From db1f164e62781c99b7cb8365ab841bb80ea12cd9 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Sat, 7 Jul 2018 11:12:28 +0200
Subject: [PATCH 01/17] Added new Config class to replace $GLOBALS['config']

---
 web/exportbans.php                    |  3 +-
 web/includes/Config.php               | 32 +++++++++++++++
 web/includes/admin.php                |  2 +-
 web/includes/page-builder.php         |  2 +-
 web/includes/sb-callback.php          | 20 ++++-----
 web/includes/system-functions.php     |  8 ++--
 web/init.php                          | 17 ++++----
 web/pages/admin.bans.php              |  4 +-
 web/pages/admin.bans.search.php       |  2 +-
 web/pages/admin.comms.search.php      |  2 +-
 web/pages/admin.edit.admindetails.php |  2 +-
 web/pages/admin.edit.admingroup.php   |  2 +-
 web/pages/admin.edit.adminservers.php |  2 +-
 web/pages/admin.edit.ban.php          |  2 +-
 web/pages/admin.edit.comms.php        |  2 +-
 web/pages/admin.settings.php          | 58 +++++++++++++--------------
 web/pages/header.php                  |  6 +--
 web/pages/page.banlist.php            | 20 ++++-----
 web/pages/page.commslist.php          |  8 ++--
 web/pages/page.home.php               |  6 +--
 web/pages/page.login.php              |  2 +-
 web/pages/page.protest.php            |  4 +-
 web/pages/page.submit.php             |  2 +-
 web/version.json                      |  6 +--
 24 files changed, 123 insertions(+), 91 deletions(-)
 create mode 100644 web/includes/Config.php

diff --git a/web/exportbans.php b/web/exportbans.php
index 50cc28cb0..143a93e28 100644
--- a/web/exportbans.php
+++ b/web/exportbans.php
@@ -1,7 +1,6 @@
 <?php
 include_once("init.php");
