3RaGaming · zackman0010 · Feb 1, 2017 · Feb 1, 2017 · Feb 1, 2017 · Feb 2, 2017
diff --git a/html/altlogin.php b/html/altlogin.php
@@ -4,73 +4,73 @@
 {
     header("Location: https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"]);
     exit();
-	die();
+    die();
 }
 //If logged in, and requested to logout... log them out and show login screen
 if(isset($_SESSION['login'])) {
-	if(isset($_REQUEST['logout'])) {
-		unset($_SESSION['login']);
-		$report = "<br />You have been logged out</br >";
-	} else {
-		//if not requesting to logout... Take back home
-		header("Location: ./?d=server1");
-		exit();
-		die();
-	}
+    if(isset($_REQUEST['logout'])) {
+        unset($_SESSION['login']);
+        $report = "<br />You have been logged out</br >";
+    } else {
+        //if not requesting to logout... Take back home
+        header("Location: ./?d=server1");
+        exit();
+        die();
+    }
 }
-
-$userN="";
+$user_name="";
 $passW="";
 if(isset($_POST['uname'])) {
-	$userN = addslashes($_POST['uname']);
+    $user_name = addslashes($_POST['uname']);
 }
 if(isset($_POST['passw'])) {
-	$passW = addslashes(md5(trim($_POST['passw'])));
+    $passW = addslashes(md5(trim($_POST['passw'])));
 }
-if(!empty($userN) && !empty($passW)) {
-	$userlist = file ('/var/www/users.txt');
-	$success = false;
-	foreach ($userlist as $user) {
-		$user_details = explode('|', $user);
-		if ((strtolower($user_details[0]) == strtolower($userN)) && trim($user_details[1]) == $passW) {
-			$userN = $user_details[0];
-			$userL = $user_details[2];
-			$success = true;
-			break;
-		}
-	}
-	if ($success) {
-		$_SESSION['login']['user']=$userN;
-		$_SESSION['login']['level']=$userL;
-		//Send home if logged in
-		header("Location: ./?d=server1");
-		die();
-	} else {
-		$report =  "<br />You have entered the wrong username or password. Please try again.<br />";
-	}
+if(!empty($user_name) && !empty($passW)) {
+    $userlist = file ('/var/www/users.txt');
+    $success = false;
+    foreach ($userlist as $user) {
+        $user_details = explode('|', $user);
+        if ((strtolower($user_details[0]) == strtolower($user_name)) && trim($user_details[1]) == $passW) {
+            var_dump($user_details);
+            $user_name  = trim($user_details[0]);
+            $user_level = trim($user_details[2]);
+            $success = true;
+            break;
+        }
+    }
+    if ($success) {
+        $_SESSION['login']['user']  = $user_name;
+        $_SESSION['login']['level'] = $user_level;
+        //Send home if logged in
+        header("Location: ./?d=server1");
+        die();
+    } else {
+        $report =  "<br />You have entered the wrong username or password. Please try again.<br />";
+    }
 } elseif(isset($_POST['submit'])) {
-	$report = "<br />I don't like no input<br />";
+    $report = "<br />I don't like no input<br />";
 }
-
+session_write_close();
 ?>
-<html>
-<head>
-<link rel="stylesheet" media="all" href="assets/login.css" />
-</head>
-<body>
-<div class="login-page">
-  <div class="form">
-    <form class="login-form" name="login" method="post">
-		<input type="hidden" name="login" value="submit" />
-		<input type="text" name="uname" <?php echo (empty($userN)?'placeholder="username"':'value="'.$userN.'"'); ?> />
-		<input type="password" name="passw" placeholder="password"/>
-		<button onclick="document.login.submit();">login</button>
-    </form>
-	<?php if(isset($report)) { echo $report; } ?>
-  </div>
-</div>
-</body>
-</html>
+    <html>
+    <head>
+        <link rel="stylesheet" media="all" href="assets/css/login.css" />
+    </head>
+    <body>
+    <div class="login-page">
+        <div class="form">
+            <form class="login-form" name="login" method="post">
+                <input type="hidden" name="login" value="submit" />
+                <input type="text" name="uname" <?php echo (empty($user_name)?'placeholder="username"':'value="'.$user_name.'"'); ?> />
+                <input type="password" name="passw" placeholder="password"/>
+                <button onclick="document.login.submit();">login</button>
+            </form>
+            <?php if(isset($report)) { echo $report; } ?>
+        </div>
+    </div>
+    </body>
+    </html>
 <?php
 //End login page
 ?>
diff --git a/html/assets/css/base.css b/html/assets/css/base.css
@@ -1,3 +1,37 @@
+
+.nav {
+    width: 100%;
+    margin-bottom: 20px;
+}
+.nav ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
+}
+.nav li {
+    display: inline;
+
+    text-align: center;
+    padding: 4px 4px 0 0;
+    text-decoration: none;
+}
+
+.welcome-msg {
+    font-family: 'Audiowide';
+    font-size: 24px;
+
+    padding-right: 30px;
+
+    -webkit-animation: blink_blink 10s infinite;
+    animation: blink_blink 10s infinite;
+}
+@-webkit-keyframes blink_blink {
+    0%   { color: black; }
+    50%  { color: red; }
+    100% { color: black; }
+}
+
 a:visited{
   color:blue;
 }
@@ -41,5 +75,50 @@ table.tablesorter thead tr .headerSortDown {
 	background-image: url(../img/desc.gif);
 }
 table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
-background-color: #8dbdd8;
+    background-color: #8dbdd8;
+}
+
+.leftside {
+    height: auto;
+    width: 54%;
+    float: left;
+}
+.rightside {
+    height: 90%;
+    width: 44%;
+    float: right;
+}
+.console {
+    width: 100%;
+    height: 300px;
+}
+.console textarea {
+    width: 100%;
+    height: 100%;
+}
+.chat {
+    width: 100%;
+    height: 400px;
+}
+.chat textarea {
+    width: 100%;
+    height: 300px;
+}
+.files {
+    width: 100%;
+    height: 99%;
+}
+
+@media only screen and (max-width: 1200px) {
+    .leftside {
+        height: auto;
+        width: 100%;
+    }
+    .rightside {
+        height: 60%;
+        width: 100%;
+    }
+    .files {
+        width: 100%;
+    }
 }
diff --git a/html/assets/css/customalerts.css b/html/assets/css/customalerts.css
@@ -23,6 +23,19 @@
     overflow-x: hidden;
     max-height:70%;
 }
+
+@media only screen and (max-width: 1200px) {
+    .modal-content {
+        background-color: #fefefe;
+        margin: 5% auto 5% auto; /* 15% from the top and centered */
+        padding: 20px;
+        border: 1px solid #888;
+        width: 90%;
+        overflow: scroll;
+        overflow-x: hidden;
+        max-height:70%;
+    }
+}
 .msg-col {
     display: inline-block;
     width: 70%;

diff --git a/html/assets/js/base.js b/html/assets/js/base.js
@@ -1035,12 +1035,12 @@
 
 
 function Download(url) {
-    if (user_level == "viewonly") { return; }
+    if (user.level === "viewonly" || user.level === "guest") { return; }
 	document.getElementById('file_iframe').src = url;
 }
 
 function server_sss(cmd) {
-    if(user_level == "viewonly" && (cmd == "start" || cmd == "stop" || cmd == "forcekill" )) {
+    if((user.level === "viewonly" || user.level === "guest") && (cmd == "start" || cmd == "stop" || cmd == "forcekill" )) {
         customAlerts.add("You have view only access","warning",true);
         return;
     }
@@ -1063,7 +1063,7 @@ function server_sss(cmd) {
 	};
 }
 function force_kill(cmd) {
-	if(user_level == "viewonly") {
+	if(user.level === "viewonly" || user.level === "guest") {
         customAlerts.add("You have view only access",'warning',true);
         return;
     }
@@ -1086,7 +1086,7 @@ function force_kill(cmd) {
     }
 }
 function command() {
-    if(user_level == "viewonly") {
+    if(user.level === "viewonly" || user.level === "guest") {
         customAlerts.add("You have view only access","warning",true);
         return;
     }
@@ -1159,7 +1159,7 @@ function uploadCanceled() {
 }
 
 function upload() {
-	if ($('#upload_file').val == "" || user_level == "viewonly") {
+	if ($('#upload_file').val == "" || user.level === "viewonly" || user.level === "guest") {
 		return;
 	}
 	var the_file;
@@ -1235,7 +1235,7 @@ function command_history(args) {
 }
 
 function update_web_control(user_name) {
-    if(user_name=="admin") {
+    if(user_name === "admin") {
         var r = confirm("Update webgui and server control files?");
         if (r == true) {
             $("#update_web_control").submit();
@@ -1287,13 +1287,13 @@ function files_delete() {
 
 //Things to only start doing after the page has finished loading
 $(document).ready(function() {
-	$('#welcome_user').text(user_name);
+	$('#welcome_user').text(user.name);
 	tc_console();
 	$('#upload_file').on('change', function() {
 		upload();
 	});
     $('#delete_files').on('click', function() {
-        if(user_level == "viewonly") {
+        if(user.level === "viewonly" || user.level === "guest"){
             customAlerts.add("You have view only access","warning",true);
         	return;
         }
@@ -1320,15 +1320,15 @@ $(document).ready(function() {
 	});
 	//Upload button click event
 	$('#upload_button').on('click', function() {
-        if(user_level == "viewonly") {
+        if(user.level === "viewonly" || user.level === "guest") {
             customAlerts.add("You have view only access","warning",true);
         	return;
         }
 		$('#upload_file').click();
 	});
 	$('#command').keydown(function(event) {
 		if (event.keyCode == 13) command();
-        if (user_level == "viewonly") { return; }
+        if (user.level === "viewonly" || user.level === "guest") { return; }
 		if (event.keyCode == 38) command_history('up');
 		if (event.keyCode == 40) command_history('down');
 	});

diff --git a/html/assets/js/console.js b/html/assets/js/console.js
@@ -3,8 +3,12 @@ var dir = loc.substring(0, loc.lastIndexOf('/'));
 var refreshtime=500;
 function tc_console()
 {
-	asyncAjax("GET",dir + "/assets/api/console.php?d=" + server_select + "&s=console",Math.random(),display,{},"console");
+    if(user.level === "admin" || user.level === "mod"){
+        asyncAjax("GET",dir + "/assets/api/console.php?d=" + server_select + "&s=console",Math.random(),display,{},"console");
+    }
+
 	asyncAjax("GET",dir + "/assets/api/console.php?d=" + server_select + "&s=chat",Math.random(),display,{},"chat");
+
 	setTimeout(tc_console,refreshtime);
 }
 

diff --git a/html/files.php b/html/files.php
@@ -51,7 +51,7 @@
 	}
 	die();
 } elseif(isset($_REQUEST['download'])) {
-	if($user_level=="viewonly") {
+	if($user_level == "viewonly" || $user_level == "guest") {
 		die('You have view only access.\nVisit our archive for file downloads\nwww.3ragaming.com/archive/factorio');
 	} 
 	if(empty($_REQUEST['download']))
@@ -168,7 +168,7 @@
 	die();
 
 } elseif(isset($_REQUEST['upload'])) {
-	if($user_level=="viewonly") {
+	if($user_level == "viewonly" || $user_level == "guest") {
 		die('You have read only access.');
 	} else {
 		//Valdidate name
@@ -288,7 +288,7 @@
 	die();
 
 }  elseif(isset($_REQUEST['delete'])) {
-	if($user_level=="viewonly") {
+	if($user_level == "viewonly" || $user_level == "guest") {
 		die('You have view only access.');
 	} else {
 		if(empty($_REQUEST['delete']))