Explorar el Código

Merge pull request #604 from causefx/cero-dev

Cero dev
causefx hace 8 años
padre
commit
a5165bab31
Se han modificado 13 ficheros con 502 adiciones y 151 borrados
  1. 2 2
      auth.php
  2. 4 4
      bower_components/speed/speedtest_worker.js
  3. 222 25
      functions.php
  4. BIN
      images/portainer.png
  5. 70 58
      lang/de.ini
  6. 5 0
      lang/en.ini
  7. 8 0
      lang/es.ini
  8. 8 0
      lang/fr.ini
  9. 8 0
      lang/it.ini
  10. 8 0
      lang/nl.ini
  11. 8 0
      lang/pl.ini
  12. 158 61
      settings.php
  13. 1 1
      user.php

+ 2 - 2
auth.php

@@ -18,14 +18,14 @@ if (isset($_GET['admin'])) {
     if($USER->authenticated && $USER->role == "admin" && !in_array(strtoupper($USER->username), getBannedUsers($ban))) {
         !$debug ? exit(http_response_code(200)) : die("$USER->username on $currentIP Authorized At Admin Level");
 	} else {
-        !$debug ? exit(http_response_code(401)) : die("$USER->username on $currentIP Not Authorized At Admin Level");
+        !$debug ? writeLog("error", "Denied Access to $USER->username on $currentIP") : die("$USER->username on $currentIP Not Authorized At Admin Level");
     }
 }
 if (isset($_GET['user'])) {
     if($USER->authenticated && !in_array(strtoupper($USER->username), getBannedUsers($ban))) {
         !$debug ? exit(http_response_code(200)) : die("$USER->username on $currentIP Authorized At User Level");
 	} else {
-        !$debug ? exit(http_response_code(401)) : die("$USER->username on $currentIP Not Authorized At User Level");
+        !$debug ? writeLog("error", "Denied Access to $USER->username on $currentIP") : die("$USER->username on $currentIP Not Authorized At User Level");
 	}
 }
 if (!isset($_GET['user']) && !isset($_GET['admin']) && !isset($_GET['whitelist'])) {

+ 4 - 4
bower_components/speed/speedtest_worker.js

@@ -19,8 +19,8 @@ function twarn(s){log+=Date.now()+' WARN: '+s+'\n'; console.warn(s)}
 
 // test settings. can be overridden by sending specific values with the start command
 var settings = {
-  time_ul: 15, // duration of upload test in seconds
-  time_dl: 15, // duration of download test in seconds
+  time_ul: 10, // duration of upload test in seconds
+  time_dl: 10, // duration of download test in seconds
   time_ulGraceTime: 3, //time to wait in seconds before actually measuring ul speed (wait for buffers to fill)
   time_dlGraceTime: 1.5, //time to wait in seconds before actually measuring dl speed (wait for TCP window to increase)
   count_ping: 35, // number of pings to perform in ping test
@@ -28,8 +28,8 @@ var settings = {
   url_ul: 'empty.php', // path to an empty file, used for upload test. must be relative to this js file
   url_ping: 'empty.php', // path to an empty file, used for ping test. must be relative to this js file
   url_getIp: 'getIP.php', // path to getIP.php relative to this js file, or a similar thing that outputs the client's ip
-  xhr_dlMultistream: 20, // number of download streams to use (can be different if enable_quirks is active)
-  xhr_ulMultistream: 6, // number of upload streams to use (can be different if enable_quirks is active)
+  xhr_dlMultistream: 10, // number of download streams to use (can be different if enable_quirks is active)
+  xhr_ulMultistream: 3, // number of upload streams to use (can be different if enable_quirks is active)
   xhr_ignoreErrors: 1, // 0=fail on errors, 1=attempt to restart a stream if it fails, 2=ignore all errors
   xhr_dlUseBlob: false, // if set to true, it reduces ram usage but uses the hard drive (useful with large garbagePhp_chunkSize and/or high xhr_dlMultistream)
   garbagePhp_chunkSize: 20, // size of chunks sent by garbage.php (can be different if enable_quirks is active)

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 222 - 25
functions.php


BIN
images/portainer.png


+ 70 - 58
lang/de.ini

@@ -251,64 +251,76 @@ GIT_BRANCH = "Github Branch, die zur erzwungenen Installation genutz wird (nur z
 GIT_CHECK = "Auf neues 'master' Release prüfen"
 GIT_FORCE = "Installation der Branch erzwingen"
 GIT_FORCE_CONFIRM = "Sicher diese Branch installieren? Von neuen auf alte Versionen zu wechseln wird weder empfohlen, noch unterstützt."
-SPEED_TEST = "Speed Test"
-NOTICE_COLOR = "Notice Color"
-NOTICE_TITLE = "Notice Title"
-NOTICE_MESSAGE = "Notice Message"
-SHOW_NAMES = "Show Names"
-NOTICE_LAYOUT = "Notice Layout"
-RECENT_ITEMS_LIMIT = "Recent Items Limit"
-ALLOW_SEARCH = "Allow Search"
-CHECK_INVITE = "Enter Invite Code to Procced"
-CODE = "Invite Code"
-INVITE_CODE = "Invite Code"
-DATE_SENT = "Date Sent"
-DATE_USED = "Date Used"
-VALID = "Valid"
-SUBMIT_CODE = "Submit Code"
-IFRAME_CAN_BE_FRAMED = "iFrame Can Be Framed"
-IFRAME_CANNOT_BE_FRAMED = "iFrame Cannot Be Framed"
-CODE_SUCCESS = "Invite Code Has Been Validated"
-CODE_ERROR = "Invite Code is incorrect or not valid"
-HAVE_ACCOUNT = "Do You Have A PLEX Account Already?"
-USERNAME_EMAIL = "Username or E-Mail"
-INVITE_SUCCESS = "You have now been invited, please check your email to accept"
-INVITE_ERROR = "Invite Code not valid, contact admin"
-CREATE_PLEX = "Create PLEX Account"
-JOIN = "Join"
-SIGN_UP = "Sign-up"
-JOIN_SUCCESS = "You have successfully signed up for PLEX, please click join now"
-JOIN_ERROR = "An error occured signing up for PLEX - Username or email might be in use - Try again"
-SEND_INVITE = "Create/Mail Invite"
-USED_BY = "Used By"
-ACCOUNT_MADE = "PLEX Account is now created, Click Join now"
-USERNAME_NAME = "Username or Name"
-ACCOUNT_SUBMITTED = "PLEX Invite Sent|1. Check Email and Accept Invite|2. Close This Modal with Small 'x' on Top Right|3. Sign in"
-PLEX_TAB_NAME = "PLEX Tab Name [only use this if your PLEX URL above is a sub-domain - i.e. https://plex.domain.com]"
-IPINFO_TOKEN = "Get Token from https://ipinfo.io/account/registration as Default will expire"
-GET_PLEX_TOKEN = "Get PLEX Token"
-EMAIL_INVITE_HEADER = "Join My|Server"
-EMAIL_INVITE_TITLE = "LOOK WHO JUST GOT AN INVITE"
-EMAIL_INVITE_MESSAGE = "Here is an invite to join my|server.  The code to join is:"
-EMAIL_INVITE_BUTTON = "JOIN MY|SERVER"
-EMAIL_INVITE_SUBTITLE = "What do I do?"
-EMAIL_INVITE_SUBMESSAGE = "You can click the link above to have it auto fill in the code for you or you could follow this link here:|to take you to my site to fill in the code."
-EMAIL_RESET_HEADER = "Reset Password"
+SPEED_TEST = "Geschwindigkeitstest"
+NOTICE_COLOR = "Hinweisfarbe"
+NOTICE_TITLE = "Hinweistitel"
+NOTICE_MESSAGE = "Hinweistext"
+SHOW_NAMES = "Namen zeigen"
+NOTICE_LAYOUT = "Hinweislayout"
+RECENT_ITEMS_LIMIT = "Begrenzung aktueller Elemente"
+ALLOW_SEARCH = "Suche erlauben"
+CHECK_INVITE = "Einladungscode zum Fortsetzen angeben"
+CODE = "Einladungscode"
+INVITE_CODE = "Einladungscode"
+DATE_SENT = "Gesendet am"
+DATE_USED = "Genutzt am"
+VALID = "Gültig"
+SUBMIT_CODE = "Code absenden"
+IFRAME_CAN_BE_FRAMED = "iFrame kann genutzt werden"
+IFRAME_CANNOT_BE_FRAMED = "iFrame kann nicht genutzt werden"
+CODE_SUCCESS = "Einladungscode erfolgreich geprüft"
+CODE_ERROR = "Einladungscode falsch oder nicht mehr gültig"
+HAVE_ACCOUNT = "Haben Sie bereits ein PLEX Konto?"
+USERNAME_EMAIL = "Benutzername oder E-Mail"
+INVITE_SUCCESS = "Sie wurden nun eingeladen. Bitte prüfen Sie ihre E-Mails um zu akzeptieren."
+INVITE_ERROR = "Einladungscode ungültig. Bitte Admin kontaktieren"
+CREATE_PLEX = "PLEX Konto anlegen"
+JOIN = "Beitreten"
+SIGN_UP = "Registrieren"
+JOIN_SUCCESS = "Erfolgreich für PLEX registriert, bitte Beitreten klicken"
+JOIN_ERROR = "Ein Fehler ist bei der Registrierung für PLEX aufgetreten - Benutzername oder E-Mail wird eventuell schon verwendet - Erneut versuchen"
+SEND_INVITE = "Einladung erstellen/versenden"
+USED_BY = "Genutzt von"
+ACCOUNT_MADE = "PLEX-Konto ist angelegt, bitte Beitreten klicken"
+USERNAME_NAME = "Benutzername oder Name"
+ACCOUNT_SUBMITTED = "PLEX Einladung versendet|1. E-Mail prüfen und Einladung annehmen|2. Den Dialog mit dem kleinen 'x' oben rechts schließen|3. Anmelden"
+PLEX_TAB_NAME = "PLEX Tab Name [nur nutzen, wenn die PLEX URL oben eine sub-domain ist - bspw. https://plex.domain.com]"
+IPINFO_TOKEN = "Token von https://ipinfo.io/account/registration holen, da Standard abläuft"
+GET_PLEX_TOKEN = "PLEX Token abrufen"
+EMAIL_INVITE_HEADER = "Meinem Server|beitreten"
+EMAIL_INVITE_TITLE = "OHA! EINE EINLADUNG"
+EMAIL_INVITE_MESSAGE = "Dies ist eine Einladung meinem Server |beizutreten.  Der Code hierfür lautet:"
+EMAIL_INVITE_BUTTON = "MEINEM SERVER|BEITRETEN"
+EMAIL_INVITE_SUBTITLE = "Was ist zu tun?"
+EMAIL_INVITE_SUBMESSAGE = "Der Link oben beinhaltet den Code bereits, ansonsten steht dieser Link zur Verfügung:|um zu meiner Seite zu gelangen und den Code anzugeben."
+EMAIL_RESET_HEADER = "Passwort zurücksetzen"
 EMAIL_RESET_TITLE = "LOOK WHO FORGOT THEIR PASSWORD"
-EMAIL_RESET_MESSAGE = "So, you forgot your password huh?  That sucks...  Don't worry, I got you covered.  Here is your new password, it may be freaking long but all you have to do is copy and login to change your password.  Super-Long-New-Password:"
+EMAIL_RESET_MESSAGE = "Das Passwort vergessen zu haben nervt... aber keine Angst: Hier ist das neue Passwort. Es mag zwar super lang sein, aber man muss es nur Kopieren und für den Login wieder einfügen um dann ein neues zu vergeben.  Super langes neues Passwort:"
 EMAIL_RESET_BUTTON = "Login"
-EMAIL_RESET_SUBTITLE = "What do I do?"
-EMAIL_RESET_SUBMESSAGE = "You can click the link above to go to my site to login.  Once logged in, click on your image or user icon on top right and change your password."
-EMAIL_NEWUSER_HEADER = "New User"
-EMAIL_NEWUSER_TITLE = "LOOK WHO JUST JOINED THE COOL CLUB"
-EMAIL_NEWUSER_MESSAGE = "Welcome, to my website.  I have many things here... many, many, many shiny things.  Have a look around :)"
+EMAIL_RESET_SUBTITLE = "Was ist zu tun?"
+EMAIL_RESET_SUBMESSAGE = "Der Link oben führt zum Login meiner Seite. Damit ist dann über einen Klick auf das Nutzerbild oben rechts eine Passwortänderung möglich"
+EMAIL_NEWUSER_HEADER = "Neuer Benutzer"
+EMAIL_NEWUSER_TITLE = "SCHAU, WER GERADE DEM COOLEN CLUB BEIGETRETEN IST"
+EMAIL_NEWUSER_MESSAGE = "Willkommen auf meiner Website. Hier gibt es viele Dinge... sehr viele tolle Dinge.  Viel Spaß beim Umsehen :)"
 EMAIL_NEWUSER_BUTTON = "Login"
-EMAIL_NEWUSER_SUBTITLE = "What do I do?"
-EMAIL_NEWUSER_SUBMESSAGE = "Now that you have signed up, you can basically do whatever you like.  Enjoy"
-PLAYLISTS = "Playlists"
-DOWNLOAD_REFRESH = "Refresh Download Queue"
-HISTORY_REFRESH = "Refresh History"
-CHECK_FRAME = "Test Frame"
-GENERATE_API_KEY = "Generate API Key"
-ORGANIZR_API_KEY = "Organizr API Key"
-TEST_EMAIL = "Send Test E-Mail"
+EMAIL_NEWUSER_SUBTITLE = "Was ist zu tun?"
+EMAIL_NEWUSER_SUBMESSAGE = "Nach der erfolgreichen Registrierung ist ab sofort ist im Grunde alles erlaubt. Viel Spaß!"
+PLAYLISTS = "Playlisten"
+DOWNLOAD_REFRESH = "Download-Warteschlange  neu laden"
+HISTORY_REFRESH = "Verlauf neu laden"
+CHECK_FRAME = "Frame testen"
+GENERATE_API_KEY = "Generate API Schlüssel"
+ORGANIZR_API_KEY = "Organizr API Schlüssel"
+TEST_EMAIL = "Test E-Mail senden"
+BACKUP_CREATED = "Backup Created"
+BACKUP_ERROR = "Backup Creation Error"
+BACKUP_NOW = "Backup Now"
+BACKUP_LIST = "Backup List"
+SPLASH = "Splash"
+PING = "Ping"
+PING_URL = "Ping URL"
+URL = "URL"
+TEST_URL = "Enter URL to Test"
+MORE = "More"
+LESS = "Less"
+ENABLE_SPLASH_SCREEN = "Enable Splash Screen"

+ 5 - 0
lang/en.ini

@@ -319,3 +319,8 @@ BACKUP_LIST = "Backup List"
 SPLASH = "Splash"
 PING = "Ping"
 PING_URL = "Ping URL"
+URL = "URL"
+TEST_URL = "Enter URL to Test"
+MORE = "More"
+LESS = "Less"
+ENABLE_SPLASH_SCREEN = "Enable Splash Screen"

+ 8 - 0
lang/es.ini

@@ -316,3 +316,11 @@ BACKUP_CREATED = "Backup Created"
 BACKUP_ERROR = "Backup Creation Error"
 BACKUP_NOW = "Backup Now"
 BACKUP_LIST = "Backup List"
+SPLASH = "Splash"
+PING = "Ping"
+PING_URL = "Ping URL"
+URL = "URL"
+TEST_URL = "Enter URL to Test"
+MORE = "More"
+LESS = "Less"
+ENABLE_SPLASH_SCREEN = "Enable Splash Screen"

+ 8 - 0
lang/fr.ini

@@ -316,3 +316,11 @@ BACKUP_CREATED = "Backup Created"
 BACKUP_ERROR = "Backup Creation Error"
 BACKUP_NOW = "Backup Now"
 BACKUP_LIST = "Backup List"
+SPLASH = "Splash"
+PING = "Ping"
+PING_URL = "Ping URL"
+URL = "URL"
+TEST_URL = "Enter URL to Test"
+MORE = "More"
+LESS = "Less"
+ENABLE_SPLASH_SCREEN = "Enable Splash Screen"

+ 8 - 0
lang/it.ini

@@ -316,3 +316,11 @@ BACKUP_CREATED = "Backup Created"
 BACKUP_ERROR = "Backup Creation Error"
 BACKUP_NOW = "Backup Now"
 BACKUP_LIST = "Backup List"
+SPLASH = "Splash"
+PING = "Ping"
+PING_URL = "Ping URL"
+URL = "URL"
+TEST_URL = "Enter URL to Test"
+MORE = "More"
+LESS = "Less"
+ENABLE_SPLASH_SCREEN = "Enable Splash Screen"

+ 8 - 0
lang/nl.ini

@@ -316,3 +316,11 @@ BACKUP_CREATED = "Backup Created"
 BACKUP_ERROR = "Backup Creation Error"
 BACKUP_NOW = "Backup Now"
 BACKUP_LIST = "Backup List"
+SPLASH = "Splash"
+PING = "Ping"
+PING_URL = "Ping URL"
+URL = "URL"
+TEST_URL = "Enter URL to Test"
+MORE = "More"
+LESS = "Less"
+ENABLE_SPLASH_SCREEN = "Enable Splash Screen"

+ 8 - 0
lang/pl.ini

@@ -316,3 +316,11 @@ BACKUP_CREATED = "Backup Created"
 BACKUP_ERROR = "Backup Creation Error"
 BACKUP_NOW = "Backup Now"
 BACKUP_LIST = "Backup List"
+SPLASH = "Splash"
+PING = "Ping"
+PING_URL = "Ping URL"
+URL = "URL"
+TEST_URL = "Enter URL to Test"
+MORE = "More"
+LESS = "Less"
+ENABLE_SPLASH_SCREEN = "Enable Splash Screen"

+ 158 - 61
settings.php

@@ -178,6 +178,28 @@ if(SLIMBAR == "true") {
 		</script>
 		
         <style>
+			@-webkit-keyframes fadeIn {
+				from { opacity: 0; }
+				to { opacity: 1; }
+			}  
+			@keyframes fadeIn {
+				from { opacity: 0; }
+				to { opacity: 1; }
+			}
+			button.settingsMenu:hover {
+				width: 250px !important;
+				z-index: 10000;
+				color: black !important;
+			}
+			button.settingsMenu:hover p{
+				display: block !important;
+				-webkit-animation: fadeIn 1s;
+				animation: fadeIn 1s;
+			}
+			button.settingsMenuActive {
+				margin-left: 0px !important;
+				color: black !important;
+			}
             .loop-animation {
                 animation-iteration-count: infinite;
                 -webkit-animation-iteration-count: infinite;
@@ -213,12 +235,12 @@ if(SLIMBAR == "true") {
                     height: 100%;
                     position: fixed;
                     max-width: 100%;
-                    width: 84%;
-                    right: -84%;
+                    width: calc(100% - 50px) !important;
+                    right: calc(-100% - 50px);
                 }.email-content .email-header, .email-new .email-header{
                     position: fixed;
                     padding: 10px 30px;
-                    width: 84%;
+                    width: calc(100% - 50px) !important;
                     z-index: 1000;
                 }
             }ul.inbox-nav.nav {
@@ -334,7 +356,7 @@ if(SLIMBAR == "true") {
                             </div>
                             <form id="urlTestForm" onsubmit="return false;">
                                 <div class="modal-body">
-                                    Let's Check this URL
+									<?php echo translate("TEST_URL"); ?>
                                     <input type="text" class="form-control material" name="url-test" placeholder="<?php echo translate("URL"); ?>" autocorrect="off" autocapitalize="off" value="">
                                 </div>
                                 <div class="modal-footer">
@@ -348,35 +370,119 @@ if(SLIMBAR == "true") {
                 <br/>
                 <div id="versionCheck"></div>
                 <div class="row">
-                    <div class="col-lg-2">
-						<button id="apply" style="width: 100%; display: none;" class="btn waves btn-success btn-sm text-uppercase waves-effect waves-float animated tada" type="submit">
-							<?php echo $language->translate("APPLY_CHANGES");?>
-						</button>
-                        <div class="content-box profile-sidebar box-shadow">
-                            <img src="images/organizr-logo-h-d.png" width="100%" style="margin-top: -10px;">
-                            <div class="profile-usermenu">
-                                <ul class="nav" id="settings-list">
-                                <!--
-                                <span class="fa-stack fa-lg pull-right" style="margin-top: -8px;margin-right: -15px;">
-                                    <i class="fa fa-square-o fa-stack-2x" style="font-size:null;"></i>
-                                    <i class="fa fa-twitter fa-stack-1x" style="font-size:null;"></i>
-                                </span>
-                                    -->
-                                    <li><a id="open-tabs" box="tab-box"><i class="fa fa-list red-orange pull-right"></i>Edit Tabs</a></li>
-                                    <li><a id="open-colors" box="color-box"><i class="fa fa-paint-brush green pull-right"></i>Edit Colors</a></li>
-                                    <li><a id="open-users" box="users-box"><i class="fa fa-user red pull-right"></i>Manage Users</a></li>
-                                    <li><a id="open-logs" box="logs-box"><i class="fa fa-file-text-o blue pull-right"></i>View Logs</a></li>
-                                    <li><a id="open-homepage" box="homepage-box"><i class=" fa fa-home yellow pull-right"></i>Edit Homepage</a></li>
-                                    <li><a id="open-advanced" box="advanced-box"><i class=" fa fa-cog light-blue pull-right"></i>Advanced</a></li>
-                                    <?php if(!empty(PLEXURL)){?><li><a id="open-invites" box="invites-box"><i class=" fa fa-user-plus gray pull-right"></i>Plex Invites</a></li><?php }?>
-                                    <li><a id="open-info" box="info-box"><i class=" fa fa-info-circle orange pull-right"></i>About</a></li>
-                                    <li><a id="open-donate" box="donate-box"><i class=" fa fa-money red pull-right"></i>Donate</a></li>
-                                </ul>
-                            </div>
-                        </div>
+					<?php 
+					if($userDevice !== "phone"){
+						echo '<div class="col-xs-1" style="width: 60px">';
+						echo '
+						<button id="apply" type="submit" style="display:none;border-radius: 20px !important; -webkit-border-radius: 20px !important;margin-bottom: -20px;z-index:10000;" class="btn btn-success btn-icon waves waves-circle waves-effect waves-float settingsMenu animated tada">
+						<i class="fa fa-retweet fa-fw pull-left" style="padding-left: 12px;"></i>
+						<p class="" style="text-align: center;direction: rtl;display:none;"><strong>'.$language->translate("APPLY_CHANGES").'</strong></p>
+					</button>
+						';
+					}else{
+						echo '<div class="col-sm-2">'; 
+						echo '<button id="apply" style="width: 100%; display: none;" class="btn waves btn-success btn-sm text-uppercase waves-effect waves-float animated tada" type="submit">'.$language->translate("APPLY_CHANGES").'</button>';
+					}?>
+						
+
+<?php 
+$buildMenu = array(
+	array(
+		'id' => 'open-tabs',
+		'box' => 'tab-box',
+		'name' => 'Edit Tabs',
+		'icon_1' => 'circle',
+		'icon_2' => 'th-list',
+		'color' => 'red-orange',
+		'color2' => 'palette-Red-A700 bg',
+		'padding' => '8',
+	),
+	array(
+		'id' => 'open-colors',
+		'box' => 'color-box',
+		'name' => 'Edit Colors',
+		'icon_1' => 'circle',
+		'icon_2' => 'paint-brush',
+		'color' => 'red',
+		'color2' => 'palette-Indigo-A700 bg',
+		'padding' => '8',
+	),
+	array(
+		'id' => 'open-users',
+		'box' => 'users-box',
+		'name' => 'Manage Users',
+		'icon_1' => 'circle',
+		'icon_2' => 'user',
+		'color' => 'green',
+		'color2' => 'palette-Blue-Grey-700 bg',
+		'padding' => '9',
+	),
+	array(
+		'id' => 'open-logs',
+		'box' => 'logs-box',
+		'name' => 'View Logs',
+		'icon_1' => 'circle',
+		'icon_2' => 'list-alt',
+		'color' => 'blue',
+		'color2' => 'palette-Light-Blue-A700 bg',
+		'padding' => '8',
+	),
+	array(
+		'id' => 'open-homepage',
+		'box' => 'homepage-box',
+		'name' => 'Edit Homepage',
+		'icon_1' => 'circle',
+		'icon_2' => 'home',
+		'color' => 'yellow',
+		'color2' => 'palette-Yellow-A700 bg',
+		'padding' => '9',
+	),
+	array(
+		'id' => 'open-invites',
+		'box' => 'invites-box',
+		'name' => 'Plex Invites',
+		'icon_1' => 'circle',
+		'icon_2' => 'user-plus',
+		'color' => 'light-blue',
+		'color2' => 'palette-Amber-A700 bg',
+		'padding' => '7',
+	),
+	array(
+		'id' => 'open-advanced',
+		'box' => 'advanced-box',
+		'name' => 'Advanced',
+		'icon_1' => 'circle',
+		'icon_2' => 'cog',
+		'color' => 'gray',
+		'color2' => 'light-blue-bg',
+		'padding' => '8',
+	),array(
+		'id' => 'open-info',
+		'box' => 'info-box',
+		'name' => 'About',
+		'icon_1' => 'circle',
+		'icon_2' => 'info-circle',
+		'color' => 'orange',
+		'color2' => 'palette-Blue-A700 bg',
+		'padding' => '8',
+	),array(
+		'id' => 'open-donate',
+		'box' => 'donate-box',
+		'name' => 'Donate',
+		'icon_1' => 'square',
+		'icon_2' => 'money',
+		'color' => 'red',
+		'color2' => 'palette-Green-A700 bg',
+		'padding' => '7',
+	),
+);
+if($userDevice !== "phone"){ echo "<br><br><br>".buildMenu($buildMenu); }else{ echo buildMenuPhone($buildMenu); }
+?>								
+
+
                     </div>
                     <div class="col-lg-10">
-                        
+						<h1 class="text-center">ORGANIZR <3 YOU</h1>
                     </div>
                 </div>
                 <div class="email-content tab-box white-bg">
@@ -485,7 +591,7 @@ echo buildSettings(
                         ),
                         array(
 							'type' => 'button',
-							'labelTranslate' => 'LAYER#CAKE',
+							'label' => 'LAYER#CAKE',
 							'icon' => 'birthday-cake',
 							'id' => 'layerCake',
 							'buttonType' => 'dark',
@@ -1731,31 +1837,23 @@ echo buildSettings(
                                             <div class="content-box profile-sidebar box-shadow">
                                                 <img src="images/organizr-logo-h-d.png" width="100%" style="margin-top: -10px;">
                                                 <div class="profile-usermenu">
-                                                    <ul class="nav" id="theme-list">
-                                                        
-
-                                                    </ul>
+                                                    <ul class="nav" id="theme-list"></ul>
                                                 </div>
                                             </div>
                                         </div>
                                         <div class="col-lg-10">
                                             <h1 id="chooseLayer">Choose A Theme To Preview</h1>
                                             <div class="row">
-                                                <div id="layerCakePreview" class="col-lg-10">
-                                                    
-                                                        
-
-                                                </div>
-                                                <div id="layerCakeInfo" class="col-lg-2">
-
-                                                </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                                                <div id="layerCakePreview" class="col-lg-10"></div>
+                                                <div id="layerCakeInfo" class="col-lg-2"></div>
+                                        	</div>
+                                    	</div>
+                                	</div>
+                            	</div>
+                        	</div>
+                    	</div>
+                	</div>
+				</div>
                 <div class="email-content speed-box white-bg">
                     <div class="email-body">
                         <div class="email-header gray-bg">
@@ -1765,12 +1863,10 @@ echo buildSettings(
                         <div class="email-inner small-box">
                             <div class="email-inner-section">
                                 <div class="small-box fade in" id="speedOrg">
-           
                                     <div class="row">
                                         <div class="col-lg-12">
                                             <div class="content-box">
-                                                <div class="content-title big-box i-block">
-                                                </div>
+                                                <div class="content-title big-box i-block"></div>
                                                 <div class="clearfix"></div>
                                                 <div class="big-box">
                                                     <div id="morris-line" class="morris-container"></div>
@@ -1778,7 +1874,6 @@ echo buildSettings(
                                             </div>
                                         </div>
 									</div>
-
 									<?php if(file_exists(DATABASE_LOCATION."speedtest.db")){ ?>
                                     <div id="speedTestTable" class="table-responsive">
                                         <table id="speedLogs" class="datatable display">
@@ -1792,13 +1887,10 @@ echo buildSettings(
                                                     <th><?php echo $language->translate("JITTER");?></th>
                                                 </tr>
                                             </thead>
-                                            <tbody>
-											<?php echo speedTestDisplay(speedTestData(),"table");?>
-                                            </tbody>
+                                            <tbody><?php echo speedTestDisplay(speedTestData(),"table");?></tbody>
                                         </table>
                                     </div>
                                     <?php } ?>
-
                                 </div>
                             </div>
                         </div>
@@ -2616,7 +2708,11 @@ echo buildSettings(
         <?php endif; ?>
 
 		<script>
-        	<?php echo speedTestDisplay(speedTestData(),"graph");?>
+			<?php echo speedTestDisplay(speedTestData(),"graph");?>
+			$(".settingsMenu").click(function() {
+                $(".settingsMenu").removeClass("settingsMenuActive");
+                $(this).addClass("settingsMenuActive");
+            })
             //Tooltips
             $('[data-toggle="tooltip"]').tooltip();
             //IP INFO
@@ -3191,7 +3287,8 @@ echo buildSettings(
 
             });
             $(".email-header .close-button").click(function () {
-                $(".email-content").removeClass("email-active");
+				$(".email-content").removeClass("email-active");
+				$(".settingsMenu").removeClass("settingsMenuActive");
                 $('html').removeClass("overhid");
                 $("#settings-list").find("li").removeClass("active");
             });

+ 1 - 1
user.php

@@ -9,7 +9,7 @@
 	 */
 	
 	// Include functions if not already included
-	require_once(__DIR__ . '/functions.php');
+	require_once('functions.php');
 	 
     // Autoload frameworks
 	require_once(__DIR__ . '/vendor/autoload.php');

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio