Added new default values

Started Work on Appearance
Fix Wizard on Submit
Added more strings

api/config/default.php

@@ -1,6 +1,7 @@
 <?php
 return array(
     'branch' => 'v2-develop',
-    'that' => 'this',
-    'organizrAPI' => 'none'
+    'logo' => 'plugins\images\organizr\logo-wide.png',
+    'title' => 'Organizr',
+    'useLogo' => false
 );

api/functions/api-functions.php

@@ -803,6 +803,30 @@ function createUser($username,$password,$defaults,$email=null) {
         return false;
     }
 }
+function getCustomizeAppearance(){
+    if(file_exists('config'.DIRECTORY_SEPARATOR.'config.php')){
+        $array = array(
+            'config' => array(
+                'branch' => $GLOBALS['branch']
+            ),
+            'database' => array(
+
+            )
+        );
+        try {
+        	$connect = new Dibi\Connection([
+        		'driver' => 'sqlite3',
+        		'database' => $GLOBALS['dbLocation'].$GLOBALS['dbName'],
+        	]);
+            //$all['tabs'] = $connect->fetchAll('SELECT * FROM tabs ORDER BY `order` ASC');
+            //$all['categories'] = $connect->fetchAll('SELECT * FROM categories ORDER BY `order` ASC');
+            //$all['groups'] = $connect->fetchAll('SELECT * FROM groups ORDER BY `group_id` ASC');
+            //return $all;
+        } catch (Dibi\Exception $e) {
+            return false;
+        }
+    }
+}
 function allTabs(){
     if(file_exists('config'.DIRECTORY_SEPARATOR.'config.php')){
         try {

api/functions/organizr-functions.php

@@ -133,9 +133,16 @@ function organizrStatus(){
     $status['dependenciesInactive'] = $dependenciesInactive;
     $status['version'] = $GLOBALS['installedVersion'];
     $status['os'] = getOS();
-    $status['php'] = phpversion();
+	$status['php'] = phpversion();
     return $status;
 }
+function loadAppearance(){
+    $appearance = array();
+    $appearance['logo'] = $GLOBALS['logo'];
+    $appearance['title'] = $GLOBALS['title'];
+    $appearance['useLogo'] = $GLOBALS['useLogo'];
+    return $appearance;
+}
 function auth(){
     $debug = false; // CAREFUL WHEN SETTING TO TRUE AS THIS OPENS AUTH UP
     $ban = isset($_GET['ban']) ? strtoupper($_GET['ban']) : "";
@@ -164,3 +171,10 @@ function auth(){
         !$debug ? exit(http_response_code(401)) : die("Not Authorized Due To No Parameters Set");
     }
 }
+function logoOrText(){
+    if($GLOBALS['useLogo'] == false){
+        return '<h1>'.$GLOBALS['title'].'</h1>';
+    }else{
+        return '<img style="max-width: 350px;" src="'.$GLOBALS['logo'].'" alt="Home" />';
+    }
+}

api/index.php

@@ -56,6 +56,25 @@ switch ($function) {
                 break;
         }
         break;
+    case 'v1_settings_customize_appearance':
+        switch ($method) {
+            case 'GET':
+                if(qualifyRequest(1)){
+                    $result['status'] = 'success';
+                    $result['statusText'] = 'success';
+                    $result['data'] = $pageSettingsCustomizeAppearance;
+                }else{
+                    $result['status'] = 'error';
+                    $result['statusText'] = 'API/Token invalid or not set';
+                    $result['data'] = null;
+                }
+                break;
+            default:
+                $result['status'] = 'error';
+                $result['statusText'] = 'The function requested is not defined for method: '.$method;
+                break;
+        }
+        break;
     case 'v1_settings_tab_editor_tabs':
         switch ($method) {
             case 'GET':
@@ -359,6 +378,25 @@ switch ($function) {
                 break;
         }
         break;
+    case 'v1_customize_appearance':
+        switch ($method) {
+            case 'GET':
+                if(qualifyRequest(1)){
+                    $result['status'] = 'success';
+                    $result['statusText'] = 'success';
+                    $result['data'] = getCustomizeAppearance();
+                }else{
+                    $result['status'] = 'error';
+                    $result['statusText'] = 'API/Token invalid or not set';
+                    $result['data'] = null;
+                }
+                break;
+            default:
+                $result['status'] = 'error';
+                $result['statusText'] = 'The function requested is not defined for method: '.$method;
+                break;
+        }
+        break;
     case 'v1_user_edit':
         switch ($method) {
             case 'POST':
@@ -402,6 +440,7 @@ switch ($function) {
                 $result['status'] = 'success';
                 $result['statusText'] = 'success';
                 $status['status'] = organizrStatus();
+                $result['appearance'] = loadAppearance();
                 $status['user'] = $GLOBALS['organizrUser'];
                 $status['categories'] = loadTabs()['categories'];
                 $status['tabs'] = loadTabs()['tabs'];

api/pages/login.php

@@ -7,7 +7,7 @@ $pageLogin = '
   <div class="login-box login-sidebar">
     <div class="white-box">
       <form class="form-horizontal form-material" id="loginform" onsubmit="return false;">
-        <a href="javascript:void(0)" class="text-center db"><img style="max-width: 350px;" src="https://sonflix.com/images/newsonflixlogo.png" alt="Home" /></a>
+        <a href="javascript:void(0)" class="text-center db" id="login-logo">'.logoOrText().'</a>
 
         <div class="form-group m-t-40">
           <div class="col-xs-12">

api/pages/settings-customize-appearance.php

@@ -0,0 +1,35 @@
+<?php
+
+$pageSettingsCustomizeAppearance = '
+<script>
+buildCustomizeAppearance();
+</script>
+<div class="panel bg-theme-dark panel-info">
+    <div class="panel-heading" lang="en"> Customize Appearance</div>
+    <div class="panel-wrapper collapse in" aria-expanded="true">
+        <div class="panel-body bg-theme-dark">
+            <form id="customize-appearance-form" class="form-horizontal" onsbumit="return false;">
+
+                <!-- FORM GROUP -->
+                <h3 class="box-title">Person Info</h3>
+                <hr class="m-t-0 m-b-40">
+                <div class="row">
+
+                    <!-- INPUT BOX -->
+                    <div class="col-md-6">
+                        <div class="form-group">
+                            <label class="control-label col-md-3">First Name</label>
+                            <div class="col-md-9">
+                                <input type="text" class="form-control" placeholder="John doe"></div>
+                        </div>
+                    </div>
+                    <!--/ INPUT BOX -->
+
+                </div>
+                <!--/ FORM GROUP -->
+
+            </form>
+        </div>
+    </div>
+</div>
+';

api/pages/settings.php

@@ -25,166 +25,177 @@ $pageSettings = '
     </div>
     <!--.row-->
     <div class="row">
-
-
-
-    <!-- Tabstyle start -->
-    <section class="">
-        <div class="sttabs tabs-style-flip">
-            <nav>
-                <ul>
-                    <li onclick="changeSettingsMenu(\'Settings::Tab Editor\')"><a href="#settings-main-tab-editor" class="sticon ti-layout-tab-v"><span lang="en">Tab Editor</span></a></li>
-                    <li onclick="changeSettingsMenu(\'Settings::Customize\')"><a href="#settings-main-customize" class="sticon ti-paint-bucket"><span lang="en">Customize</span></a></li>
-                    <li onclick="changeSettingsMenu(\'Settings::User Management\')"><a href="#settings-main-user-management" class="sticon ti-user"><span lang="en">User Management</span></a></li>
-					<li onclick="changeSettingsMenu(\'Settings::Plugins\')"><a href="#settings-main-plugins" class="sticon ti-plug"><span lang="en">Plugins</span></a></li>
-                    <li onclick="changeSettingsMenu(\'Settings::System Settings\')"><a href="#settings-main-system-settings" class="sticon ti-settings"><span lang="en">System Settings</span></a></li>
-                </ul>
-            </nav>
-            <div class="content-wrap">
-                <section id="settings-main-tab-editor">
-                    <ul class="nav customtab2 nav-tabs" role="tablist">
-                        <li onclick="changeSettingsMenu(\'Settings::Tab Editor::Tabs\');loadTabEditor();" role="presentation" class=""><a href="#settings-tab-editor-tabs" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-layout-tab-v"></i></span><span class="hidden-xs" lang="en"> Tabs</span></a>
-                        </li>
-                        <li onclick="changeSettingsMenu(\'Settings::Tab Editor::Categories\');loadCategoryEditor();" role="presentation" class=""><a href="#settings-tab-editor-categories" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-layout-list-thumb"></i></span><span class="hidden-xs" lang="en"> Categories</span></a>
-                        </li>
-                    </ul>
-                    <!-- Tab panes -->
-                    <div class="tab-content">
-                        <div role="tabpanel" class="tab-pane fade" id="settings-tab-editor-tabs">
-                            <h2 lang="en">Loading...</h2>
-                            <div class="clearfix"></div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane fade" id="settings-tab-editor-categories">
-                            <h2 lang="en">Loading...</h2>
-                        </div>
-                    </div>
-                </section>
-                <section id="settings-main-customize">
-                    <h2 lang="en">Customize Organizr</h2>
-                </section>
-                <section id="settings-main-user-management">
-                    <ul class="nav customtab2 nav-tabs" role="tablist">
-                        <li onclick="changeSettingsMenu(\'Settings::User Management::Manage Users\');loadUserManagement();" role="presentation" class=""><a href="#settings-user-manage-users" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-id-badge"></i></span><span class="hidden-xs" lang="en"> Manage Users</span></a>
-                        </li>
-                        <li onclick="changeSettingsMenu(\'Settings::User Management::Manage Groups\');loadGroupManagement();" role="presentation" class=""><a href="#settings-user-manage-groups" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-briefcase"></i></span><span class="hidden-xs" lang="en"> Manage Groups</span></a>
-                        </li>
+        <!-- Tabstyle start -->
+        <section class="">
+            <div class="sttabs tabs-style-flip">
+                <nav>
+                    <ul>
+                        <li onclick="changeSettingsMenu(\'Settings::Tab Editor\')"><a href="#settings-main-tab-editor" class="sticon ti-layout-tab-v"><span lang="en">Tab Editor</span></a></li>
+                        <li onclick="changeSettingsMenu(\'Settings::Customize\')"><a href="#settings-main-customize" class="sticon ti-paint-bucket"><span lang="en">Customize</span></a></li>
+                        <li onclick="changeSettingsMenu(\'Settings::User Management\')"><a href="#settings-main-user-management" class="sticon ti-user"><span lang="en">User Management</span></a></li>
+    					<li onclick="changeSettingsMenu(\'Settings::Plugins\')"><a href="#settings-main-plugins" class="sticon ti-plug"><span lang="en">Plugins</span></a></li>
+                        <li onclick="changeSettingsMenu(\'Settings::System Settings\')"><a href="#settings-main-system-settings" class="sticon ti-settings"><span lang="en">System Settings</span></a></li>
                     </ul>
-                    <!-- Tab panes -->
-                    <div class="tab-content">
-                        <div role="tabpanel" class="tab-pane fade" id="settings-user-manage-users">
-                            <h2 lang="en">Loading...</h2>
-                            <div class="clearfix"></div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane fade" id="settings-user-manage-groups">
-                            <h2 lang="en">Loading...</h2>
-                            <div class="clearfix"></div>
+                </nav>
+                <div class="content-wrap">
+                    <! -- TAB EDITOR -->
+                    <section id="settings-main-tab-editor">
+                        <ul class="nav customtab2 nav-tabs" role="tablist">
+                            <li onclick="changeSettingsMenu(\'Settings::Tab Editor::Tabs\');loadSettingsPage(\'api/?v1/settings/tab/editor/tabs\',\'#settings-tab-editor-tabs\',\'Tab Editor\');" role="presentation" class=""><a href="#settings-tab-editor-tabs" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-layout-tab-v"></i></span><span class="hidden-xs" lang="en"> Tabs</span></a>
+                            </li>
+                            <li onclick="changeSettingsMenu(\'Settings::Tab Editor::Categories\');loadSettingsPage(\'api/?v1/settings/tab/editor/categories\',\'#settings-tab-editor-categories\',\'Category Editor\');" role="presentation" class=""><a href="#settings-tab-editor-categories" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-layout-list-thumb"></i></span><span class="hidden-xs" lang="en"> Categories</span></a>
+                            </li>
+                        </ul>
+                        <!-- Tab panes -->
+                        <div class="tab-content">
+                            <div role="tabpanel" class="tab-pane fade" id="settings-tab-editor-tabs">
+                                <h2 lang="en">Loading...</h2>
+                                <div class="clearfix"></div>
+                            </div>
+                            <div role="tabpanel" class="tab-pane fade" id="settings-tab-editor-categories">
+                                <h2 lang="en">Loading...</h2>
+                            </div>
                         </div>
-                    </div>
-                </section>
-                <section id="settings-main-plugins">
-                    <h2 lang="en">Plugins</h2>
-                </section>
-                <section id="settings-main-system-settings">
-                    <ul class="nav customtab2 nav-tabs" role="tablist">
-                        <li onclick="changeSettingsMenu(\'Settings::System Settings::About\')" role="presentation" class="active"><a href="#settings-settings-about" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="true"><span class="visible-xs"><i class="ti-info-alt"></i></span><span class="hidden-xs" lang="en"> About</span></a>
-                        </li>
-                        <li onclick="changeSettingsMenu(\'Settings::System Settings::Main\')" role="presentation" class=""><a href="#settings-settings-main" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-settings"></i></span><span class="hidden-xs" lang="en"> Main</span></a>
-                        </li>
-                        <li onclick="changeSettingsMenu(\'Settings::System Settings::Logs\');loadLogs();" role="presentation" class=""><a href="#settings-settings-logs" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-receipt"></i></span><span class="hidden-xs" lang="en"> Logs</span></a>
-                        </li>
-                        <li onclick="changeSettingsMenu(\'Settings::System Settings::Updates\')" role="presentation" class=""><a href="#settings-settings-updates" aria-controls="profile" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-package"></i></span> <span class="hidden-xs" lang="en">Updates</span></a>
-                        </li>
-                        <li onclick="changeSettingsMenu(\'Settings::System Settings::Donate\')" role="presentation" class=""><a href="#settings-settings-donate" aria-controls="profile" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-money"></i></span> <span class="hidden-xs" lang="en">Donate</span></a>
-                        </li>
-                    </ul>
-                    <!-- Tab panes -->
-                    <div class="tab-content">
-                        <div role="tabpanel" class="tab-pane fade" id="settings-settings-main">
-                            <h2 lang="en">Main Settings</h2>
-                            <div class="clearfix"></div>
+                    </section>
+                    <! -- Customzie -->
+                    <section id="settings-main-customize">
+                        <ul class="nav customtab2 nav-tabs" role="tablist">
+                            <li onclick="changeSettingsMenu(\'Settings::Customzie::Appearance\');loadSettingsPage(\'api/?v1/settings/customize/appearance\',\'#settings-customize-appearance\',\'Customize Appearance\');" role="presentation" class=""><a href="#settings-customize-appearance" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-eye"></i></span><span class="hidden-xs" lang="en"> Appearance</span></a>
+                            </li>
+                        </ul>
+                        <!-- Tab panes -->
+                        <div class="tab-content">
+                            <div role="tabpanel" class="tab-pane fade" id="settings-customize-appearance">
+                                <h2 lang="en">Loading...</h2>
+                                <div class="clearfix"></div>
+                            </div>
                         </div>
-                        <div role="tabpanel" class="tab-pane fade" id="settings-settings-logs">
-                            <h2 lang="en">Loading...</h2>
-                            <div class="clearfix"></div>
+                    </section>
+                    <! -- USER MANAGEMENT -->
+                    <section id="settings-main-user-management">
+                        <ul class="nav customtab2 nav-tabs" role="tablist">
+                            <li onclick="changeSettingsMenu(\'Settings::User Management::Manage Users\');loadSettingsPage(\'api/?v1/settings/user/manage/users\',\'#settings-user-manage-users\',\'User Management\');" role="presentation" class=""><a href="#settings-user-manage-users" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-id-badge"></i></span><span class="hidden-xs" lang="en"> Users</span></a>
+                            </li>
+                            <li onclick="changeSettingsMenu(\'Settings::User Management::Manage Groups\');loadSettingsPage(\'api/?v1/settings/user/manage/groups\',\'#settings-user-manage-groups\',\'Group Management\');" role="presentation" class=""><a href="#settings-user-manage-groups" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-briefcase"></i></span><span class="hidden-xs" lang="en"> Groups</span></a>
+                            </li>
+                        </ul>
+                        <!-- Tab panes -->
+                        <div class="tab-content">
+                            <div role="tabpanel" class="tab-pane fade" id="settings-user-manage-users">
+                                <h2 lang="en">Loading...</h2>
+                                <div class="clearfix"></div>
+                            </div>
+                            <div role="tabpanel" class="tab-pane fade" id="settings-user-manage-groups">
+                                <h2 lang="en">Loading...</h2>
+                                <div class="clearfix"></div>
+                            </div>
                         </div>
-                        <div role="tabpanel" class="tab-pane fade active in" id="settings-settings-about">
-							<div class="row">
-								<div class="col-lg-6 col-sm-12 col-md-6">
-									<div class="panel bg-theme-dark">
-										<div class="p-30">
-											<div class="row">
-												<div class="col-xs-12"><img src="plugins/images/organizr/logo-wide.png" alt="organizr" class="img-responsive"></div>
-											</div>
-										</div>
-										<hr class="m-t-10">
-										<div class="p-20 text-center">
-											<p lang="en">Below you will find all the links for everything that has to do with Organizr</p>
-										</div>
-										<hr>
-										<ul class="dp-table profile-social-icons">
-											<li><a href="https://organizr.us" target="_blank"><i class="mdi mdi-web mdi-24px"></i></a></li>
-											<li><a href="https://reddit.com/r/organizr" target="_blank"><i class="mdi mdi-reddit mdi-24px"></i></a></li>
-											<li><a href="https://organizr.us/discord" target="_blank"><i class="mdi mdi-discord mdi-24px"></i></a></li>
-											<li><a href="https://github.com/causefx/organizr" target="_blank"><i class="mdi mdi-github-box mdi-24px"></i></a></li>
-										</ul>
-									</div>
-								</div>
-                                <div class="col-lg-6 col-sm-12 col-md-6">
-                                    <div class="white-box bg-theme-dark">
-                                        <h3 class="box-title" lang="en">Information</h3>
-                                        <ul class="feeds">
-                                            <li><div class="bg-info"><i class="mdi mdi-webpack mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Organizr Version</span> '.$GLOBALS['installedVersion'].'</li>
-                                            <li><div class="bg-info"><i class="mdi mdi-github-box mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Organizr Branch</span> '.$GLOBALS['branch'].'</li>
-                                            <li><div class="bg-info"><i class="mdi mdi-database mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Database Location</span> '.$GLOBALS['dbLocation'].$GLOBALS['dbName'].'</li>
-                                            <hr class="m-t-10">
-                                            <li><div class="bg-info"><i class="mdi mdi-language-php mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">PHP Version</span> '.phpversion().'</li>
-                                            <li><div class="bg-info"><i class="mdi mdi-package-variant-closed mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Webserver Version</span> '.$_SERVER['SERVER_SOFTWARE'].'</li>
-                                            <hr class="m-t-10">
-                                            <li><div class="bg-info"><i class="mdi mdi-account-card-details mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">License</span> '.ucwords($GLOBALS['license']).'</li>
+                    </section>
+                    <! -- PLUGINS -->
+                    <section id="settings-main-plugins">
+                        <h2 lang="en">Plugins</h2>
+                    </section>
+                    <! -- SYSTEM SETTINGS -->
+                    <section id="settings-main-system-settings">
+                        <ul class="nav customtab2 nav-tabs" role="tablist">
+                            <li onclick="changeSettingsMenu(\'Settings::System Settings::About\')" role="presentation" class="active"><a href="#settings-settings-about" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="true"><span class="visible-xs"><i class="ti-info-alt"></i></span><span class="hidden-xs" lang="en"> About</span></a>
+                            </li>
+                            <li onclick="changeSettingsMenu(\'Settings::System Settings::Main\')" role="presentation" class=""><a href="#settings-settings-main" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-settings"></i></span><span class="hidden-xs" lang="en"> Main</span></a>
+                            </li>
+                            <li onclick="changeSettingsMenu(\'Settings::System Settings::Logs\');loadSettingsPage(\'api/?v1/settings/settings/logs\',\'#settings-settings-logs\',\'Log Viewer\');" role="presentation" class=""><a href="#settings-settings-logs" aria-controls="home" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-receipt"></i></span><span class="hidden-xs" lang="en"> Logs</span></a>
+                            </li>
+                            <li onclick="changeSettingsMenu(\'Settings::System Settings::Updates\')" role="presentation" class=""><a href="#settings-settings-updates" aria-controls="profile" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-package"></i></span> <span class="hidden-xs" lang="en">Updates</span></a>
+                            </li>
+                            <li onclick="changeSettingsMenu(\'Settings::System Settings::Donate\')" role="presentation" class=""><a href="#settings-settings-donate" aria-controls="profile" role="tab" data-toggle="tab" aria-expanded="false"><span class="visible-xs"><i class="ti-money"></i></span> <span class="hidden-xs" lang="en">Donate</span></a>
+                            </li>
+                        </ul>
+                        <!-- Tab panes -->
+                        <div class="tab-content">
+                            <div role="tabpanel" class="tab-pane fade" id="settings-settings-main">
+                                <h2 lang="en">Main Settings</h2>
+                                <div class="clearfix"></div>
+                            </div>
+                            <div role="tabpanel" class="tab-pane fade" id="settings-settings-logs">
+                                <h2 lang="en">Loading...</h2>
+                                <div class="clearfix"></div>
+                            </div>
+                            <div role="tabpanel" class="tab-pane fade active in" id="settings-settings-about">
+    							<div class="row">
+    								<div class="col-lg-6 col-sm-12 col-md-6">
+    									<div class="panel bg-theme-dark">
+    										<div class="p-30">
+    											<div class="row">
+    												<div class="col-xs-12"><img src="plugins/images/organizr/logo-wide.png" alt="organizr" class="img-responsive"></div>
+    											</div>
+    										</div>
+    										<hr class="m-t-10">
+    										<div class="p-20 text-center">
+    											<p lang="en">Below you will find all the links for everything that has to do with Organizr</p>
+    										</div>
+    										<hr>
+    										<ul class="dp-table profile-social-icons">
+    											<li><a href="https://organizr.us" target="_blank"><i class="mdi mdi-web mdi-24px"></i></a></li>
+    											<li><a href="https://reddit.com/r/organizr" target="_blank"><i class="mdi mdi-reddit mdi-24px"></i></a></li>
+    											<li><a href="https://organizr.us/discord" target="_blank"><i class="mdi mdi-discord mdi-24px"></i></a></li>
+    											<li><a href="https://github.com/causefx/organizr" target="_blank"><i class="mdi mdi-github-box mdi-24px"></i></a></li>
+    										</ul>
+    									</div>
+    								</div>
+                                    <div class="col-lg-6 col-sm-12 col-md-6">
+                                        <div class="white-box bg-theme-dark">
+                                            <h3 class="box-title" lang="en">Information</h3>
+                                            <ul class="feeds">
+                                                <li><div class="bg-info"><i class="mdi mdi-webpack mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Organizr Version</span> '.$GLOBALS['installedVersion'].'</li>
+                                                <li><div class="bg-info"><i class="mdi mdi-github-box mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Organizr Branch</span> '.$GLOBALS['branch'].'</li>
+                                                <li><div class="bg-info"><i class="mdi mdi-database mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Database Location</span> '.$GLOBALS['dbLocation'].$GLOBALS['dbName'].'</li>
+                                                <hr class="m-t-10">
+                                                <li><div class="bg-info"><i class="mdi mdi-language-php mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">PHP Version</span> '.phpversion().'</li>
+                                                <li><div class="bg-info"><i class="mdi mdi-package-variant-closed mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">Webserver Version</span> '.$_SERVER['SERVER_SOFTWARE'].'</li>
+                                                <hr class="m-t-10">
+                                                <li><div class="bg-info"><i class="mdi mdi-account-card-details mdi-24px text-white"></i></div><span class="text-muted hidden-xs" lang="en">License</span> '.ucwords($GLOBALS['license']).'</li>
 
-                                        </ul>
+                                            </ul>
+                                        </div>
+                                    </div>
+    							</div>
+                                <div class="clearfix"></div>
+                            </div>
+                            <div role="tabpanel" class="tab-pane fade" id="settings-settings-donate">
+                                <div class="row">
+                                    <div class="col-md-3 col-sm-6 col-xs-12">
+                                        <div class="white-box bg-theme-dark">
+                                            <h1 class="m-t-0"><i class="fa fa-cc-visa text-info"></i></h1>
+                                            <h2>**** **** **** 2150</h2> <span class="pull-right">Expiry date: 10/16</span> <span class="font-500">Johnathan Doe</span> </div>
+                                    </div>
+                                    <div class="col-md-3 col-sm-6 col-xs-12">
+                                        <div class="white-box">
+                                            <h1 class="m-t-0"><i class="fa fa-cc-mastercard text-danger"></i></h1>
+                                            <h2>**** **** **** 2150</h2> <span class="pull-right">Expiry date: 10/16</span> <span class="font-500">Johnathan Doe</span> </div>
+                                    </div>
+                                    <div class="col-md-3 col-sm-6 col-xs-12">
+                                        <div class="white-box">
+                                            <h1 class="m-t-0"><i class="fa fa-cc-discover text-success"></i></h1>
+                                            <h2>**** **** **** 2150</h2> <span class="pull-right">Expiry date: 10/16</span> <span class="font-500">Johnathan Doe</span> </div>
+                                    </div>
+                                    <div class="col-md-3 col-sm-6 col-xs-12">
+                                        <div class="white-box">
+                                            <h1 class="m-t-0"><i class="fa fa-cc-amex text-warning"></i></h1>
+                                            <h2>**** **** **** 2150</h2> <span class="pull-right">Expiry date: 10/16</span> <span class="font-500">Johnathan Doe</span> </div>
                                     </div>
                                 </div>
-							</div>
-                            <div class="clearfix"></div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane fade" id="settings-settings-donate">
-                            <div class="row">
-                                <div class="col-md-3 col-sm-6 col-xs-12">
-                                    <div class="white-box bg-theme-dark">
-                                        <h1 class="m-t-0"><i class="fa fa-cc-visa text-info"></i></h1>
-                                        <h2>**** **** **** 2150</h2> <span class="pull-right">Expiry date: 10/16</span> <span class="font-500">Johnathan Doe</span> </div>
-                                </div>
-                                <div class="col-md-3 col-sm-6 col-xs-12">
-                                    <div class="white-box">
-                                        <h1 class="m-t-0"><i class="fa fa-cc-mastercard text-danger"></i></h1>
-                                        <h2>**** **** **** 2150</h2> <span class="pull-right">Expiry date: 10/16</span> <span class="font-500">Johnathan Doe</span> </div>
-                                </div>
-                                <div class="col-md-3 col-sm-6 col-xs-12">
-                                    <div class="white-box">
-                                        <h1 class="m-t-0"><i class="fa fa-cc-discover text-success"></i></h1>
-                                        <h2>**** **** **** 2150</h2> <span class="pull-right">Expiry date: 10/16</span> <span class="font-500">Johnathan Doe</span> </div>
-                                </div>
-                                <div class="col-md-3 col-sm-6 col-xs-12">
-                                    <div class="white-box">
-                                        <h1 class="m-t-0"><i class="fa fa-cc-amex text-warning"></i></h1>
-                                        <h2>**** **** **** 2150</h2> <span class="pull-right">Expiry date: 10/16</span> <span class="font-500">Johnathan Doe</span> </div>
-                                </div>
+                                <div class="clearfix"></div>
+                            </div>
+                            <div role="tabpanel" class="tab-pane fade" id="settings-settings-updates">
+                                <div id="githubVersions"></div>
+                                <div class="clearfix"></div>
                             </div>
-                            <div class="clearfix"></div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane fade" id="settings-settings-updates">
-                            <div id="githubVersions"></div>
-                            <div class="clearfix"></div>
                         </div>
-                    </div>
-                </section>
+                    </section>
+                </div>
+                <!-- /content -->
             </div>
-            <!-- /content -->
-        </div>
-        <!-- /tabs -->
-    </section>
-
+            <!-- /tabs -->
+        </section>
     </div>
     <!--./row-->
 </div>

api/pages/wizard.php

@@ -42,15 +42,15 @@ $pageWizard = '
                                 }
                             }
                         },
-                        key: {
+                        hashKey: {
                             validators: {
                                 notEmpty: {
-                                    message: \'The key hash is required\'
+                                    message: \'The hash key is required\'
                                 },
                                 stringLength: {
                                     min: 3,
                                     max: 30,
-                                    message: \'The key hash must be more than 2 and less than 30 characters long\'
+                                    message: \'The hash key must be more than 2 and less than 30 characters long\'
                                 }
                             }
                         },
@@ -127,7 +127,6 @@ $pageWizard = '
                 console.log( post );
                 organizrAPI(\'POST\',\'api/?v1/wizard_config\',post).success(function(data) {
             		var html = JSON.parse(data);
-                    console.log(html.data);
                     if(html.data == true){
                         location.reload();
                     }else{
@@ -178,7 +177,7 @@ $pageWizard = '
                             <h4><span><i class="ti-check"></i></span><item lang="en">Verify</item></h4>
                         </li>
                     </ul>
-                    <form class="form-horizontal" id="validation" name="validation" onsubmit="return:false;">
+                    <form class="form-horizontal" id="validation" name="validation" onsubmit="return false;">
                         <div class="wizard-content">
                             <div class="wizard-pane active" role="tabpanel">
                                 <div class="form-group">

index.php

@@ -46,10 +46,8 @@
 			<div class="navbar-header">
 				<div class="top-left-part hidden-xs">
 					<!-- Logo -->
-					 <a class="logo" href="#"><!-- Logo text image you can use text also -->
-						 <span class="hidden-xs"><!--This is dark logo text-->
-							<img alt="home" class="dark-logo" height="60px" src="https://sonflix.com/images/newsonflixlogo.png"> <!--This is light logo text-->
-						 </span>
+					 <a class="logo" href="javascript:void(0)"><!-- Logo text image you can use text also -->
+						 <span class="hidden-xs" id="main-logo"></span>
 					 </a>
 				</div><!-- /Logo -->
 				<!-- Search input and Toggle icon -->
@@ -71,9 +69,7 @@
 				<div class="sidebar-head">
 					<h3><span class="fa-fw open-close"><i class="ti-menu hidden-xs"></i><i class="ti-close visible-xs"></i></span>
 					<span class="hide-menu hidden-xs" lang="en">Navigation</span>
-					<span class="hide-menu hidden-sm hidden-md hidden-lg"><!--This is dark logo text-->
-							<img alt="home" height="35px" src="https://sonflix.com/images/newsonflixlogo.png"> <!--This is light logo text-->
-						 </span>
+					<span class="hide-menu hidden-sm hidden-md hidden-lg" id="side-logo"></span>
 					</h3>
 				</div>
 				<ul class="nav" id="side-menu"></ul>

js/functions.js

@@ -439,13 +439,24 @@ function hasValue(test){
 /* BUILD FUNCTIONS */
 /* END BUILD FUNCTIONS */
 /* ORGANIZR API FUNCTIONS */
+function buildCustomizeAppearance(){
+	ajaxloader(".content-wrap","in");
+	organizrAPI('GET','api/?v1/customize/appearance').success(function(data) {
+		var response = JSON.parse(data);
+		console.log(response)
+		//$('#manageUserTable').html(buildUserManagementItem(response.data));
+	}).fail(function(xhr) {
+		console.error("Organizr Function: API Connection Failed");
+	});
+	ajaxloader();
+}
 function buildUserManagement(){
 	ajaxloader(".content-wrap","in");
 	organizrAPI('GET','api/?v1/user/list').success(function(data) {
 		var response = JSON.parse(data);
 		$('#manageUserTable').html(buildUserManagementItem(response.data));
 	}).fail(function(xhr) {
-		console.error("Organizr Function: Failed to grab user list from API");
+		console.error("Organizr Function: API Connection Failed");
 	});
 	ajaxloader();
 }
@@ -455,7 +466,7 @@ function buildGroupManagement(){
 		var response = JSON.parse(data);
 		$('#manageGroupTable').html(buildGroupManagementItem(response.data));
 	}).fail(function(xhr) {
-		console.error("Organizr Function: Failed to grab user list from API");
+		console.error("Organizr Function: API Connection Failed");
 	});
 	ajaxloader();
 }
@@ -465,7 +476,7 @@ function buildTabEditor(){
 		var response = JSON.parse(data);
 		$('#tabEditorTable').html(buildTabEditorItem(response.data));
 	}).fail(function(xhr) {
-		console.error("Organizr Function: Failed to grab user list from API");
+		console.error("Organizr Function: API Connection Failed");
 	});
 	ajaxloader();
 }
@@ -475,7 +486,7 @@ function buildCategoryEditor(){
 		var response = JSON.parse(data);
 		$('#categoryEditorTable').html(buildCategoryEditorItem(response.data));
 	}).fail(function(xhr) {
-		console.error("Organizr Function: Failed to grab user list from API");
+		console.error("Organizr Function: API Connection Failed");
 	});
 	ajaxloader();
 }
@@ -1004,49 +1015,13 @@ function loadInternal(url,tabName){
 		console.error("Organizr Function: Connection Failed");
 	});
 }