-$exportpublic = (isset($GLOBALS['config']['config.exportpublic']) && $GLOBALS['config']['config.exportpublic'] == "1");
-if (!$userbank->HasAccess(ADMIN_OWNER) && !$exportpublic) {
+if (!$userbank->HasAccess(ADMIN_OWNER) && !Config::getBool('config.exportpublic')) {
     echo "Don't have access to this feature.";
 } else if (!isset($_GET['type'])) {
     echo "You have to specify the type. Only follow links!";
diff --git a/web/includes/Config.php b/web/includes/Config.php
new file mode 100644
index 000000000..81d6d016e
--- /dev/null
+++ b/web/includes/Config.php
@@ -0,0 +1,32 @@
+<?php
+
+class Config
+{
+    private static $config = [];
+    private static $dbh = null;
+
+    public static function init(Database $dbh)
+    {
+        self::$dbh = $dbh;
+        self::$config = self::getAll();
+    }
+
+    public static function get($setting)
+    {
+        return array_key_exists($setting, self::$config) ? self::$config[$setting] : null;
+    }
+
+    public static function getBool($setting)
+    {
+        return (bool)self::get($setting);
+    }
+
+    private static function getAll()
+    {
+        self::$dbh->query("SELECT * FROM `:prefix_settings`");
+        foreach(self::$dbh->resultset() as $data) {
+            $config[$data['setting']] = $data['value'];
+        }
+        return $config;
+    }
+}
diff --git a/web/includes/admin.php b/web/includes/admin.php
index 981230f1e..2740fd020 100644
--- a/web/includes/admin.php
+++ b/web/includes/admin.php
@@ -255,7 +255,7 @@
         $banTabMenu = new CTabsMenu();
         if ($userbank->HasAccess(ADMIN_OWNER|ADMIN_ADD_BAN)) {
             $banTabMenu->addMenuItem("Add a ban", 0);
-            if ($GLOBALS['config']['config.enablegroupbanning']==1) {
+            if (Config::getBool('config.enablegroupbanning')) {
                 $banTabMenu->addMenuItem("Group ban", 4);
             }
         }
diff --git a/web/includes/page-builder.php b/web/includes/page-builder.php
index 9915ab44a..dea61ae67 100644
--- a/web/includes/page-builder.php
+++ b/web/includes/page-builder.php
@@ -76,7 +76,7 @@
         $page = TEMPLATES_PATH . "/page.home.php";
         break;
     default:
-        switch ($GLOBALS['config']['config.defaultpage']) {
+        switch (Config::get('config.defaultpage')) {
             case 1:
                 RewritePageTitle("Ban List");
                 $page = TEMPLATES_PATH . "/page.banlist.php";
diff --git a/web/includes/sb-callback.php b/web/includes/sb-callback.php
index a8a7a395f..6b52a7c3c 100644
--- a/web/includes/sb-callback.php
+++ b/web/includes/sb-callback.php
@@ -360,7 +360,7 @@ function RemoveGroup($gid, $type)
     $query0 = $GLOBALS['db']->Execute("DELETE FROM `" . DB_PREFIX . "_srvgroups_overrides` WHERE group_id = $gid");
     }
 
-    if(isset($GLOBALS['config']['config.enableadminrehashing']) && $GLOBALS['config']['config.enableadminrehashing'] == 1)
+    if(Config::getBool('config.enableadminrehashing'))
     {
     // rehash the settings out of the database on all servers
     $serveraccessq = $GLOBALS['db']->GetAll("SELECT sid FROM ".DB_PREFIX."_servers WHERE enabled = 1;");
@@ -586,7 +586,7 @@ function RemoveAdmin($aid)
 
     $delquery = $GLOBALS['db']->Execute(sprintf("DELETE FROM `%s_admins` WHERE aid = %d LIMIT 1", DB_PREFIX, $aid));
     if($delquery) {
-    if(isset($GLOBALS['config']['config.enableadminrehashing']) && $GLOBALS['config']['config.enableadminrehashing'] == 1)
+    if(Config::getBool('config.enableadminrehashing'))
     {
     // rehash the admins for the servers where this admin was on
     $serveraccessq = $GLOBALS['db']->GetAll("SELECT s.sid FROM `".DB_PREFIX."_servers` s
@@ -1173,7 +1173,7 @@ function AddAdmin($mask, $srv_mask, $a_name, $a_steam, $a_email, $a_password, $a
     if(!empty($server))
     $GLOBALS['db']->Execute($addtosrv,array($aid, $server_admin_group_int, '-1', substr($server, 1)));
     }
-    if(isset($GLOBALS['config']['config.enableadminrehashing']) && $GLOBALS['config']['config.enableadminrehashing'] == 1)
+    if(Config::getBool('config.enableadminrehashing'))
     {
     // rehash the admins on the servers
     $serveraccessq = $GLOBALS['db']->GetAll("SELECT s.sid FROM `".DB_PREFIX."_servers` s
@@ -1770,7 +1770,7 @@ function AddBan($nickname, $type, $steam, $ip, $length, $dfile, $dname, $reason,
 
     $GLOBALS['db']->Execute("UPDATE `".DB_PREFIX."_submissions` SET archiv = '3', archivedby = '".$userbank->GetAid()."' WHERE SteamId = ?;", array($steam));
 
-    $kickit = isset($GLOBALS['config']['config.enablekickit']) && $GLOBALS['config']['config.enablekickit'] == "1";
+    $kickit = Config::getBool('config.enablekickit');
     if ($kickit) {
         $objResponse->addScript("ShowKickBox('".((int)$type==0?$steam:$ip)."', '".(int)$type."');");
     } else {
@@ -1999,7 +1999,7 @@ function EditAdminPerms($aid, $web_flags, $srv_flags)
     // Update server stuff
     $GLOBALS['db']->Execute("UPDATE `".DB_PREFIX."_admins` SET `srv_flags` = ?, `immunity` = ? WHERE `aid` = $aid", array($srv_flags, $immunity));
 
-    if(isset($GLOBALS['config']['config.enableadminrehashing']) && $GLOBALS['config']['config.enableadminrehashing'] == 1)
+    if(Config::getBool('config.enableadminrehashing'))
     {
     // rehash the admins on the servers
     $serveraccessq = $GLOBALS['db']->GetAll("SELECT s.sid FROM `".DB_PREFIX."_servers` s
@@ -2118,7 +2118,7 @@ function EditGroup($gid, $web_flags, $srv_flags, $type, $name, $overrides, $newO
     }
     }
 
-    if(isset($GLOBALS['config']['config.enableadminrehashing']) && $GLOBALS['config']['config.enableadminrehashing'] == 1)
+    if(Config::getBool('config.enableadminrehashing'))
     {
     // rehash the settings out of the database on all servers
     $serveraccessq = $GLOBALS['db']->GetAll("SELECT sid FROM ".DB_PREFIX."_servers WHERE enabled = 1;");
@@ -2613,7 +2613,7 @@ function RehashAdmins($server, $do=0)
 function GroupBan($groupuri, $isgrpurl="no", $queue="no", $reason="", $last="")
 {
     $objResponse = new xajaxResponse();
-    if($GLOBALS['config']['config.enablegroupbanning']==0)
+    if(!Config::getBool('config.enablegroupbanning'))
     return $objResponse;
     global $userbank, $username;
     if(!$userbank->HasAccess(ADMIN_OWNER|ADMIN_ADD_BAN))
@@ -2653,7 +2653,7 @@ function BanMemberOfGroup($grpurl, $queue, $reason, $last)
 {
     set_time_limit(0);
     $objResponse = new xajaxResponse();
-    if ($GLOBALS['config']['config.enablegroupbanning'] == 0 || !defined('STEAMAPIKEY') || STEAMAPIKEY == '') {
+    if (!Config::getBool('config.enablegroupbanning') || !defined('STEAMAPIKEY') || STEAMAPIKEY == '') {
         return $objResponse;
     }
     global $userbank, $username;
@@ -2746,7 +2746,7 @@ function GetGroups($friendid)
 {
     set_time_limit(0);
     $objResponse = new xajaxResponse();
-    if($GLOBALS['config']['config.enablegroupbanning']==0 || !is_numeric($friendid))
+    if(!Config::getBool('config.enablegroupbanning') || !is_numeric($friendid))
     return $objResponse;
     global $userbank, $username;
     if(!$userbank->HasAccess(ADMIN_OWNER|ADMIN_ADD_BAN))
@@ -2825,7 +2825,7 @@ function BanFriends($friendid, $name)
     global $userbank, $username;
     $objResponse = new xajaxResponse();
     $name = filter_var($name, FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
-    if ($GLOBALS['config']['config.enablefriendsbanning'] == 0 || !is_numeric($friendid)) {
+    if (!Config::getBool('config.enablefriendsbanning') || !is_numeric($friendid)) {
         return $objResponse;
     }
 
diff --git a/web/includes/system-functions.php b/web/includes/system-functions.php
index 5a585e61e..5769ec35b 100644
--- a/web/includes/system-functions.php
+++ b/web/includes/system-functions.php
@@ -86,7 +86,7 @@ function AddTab($title, $url, $desc, $active=false)
     $tabs['title'] = $title;
     $tabs['url'] = $url;
     $tabs['desc'] = $desc;
-    if ($_GET['p'] == "default" && $title == $tab_arr[intval($GLOBALS['config']['config.defaultpage'])]) {
+    if ($_GET['p'] == "default" && $title == $tab_arr[intval(Config::get('config.defaultpage'))]) {
         $tabs['active'] = true;
         $GLOBALS['pagetitle'] = $title;
     } else {
@@ -111,13 +111,13 @@ function BuildPageTabs()
     AddTab("Dashboard", "index.php?p=home", "This page shows an overview of your bans and servers.");
     AddTab("Servers", "index.php?p=servers", "All of your servers and their status can be viewed here");
     AddTab("Bans", "index.php?p=banlist", "All of the bans in the database can be viewed from here.");
-    if ($GLOBALS['config']['config.enablecomms'] == "1") {
+    if (Config::getBool('config.enablecomms')) {
         AddTab("Comms", "index.php?p=commslist", "All of the communication bans (such as chat gags and voice mutes) in the database can be viewed from here.");
     }
-    if ($GLOBALS['config']['config.enablesubmit']=="1") {
+    if (Config::getBool('config.enablesubmit')) {
         AddTab("Report a Player", "index.php?p=submit", "You can submit a demo or screenshot of a suspected cheater here. It will then be up for review by one of the admins");
     }
-    if ($GLOBALS['config']['config.enableprotest']=="1") {
+    if (Config::getBool('config.enableprotest')) {
         AddTab("Appeal a Ban", "index.php?p=protest", "Here you can appeal your ban. And prove your case as to why you should be unbanned.");
     }
     if ($userbank->is_admin()) {
diff --git a/web/init.php b/web/init.php
index ec2ef0041..b9477ac00 100644
--- a/web/init.php
+++ b/web/init.php
@@ -164,10 +164,6 @@
 $mysql_server_info = $GLOBALS['db']->ServerInfo();
 $GLOBALS['db_version'] = $mysql_server_info['version'];
 
-$debug = $GLOBALS['db']->Execute("SELECT value FROM `".DB_PREFIX."_settings` WHERE setting = 'config.debug';");
-if ($debug->fields['value']=="1") {
-    define("DEVELOPER_MODE", true);
-}
 
 require_once(INCLUDES_PATH.'/SteamID/bootstrap.php');
 \SteamID\SteamID::init($GLOBALS['PDO']);
@@ -175,6 +171,9 @@
 require_once(INCLUDES_PATH.'/Log.php');
 Log::init($GLOBALS['PDO']);
 
+require_once(INCLUDES_PATH.'/Config.php');
+Config::init($GLOBALS['PDO']);
+
 // ---------------------------------------------------
 //  Setup our custom error handler
 // ---------------------------------------------------
@@ -301,9 +300,11 @@ function sbError($errno, $errstr, $errfile, $errline)
     $res->MoveNext();
 }
 
-define('SB_BANS_PER_PAGE', $GLOBALS['config']['banlist.bansperpage']);
-define('MIN_PASS_LENGTH', $GLOBALS['config']['config.password.minlength']);
-$dateformat = !empty($GLOBALS['config']['config.dateformat'])?$GLOBALS['config']['config.dateformat']:"m-d-y H:i";
+define("DEVELOPER_MODE", Config::getBool('config.debug'));
+define('SB_BANS_PER_PAGE', Config::get('banlist.bansperpage'));
+define('MIN_PASS_LENGTH', Config::get('config.password.minlength'));
+
+$dateformat = (Config::getBool('config.dateformat')) ? Config::get('config.dateformat') : 'm-d-y H:i';
 
 // ---------------------------------------------------
 // Setup our templater
@@ -312,7 +313,7 @@ function sbError($errno, $errstr, $errfile, $errline)
 
 global $theme, $userbank;
 
-$theme_name = isset($GLOBALS['config']['config.theme'])?$GLOBALS['config']['config.theme']:'default';
+$theme_name = (Config::getBool('config.theme')) ? Config::get('config.theme') : 'default';
 if (defined("IS_UPDATE")) {
     $theme_name = "default";
 }
diff --git a/web/pages/admin.bans.php b/web/pages/admin.bans.php
index 62cbfac27..a76e6faf1 100644
--- a/web/pages/admin.bans.php
+++ b/web/pages/admin.bans.php
@@ -106,7 +106,7 @@
 // Add Ban
 echo '<div id="0" style="display:none;">';
 $theme->assign('permission_addban', $userbank->HasAccess(ADMIN_OWNER | ADMIN_ADD_BAN));
-$theme->assign('customreason', ((isset($GLOBALS['config']['bans.customreasons']) && $GLOBALS['config']['bans.customreasons'] != "") ? unserialize($GLOBALS['config']['bans.customreasons']) : false));
+$theme->assign('customreason', (Config::getBool('bans.customreasons')) ? unserialize(Config::get('bans.customreasons')) : false);
 $theme->display('page_admin_bans_add.tpl');
 echo '</div>';
 
@@ -731,7 +731,7 @@
 
 echo '<div id="4" style="display:none;">';
 $theme->assign('permission_addban', $userbank->HasAccess(ADMIN_OWNER | ADMIN_ADD_BAN));
-$theme->assign('groupbanning_enabled', $GLOBALS['config']['config.enablegroupbanning'] == 1 ? true : false);
+$theme->assign('groupbanning_enabled', Config::getBool('config.enablegroupbanning'));
 if (isset($_GET['fid'])) {
     $theme->assign('list_steam_groups', $_GET['fid']);
 } else {
diff --git a/web/pages/admin.bans.search.php b/web/pages/admin.bans.search.php
index b4b38ffa6..af70e1dcf 100644
--- a/web/pages/admin.bans.search.php
+++ b/web/pages/admin.bans.search.php
@@ -42,7 +42,7 @@
 $serverscript .= "</script>";
 $page = isset($_GET['page']) ? $_GET['page'] : 1;
 
-$theme->assign('hideplayerips', (isset($GLOBALS['config']['banlist.hideplayerips']) && $GLOBALS['config']['banlist.hideplayerips'] == "1" && !$userbank->is_admin()));
+$theme->assign('hideplayerips', (Config::getBool('banlist.hideplayerips') && !$userbank->is_admin()));
 $theme->assign('is_admin', $userbank->is_admin());
 $theme->assign('admin_list', $admin_list);
 $theme->assign('server_list', $servers);
diff --git a/web/pages/admin.comms.search.php b/web/pages/admin.comms.search.php
index bda46ffd2..fde828da0 100644
--- a/web/pages/admin.comms.search.php
+++ b/web/pages/admin.comms.search.php
@@ -47,7 +47,7 @@
 $serverscript .= "</script>";
 $page = isset($_GET['page']) ? $_GET['page'] : 1;
 
-$theme->assign('hideplayerips', (isset($GLOBALS['config']['banlist.hideplayerips']) && $GLOBALS['config']['banlist.hideplayerips'] == "1" && !$userbank->is_admin()));
+$theme->assign('hideplayerips', (Config::getBool('banlist.hideplayerips') && !$userbank->is_admin()));
 $theme->assign('is_admin', $userbank->is_admin());
 $theme->assign('admin_list', $admin_list);
 $theme->assign('server_list', $servers);
diff --git a/web/pages/admin.edit.admindetails.php b/web/pages/admin.edit.admindetails.php
index 9e704e230..374b72fb5 100644
--- a/web/pages/admin.edit.admindetails.php
+++ b/web/pages/admin.edit.admindetails.php
@@ -255,7 +255,7 @@
             $ownpwchanged = true;
         }
 
-        if (isset($GLOBALS['config']['config.enableadminrehashing']) && $GLOBALS['config']['config.enableadminrehashing'] == 1) {
+        if (Config::getBool('config.enableadminrehashing')) {
             // rehash the admins on the servers
             $serveraccessq = $GLOBALS['db']->GetAll("SELECT s.sid FROM `" . DB_PREFIX . "_servers` s
                 LEFT JOIN `" . DB_PREFIX . "_admins_servers_groups` asg ON asg.admin_id = '" . (int) $_GET['id'] . "'
diff --git a/web/pages/admin.edit.admingroup.php b/web/pages/admin.edit.admingroup.php
index 51aa21f32..f88dc738c 100644
--- a/web/pages/admin.edit.admingroup.php
+++ b/web/pages/admin.edit.admingroup.php
@@ -129,7 +129,7 @@
                 )
             );
         }
-        if (isset($GLOBALS['config']['config.enableadminrehashing']) && $GLOBALS['config']['config.enableadminrehashing'] == 1) {
+        if (Config::getBool('config.enableadminrehashing')) {
             // rehash the admins on the servers
             $serveraccessq = $GLOBALS['db']->GetAll("SELECT s.sid FROM `" . DB_PREFIX . "_servers` s
                 LEFT JOIN `" . DB_PREFIX . "_admins_servers_groups` asg ON asg.admin_id = '" . (int) $_GET['id'] . "'
diff --git a/web/pages/admin.edit.adminservers.php b/web/pages/admin.edit.adminservers.php
index c796ed21c..7bc1b8854 100644
--- a/web/pages/admin.edit.adminservers.php
+++ b/web/pages/admin.edit.adminservers.php
@@ -96,7 +96,7 @@
             ));
         }
     }
-    if (isset($GLOBALS['config']['config.enableadminrehashing']) && $GLOBALS['config']['config.enableadminrehashing'] == 1) {
+    if (Config::getBool('config.enableadminrehashing')) {
         // rehash the admins on the servers
         $serveraccessq = $GLOBALS['db']->GetAll("SELECT s.sid FROM `" . DB_PREFIX . "_servers` s
 												LEFT JOIN `" . DB_PREFIX . "_admins_servers_groups` asg ON asg.admin_id = '" . (int) $aid . "'
diff --git a/web/pages/admin.edit.ban.php b/web/pages/admin.edit.ban.php
index f7683e39a..cff6f28d4 100644
--- a/web/pages/admin.edit.ban.php
+++ b/web/pages/admin.edit.ban.php
@@ -216,7 +216,7 @@
 $theme->assign('ban_authid', trim($res['authid']));
 $theme->assign('ban_ip', $res['ip']);
 $theme->assign('ban_demo', (!empty($res['dname']) ? "Uploaded: <b>" . $res['dname'] . "</b>" : ""));
-$theme->assign('customreason', ((isset($GLOBALS['config']['bans.customreasons']) && $GLOBALS['config']['bans.customreasons'] != "") ? unserialize($GLOBALS['config']['bans.customreasons']) : false));
+$theme->assign('customreason', (Config::getBool('bans.customreasons')) ? unserialize(Config::get('bans.customreasons')) : false);
 
 $theme->left_delimiter  = "-{";
 $theme->right_delimiter = "}-";
diff --git a/web/pages/admin.edit.comms.php b/web/pages/admin.edit.comms.php
index 298170100..c87be5ab0 100644
--- a/web/pages/admin.edit.comms.php
+++ b/web/pages/admin.edit.comms.php
@@ -160,7 +160,7 @@
 $theme->assign('ban_name', $res['name']);
 $theme->assign('ban_reason', $res['reason']);
 $theme->assign('ban_authid', trim($res['authid']));
-$theme->assign('customreason', ((isset($GLOBALS['config']['bans.customreasons']) && $GLOBALS['config']['bans.customreasons'] != "") ? unserialize($GLOBALS['config']['bans.customreasons']) : false));
+$theme->assign('customreason', (Config::getBool('bans.customreasons')) ? unserialize(Config::get('bans.customreasons')) : false);
 
 $theme->left_delimiter  = "-{";
 $theme->right_delimiter = "}-";
diff --git a/web/pages/admin.settings.php b/web/pages/admin.settings.php
index 9f314ce5f..b58baafba 100644
--- a/web/pages/admin.settings.php
+++ b/web/pages/admin.settings.php
@@ -79,11 +79,11 @@
 } else {
     $searchlink = "";
 }
-$list_start = ($page - 1) * intval($GLOBALS['config']['banlist.bansperpage']);
-$list_end   = $list_start + intval($GLOBALS['config']['banlist.bansperpage']);
+$list_start = ($page - 1) * SB_BANS_PER_PAGE;
+$list_end   = $list_start + SB_BANS_PER_PAGE;
 
 $log_count = Log::getCount($where);
-$log       = Log::getAll($list_start, intval($GLOBALS['config']['banlist.bansperpage']), $where);
+$log       = Log::getAll($list_start, SB_BANS_PER_PAGE, $where);
 if (($page > 1)) {
     $prev = CreateLinkR('<img border="0" alt="prev" src="images/left.png" style="vertical-align:middle;" /> prev', "index.php?p=admin&c=settings" . $searchlink . "&page=" . ($page - 1) . "#^2");
 } else {
@@ -94,13 +94,13 @@
 } else {
     $next = "";
 }
-$pages = (round($log_count / intval($GLOBALS['config']['banlist.bansperpage'])) == 0) ? 1 : round($log_count / intval($GLOBALS['config']['banlist.bansperpage']));
+$pages = (round($log_count / SB_BANS_PER_PAGE) == 0) ? 1 : round($log_count / SB_BANS_PER_PAGE);
 if ($pages > 1) {
     $page_numbers = 'Page ' . $page . ' of ' . $pages . " - " . $prev . " | " . $next;
 } else {
     $page_numbers = 'Page ' . $page . ' of ' . $pages;
 }
-$pages = ceil($log_count / intval($GLOBALS['config']['banlist.bansperpage']));
+$pages = ceil($log_count / SB_BANS_PER_PAGE);
 if ($pages > 1) {
     if (!isset($_GET['advSearch']) || !isset($_GET['advType'])) {
         $_GET['advSearch'] = "";
@@ -276,15 +276,15 @@
 
     #########[Settings Page]###############
     echo '<div id="0" style="display:none;">';
-    $theme->assign('config_title', $GLOBALS['config']['template.title']);
-    $theme->assign('config_logo', $GLOBALS['config']['template.logo']);
-    $theme->assign('config_min_password', $GLOBALS['config']['config.password.minlength']);
-    $theme->assign('config_dateformat', $GLOBALS['config']['config.dateformat']);
-    $theme->assign('config_dash_title', $GLOBALS['config']['dash.intro.title']);
-    $theme->assign('config_dash_text', stripslashes($GLOBALS['config']['dash.intro.text']));
-    $theme->assign('config_bans_per_page', $GLOBALS['config']['banlist.bansperpage']);
+    $theme->assign('config_title', Config::get('template.title'));
+    $theme->assign('config_logo', Config::get('template.logo'));
+    $theme->assign('config_min_password', MIN_PASS_LENGTH);
+    $theme->assign('config_dateformat', Config::get('config.dateformat'));
+    $theme->assign('config_dash_title', Config::get('dash.intro.title'));
+    $theme->assign('config_dash_text', Config::get('dash.intro.text'));
+    $theme->assign('config_bans_per_page', SB_BANS_PER_PAGE);
 
-    $theme->assign('bans_customreason', ((isset($GLOBALS['config']['bans.customreasons']) && $GLOBALS['config']['bans.customreasons'] != "") ? unserialize($GLOBALS['config']['bans.customreasons']) : array()));
+    $theme->assign('bans_customreason', (Config::getBool('bans.customreasons')) ? unserialize(Config::get('bans.customreasons')) : []);
 
     $theme->display('page_admin_settings_settings.tpl');
     echo '</div>';
@@ -325,22 +325,22 @@
 }
 ?>
 <script>
-$('config_debug').checked = <?=$GLOBALS['config']['config.debug']?>;
-$('enable_submit').checked = <?=$GLOBALS['config']['config.enablesubmit']?>;
-$('enable_protest').checked = <?=$GLOBALS['config']['config.enableprotest']?>;
-$('enable_commslist').checked = <?=$GLOBALS['config']['config.enablecomms']?>;
-$('enable_kickit').checked = <?=$GLOBALS['config']['config.enablekickit']?>;
-$('export_public').checked = <?=$GLOBALS['config']['config.exportpublic']?>;
-$('dash_nopopup').checked = <?=$GLOBALS['config']['dash.lognopopup']?>;
-$('default_page').value = <?=$GLOBALS['config']['config.defaultpage']?>;
-$('protest_emailonlyinvolved').checked = <?=$GLOBALS['config']['protest.emailonlyinvolved']?>;
-$('banlist_hideadmname').checked = <?=$GLOBALS['config']['banlist.hideadminname']?>;
-$('banlist_nocountryfetch').checked = <?=$GLOBALS['config']['banlist.nocountryfetch']?>;
-$('banlist_hideplayerips').checked = <?=$GLOBALS['config']['banlist.hideplayerips']?>;
-$('enable_groupbanning').checked = <?=$GLOBALS['config']['config.enablegroupbanning']?>;
-$('enable_friendsbanning').checked = <?=$GLOBALS['config']['config.enablefriendsbanning']?>;
-$('enable_adminrehashing').checked = <?=$GLOBALS['config']['config.enableadminrehashing']?>;
-$('enable_steamlogin').checked = <?=$GLOBALS['config']['config.enablesteamlogin']?>;
+$('config_debug').checked = <?=(int)Config::getBool('config.debug');?>;
+$('enable_submit').checked = <?=(int)Config::getBool('config.enablesubmit');?>;
+$('enable_protest').checked = <?=(int)Config::getBool('config.enableprotest');?>;
+$('enable_commslist').checked = <?=(int)Config::getBool('config.enablecomms');?>;
+$('enable_kickit').checked = <?=(int)Config::getBool('config.enablekickit');?>;
+$('export_public').checked = <?=(int)Config::getBool('config.exportpublic');?>;
+$('dash_nopopup').checked = <?=(int)Config::getBool('dash.lognopopup');?>;
+$('default_page').value = <?=(int)Config::getBool('config.defaultpage');?>;
+$('protest_emailonlyinvolved').checked = <?=(int)Config::getBool('protest.emailonlyinvolved');?>;
+$('banlist_hideadmname').checked = <?=(int)Config::getBool('banlist.hideadminname');?>;
+$('banlist_nocountryfetch').checked = <?=(int)Config::getBool('banlist.nocountryfetch');?>;
+$('banlist_hideplayerips').checked = <?=(int)Config::getBool('banlist.hideplayerips');?>;
+$('enable_groupbanning').checked = <?=(int)Config::getBool('config.enablegroupbanning');?>;
+$('enable_friendsbanning').checked = <?=(int)Config::getBool('config.enablefriendsbanning');?>;
+$('enable_adminrehashing').checked = <?=(int)Config::getBool('config.enableadminrehashing');?>;
+$('enable_steamlogin').checked = <?=(int)Config::getBool('config.enablesteamlogin');?>;
 <?php
 if (ini_get('safe_mode') == 1) {
     print "$('enable_groupbanning').disabled = true;\n";
diff --git a/web/pages/header.php b/web/pages/header.php
index d5470a292..9e12c6336 100644
--- a/web/pages/header.php
+++ b/web/pages/header.php
@@ -53,9 +53,9 @@
 }
 
 $theme->assign('xajax_functions', $xajax->printJavascript("scripts", "xajax.js"));
-$theme->assign('header_title', $GLOBALS['config']['template.title']);
-$theme->assign('header_logo', $GLOBALS['config']['template.logo']);
+$theme->assign('header_title', Config::get('template.title'));
+$theme->assign('header_logo', Config::get('template.logo'));
 $theme->assign('username', $userbank->GetProperty("user"));
 $theme->assign('logged_in', $userbank->is_logged_in());
-$theme->assign('theme_name', isset($GLOBALS['config']['config.theme']) ? $GLOBALS['config']['config.theme'] : 'default');
+$theme->assign('theme_name', (Config::get('config.theme')) ? Config::get('config.theme') : 'default');
 $theme->display('page_header.tpl');
diff --git a/web/pages/page.banlist.php b/web/pages/page.banlist.php
index 123d0e374..04890d8bf 100644
--- a/web/pages/page.banlist.php
+++ b/web/pages/page.banlist.php
@@ -236,7 +236,7 @@ function setPostKey()
     // disable ip search if hiding player ips
     $search_ips   = "";
     $search_array = array();
-    if (!isset($GLOBALS['config']['banlist.hideplayerips']) || $GLOBALS['config']['banlist.hideplayerips'] != "1" || $userbank->is_admin()) {
+    if (!Config::getBool('banlist.hideplayerips') || $userbank->is_admin()) {
         $search_ips     = "BA.ip LIKE ? OR ";
         $search_array[] = $search;
     }
@@ -319,7 +319,7 @@ function setPostKey()
             break;
         case "ip":
             // disable ip search if hiding player ips
-            if (isset($GLOBALS['config']['banlist.hideplayerips']) && $GLOBALS['config']['banlist.hideplayerips'] == "1" && !$userbank->is_admin()) {
+            if (Config::getBool('banlist.hideplayerips') && !$userbank->is_admin()) {
                 $where   = "";
                 $advcrit = array();
             } else {
@@ -379,7 +379,7 @@ function setPostKey()
             );
             break;
         case "admin":
-            if ($GLOBALS['config']['banlist.hideadminname'] && !$userbank->is_admin()) {
+            if (Config::getBool('banlist.hideadminname') && !$userbank->is_admin()) {
                 $where   = "";
                 $advcrit = array();
             } else {
@@ -472,7 +472,7 @@ function setPostKey()
     if (!empty($res->fields['ban_ip'])) {
         if (!empty($res->fields['ban_country']) && $res->fields['ban_country'] != ' ') {
             $data['country'] = '<img src="images/country/' . strtolower($res->fields['ban_country']) . '.jpg" alt="' . $res->fields['ban_country'] . '" border="0" align="absmiddle" />';
-        } elseif (isset($GLOBALS['config']['banlist.nocountryfetch']) && $GLOBALS['config']['banlist.nocountryfetch'] == "0") {
+        } elseif (!Config::getBool('banlist.nocountryfetch')) {
             $country = FetchIp($res->fields['ban_ip']);
             $edit    = $GLOBALS['db']->Execute("UPDATE " . DB_PREFIX . "_bans SET country = ?
 				                            WHERE bid = ?", array(
@@ -497,7 +497,7 @@ function setPostKey()
     $steam3parts         = explode(':', $steam2id);
     $data['steamid3']    = '[U:1:' . ($steam3parts[2] * 2 + $steam3parts[1]) . ']';
 
-    if (isset($GLOBALS['config']['banlist.hideadminname']) && $GLOBALS['config']['banlist.hideadminname'] == "1" && !$userbank->is_admin()) {
+    if (Config::getBool('banlist.hideadminname') && !$userbank->is_admin()) {
         $data['admin'] = false;
     } else {
         $data['admin'] = stripslashes($res->fields['admin_name']);
@@ -809,12 +809,12 @@ function setPostKey()
 $theme->assign('admin_nick', $userbank->GetProperty("user"));
 
 $theme->assign('admin_postkey', $_SESSION['banlist_postkey']);
-$theme->assign('hideplayerips', (isset($GLOBALS['config']['banlist.hideplayerips']) && $GLOBALS['config']['banlist.hideplayerips'] == "1" && !$userbank->is_admin()));
-$theme->assign('hideadminname', (isset($GLOBALS['config']['banlist.hideadminname']) && $GLOBALS['config']['banlist.hideadminname'] == "1" && !$userbank->is_admin()));
-$theme->assign('groupban', ($GLOBALS['config']['config.enablegroupbanning'] == 1 && $userbank->HasAccess(ADMIN_OWNER | ADMIN_ADD_BAN)));
-$theme->assign('friendsban', ($GLOBALS['config']['config.enablefriendsbanning'] == 1 && $userbank->HasAccess(ADMIN_OWNER | ADMIN_ADD_BAN)));
+$theme->assign('hideplayerips', (Config::getBool('banlist.hideplayerips') && !$userbank->is_admin()));
+$theme->assign('hideadminname', (Config::getBool('banlist.hideadminname') && !$userbank->is_admin()));
+$theme->assign('groupban', (Config::getBool('config.enablegroupbanning') && $userbank->HasAccess(ADMIN_OWNER | ADMIN_ADD_BAN)));
+$theme->assign('friendsban', (Config::getBool('config.enablefriendsbanning') && $userbank->HasAccess(ADMIN_OWNER | ADMIN_ADD_BAN)));
 $theme->assign('general_unban', $userbank->HasAccess(ADMIN_OWNER | ADMIN_UNBAN | ADMIN_UNBAN_OWN_BANS | ADMIN_UNBAN_GROUP_BANS));
 $theme->assign('can_delete', $userbank->HasAccess(ADMIN_DELETE_BAN));
 $theme->assign('view_bans', ($userbank->HasAccess(ADMIN_OWNER | ADMIN_EDIT_ALL_BANS | ADMIN_EDIT_OWN_BANS | ADMIN_EDIT_GROUP_BANS | ADMIN_UNBAN | ADMIN_UNBAN_OWN_BANS | ADMIN_UNBAN_GROUP_BANS | ADMIN_DELETE_BAN)));
-$theme->assign('can_export', ($userbank->HasAccess(ADMIN_OWNER) || (isset($GLOBALS['config']['config.exportpublic']) && $GLOBALS['config']['config.exportpublic'] == "1")));
+$theme->assign('can_export', ($userbank->HasAccess(ADMIN_OWNER) || Config::getBool('config.exportpublic')));
 $theme->display('page_bans.tpl');
diff --git a/web/pages/page.commslist.php b/web/pages/page.commslist.php
index 11c4c949a..41c5aafa7 100644
--- a/web/pages/page.commslist.php
+++ b/web/pages/page.commslist.php
@@ -35,7 +35,7 @@
     echo "You should not be here. Only follow links!";
     die();
 }
-if ($GLOBALS['config']['config.enablecomms'] != "1") {
+if (!Config::getBool('config.enablecomms')) {
     print "<script>ShowBox('Error', 'This page is disabled. You should not be here.', 'red');</script>";
     PageDie();
 }
@@ -359,7 +359,7 @@ function setPostKey()
             );
             break;
         case "admin":
-            if ($GLOBALS['config']['banlist.hideadminname'] && !$userbank->is_admin()) {
+            if (Config::getBool('banlist.hideadminname') && !$userbank->is_admin()) {
                 $where   = "";
                 $advcrit = array();
             } else {
@@ -470,7 +470,7 @@ function setPostKey()
     $steam3parts         = explode(':', $steam2id);
     $data['steamid3']    = '[U:1:' . ($steam3parts[2] * 2 + $steam3parts[1]) . ']';
 
-    if (isset($GLOBALS['config']['banlist.hideadminname']) && $GLOBALS['config']['banlist.hideadminname'] == "1" && !$userbank->is_admin()) {
+    if (Config::getBool('banlist.hideadminname') && !$userbank->is_admin()) {
         $data['admin'] = false;
     } else {
         $data['admin'] = stripslashes($res->fields['admin_name']);
@@ -760,7 +760,7 @@ function setPostKey()
 $theme->assign('admin_nick', $userbank->GetProperty("user"));
 
 $theme->assign('admin_postkey', $_SESSION['banlist_postkey']);
-$theme->assign('hideadminname', (isset($GLOBALS['config']['banlist.hideadminname']) && $GLOBALS['config']['banlist.hideadminname'] == "1" && !$userbank->is_admin()));
+$theme->assign('hideadminname', (Config::getBool('banlist.hideadminname') && !$userbank->is_admin()));
 $theme->assign('general_unban', $userbank->HasAccess(ADMIN_OWNER | ADMIN_UNBAN | ADMIN_UNBAN_OWN_BANS | ADMIN_UNBAN_GROUP_BANS));
 $theme->assign('can_delete', $userbank->HasAccess(ADMIN_DELETE_BAN));
 $theme->assign('view_bans', ($userbank->HasAccess(ADMIN_OWNER | ADMIN_EDIT_ALL_BANS | ADMIN_EDIT_OWN_BANS | ADMIN_EDIT_GROUP_BANS | ADMIN_UNBAN | ADMIN_UNBAN_OWN_BANS | ADMIN_UNBAN_GROUP_BANS | ADMIN_DELETE_BAN)));
diff --git a/web/pages/page.home.php b/web/pages/page.home.php
index bbfbf51a7..45303a717 100644
--- a/web/pages/page.home.php
+++ b/web/pages/page.home.php
@@ -170,9 +170,9 @@
 
 require(TEMPLATES_PATH . "/page.servers.php"); //Set theme vars from servers page
 
-$theme->assign('dashboard_lognopopup', (isset($GLOBALS['config']['dash.lognopopup']) && $GLOBALS['config']['dash.lognopopup'] == "1"));
-$theme->assign('dashboard_title', stripslashes($GLOBALS['config']['dash.intro.title']));
-$theme->assign('dashboard_text', stripslashes($GLOBALS['config']['dash.intro.text']));
+$theme->assign('dashboard_lognopopup', Config::getBool('dash.lognopopup'));
+$theme->assign('dashboard_title', Config::get('dash.intro.title'));
+$theme->assign('dashboard_text', Config::get('dash.intro.text'));
 $theme->assign('players_blocked', $stopped);
 $theme->assign('total_blocked', $totalstopped);
 
diff --git a/web/pages/page.login.php b/web/pages/page.login.php
index d7526f25c..abc2b0058 100644
--- a/web/pages/page.login.php
+++ b/web/pages/page.login.php
@@ -71,7 +71,7 @@
     }
 }
 
-$theme->assign('steamlogin_show', $GLOBALS['config']['config.enablesteamlogin']);
+$theme->assign('steamlogin_show', Config::getBool('config.enablesteamlogin'));
 $theme->assign('redir', "DoLogin('" . (isset($_SESSION['q']) ? $_SESSION['q'] : '') . "');");
 $theme->left_delimiter  = "-{";
 $theme->right_delimiter = "}-";
diff --git a/web/pages/page.protest.php b/web/pages/page.protest.php
index c21834b9d..c065cee73 100644
--- a/web/pages/page.protest.php
+++ b/web/pages/page.protest.php
@@ -26,7 +26,7 @@
 *************************************************************************/
 
 global $userbank, $theme;
-if ($GLOBALS['config']['config.enableprotest'] != "1") {
+if (!Config::getBool('config.enableprotest')) {
     print "<script>ShowBox('Error', 'This page is disabled. You should not be here.', 'red');</script>";
     PageDie();
 }
@@ -137,7 +137,7 @@
 
         $emailinfo = $GLOBALS['db']->Execute("SELECT aid, user, email FROM `" . DB_PREFIX . "_admins` WHERE aid = (SELECT aid FROM `" . DB_PREFIX . "_bans` WHERE bid = '" . (int) $BanId . "');");
         $requri    = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], ".php") + 4);
-        if (isset($GLOBALS['config']['protest.emailonlyinvolved']) && $GLOBALS['config']['protest.emailonlyinvolved'] == 1 && !empty($emailinfo->fields['email'])) {
+        if (Config::getBool('protest.emailonlyinvolved') && !empty($emailinfo->fields['email'])) {
             $admins = array(
                 array(
                     'aid' => $emailinfo->fields['aid'],
diff --git a/web/pages/page.submit.php b/web/pages/page.submit.php
index 52ee27a7f..455e1fa08 100644
--- a/web/pages/page.submit.php
+++ b/web/pages/page.submit.php
@@ -33,7 +33,7 @@
     echo "You should not be here. Only follow links!";
     die();
 }
-if ($GLOBALS['config']['config.enablesubmit'] != "1") {
+if (!Config::getBool('config.enablesubmit')) {
     print "<script>ShowBox('Error', 'This page is disabled. You should not be here.', 'red');</script>";
     PageDie();
 }
diff --git a/web/version.json b/web/version.json
index 8a7eaf2e2..a4b2d087a 100644
--- a/web/version.json
+++ b/web/version.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.6.3",
-    "git": "676",
-    "dev": false
+    "version": "1.7.0",
+    "git": "765",
+    "dev": true
 }

From 346667575c57186cf728b96a432a43f3279185ae Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Sat, 7 Jul 2018 11:13:43 +0200
Subject: [PATCH 02/17] Removed $GLOBALS['sb-email']

---
 web/init.php                              | 1 -
 web/install/includes/system-functions.php | 2 +-
 web/pages/page.lostpassword.php           | 2 +-
 web/pages/page.protest.php                | 2 +-
 web/pages/page.submit.php                 | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/init.php b/web/init.php
index b9477ac00..c33c89e37 100644
--- a/web/init.php
+++ b/web/init.php
@@ -153,7 +153,6 @@
 require_once(INCLUDES_PATH.'/Database.php');
 $GLOBALS['db'] = ADONewConnection("mysqli://".DB_USER.':'.urlencode(DB_PASS).'@'.DB_HOST.':'.DB_PORT.'/'.DB_NAME);
 $GLOBALS['PDO'] = new Database(DB_HOST, DB_PORT, DB_NAME, DB_USER, DB_PASS, DB_PREFIX, DB_CHARSET);
-$GLOBALS['sb-email'] = SB_EMAIL;
 
 if (!is_object($GLOBALS['db'])) {
     die();
diff --git a/web/install/includes/system-functions.php b/web/install/includes/system-functions.php
index f5916ebad..67168ff25 100644
--- a/web/install/includes/system-functions.php
+++ b/web/install/includes/system-functions.php
@@ -75,7 +75,7 @@ function AddTab($title, $url, $desc, $active=false)
     $tabs['title'] = $title;
     $tabs['url'] = $url;
     $tabs['desc'] = $desc;
-    if (!isset($_GET['p']) && $title == $tab_arr[isset($GLOBALS['config']) ? intval($GLOBALS['config']['config.defaultpage']) : 0]) {
+    if (!isset($_GET['p']) && $title == $tab_arr[is_null(Config::get('config.defaultpage')) ? 0 : Config::get('config.defaultpage')]) {
         $tabs['active'] = true;
         $GLOBALS['pagetitle'] = $title;
     } else {
diff --git a/web/pages/page.lostpassword.php b/web/pages/page.lostpassword.php
index 5c041e742..a846661f0 100644
--- a/web/pages/page.lostpassword.php
+++ b/web/pages/page.lostpassword.php
@@ -60,7 +60,7 @@
         $message .= "Your password was changed to: " . $newpass . "\n\n";
         $message .= "Login to your SourceBans account and change your password in Your Account.\n";
 
-        $headers = 'From: ' . $GLOBALS['sb-email'] . "\n" . 'X-Mailer: PHP/' . phpversion();
+        $headers = 'From: ' . SB_EMAIL . "\n" . 'X-Mailer: PHP/' . phpversion();
         $m       = mail($email, "SourceBans Password Reset", $message, $headers);
 
         echo '<div id="msg-blue" style="">
diff --git a/web/pages/page.protest.php b/web/pages/page.protest.php
index c065cee73..557e2f329 100644
--- a/web/pages/page.protest.php
+++ b/web/pages/page.protest.php
@@ -133,7 +133,7 @@
         $Email       = "";
 
         // Send an email when protest was posted
-        $headers = 'From: ' . $GLOBALS['sb-email'] . "\n" . 'X-Mailer: PHP/' . phpversion();
+        $headers = 'From: ' . SB_EMAIL . "\n" . 'X-Mailer: PHP/' . phpversion();
 
         $emailinfo = $GLOBALS['db']->Execute("SELECT aid, user, email FROM `" . DB_PREFIX . "_admins` WHERE aid = (SELECT aid FROM `" . DB_PREFIX . "_bans` WHERE bid = '" . (int) $BanId . "');");
         $requri    = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], ".php") + 4);
diff --git a/web/pages/page.submit.php b/web/pages/page.submit.php
index 455e1fa08..172ddf4be 100644
--- a/web/pages/page.submit.php
+++ b/web/pages/page.submit.php
@@ -165,7 +165,7 @@
             $SID           = -1;
 
             // Send an email when ban was posted
-            $headers = 'From: ' . $GLOBALS['sb-email'] . "\n" . 'X-Mailer: PHP/' . phpversion();
+            $headers = 'From: ' . SB_EMAIL . "\n" . 'X-Mailer: PHP/' . phpversion();
 
             $admins = $userbank->GetAllAdmins();
             $requri = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], ".php") - 5);

From 99d6ffa86b8a7a451a66b8662b5f85fa51866947 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Sat, 7 Jul 2018 11:15:35 +0200
Subject: [PATCH 03/17] Removed unused constants

---
 web/includes/CUserManager.php |  2 +-
 web/includes/sb-callback.php  |  4 ++--
 web/init.php                  | 34 ++++------------------------------
 web/install/init.php          | 14 +-------------
 web/pages/admin.blockit.php   |  4 +---
 web/pages/footer.php          |  2 +-
 6 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/web/includes/CUserManager.php b/web/includes/CUserManager.php
index 7d30689ec..7bab81978 100644
--- a/web/includes/CUserManager.php
+++ b/web/includes/CUserManager.php
@@ -242,7 +242,7 @@ public function login($aid, $password, $save = true)
      * @param $password password to encrypt.
      * @return string.
      */
-    public function encrypt_password($password, $salt = SB_SALT)
+    public function encrypt_password($password, $salt = 'SourceBans')
     {
         return sha1(sha1($salt . $password));
     }
diff --git a/web/includes/sb-callback.php b/web/includes/sb-callback.php
index 6b52a7c3c..557a5c378 100644
--- a/web/includes/sb-callback.php
+++ b/web/includes/sb-callback.php
@@ -30,7 +30,7 @@
 include_once('system-functions.php');
 $xajax = new xajax();
 //$xajax->debugOn();
-$xajax->setRequestURI(XAJAX_REQUEST_URI);
+$xajax->setRequestURI('./index.php');
 global $userbank;
 
 if (\SessionManager::checkSession()) {
@@ -155,7 +155,7 @@ function LostPassword($email)
 
     $message .= "http://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . "?p=lostpassword&email=". $email . "&validation=" . $validation;
 
-    $headers = 'From: ' . $GLOBALS['sb-email'] . "\n" .
+    $headers = 'From: ' . SB_EMAIL . "\n" .
     'X-Mailer: PHP/' . phpversion();
     $m = mail($email, "SourceBans Password Reset", $message, $headers);
 
diff --git a/web/init.php b/web/init.php
index c33c89e37..f75af3102 100644
--- a/web/init.php
+++ b/web/init.php
@@ -52,7 +52,6 @@
 define('SB_THEMES_COMPILE', ROOT . 'themes_c/');
 
 define('IN_SB', true);
-define('XAJAX_REQUEST_URI', './index.php');
 
 require_once(INCLUDES_PATH.'/SessionManager.php');
 include_once(INCLUDES_PATH . "/CUserManager.php");
@@ -105,24 +104,10 @@
 // ---------------------------------------------------
 //  Initial setup
 // ---------------------------------------------------
-define('SB_GIT', true);
-if (!defined('SB_VERSION')) {
-    if (file_exists('version.json')) {
-        $json = json_decode(file_get_contents('version.json'), true);
-        define('SB_VERSION', $json['version']);
-        define('SB_GITREV', $json['git']);
-        define('SB_DEV', $json['dev']);
-    } else {
-        define('SB_VERSION', 'N/A');
-        define('SB_GITREV', '0');
-        define('SB_DEV', false);
-    }
-}
-define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2);
-define('COOKIE_PATH', '/');
-define('COOKIE_DOMAIN', '');
-define('COOKIE_SECURE', false);
-define('SB_SALT', 'SourceBans');
+$version = @json_decode(file_get_contents('version.json'), true);
+define('SB_VERSION', isset($version['version']) ? $version['version'] : 'N/A');
+define('SB_GITREV', isset($version['git']) ? $version['git'] : 0);
+define('SB_DEV', isset($version['dev']) ? $version['dev'] : false);
 
 // ---------------------------------------------------
 //  Setup PHP
@@ -210,12 +195,7 @@ function sbError($errno, $errstr, $errfile, $errline)
 // ---------------------------------------------------
 //  Some defs
 // ---------------------------------------------------
-define('EMAIL_FORMAT', "/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/");
-define('URL_FORMAT', "/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i");
-define('STEAM_FORMAT', "/^STEAM_[0-9]:[0-9]:[0-9]+$/");
 define('STATUS_PARSE', '/#.* +([0-9]+) +"(.+)" +(STEAM_[0-9]:[0-9]:[0-9]+|\[U:[0-9]:[0-9]+\]) +([0-9:]+) +([0-9]+) +([0-9]+) +([a-zA-Z]+).* +([0-9.:]+)/');
-define('IP_FORMAT', '/\b(?:(?: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]?)\b/');
-define('SERVER_QUERY', 'http://www.sourcebans.net/public/query/');
 
 // Web admin-flags
 define('ADMIN_LIST_ADMINS', (1<<0));
@@ -291,12 +271,6 @@ function sbError($errno, $errstr, $errfile, $errline)
 define('ALL_SERVER', SM_RESERVED_SLOT.SM_GENERIC.SM_KICK.SM_BAN.SM_UNBAN.SM_SLAY.SM_MAP.SM_CVAR.SM_CONFIG.SM_VOTE.SM_PASSWORD.SM_RCON.
                      SM_CHEATS.SM_CUSTOM1.SM_CUSTOM2.SM_CUSTOM3. SM_CUSTOM4.SM_CUSTOM5.SM_CUSTOM6.SM_ROOT);
 
-$res = $GLOBALS['db']->Execute("SELECT * FROM ".DB_PREFIX."_settings GROUP BY `setting`, `value`");
-$GLOBALS['config'] = array();
-while (!$res->EOF) {
-    $setting = array($res->fields['setting'] => $res->fields['value']);
-    $GLOBALS['config'] = array_merge_recursive($GLOBALS['config'], $setting);
-    $res->MoveNext();
 }
 
 define("DEVELOPER_MODE", Config::getBool('config.debug'));
diff --git a/web/install/init.php b/web/install/init.php
index ffc2014e5..a4a2aef02 100644
--- a/web/install/init.php
+++ b/web/install/init.php
@@ -60,11 +60,7 @@
 if (!defined('SB_VERSION')) {
     define('SB_VERSION', '1.6.3-Installer');
 }
-define('LOGIN_COOKIE_LIFETIME', (60*60*24*7)*2);
-define('COOKIE_PATH', '/');
-define('COOKIE_DOMAIN', '');
-define('COOKIE_SECURE', false);
-define('SB_SALT', 'SourceBans');
+
 // ---------------------------------------------------
 //  Setup PHP
 // ---------------------------------------------------
@@ -84,11 +80,3 @@
     $handle = fopen("../config.php", "w");
     fclose($handle);
 }
-
-// ---------------------------------------------------
-//  Some defs
-// ---------------------------------------------------
-define('EMAIL_FORMAT', "/^([a-zA-Z0-9])+([a-zA-Z0-9\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/");
-define('URL_FORMAT', "/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i");
-define('STEAM_FORMAT', "/^STEAM_[0-9]:[0-9]:[0-9]+$/");
-define('STATUS_PARSE', '/#[ ]*([0-9]+) "(.+)" (STEAM_0:[0-1]:[0-9]+)[ ]{1,2}([0-9]+[:[0-9]+) ([0-9]+)[ ]([0-9]+) ([a-zA-Z]+) ([0-9.:]+)/');
diff --git a/web/pages/admin.blockit.php b/web/pages/admin.blockit.php
index 9022f4966..4eebb62e2 100644
--- a/web/pages/admin.blockit.php
+++ b/web/pages/admin.blockit.php
@@ -110,9 +110,7 @@ function BlockPlayer($check, $sid, $num, $type, $length)
 
         //search for the steamid on the server
         foreach ($matches[3] as $match) {
-            if (!preg_match(STEAM_FORMAT, $match)) {
-                $match = \SteamID\SteamID::toSteam2($match);
-            }
+            $match = \SteamID\SteamID::toSteam2($match);
             if (substr($match, 8) == substr($check, 8)) {
                 // gotcha!!! kick him!
                 $gothim = true;
diff --git a/web/pages/footer.php b/web/pages/footer.php
index 7a009ccf4..1bfee47c5 100644
--- a/web/pages/footer.php
+++ b/web/pages/footer.php
@@ -45,7 +45,7 @@
 if (isset($_GET['p']) && $_GET['p'] != "login") {
     $_SESSION['q'] = $_SERVER['QUERY_STRING'];
 }
-if (defined('DEVELOPER_MODE')) {
+if (DEVELOPER_MODE) {
     global $start;
     $time      = microtime();
     $time      = explode(" ", $time);

From c6e618474c5b5be502dfefd6ace0255e5056b45a Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Sat, 7 Jul 2018 11:16:16 +0200
Subject: [PATCH 04/17] Remove $GLOBALS['db_version']

---
 web/init.php               | 4 ----
 web/pages/page.banlist.php | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/web/init.php b/web/init.php
index f75af3102..1b8fcd306 100644
--- a/web/init.php
+++ b/web/init.php
@@ -145,10 +145,6 @@
 
 $GLOBALS['db']->Execute("SET NAMES ".DB_CHARSET.";");
 
-$mysql_server_info = $GLOBALS['db']->ServerInfo();
-$GLOBALS['db_version'] = $mysql_server_info['version'];
-
-
 require_once(INCLUDES_PATH.'/SteamID/bootstrap.php');
 \SteamID\SteamID::init($GLOBALS['PDO']);
 
diff --git a/web/pages/page.banlist.php b/web/pages/page.banlist.php
index 04890d8bf..c982bd75a 100644
--- a/web/pages/page.banlist.php
+++ b/web/pages/page.banlist.php
@@ -54,9 +54,6 @@ function setPostKey()
     $page     = intval($_GET['page']);
     $pagelink = "&page=" . $page;
 }
-if (version_compare($GLOBALS['db_version'], "5.6.0") >= 0 && version_compare($GLOBALS['db_version'], "10.0.0") < 0) {
-    $GLOBALS['db']->Execute("set session optimizer_switch='block_nested_loop=off';");
-}
 if (isset($_GET['a']) && $_GET['a'] == "unban" && isset($_GET['id'])) {
     if ($_GET['key'] != $_SESSION['banlist_postkey']) {
         die("Possible hacking attempt (URL Key mismatch)");

From fc5a87ff013a57eb999079cafa6cda802e318e0b Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Sat, 7 Jul 2018 11:16:54 +0200
Subject: [PATCH 05/17] Improved error handler

---
 web/init.php | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/web/init.php b/web/init.php
index 1b8fcd306..8109d9e3a 100644
--- a/web/init.php
+++ b/web/init.php
@@ -162,31 +162,17 @@ function sbError($errno, $errstr, $errfile, $errline)
 {
     switch ($errno) {
         case E_USER_ERROR:
-            $msg = "[$errno] $errstr<br />\n";
-            $msg .= "Fatal error on line $errline in file $errfile";
-            Log::add("e", "PHP Error", $msg);
-            exit(1);
-            break;
-
+            Log::add('e', 'PHP Error', "[$errno] $errstr\nFatal Error on line $errline in file $errfile");
+            return true;
         case E_USER_WARNING:
-            $msg = "[$errno] $errstr<br />\n";
-            $msg .= "Error on line $errline in file $errfile";
-            Log::add("w", "PHP Warning", $msg);
-            break;
-
+            Log::add('w', 'PHP Warning', "[$errno] $errstr\nError on line $errline in file $errfile");
+            return true;
         case E_USER_NOTICE:
-            $msg = "[$errno] $errstr<br />\n";
-            $msg .= "Notice on line $errline in file $errfile";
-            Log::add("m", "PHP Notice", $msg);
-            break;
-
+            Log::add('m', 'PHP Notice', "[$errno] $errstr\nNotice on line $errline in file $errfile");
+            return true;
         default:
             return false;
-            break;
     }
-
-    /* Don't execute PHP internal error handler */
-    return true;
 }
 // ---------------------------------------------------
 //  Some defs

From 0c5f9cfc974689934c5b8f13f6802ab371ff6683 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Sat, 7 Jul 2018 11:17:53 +0200
Subject: [PATCH 06/17] Allocate all permission flags to permissions.json

---
 web/config.php.template  |  3 --
 web/init.php             | 96 ++--------------------------------------
 web/permissions.json     | 56 +++++++++++++++++++++++
 web/updater/data/600.php |  3 --
 4 files changed, 60 insertions(+), 98 deletions(-)
 create mode 100644 web/permissions.json

diff --git a/web/config.php.template b/web/config.php.template
index feea8220b..bee502ea0 100644
--- a/web/config.php.template
+++ b/web/config.php.template
@@ -41,6 +41,3 @@ define('STEAMAPIKEY', ''); // Steam API Key for Shizz
 define('SB_WP_URL', ''); //URL of SourceBans Site
 define('SB_EMAIL', '');
 define('SB_NEW_SALT', '$5$'); //Salt for passwords
-
-//define('DEVELOPER_MODE', true);			// Use if you want to show debugmessages
-//define('SB_MEM', '128M'); 				// Override php memory limit, if isn't enough
diff --git a/web/init.php b/web/init.php
index 8109d9e3a..9726ccfc1 100644
--- a/web/init.php
+++ b/web/init.php
@@ -58,24 +58,7 @@
 
 \SessionManager::sessionStart('SourceBans');
 
-// ---------------------------------------------------
-//  Fix some $_SERVER vars
-// ---------------------------------------------------
-// Fix for IIS, which doesn't set REQUEST_URI
-if (!isset($_SERVER['REQUEST_URI']) || trim($_SERVER['REQUEST_URI']) == '') {
-    $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
-    if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
-        $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
-    }
-}
-// Fix for Dreamhost and other PHP as CGI hosts
-if (strstr($_SERVER['SCRIPT_NAME'], 'php.cgi')) {
-    unset($_SERVER['PATH_INFO']);
-}
-
-if (trim($_SERVER['PHP_SELF']) == '') {
-    $_SERVER['PHP_SELF'] = preg_replace("/(\?.*)?$/", '', $_SERVER["REQUEST_URI"]);
-}
+require_once(INCLUDES_PATH.'/SourceQuery/bootstrap.php');
 
 // ---------------------------------------------------
 //  Are we installed?
@@ -179,80 +162,9 @@ function sbError($errno, $errstr, $errfile, $errline)
 // ---------------------------------------------------
 define('STATUS_PARSE', '/#.* +([0-9]+) +"(.+)" +(STEAM_[0-9]:[0-9]:[0-9]+|\[U:[0-9]:[0-9]+\]) +([0-9:]+) +([0-9]+) +([0-9]+) +([a-zA-Z]+).* +([0-9.:]+)/');
 
-// Web admin-flags
-define('ADMIN_LIST_ADMINS', (1<<0));
-define('ADMIN_ADD_ADMINS', (1<<1));
-define('ADMIN_EDIT_ADMINS', (1<<2));
-define('ADMIN_DELETE_ADMINS', (1<<3));
-
-define('ADMIN_LIST_SERVERS', (1<<4));
-define('ADMIN_ADD_SERVER', (1<<5));
-define('ADMIN_EDIT_SERVERS', (1<<6));
-define('ADMIN_DELETE_SERVERS', (1<<7));
-
-define('ADMIN_ADD_BAN', (1<<8));
-define('ADMIN_EDIT_OWN_BANS', (1<<10));
-define('ADMIN_EDIT_GROUP_BANS', (1<<11));
-define('ADMIN_EDIT_ALL_BANS', (1<<12));
-define('ADMIN_BAN_PROTESTS', (1<<13));
-define('ADMIN_BAN_SUBMISSIONS', (1<<14));
-define('ADMIN_DELETE_BAN', (1<<25));
-define('ADMIN_UNBAN', (1<<26));
-define('ADMIN_BAN_IMPORT', (1<<27));
-define('ADMIN_UNBAN_OWN_BANS', (1<<30));
-define('ADMIN_UNBAN_GROUP_BANS', (1<<31));
-
-define('ADMIN_LIST_GROUPS', (1<<15));
-define('ADMIN_ADD_GROUP', (1<<16));
-define('ADMIN_EDIT_GROUPS', (1<<17));
-define('ADMIN_DELETE_GROUPS', (1<<18));
-
-define('ADMIN_WEB_SETTINGS', (1<<19));
-
-define('ADMIN_LIST_MODS', (1<<20));
-define('ADMIN_ADD_MODS', (1<<21));
-define('ADMIN_EDIT_MODS', (1<<22));
-define('ADMIN_DELETE_MODS', (1<<23));
-
-define('ADMIN_NOTIFY_SUB', (1<<28));
-define('ADMIN_NOTIFY_PROTEST', (1<<29));
-
-define('ADMIN_OWNER', (1<<24));
-
-// Server admin-flags
-define('SM_RESERVED_SLOT', "a");
-define('SM_GENERIC', "b");
-define('SM_KICK', "c");
-define('SM_BAN', "d");
-define('SM_UNBAN', "e");
-define('SM_SLAY', "f");
-define('SM_MAP', "g");
-define('SM_CVAR', "h");
-define('SM_CONFIG', "i");
-define('SM_CHAT', "j");
-define('SM_VOTE', "k");
-define('SM_PASSWORD', "l");
-define('SM_RCON', "m");
-define('SM_CHEATS', "n");
-define('SM_ROOT', "z");
-
-define('SM_CUSTOM1', "o");
-define('SM_CUSTOM2', "p");
-define('SM_CUSTOM3', "q");
-define('SM_CUSTOM4', "r");
-define('SM_CUSTOM5', "s");
-define('SM_CUSTOM6', "t");
-
-
-define('ALL_WEB', ADMIN_LIST_ADMINS|ADMIN_ADD_ADMINS|ADMIN_EDIT_ADMINS|ADMIN_DELETE_ADMINS|ADMIN_LIST_SERVERS|ADMIN_ADD_SERVER|
-                  ADMIN_EDIT_SERVERS|ADMIN_DELETE_SERVERS|ADMIN_ADD_BAN|ADMIN_EDIT_OWN_BANS|ADMIN_EDIT_GROUP_BANS|
-                  ADMIN_EDIT_ALL_BANS|ADMIN_BAN_PROTESTS|ADMIN_BAN_SUBMISSIONS|ADMIN_LIST_GROUPS|ADMIN_ADD_GROUP|ADMIN_EDIT_GROUPS|
-                  ADMIN_DELETE_GROUPS|ADMIN_WEB_SETTINGS|ADMIN_LIST_MODS|ADMIN_ADD_MODS|ADMIN_EDIT_MODS|ADMIN_DELETE_MODS|ADMIN_OWNER|
-                  ADMIN_DELETE_BAN|ADMIN_UNBAN|ADMIN_BAN_IMPORT|ADMIN_UNBAN_OWN_BANS|ADMIN_UNBAN_GROUP_BANS|ADMIN_NOTIFY_SUB|ADMIN_NOTIFY_PROTEST);
-
-define('ALL_SERVER', SM_RESERVED_SLOT.SM_GENERIC.SM_KICK.SM_BAN.SM_UNBAN.SM_SLAY.SM_MAP.SM_CVAR.SM_CONFIG.SM_VOTE.SM_PASSWORD.SM_RCON.
-                     SM_CHEATS.SM_CUSTOM1.SM_CUSTOM2.SM_CUSTOM3. SM_CUSTOM4.SM_CUSTOM5.SM_CUSTOM6.SM_ROOT);
-
+$flags = json_decode(file_get_contents('permissions.json'), true);
+foreach ($flags as $flag => $value) {
+    define($flag, $value);
 }
 
 define("DEVELOPER_MODE", Config::getBool('config.debug'));
diff --git a/web/permissions.json b/web/permissions.json
new file mode 100644
index 000000000..7448a75c2
--- /dev/null
+++ b/web/permissions.json
@@ -0,0 +1,56 @@
+{
+    "ADMIN_LIST_ADMINS": 1,
+    "ADMIN_ADD_ADMINS": 2,
+    "ADMIN_EDIT_ADMINS": 4,
+    "ADMIN_DELETE_ADMINS": 8,
+    "ADMIN_LIST_SERVERS": 16,
+    "ADMIN_ADD_SERVER": 32,
+    "ADMIN_EDIT_SERVERS": 64,
+    "ADMIN_DELETE_SERVERS": 128,
+    "ADMIN_ADD_BAN": 256,
+    "ADMIN_EDIT_OWN_BANS": 1024,
+    "ADMIN_EDIT_GROUP_BANS": 2048,
+    "ADMIN_EDIT_ALL_BANS": 4096,
+    "ADMIN_BAN_PROTESTS": 8192,
+    "ADMIN_BAN_SUBMISSIONS": 16384,
+    "ADMIN_DELETE_BAN": 33554432,
+    "ADMIN_UNBAN": 67108864,
+    "ADMIN_BAN_IMPORT": 134217728,
+    "ADMIN_UNBAN_OWN_BANS": 1073741824,
+    "ADMIN_UNBAN_GROUP_BANS": 2147483648,
+    "ADMIN_LIST_GROUPS": 32768,
+    "ADMIN_ADD_GROUP": 65536,
+    "ADMIN_EDIT_GROUPS": 131072,
+    "ADMIN_DELETE_GROUPS": 262144,
+    "ADMIN_WEB_SETTINGS": 524288,
+    "ADMIN_LIST_MODS": 1048576,
+    "ADMIN_ADD_MODS": 2097152,
+    "ADMIN_EDIT_MODS": 4194304,
+    "ADMIN_DELETE_MODS": 8388608,
+    "ADMIN_NOTIFY_SUB": 268435456,
+    "ADMIN_NOTIFY_PROTEST": 536870912,
+    "ADMIN_OWNER": 16777216,
+    "ALL_WEB": 4294966783,
+
+    "SM_RESERVED_SLOT": "a",
+    "SM_GENERIC": "b",
+    "SM_KICK": "c",
+    "SM_BAN": "d",
+    "SM_UNBAN": "e",
+    "SM_SLAY": "f",
+    "SM_MAP": "g",
+    "SM_CVAR": "h",
+    "SM_CONFIG": "i",
+    "SM_CHAT": "j",
+    "SM_VOTE": "k",
+    "SM_PASSWORD": "l",
+    "SM_RCON": "m",
+    "SM_CHEATS": "n",
+    "SM_ROOT": "z",
+    "SM_CUSTOM1": "o",
+    "SM_CUSTOM2": "p",
+    "SM_CUSTOM3": "q",
+    "SM_CUSTOM4": "r",
+    "SM_CUSTOM5": "s",
+    "SM_CUSTOM6": "t"
+}
diff --git a/web/updater/data/600.php b/web/updater/data/600.php
index 545b2a0f8..a7ab874b2 100644
--- a/web/updater/data/600.php
+++ b/web/updater/data/600.php
@@ -46,9 +46,6 @@
 define('STEAMAPIKEY', '{steamapikey}');                // Steam API Key for Shizz
 define('SB_WP_URL', '{sbwpurl}');                       //URL of SourceBans Site
 define('SB_EMAIL', '{sbwpemail}');
-
-//define('DEVELOPER_MODE', true);            // Use if you want to show debugmessages
-//define('SB_MEM', '128M');                 // Override php memory limit, if isn't enough (Banlist is just a blank page)
 ?>";
 
 if (!defined('SB_EMAIL')) {

From 4f76b2afee0e1e45241f2fb984cdc427aa8764a6 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:06:52 +0200
Subject: [PATCH 07/17] Relocate version.json

---
 web/{ => configs}/version.json | 10 +++++-----
 web/init.php                   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename web/{ => configs}/version.json (92%)

diff --git a/web/version.json b/web/configs/version.json
similarity index 92%
rename from web/version.json
rename to web/configs/version.json
index a4b2d087a..3236b4b7e 100644
--- a/web/version.json
+++ b/web/configs/version.json
@@ -1,5 +1,5 @@
-{
-    "version": "1.7.0",
-    "git": "765",
-    "dev": true
-}
+{
+    "version": "1.7.0",
+    "git": "765",
+    "dev": true
+}
diff --git a/web/init.php b/web/init.php
index 9726ccfc1..f5a761a30 100644
--- a/web/init.php
+++ b/web/init.php
@@ -87,7 +87,7 @@
 // ---------------------------------------------------
 //  Initial setup
 // ---------------------------------------------------
-$version = @json_decode(file_get_contents('version.json'), true);
+$version = @json_decode(file_get_contents('configs/version.json'), true);
 define('SB_VERSION', isset($version['version']) ? $version['version'] : 'N/A');
 define('SB_GITREV', isset($version['git']) ? $version['git'] : 0);
 define('SB_DEV', isset($version['dev']) ? $version['dev'] : false);

From 408bf320ded74bf5e675f79568d4a122e15170a2 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:07:18 +0200
Subject: [PATCH 08/17] Relocate permissions

---
 web/configs/permissions/sourcemod.json | 106 ++++++++++++++++
 web/configs/permissions/web.json       | 161 +++++++++++++++++++++++++
 web/init.php                           |  10 +-
 web/permissions.json                   |  56 ---------
 4 files changed, 274 insertions(+), 59 deletions(-)
 create mode 100644 web/configs/permissions/sourcemod.json
 create mode 100644 web/configs/permissions/web.json
 delete mode 100644 web/permissions.json

diff --git a/web/configs/permissions/sourcemod.json b/web/configs/permissions/sourcemod.json
new file mode 100644
index 000000000..a62218fa4
--- /dev/null
+++ b/web/configs/permissions/sourcemod.json
@@ -0,0 +1,106 @@
+{
+    "SM_RESERVED_SLOT": {
+        "value": "a",
+        "display": "Reserved Slot"
+    },
+
+    "SM_GENERIC": {
+        "value": "b",
+        "display": "Generic Admin"
+    },
+
+    "SM_KICK": {
+        "value": "c",
+        "display": "Kick"
+    },
+
+    "SM_BAN": {
+        "value": "d",
+        "display": "Ban"
+    },
+
+    "SM_UNBAN": {
+        "value": "e",
+        "display": "Unban"
+    },
+
+    "SM_SLAY": {
+        "value": "f",
+        "display": "Slay"
+    },
+
+    "SM_MAP": {
+        "value": "g",
+        "display": "Map Change"
+    },
+
+    "SM_CVAR": {
+        "value": "h",
+        "display": "Change ConVars"
+    },
+
+    "SM_CONFIG": {
+        "value": "i",
+        "display": "Run Configs"
+    },
+
+    "SM_CHAT": {
+        "value": "j",
+        "display": "Admin Chat"
+    },
+
+    "SM_VOTE": {
+        "value": "k",
+        "display": "Start Votes"
+    },
+
+    "SM_PASSWORD": {
+        "value": "l",
+        "display": "Password Server"
+    },
+
+    "SM_RCON": {
+        "value": "m",
+        "display": "RCON"
+    },
+
+    "SM_CHEATS": {
+        "value": "n",
+        "display": "Enable Cheats"
+    },
+
+    "SM_ROOT": {
+        "value": "z",
+        "display": "Full Admin"
+    },
+
+    "SM_CUSTOM1": {
+        "value": "o",
+        "display": "Custom Flag 1"
+    },
+
+    "SM_CUSTOM2": {
+        "value": "p",
+        "display": "Custom Flag 2"
+    },
+
+    "SM_CUSTOM3": {
+        "value": "q",
+        "display": "Custom Flag 3"
+    },
+
+    "SM_CUSTOM4": {
+        "value": "r",
+        "display": "Custom flag 4"
+    },
+
+    "SM_CUSTOM5": {
+        "value": "s",
+        "display": "Custom Flag 5"
+    },
+
+    "SM_CUSTOM6": {
+        "value": "t",
+        "display": "Custom Flag 6"
+    }
+}
diff --git a/web/configs/permissions/web.json b/web/configs/permissions/web.json
new file mode 100644
index 000000000..c5f40f422
--- /dev/null
+++ b/web/configs/permissions/web.json
@@ -0,0 +1,161 @@
+{
+    "ADMIN_LIST_ADMINS": {
+        "value": 1,
+        "display": "View Admins"
+    },
+
+    "ADMIN_ADD_ADMINS": {
+        "value": 2,
+        "display": "Add Admins"
+    },
+
+    "ADMIN_EDIT_ADMINS": {
+        "value": 4,
+        "display": "Edit Admins"
+    },
+
+    "ADMIN_DELETE_ADMINS": {
+        "value": 8,
+        "display": "Delete Admins"
+    },
+
+    "ADMIN_LIST_SERVERS": {
+        "value": 16,
+        "display": "View Servers"
+    },
+
+    "ADMIN_ADD_SERVER": {
+        "value": 32,
+        "display": "Add Servers"
+    },
+
+    "ADMIN_EDIT_SERVERS": {
+        "value": 64,
+        "display": "Edit Servers"
+    },
+
+    "ADMIN_DELETE_SERVERS": {
+        "value": 128,
+        "display": "Delete Servers"
+    },
+
+    "ADMIN_ADD_BAN": {
+        "value": 256,
+        "display": "Add Bans"
+    },
+
+    "ADMIN_EDIT_OWN_BANS": {
+        "value": 1024,
+        "display": "Edit Own Bans"
+    },
+
+    "ADMIN_EDIT_GROUP_BANS": {
+        "value": 2048,
+        "display": "Edit Group Bans"
+    },
+
+    "ADMIN_EDIT_ALL_BANS": {
+        "value": 4096,
+        "display": "Edit All Bans"
+    },
+
+    "ADMIN_BAN_PROTESTS": {
+        "value": 8192,
+        "display": "Ban Appeals"
+    },
+
+    "ADMIN_BAN_SUBMISSIONS": {
+        "value": 16384,
+        "display": "Ban Reports"
+    },
+
+    "ADMIN_DELETE_BAN": {
+        "value": 33554432,
+        "display": "Delete All Bans"
+    },
+
+    "ADMIN_UNBAN": {
+        "value": 67108864,
+        "display": "Unban All Bans"
+    },
+
+    "ADMIN_BAN_IMPORT": {
+        "value": 134217728,
+        "display": "Import Bans"
+    },
+
+    "ADMIN_UNBAN_OWN_BANS": {
+        "value": 1073741824,
+        "display": "Unban Own Bans"
+    },
+
+    "ADMIN_UNBAN_GROUP_BANS": {
+        "value": 2147483648,
+        "display": "Unban Group Bans"
+    },
+
+    "ADMIN_LIST_GROUPS": {
+        "value": 32768,
+        "display": "View Groups"
+    },
+
+    "ADMIN_ADD_GROUP": {
+        "value": 65536,
+        "display": "Add Groups"
+    },
+
+    "ADMIN_EDIT_GROUPS": {
+        "value": 131072,
+        "display": "Edit Groups"
+    },
+
+    "ADMIN_DELETE_GROUPS": {
+        "value": 262144,
+        "display": "Delete Groups"
+    },
+
+    "ADMIN_WEB_SETTINGS": {
+        "value": 524288,
+        "display": "Web Settings"
+    },
+
+    "ADMIN_LIST_MODS": {
+        "value": 1048576,
+        "display": "View Mods"
+    },
+
+    "ADMIN_ADD_MODS": {
+        "value": 2097152,
+        "display": "Add Mods"
+    },
+
+    "ADMIN_EDIT_MODS": {
+        "value": 4194304,
+        "display": "Edit Mods"
+    },
+
+    "ADMIN_DELETE_MODS": {
+        "value": 8388608,
+        "display": "Delete Mods"
+    },
+
+    "ADMIN_NOTIFY_SUB": {
+        "value": 268435456,
+        "display": "Ban Report Email Notifications"
+    },
+
+    "ADMIN_NOTIFY_PROTEST": {
+        "value": 536870912,
+        "display": "Ban Appeal Email Notifications"
+    },
+
+    "ADMIN_OWNER": {
+        "value": 16777216,
+        "display": "Owner"
+    },
+
+    "ALL_WEB": {
+        "value": 4294966783,
+        "display": "All Web Permissions"
+    }
+}
diff --git a/web/init.php b/web/init.php
index f5a761a30..4c585b7a7 100644
--- a/web/init.php
+++ b/web/init.php
@@ -162,9 +162,13 @@ function sbError($errno, $errstr, $errfile, $errline)
 // ---------------------------------------------------
 define('STATUS_PARSE', '/#.* +([0-9]+) +"(.+)" +(STEAM_[0-9]:[0-9]:[0-9]+|\[U:[0-9]:[0-9]+\]) +([0-9:]+) +([0-9]+) +([0-9]+) +([a-zA-Z]+).* +([0-9.:]+)/');
 
-$flags = json_decode(file_get_contents('permissions.json'), true);
-foreach ($flags as $flag => $value) {
-    define($flag, $value);
+$webflags = json_decode(file_get_contents(ROOT.'/configs/permissions/web.json'), true);
+foreach ($webflags as $flag => $perm) {
+    define($flag, $perm['value']);
+}
+$smflags = json_decode(file_get_contents(ROOT.'/configs/permissions/sourcemod.json'), true);
+foreach ($smflags as $flag => $perm) {
+    define($flag, $perm['value']);
 }
 
 define("DEVELOPER_MODE", Config::getBool('config.debug'));
diff --git a/web/permissions.json b/web/permissions.json
deleted file mode 100644
index 7448a75c2..000000000
--- a/web/permissions.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "ADMIN_LIST_ADMINS": 1,
-    "ADMIN_ADD_ADMINS": 2,
-    "ADMIN_EDIT_ADMINS": 4,
-    "ADMIN_DELETE_ADMINS": 8,
-    "ADMIN_LIST_SERVERS": 16,
-    "ADMIN_ADD_SERVER": 32,
-    "ADMIN_EDIT_SERVERS": 64,
-    "ADMIN_DELETE_SERVERS": 128,
-    "ADMIN_ADD_BAN": 256,
-    "ADMIN_EDIT_OWN_BANS": 1024,
-    "ADMIN_EDIT_GROUP_BANS": 2048,
-    "ADMIN_EDIT_ALL_BANS": 4096,
-    "ADMIN_BAN_PROTESTS": 8192,
-    "ADMIN_BAN_SUBMISSIONS": 16384,
-    "ADMIN_DELETE_BAN": 33554432,
-    "ADMIN_UNBAN": 67108864,
-    "ADMIN_BAN_IMPORT": 134217728,
-    "ADMIN_UNBAN_OWN_BANS": 1073741824,
-    "ADMIN_UNBAN_GROUP_BANS": 2147483648,
-    "ADMIN_LIST_GROUPS": 32768,
-    "ADMIN_ADD_GROUP": 65536,
-    "ADMIN_EDIT_GROUPS": 131072,
-    "ADMIN_DELETE_GROUPS": 262144,
-    "ADMIN_WEB_SETTINGS": 524288,
-    "ADMIN_LIST_MODS": 1048576,
-    "ADMIN_ADD_MODS": 2097152,
-    "ADMIN_EDIT_MODS": 4194304,
-    "ADMIN_DELETE_MODS": 8388608,
-    "ADMIN_NOTIFY_SUB": 268435456,
-    "ADMIN_NOTIFY_PROTEST": 536870912,
-    "ADMIN_OWNER": 16777216,
-    "ALL_WEB": 4294966783,
-
-    "SM_RESERVED_SLOT": "a",
-    "SM_GENERIC": "b",
-    "SM_KICK": "c",
-    "SM_BAN": "d",
-    "SM_UNBAN": "e",
-    "SM_SLAY": "f",
-    "SM_MAP": "g",
-    "SM_CVAR": "h",
-    "SM_CONFIG": "i",
-    "SM_CHAT": "j",
-    "SM_VOTE": "k",
-    "SM_PASSWORD": "l",
-    "SM_RCON": "m",
-    "SM_CHEATS": "n",
-    "SM_ROOT": "z",
-    "SM_CUSTOM1": "o",
-    "SM_CUSTOM2": "p",
-    "SM_CUSTOM3": "q",
-    "SM_CUSTOM4": "r",
-    "SM_CUSTOM5": "s",
-    "SM_CUSTOM6": "t"
-}

From 5162c993c92273cd1a44474dd9121da6e6a99add Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:10:22 +0200
Subject: [PATCH 09/17] Load quotes from file

---
 web/configs/quotes.json           | 134 ++++++++++++++++++++++++++++++
 web/includes/system-functions.php |  41 +--------
 2 files changed, 137 insertions(+), 38 deletions(-)
 create mode 100644 web/configs/quotes.json

diff --git a/web/configs/quotes.json b/web/configs/quotes.json
new file mode 100644
index 000000000..c5aaff798
--- /dev/null
+++ b/web/configs/quotes.json
@@ -0,0 +1,134 @@
+[
+    {
+        "author": "Viper",
+        "quote": "Buy a new PC!"
+    },
+    {
+        "author": "Brizad",
+        "quote": "I'm not lazy! I just utilize technical resources!"
+    },
+    {
+        "author": "sslice",
+        "quote": "I need to mow the lawn"
+    },
+    {
+        "author": "Viper",
+        "quote": "You're a Noob and You Know It!"
+    },
+    {
+        "author": "Viper",
+        "quote": "Like A Glove!"
+    },
+    {
+        "author": "Viper",
+        "quote": "Get your ass ingame."
+    },
+    {
+        "author": "Viper",
+        "quote": "Mother F***ing Peices of Sh**"
+    },
+    {
+        "author": "[Everyone]",
+        "quote": "Shut up Bam"
+    },
+    {
+        "author": "Viper",
+        "quote": "Hi OllyBunch"
+    },
+    {
+        "author": "[Unknown]",
+        "quote": "Procrastination is like masturbation. Sure it feels good, but in the end you're only F***ing yourself!"
+    },
+    {
+        "author": "SteamFriend",
+        "quote": "Rave's momma so fat she sat on the beach and Greenpeace threw her in"
+    },
+    {
+        "author": "Faith",
+        "quote": "Im just getting a beer"
+    },
+    {
+        "author": "Viper",
+        "quote": "To be honest..., I DON'T CARE!"
+    },
+    {
+        "author": "teame06",
+        "quote": "Yams"
+    },
+    {
+        "author": "gdogg",
+        "quote": "built in cheat 1.6 - my friend told me theres a cheat where u can buy a car door and run around and it makes u invincible...."
+    },
+    {
+        "author": "BAILOPAN",
+        "quote": "I just join conversation when i see a chance to tell people they might be wrong, then i quickly leave, LIKE A BAT"
+    },
+    {
+        "author": "[Everyone]",
+        "quote": "Let's just blame it on FlyingMongoose"
+    },
+    {
+        "author": "Recon",
+        "quote": "Don't step on that boom... mine..."
+    },
+    {
+        "author": "Recon",
+        "quote": "Looks through sniper scope... Sit ;)"
+    },
+    {
+        "author": "Recon",
+        "quote": "That plugin looks like something you found in a junk yard."
+    },
+    {
+        "author": "Recon",
+        "quote": "That's exactly what I asked you not to do."
+    },
+    {
+        "author": "Recon",
+        "quote": "Why are you wasting your time looking at this?"
+    },
+    {
+        "author": "Recon",
+        "quote": "You must have better things to do with your time"
+    },
+    {
+        "author": "Mr. T",
+        "quote": "I pity da fool"
+    },
+    {
+        "author": "Tsunami",
+        "quote": "you grew a 3rd head?"
+    },
+    {
+        "author": "devicenull",
+        "quote": "I dont think you want to know..."
+    },
+    {
+        "author": "Brizad",
+        "quote": "Sheep sex isn't baaaaaa...aad"
+    },
+    {
+        "author": "Brizad",
+        "quote": "Oh wow, he's got skillz spelled with an 's'"
+    },
+    {
+        "author": "Brizad",
+        "quote": "I'll get to it this weekend... I promise"
+    },
+    {
+        "author": "Marge Simpson",
+        "quote": "People do crazy things all the time... Like eat a Arby's"
+    },
+    {
+        "author": "SirTiger",
+        "quote": "I wish my lawn was emo, so it would cut itself"
+    },
+    {
+        "author": "Olly",
+        "quote": "Oh no! I've overflowed my balls!"
+    },
+    {
+        "author": "ISSUE_TEMPLATE.md",
+        "quote": "Pump me full of your precious information, Senpai!"
+    }
+]
diff --git a/web/includes/system-functions.php b/web/includes/system-functions.php
index 5769ec35b..47d5c4d96 100644
--- a/web/includes/system-functions.php
+++ b/web/includes/system-functions.php
@@ -493,44 +493,9 @@ function trunc($text, $len, $byword=true)
 
 function CreateQuote()
 {
-    global $userbank;
-    $quote = array(
-        array("Buy a new PC!", "Viper"),
-        array("I'm not lazy! I just utilize technical resources!", "Brizad"),
-        array("I need to mow the lawn", "sslice"),
-        array("Like A Glove!", "Viper"),
-        array("Your a Noob and You Know It!", "Viper"),
-        array("Get your ass ingame", "Viper"),
-        array("Mother F***ing Peices of Sh**", "Viper"),
-        array("Shut up Bam", "[Everyone]"),
-        array("Hi OllyBunch", "Viper"),
-        array("Procrastination is like masturbation. Sure it feels good, but in the end you're only F***ing yourself!", "[Unknown]"),
-        array("Rave's momma so fat she sat on the beach and Greenpeace threw her in", "SteamFriend"),
-        array("Im just getting a beer", "Faith"),
-        array("To be honest " . ($userbank->is_logged_in()?$userbank->getProperty('user'):'...') . ", I DONT CARE!", "Viper"),
-        array("Yams", "teame06"),
-        array("built in cheat 1.6 - my friend told me theres a cheat where u can buy a car door and run around and it makes u invincible....", "gdogg"),
-        array("i just join conversation when i see a chance to tell people they might be wrong, then i quickly leave, LIKE A BAT", "BAILOPAN"),
-        array("Lets just blame it on FlyingMongoose", "[Everyone]"),
-        array("Don't step on that boom... mine...", "Recon"),
-        array("Looks through sniper scope... Sit ;)", "Recon"),
-        array("That plugin looks like something you found in a junk yard.", "Recon"),
-        array("That's exactly what I asked you not to do.", "Recon"),
-        array("Why are you wasting your time looking at this?", "Recon"),
-        array("You must have better things to do with your time", "Recon"),
-        array("I pity da fool", "Mr. T"),
-        array("you grew a 3rd head?", "Tsunami"),
-        array("I dont think you want to know...", "devicenull"),
-        array("Sheep sex isn't baaaaaa...aad", "Brizad"),
-        array("Oh wow, he's got skillz spelled with an 's'", "Brizad"),
-        array("I'll get to it this weekend... I promise", "Brizad"),
-        array("People do crazy things all the time... Like eat a Arby's", "Marge Simpson"),
-        array("I wish my lawn was emo, so it would cut itself", "SirTiger"),
-        array("Oh no! I've overflowed my balls!", "Olly"),
-        array("Pump me full of your precious information, Senpai!", "ISSUE_TEMPLATE.md")
-    );
-    $num = rand(0, sizeof($quote)-1);
-    return '"' . $quote[$num][0] . '" - <i>' . $quote[$num][1] . '</i>';
+    $quotes = json_decode(file_get_contents('configs/quotes.json'), true);
+    $num = rand(0, count($quotes) - 1);
+    return '"'.$quotes[$num]['quote'].'" - <i>'.$quotes[$num]['author'].'</i>';
 }
 
 function CheckAdminAccess($mask)

From 48c78903fdfc7c7cacd9af1597fd4788f9998c0e Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:12:21 +0200
Subject: [PATCH 10/17] Rework BitToString() and SmFlagsToSb() functions

---
 web/includes/system-functions.php             | 223 ++----------------
 web/themes/default/page_admin_admins_list.tpl |  26 +-
 web/themes/default/page_admin_groups_list.tpl |  76 +++---
 web/themes/default/page_youraccount.tpl       |  52 ++--
 4 files changed, 126 insertions(+), 251 deletions(-)

diff --git a/web/includes/system-functions.php b/web/includes/system-functions.php
index 47d5c4d96..1d28542cb 100644
--- a/web/includes/system-functions.php
+++ b/web/includes/system-functions.php
@@ -244,226 +244,41 @@ function RewritePageTitle($title)
     $GLOBALS['TitleRewrite'] = $title;
 }
 
-/**
- * Build sub-menu
- *
- * @param array $el The array of elements for the menu
- * @return noreturn
- */
-function SubMenu($el)
+function BitToString($mask)
 {
-    $output = "";
-    $first = true;
-    foreach ($el as $e) {
-        preg_match('/.*?&c=(.*)/', html_entity_decode($e['url']), $matches);
-        if (!empty($matches[1])) {
-            $c = $matches[1];
-        }
+    $perms = json_decode(file_get_contents(ROOT.'/configs/permissions/web.json'), true);
 
-        $output .= "<a class=\"nav_link".($first?" first":"").(isset($_GET['c'])&&$_GET['c']==$c?" active":"")."\" href=\"" . $e['url'] . "\">" . $e['title']. "</a>";
-        $first = false;
-    }
-    $GLOBALS['NavRewrite'] = $output;
-}
-
-/**
- * Converts a flag bitmask into a string
- *
- * @param integer $mask The mask to convert
- * @return string
- */
-function BitToString($mask, $masktype=0, $head=true)
-{
-    $string = "";
-    if ($head) {
-        $string .= "<span style='font-size:10px;color:#1b75d1;'>Web Permissions</span><br>";
-    }
     if ($mask == 0) {
-        $string .= "<i>None</i>";
-        return $string;
-    }
-    if (($mask & ADMIN_LIST_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; View Admins<br />";
-    }
-    if (($mask & ADMIN_ADD_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add Admins<br />";
-    }
-    if (($mask & ADMIN_EDIT_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit Admins<br />";
-    }
-    if (($mask & ADMIN_DELETE_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete Admins<br />";
-    }
-
-    if (($mask & ADMIN_LIST_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; View Servers<br />";
-    }
-    if (($mask & ADMIN_ADD_SERVER) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add Servers<br />";
-    }
-    if (($mask & ADMIN_EDIT_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit Servers<br />";
-    }
-    if (($mask & ADMIN_DELETE_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete Servers<br />";
-    }
-
-    if (($mask & ADMIN_ADD_BAN) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add Bans<br />";
-    }
-    if (($mask & ADMIN_EDIT_OWN_BANS) !=0 && ($mask & ADMIN_EDIT_ALL_BANS) ==0) {
-        $string .="&bull; Edit Own Bans<br />";
-    }
-    if (($mask & ADMIN_EDIT_GROUP_BANS) !=0 && ($mask & ADMIN_EDIT_ALL_BANS) ==0) {
-        $string .= "&bull; Edit Group Bans<br />";
-    }
-    if (($mask & ADMIN_EDIT_ALL_BANS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit All Bans<br />";
-    }
-    if (($mask & ADMIN_BAN_PROTESTS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Ban Appeals<br />";
-    }
-    if (($mask & ADMIN_BAN_SUBMISSIONS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Ban Reports<br />";
-    }
-
-    if (($mask & ADMIN_UNBAN_OWN_BANS) !=0 && ($mask & ADMIN_UNBAN) ==0) {
-        $string .= "&bull; Unban Own Bans<br />";
-    }
-    if (($mask & ADMIN_UNBAN_GROUP_BANS) !=0 && ($mask & ADMIN_UNBAN) ==0) {
-        $string .= "&bull; Unban Group Bans<br />";
-    }
-    if (($mask & ADMIN_UNBAN) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Unban All Bans<br />";
-    }
-    if (($mask & ADMIN_DELETE_BAN) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete All Bans<br />";
-    }
-    if (($mask & ADMIN_BAN_IMPORT) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Import Bans<br />";
-    }
-
-    if (($mask & ADMIN_LIST_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; View Groups<br />";
-    }
-    if (($mask & ADMIN_ADD_GROUP) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add Groups<br />";
-    }
-    if (($mask & ADMIN_EDIT_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit Groups<br />";
-    }
-    if (($mask & ADMIN_DELETE_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete Groups<br />";
-    }
-
-    if (($mask & ADMIN_NOTIFY_SUB) !=0 || ($mask & ADMIN_NOTIFY_SUB) !=0) {
-        $string .= "&bull; Ban Report Email Notifications<br />";
-    }
-    if (($mask & ADMIN_NOTIFY_PROTEST) !=0 || ($mask & ADMIN_NOTIFY_PROTEST) !=0) {
-        $string .= "&bull; Ban Appeal Email Notifications<br />";
-    }
-
-    if (($mask & ADMIN_WEB_SETTINGS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Web Settings<br />";
-    }
-
-    if (($mask & ADMIN_LIST_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; View Mods<br />";
-    }
-    if (($mask & ADMIN_ADD_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add Mods<br />";
-    }
-    if (($mask & ADMIN_EDIT_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit Mods<br />";
-    }
-    if (($mask & ADMIN_DELETE_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete Mods<br />";
+        return false;
     }
 
-    if (($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Owner<br />";
+    foreach ($perms as $perm) {
+        if (($mask & $perm['value']) != 0 || ($mask & ADMIN_OWNER) != 0) {
+            if ($perm['value'] != ALL_WEB) {
+                $out[] = $perm['display'];
+            }
+        }
     }
 
-    return $string;
+    return $out;
 }
 
 
-function SmFlagsToSb($flagstring, $head=true)
+function SmFlagsToSb($flagstring)
 {
-    $string = "";
-    if ($head) {
-        $string .= "<span style='font-size:10px;color:#1b75d1;'>Server Permissions</span><br>";
-    }
+    $flags = json_decode(file_get_contents(ROOT.'/configs/permissions/sourcemod.json'), true);
+
     if (empty($flagstring)) {
-        $string .= "<i>None</i>";
-        return $string;
-    }
-    if ((strstr($flagstring, "a") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Reserved Slot<br />";
-    }
-    if ((strstr($flagstring, "b") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Generic Admin<br />";
-    }
-    if ((strstr($flagstring, "c") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Kick<br />";
-    }
-    if ((strstr($flagstring, "d") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Ban<br />";
-    }
-    if ((strstr($flagstring, "e") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Unban<br />";
-    }
-    if ((strstr($flagstring, "f") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Slay<br />";
-    }
-    if ((strstr($flagstring, "g") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Map Change<br />";
-    }
-    if ((strstr($flagstring, "h") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Change CVars<br />";
-    }
-    if ((strstr($flagstring, "i") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Run Configs<br />";
-    }
-    if ((strstr($flagstring, "j") || strstr($flagstring, "z"))) {
-        $string .= "&bull; Admin Chat<br />";
-    }
-    if ((strstr($flagstring, "k") || strstr($flagstring, "z"))) {
-        $string .="&bull; Start Votes<br />";
-    }
-    if ((strstr($flagstring, "l") || strstr($flagstring, "z"))) {
-        $string .="&bull; Password Server<br />";
-    }
-    if ((strstr($flagstring, "m") || strstr($flagstring, "z"))) {
-        $string .="&bull; RCON<br />";
-    }
-    if ((strstr($flagstring, "n") || strstr($flagstring, "z"))) {
-        $string .="&bull; Enable Cheats<br />";
-    }
-    if ((strstr($flagstring, "z"))) {
-        $string .="&bull; Full Admin<br />";
+        return false;
     }
 
-    if ((strstr($flagstring, "o") || strstr($flagstring, "z"))) {
-        $string .="&bull; Custom Flag 1<br />";
-    }
-    if ((strstr($flagstring, "p") || strstr($flagstring, "z"))) {
-        $string .="&bull; Custom Flag 2<br />";
-    }
-    if ((strstr($flagstring, "q") || strstr($flagstring, "z"))) {
-        $string .="&bull; Custom Flag 3<br />";
-    }
-    if ((strstr($flagstring, "r") || strstr($flagstring, "z"))) {
-        $string .="&bull; Custom flag 4<br />";
-    }
-    if ((strstr($flagstring, "s") || strstr($flagstring, "z"))) {
-        $string .="&bull; Custom Flag 5<br />";
-    }
-    if ((strstr($flagstring, "t") || strstr($flagstring, "z"))) {
-        $string .="&bull; Custom Flag 6<br />";
+    foreach ($flags as $flag) {
+        if (strstr($flagstring, $flag['value']) || strstr($flagstring, 'z')) {
+            $out[] = $flag['display'];
+        }
     }
 
-    return $string;
+    return $out;
 }
 
 function NextSid()
diff --git a/web/themes/default/page_admin_admins_list.tpl b/web/themes/default/page_admin_admins_list.tpl
index 9e27f9dc3..881476f4a 100644
--- a/web/themes/default/page_admin_admins_list.tpl
+++ b/web/themes/default/page_admin_admins_list.tpl
@@ -7,7 +7,7 @@ Click on an admin to see more detailed information and actions to perform on the
 
 {php} require (TEMPLATES_PATH . "/admin.admins.search.php");{/php}
 
-<div id="banlist-nav"> 
+<div id="banlist-nav">
 {$admin_nav}
 </div>
 <div id="banlist">
@@ -38,8 +38,28 @@ Click on an admin to see more detailed information and actions to perform on the
 				            <td width="30%" valign="top" class="front-module-line"><b>Action</b></td>
 			          	</tr>
 			          	<tr align="left">
-				            <td valign="top">{$admin.server_flag_string}</td>
-				            <td valign="top">{$admin.web_flag_string}</td>
+				            <td valign="top">
+                                <span style='font-size:10px;color:#1b75d1;'>Web Permissions</span>
+                                <br/>
+                                {if $admin.server_flag_string}
+                                    {foreach from=$admin.server_flag_string item=permission}
+                                        &bull; {$permission} <br/>
+                                    {/foreach}
+                                {else}
+                                    <i>None</i>
+                                {/if}
+                            </td>
+				            <td valign="top">
+                                <span style='font-size:10px;color:#1b75d1;'>Server Permissions</span>
+                                <br/>
+                                {if $admin.web_flag_string}
+                                    {foreach from=$admin.web_flag_string item=permission}
+                                        &bull; {$permission} <br/>
+                                    {/foreach}
+                                {else}
+                                    <i>None</i>
+                                {/if}
+                            </td>
 				            <td width="30%" valign="top">
 								<div class="ban-edit">
 						        	<ul>
diff --git a/web/themes/default/page_admin_groups_list.tpl b/web/themes/default/page_admin_groups_list.tpl
index 5b2f8a320..5ebb1b4ad 100644
--- a/web/themes/default/page_admin_groups_list.tpl
+++ b/web/themes/default/page_admin_groups_list.tpl
@@ -3,7 +3,7 @@
 {else}
 	<h3>Groups</h3>
 	Click on a group to view its permissions. <br /><br />
-	
+
 	<!-- Web Admin Groups -->
 	<table width="100%" cellpadding="0" cellspacing="0">
 		<tr>
@@ -25,7 +25,7 @@
 			<tr id="gid_{$group.gid}" class="opener tbl_out" onmouseout="this.className='tbl_out'" onmouseover="this.className='tbl_hover'">
 				<td class="listtable_1" height='16'>{$group.name}</td>
 		      	<td class="listtable_1" height='16'>{$web_admins[$smarty.foreach.web_group.index]}</td>
-				<td class="listtable_1" height='16'> 
+				<td class="listtable_1" height='16'>
 					{if $permission_editgroup}
 			        	<a href="index.php?p=admin&c=groups&o=edit&type=web&id={$group.gid}">Edit</a>
 			        {/if}
@@ -34,18 +34,28 @@
 					{/if}
 				</td>
 			</tr>
-			<tr>	 
-		    	<td colspan="7" align="center">     	
-		      	<div class="opener"> 
+			<tr>
+		    	<td colspan="7" align="center">
+		      	<div class="opener">
 					<table width="80%" cellspacing="0" cellpadding="0" class="listtable">
 		          		<tr>
 		            		<td height="16" align="left" class="listtable_top" colspan="3">
-								<b>Group Details</b>            
+								<b>Group Details</b>
 							</td>
 		          		</tr>
 		          		<tr align="left">
 		            		<td width="20%" height="16" class="listtable_1">Permissions</td>
-		            		<td height="16" class="listtable_1">{$group.permissions}</td>
+		            		<td height="16" class="listtable_1">
+                                <span style='font-size:10px;color:#1b75d1;'>Web Permissions</span>
+                                <br/>
+                                {if $group.permissions}
+                                    {foreach from=$group.permissions item=permission}
+                                        &bull; {$permission} <br/>
+                                    {/foreach}
+                                {else}
+                                    <i>None</i>
+                                {/if}
+                            </td>
 		           		</tr>
 						<tr align="left">
 		            		<td width="20%" height="16" class="listtable_1">Members</td>
@@ -63,14 +73,14 @@
 								</table>
 							</td>
 		           		</tr>
-		        	</table>		
+		        	</table>
 		     	</div>
-		    </td> 	
-		</tr>        
+		    </td>
+		</tr>
 		{/foreach}
 	</table>
 	<br /><br />
-	
+
 	<!-- Server Admin Groups -->
 	<table width="100%" cellpadding="0" cellspacing="0">
 	<tr>
@@ -92,7 +102,7 @@
 		<tr id="gid_{$group.id}" class="opener tbl_out" onmouseout="this.className='tbl_out'" onmouseover="this.setProperty('class', 'tbl_hover')">
 			<td class="listtable_1" height='16'>{$group.name}</td>
 	      	<td class="listtable_1" height='16'>{$server_admins[$smarty.foreach.server_admin_group.index]}</td>
-	        <td class="listtable_1" height='16'> 
+	        <td class="listtable_1" height='16'>
 				{if $permission_editgroup}
 					<a href="index.php?p=admin&c=groups&o=edit&type=srv&id={$group.id}">Edit</a>
 				{/if}
@@ -101,18 +111,28 @@
 				{/if}
 			</td>
 		</tr>
-		<tr>	 
-    		<td colspan="7" align="center">     	
-      			<div class="opener"> 
+		<tr>
+    		<td colspan="7" align="center">
+      			<div class="opener">
 					<table width="80%" cellspacing="0" cellpadding="0" class="listtable">
           				<tr>
             				<td height="16" align="left" class="listtable_top" colspan="3">
-								<b>Group Details</b>            
+								<b>Group Details</b>
 							</td>
 	          			</tr>
 	          			<tr align="left">
 	            			<td width="20%" height="16" class="listtable_1">Permissions</td>
-	            			<td height="16" class="listtable_1">{$group.permissions}</td>
+	            			<td height="16" class="listtable_1">
+                                <span style='font-size:10px;color:#1b75d1;'>Server Permissions</span>
+                                <br/>
+                                {if $group.permissions}
+                                    {foreach from=$group.permissions item=permission}
+                                        &bull; {$permission} <br/>
+                                    {/foreach}
+                                {else}-
+                                    <i>None</i>
+                                {/if}
+                            </td>
 	           			</tr>
 						<tr align="left">
 		            		<td width="20%" height="16" class="listtable_1">Members</td>
@@ -149,10 +169,10 @@
 									</table>
 								</td>
 		           </tr>
-	        	</table>		
+	        	</table>
 	     		</div>
-	     	</td> 	
-	  	</tr>      
+	     	</td>
+	  	</tr>
 	{/foreach}
 	</table>
 	<br /><br />
@@ -179,18 +199,18 @@
 			<tr id="gid_{$group.gid}" class="opener tbl_out" onmouseout="this.className='tbl_out'" onmouseover="this.setProperty('class', 'tbl_hover')">
 	            <td class="listtable_1" height='16'>{$group.name}</td>
 	      		<td class="listtable_1" height='16'>{$server_counts[$smarty.foreach.server_group.index]}</td>
-	            <td class="listtable_1" height='16'>   
+	            <td class="listtable_1" height='16'>
 	            {if $permission_editgroup}
 					<a href="index.php?p=admin&c=groups&o=edit&type=server&id={$group.gid}">Edit</a>
 				{/if}
 				{if $permission_deletegroup}
 					- <a href="#" onclick="RemoveGroup({$group.gid}, '{$group.name}', 'server');">Delete</a>
-				{/if}        
+				{/if}
 	            </td>
 			</tr>
-			<tr>	 
-	    		<td colspan="7" align="center">     	
-	      			<div class="opener"> 
+			<tr>
+	    		<td colspan="7" align="center">
+	      			<div class="opener">
 						<table width="80%" cellspacing="0" cellpadding="0" class="listtable">
 	          				<tr>
 	            				<td height="16" align="left" class="listtable_top" colspan="3"><b>Servers in this group</b></td>
@@ -201,10 +221,10 @@
 	            					Please Wait!
 		            			</td>
 	           				</tr>
-	        			</table>		
+	        			</table>
 	     			</div>
-	     		</td> 	
-	  		</tr> 
+	     		</td>
+	  		</tr>
 		{/foreach}
 	</table>
 {/if}
diff --git a/web/themes/default/page_youraccount.tpl b/web/themes/default/page_youraccount.tpl
index 08df5b00a..d56f4afc6 100644
--- a/web/themes/default/page_youraccount.tpl
+++ b/web/themes/default/page_youraccount.tpl
@@ -6,8 +6,28 @@
 The following is a list of the permissions that you have on this system.<br /><br /> <br />
 <table width="100%" border="0">
   <tr>
-    <td width="35%" valign="top">-{$web_permissions}-</td>
-    <td valign="top">-{$server_permissions}-</td>
+    <td width="35%" valign="top">
+        <span style='font-size:10px;color:#1b75d1;'>Web Permissions</span>
+        <br/>
+        -{if $web_permissions}-
+            -{foreach from=$web_permissions item=permission}-
+                &bull; -{$permission}- <br/>
+            -{/foreach}-
+        -{else}-
+            <i>None</i>
+        -{/if}-
+    </td>
+    <td valign="top">
+        <span style='font-size:10px;color:#1b75d1;'>Server Permissions</span>
+        <br/>
+        -{if $server_permissions}-
+            -{foreach from=$server_permissions item=permission}-
+                &bull; -{$permission}- <br/>
+            -{/foreach}-
+        -{else}-
+            <i>None</i>
+        -{/if}-
+    </td>
   </tr>
 </table>
 </div>
@@ -40,7 +60,7 @@ The following is a list of the permissions that you have on this system.<br /><b
       </div>
         <div id="pass2.msg" class="badentry"></div></td>
   </tr>
-  
+
   <tr>
     <td>&nbsp;</td>
     <td>
@@ -143,7 +163,7 @@ var error = 0;
 function checkYourAcctPass()
 	{
 		var err = 0;
-		
+
 		if($('pass1').value.length < -{$min_pass_len}-)
 		{
 			$('pass1.msg').setStyle('display', 'block');
@@ -155,7 +175,7 @@ function checkYourAcctPass()
 			$('pass1.msg').setStyle('display', 'none');
 		}
 		if($('pass2').value != "" && $('pass2').value != $('pass1').value)
-		{	
+		{
 			$('pass2.msg').setStyle('display', 'block');
 			$('pass2.msg').setHTML('Your passwords dont match');
 			err++;
@@ -171,7 +191,7 @@ function checkYourAcctPass()
 		{
 			set_error(0);
 			return true;
-		}	
+		}
 	}
 	function dispatch()
 	{
@@ -190,7 +210,7 @@ function checkYourAcctPass()
 		if(!$('delspass') || $('delspass').checked == false)
 		{
 			var err = 0;
-			
+
 			if($('spass1').value.length < -{$min_pass_len}-)
 			{
 				$('spass1.msg').setStyle('display', 'block');
@@ -202,7 +222,7 @@ function checkYourAcctPass()
 				$('spass1.msg').setStyle('display', 'none');
 			}
 			if($('spass2').value != "" && $('spass2').value != $('spass1').value)
-			{	
+			{
 				$('spass2.msg').setStyle('display', 'block');
 				$('spass2.msg').setHTML('Your passwords dont match');
 				err++;
@@ -218,13 +238,13 @@ function checkYourAcctPass()
 			{
 				set_error(0);
 				return true;
-			}	
+			}
 		}
 		else
 		{
 			set_error(0);
 			return true;
-		}	
+		}
 	}
 	function srvdispatch()
 	{
@@ -255,7 +275,7 @@ function checkYourAcctPass()
 		}else{
 			$('email1.msg').setStyle('display', 'none');
 		}
-        
+
         if($('email2').value == "")
         {
             $('email2.msg').setStyle('display', 'block');
@@ -264,14 +284,14 @@ function checkYourAcctPass()
 		}else{
 			$('email2.msg').setStyle('display', 'none');
 		}
-         
+
 		if(err == 0 && $('email2').value != $('email1').value)
-		{	
+		{
 			$('email2.msg').setStyle('display', 'block');
 			$('email2.msg').setHTML('The typed E-mails doesn\'t match.');
 			err++;
 		}
-        
+
         if($('emailpw').value == "")
         {
             $('emailpw.msg').setStyle('display', 'block');
@@ -280,7 +300,7 @@ function checkYourAcctPass()
 		}else{
 			$('emailpw.msg').setStyle('display', 'none');
 		}
-        
+
 		if(err > 0)
 		{
 			set_error(1);
@@ -296,4 +316,4 @@ function checkYourAcctPass()
 		}
 	}
 </script>
-</div>	
+</div>

From e49c255793bdda58ed8be10d2d1864e8b084253a Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:13:11 +0200
Subject: [PATCH 11/17] Rework routing in installer

---
 web/install/includes/page-builder.php | 64 ---------------------------
 web/install/includes/routing.php      | 27 +++++++++++
 web/install/index.php                 | 43 ++++++------------
 3 files changed, 40 insertions(+), 94 deletions(-)
 delete mode 100644 web/install/includes/page-builder.php
 create mode 100644 web/install/includes/routing.php

diff --git a/web/install/includes/page-builder.php b/web/install/includes/page-builder.php
deleted file mode 100644
index 55e0526ee..000000000
--- a/web/install/includes/page-builder.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-// *************************************************************************
-//  This file is part of SourceBans++.
-//
-//  Copyright (C) 2014-2016 Sarabveer Singh <me@sarabveer.me>
-//
-//  SourceBans++ is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, per version 3 of the License.
-//
-//  SourceBans++ is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with SourceBans++. If not, see <http://www.gnu.org/licenses/>.
-//
-//  This file is based off work covered by the following copyright(s):
-//
-//   SourceBans 1.4.11
-//   Copyright (C) 2007-2015 SourceBans Team - Part of GameConnect
-//   Licensed under GNU GPL version 3, or later.
-//   Page: <http://www.sourcebans.net/> - <https://github.com/GameConnect/sourcebansv1>
-//
-// *************************************************************************
-
-$_GET['step'] = isset($_GET['step']) ? $_GET['step'] : '1';
-
-switch ($_GET['step']) {
-    case "6":
-        RewritePageTitle("Step 6 - AMXBans Import");
-        $page = TEMPLATES_PATH . "/page.6.php";
-        break;
-    case "5":
-        RewritePageTitle("Step 5 - Setup");
-        $page = TEMPLATES_PATH . "/page.5.php";
-        break;
-    case "4":
-        RewritePageTitle("Step 4 - Table Creation");
-        $page = TEMPLATES_PATH . "/page.4.php";
-        break;
-    case "3":
-        RewritePageTitle("Step 3 - System Requirements Check");
-        $page = TEMPLATES_PATH . "/page.3.php";
-        break;
-    case "2":
-        RewritePageTitle("Step 2 - Database Details");
-        $page = TEMPLATES_PATH . "/page.2.php";
-        break;
-    default:
-        RewritePageTitle("Step 1 - License agreement");
-        $page = TEMPLATES_PATH . "/page.1.php";
-        break;
-}
-
-require_once(TEMPLATES_PATH . "/header.php");
-BuildPageTabs();
-BuildSubMenu();
-BuildContHeader();
-if (!empty($page)) {
-    include $page;
-}
-include_once(TEMPLATES_PATH . '/footer.php');
diff --git a/web/install/includes/routing.php b/web/install/includes/routing.php
new file mode 100644
index 000000000..9324761fd
--- /dev/null
+++ b/web/install/includes/routing.php
@@ -0,0 +1,27 @@
+<?php
+function route($step)
+{
+    switch ($step) {
+        case 6:
+            return ['AMXBans Import', '/page.6.php'];
+        case 5:
+            return ['Initial Setup', '/page.5.php'];
+        case 4:
+            return ['Table Creation', '/page.4.php'];
+        case 3:
+            return ['System Requirements Check', '/page.3.php'];
+        case 2:
+            return ['Database Details', '/page.2.php'];
+        default:
+            return ['License agreement', '/page.1.php'];
+    }
+}
+
+function build($title, $page, $step)
+{
+    require_once(TEMPLATES_PATH.'/header.php');
+    require_once(TEMPLATES_PATH.'/submenu.php');
+    require_once(TEMPLATES_PATH.'/content.header.php');
+    require_once(TEMPLATES_PATH.$page);
+    require_once(TEMPLATES_PATH.'/footer.php');
+}
diff --git a/web/install/index.php b/web/install/index.php
index 51eb45ba7..da1e95489 100644
--- a/web/install/index.php
+++ b/web/install/index.php
@@ -1,31 +1,14 @@
 <?php
-/*************************************************************************
-	This file is part of SourceBans++
-
-	Copyright © 2014-2016 SourceBans++ Dev Team <https://github.com/sbpp>
-
-	SourceBans++ is licensed under a
-	Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-
-	You should have received a copy of the license along with this
-	work.  If not, see <http://creativecommons.org/licenses/by-nc-sa/3.0/>.
-
-	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.
-
-	This program is based off work covered by the following copyright(s):
-		SourceBans 1.4.11
-		Copyright © 2007-2014 SourceBans Team - Part of GameConnect
-		Licensed under CC BY-NC-SA 3.0
-		Page: <http://www.sourcebans.net/> - <http://www.gameconnect.net/>
-*************************************************************************/
-
-include_once 'init.php';
-include_once(INCLUDES_PATH . "/user-functions.php");
-include_once(INCLUDES_PATH . "/system-functions.php");
-include_once(INCLUDES_PATH . "/page-builder.php");
+require_once('init.php');
+require_once(INCLUDES_PATH.'/system-functions.php');
+require_once(INCLUDES_PATH.'/routing.php');
+
+$options = [
+    'min_range' => 1,
+    'max_range' => 6,
+    'default' => 1
+];
+$step = filter_input(INPUT_GET, 'step', FILTER_VALIDATE_INT, ['options' => $options]);
+
+[$title, $page] = route($step);
+build($title, $page, $step);

From b194560a8d21b7ae3e2567523949dda34aad80fd Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:14:41 +0200
Subject: [PATCH 12/17] Removed unused code in the installer

---
 web/install/includes/converter.inc.php    |  76 +--
 web/install/includes/system-functions.php | 540 +---------------------
 web/install/includes/user-functions.php   | 186 --------
 web/install/init.php                      |  52 +--
 web/install/scripts/mootools.js           |   1 -
 web/install/template/content.header.php   |  18 +-
 web/install/template/footer.php           |  20 +-
 web/install/template/header.php           |  32 +-
 web/install/template/page.1.php           |   6 -
 web/install/template/page.2.php           |   4 -
 web/install/template/page.3.php           |   4 -
 web/install/template/page.4.php           |  16 +-
 web/install/template/page.5.php           |  22 +-
 web/install/template/page.6.php           |   5 -
 web/install/template/submenu.php          |  26 +-
 web/install/template/tab.php              |   9 -
 16 files changed, 39 insertions(+), 978 deletions(-)
 delete mode 100644 web/install/includes/user-functions.php
 delete mode 100644 web/install/scripts/mootools.js
 delete mode 100644 web/install/template/tab.php

diff --git a/web/install/includes/converter.inc.php b/web/install/includes/converter.inc.php
index f90cbe134..a60ce68d4 100644
--- a/web/install/includes/converter.inc.php
+++ b/web/install/includes/converter.inc.php
@@ -66,78 +66,4 @@ function convertAmxbans($oldDB, $newDB)
         $newDB->execute();
     }
     echo "OK<br>";
-        /*
-    	echo "Converting ".$fromprefix."_banhistory... ";
-    	ob_flush();
-    	$res = $olddb->Execute("SELECT player_ip, player_id, player_nick, ban_created, ban_length, ban_reason, admin_ip, admin_id, admin_nick
-    				,server_ip, server_name, unban_created FROM ".$fromprefix."_banhistory");
-    	$ins = $newdb->Prepare("INSERT INTO ".$toprefix."_banhistory(Type,ip,authid,name,created,ends,length,reason,adminIp,Adminid,RemovedOn,RemovedBy) VALUES ('U',?,?,?,?,?,?,?,?,?,?,?)");
-    	while (!$res->EOF)
-    	{
-        	$vals = array($res->fields[0],$res->fields[1],$res->fields[2],$res->fields[3],($res->fields[4] == 0 ? 0 : $res->fields[3]+$res->fields[4])
-    			,$res->fields[4],$res->fields[5],$res->fields[6],$res->fields[7],$res->fields[8],$res->fields[7]);
-
-    		foreach ($vals as $ind=>$cur)
-    		{
-        		if (is_null($cur))
-        		{
-            		$vals[$ind] = '';
-        		}
-    		}
-    		$newdb->Execute($ins,$vals);
-    		$res->MoveNext();
-    	}
-        echo "OK<br>";
-
-   	echo "Converting ".$fromprefix."_levels... ";
-    	ob_flush();
-    	$res = $olddb->Execute("SELECT level, bans_add, bans_edit, bans_delete, bans_unban, bans_import, bans_export, amxadmins_view, amxadmins_edit
-    	            , webadmins_view, webadmins_edit, permissions_edit, servers_edit FROM ".$fromprefix."_levels");
-    	$ins = $newdb->Prepare("INSERT INTO ".$toprefix."_groups(type,name,flags) VALUES (1,?,?)");
-    	$levelconvert = array();
-    	while (!$res->EOF)
-    	{
-        	$acc = 0;
-        	if ($res->fields[1] == 'yes' || $res->fields[2] == 'yes' || $res->fields[3] == 'yes' || $res->fields[4] == 'yes')
-        	{
-            	$acc |= ADMIN_WEB_BANS;
-        	}
-        	// amxadmins_view is ignored
-        	if ($res->fields[6] == 'yes')
-        	{
-            	$acc |= ADMIN_SERVER_ADMINS;
-        	}
-        	// webadmins_view is ignored
-        	if ($res->fields[8] == 'yes')
-        	{
-            	$acc |= ADMIN_WEB_AGROUPS;
-        	}
-        	if ($res->fields[9] == 'yes')
-        	{
-            	$acc |= ADMIN_WEB_AGROUPS | ADMIN_SERVER_AGROUPS;
-        	}
-        	if ($res->fields[10] == 'yes')
-        	{
-            	$acc |= ADMIN_SERVER_ADD | ADMIN_SERVER_REMOVE | ADMIN_SERVER_GROUPS;
-        	}
-        	if ($res->fields[0] == '1')
-        	{
-            	$acc |= ADMIN_OWNER;
-        	}
-          	$newdb->Execute($ins,array("AMXBANS_".$res->fields[0],$acc));
-            $levelconvert[$res->fields[0]] = $newdb->Insert_ID();
-        	$res->MoveNext();
-    	}
-    	echo "OK<br>";
-
-    	echo "Converting ".$fromprefix."_admins... ";
-    	ob_flush();
-    	$res = $olddb->Execute("SELECT username, level FROM ".$fromprefix."_webadmins");
-    	$ins = $newdb->Prepare("INSERT INTO ".$toprefix."_admins(user,name,gid) VALUES (?,?,?)");
-    	while (!$res->EOF)
-    	{
-        	$newdb->Execute($ins,array($res->fields[0],$res->fields[0],$levelconvert[$res->fields[1]]));
-        	$res->MoveNext();
-    	}
-    	echo "OK<br>"; */
-    }
+}
diff --git a/web/install/includes/system-functions.php b/web/install/includes/system-functions.php
index 67168ff25..c9031b506 100644
--- a/web/install/includes/system-functions.php
+++ b/web/install/includes/system-functions.php
@@ -1,544 +1,12 @@
 <?php
-// *************************************************************************
-//  This file is part of SourceBans++.
-//
-//  Copyright (C) 2014-2016 Sarabveer Singh <me@sarabveer.me>
-//
-//  SourceBans++ is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, per version 3 of the License.
-//
-//  SourceBans++ is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with SourceBans++. If not, see <http://www.gnu.org/licenses/>.
-//
-//  This file is based off work covered by the following copyright(s):
-//
-//   SourceBans 1.4.11
-//   Copyright (C) 2007-2015 SourceBans Team - Part of GameConnect
-//   Licensed under GNU GPL version 3, or later.
-//   Page: <http://www.sourcebans.net/> - <https://github.com/GameConnect/sourcebansv1>
-//
-// *************************************************************************
-
-if (!defined("IN_SB")) {
-    die("You should not be here. Only follow links!");
-}
-
-/**
- * Displays the sub-nav menu of SourceBans
- *
- * @return noreturn
- */
-function BuildSubMenu()
-{
-    include TEMPLATES_PATH . "/submenu.php";
-}
-
-/**
- * Displays the content header
- *
- * @return noreturn
- */
-function BuildContHeader()
-{
-    if (!isset($_GET['s'])) {
-        $page = "<b>".(isset($GLOBALS['pagetitle']) ? $GLOBALS['pagetitle'] : '')."</b>";
-    }
-    include TEMPLATES_PATH . "/content.header.php";
-}
-
-
-/**
- * Adds a tab to the page
- *
- * @param string $title The title of the tab
- * @param string $utl The link of the tab
- * @param boolean $active Is the tab active?
- * @return noreturn
- */
-
-function AddTab($title, $url, $desc, $active=false)
-{
-    global $tabs;
-    $tab_arr = array();
-    $tab_arr[0] = "Dashboard";
-    $tab_arr[1] = "Ban List";
-    $tab_arr[2] = "Servers";
-    $tab_arr[3] = "Submit a ban";
-    $tab_arr[4] = "Protest a ban";
-    $tabs = array();
-    $tabs['title'] = $title;
-    $tabs['url'] = $url;
-    $tabs['desc'] = $desc;
-    if (!isset($_GET['p']) && $title == $tab_arr[is_null(Config::get('config.defaultpage')) ? 0 : Config::get('config.defaultpage')]) {
-        $tabs['active'] = true;
-        $GLOBALS['pagetitle'] = $title;
-    } else {
-        if (isset($_GET['p']) && substr($url, 3) == $_GET['p']) {
-            $tabs['active'] = true;
-            $GLOBALS['pagetitle'] = $title;
-        } else {
-            $tabs['active'] = false;
-        }
-    }
-    include TEMPLATES_PATH . "/tab.php";
-}
-
-/**
- * Displays the pagetabs
- *
- * @return noreturn
- */
-function BuildPageTabs()
-{
-    AddTab("SourceBans", "https://www.gameconnect.net/projects/sourcebans/", "");
-    AddTab("SourceBans++", "https://sbpp.github.io", "");
-    AddTab("SourceMod", "https://www.sourcemod.net/", "");
-}
-
-/**
- * Rewrites the breadcrumb html
- *
- * @return noreturn
- */
-function BuildBreadcrumbs()
-{
-    $base = $GLOBALS['pagetitle'];
-
-    switch ($_GET['c']) {
-        case "admins":
-            $cat = "Admin management";
-            break;
-        case "servers":
-            $cat = "Server management";
-            break;
-        case "bans":
-            $cat = "Ban management";
-            break;
-        case "groups":
-            $cat = "Group management";
-            break;
-        case "settings":
-            $cat = "SourceBans settings";
-            break;
-        case "mods":
-            $cat = "Mod management";
-            break;
-    }
-
-    if (!isset($_GET['c'])) {
-        $bread = "<b>" . $base . "</b>";
-    } else {
-        $bread = "<a href='?p=". $_GET['p'] . "'>" . $base . "</a>  &raquo; <b>" . $cat . "</b>";
-    }
-    $text = "&raquo; <a href='?p=home'>Home</a> &raquo; " . $bread;
-    echo '<script>$("breadcrumb").setHTML("' . $text . '");</script>';
-}
-/**
- * Creates an anchor tag, and adds tooltip code if needed
- *
- * @param string $title The title of the tooltip/text to link
- * @param string $url The link
- * @param string $tooltip The tooltip message
- * @param string $target The new links target
- * @return noreturn
- */
-function CreateLink($title, $url, $tooltip="", $target="_self", $wide=false)
-{
-    $class = "tip";
-    if ($wide) {
-        $class = "perm";
-    }
-    if (strlen($tooltip) == 0) {
-        echo '<a href="' . $url . '" target="' . $target . '">' . $title .' </a>';
-    } else {
-        echo '<a href="' . $url . '" class="' . $class .'" title="' .  $title . ' :: ' .  $tooltip . '" target="' . $target . '">' . $title .' </a>';
-    }
-}
-
-/**
- * Creates an anchor tag, and adds tooltip code if needed
- *
- * @param string $title The title of the tooltip/text to link
- * @param string $url The link
- * @param string $tooltip The tooltip message
- * @param string $target The new links target
- * @return URL
- */
-function CreateLinkR($title, $url, $tooltip="", $target="_self", $wide=false, $onclick)
-{
-    $class = "tip";
-    if ($wide) {
-        $class = "perm";
-    }
-
-    if (strlen($tooltip) == 0) {
-        return '<a href="' . $url . '" onclick="' . $onclick . '" target="' . $target . '">' . $title .' </a>';
-    } else {
-        return '<a href="' . $url . '" class="' . $class .'" title="' .  $title . ' :: ' .  $tooltip . '" target="' . $target . '">' . $title .' </a>';
-    }
-}
-
 function HelpIcon($title, $text)
 {
-    return '<img border="0" align="absbottom" src="images/admin/help.png" class="tip" title="' .  $title . ' :: ' .  $text . '">&nbsp;&nbsp;';
-}
-
-/**
- * Allows the title of the page to change wherever the code is being executed from
- *
- * @param string $title The new title
- * @return noreturn
- */
-function RewritePageTitle($title)
-{
-    $GLOBALS['TitleRewrite'] = $title;
-}
-
-/**
- * Build sub-menu
- *
- * @param array $el The array of elements for the menu
- * @return noreturn
- */
-function SubMenu($el)
-{
-    $output = "";
-    foreach ($el as $e) {
-        $output .= "<a class=\"nav_link\" href=\"" . $e['url'] . "\">" . $e['title']. "</a>";
-    }
-    $GLOBALS['NavRewrite'] = $output;
-}
-
-/**
- * Converts a flag bitmask into a string
- *
- * @param integer $mask The mask to convert
- * @return string
- */
-function BitToString($mask, $masktype=0, $head=true)
-{
-    $string = "";
-    if ($head) {
-        $string .= "<span style='font-size:10px;color:#1b75d1;'>Web Permissions</span><br>";
-    }
-    if ($mask == 0) {
-        $string .= "<i>None</i>";
-        return $string;
-    }
-    if (($mask & ADMIN_LIST_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; View admins<br />";
-    }
-    if (($mask & ADMIN_ADD_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add admins<br />";
-    }
-    if (($mask & ADMIN_EDIT_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit admins<br />";
-    }
-    if (($mask & ADMIN_DELETE_ADMINS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete admins<br />";
-    }
-
-    if (($mask & ADMIN_LIST_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; View servers<br />";
-    }
-    if (($mask & ADMIN_ADD_SERVER) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add servers<br />";
-    }
-    if (($mask & ADMIN_EDIT_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit servers<br />";
-    }
-    if (($mask & ADMIN_DELETE_SERVERS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete servers<br />";
-    }
-
-    if (($mask & ADMIN_ADD_BAN) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add bans<br />";
-    }
-    if (($mask & ADMIN_BAN_LIST) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; View bans<br />";
-    }
-    if (($mask & ADMIN_EDIT_OWN_BANS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .="&bull; Edit own bans<br />";
-    }
-    if (($mask & ADMIN_EDIT_GROUP_BANS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit groups bans<br />";
-    }
-    if (($mask & ADMIN_EDIT_ALL_BANS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit all bans<br />";
-    }
-    if (($mask & ADMIN_BAN_PROTESTS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Ban protests<br />";
-    }
-    if (($mask & ADMIN_BAN_SUBMISSIONS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Ban submissions<br />";
-    }
-
-    if (($mask & ADMIN_LIST_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; List groups<br />";
-    }
-    if (($mask & ADMIN_ADD_GROUP) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add groups<br />";
-    }
-    if (($mask & ADMIN_EDIT_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit groups<br />";
-    }
-    if (($mask & ADMIN_DELETE_GROUPS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete groups<br />";
-    }
-
-    if (($mask & ADMIN_WEB_SETTINGS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Web settings<br />";
-    }
-
-    if (($mask & ADMIN_LIST_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; List mods<br />";
-    }
-    if (($mask & ADMIN_ADD_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Add mods<br />";
-    }
-    if (($mask & ADMIN_EDIT_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Edit mods<br />";
-    }
-    if (($mask & ADMIN_DELETE_MODS) !=0 || ($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Delete mods<br />";
-    }
-
-    if (($mask & ADMIN_OWNER) !=0) {
-        $string .= "&bull; Owner<br />";
-    }
-
-    return $string;
-}
-
-
-function SmFlagsToSb($flagstring, $head=true)
-{
-    $string = "";
-    if ($head) {
-        $string .= "<span style='font-size:10px;color:#1b75d1;'>Server Permissions</span><br>";
-    }
-    if (empty($flagstring)) {
-        $string .= "<i>None</i>";
-        return $string;
-    }
-    if((strstr($flagstring, "a") || strstr($flagstring, "z")))
-		$string .= "&bull; Reserved slot<br />";
-	if((strstr($flagstring, "b") || strstr($flagstring, "z")))
-		$string .= "&bull; Generic admin<br />";
-	if((strstr($flagstring, "c") || strstr($flagstring, "z")))
-		$string .= "&bull; Kick<br />";
-	if((strstr($flagstring, "d") || strstr($flagstring, "z")))
-		$string .= "&bull; Ban<br />";
-	if((strstr($flagstring, "e") || strstr($flagstring, "z")))
-		$string .= "&bull; Un-ban<br />";
-	if((strstr($flagstring, "f") || strstr($flagstring, "z")))
-		$string .= "&bull; Slay<br />";
-	if((strstr($flagstring, "g") || strstr($flagstring, "z")))
-		$string .= "&bull; Map change<br />";
-	if((strstr($flagstring, "h") || strstr($flagstring, "z")))
-		$string .= "&bull; Change cvars<br />";
-	if((strstr($flagstring, "i") || strstr($flagstring, "z")))
-		$string .= "&bull; Run configs<br />";
-	if((strstr($flagstring, "j") || strstr($flagstring, "z")))
-		$string .= "&bull; Admin chat<br />";
-	if((strstr($flagstring, "k") || strstr($flagstring, "z")))
-		$string .="&bull; Start votes<br />";
-	if((strstr($flagstring, "l") || strstr($flagstring, "z")))
-		$string .="&bull; Password server<br />";
-	if((strstr($flagstring, "m") || strstr($flagstring, "z")))
-		$string .="&bull; RCON<br />";
-	if((strstr($flagstring, "n") || strstr($flagstring, "z")))
-		$string .="&bull; Enable Cheats<br />";
-	if((strstr($flagstring, "z")))
-		$string .="&bull; Full Admin<br />";
-
-	if((strstr($flagstring, "o") || strstr($flagstring, "z")))
-		$string .="&bull; Custom flag 1<br />";
-	if((strstr($flagstring, "p") || strstr($flagstring, "z")))
-		$string .="&bull; Custom flag 2<br />";
-	if((strstr($flagstring, "q") || strstr($flagstring, "z")))
-		$string .="&bull; Custom flag 3<br />";
-	if((strstr($flagstring, "r") || strstr($flagstring, "z")))
-		$string .="&bull; Custom flag 4<br />";
-	if((strstr($flagstring, "s") || strstr($flagstring, "z")))
-		$string .="&bull; Custom flag 5<br />";
-	if((strstr($flagstring, "t") || strstr($flagstring, "z")))
-		$string .="&bull; Custom flag 6<br />";
-
-
-    //if(($mask & SM_DEF_IMMUNITY) != 0)
-    //{
-    //	$flagstring .="&bull; Default immunity<br />";
-    //}
-    //if(($mask & SM_GLOBAL_IMMUNITY) != 0)
-    //{
-    //	$flagstring .="&bull; Global immunity<br />";
-    //}
-    return $string;
-}
-
-function PrintArray($array)
-{
-    echo "<pre>";
-    print_r($array);
-    echo "</pre>";
-}
-
-function NextGid()
-{
-	$gid = $GLOBALS['db']->GetRow("SELECT MAX(gid) AS next_gid FROM `" . DB_PREFIX . "_groups`");
-	return ($gid['next_gid']+1);
-}
-function NextSGid()
-{
-	$gid = $GLOBALS['db']->GetRow("SELECT MAX(id) AS next_id FROM `" . DB_PREFIX . "_srvgroups`");
-	return ($gid['next_id']+1);
-}
-function NextSid()
-{
-	$sid = $GLOBALS['db']->GetRow("SELECT MAX(sid) AS next_sid FROM `" . DB_PREFIX . "_servers`");
-	return ($sid['next_sid']+1);
-}
-function NextAid()
-{
-	$aid = $GLOBALS['db']->GetRow("SELECT MAX(aid) AS next_aid FROM `" . DB_PREFIX . "_admins`");
-	return ($aid['next_aid']+1);
-}
-
-function trunc($text, $len, $byword=true)
-{
-	if(strlen($text) <= $len)
-		return $text;
-    $text = $text." ";
-    $text = substr($text,0,$len);
-    if($byword)
-    	$text = substr($text,0,strrpos($text,' '));
-    $text = $text."...";
-    return $text;
-}
-
-function CreateRedBox($title, $content)
-{
-	$text = '<div id="msg-red-debug" style="">
-	<i><img src="./images/warning.png" alt="Warning" /></i>
-	<b>' . $title .'</b>
-	<br />
-	' . $content . '</i>
-</div>';
-
-	echo $text;
-}
-function CreateGreenBox($title, $contnet)
-{
-	$text = '<div id="msg-green-dbg" style="">
-	<i><img src="./images/yay.png" alt="Yay!" /></i>
-	<b>' . $title .'</b>
-	<br />
-	' . $contnet . '</i>
-</div>';
-
-	echo $text;
+    return '<img border="0" align="absbottom" src="images/admin/help.png" class="tip" title="' .  $title . ' :: ' .  $text . '">';
 }
 
 function CreateQuote()
 {
-	$quote = array(
-		array("Buy a new PC!", "Viper"),
-		array("I'm not lazy! I just utilize technical resources!", "Brizad"),
-		array("I need to mow the lawn", "sslice"),
-		array("Like A Glove!", "Viper"),
-		array("Your a Noob and You Know It!", "Viper"),
-		array("Get your ass ingame", "Viper"),
-		array("Mother F***ing Peices of Sh**", "Viper"),
-		array("Shut up Bam", "[Everyone]"),
-		array("Hi OllyBunch", "Viper"),
-		array("Procrastination is like masturbation. Sure it feels good, but in the end you're only F***ing yourself!", "[Unknown]"),
-		array("Rave's momma so fat she sat on the beach and Greenpeace threw her in", "SteamFriend"),
-		array("Im just getting a beer", "Faith"),
-		array("To be honest " . (isset($_SESSION['user']['user'])?$_SESSION['user']['user']:'...') . ", I DONT CARE!", "Viper"),
-		array("Yams", "teame06"),
-		array("built in cheat 1.6 - my friend told me theres a cheat where u can buy a car door and run around and it makes u invincible....", "gdogg"),
-		array("i just join conversation when i see a chance to tell people they might be wrong, then i quickly leave, LIKE A BAT", "BAILOPAN"),
-		array("Lets just blame it on FlyingMongoose", "[Everyone]"),
-		array("I wish my lawn was emo, so it would cut itself", "SirTiger"),
-	);
-	$num = rand(0, sizeof($quote)-1);
-	return '"' . $quote[$num][0] . '" - <i>' . $quote[$num][1] . '</i>';
-}
-
-function RemoveCode($text)
-{
-	return addslashes(htmlspecialchars(strip_tags($text)));
+    $quotes = json_decode(file_get_contents('../configs/quotes.json'), true);
+    $num = rand(0, count($quotes) - 1);
+    return sprintf('"%s" - <i>%s</i>', $quotes[$num]['quote'], $quotes[$num]['author']);
 }
-
-function SecondsToString($sec, $textual=true)
-{
-	$div = array( 2592000, 604800, 86400, 3600, 60, 1 );
-	if($textual)
-	{
-		$desc = array ('mo','wk','d','hr','min','sec');
-		$ret = "";
-		for ($i=0;$i<count($div);$i++)
-		{
-			if (($cou = round($sec / $div[$i])) >= 1)
-			{
-				$ret .= $cou.' '.$desc[$i].', ';
-				$sec %= $div[$i];
-			}
-		}
-		$ret = substr($ret,0,strlen($ret)-2);
-	}else{
-		$hours = floor ($sec / 60 / 60);
-		$sec -= $hours * 60*60;
-		$mins = floor ($sec / 60);
-		$secs = $sec % 60;
-		$ret = $hours . ":" . $mins . ":" . $secs;
-	}
-	return $ret;
-}
-
-function CreateHostnameCache()
-{
-	require_once INCLUDES_PATH.'/CServerInfo.php';
-
-	$res = $GLOBALS['db']->Execute("SELECT sid, ip, port, modid, rcon FROM ".DB_PREFIX."_servers WHERE sid > 0 ORDER BY sid");
-	$servers = array();
-	while (!$res->EOF)
-	{
-		$info = array();
-		$sinfo = new CServerInfo($res->fields[1],$res->fields[2]);
-		$info = $sinfo->getInfo();
-		$servers[$res->fields[0]] = $info['hostname'];
-		$res->MoveNext();
-	}
-	return($servers);
-}
-
-function FetchIp($ip)
-{
-	global $addr;
-	$addr = $ip;
-	return include INCLUDES_PATH.'/read_country.php';
-}
-
-function PageDie()
-{
-	include TEMPLATES_PATH.'/footer.php';
-	die();
-}
-
-function GetMapImage($map)
-{
-	if(@file_exists(SB_MAP_LOCATION . "/" . $map . ".jpg"))
-		return "images/maps/" . $map . ".jpg";
-	else
-		return "images/maps/nomap.jpg";
-}
-
-?>
diff --git a/web/install/includes/user-functions.php b/web/install/includes/user-functions.php
deleted file mode 100644
index 8bddb6f94..000000000
--- a/web/install/includes/user-functions.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-// *************************************************************************
-//  This file is part of SourceBans++.
-//
-//  Copyright (C) 2014-2016 Sarabveer Singh <me@sarabveer.me>
-//
-//  SourceBans++ is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, per version 3 of the License.
-//
-//  SourceBans++ is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with SourceBans++. If not, see <http://www.gnu.org/licenses/>.
-//
-//  This file is based off work covered by the following copyright(s):
-//
-//   SourceBans 1.4.11
-//   Copyright (C) 2007-2015 SourceBans Team - Part of GameConnect
-//   Licensed under GNU GPL version 3, or later.
-//   Page: <http://www.sourcebans.net/> - <https://github.com/GameConnect/sourcebansv1>
-//
-// *************************************************************************
-
-global $user, $db;
-/**
- * Checks the database for any identical
- * rows, username, email etc
- *
- * @param string $table the table to lookup
- * @param string $field The feild to check
- * @param string $value The value to check against
- * @return true if the value already exists in that field is found, else false
- */
-function is_taken($table, $field, $value)
-{
-    $GLOBALS['db']->query('SELECT * FROM `:prefix_:table` WHERE `:field` = `:value`');
-    $GLOBALS['db']->bind(':table', $table);
-    $GLOBALS['db']->bind(':field', $field);
-    $GLOBALS['db']->bind(':value', $value);
-    $result = $GLOBALS['db']->resultset();
-    return (count($result) > 0);
-}
-
-/**
- * Returns the current flags associated with the user
- *
- * @param integer The admin id to check
- * @return integer.
- */
-function get_user_flags($aid)
-{
-    if (empty($aid)) {
-        return 0;
-    }
-
-    $GLOBALS['db']->query('SELECT `gid`, `extraflags` FROM `:prefix_admins` WHERE `aid` = `:aid`');
-    $GLOBALS['db']->bind(':aid', $aid);
-    $admin = $GLOBALS['db']->single();
-
-    if (intval($admin['gid']) === -1) {
-        return intval($admin['extraflags']);
-    }
-
-    $GLOBALS['db']->query('SELECT `flags` FROM `:prefix_groups` WHERE `gid` = `:gid`');
-    $GLOBALS['db']->bind(':gid', $admin['gid']);
-    $group = $GLOBALS['db']->single();
-    return (intval($group['flags']) | intval($admin['extraflags']));
-}
-
-/**
- * Returns the current server flags associated with the user
- *
- * @param string The admin to check
- * @return string.
- */
-function get_user_admin($steam)
-{
-    if (empty($steam)) {
-        return 0;
-    }
-    $GLOBALS['db']->query('SELECT * FROM `:prefix_srvadmins` WHERE `identity` = `:identity`');
-    $GLOBALS['db']->bind(':identity', $steam);
-    $admin = $GLOBALS['db']->single();
-
-    if (strlen($admin['groups']) > 1) {
-        $GLOBALS['db']->query('SELECT `flags` FROM `:prefix_srvgroups` WHERE `name` = `:name`');
-        $GLOBALS['db']->bind(':name', $admin['groups']);
-        $query = $GLOBALS['db']->single();
-        return $query['flags'] . $admin['flags'];
-    }
-    return $admin['flags'];
-}
-
-/**
- * Returns the current server flags associated with the user
- *
- * @param string The admin to check
- * @return string.
- */
-function get_non_inherited_admin($steam)
-{
-    if (empty($steam)) {
-        return 0;
-    }
-    $GLOBALS['db']->query('SELECT * FROM `:prefix_srvadmins` WHERE `identity` = `:identity`');
-    $GLOBALS['db']->bind(':identity', $steam);
-    $admin = $GLOBALS['db']->single();
-    return $admin['flags'];
-}
-
-/**
- * Checks if user is logged in.
- *
- * @return boolean.
- */
-function is_logged_in()
-{
-    if ($_SESSION['user']['user'] == "Guest" || $_SESSION['user']['user'] == "") {
-        return false;
-    }
-    return true;
-}
-
-/**
- * Checks if user is an admin.
- *
- * @return boolean.
- */
-function is_admin($aid)
-{
-    if (check_flags($aid, ALL_WEB)) {
-        return true;
-    }
-    return false;
-}
-
-/**
- * Checks if the admin has ANY the specified flags
- *
- * @param integet $aid the admin id to check the flags of
- * @param integer $flag the flag to check
- * @return boolean
- */
-function check_flags($aid, $flag)
-{
-    $mask = get_user_flags($aid);
-    if (($mask & $flag) !=0) {
-        return true;
-    }
-    return false;
-}
-
-/**
- * Checks if the mask contains ANY the specified flags
- *
- * @param integet $aid the admin id to check the flags of
- * @param integer $flag the flag to check
- * @return boolean
- */
-function check_flag($mask, $flag)
-{
-    if (($mask & $flag) !=0) {
-        return true;
-    }
-    return false;
-}
-
-function validate_steam($steam)
-{
-    if (preg_match(STEAM_FORMAT, $steam)) {
-        return true;
-    }
-    return false;
-}
-
-function validate_email($email)
-{
-    if (preg_match(EMAIL_FORMAT, $email)) {
-        return true;
-    }
-    return false;
-}
diff --git a/web/install/init.php b/web/install/init.php
index a4a2aef02..fb6cacdcc 100644
--- a/web/install/init.php
+++ b/web/install/init.php
@@ -1,30 +1,4 @@
 <?php
-/*************************************************************************
-	This file is part of SourceBans++
-
-	Copyright © 2014-2016 SourceBans++ Dev Team <https://github.com/sbpp>
-
-	SourceBans++ is licensed under a
-	Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License.
-
-	You should have received a copy of the license along with this
-	work.  If not, see <http://creativecommons.org/licenses/by-nc-sa/3.0/>.
-
-	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.
-
-	This program is based off work covered by the following copyright(s):
-		SourceBans 1.4.11
-		Copyright © 2007-2014 SourceBans Team - Part of GameConnect
-		Licensed under CC BY-NC-SA 3.0
-		Page: <http://www.sourcebans.net/> - <http://www.gameconnect.net/>
-*************************************************************************/
-
 // ---------------------------------------------------
 //  Directories
 // ---------------------------------------------------
@@ -35,31 +9,7 @@
 define('IN_SB', true);
 define('IN_INSTALL', true);
 
-// ---------------------------------------------------
-//  Fix some $_SERVER vars
-// ---------------------------------------------------
-// Fix for IIS, which doesn't set REQUEST_URI
-if (!isset($_SERVER['REQUEST_URI']) || trim($_SERVER['REQUEST_URI']) == '') {
-    $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
-
-    if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
-        $_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
-    }
-}
-// Fix for Dreamhost and other PHP as CGI hosts
-if (strstr($_SERVER['SCRIPT_NAME'], 'php.cgi')) {
-    unset($_SERVER['PATH_INFO']);
-}
-if (trim($_SERVER['PHP_SELF']) == '') {
-    $_SERVER['PHP_SELF'] = preg_replace("/(\?.*)?$/", '', $_SERVER["REQUEST_URI"]);
-}
-
-// ---------------------------------------------------
-//  Initial setup
-// ---------------------------------------------------
-if (!defined('SB_VERSION')) {
-    define('SB_VERSION', '1.6.3-Installer');
-}
+define('SB_VERSION', '1.7.0 | Installer');
 
 // ---------------------------------------------------
 //  Setup PHP
diff --git a/web/install/scripts/mootools.js b/web/install/scripts/mootools.js
deleted file mode 100644
index 32f1ade20..000000000
--- a/web/install/scripts/mootools.js
+++ /dev/null
@@ -1 +0,0 @@
-var MooTools={version:'1.2dev'};function $defined(a){return(a!=undefined)};function $type(a){if(!$defined(a))return false;if(a.htmlElement)return'element';var b=typeof a;if(b=='object'&&a.nodeName){switch(a.nodeType){case 1:return'element';case 3:return(/\S/).test(a.nodeValue)?'textnode':'whitespace'}}if(b=='object'||b=='function'){switch(a.constructor){case Array:return'array';case RegExp:return'regexp';case Class:return'class'}if(typeof a.length=='number'){if(a.item)return'collection';if(a.callee)return'arguments'}}return b};function $merge(){var a={};for(var i=0;i<arguments.length;i++){for(var b in arguments[i]){var c=arguments[i][b];var d=a[b];if(d&&$type(c)=='object'&&$type(d)=='object')a[b]=$merge(d,c);else a[b]=c}}return a};var $extend=function(){var a=arguments;if(!a[1])a=[this,a[0]];for(var b in a[1])a[0][b]=a[1][b];return a[0]};var $native=function(){for(var i=0,l=arguments.length;i<l;i++){arguments[i].extend=function(a){for(var b in a){if(!this.prototype[b])this.prototype[b]=a[b];if(!this[b])this[b]=$native.generic(b)}}}};$native.generic=function(b){return function(a){return this.prototype[b].apply(a,Array.prototype.slice.call(arguments,1))}};$native(Function,Array,String,Number);var Abstract=function(a){a=a||{};a.extend=$extend;return a};var Window=new Abstract(window);var Document=new Abstract(document);document.head=document.getElementsByTagName('head')[0];function $chk(a){return!!(a||a===0)};function $pick(a,b){return $defined(a)?a:b};function $random(a,b){return Math.floor(Math.random()*(b-a+1)+a)};function $time(){return new Date().getTime()};function $clear(a){clearTimeout(a);clearInterval(a);return null};window.xpath=!!(document.evaluate);if(window.ActiveXObject)window.ie=window[window.XMLHttpRequest?'ie7':'ie6']=true;else if(document.childNodes&&!document.all&&!navigator.taintEnabled)window.webkit=window[window.xpath?'webkit420':'webkit419']=true;else if(document.getBoxObjectFor!=null)window.gecko=true;if(typeof HTMLElement=='undefined'){var HTMLElement=function(){};if(window.webkit)document.createElement("iframe");HTMLElement.prototype=(window.webkit)?window["[[DOMElement.prototype]]"]:{}}HTMLElement.prototype.htmlElement=function(){};if(window.ie6)try{document.execCommand("BackgroundImageCache",false,true)}catch(e){};var Class=function(a){var b=function(){return(arguments[0]!==null&&this.initialize&&$type(this.initialize)=='function')?this.initialize.apply(this,arguments):this};$extend(b,this);b.prototype=a;b.constructor=Class;return b};Class.empty=function(){};Class.prototype={extend:function(a){var b=new this(null);for(var c in a){var d=b[c];b[c]=Class.Merge(d,a[c])}return new Class(b)},implement:function(){for(var i=0,l=arguments.length;i<l;i++)$extend(this.prototype,arguments[i])}};Class.Merge=function(a,b){if(a&&a!=b){var c=$type(b);if(c!=$type(a))return b;switch(c){case'function':var d=function(){this.parent=arguments.callee.parent;return b.apply(this,arguments)};d.parent=a;return d;case'object':return $merge(a,b)}}return b};var Chain=new Class({chain:function(a){this.chains=this.chains||[];this.chains.push(a);return this},callChain:function(){if(this.chains&&this.chains.length)this.chains.shift().delay(10,this)},clearChain:function(){this.chains=[]}});var Events=new Class({addEvent:function(a,b){if(b!=Class.empty){this.$events=this.$events||{};this.$events[a]=this.$events[a]||[];this.$events[a].include(b)}return this},fireEvent:function(b,c,d){if(this.$events&&this.$events[b]){this.$events[b].each(function(a){a.create({'bind':this,'delay':d,'arguments':c})()},this)}return this},removeEvent:function(a,b){if(this.$events&&this.$events[a])this.$events[a].remove(b);return this}});var Options=new Class({setOptions:function(){this.options=$merge.apply(null,[this.options].extend(arguments));if(this.addEvent){for(var a in this.options){if($type(this.options[a]=='function')&&(/^on[A-Z]/).test(a))this.addEvent(a,this.options[a])}}return this}});Array.extend({forEach:function(a,b){for(var i=0,j=this.length;i<j;i++)a.call(b,this[i],i,this)},filter:function(a,b){var c=[];for(var i=0,j=this.length;i<j;i++){if(a.call(b,this[i],i,this))c.push(this[i])}return c},map:function(a,b){var c=[];for(var i=0,j=this.length;i<j;i++)c[i]=a.call(b,this[i],i,this);return c},every:function(a,b){for(var i=0,j=this.length;i<j;i++){if(!a.call(b,this[i],i,this))return false}return true},some:function(a,b){for(var i=0,j=this.length;i<j;i++){if(a.call(b,this[i],i,this))return true}return false},indexOf:function(a,b){var c=this.length;for(var i=(b<0)?Math.max(0,c+b):b||0;i<c;i++){if(this[i]===a)return i}return-1},copy:function(a,b){a=a||0;if(a<0)a=this.length+a;b=b||(this.length-a);var c=[];for(var i=0;i<b;i++)c[i]=this[a++];return c},remove:function(a){var i=0;var b=this.length;while(i<b){if(this[i]===a){this.splice(i,1);b--}else{i++}}return this},contains:function(a,b){return this.indexOf(a,b)!=-1},associate:function(a){var b={},length=Math.min(this.length,a.length);for(var i=0;i<length;i++)b[a[i]]=this[i];return b},extend:function(a){for(var i=0,j=a.length;i<j;i++)this.push(a[i]);return this},merge:function(a){for(var i=0,l=a.length;i<l;i++)this.include(a[i]);return this},include:function(a){if(!this.contains(a))this.push(a);return this},getRandom:function(){return this[$random(0,this.length-1)]||null},getLast:function(){return this[this.length-1]||null}});Array.prototype.each=Array.prototype.forEach;Array.each=Array.forEach;function $A(a){return Array.copy(a)};function $each(a,b,c){if(a&&typeof a.length=='number'&&$type(a)!='object'){Array.forEach(a,b,c)}else{for(var d in a)b.call(c||a,a[d],d)}};String.extend({test:function(a,b){return(($type(a)=='string')?new RegExp(a,b):a).test(this)},toInt:function(){return parseInt(this,10)},toFloat:function(){return parseFloat(this)},camelCase:function(){return this.replace(/-\D/g,function(a){return a.charAt(1).toUpperCase()})},hyphenate:function(){return this.replace(/\w[A-Z]/g,function(a){return(a.charAt(0)+'-'+a.charAt(1).toLowerCase())})},capitalize:function(){return this.replace(/\b[a-z]/g,function(a){return a.toUpperCase()})},trim:function(){return this.replace(/^\s+|\s+$/g,'')},clean:function(){return this.replace(/\s{2,}/g,' ').trim()},rgbToHex:function(a){var b=this.match(/\d{1,3}/g);return(b)?b.rgbToHex(a):false},hexToRgb:function(a){var b=this.match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);return(b)?b.slice(1).hexToRgb(a):false},contains:function(a,s){return(s)?(s+this+s).indexOf(s+a+s)>-1:this.indexOf(a)>-1},escapeRegExp:function(){return this.replace(/([.*+?^${}()|[\]\/\\])/g,'\\$1')}});Array.extend({rgbToHex:function(a){if(this.length<3)return false;if(this.length==4&&this[3]==0&&!a)return'transparent';var b=[];for(var i=0;i<3;i++){var c=(this[i]-0).toString(16);b.push((c.length==1)?'0'+c:c)}return a?b:'#'+b.join('')},hexToRgb:function(a){if(this.length!=3)return false;var b=[];for(var i=0;i<3;i++){b.push(parseInt((this[i].length==1)?this[i]+this[i]:this[i],16))}return a?b:'rgb('+b.join(',')+')'}});Function.extend({create:function(d){var e=this;d=$merge({'bind':e,'event':false,'arguments':null,'delay':false,'periodical':false,'attempt':false},d);if($chk(d.arguments)&&$type(d.arguments)!='array')d.arguments=[d.arguments];return function(a){var b;if(d.event){a=a||window.event;b=[(d.event===true)?a:new d.event(a)];if(d.arguments)b.extend(d.arguments)}else b=d.arguments||arguments;var c=function(){return e.apply($pick(d.bind,e),b)};if(d.delay)return setTimeout(c,d.delay);if(d.periodical)return setInterval(c,d.periodical);if(d.attempt)try{return c()}catch(err){return false};return c()}},pass:function(a,b){return this.create({'arguments':a,'bind':b})},attempt:function(a,b){return this.create({'arguments':a,'bind':b,'attempt':true})()},bind:function(a,b){return this.create({'bind':a,'arguments':b})},bindAsEventListener:function(a,b){return this.create({'bind':a,'event':true,'arguments':b})},delay:function(a,b,c){return this.create({'delay':a,'bind':b,'arguments':c})()},periodical:function(a,b,c){return this.create({'periodical':a,'bind':b,'arguments':c})()}});Number.extend({toInt:function(){return parseInt(this)},toFloat:function(){return parseFloat(this)},limit:function(a,b){return Math.min(b,Math.max(a,this))},round:function(a){a=Math.pow(10,a||0);return Math.round(this*a)/a},times:function(a){for(var i=0;i<this;i++)a(i)}});var Element=new Class({initialize:function(a,b){if($type(a)=='string'){if(window.ie&&b&&(b.name||b.type)){var c=(b.name)?' name="'+b.name+'"':'';var d=(b.type)?' type="'+b.type+'"':'';delete b.name;delete b.type;a='<'+a+c+d+'>'}a=document.createElement(a)}a=$(a);return(!b||!a)?a:a.set(b)}});var Elements=new Class({initialize:function(a){return(a)?$extend(a,this):this}});Elements.extend=function(a){for(var b in a){this.prototype[b]=a[b];this[b]=$native.generic(b)}};function $(a){if(!a)return false;if(a.htmlElement)return Garbage.collect(a);if([window,document].contains(a))return a;var b=$type(a);if(b=='string'){a=document.getElementById(a);b=(a)?'element':false}if(b!='element')return false;if(a.htmlElement)return Garbage.collect(a);if(['object','embed'].contains(a.tagName.toLowerCase()))return a;$extend(a,Element.prototype);a.htmlElement=function(){};return Garbage.collect(a)};document.getElementsBySelector=document.getElementsByTagName;function $$(){var a=[];for(var i=0,j=arguments.length;i<j;i++){var b=arguments[i];switch($type(b)){case'element':a.push(b);case'boolean':break;case false:break;case'string':b=document.getElementsBySelector(b,true);default:a.extend(b)}}return $$.unique(a)};$$.unique=function(a){var b=[];for(var i=0,l=a.length;i<l;i++){if(a[i].$included)continue;var c=$(a[i]);if(c&&!c.$included){c.$included=true;b.push(c)}}for(var n=0,d=b.length;n<d;n++)b[n].$included=null;return new Elements(b)};Elements.Multi=function(d){return function(){var a=arguments;var b=[];var c=true;for(var i=0,j=this.length,returns;i<j;i++){returns=this[i][d].apply(this[i],a);if($type(returns)!='element')c=false;b.push(returns)};return(c)?$$.unique(b):b}};Element.extend=function(a){for(var b in a){HTMLElement.prototype[b]=a[b];Element.prototype[b]=a[b];Element[b]=$native.generic(b);var c=(Array.prototype[b])?b+'Elements':b;Elements.prototype[c]=Elements.Multi(b)}};Element.extend({set:function(a){for(var b in a){var c=a[b];switch(b){case'styles':this.setStyles(c);break;case'events':if(this.addEvents)this.addEvents(c);break;case'properties':this.setProperties(c);break;default:this.setProperty(b,c)}}return this},inject:function(a,b){a=$(a);switch(b){case'before':a.parentNode.insertBefore(this,a);break;case'after':var c=a.getNext();if(!c)a.parentNode.appendChild(this);else a.parentNode.insertBefore(this,c);break;case'top':var d=a.firstChild;if(d){a.insertBefore(this,d);break}default:a.appendChild(this)}return this},injectBefore:function(a){return this.inject(a,'before')},injectAfter:function(a){return this.inject(a,'after')},injectInside:function(a){return this.inject(a,'bottom')},injectTop:function(a){return this.inject(a,'top')},adopt:function(){var b=[];$each(arguments,function(a){b=b.concat(a)});$$(b).inject(this);return this},remove:function(){return this.parentNode.removeChild(this)},clone:function(a){var b=$(this.cloneNode(a!==false));if(!b.$events)return b;b.$events={};for(var c in this.$events)b.$events[c]={'keys':$A(this.$events[c].keys),'values':$A(this.$events[c].values)};return b.removeEvents()},replaceWith:function(a){a=$(a);this.parentNode.replaceChild(a,this);return a},appendText:function(a){if(window.ie){switch(this.getTag()){case'style':this.styleSheet.cssText=a;return this;case'script':return this.setProperty('text',a)}}this.appendChild(document.createTextNode(a));return this},hasClass:function(a){return this.className.contains(a,' ')},addClass:function(a){if(!this.hasClass(a))this.className=(this.className+' '+a).clean();return this},removeClass:function(a){this.className=this.className.replace(new RegExp('(^|\\s)'+a+'(?:\\s|$)'),'$1').clean();return this},toggleClass:function(a){return this.hasClass(a)?this.removeClass(a):this.addClass(a)},setStyle:function(a,b){switch(a){case'opacity':return this.setOpacity(parseFloat(b));case'float':a=(window.ie)?'styleFloat':'cssFloat'}a=a.camelCase();switch($type(b)){case'number':if(!['zIndex','zoom'].contains(a))b+='px';break;case'array':b='rgb('+b.join(',')+')'}this.style[a]=b;return this},setStyles:function(a){switch($type(a)){case'object':Element.setMany(this,'setStyle',a);break;case'string':this.style.cssText=a}return this},setOpacity:function(a){if(a==0){if(this.style.visibility!="hidden")this.style.visibility="hidden"}else{if(this.style.visibility!="visible")this.style.visibility="visible"}if(!this.currentStyle||!this.currentStyle.hasLayout)this.style.zoom=1;if(window.ie)this.style.filter=(a==1)?'':"alpha(opacity="+a*100+")";this.style.opacity=this.$tmp.opacity=a;return this},getStyle:function(b){b=b.camelCase();var c=this.style[b];if(!$chk(c)){if(b=='opacity')return this.$tmp.opacity;c=[];for(var d in Element.Styles){if(b==d){Element.Styles[d].each(function(s){var a=this.getStyle(s);c.push(parseInt(a)?a:'0px')},this);if(b=='border'){var e=c.every(function(a){return(a==c[0])});return(e)?c[0]:false}return c.join(' ')}}if(b.contains('border')){if(Element.Styles.border.contains(b)){return['Width','Style','Color'].map(function(p){return this.getStyle(b+p)},this).join(' ')}else if(Element.borderShort.contains(b)){return['Top','Right','Bottom','Left'].map(function(p){return this.getStyle('border'+p+b.replace('border',''))},this).join(' ')}}if(document.defaultView)c=document.defaultView.getComputedStyle(this,null).getPropertyValue(b.hyphenate());else if(this.currentStyle)c=this.currentStyle[b]}if(window.ie)c=Element.fixStyle(b,c,this);if(c&&b.test(/color/i)&&c.contains('rgb')){return c.split('rgb').splice(1,4).map(function(a){return a.rgbToHex()}).join(' ')}return c},getStyles:function(){return Element.getMany(this,'getStyle',arguments)},walk:function(a,b){a+='Sibling';var c=(b)?this[b]:this[a];while(c&&$type(c)!='element')c=c[a];return $(c)},getPrevious:function(){return this.walk('previous')},getNext:function(){return this.walk('next')},getFirst:function(){return this.walk('next','firstChild')},getLast:function(){return this.walk('previous','lastChild')},getParent:function(){return $(this.parentNode)},getChildren:function(){return $$(this.childNodes)},hasChild:function(a){return!!$A(this.getElementsByTagName('*')).contains(a)},getProperty:function(a){var b=Element.Properties[a];if(b)return this[b];var c=Element.PropertiesIFlag[a]||0;if(!window.ie||c)return this.getAttribute(a,c);var d=this.attributes[a];return(d)?d.nodeValue:null},removeProperty:function(a){var b=Element.Properties[a];if(b)this[b]='';else this.removeAttribute(a);return this},getProperties:function(){return Element.getMany(this,'getProperty',arguments)},setProperty:function(a,b){var c=Element.Properties[a];if(c)this[c]=b;else this.setAttribute(a,b);return this},setProperties:function(a){return Element.setMany(this,'setProperty',a)},setHTML:function(){this.innerHTML=$A(arguments).join('');return this},getTag:function(){return this.tagName.toLowerCase()},empty:function(){Garbage.trash(this.getElementsByTagName('*'));return this.setHTML('')}});Element.fixStyle=function(b,c,d){if($chk(parseInt(c)))return c;if(['height','width'].contains(b)){var e=(b=='width')?['left','right']:['top','bottom'];var f=0;e.each(function(a){f+=d.getStyle('border-'+a+'-width').toInt()+d.getStyle('padding-'+a).toInt()});return d['offset'+b.capitalize()]-f+'px'}else if(b.test(/border(.+)Width|margin|padding/)){return'0px'}return c};Element.Styles={'border':[],'padding':[],'margin':[]};['Top','Right','Bottom','Left'].each(function(a){for(var b in Element.Styles)Element.Styles[b].push(b+a)});Element.borderShort=['borderWidth','borderStyle','borderColor'];Element.getMany=function(b,c,d){var e={};$each(d,function(a){e[a]=b[c](a)});return e};Element.setMany=function(a,b,c){for(var d in c)a[b](d,c[d]);return a};Element.Properties=new Abstract({'class':'className','for':'htmlFor','colspan':'colSpan','rowspan':'rowSpan','accesskey':'accessKey','tabindex':'tabIndex','maxlength':'maxLength','readonly':'readOnly','frameborder':'frameBorder','value':'value','disabled':'disabled','checked':'checked','multiple':'multiple','selected':'selected'});Element.PropertiesIFlag={'href':2,'src':2};Element.Methods={Listeners:{addListener:function(a,b){if(this.addEventListener)this.addEventListener(a,b,false);else this.attachEvent('on'+a,b);return this},removeListener:function(a,b){if(this.removeEventListener)this.removeEventListener(a,b,false);else this.detachEvent('on'+a,b);return this}}};window.extend(Element.Methods.Listeners);document.extend(Element.Methods.Listeners);Element.extend(Element.Methods.Listeners);var Garbage={elements:[],collect:function(a){if(!a.$tmp){Garbage.elements.push(a);a.$tmp={'opacity':1}}return a},trash:function(a){for(var i=0,j=a.length,el;i<j;i++){if(!(el=a[i])||!el.$tmp)continue;if(el.$events)el.fireEvent('trash').removeEvents();for(var p in el.$tmp)el.$tmp[p]=null;for(var d in Element.prototype)el[d]=null;Garbage.elements[Garbage.elements.indexOf(el)]=null;el.htmlElement=el.$tmp=el=null}Garbage.elements.remove(null)},empty:function(){Garbage.collect(window);Garbage.collect(document);Garbage.trash(Garbage.elements)}};window.addListener('beforeunload',function(){window.addListener('unload',Garbage.empty);if(window.ie)window.addListener('unload',CollectGarbage)});var Event=new Class({initialize:function(a){if(a&&a.$extended)return a;this.$extended=true;a=a||window.event;this.event=a;this.type=a.type;this.target=a.target||a.srcElement;if(this.target.nodeType==3)this.target=this.target.parentNode;this.shift=a.shiftKey;this.control=a.ctrlKey;this.alt=a.altKey;this.meta=a.metaKey;if(['DOMMouseScroll','mousewheel'].contains(this.type)){this.wheel=(a.wheelDelta)?a.wheelDelta/120:-(a.detail||0)/3}else if(this.type.contains('key')){this.code=a.which||a.keyCode;for(var b in Event.keys){if(Event.keys[b]==this.code){this.key=b;break}}if(this.type=='keydown'){var c=this.code-111;if(c>0&&c<13)this.key='f'+c}this.key=this.key||String.fromCharCode(this.code).toLowerCase()}else if(this.type.test(/(click|mouse|menu)/)){this.page={'x':a.pageX||a.clientX+document.documentElement.scrollLeft,'y':a.pageY||a.clientY+document.documentElement.scrollTop};this.client={'x':a.pageX?a.pageX-window.pageXOffset:a.clientX,'y':a.pageY?a.pageY-window.pageYOffset:a.clientY};this.rightClick=(a.which==3)||(a.button==2);switch(this.type){case'mouseover':this.relatedTarget=a.relatedTarget||a.fromElement;break;case'mouseout':this.relatedTarget=a.relatedTarget||a.toElement}this.fixRelatedTarget()}return this},stop:function(){return this.stopPropagation().preventDefault()},stopPropagation:function(){if(this.event.stopPropagation)this.event.stopPropagation();else this.event.cancelBubble=true;return this},preventDefault:function(){if(this.event.preventDefault)this.event.preventDefault();else this.event.returnValue=false;return this}});Event.fix={relatedTarget:function(){if(this.relatedTarget&&this.relatedTarget.nodeType==3)this.relatedTarget=this.relatedTarget.parentNode},relatedTargetGecko:function(){try{Event.fix.relatedTarget.call(this)}catch(e){this.relatedTarget=this.target}}};Event.prototype.fixRelatedTarget=(window.gecko)?Event.fix.relatedTargetGecko:Event.fix.relatedTarget;Event.keys=new Abstract({'enter':13,'up':38,'down':40,'left':37,'right':39,'esc':27,'space':32,'backspace':8,'tab':9,'delete':46});Element.Methods.Events={addEvent:function(a,b){this.$events=this.$events||{};this.$events[a]=this.$events[a]||{'keys':[],'values':[]};if(this.$events[a].keys.contains(b))return this;this.$events[a].keys.push(b);var c=a;var d=Element.Events[a];if(d){if(d.add)d.add.call(this,b);if(d.map)b=d.map;if(d.type)c=d.type}if(!this.addEventListener)b=b.create({'bind':this,'event':true});this.$events[a].values.push(b);return(Element.NativeEvents.contains(c))?this.addListener(c,b):this},removeEvent:function(a,b){if(!this.$events||!this.$events[a])return this;var c=this.$events[a].keys.indexOf(b);if(c==-1)return this;var d=this.$events[a].keys.splice(c,1)[0];var e=this.$events[a].values.splice(c,1)[0];var f=Element.Events[a];if(f){if(f.remove)f.remove.call(this,b);if(f.type)a=f.type}return(Element.NativeEvents.contains(a))?this.removeListener(a,e):this},addEvents:function(a){return Element.setMany(this,'addEvent',a)},removeEvents:function(b){if(!this.$events)return this;if(!b){for(var c in this.$events)this.removeEvents(c);this.$events=null}else if(this.$events[b]){this.$events[b].keys.each(function(a){this.removeEvent(b,a)},this);this.$events[b]=null}return this},fireEvent:function(b,c,d){if(this.$events&&this.$events[b]){this.$events[b].keys.each(function(a){a.create({'bind':this,'delay':d,'arguments':c})()},this)}return this},cloneEvents:function(b,c){if(!b.$events)return this;if(!c){for(var d in b.$events)this.cloneEvents(b,d)}else if(b.$events[c]){b.$events[c].keys.each(function(a){this.addEvent(c,a)},this)}return this}};window.extend(Element.Methods.Events);document.extend(Element.Methods.Events);Element.extend(Element.Methods.Events);Element.Events=new Abstract({'mouseenter':{type:'mouseover',map:function(a){a=new Event(a);if(a.relatedTarget!=this&&!this.hasChild(a.relatedTarget))this.fireEvent('mouseenter',a)}},'mouseleave':{type:'mouseout',map:function(a){a=new Event(a);if(a.relatedTarget!=this&&!this.hasChild(a.relatedTarget))this.fireEvent('mouseleave',a)}},'mousewheel':{type:(window.gecko)?'DOMMouseScroll':'mousewheel'}});Element.NativeEvents=['click','dblclick','mouseup','mousedown','mousewheel','DOMMouseScroll','mouseover','mouseout','mousemove','keydown','keypress','keyup','load','unload','beforeunload','resize','move','focus','blur','change','submit','reset','select','error','abort','contextmenu','scroll'];Function.extend({bindWithEvent:function(a,b){return this.create({'bind':a,'arguments':b,'event':Event})}});Elements.extend({filterByTag:function(b){return new Elements(this.filter(function(a){return(Element.getTag(a)==b)}))},filterByClass:function(b,c){var d=this.filter(function(a){return(a.className&&a.className.contains(b,' '))});return(c)?d:new Elements(d)},filterById:function(b,c){var d=this.filter(function(a){return(a.id==b)});return(c)?d:new Elements(d)},filterByAttribute:function(c,d,e,f){var g=this.filter(function(a){var b=Element.getProperty(a,c);if(!b)return false;if(!d)return true;switch(d){case'=':return(b==e);case'*=':return(b.contains(e));case'^=':return(b.substr(0,e.length)==e);case'$=':return(b.substr(b.length-e.length)==e);case'!=':return(b!=e);case'~=':return b.contains(e,' ')}return false});return(f)?g:new Elements(g)}});function $E(a,b){return($(b)||document).getElement(a)};function $ES(a,b){return($(b)||document).getElementsBySelector(a)};$$.shared={'regexp':/^(\w*|\*)(?:#([\w-]+)|\.([\w-]+))?(?:\[(\w+)(?:([!*^$]?=)["']?([^"'\]]*)["']?)?])?$/,'xpath':{getParam:function(a,b,c,i){var d=[b.namespaceURI?'xhtml:':'',c[1]];if(c[2])d.push('[@id="',c[2],'"]');if(c[3])d.push('[contains(concat(" ", @class, " "), " ',c[3],' ")]');if(c[4]){if(c[5]&&c[6]){switch(c[5]){case'*=':d.push('[contains(@',c[4],', "',c[6],'")]');break;case'^=':d.push('[starts-with(@',c[4],', "',c[6],'")]');break;case'$=':d.push('[substring(@',c[4],', string-length(@',c[4],') - ',c[6].length,' + 1) = "',c[6],'"]');break;case'=':d.push('[@',c[4],'="',c[6],'"]');break;case'!=':d.push('[@',c[4],'!="',c[6],'"]')}}else{d.push('[@',c[4],']')}}a.push(d.join(''));return a},getItems:function(a,b,c){var d=[];var e=document.evaluate('.//'+a.join('//'),b,$$.shared.resolver,XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE,null);for(var i=0,j=e.snapshotLength;i<j;i++)d.push(e.snapshotItem(i));return(c)?d:new Elements(d.map($))}},'normal':{getParam:function(a,b,c,i){if(i==0){if(c[2]){var d=b.getElementById(c[2]);if(!d||((c[1]!='*')&&(Element.getTag(d)!=c[1])))return false;a=[d]}else{a=$A(b.getElementsByTagName(c[1]))}}else{a=$$.shared.getElementsByTagName(a,c[1]);if(c[2])a=Elements.filterById(a,c[2],true)}if(c[3])a=Elements.filterByClass(a,c[3],true);if(c[4])a=Elements.filterByAttribute(a,c[4],c[5],c[6],true);return a},getItems:function(a,b,c){return(c)?a:$$.unique(a)}},resolver:function(a){return(a=='xhtml')?'http://www.w3.org/1999/xhtml':false},getElementsByTagName:function(a,b){var c=[];for(var i=0,j=a.length;i<j;i++)c.extend(a[i].getElementsByTagName(b));return c}};$$.shared.method=(window.xpath)?'xpath':'normal';Element.Methods.Dom={getElements:function(a,b){var c=[];a=a.trim().split(' ');for(var i=0,j=a.length;i<j;i++){var d=a[i];var e=d.match($$.shared.regexp);if(!e)break;e[1]=e[1]||'*';var f=$$.shared[$$.shared.method].getParam(c,this,e,i);if(!f)break;c=f}return $$.shared[$$.shared.method].getItems(c,this,b)},getElement:function(a){return $(this.getElements(a,true)[0]||false)},getElementsBySelector:function(a,b){var c=[];a=a.split(',');for(var i=0,j=a.length;i<j;i++)c=c.concat(this.getElements(a[i],true));return(b)?c:$$.unique(c)}};Element.extend({getElementById:function(a){var b=document.getElementById(a);if(!b)return false;for(var c=b.parentNode;c!=this;c=c.parentNode){if(!c)return false}return b}});document.extend(Element.Methods.Dom);Element.extend(Element.Methods.Dom);Element.extend({getValue:function(){switch(this.getTag()){case'select':var b=[];$each(this.options,function(a){if(a.selected)b.push($pick(a.value,a.text))});return(this.multiple)?b:b[0];case'input':if(!(this.checked&&['checkbox','radio'].contains(this.type))&&!['hidden','text','password'].contains(this.type))break;case'textarea':return this.value}return false},getFormElements:function(){return $$(this.getElementsByTagName('input'),this.getElementsByTagName('select'),this.getElementsByTagName('textarea'))},toQueryString:function(){var f=[];this.getFormElements().each(function(b){var c=b.name;var d=b.getValue();if(d===false||!c||b.disabled)return;var e=function(a){f.push(c+'='+encodeURIComponent(a))};if($type(d)=='array')d.each(e);else e(d)});return f.join('&')}});Element.extend({scrollTo:function(x,y){this.scrollLeft=x;this.scrollTop=y},getSize:function(){return{'scroll':{'x':this.scrollLeft,'y':this.scrollTop},'size':{'x':this.offsetWidth,'y':this.offsetHeight},'scrollSize':{'x':this.scrollWidth,'y':this.scrollHeight}}},getPosition:function(b){b=b||[];var c=this,left=0,top=0;do{left+=c.offsetLeft||0;top+=c.offsetTop||0;c=c.offsetParent}while(c);b.each(function(a){left-=a.scrollLeft||0;top-=a.scrollTop||0});return{'x':left,'y':top}},getTop:function(a){return this.getPosition(a).y},getLeft:function(a){return this.getPosition(a).x},getCoordinates:function(a){var b=this.getPosition(a);var c={'width':this.offsetWidth,'height':this.offsetHeight,'left':b.x,'top':b.y};c.right=c.left+c.width;c.bottom=c.top+c.height;return c}});Element.Events.domready={add:function(a){if(window.loaded){a.call(this);return}var b=function(){if(window.loaded)return;window.loaded=true;window.timer=$clear(window.timer);this.fireEvent('domready')}.bind(this);if(document.readyState&&window.webkit){window.timer=function(){if(['loaded','complete'].contains(document.readyState))b()}.periodical(50)}else if(document.readyState&&window.ie){if(!$('ie_ready')){var c=(window.location.protocol=='https:')?'://0':'javascript:void(0)';document.write('<script id="ie_ready" defer src="'+c+'"><\/script>');$('ie_ready').onreadystatechange=function(){if(this.readyState=='complete')b()}}}else{window.addListener("load",b);document.addListener("DOMContentLoaded",b)}}};window.extend({getWidth:function(){if(this.webkit419)return this.innerWidth;if(this.opera)return document.body.clientWidth;return document.documentElement.clientWidth},getHeight:function(){if(this.webkit419)return this.innerHeight;if(this.opera)return document.body.clientHeight;return document.documentElement.clientHeight},getScrollWidth:function(){if(this.ie)return Math.max(document.documentElement.offsetWidth,document.documentElement.scrollWidth);if(this.webkit)return document.body.scrollWidth;return document.documentElement.scrollWidth},getScrollHeight:function(){if(this.ie)return Math.max(document.documentElement.offsetHeight,document.documentElement.scrollHeight);if(this.webkit)return document.body.scrollHeight;return document.documentElement.scrollHeight},getScrollLeft:function(){return this.pageXOffset||document.documentElement.scrollLeft},getScrollTop:function(){return this.pageYOffset||document.documentElement.scrollTop},getSize:function(){return{'size':{'x':this.getWidth(),'y':this.getHeight()},'scrollSize':{'x':this.getScrollWidth(),'y':this.getScrollHeight()},'scroll':{'x':this.getScrollLeft(),'y':this.getScrollTop()}}},getPosition:function(){return{'x':0,'y':0}}});var Fx={};Fx.Base=new Class({options:{onStart:Class.empty,onComplete:Class.empty,onCancel:Class.empty,transition:function(p){return-(Math.cos(Math.PI*p)-1)/2},duration:500,unit:'px',wait:true,fps:50},initialize:function(a){this.element=this.element||null;this.setOptions(a);if(this.options.initialize)this.options.initialize.call(this)},step:function(){var a=$time();if(a<this.time+this.options.duration){this.delta=this.options.transition((a-this.time)/this.options.duration);this.setNow();this.increase()}else{this.stop(true);this.set(this.to);this.fireEvent('onComplete',this.element,10);this.callChain()}},set:function(a){this.now=a;this.increase();return this},setNow:function(){this.now=this.compute(this.from,this.to)},compute:function(a,b){return(b-a)*this.delta+a},start:function(a,b){if(!this.options.wait)this.stop();else if(this.timer)return this;this.from=a;this.to=b;this.change=this.to-this.from;this.time=$time();this.timer=this.step.periodical(Math.round(1000/this.options.fps),this);this.fireEvent('onStart',this.element);return this},stop:function(a){if(!this.timer)return this;this.timer=$clear(this.timer);if(!a)this.fireEvent('onCancel',this.element);return this}});Fx.Base.implement(new Chain,new Events,new Options);Fx.CSS={select:function(a,b){if(a.test(/color/i))return this.Color;var c=$type(b);if((c=='array')||(c=='string'&&b.contains(' ')))return this.Multi;return this.Single},parse:function(a,b,c){if(!c.push)c=[c];var d=c[0],to=c[1];if(!$chk(to)){to=d;d=a.getStyle(b)}var e=this.select(b,to);return{'from':e.parse(d),'to':e.parse(to),'css':e}}};Fx.CSS.Single={parse:function(a){return parseFloat(a)},getNow:function(a,b,c){return c.compute(a,b)},getValue:function(a,b,c){if(b=='px'&&c!='opacity')a=Math.round(a);return a+b}};Fx.CSS.Multi={parse:function(a){return a.push?a:a.split(' ').map(function(v){return parseFloat(v)})},getNow:function(a,b,c){var d=[];for(var i=0;i<a.length;i++)d[i]=c.compute(a[i],b[i]);return d},getValue:function(a,b,c){if(b=='px'&&c!='opacity')a=a.map(Math.round);return a.join(b+' ')+b}};Fx.CSS.Color={parse:function(a){return a.push?a:a.hexToRgb(true)},getNow:function(a,b,c){var d=[];for(var i=0;i<a.length;i++)d[i]=Math.round(c.compute(a[i],b[i]));return d},getValue:function(a){return'rgb('+a.join(',')+')'}};Fx.Style=Fx.Base.extend({initialize:function(a,b,c){this.element=$(a);this.property=b;this.parent(c)},hide:function(){return this.set(0)},setNow:function(){this.now=this.css.getNow(this.from,this.to,this)},set:function(a){this.css=Fx.CSS.select(this.property,a);return this.parent(this.css.parse(a))},start:function(a,b){if(this.timer&&this.options.wait)return this;var c=Fx.CSS.parse(this.element,this.property,[a,b]);this.css=c.css;return this.parent(c.from,c.to)},increase:function(){this.element.setStyle(this.property,this.css.getValue(this.now,this.options.unit,this.property))}});Element.extend({effect:function(a,b){return new Fx.Style(this,a,b)}});Fx.Styles=Fx.Base.extend({initialize:function(a,b){this.element=$(a);this.parent(b)},setNow:function(){for(var p in this.from)this.now[p]=this.css[p].getNow(this.from[p],this.to[p],this)},set:function(a){var b={};this.css={};for(var p in a){this.css[p]=Fx.CSS.select(p,a[p]);b[p]=this.css[p].parse(a[p])}return this.parent(b)},start:function(a){if(this.timer&&this.options.wait)return this;this.now={};this.css={};var b={},to={};for(var p in a){var c=Fx.CSS.parse(this.element,p,a[p]);b[p]=c.from;to[p]=c.to;this.css[p]=c.css}return this.parent(b,to)},increase:function(){for(var p in this.now)this.element.setStyle(p,this.css[p].getValue(this.now[p],this.options.unit,p))}});Element.extend({effects:function(a){return new Fx.Styles(this,a)}});Fx.Elements=Fx.Base.extend({initialize:function(a,b){this.elements=$$(a);this.parent(b)},setNow:function(){for(var i in this.from){var a=this.from[i],iTo=this.to[i],iCss=this.css[i],iNow=this.now[i]={};for(var p in a)iNow[p]=iCss[p].getNow(a[p],iTo[p],this)}},set:function(a){var b={};this.css={};for(var i in a){var c=a[i],iCss=this.css[i]={},iParsed=b[i]={};for(var p in c){iCss[p]=Fx.CSS.select(p,c[p]);iParsed[p]=iCss[p].parse(c[p])}}return this.parent(b)},start:function(a){if(this.timer&&this.options.wait)return this;this.now={};this.css={};var b={},to={};for(var i in a){var c=a[i],iFrom=b[i]={},iTo=to[i]={},iCss=this.css[i]={};for(var p in c){var d=Fx.CSS.parse(this.elements[i],p,c[p]);iFrom[p]=d.from;iTo[p]=d.to;iCss[p]=d.css}}return this.parent(b,to)},increase:function(){for(var i in this.now){var a=this.now[i],iCss=this.css[i];for(var p in a)this.elements[i].setStyle(p,iCss[p].getValue(a[p],this.options.unit,p))}}});Fx.Scroll=Fx.Base.extend({options:{overflown:[],offset:{'x':0,'y':0},wheelStops:true},initialize:function(a,b){this.now=[];this.element=$(a);this.bound={'stop':this.stop.bind(this,false)};this.parent(b);if(this.options.wheelStops){this.addEvent('onStart',function(){document.addEvent('mousewheel',this.bound.stop)}.bind(this));this.addEvent('onComplete',function(){document.removeEvent('mousewheel',this.bound.stop)}.bind(this))}},setNow:function(){for(var i=0;i<2;i++)this.now[i]=this.compute(this.from[i],this.to[i])},scrollTo:function(x,y){if(this.timer&&this.options.wait)return this;var a=this.element.getSize();var b={'x':x,'y':y};for(var z in a.size){var c=a.scrollSize[z]-a.size[z];if($chk(b[z]))b[z]=($type(b[z])=='number')?b[z].limit(0,c):c;else b[z]=a.scroll[z];b[z]+=this.options.offset[z]}return this.start([a.scroll.x,a.scroll.y],[b.x,b.y])},toTop:function(){return this.scrollTo(false,0)},toBottom:function(){return this.scrollTo(false,'full')},toLeft:function(){return this.scrollTo(0,false)},toRight:function(){return this.scrollTo('full',false)},toElement:function(a){var b=this.element.getPosition(this.options.overflown);var c=$(a).getPosition(this.options.overflown);return this.scrollTo(c.x-b.x,c.y-b.y)},increase:function(){this.element.scrollTo(this.now[0],this.now[1])}});Fx.Slide=Fx.Base.extend({options:{mode:'vertical'},initialize:function(a,b){this.element=$(a);this.wrapper=new Element('div',{'styles':$extend(this.element.getStyles('margin'),{'overflow':'hidden'})}).injectAfter(this.element).adopt(this.element);this.element.setStyle('margin',0);this.setOptions(b);this.now=[];this.parent(this.options);this.open=true;this.addEvent('onComplete',function(){this.open=(this.now[0]===0)});if(window.webkit419)this.addEvent('onComplete',function(){if(this.open)this.element.remove().inject(this.wrapper)})},setNow:function(){for(var i=0;i<2;i++)this.now[i]=this.compute(this.from[i],this.to[i])},vertical:function(){this.margin='margin-top';this.layout='height';this.offset=this.element.offsetHeight},horizontal:function(){this.margin='margin-left';this.layout='width';this.offset=this.element.offsetWidth},slideIn:function(a){this[a||this.options.mode]();return this.start([this.element.getStyle(this.margin).toInt(),this.wrapper.getStyle(this.layout).toInt()],[0,this.offset])},slideOut:function(a){this[a||this.options.mode]();return this.start([this.element.getStyle(this.margin).toInt(),this.wrapper.getStyle(this.layout).toInt()],[-this.offset,0])},hide:function(a){this[a||this.options.mode]();this.open=false;return this.set([-this.offset,0])},show:function(a){this[a||this.options.mode]();this.open=true;return this.set([0,this.offset])},toggle:function(a){if(this.wrapper.offsetHeight==0||this.wrapper.offsetWidth==0)return this.slideIn(a);return this.slideOut(a)},increase:function(){this.element.setStyle(this.margin,this.now[0]+this.options.unit);this.wrapper.setStyle(this.layout,this.now[1]+this.options.unit)}});Fx.Transition=function(b,c){c=c||[];if($type(c)!='array')c=[c];return $extend(b,{easeIn:function(a){return b(a,c)},easeOut:function(a){return 1-b(1-a,c)},easeInOut:function(a){return(a<=0.5)?b(2*a,c)/2:(2-b(2*(1-a),c))/2}})};Fx.Transitions=new Abstract({linear:function(p){return p}});Fx.Transitions.extend=function(a){for(var b in a)Fx.Transitions[b]=new Fx.Transition(a[b])};Fx.Transitions.extend({Pow:function(p,x){return Math.pow(p,x[0]||6)},Expo:function(p){return Math.pow(2,8*(p-1))},Circ:function(p){return 1-Math.sin(Math.acos(p))},Sine:function(p){return 1-Math.sin((1-p)*Math.PI/2)},Back:function(p,x){x=x[0]||1.618;return Math.pow(p,2)*((x+1)*p-x)},Bounce:function(p){var c;for(var a=0,b=1;1;a+=b,b/=2){if(p>=(7-4*a)/11){c=-Math.pow((11-6*a-11*p)/4,2)+b*b;break}}return c},Elastic:function(p,x){return Math.pow(2,10*--p)*Math.cos(20*p*Math.PI*(x[0]||1)/3)}});['Quad','Cubic','Quart','Quint'].each(function(a,i){Fx.Transitions[a]=new Fx.Transition(function(p){return Math.pow(p,[i+2])})});var Drag={};Drag.Base=new Class({options:{handle:false,unit:'px',onStart:Class.empty,onBeforeStart:Class.empty,onComplete:Class.empty,onSnap:Class.empty,onDrag:Class.empty,limit:false,modifiers:{x:'left',y:'top'},grid:false,snap:6},initialize:function(a,b){this.setOptions(b);this.element=$(a);this.handle=$(this.options.handle)||this.element;this.mouse={'now':{},'pos':{}};this.value={'start':{},'now':{}};this.bound={'start':this.start.bindWithEvent(this),'check':this.check.bindWithEvent(this),'drag':this.drag.bindWithEvent(this),'stop':this.stop.bind(this)};this.attach();if(this.options.initialize)this.options.initialize.call(this)},attach:function(){this.handle.addEvent('mousedown',this.bound.start);return this},detach:function(){this.handle.removeEvent('mousedown',this.bound.start);return this},start:function(a){this.fireEvent('onBeforeStart',this.element);this.mouse.start=a.page;var b=this.options.limit;this.limit={'x':[],'y':[]};for(var z in this.options.modifiers){if(!this.options.modifiers[z])continue;this.value.now[z]=this.element.getStyle(this.options.modifiers[z]).toInt();this.mouse.pos[z]=a.page[z]-this.value.now[z];if(b&&b[z]){for(var i=0;i<2;i++){if($chk(b[z][i]))this.limit[z][i]=($type(b[z][i])=='function')?b[z][i]():b[z][i]}}}if($type(this.options.grid)=='number')this.options.grid={'x':this.options.grid,'y':this.options.grid};document.addListener('mousemove',this.bound.check);document.addListener('mouseup',this.bound.stop);this.fireEvent('onStart',this.element);a.stop()},check:function(a){var b=Math.round(Math.sqrt(Math.pow(a.page.x-this.mouse.start.x,2)+Math.pow(a.page.y-this.mouse.start.y,2)));if(b>this.options.snap){document.removeListener('mousemove',this.bound.check);document.addListener('mousemove',this.bound.drag);this.drag(a);this.fireEvent('onSnap',this.element)}a.stop()},drag:function(a){this.out=false;this.mouse.now=a.page;for(var z in this.options.modifiers){if(!this.options.modifiers[z])continue;this.value.now[z]=this.mouse.now[z]-this.mouse.pos[z];if(this.limit[z]){if($chk(this.limit[z][1])&&(this.value.now[z]>this.limit[z][1])){this.value.now[z]=this.limit[z][1];this.out=true}else if($chk(this.limit[z][0])&&(this.value.now[z]<this.limit[z][0])){this.value.now[z]=this.limit[z][0];this.out=true}}if(this.options.grid[z])this.value.now[z]-=(this.value.now[z]%this.options.grid[z]);this.element.setStyle(this.options.modifiers[z],this.value.now[z]+this.options.unit)}this.fireEvent('onDrag',this.element);a.stop()},stop:function(){document.removeListener('mousemove',this.bound.check);document.removeListener('mousemove',this.bound.drag);document.removeListener('mouseup',this.bound.stop);this.fireEvent('onComplete',this.element)}});Drag.Base.implement(new Events,new Options);Element.extend({makeResizable:function(a){return new Drag.Base(this,$merge({modifiers:{x:'width',y:'height'}},a))}});Drag.Move=Drag.Base.extend({options:{droppables:[],container:false,overflown:[]},initialize:function(a,b){this.setOptions(b);this.element=$(a);this.droppables=$$(this.options.droppables);this.container=$(this.options.container);this.position={'element':this.element.getStyle('position'),'container':false};if(this.container)this.position.container=this.container.getStyle('position');if(!['relative','absolute','fixed'].contains(this.position.element))this.position.element='absolute';var c=this.element.getStyle('top').toInt();var d=this.element.getStyle('left').toInt();if(this.position.element=='absolute'&&!['relative','absolute','fixed'].contains(this.position.container)){c=$chk(c)?c:this.element.getTop(this.options.overflown);d=$chk(d)?d:this.element.getLeft(this.options.overflown)}else{c=$chk(c)?c:0;d=$chk(d)?d:0}this.element.setStyles({'top':c,'left':d,'position':this.position.element});this.parent(this.element)},start:function(a){this.overed=null;if(this.container){var b=this.container.getCoordinates();var c=this.element.getCoordinates();if(this.position.element=='absolute'&&!['relative','absolute','fixed'].contains(this.position.container)){this.options.limit={'x':[b.left,b.right-c.width],'y':[b.top,b.bottom-c.height]}}else{this.options.limit={'y':[0,b.height-c.height],'x':[0,b.width-c.width]}}}this.parent(a)},drag:function(a){this.parent(a);var b=this.out?false:this.droppables.filter(this.checkAgainst,this).getLast();if(this.overed!=b){if(this.overed)this.overed.fireEvent('leave',[this.element,this]);this.overed=b?b.fireEvent('over',[this.element,this]):null}return this},checkAgainst:function(a){a=a.getCoordinates(this.options.overflown);var b=this.mouse.now;return(b.x>a.left&&b.x<a.right&&b.y<a.bottom&&b.y>a.top)},stop:function(){if(this.overed&&!this.out)this.overed.fireEvent('drop',[this.element,this]);else this.element.fireEvent('emptydrop',this);this.parent();return this}});Element.extend({makeDraggable:function(a){return new Drag.Move(this,a)}});var XHR=new Class({options:{method:'post',async:true,onRequest:Class.empty,onSuccess:Class.empty,onFailure:Class.empty,urlEncoded:true,encoding:'utf-8',autoCancel:false,headers:{}},setTransport:function(){this.transport=(window.XMLHttpRequest)?new XMLHttpRequest():(window.ie?new ActiveXObject('Microsoft.XMLHTTP'):false);return this},initialize:function(a){this.setTransport().setOptions(a);this.options.isSuccess=this.options.isSuccess||this.isSuccess;this.headers={};if(this.options.urlEncoded&&this.options.method=='post'){var b=(this.options.encoding)?'; charset='+this.options.encoding:'';this.setHeader('Content-type','application/x-www-form-urlencoded'+b)}if(this.options.initialize)this.options.initialize.call(this)},onStateChange:function(){if(this.transport.readyState!=4||!this.running)return;this.running=false;var a=0;try{a=this.transport.status}catch(e){};if(this.options.isSuccess.call(this,a))this.onSuccess();else this.onFailure();this.transport.onreadystatechange=Class.empty},isSuccess:function(a){return((a>=200)&&(a<300))},onSuccess:function(){this.response={'text':this.transport.responseText,'xml':this.transport.responseXML};this.fireEvent('onSuccess',[this.response.text,this.response.xml]);this.callChain()},onFailure:function(){this.fireEvent('onFailure',this.transport)},setHeader:function(a,b){this.headers[a]=b;return this},send:function(a,b){if(this.options.autoCancel)this.cancel();else if(this.running)return this;this.running=true;if(b&&this.options.method=='get'){a=a+(a.contains('?')?'&':'?')+b;b=null}this.transport.open(this.options.method.toUpperCase(),a,this.options.async);this.transport.onreadystatechange=this.onStateChange.bind(this);if((this.options.method=='post')&&this.transport.overrideMimeType)this.setHeader('Connection','close');$extend(this.headers,this.options.headers);for(var c in this.headers)try{this.transport.setRequestHeader(c,this.headers[c])}catch(e){};this.fireEvent('onRequest');this.transport.send($pick(b,null));return this},cancel:function(){if(!this.running)return this;this.running=false;this.transport.abort();this.transport.onreadystatechange=Class.empty;this.setTransport();this.fireEvent('onCancel');return this}});XHR.implement(new Chain,new Events,new Options);var Ajax=XHR.extend({options:{data:null,update:null,onComplete:Class.empty,evalScripts:false,evalResponse:false},initialize:function(a,b){this.addEvent('onSuccess',this.onComplete);this.setOptions(b);if(!['post','get'].contains(this.options.method)){this._method='_method='+this.options.method;this.options.method='post'}this.parent();this.setHeader('X-Requested-With','XMLHttpRequest');this.setHeader('Accept','text/javascript, text/html, application/xml, text/xml, */*');this.url=a},onComplete:function(){if(this.options.update)$(this.options.update).empty().setHTML(this.response.text);if(this.options.evalScripts||this.options.evalResponse)this.evalScripts();this.fireEvent('onComplete',[this.response.text,this.response.xml],20)},request:function(a){a=a||this.options.data;switch($type(a)){case'element':a=$(a).toQueryString();break;case'object':a=Object.toQueryString(a)}if(this._method)a=(a)?[this._method,a].join('&'):this._method;return this.send(this.url,a)},evalScripts:function(){var a,scripts;if(this.options.evalResponse||(/(ecma|java)script/).test(this.getHeader('Content-type')))scripts=this.response.text;else{scripts=[];var b=/<script[^>]*>([\s\S]*?)<\/script>/gi;while((a=b.exec(this.response.text)))scripts.push(a[1]);scripts=scripts.join('\n')}if(scripts)(window.execScript)?window.execScript(scripts):eval.call(window,scripts)},getHeader:function(a){try{return this.transport.getResponseHeader(a)}catch(e){};return null}});Object.toQueryString=function(a){var b=[];for(var c in a)b.push(encodeURIComponent(c)+'='+encodeURIComponent(a[c]));return b.join('&')};Element.extend({send:function(a){return new Ajax(this.getProperty('action'),$merge({data:this.toQueryString()},a,{method:'post'})).request()}});var Cookie=new Abstract({options:{domain:false,path:false,duration:false,secure:false},set:function(a,b,c){c=$merge(this.options,c);b=encodeURIComponent(b);if(c.domain)b+='; domain='+c.domain;if(c.path)b+='; path='+c.path;if(c.duration){var d=new Date();d.setTime(d.getTime()+c.duration*24*60*60*1000);b+='; expires='+d.toGMTString()}if(c.secure)b+='; secure';document.cookie=a+'='+b;return $extend(c,{'key':a,'value':b})},get:function(a){var b=document.cookie.match('(?:^|;)\\s*'+a.escapeRegExp()+'=([^;]*)');return b?decodeURIComponent(b[1]):false},remove:function(a,b){if($type(a)=='object')this.set(a.key,'',$merge(a,{duration:-1}));else this.set(a,'',$merge(b,{duration:-1}))}});var Json={toString:function(a){switch($type(a)){case'string':return'"'+a.replace(/(["\\])/g,'\\$1')+'"';case'array':return'['+a.map(Json.toString).join(',')+']';case'object':var b=[];for(var c in a)b.push(Json.toString(c)+':'+Json.toString(a[c]));return'{'+b.join(',')+'}';case'number':if(isFinite(a))break;case false:return'null'}return String(a)},evaluate:function(a,b){return(($type(a)!='string')||(b&&!a.test(/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/)))?null:eval('('+a+')')}};Json.Remote=XHR.extend({initialize:function(a,b){this.url=a;this.addEvent('onSuccess',this.onComplete);this.parent(b);this.setHeader('X-Request','JSON')},send:function(a){return this.parent(this.url,'json='+Json.toString(a))},onComplete:function(){this.fireEvent('onComplete',[Json.evaluate(this.response.text,this.options.secure)])}});var Asset=new Abstract({javascript:function(a,b){b=$merge({'onload':Class.empty},b);var c=new Element('script',{'src':a}).addEvents({'load':b.onload,'readystatechange':function(){if(this.readyState=='complete')this.fireEvent('load')}});delete b.onload;return c.setProperties(b).inject(document.head)},css:function(a,b){return new Element('link',$merge({'rel':'stylesheet','media':'screen','type':'text/css','href':a},b)).inject(document.head)},image:function(c,d){d=$merge({'onload':Class.empty,'onabort':Class.empty,'onerror':Class.empty},d);var e=new Image();e.src=c;var f=new Element('img',{'src':c});['load','abort','error'].each(function(a){var b=d['on'+a];delete d['on'+a];f.addEvent(a,function(){this.removeEvent(a,arguments.callee);b.call(this)})});if(e.width&&e.height)f.fireEvent('load',f,1);return f.setProperties(d)},images:function(c,d){d=$merge({onComplete:Class.empty,onProgress:Class.empty},d);if(!c.push)c=[c];var e=[];var f=0;c.each(function(a){var b=new Asset.image(a,{'onload':function(){d.onProgress.call(this,f);f++;if(f==c.length)d.onComplete()}});e.push(b)});return new Elements(e)}});var Hash=new Class({length:0,initialize:function(a){this.obj=a||{};this.setLength()},get:function(a){return(this.hasKey(a))?this.obj[a]:null},hasKey:function(a){return(a in this.obj)},set:function(a,b){if(!this.hasKey(a))this.length++;this.obj[a]=b;return this},setLength:function(){this.length=0;for(var p in this.obj)this.length++;return this},remove:function(a){if(this.hasKey(a)){delete this.obj[a];this.length--}return this},each:function(a,b){$each(this.obj,a,b)},extend:function(a){$extend(this.obj,a);return this.setLength()},merge:function(){this.obj=$merge.apply(null,[this.obj].extend(arguments));return this.setLength()},empty:function(){this.obj={};this.length=0;return this},keys:function(){var a=[];for(var b in this.obj)a.push(b);return a},values:function(){var a=[];for(var b in this.obj)a.push(this.obj[b]);return a}});function $H(a){return new Hash(a)};Hash.Cookie=Hash.extend({initialize:function(a,b){this.name=a;this.options=$extend({'autoSave':true},b||{});this.load()},save:function(){if(this.length==0){Cookie.remove(this.name,this.options);return true}var a=Json.toString(this.obj);if(a.length>4096)return false;Cookie.set(this.name,a,this.options);return true},load:function(){this.obj=Json.evaluate(Cookie.get(this.name),true)||{};this.setLength()}});Hash.Cookie.Methods={};['extend','set','merge','empty','remove'].each(function(a){Hash.Cookie.Methods[a]=function(){Hash.prototype[a].apply(this,arguments);if(this.options.autoSave)this.save();return this}});Hash.Cookie.implement(Hash.Cookie.Methods);var Color=new Class({initialize:function(a,b){b=b||(a.push?'rgb':'hex');var c,hsb;switch(b){case'rgb':c=a;hsb=c.rgbToHsb();break;case'hsb':c=a.hsbToRgb();hsb=a;break;default:c=a.hexToRgb(true);hsb=c.rgbToHsb()}c.hsb=hsb;c.hex=c.rgbToHex();return $extend(c,Color.prototype)},mix:function(){var b=$A(arguments);var c=($type(b[b.length-1])=='number')?b.pop():50;var d=this.copy();b.each(function(a){a=new Color(a);for(var i=0;i<3;i++)d[i]=Math.round((d[i]/100*(100-c))+(a[i]/100*c))});return new Color(d,'rgb')},invert:function(){return new Color(this.map(function(a){return 255-a}))},setHue:function(a){return new Color([a,this.hsb[1],this.hsb[2]],'hsb')},setSaturation:function(a){return new Color([this.hsb[0],a,this.hsb[2]],'hsb')},setBrightness:function(a){return new Color([this.hsb[0],this.hsb[1],a],'hsb')}});function $RGB(r,g,b){return new Color([r,g,b],'rgb')};function $HSB(h,s,b){return new Color([h,s,b],'hsb')};Array.extend({rgbToHsb:function(){var a=this[0],green=this[1],blue=this[2];var b,saturation,brightness;var c=Math.max(a,green,blue),min=Math.min(a,green,blue);var d=c-min;brightness=c/255;saturation=(c!=0)?d/c:0;if(saturation==0){b=0}else{var e=(c-a)/d;var f=(c-green)/d;var g=(c-blue)/d;if(a==c)b=g-f;else if(green==c)b=2+e-g;else b=4+f-e;b/=6;if(b<0)b++}return[Math.round(b*360),Math.round(saturation*100),Math.round(brightness*100)]},hsbToRgb:function(){var a=Math.round(this[2]/100*255);if(this[1]==0){return[a,a,a]}else{var b=this[0]%360;var f=b%60;var p=Math.round((this[2]*(100-this[1]))/10000*255);var q=Math.round((this[2]*(6000-this[1]*f))/600000*255);var t=Math.round((this[2]*(6000-this[1]*(60-f)))/600000*255);switch(Math.floor(b/60)){case 0:return[a,t,p];case 1:return[q,a,p];case 2:return[p,a,t];case 3:return[p,q,a];case 4:return[t,p,a];case 5:return[a,p,q]}}return false}});var Scroller=new Class({options:{area:20,velocity:1,onChange:function(x,y){this.element.scrollTo(x,y)}},initialize:function(a,b){this.setOptions(b);this.element=$(a);this.mousemover=([window,document].contains(a))?$(document.body):this.element},start:function(){this.coord=this.getCoords.bindWithEvent(this);this.mousemover.addListener('mousemove',this.coord)},stop:function(){this.mousemover.removeListener('mousemove',this.coord);this.timer=$clear(this.timer)},getCoords:function(a){this.page=(this.element==window)?a.client:a.page;if(!this.timer)this.timer=this.scroll.periodical(50,this)},scroll:function(){var a=this.element.getSize();var b=this.element.getPosition();var c={'x':0,'y':0};for(var z in this.page){if(this.page[z]<(this.options.area+b[z])&&a.scroll[z]!=0)c[z]=(this.page[z]-this.options.area-b[z])*this.options.velocity;else if(this.page[z]+this.options.area>(a.size[z]+b[z])&&a.scroll[z]+a.size[z]!=a.scrollSize[z])c[z]=(this.page[z]-a.size[z]+this.options.area-b[z])*this.options.velocity}if(c.y||c.x)this.fireEvent('onChange',[a.scroll.x+c.x,a.scroll.y+c.y])}});Scroller.implement(new Events,new Options);var Slider=new Class({options:{onChange:Class.empty,onComplete:Class.empty,onTick:function(a){this.knob.setStyle(this.p,a)},mode:'horizontal',steps:100,offset:0},initialize:function(a,b,c){this.element=$(a);this.knob=$(b);this.setOptions(c);this.previousChange=-1;this.previousEnd=-1;this.step=-1;this.element.addEvent('mousedown',this.clickedElement.bindWithEvent(this));var d,offset;switch(this.options.mode){case'horizontal':this.z='x';this.p='left';d={'x':'left','y':false};offset='offsetWidth';break;case'vertical':this.z='y';this.p='top';d={'x':false,'y':'top'};offset='offsetHeight'}this.max=this.element[offset]-this.knob[offset]+(this.options.offset*2);this.half=this.knob[offset]/2;this.getPos=this.element['get'+this.p.capitalize()].bind(this.element);this.knob.setStyle('position','relative').setStyle(this.p,-this.options.offset);var e={};e[this.z]=[-this.options.offset,this.max-this.options.offset];this.drag=new Drag.Base(this.knob,{limit:e,modifiers:d,snap:0,onStart:function(){this.draggedKnob()}.bind(this),onDrag:function(){this.draggedKnob()}.bind(this),onComplete:function(){this.draggedKnob();this.end()}.bind(this)});if(this.options.initialize)this.options.initialize.call(this)},set:function(a){this.step=a.limit(0,this.options.steps);this.checkStep();this.end();this.fireEvent('onTick',this.toPosition(this.step));return this},clickedElement:function(a){var b=a.page[this.z]-this.getPos()-this.half;b=b.limit(-this.options.offset,this.max-this.options.offset);this.step=this.toStep(b);this.checkStep();this.end();this.fireEvent('onTick',b)},draggedKnob:function(){this.step=this.toStep(this.drag.value.now[this.z]);this.checkStep()},checkStep:function(){if(this.previousChange!=this.step){this.previousChange=this.step;this.fireEvent('onChange',this.step)}},end:function(){if(this.previousEnd!==this.step){this.previousEnd=this.step;this.fireEvent('onComplete',this.step+'')}},toStep:function(a){return Math.round((a+this.options.offset)/this.max*this.options.steps)},toPosition:function(a){return this.max*a/this.options.steps}});Slider.implement(new Events);Slider.implement(new Options);var SmoothScroll=Fx.Scroll.extend({initialize:function(c){this.parent(window,c);this.links=(this.options.links)?$$(this.options.links):$$(document.links);var d=window.location.href.match(/^[^#]*/)[0]+'#';this.links.each(function(a){if(a.href.indexOf(d)!=0)return;var b=a.href.substr(d.length);if(b&&$(b))this.useLink(a,b)},this);if(!window.webkit419)this.addEvent('onComplete',function(){window.location.hash=this.anchor})},useLink:function(b,c){b.addEvent('click',function(a){this.anchor=c;this.toElement(c);a.stop()}.bindWithEvent(this))}});var Sortables=new Class({options:{handles:false,onStart:Class.empty,onComplete:Class.empty,ghost:true,snap:3,onDragStart:function(a,b){b.setStyle('opacity',0.7);a.setStyle('opacity',0.7)},onDragComplete:function(a,b){a.setStyle('opacity',1);b.remove();this.trash.remove()}},initialize:function(a,b){this.setOptions(b);this.list=$(a);this.elements=this.list.getChildren();this.handles=(this.options.handles)?$$(this.options.handles):this.elements;this.bound={'start':[],'moveGhost':this.moveGhost.bindWithEvent(this)};for(var i=0,l=this.handles.length;i<l;i++){this.bound.start[i]=this.start.bindWithEvent(this,this.elements[i])}this.attach();if(this.options.initialize)this.options.initialize.call(this);this.bound.move=this.move.bindWithEvent(this);this.bound.end=this.end.bind(this)},attach:function(){this.handles.each(function(a,i){a.addEvent('mousedown',this.bound.start[i])},this)},detach:function(){this.handles.each(function(a,i){a.removeEvent('mousedown',this.bound.start[i])},this)},start:function(a,b){this.active=b;this.coordinates=this.list.getCoordinates();if(this.options.ghost){var c=b.getPosition();this.offset=a.page.y-c.y;this.trash=new Element('div').inject(document.body);this.ghost=b.clone().inject(this.trash).setStyles({'position':'absolute','left':c.x,'top':a.page.y-this.offset});document.addListener('mousemove',this.bound.moveGhost);this.fireEvent('onDragStart',[b,this.ghost])}document.addListener('mousemove',this.bound.move);document.addListener('mouseup',this.bound.end);this.fireEvent('onStart',b);a.stop()},moveGhost:function(a){var b=a.page.y-this.offset;b=b.limit(this.coordinates.top,this.coordinates.bottom-this.ghost.offsetHeight);this.ghost.setStyle('top',b);a.stop()},move:function(a){var b=a.page.y;this.previous=this.previous||b;var c=((this.previous-b)>0);var d=this.active.getPrevious();var e=this.active.getNext();if(d&&c&&b<d.getCoordinates().bottom)this.active.injectBefore(d);if(e&&!c&&b>e.getCoordinates().top)this.active.injectAfter(e);this.previous=b},serialize:function(b){return this.list.getChildren().map(b||function(a){return this.elements.indexOf(a)},this)},end:function(){this.previous=null;document.removeListener('mousemove',this.bound.move);document.removeListener('mouseup',this.bound.end);if(this.options.ghost){document.removeListener('mousemove',this.bound.moveGhost);this.fireEvent('onDragComplete',[this.active,this.ghost])}this.fireEvent('onComplete',this.active)}});Sortables.implement(new Events,new Options);var Tips=new Class({options:{onShow:function(a){a.setStyle('visibility','visible')},onHide:function(a){a.setStyle('visibility','hidden')},maxTitleChars:30,showDelay:100,hideDelay:100,className:'tool',offsets:{'x':16,'y':16},fixed:false},initialize:function(a,b){this.setOptions(b);this.toolTip=new Element('div',{'class':this.options.className+'-tip','styles':{'position':'absolute','top':'0','left':'0','visibility':'hidden'}}).inject(document.body);this.wrapper=new Element('div').inject(this.toolTip);$$(a).each(this.build,this);if(this.options.initialize)this.options.initialize.call(this)},build:function(b){b.$tmp.myTitle=(b.href&&b.getTag()=='a')?b.href.replace('http://',''):(b.rel||false);if(b.title){var c=b.title.split('::');if(c.length>1){b.$tmp.myTitle=c[0].trim();b.$tmp.myText=c[1].trim()}else{b.$tmp.myText=b.title}b.removeAttribute('title')}else{b.$tmp.myText=false}if(b.$tmp.myTitle&&b.$tmp.myTitle.length>this.options.maxTitleChars)b.$tmp.myTitle=b.$tmp.myTitle.substr(0,this.options.maxTitleChars-1)+"&hellip;";b.addEvent('mouseenter',function(a){this.start(b);if(!this.options.fixed)this.locate(a);else this.position(b)}.bind(this));if(!this.options.fixed)b.addEvent('mousemove',this.locate.bindWithEvent(this));var d=this.end.bind(this);b.addEvent('mouseleave',d);b.addEvent('trash',d)},start:function(a){this.wrapper.empty();if(a.$tmp.myTitle){this.title=new Element('span').inject(new Element('div',{'class':this.options.className+'-title'}).inject(this.wrapper)).setHTML(a.$tmp.myTitle)}if(a.$tmp.myText){this.text=new Element('span').inject(new Element('div',{'class':this.options.className+'-text'}).inject(this.wrapper)).setHTML(a.$tmp.myText)}$clear(this.timer);this.timer=this.show.delay(this.options.showDelay,this)},end:function(a){$clear(this.timer);this.timer=this.hide.delay(this.options.hideDelay,this)},position:function(a){var b=a.getPosition();this.toolTip.setStyles({'left':b.x+this.options.offsets.x,'top':b.y+this.options.offsets.y})},locate:function(a){var b={'x':window.getWidth(),'y':window.getHeight()};var c={'x':window.getScrollLeft(),'y':window.getScrollTop()};var d={'x':this.toolTip.offsetWidth,'y':this.toolTip.offsetHeight};var e={'x':'left','y':'top'};for(var z in e){var f=a.page[z]+this.options.offsets[z];if((f+d[z]-c[z])>b[z])f=a.page[z]-this.options.offsets[z]-d[z];this.toolTip.setStyle(e[z],f)}},show:function(){if(this.options.timeout)this.timer=this.hide.delay(this.options.timeout,this);this.fireEvent('onShow',[this.toolTip])},hide:function(){this.fireEvent('onHide',[this.toolTip])}});Tips.implement(new Events,new Options);var Group=new Class({initialize:function(){this.instances=$A(arguments);this.events={};this.checker={}},addEvent:function(b,c){this.checker[b]=this.checker[b]||{};this.events[b]=this.events[b]||[];if(this.events[b].contains(c))return false;else this.events[b].push(c);this.instances.each(function(a,i){a.addEvent(b,this.check.bind(this,[b,a,i]))},this);return this},check:function(b,c,i){this.checker[b][i]=true;var d=this.instances.every(function(a,j){return this.checker[b][j]||false},this);if(!d)return;this.checker[b]={};this.events[b].each(function(a){a.call(this,this.instances,c)},this)}});var Accordion=Fx.Elements.extend({options:{onActive:Class.empty,onBackground:Class.empty,display:0,show:false,height:true,width:false,opacity:true,fixedHeight:false,fixedWidth:false,wait:false,alwaysHide:false},initialize:function(){var c,togglers,elements,container;$each(arguments,function(a,i){switch($type(a)){case'object':c=a;break;case'element':container=$(a);break;default:var b=$$(a);if(!togglers)togglers=b;else elements=b}});this.togglers=togglers||[];this.elements=elements||[];this.container=$(container);this.setOptions(c);this.previous=-1;if(this.options.alwaysHide)this.options.wait=true;if($chk(this.options.show)){this.options.display=false;this.previous=this.options.show}if(this.options.start){this.options.display=false;this.options.show=false}this.effects={};if(this.options.opacity)this.effects.opacity='fullOpacity';if(this.options.width)this.effects.width=this.options.fixedWidth?'fullWidth':'offsetWidth';if(this.options.height)this.effects.height=this.options.fixedHeight?'fullHeight':'scrollHeight';for(var i=0,l=this.togglers.length;i<l;i++)this.addSection(this.togglers[i],this.elements[i]);this.elements.each(function(a,i){if(this.options.show===i){this.fireEvent('onActive',[this.togglers[i],a])}else{for(var b in this.effects)a.setStyle(b,0)}},this);this.parent(this.elements);if($chk(this.options.display))this.display(this.options.display)},addSection:function(a,b,c){a=$(a);b=$(b);var d=this.togglers.contains(a);var e=this.togglers.length;this.togglers.include(a);this.elements.include(b);if(e&&(!d||c)){c=$pick(c,e-1);a.injectBefore(this.togglers[c]);b.injectAfter(a)}else if(this.container&&!d){a.inject(this.container);b.inject(this.container)}var f=this.togglers.indexOf(a);a.addEvent('click',this.display.bind(this,f));if(this.options.height)b.setStyles({'padding-top':0,'border-top':'none','padding-bottom':0,'border-bottom':'none'});if(this.options.width)b.setStyles({'padding-left':0,'border-left':'none','padding-right':0,'border-right':'none'});b.fullOpacity=1;if(this.options.fixedWidth)b.fullWidth=this.options.fixedWidth;if(this.options.fixedHeight)b.fullHeight=this.options.fixedHeight;b.setStyle('overflow','hidden');if(!d){for(var g in this.effects)b.setStyle(g,0)}return this},display:function(d){d=($type(d)=='element')?this.elements.indexOf(d):d;if((this.timer&&this.options.wait)||(d===this.previous&&!this.options.alwaysHide))return this;this.previous=d;var e={};this.elements.each(function(a,i){e[i]={};var b=(i!=d)||(this.options.alwaysHide&&(a.offsetHeight>0));this.fireEvent(b?'onBackground':'onActive',[this.togglers[i],a]);for(var c in this.effects)e[i][c]=b?0:a[this.effects[c]]},this);return this.start(e)},showThisHideOpen:function(a){return this.display(a)}});Fx.Accordion=Accordion;
\ No newline at end of file
diff --git a/web/install/template/content.header.php b/web/install/template/content.header.php
index f69a9b887..863e6481f 100644
--- a/web/install/template/content.header.php
+++ b/web/install/template/content.header.php
@@ -1,17 +1,3 @@
-<?php
-if (!defined("IN_SB")) {
-    print "You should not be here. Only follow links!";
-    die();
-}
-?>
-<div id="msg-red-debug" style="display:none;" >
-	<i><img src="./images/warning.png" alt="Warning" /></i>
-	<b>Debug</b>
-	<br />
-	<div id="debug-text">
-	</div>
-</div>
-
 <div id="dialog-placement" style="vertical-align:middle;display:none;opacity:0;text-align:center;width:892px;margin:0 auto;position:fixed !important;position:absolute;overflow:hidden;top:10px;left:100px;">
 <table width="460px" id="dialog-holder" class="dialog-holder" border="0" cellspacing="0" cellpadding="0" >
 	<tbody width="460px">
@@ -52,8 +38,6 @@
 
 
 <div id="content_title">
-    <?php
-        print isset($GLOBALS['pagetitle']) ? $GLOBALS['pagetitle'] : null;
-    ?>
+    <b><?php print $title;?></b>
 </div>
 <div id="content">
diff --git a/web/install/template/footer.php b/web/install/template/footer.php
index 8bf246bc2..3f8c0fd1d 100644
--- a/web/install/template/footer.php
+++ b/web/install/template/footer.php
@@ -1,10 +1,3 @@
-<?php
-if (!defined("IN_SB")) {
-    print "You should not be here. Only follow links!";
-    die();
-}
-?>
-
 </div></div>
 <div id="footer">
     <div id="mainwrapper" style="text-align: center;">
@@ -14,17 +7,7 @@
         <span style="line-height: 20px;"><?php print CreateQuote();?><span>
     </div>
 </div>
-<?php
-if (isset($_GET['debug']) && $_GET['debug'] == 1) {
-    echo '<h3>Session Data</h3><pre>';
-    print_r($_SESSION);
-    echo '</pre><h3>Post Data</h3><pre>';
-    print_r($_POST);
-    echo '</pre><h3>Cookie Data</h3><pre>';
-    print_r($_COOKIE);
-    echo'</pre>';
-}
-?>
+
 </div>
 <script type="text/javascript">
 window.addEvent('domready', function() {
@@ -43,7 +26,6 @@
         className: 'perm'
     });
 });
-$('content_title').setHTML('<?php echo $GLOBALS['TitleRewrite'] ?>');
 </script>
 </body>
 </html>
diff --git a/web/install/template/header.php b/web/install/template/header.php
index 044d96aa6..9a422d4f9 100644
--- a/web/install/template/header.php
+++ b/web/install/template/header.php
@@ -1,30 +1,34 @@
 <!DOCTYPE html>
-<?php
-ob_start();
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
-?>
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <title>SourceBans++</title>
         <link href="includes/main.css" rel="stylesheet" type="text/css" />
-        <script type="text/javascript" src="./scripts/fontawesome-all.min.js"></script>
-        <script type="text/javascript" src="./scripts/mootools.js"></script>
+        <script type="text/javascript" src="../scripts/fontawesome-all.min.js"></script>
+        <script type="text/javascript" src="../scripts/mootools.js"></script>
         <script type="text/javascript" src="./scripts/sourcebans.js"></script>
         <link rel="Shortcut Icon" href="./images/favicon.ico">
     </head>
     <body>
-        <div style="background-color: #bab5b2;">
-            <div id="header">
-                <div id="head-logo">
-        			<img src="images/logos/sb-large.png" border="0" alt="SourceBans Logo" />
-                </div>
+        <div id="header">
+            <div id="head-logo">
+        		<img src="images/logos/sb-large.png" border="0" alt="SourceBans Logo" />
             </div>
         </div>
         <div id="tabsWrapper">
             <div id="mainwrapper">
                 <div id="tabs">
                     <ul>
+                        <li class='noactive'>
+                            <a href='https://www.gameconnect.net/projects/sourcebans/' target='_blank' rel='noopener'>SourceBans</a>
+                        </li>
+                        <li class='noactive'>
+                            <a href='https://sbpp.github.io' target='_blank' rel='noopener'>SourceBans++</a>
+                        </li>
+                        <li class='noactive'>
+                            <a href='https://www.sourcemod.net/' target='_blank' rel='noopener'>SourceMod</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
diff --git a/web/install/template/page.1.php b/web/install/template/page.1.php
index 7161cf6f6..fc3f6396c 100644
--- a/web/install/template/page.1.php
+++ b/web/install/template/page.1.php
@@ -1,9 +1,3 @@
-<?php
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
-?>
     <b><p>To use this webpanel software, you are required to read and accept the following license. If you do not agree with the license, then go and make your own ban/admin system.<br /><br />
     An explanation  of this license is available <u><a href="https://creativecommons.org/licenses/by-nc-sa/3.0/">here</a></u>.</p></b>
 
diff --git a/web/install/template/page.2.php b/web/install/template/page.2.php
index c27894b5a..fa131341e 100644
--- a/web/install/template/page.2.php
+++ b/web/install/template/page.2.php
@@ -1,8 +1,4 @@
 <?php
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
 if (isset($_POST['postd'])) {
     if (empty($_POST['server']) ||empty($_POST['port']) ||empty($_POST['username']) ||empty($_POST['database']) ||empty($_POST['prefix'])) {
         echo "<script>ShowBox('Error', 'There is some missing data. All fields are required.', 'red', '', true);</script>";
diff --git a/web/install/template/page.3.php b/web/install/template/page.3.php
index 830cb777d..4c3566317 100644
--- a/web/install/template/page.3.php
+++ b/web/install/template/page.3.php
@@ -1,8 +1,4 @@
 <?php
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
 $errors = 0;
 $warnings = 0;
 
diff --git a/web/install/template/page.4.php b/web/install/template/page.4.php
index 08b2a5b0f..8c171587c 100644
--- a/web/install/template/page.4.php
+++ b/web/install/template/page.4.php
@@ -1,8 +1,4 @@
 <?php
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
 $errors = 0;
 $warnings = 0;
 
@@ -29,6 +25,11 @@
         }
     }
 }
+if ($errors > 0) {
+    print "<script>ShowBox('Error', 'There was an error creating the table structure. Please read the message above to help debug the problem.', 'red', '', true);</script>";
+} else {
+    print "<script>ShowBox('Success', 'The tables were created successfully', 'green', '', true);</script>";
+}
 ?>
 <br />
 <table style="width: 101%; margin: 0 0 -2px -2px;">
@@ -37,13 +38,6 @@
     </tr>
 </table>
 <div id="submit-main">
-<?php
-if ($errors > 0) {
-    print "<script>ShowBox('Error', 'There was an error creating the table structure. Please read the message above to help debug the problem.', 'red', '', true);</script>";
-} else {
-    print "<script>ShowBox('Success', 'The tables were created successfully', 'green', '', true);</script>";
-}
-?>
 <form action="index.php?step=5" method="post" name="send" id="send">
     <input type="hidden" name="username" value="<?php echo $_POST['username']?>">
     <input type="hidden" name="password" value="<?php echo $_POST['password']?>">
diff --git a/web/install/template/page.5.php b/web/install/template/page.5.php
index 437f90cb5..283ad5cf6 100644
--- a/web/install/template/page.5.php
+++ b/web/install/template/page.5.php
@@ -1,22 +1,5 @@
 <?php
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
-
 $web_cfg = "<?php
-/**
- * config.php
- *
- * This file contains all of the configuration for the db
- * that will
- * @author SteamFriends Development Team
- * @version 1.0.0
- * @copyright SteamFriends (www.SteamFriends.com)
- * @package SourceBans
- */
-if(!defined('IN_SB')){echo 'You should not be here. Only follow links!';die();}
-
 define('DB_HOST', '{server}');   					// The host/ip to your SQL server
 define('DB_USER', '{user}');						// The username to connect with
 define('DB_PASS', '{pass}');						// The password
@@ -27,10 +10,7 @@
 define('STEAMAPIKEY', '{steamapikey}');				// Steam API Key for Shizz
 define('SB_WP_URL', '{sbwpurl}');       				//URL of SourceBans Site
 define('SB_EMAIL', '{sbwpemail}');
-
-//define('DEVELOPER_MODE', true);			// Use if you want to show debugmessages
-//define('SB_MEM', '128M'); 				// Override php memory limit, if isn't enough (Banlist is just a blank page)
-?>";
+";
 
 $srv_cfg = '"driver_default"		"mysql"
 
diff --git a/web/install/template/page.6.php b/web/install/template/page.6.php
index 6404cbecc..1271508db 100644
--- a/web/install/template/page.6.php
+++ b/web/install/template/page.6.php
@@ -1,9 +1,4 @@
 <?php
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
-
 if (isset($_POST['postd']) && $_POST['postd']) {
     if (empty($_POST['amx_server']) ||empty($_POST['amx_port']) ||empty($_POST['amx_username']) ||empty($_POST['amx_password']) ||empty($_POST['amx_database']) ||empty($_POST['amx_prefix'])) {
         echo "<script>ShowBox('Error', 'There is some missing data. All feilds are required.', 'red', '', true);</script>";
diff --git a/web/install/template/submenu.php b/web/install/template/submenu.php
index 37407c928..1645bab13 100644
--- a/web/install/template/submenu.php
+++ b/web/install/template/submenu.php
@@ -1,13 +1,3 @@
-<?php
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
-?>
-</ul>
-        </div>
-    </div>
-</div>
 <div id="mainwrapper">
     <div id="navigation">
         <div id="nav"></div>
@@ -22,15 +12,13 @@
                 5 => 'Initial Setup'
             );
 
-            if (isset($_GET['step']) && is_numeric($_GET['step'])) {
-                foreach ($steps as $key => $value) {
-                    if ($key < $_GET['step']) {
-                        print '<strike>Step '.$key.': '.$value.'</strike><br/>';
-                    } elseif ($key == $_GET['step']) {
-                        print '<b>Step '.$key.': '.$value.'</b><br/>';
-                    } elseif ($key > $_GET['step']) {
-                        print 'Step '.$key.': '.$value.'<br/>';
-                    }
+            foreach ($steps as $key => $value) {
+                if ($key < $step) {
+                    print '<strike>Step '.$key.': '.$value.'</strike><br/>';
+                } elseif ($key == $step) {
+                    print '<b>Step '.$key.': '.$value.'</b><br/>';
+                } elseif ($key > $step) {
+                    print 'Step '.$key.': '.$value.'<br/>';
                 }
             }
             ?>
diff --git a/web/install/template/tab.php b/web/install/template/tab.php
deleted file mode 100644
index d0e5946bd..000000000
--- a/web/install/template/tab.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-if (!defined("IN_SB")) {
-    echo "You should not be here. Only follow links!";
-    die();
-}
-$class = ($tabs['active'] == true) ? "active" : "nonactive";
-echo '<li class="nonactive">';
-CreateLink($tabs['title'], $tabs['url'], $tabs['desc']);
-echo '</li>';

From d969e89b6b5f87f88a133236d028063274f0afd8 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:15:19 +0200
Subject: [PATCH 13/17] Hide sensitive information by default

---
 web/install/includes/data.sql | 73 ++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 40 deletions(-)

diff --git a/web/install/includes/data.sql b/web/install/includes/data.sql
index b992722d4..9e6aec7e2 100644
--- a/web/install/includes/data.sql
+++ b/web/install/includes/data.sql
@@ -1,43 +1,41 @@
 INSERT INTO `{prefix}_mods` (`mid`, `name`, `icon`, `modfolder`, `steam_universe`) VALUES
-(1, 'Web', 'web.png', 'NULL', '0'),
-(2, 'Half-Life 2 Deathmatch', 'hl2dm.png', 'hl2mp', '0'),
-(3, 'Counter-Strike: Source', 'csource.png', 'cstrike', '0'),
-(4, 'Day of Defeat: Source', 'dods.png', 'dod', '0'),
-(5, 'Insurgency: Source', 'ins.png', 'insurgency', '0'),
-(6, 'Dystopia', 'dys.png', 'dystopia_v1', '0'),
-(7, 'Hidden: Source', 'hidden.png', 'hidden', '0'),
-(8, 'Half-Life 2 Capture the Flag', 'hl2ctf.png', 'hl2ctf', '0'),
-(9, 'Pirates Vikings and Knights II', 'pvkii.png', 'pvkii', '0'),
-(10, 'Perfect Dark: Source', 'pdark.png', 'pdark', '0'),
-(11, 'The Ship', 'ship.png', 'ship', '0'),
-(12, 'Fortress Forever', 'hl2-fortressforever.png', 'FortressForever', '0'),
-(13, 'Team Fortress 2', 'tf2.png', 'tf', '0'),
-(14, 'Zombie Panic', 'zps.png', 'zps', '0'),
-(15, "Garry's Mod", 'gmod.png', 'garrysmod', '0'),
-(16, "Left 4 Dead", 'l4d.png', 'left4dead', '1'),
-(17, "Left 4 Dead 2", 'l4d2.png', 'left4dead2', '1'),
-(18, "CSPromod", 'cspromod.png', 'cspromod', '0'),
-(19, "Alien Swarm", 'alienswarm.png', 'alienswarm', '0'),
-(20, "E.Y.E: Divine Cybermancy", 'eye.png', 'eye', '0'),
-(21, "Nuclear Dawn", 'nucleardawn.png', 'nucleardawn', '0'),
-(22, "Counter-Strike: Global Offensive", 'csgo.png', 'csgo', '1'),
-(23, 'Synergy', 'synergy.png', 'synergy', '0');
-
-UPDATE `{prefix}_mods` SET `mid` = '0' WHERE `name` = 'Web';
+(0, 'Web', 'web.png', 'NULL', '0'),
+(1, 'Half-Life 2 Deathmatch', 'hl2dm.png', 'hl2mp', '0'),
+(2, 'Counter-Strike: Source', 'csource.png', 'cstrike', '0'),
+(3, 'Day of Defeat: Source', 'dods.png', 'dod', '0'),
+(4, 'Insurgency: Source', 'ins.png', 'insurgency', '0'),
+(5, 'Dystopia', 'dys.png', 'dystopia_v1', '0'),
+(6, 'Hidden: Source', 'hidden.png', 'hidden', '0'),
+(7, 'Half-Life 2 Capture the Flag', 'hl2ctf.png', 'hl2ctf', '0'),
+(8, 'Pirates Vikings and Knights II', 'pvkii.png', 'pvkii', '0'),
+(9, 'Perfect Dark: Source', 'pdark.png', 'pdark', '0'),
+(10, 'The Ship', 'ship.png', 'ship', '0'),
+(11, 'Fortress Forever', 'hl2-fortressforever.png', 'FortressForever', '0'),
+(12, 'Team Fortress 2', 'tf2.png', 'tf', '0'),
+(13, 'Zombie Panic', 'zps.png', 'zps', '0'),
+(14, "Garry's Mod", 'gmod.png', 'garrysmod', '0'),
+(15, "Left 4 Dead", 'l4d.png', 'left4dead', '1'),
+(16, "Left 4 Dead 2", 'l4d2.png', 'left4dead2', '1'),
+(17, "CSPromod", 'cspromod.png', 'cspromod', '0'),
+(18, "Alien Swarm", 'alienswarm.png', 'alienswarm', '0'),
+(19, "E.Y.E: Divine Cybermancy", 'eye.png', 'eye', '0'),
+(20, "Nuclear Dawn", 'nucleardawn.png', 'nucleardawn', '0'),
+(21, "Counter-Strike: Global Offensive", 'csgo.png', 'csgo', '1'),
+(22, 'Synergy', 'synergy.png', 'synergy', '0');
 
 INSERT INTO `{prefix}_settings` (`setting`, `value`) VALUES
-('dash.intro.text', '<center><p>Your new SourceBans install</p><p>SourceBans successfully installed!</center>'),
-('dash.intro.title', 'Your SourceBans install'),
+('dash.intro.text', '<center><p>Your new SourceBans install</p><p>SourceBans++ successfully installed!</center>'),
+('dash.intro.title', 'Your SourceBans++ install'),
 ('dash.lognopopup', '0'),
 ('banlist.bansperpage', '30'),
-('banlist.hideadminname', '0'),
-('banlist.nocountryfetch', '0'),
-('banlist.hideplayerips', '0'),
+('banlist.hideadminname', '1'),
+('banlist.nocountryfetch', '1'),
+('banlist.hideplayerips', '1'),
 ('bans.customreasons', ''),
-('config.password.minlength', '4'),
+('config.password.minlength', '7'),
 ('config.debug', '0 '),
 ('template.logo', 'logos/sb-large.png'),
-('template.title', 'SourceBans'),
+('template.title', 'SourceBans++'),
 ('config.enableprotest', '1'),
 ('config.enablecomms', '1'),
 ('config.enablesubmit', '1'),
@@ -50,13 +48,8 @@ INSERT INTO `{prefix}_settings` (`setting`, `value`) VALUES
 ('config.enablefriendsbanning', '0'),
 ('config.enableadminrehashing', '1'),
 ('protest.emailonlyinvolved', '0'),
-('config.version', '604'),
+('config.version', '605'),
 ('config.enablesteamlogin', '1');
 
-
-INSERT INTO `{prefix}_admins` (
-`aid` ,	`user` , `authid` ,	`password` , `gid` , `email` ,	`validate` , `extraflags`, `immunity`)
-VALUES (
-NULL , 'CONSOLE', 'STEAM_ID_SERVER', '', '0', '', NULL, '0', 0);
-
-UPDATE `{prefix}_admins` SET `aid` = '0' WHERE `authid` = 'STEAM_ID_SERVER';
+INSERT INTO `{prefix}_admins` (`aid` ,	`user` , `authid` ,	`password` , `gid` , `email` ,	`validate` , `extraflags`, `immunity`) VALUES
+(0 , 'CONSOLE', 'STEAM_ID_SERVER', '', '0', '', NULL, '0', 0);

From cc37e85fcf5d6f6375c6e3d1cdca51fb1592adff Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:16:00 +0200
Subject: [PATCH 14/17] Hide IP, country and admin name by default

---
 web/updater/data/605.php | 12 ++++++++++++
 web/updater/store.json   |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 web/updater/data/605.php

diff --git a/web/updater/data/605.php b/web/updater/data/605.php
new file mode 100644
index 000000000..918387849
--- /dev/null
+++ b/web/updater/data/605.php
@@ -0,0 +1,12 @@
+<?php
+
+$this->dbs->query("UPDATE `:prefix_settings` SET value = 1 WHERE setting = 'banlist.hideadminname'");
+$this->dbs->execute();
+
+$this->dbs->query("UPDATE `:prefix_settings` SET value = 1 WHERE setting = 'banlist.hideplayerips'");
+$this->dbs->execute();
+
+$this->dbs->query("UPDATE `:prefix_settings` SET value = 1 WHERE setting = 'banlist.nocountryfetch'");
+$this->dbs->execute();
+
+return true;
diff --git a/web/updater/store.json b/web/updater/store.json
index 3b793013c..1f700072b 100644
--- a/web/updater/store.json
+++ b/web/updater/store.json
@@ -31,5 +31,6 @@
     "600": "600.php",
     "602": "602.php",
     "603": "603.php",
-    "604": "604.php"
+    "604": "604.php",
+    "605": "605.php"
 }

From 49d04c18e9f8158b047fd3a91074e0e8c0caa8e9 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:18:21 +0200
Subject: [PATCH 15/17] Fix issue with displaying admin names even if
 'hideadminname' is turned on

---
 web/pages/page.banlist.php   | 4 ++--
 web/pages/page.commslist.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/pages/page.banlist.php b/web/pages/page.banlist.php
index c982bd75a..9bae9b59e 100644
--- a/web/pages/page.banlist.php
+++ b/web/pages/page.banlist.php
@@ -466,7 +466,7 @@ function setPostKey()
 
     $data['ban_id'] = $res->fields['ban_id'];
 
-    if (!empty($res->fields['ban_ip'])) {
+    if (!empty($res->fields['ban_ip']) && !Config::getBool('banlist.nocountryfetch')) {
         if (!empty($res->fields['ban_country']) && $res->fields['ban_country'] != ' ') {
             $data['country'] = '<img src="images/country/' . strtolower($res->fields['ban_country']) . '.jpg" alt="' . $res->fields['ban_country'] . '" border="0" align="absmiddle" />';
         } elseif (!Config::getBool('banlist.nocountryfetch')) {
@@ -533,7 +533,7 @@ function setPostKey()
 
         $removedby         = $GLOBALS['db']->GetRow("SELECT user FROM `" . DB_PREFIX . "_admins` WHERE aid = '" . $res->fields['RemovedBy'] . "'");
         $data['removedby'] = "";
-        if (isset($removedby[0])) {
+        if (isset($removedby[0]) && $data['admin']) {
             $data['removedby'] = $removedby[0];
         }
     }
diff --git a/web/pages/page.commslist.php b/web/pages/page.commslist.php
index 41c5aafa7..247138ffc 100644
--- a/web/pages/page.commslist.php
+++ b/web/pages/page.commslist.php
@@ -505,7 +505,7 @@ function setPostKey()
 
         $removedby         = $GLOBALS['db']->GetRow("SELECT user FROM `" . DB_PREFIX . "_admins` WHERE aid = '" . $res->fields['RemovedBy'] . "'");
         $data['removedby'] = "";
-        if (isset($removedby[0])) {
+        if (isset($removedby[0]) && $data['admin']) {
             $data['removedby'] = $removedby[0];
         }
     } else if ($data['ban_length'] == 'Permanent') {

From d84cac8a2d8c2068424222cb7c3554344241041a Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:25:15 +0200
Subject: [PATCH 16/17] Update git commit count

---
 web/configs/version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/configs/version.json b/web/configs/version.json
index 3236b4b7e..d6bb3b3e5 100644
--- a/web/configs/version.json
+++ b/web/configs/version.json
@@ -1,5 +1,5 @@
 {
     "version": "1.7.0",
-    "git": "765",
+    "git": "784",
     "dev": true
 }

From e3566bc6cb14a7317d985d762ce30b722848aa97 Mon Sep 17 00:00:00 2001
From: Marvin <Groruk@uberdoge.network>
Date: Fri, 27 Jul 2018 03:31:07 +0200
Subject: [PATCH 17/17] Merge conflict

---
 web/version.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 web/version.json

diff --git a/web/version.json b/web/version.json
new file mode 100644
index 000000000..e69de29bb