-function loadLogs(){
-	organizrAPI('get','api/?v1/settings/settings/logs').success(function(data) {
-		var json = JSON.parse(data);
-		console.log('Organizr Function: Loading Organizr Logs');
-		$('#settings-settings-logs').html(json.data);
-	}).fail(function(xhr) {
-		console.error("Organizr Function: API Log Connection Failed");
-	});
-}
-function loadUserManagement(){
-	organizrAPI('get','api/?v1/settings/user/manage/users').success(function(data) {
-		var json = JSON.parse(data);
-		console.log('Organizr Function: Loading Organizr User Management');
-		$('#settings-user-manage-users').html(json.data);
-	}).fail(function(xhr) {
-		console.error("Organizr Function: API User Management Connection Failed");
-	});
-}
-function loadGroupManagement(){
-	organizrAPI('get','api/?v1/settings/user/manage/groups').success(function(data) {
-		var json = JSON.parse(data);
-		console.log('Organizr Function: Loading Organizr Group Management');
-		$('#settings-user-manage-groups').html(json.data);
-	}).fail(function(xhr) {
-		console.error("Organizr Function: API Group Management Connection Failed");
-	});
-}
-function loadTabEditor(){
-	organizrAPI('get','api/?v1/settings/tab/editor/tabs').success(function(data) {
+function loadSettingsPage(api,element,organizrFn){
+	organizrAPI('get',api).success(function(data) {
 		var json = JSON.parse(data);
-		console.log('Organizr Function: Loading Organizr Tab Editor');
-		$('#settings-tab-editor-tabs').html(json.data);
+		console.log('Organizr Function: Loading '+organizrFn);
+		$(element).html(json.data);
 	}).fail(function(xhr) {
-		console.error("Organizr Function: API Tab Editor Connection Failed");
-	});
-}
-function loadCategoryEditor(){
-	organizrAPI('get','api/?v1/settings/tab/editor/categories').success(function(data) {
-		var json = JSON.parse(data);
-		console.log('Organizr Function: Loading Organizr Category Editor');
-		$('#settings-tab-editor-categories').html(json.data);
-	}).fail(function(xhr) {
-		console.error("Organizr Function: API Category Editor Connection Failed");
+		console.error("Organizr Function: API Connection Failed");
 	});
 }
 function updateCheck(){
@@ -1071,7 +1046,7 @@ function updateNow(){
 	alert('update script');
 }
 function organizrAPI(type,path,data=null){
-	console.log('Organizr API: Calling API: '+path);
+	//console.log('Organizr API: Calling API: '+path);
 	switch (type) {
 		case 'get':
 		case 'GET':
@@ -1283,8 +1258,15 @@ function logIcon(type){
 function radioLoop(element){
 	$('[type=radio][id!="'+element.id+'"]').each(function() { this.checked=false });
 }
-function loadAppearance(){
-	$(document).attr("title", "New Title");
+function loadAppearance(appearance){
+	console.log(appearance);
+	if(appearance.useLogo === false){
+		$('#main-logo').html(appearance.title);
+		$('#side-logo').html(appearance.title);
+	}else{
+		$('#main-logo').html('<img alt="home" class="dark-logo" height="60px" src="'+appearance.logo+'">');
+		$('#side-logo').html('<img alt="home" height="35px" src="'+appearance.logo+'">');
+	}
 	$('.navbar-header').css("background", "#1f1f1f");
 }
 function clearForm(form){
@@ -1312,9 +1294,9 @@ function launch(){
 			token:json.data.user.token,
 			branch:json.branch
 		};
-		console.log("%cOrganizr","background: #000; color: #66D9EF; font-size: 24px; font-family: Monospace; padding : 5px 234px 5px 10px; border-radius: 5px 5px 0 0;");
-		console.log("%cVersion: "+currentVersion,"background: #AD80FD; color: #333333; font-size: 12px; font-family: Monospace; padding : 2px 207.5px 5px 10px;");
-		console.log("%cStarting Up...","background: #F92671; color: #fff; font-size: 12px; font-family: Monospace; padding : 5px 247px 2px 10px; border-radius: 0 0 5px 5px;")
+		console.log("%cOrganizr","color: #66D9EF; font-size: 24px; font-family: Monospace;");
+		console.log("%cVersion: "+currentVersion,"color: #AD80FD; font-size: 12px; font-family: Monospace;");
+		console.log("%cStarting Up...","color: #F92671; font-size: 12px; font-family: Monospace;")
 		switch (json.data.status.status) {
 			case "wizard":
 				buildWizard();
@@ -1324,7 +1306,7 @@ function launch(){
 				buildDependencyCheck(json);
 				break;
 			case "ok":
-				loadAppearance();
+				loadAppearance(json.appearance);
 				userMenu(json);
 				categoryProcess(json);
 				tabProcess(json);

js/langpack/en.json

@@ -142,6 +142,12 @@
 		"Add New Group":"Add New Group",
 		"USERS":"USERS",
 		"GROUP NAME":"GROUP NAME",
-		"MANAGE GROUPS":"MANAGE GROUPS"
+		"MANAGE GROUPS":"MANAGE GROUPS",
+		"Changed Language To":"Changed Language To",
+		"Groups":"Groups",
+		"Users":"Users",
+		"Appearance":"Appearance",
+		"Customize Appearance":"Customize Appearance",
+		"Customize":"Customize"
 	}
 }