release 1.3.22

webinterface/_nav.php

@@ -4,16 +4,16 @@ if(($job_check = $mysqlcon->query("SELECT * FROM `$dbname`.`job_check`")->fetchA
 } else {
 	if((time() - $job_check['last_update']['timestamp']) < 259200 && !isset($_SESSION[$rspathhex.'upinfomsg'])) {
 		if(!isset($err_msg)) {
-			$err_msg = '<i class="fas fa-info-circle"></i>&nbsp;'.sprintf($lang['upinf2'], date("Y-m-d H:i",$job_check['last_update']['timestamp']), '<i class="fas fa-book"></i>&nbsp;<a href="//ts-ranksystem.com/?changelog" target="_blank">', '</a>'); $err_lvl = 1;
+			$err_msg = '<i class="fas fa-info-circle"></i><span class="item-margin">'.sprintf($lang['upinf2'], date("Y-m-d H:i",$job_check['last_update']['timestamp']), '</span><i class="fas fa-book"></i><span class="item-margin"><a href="//ts-ranksystem.com/?changelog" target="_blank">', '</a></span>'); $err_lvl = 1;
 			$_SESSION[$rspathhex.'upinfomsg'] = 1;
 		}
 	}
 }
 
-if(!isset($_POST['start']) && !isset($_POST['stop']) && !isset($_POST['restart']) && isset($_SESSION[$rspathhex.'username']) && $_SESSION[$rspathhex.'username'] == $cfg['webinterface_user'] && $_SESSION[$rspathhex.'password'] == $cfg['webinterface_pass']) {
+if(!isset($_POST['start']) && !isset($_POST['stop']) && !isset($_POST['restart']) && isset($_SESSION[$rspathhex.'username']) && hash_equals($_SESSION[$rspathhex.'username'], $cfg['webinterface_user']) && hash_equals($_SESSION[$rspathhex.'password'], $cfg['webinterface_pass'])) {
 	if (substr(php_uname(), 0, 7) == "Windows") {
-		if (file_exists(substr(__DIR__,0,-12).'logs\pid')) {
-			$pid = str_replace(array("\r", "\n"), '', file_get_contents(substr(__DIR__,0,-12).'logs\pid'));
+		if (file_exists($GLOBALS['pidfile'])) {
+			$pid = str_replace(array("\r", "\n"), '', file_get_contents($GLOBALS['pidfile']));
 			exec("wmic process where \"processid=".$pid."\" get processid 2>nul", $result);
 			if(isset($result[1]) && is_numeric($result[1])) {
 				$botstatus = 1;
@@ -24,8 +24,8 @@ if(!isset($_POST['start']) && !isset($_POST['stop']) && !isset($_POST['restart']
 			$botstatus = 0;
 		}
 	} else {
-		if (file_exists(substr(__DIR__,0,-12).'logs/pid')) {
-			$check_pid = str_replace(array("\r", "\n"), '', file_get_contents(substr(__DIR__,0,-12).'logs/pid'));
+		if (file_exists($GLOBALS['pidfile'])) {
+			$check_pid = str_replace(array("\r", "\n"), '', file_get_contents($GLOBALS['pidfile']));
 			$result = str_replace(array("\r", "\n"), '', shell_exec("ps ".$check_pid));
 			if (strstr($result, $check_pid)) {
 				$botstatus = 1;
@@ -38,7 +38,7 @@ if(!isset($_POST['start']) && !isset($_POST['stop']) && !isset($_POST['restart']
 	}
 }
 
-if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && $_SESSION[$rspathhex.'username'] == $cfg['webinterface_user'] && $_SESSION[$rspathhex.'password'] == $cfg['webinterface_pass']) {
+if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && hash_equals($_SESSION[$rspathhex.'username'], $cfg['webinterface_user']) && hash_equals($_SESSION[$rspathhex.'password'], $cfg['webinterface_pass'])) {
 	if ($_POST['switchexpert'] == "check") $cfg['webinterface_advanced_mode'] = 1; else $cfg['webinterface_advanced_mode'] = 0;
 
 	if (($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('webinterface_advanced_mode','{$cfg['webinterface_advanced_mode']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`);")) === false) {
@@ -58,6 +58,11 @@ if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && $
 	<link rel="icon" href="../tsicons/rs.png">
 	<title>TSN Ranksystem - ts-ranksystem.com</title>
 	<link href="../libs/combined_wi.css?v=<?PHP echo $cfg['version_current_using']; ?>" rel="stylesheet">
+	<?PHP
+	if ($GLOBALS['style'] != NULL && is_file(dirname(__DIR__).DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.$GLOBALS['style'].DIRECTORY_SEPARATOR.'WI.css')) {
+		echo '<link href="../styles'.DIRECTORY_SEPARATOR.$GLOBALS['style'].DIRECTORY_SEPARATOR.'WI.css?v='.$cfg['version_current_using'].'" rel="stylesheet">';
+	}
+	?>
 	<script src="../libs/combined_wi.js?v=<?PHP echo $cfg['version_current_using']; ?>"></script>
 	<script>
 	$(function() {
@@ -80,8 +85,20 @@ if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && $
 				$(this).toggleClass("hidden");
 			});
 		}
-	};
+	$(".close-button").click(function(){
+		$(this).closest("li").css("display","none");
+        $.ajax({
+            type: "POST",
+            url: "../other/session_handling.php",
+            data: {stats_news_html: "stats_news_html"}
+        });
+	})};
 	</script>
+	<?PHP
+	if ($GLOBALS['style'] != NULL && is_file(dirname(__DIR__).DIRECTORY_SEPARATOR.'styles'.DIRECTORY_SEPARATOR.$GLOBALS['style'].DIRECTORY_SEPARATOR.'WI.js')) {
+		echo '<script src="../styles'.DIRECTORY_SEPARATOR.$GLOBALS['style'].DIRECTORY_SEPARATOR.'/WI.js?v='.$cfg['version_current_using'].'"></script>';
+	}
+	?>
 <body>
 	<div id="wrapper">
 		<nav class="navbar navbar-inverse navbar-fixed-top">
@@ -95,16 +112,22 @@ if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && $
 			<ul class="nav navbar-left top-nav">
 				<li class="navbar-form navbar-right">
 					<button onclick="window.open('../stats/list_rankup.php?admin=true','_blank'); return false;" class="btn btn-primary" name="adminlist">
-						<i class="fas fa-list"></i>&nbsp;<?PHP echo $lang['wihladm']; ?>
+						<i class="fas fa-list"></i><span class="item-margin"><?PHP echo $lang['wihladm']; ?></span>
 					</button>
 				</li>
 			</ul>
 			<?PHP } ?>
 			<ul class="nav navbar-right top-nav">
-				<?PHP 
-				if(isset($_SESSION[$rspathhex.'username']) && $_SESSION[$rspathhex.'username'] == $cfg['webinterface_user'] && $_SESSION[$rspathhex.'password'] == $cfg['webinterface_pass']) { ?>
+				<?PHP
+				if(isset($job_check['news_html']['timestamp']) && $job_check['news_html']['timestamp'] != 0 && isset($_SESSION[$rspathhex.'stats_news_html'])) { ?>
+				<li class="navbar-form navbar-left">
+					<span class="label label-primary"><?PHP echo $cfg['stats_news_html']; ?><button type="button" class="close close-button" aria-label="Close"><span aria-hidden="true">&times;</span></button></span>
+				</li>
+				<?PHP
+				}
+				if(isset($_SESSION[$rspathhex.'username']) && hash_equals($_SESSION[$rspathhex.'username'], $cfg['webinterface_user']) && hash_equals($_SESSION[$rspathhex.'password'], $cfg['webinterface_pass'])) { ?>
 				<li class="dropdown">
-					<a href="" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i>&nbsp;&nbsp;<?PHP echo $_SESSION[$rspathhex.'username']; ?>&nbsp;<b class="caret"></b></a>
+					<a href="" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><span class="item-margin"><?PHP echo $_SESSION[$rspathhex.'username']; ?></span><span class="item-margin"><i class="fas fa-caret-down"></i></span></a>
 					<ul class="dropdown-menu">
 						<li class="navbar-form">
 							<form method="post" id="autosubmit">
@@ -121,40 +144,40 @@ if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && $
 						</li>
 						<li class="divider"></li>
 						<?PHP if($_SERVER['SERVER_PORT'] == 443 || $_SERVER['SERVER_PORT'] == 80) {
-							echo '<li><a href="//',$_SERVER['SERVER_NAME'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'stats/"><i class="fas fa-chart-bar"></i>&nbsp;&nbsp;',$lang['winav6'],'</a></li>';
+							echo '<li><a href="//',$_SERVER['SERVER_NAME'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'stats/"><i class="fas fa-chart-bar"></i><span class="item-margin">',$lang['winav6'],'</span></a></li>';
 						} else {
-							echo '<li><a href="//',$_SERVER['SERVER_NAME'],':',$_SERVER['SERVER_PORT'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'stats/"><i class="fas fa-chart-bar"></i>&nbsp;&nbsp;',$lang['winav6'],'</a></li>';
+							echo '<li><a href="//',$_SERVER['SERVER_NAME'],':',$_SERVER['SERVER_PORT'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'stats/"><i class="fas fa-chart-bar"></i><span class="item-margin">',$lang['winav6'],'</span></a></li>';
 						} ?>
 						<li>
-							<a href="changepassword.php"><i class="fas fa-key"></i>&nbsp;&nbsp;<?PHP echo $lang['pass2']; ?></a>
+							<a href="changepassword.php"><i class="fas fa-key"></i><span class="item-margin"><?PHP echo $lang['pass2']; ?></span></a>
 						</li>
 						<li class="divider"></li>
 						<li>
 							<form method="post" id="logout">
 								<div class="form-group">
-									<button type="submit" name="logout" class="btn btn-primary btn-sm btn-block"><span class="fas fa-sign-out-alt" aria-hidden="true"></span>&nbsp;<?PHP echo $lang['wilogout']; ?></button>
+									<button type="submit" name="logout" class="btn btn-primary btn-sm btn-block"><span class="fas fa-sign-out-alt" aria-hidden="true"></span><span class="item-margin"><?PHP echo $lang['wilogout']; ?></span></button>
 								</div>
 							</form>
 						</li>
 					</ul>
 				</li>
 				<?PHP } elseif($_SERVER['SERVER_PORT'] == 443 || $_SERVER['SERVER_PORT'] == 80) {
-					echo '<li><a href="//',$_SERVER['SERVER_NAME'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'stats/"><i class="fas fa-chart-bar"></i>&nbsp;',$lang['winav6'],'</a></li>';
+					echo '<li><a href="//',$_SERVER['SERVER_NAME'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'stats/"><i class="fas fa-chart-bar"></i><span class="item-margin">',$lang['winav6'],'</span></a></li>';
 				} else {
-					echo '<li><a href="//',$_SERVER['SERVER_NAME'],':',$_SERVER['SERVER_PORT'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'stats/"><i class="fas fa-chart-bar"></i>&nbsp;',$lang['winav6'],'</a></li>';
+					echo '<li><a href="//',$_SERVER['SERVER_NAME'],':',$_SERVER['SERVER_PORT'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'stats/"><i class="fas fa-chart-bar"></i><span class="item-margin">',$lang['winav6'],'</span></a></li>';
 				} ?>
 				<li class="dropdown">
 					<?PHP
 					$dropdownlist = '';
-					if(is_dir(substr(__DIR__,0,-12).'languages/')) {
-						foreach(scandir(substr(__DIR__,0,-12).'languages/') as $file) {
+					if(is_dir($GLOBALS['langpath'])) {
+						foreach(scandir($GLOBALS['langpath']) as $file) {
 							if ('.' === $file || '..' === $file || is_dir($file)) continue;
 							$sep_lang = preg_split("/[._]/", $file);
 							if(isset($sep_lang[0]) && $sep_lang[0] == 'core' && isset($sep_lang[1]) && strlen($sep_lang[1]) == 2 && isset($sep_lang[4]) && strtolower($sep_lang[4]) == 'php') {
 								if($_SESSION[$rspathhex.'language'] == $sep_lang[1]) {
-									$dropdownfront = '<a href="" class="dropdown-toggle" data-toggle="dropdown"><span class="flag-icon flag-icon-'.$sep_lang[3].'"></span>&nbsp;<b class="caret"></b></a><ul class="dropdown-menu">';
+									$dropdownfront = '<a href="" class="dropdown-toggle" data-toggle="dropdown"><span class="flag-icon flag-icon-'.$sep_lang[3].'"></span><span class="item-margin"><i class="fas fa-caret-down"></i></span></a><ul class="dropdown-menu">';
 								}
-								$dropdownlist .= '<li><a href="?lang='.$sep_lang[1].'"><span class="flag-icon flag-icon-'.$sep_lang[3].'"></span>&nbsp;&nbsp;'.strtoupper($sep_lang[1]).' - '.$sep_lang[2].'</a></li>';
+								$dropdownlist .= '<li><a href="?lang='.$sep_lang[1].'"><span class="flag-icon flag-icon-'.$sep_lang[3].'"></span><span class="item-margin">'.strtoupper($sep_lang[1]).' - '.$sep_lang[2].'</span></a></li>';
 							}
 						}
 					}
@@ -166,83 +189,83 @@ if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && $
 			<div class="collapse navbar-collapse">
 				<ul class="nav navbar-nav side-nav">
 					<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "ts.php" ? ' class="active">' : '>'); ?>
-						<a href="ts.php"><i class="fas fa-headset"></i>&nbsp;&nbsp;<?PHP echo $lang['winav1']; ?></a>
+						<a href="ts.php"><i class="fas fa-headset fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav1']; ?></span></a>
 					</li>
 					<?PHP 
 					if ((array_key_exists('webinterface_fresh_installation', $cfg) && $cfg['webinterface_fresh_installation'] != 1) || !array_key_exists('webinterface_fresh_installation', $cfg)) {
 						echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "db.php" ? ' class="active expertelement">' : ' class="expertelement">'); ?>
-							<a href="db.php"><i class="fas fa-database"></i>&nbsp;&nbsp;<?PHP echo $lang['winav2']; ?></a>
+							<a href="db.php"><i class="fas fa-database fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav2']; ?></span></a>
 						</li>
 						<li>
-							<a href="javascript:;" data-toggle="collapse" data-target="#rank"><i class="fas fa-hourglass-half"></i>&nbsp;&nbsp;<?PHP echo $lang['stmy0002']; ?>&nbsp;<i class="fas fa-caret-down"></i></a>
+							<a href="javascript:;" data-toggle="collapse" data-target="#rank"><i class="fas fa-hourglass-half fa-fw"></i><span class="item-margin"><?PHP echo $lang['stmy0002']; ?></span><span class="item-margin"><i class="fas fa-caret-down"></i></span></a>
 							<?PHP echo '<ul id="rank" class="'.(in_array(basename($_SERVER['SCRIPT_NAME']), array("core.php", "rank.php", "boost.php", "except.php", "msg.php")) ? 'in collapse">' : 'collapse">'); ?>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "core.php" ? ' class="active">' : '>'); ?>
-									<a href="core.php" class="active"><i class="fas fa-cogs"></i>&nbsp;&nbsp;<?PHP echo $lang['winav3']; ?></a>
+									<a href="core.php"><i class="fas fa-cogs fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav3']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "rank.php" ? ' class="active">' : '>'); ?>
-									<a href="rank.php" class="active"><i class="fas fa-list-ol"></i>&nbsp;&nbsp;<?PHP echo $lang['wigrptime']; ?></a>
+									<a href="rank.php"><i class="fas fa-list-ol fa-fw"></i><span class="item-margin"><?PHP echo $lang['wigrptime']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "except.php" ? ' class="active">' : '>'); ?>
-									<a href="except.php" class="active"><i class="fas fa-ban"></i>&nbsp;&nbsp;<?PHP echo $lang['wiexcept']; ?></a>
+									<a href="except.php"><i class="fas fa-ban fa-fw"></i><span class="item-margin"><?PHP echo $lang['wiexcept']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "boost.php" ? ' class="active">' : '>'); ?>
-									<a href="boost.php"><i class="fas fa-rocket"></i>&nbsp;&nbsp;<?PHP echo $lang['wiboost']; ?></a>
+									<a href="boost.php"><i class="fas fa-rocket fa-fw"></i><span class="item-margin"><?PHP echo $lang['wiboost']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "msg.php" ? ' class="active">' : '>'); ?>
-									<a href="msg.php"><i class="fas fa-envelope"></i>&nbsp;&nbsp;<?PHP echo $lang['winav5']; ?></a>
+									<a href="msg.php"><i class="fas fa-envelope fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav5']; ?></span></a>
 								</li>
 							</ul>
 						</li>
 						<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "other.php" ? ' class="active expertelement">' : ' class="expertelement">'); ?>
-							<a href="other.php"><i class="fas fa-wrench"></i>&nbsp;&nbsp;<?PHP echo $lang['winav4']; ?></a>
+							<a href="other.php"><i class="fas fa-wrench fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav4']; ?></span></a>
 						</li>
 						<li>
-							<a href="javascript:;" data-toggle="collapse" data-target="#stats"><i class="fas fa-chart-area"></i>&nbsp;&nbsp;<?PHP echo $lang['winav6']; ?>&nbsp;<i class="fas fa-caret-down"></i></a>
+							<a href="javascript:;" data-toggle="collapse" data-target="#stats"><i class="fas fa-chart-area fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav6']; ?></span><span class="item-margin"><i class="fas fa-caret-down"></i></span></a>
 							<?PHP echo '<ul id="stats" class="'.(in_array(basename($_SERVER['SCRIPT_NAME']), array("stats.php", "ranklist.php", "imprint.php")) ? 'in collapse">' : 'collapse">'); ?>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "stats.php" ? ' class="active expertelement">' : ' class="expertelement">'); ?>
-									<a href="stats.php"><i class="fas fa-chart-bar"></i>&nbsp;&nbsp;<?PHP echo $lang['winav13']; ?></a>
+									<a href="stats.php"><i class="fas fa-chart-bar fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav13']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "ranklist.php" ? ' class="active">' : '>'); ?>
-									<a href="ranklist.php"><i class="fas fa-list"></i>&nbsp;&nbsp;<?PHP echo $lang['stnv0029']; ?></a>
+									<a href="ranklist.php"><i class="fas fa-list fa-fw"></i><span class="item-margin"><?PHP echo $lang['stnv0029']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "imprint.php" ? ' class="active">' : '>'); ?>
-									<a href="imprint.php"><i class="fas fa-address-card"></i>&nbsp;&nbsp;<?PHP echo $lang['imprint']; ?></a>
+									<a href="imprint.php"><i class="fas fa-address-card fa-fw"></i><span class="item-margin"><?PHP echo $lang['imprint']; ?></span></a>
 								</li>
 							</ul>
 						</li>
 						<li class="divider"></li>
 						<li>
-							<a href="javascript:;" data-toggle="collapse" data-target="#admin"><i class="fas fa-users"></i>&nbsp;&nbsp;<?PHP echo $lang['winav7']; ?>&nbsp;<i class="fas fa-caret-down"></i></a>
+							<a href="javascript:;" data-toggle="collapse" data-target="#admin"><i class="fas fa-users fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav7']; ?></span><span class="item-margin"><i class="fas fa-caret-down"></i></span></a>
 							<?PHP echo '<ul id="admin" class="'.(in_array(basename($_SERVER['SCRIPT_NAME']), array("admin_addtime.php", "admin_remtime.php", "admin_delclient.php", "reset.php", "export.php")) ? 'in collapse">' : 'collapse">'); ?>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "admin_addtime.php" ? ' class="active">' : '>'); ?>
-									<a href="admin_addtime.php"><i class="fas fa-plus"></i>&nbsp;&nbsp;<?PHP echo $lang['wihladm1']; ?></a>
+									<a href="admin_addtime.php"><i class="fas fa-plus fa-fw"></i><span class="item-margin"><?PHP echo $lang['wihladm1']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "admin_remtime.php" ? ' class="active">' : '>'); ?>
-									<a href="admin_remtime.php"><i class="fas fa-minus"></i>&nbsp;&nbsp;<?PHP echo $lang['wihladm2']; ?></a>
+									<a href="admin_remtime.php"><i class="fas fa-minus fa-fw"></i><span class="item-margin"><?PHP echo $lang['wihladm2']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "admin_delclient.php" ? ' class="active">' : '>'); ?>
-									<a href="admin_delclient.php"><i class="fas fa-times"></i>&nbsp;&nbsp;<?PHP echo $lang['wihladm4']; ?></a>
+									<a href="admin_delclient.php"><i class="fas fa-times fa-fw"></i><span class="item-margin"><?PHP echo $lang['wihladm4']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "reset.php" ? ' class="active expertelement">' : ' class="expertelement">'); ?>
-									<a href="reset.php"><i class="fas fa-sync"></i>&nbsp;&nbsp;<?PHP echo $lang['wihladm3']; ?></a>
+									<a href="reset.php"><i class="fas fa-sync fa-fw"></i><span class="item-margin"><?PHP echo $lang['wihladm3']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "export.php" ? ' class="active expertelement">' : ' class="expertelement">'); ?>
-									<a href="export.php"><i class="fas fa-download"></i>&nbsp;&nbsp;<?PHP echo $lang['wihladmex']; ?></a>
+									<a href="export.php"><i class="fas fa-download fa-fw"></i><span class="item-margin"><?PHP echo $lang['wihladmex']; ?></span></a>
 								</li>
 							</ul>
 						</li>
 						<li class="divider"></li>
 						<li>
-							<a href="javascript:;" data-toggle="collapse" data-target="#addons"><i class="fas fa-puzzle-piece"></i>&nbsp;&nbsp;<?PHP echo $lang['winav12']; ?>&nbsp;<i class="fas fa-caret-down"></i></a>
+							<a href="javascript:;" data-toggle="collapse" data-target="#addons"><i class="fas fa-puzzle-piece fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav12']; ?></span><span class="item-margin"><i class="fas fa-caret-down"></i></span></a>
 							<?PHP echo '<ul id="addons" class="'.(in_array(basename($_SERVER['SCRIPT_NAME']), array("addon_assign_groups.php", "api.php", "addon_channelinfo_toplist.php")) ? 'in collapse">' : 'collapse">'); ?>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "api.php" ? ' class="active">' : '>'); ?>
-									<a href="api.php"><i class="fas fa-microchip"></i>&nbsp;&nbsp;<?PHP echo $lang['api']; ?></a>
+									<a href="api.php"><i class="fas fa-microchip fa-fw"></i><span class="item-margin"><?PHP echo $lang['api']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "addon_assign_groups.php" ? ' class="active">' : '>'); ?>
-									<a href="addon_assign_groups.php" class="active"><i class="fas fa-user-plus"></i>&nbsp;&nbsp;<?PHP echo $lang['stag0001']; ?></a>
+									<a href="addon_assign_groups.php"><i class="fas fa-user-plus fa-fw"></i><span class="item-margin"><?PHP echo $lang['stag0001']; ?></span></a>
 								</li>
 								<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "addon_channelinfo_toplist.php" ? ' class="active">' : '>'); ?>
-									<a href="addon_channelinfo_toplist.php" class="active"><i class="fas fa-trophy"></i>&nbsp;&nbsp;<?PHP echo $lang['addonchtopl']; ?></a>
+									<a href="addon_channelinfo_toplist.php"><i class="fas fa-trophy fa-fw"></i><span class="item-margin"><?PHP echo $lang['addonchtopl']; ?></span></a>
 								</li>
 							</ul>
 						</li>
@@ -250,17 +273,17 @@ if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && $
 					} ?>
 					<li class="divider"></li>
 					<?PHP echo '<li'.(basename($_SERVER['SCRIPT_NAME']) == "bot.php" ? ' class="active">' : '>'); ?>
-						<a href="bot.php"><i class="fas fa-power-off"></i>&nbsp;&nbsp;<?PHP echo $lang['winav8']; ?></a>
+						<a href="bot.php"><i class="fas fa-power-off fa-fw"></i><span class="item-margin"><?PHP echo $lang['winav8']; ?></span></a>
 					</li>
 					<?PHP
 					if(isset($botstatus)) {
 						echo '<li class="divider"></li>';
 						if($botstatus == 1) {
-							echo '<li><div class="btn-group-justified alertbot alert-success" style="width:100%;"><i class="fas fa-check"></i>&nbsp;&nbsp;'.$lang['boton'].'</div></li>';
+							echo '<li><div class="btn-group-justified alertbot alert-success" style="width:100%;"><i class="fas fa-check fa-fw"></i><span class="item-margin">'.$lang['boton'].'</span></div></li>';
 						} else {
-							echo '<li><div class="btn-group-justified alertbot alert-info" style="width:100%;"><i class="fas fa-times"></i>&nbsp;&nbsp;'.$lang['botoff'];
-							if (file_exists($cfg['logs_path']."autostart_deactivated")) {
-								echo '<br><br><i class="fas fa-info-circle"></i>&nbsp;&nbsp;',$lang['autooff'],'</div></li>';
+							echo '<li><div class="btn-group-justified alertbot alert-info" style="width:100%;"><i class="fas fa-times fa-fw"></i><span class="item-margin">'.$lang['botoff'].'</span>';
+							if (file_exists($GLOBALS['autostart'])) {
+								echo '<br><br><i class="fas fa-info-circle fa-fw"></i><span class="item-margin">',$lang['autooff'],'</span></div></li>';
 							} else {
 								echo '</div></li>';
 							}
@@ -271,7 +294,7 @@ if(isset($_POST['switchexpert']) && isset($_SESSION[$rspathhex.'username']) && $
 			</div>
 		</nav>
 <?PHP
-if($cfg['webinterface_admin_client_unique_id_list'] == NULL && isset($_SESSION[$rspathhex.'username']) && $_SESSION[$rspathhex.'username'] == $cfg['webinterface_user'] && !isset($err_msg) && $cfg['webinterface_fresh_installation'] != 1) {
+if($cfg['webinterface_admin_client_unique_id_list'] == NULL && isset($_SESSION[$rspathhex.'username']) && hash_equals($_SESSION[$rspathhex.'username'], $cfg['webinterface_user']) && !isset($err_msg) && $cfg['webinterface_fresh_installation'] != 1) {
 	$err_msg = $lang['winav11']; $err_lvl = 2;
 }
 

webinterface/_preload.php

@@ -1,26 +1,23 @@
 <?PHP
-require_once('../other/_functions.php');
-require_once('../other/config.php');
+require_once(dirname(__DIR__).DIRECTORY_SEPARATOR.'other/_functions.php');
+require_once(dirname(__DIR__).DIRECTORY_SEPARATOR.'other/config.php');
 
 $prot = start_session($cfg);
-$lang = set_language(get_language($cfg));
+$lang = set_language(get_language());
 
 error_reporting(E_ALL);
 ini_set("log_errors", 1);
 set_error_handler("php_error_handling");
-ini_set("error_log", $cfg['logs_path'].'ranksystem.log');
+ini_set("error_log", $GLOBALS['logfile']);
 
 try {
-	require_once('../other/phpcommand.php');
-
 	if (isset($_POST['logout'])) {
 		echo "logout";
 		rem_session_ts3();
 		header("Location: $prot://".$_SERVER['HTTP_HOST'].rtrim(dirname($_SERVER['PHP_SELF']), '/\\'));
 		exit;
 	}
-
-	if (basename($_SERVER['SCRIPT_NAME']) != "index.php" && basename($_SERVER['SCRIPT_NAME']) != "resetpassword.php" && (!isset($_SESSION[$rspathhex.'username']) || $_SESSION[$rspathhex.'username'] != $cfg['webinterface_user'] || $_SESSION[$rspathhex.'password'] != $cfg['webinterface_pass'] || $_SESSION[$rspathhex.'clientip'] != getclientip())) {
+	if (strtolower(basename($_SERVER['SCRIPT_NAME'])) != "index.php" && basename($_SERVER['SCRIPT_NAME']) != "resetpassword.php" &&	(!isset($_SESSION[$rspathhex.'username']) || !isset($_SESSION[$rspathhex.'password']) || !isset($_SESSION[$rspathhex.'clientip']) || !isset($cfg['webinterface_user']) || !isset($cfg['webinterface_pass']) || !hash_equals($_SESSION[$rspathhex.'username'], $cfg['webinterface_user']) || !hash_equals($_SESSION[$rspathhex.'password'], $cfg['webinterface_pass']) || !hash_equals($_SESSION[$rspathhex.'clientip'], getclientip()))) {
 		rem_session_ts3();
 		header("Location: $prot://".$_SERVER['HTTP_HOST'].rtrim(dirname($_SERVER['PHP_SELF']), '/\\'));
 		exit;

webinterface/addon_assign_groups.php

@@ -70,7 +70,7 @@ try {
 				$err_msg = print_r($sqlexec->errorInfo(), true);
 				$err_lvl = 3;
 			} elseif($addons_config['assign_groups_active']['value'] != $assign_groups_active && $assign_groups_active == 1) {
-				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 				$err_lvl = NULL;
 			} else {
 				$err_msg = $lang['wisvsuc'];
@@ -89,7 +89,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_addon_assign_groups">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -150,7 +150,7 @@ try {
 													if ($groupParam['type'] == 0) $grouptype=" [TEMPLATE GROUP]"; else $grouptype="";
 													if ($groupParam['type'] == 2) $grouptype=" [QUERY GROUP]";
 													if ($groupID != 0) {
-														echo '<option data-content="&nbsp;&nbsp;<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'>&nbsp;&nbsp;',$groupParam['sgidname'],'&nbsp;<span class=\'text-muted small\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$disabled,'></option>';
+														echo '<option data-content="<span class=\'item-margin\'><img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'></span><span class=\'item-margin\'>',$groupParam['sgidname'],'</span><span class=\'text-muted small item-margin\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$disabled,'></option>';
 													}
 												}
 												?>
@@ -182,7 +182,7 @@ try {
 													if ($groupParam['type'] == 0) $grouptype=" [TEMPLATE GROUP]"; else $grouptype="";
 													if ($groupParam['type'] == 2) $grouptype=" [QUERY GROUP]";
 													if ($groupID != 0) {
-														echo '<option data-content="&nbsp;&nbsp;<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'>&nbsp;&nbsp;',$groupParam['sgidname'],'&nbsp;<span class=\'text-muted small\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$disabled,'></option>';
+														echo '<option data-content="<span class=\'item-margin\'><img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'></span><span class=\'item-margin\'>',$groupParam['sgidname'],'</span><span class=\'text-muted small item-margin\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$disabled,'></option>';
 													}
 												}
 												?>
@@ -227,7 +227,7 @@ try {
 													if ($groupParam['type'] == 0) $grouptype=" [TEMPLATE GROUP]"; else $grouptype="";
 													if ($groupParam['type'] == 2) $grouptype=" [QUERY GROUP]";
 													if ($groupID != 0) {
-														echo '<option data-content="&nbsp;&nbsp;<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'>&nbsp;&nbsp;',$groupParam['sgidname'],'&nbsp;<span class=\'text-muted small\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
+														echo '<option data-content="<span class=\'item-margin\'><img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'></span><span class=\'item-margin\'>',$groupParam['sgidname'],'</span><span class=\'text-muted small item-margin\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
 													}
 												}
 												?>
@@ -261,7 +261,7 @@ try {
 													if ($groupParam['type'] == 0) $grouptype=" [TEMPLATE GROUP]"; else $grouptype="";
 													if ($groupParam['type'] == 2) $grouptype=" [QUERY GROUP]";
 													if ($groupID != 0) {
-														echo '<option data-content="&nbsp;&nbsp;<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'>&nbsp;&nbsp;',$groupParam['sgidname'],'&nbsp;<span class=\'text-muted small\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
+														echo '<option data-content="<span class=\'item-margin\'><img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'></span><span class=\'item-margin\'>',$groupParam['sgidname'],'</span><span class=\'text-muted small item-margin\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
 													}
 												}
 												?>
@@ -298,7 +298,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/addon_channelinfo_toplist.php

@@ -41,7 +41,7 @@ try {
 				$err_msg = print_r($sqlexec->errorInfo(), true);
 				$err_lvl = 3;
 			} else {
-				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 				$err_lvl = NULL;
 			}
 		}
@@ -57,7 +57,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_addon_channelinfo_toplist">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -148,7 +148,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/admin_addtime.php

@@ -59,7 +59,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_admin_addtime">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -90,8 +90,8 @@ try {
 											<div class="col-sm-8 pull-right">
 												<select class="selectpicker show-tick form-control" id="number" name="number" onchange="this.form.submit();">
 												<?PHP
-												echo '<option data-icon="fas fa-eye-slash" value="yes"'; if(!isset($_SESSION[$rspathhex.'showexcepted']) || $_SESSION[$rspathhex.'showexcepted'] == "yes") echo " selected=selected"; echo '>&nbsp;hide</option>';
-												echo '<option data-icon="fas fa-eye" value="no"'; if(isset($_SESSION[$rspathhex.'showexcepted']) && $_SESSION[$rspathhex.'showexcepted'] == "no") echo " selected=selected"; echo '>&nbsp;show</option>';
+												echo '<option data-icon="fas fa-eye-slash" value="yes"'; if(!isset($_SESSION[$rspathhex.'showexcepted']) || $_SESSION[$rspathhex.'showexcepted'] == "yes") echo " selected=selected"; echo '><span class="item-margin">hide</span></option>';
+												echo '<option data-icon="fas fa-eye" value="no"'; if(isset($_SESSION[$rspathhex.'showexcepted']) && $_SESSION[$rspathhex.'showexcepted'] == "no") echo " selected=selected"; echo '><span class="item-margin">show</span></option>';
 												?>
 												</select>
 											</div>
@@ -102,7 +102,7 @@ try {
 												<select class="selectpicker show-tick form-control" data-actions-box="true" data-live-search="true" multiple name="user[]">
 												<?PHP
 												foreach ($user_arr as $user) {
-													echo '<option value="',$user['uuid'],'" data-subtext="UUID: ',$user['uuid'],'; DBID: ',$user['cldbid'],'">',htmlspecialchars($user['name']),'</option>';
+													echo '<option value="',$user['uuid'],'" data-subtext="UUID:&nbsp;',$user['uuid'],';&nbsp;DBID: ',$user['cldbid'],'">',htmlspecialchars($user['name']),'</option>';
 												}
 												?>
 												</select>
@@ -171,7 +171,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/admin_delclient.php

@@ -55,9 +55,9 @@ try {
 		$err_msg .= '<br><br><form class="btn-group" name="confirm" action="admin_delclient.php" method="POST">
 		<input type="hidden" name="csrf_token" value="'.$csrf_token.'">
 		<input type="hidden" name="uuids" value="'.$uuids.'">
-		<button type="submit" class="btn btn-success btn-sm" name="confirm"><i class="fas fa-check"></i>&nbsp;'.$lang['wihladm43'].'</button></form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<form class="btn-group" name="cancel" action="admin_delclient.php" method="POST">
+		<button type="submit" class="btn btn-success btn-sm" name="confirm"><i class="fas fa-check"></i><span class="item-margin">'.$lang['wihladm43'].'</span></button></form><span class="item-margin"><form class="btn-group" name="cancel" action="admin_delclient.php" method="POST">
 		<input type="hidden" name="csrf_token" value="'.$csrf_token.'">
-		<button type="submit" class="btn btn-danger btn-sm" name="cancel"><i class="fas fa-times"></i>&nbsp;'.$lang['wihladmrs14'].'</button></form>';
+		<button type="submit" class="btn btn-danger btn-sm" name="cancel"><i class="fas fa-times"></i><span class="item-margin">'.$lang['wihladmrs14'].'</span></button></form></span>';
 		$err_lvl = 1;	
 	} elseif(isset($_POST['update'])) {
 		echo '<div class="alert alert-danger alert-dismissible">',$lang['errcsrf'],'</div>';
@@ -65,7 +65,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_admin_delclient">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -121,7 +121,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/admin_remtime.php

@@ -60,7 +60,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_admin_remtime">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -91,8 +91,8 @@ try {
 											<div class="col-sm-8 pull-right">
 												<select class="selectpicker show-tick form-control" id="number" name="number" onchange="this.form.submit();">
 												<?PHP
-												echo '<option data-icon="fas fa-eye-slash" value="yes"'; if(!isset($_SESSION[$rspathhex.'showexcepted']) || $_SESSION[$rspathhex.'showexcepted'] == "yes") echo " selected=selected"; echo '>&nbsp;hide</option>';
-												echo '<option data-icon="fas fa-eye" value="no"'; if(isset($_SESSION[$rspathhex.'showexcepted']) && $_SESSION[$rspathhex.'showexcepted'] == "no") echo " selected=selected"; echo '>&nbsp;show</option>';
+												echo '<option data-icon="fas fa-eye-slash" value="yes"'; if(!isset($_SESSION[$rspathhex.'showexcepted']) || $_SESSION[$rspathhex.'showexcepted'] == "yes") echo " selected=selected"; echo '><span class="item-margin">hide</span></option>';
+												echo '<option data-icon="fas fa-eye" value="no"'; if(isset($_SESSION[$rspathhex.'showexcepted']) && $_SESSION[$rspathhex.'showexcepted'] == "no") echo " selected=selected"; echo '><span class="item-margin">show</span></option>';
 												?>
 												</select>
 											</div>
@@ -172,7 +172,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/api.php

@@ -21,7 +21,8 @@ try {
 			$apidefinition = [];
 			foreach($_POST['apikey'] as $rowid => $apikey) {
 				$desc = isset($_POST["desc"][$rowid]) ? $_POST["desc"][$rowid] : null;
-				$apidefinition[] = "$apikey=>$desc";
+				if(isset($_POST["perm_bot"]) && in_array($rowid,$_POST["perm_bot"])) $perm_bot = 1; else $perm_bot = 0;
+				$apidefinition[] = "$apikey=>$desc=>$perm_bot";
 			}
 
 			$stats_api_keys = implode(",", $apidefinition);
@@ -44,8 +45,8 @@ try {
 		} else {
 			$keyarr = explode(',', $stats_api_keys);
 			foreach ($keyarr as $entry) {
-				list($key, $value) = explode('=>', $entry);
-				$addnewvalue[$key] = $value;
+				list($key, $desc, $perm_bot) = explode('=>', $entry);
+				$addnewvalue[$key] = array("key"=>$key,"desc"=>$desc,"perm_bot"=>$perm_bot);
 				$cfg['stats_api_keys'] = $addnewvalue;
 			}
 		}
@@ -55,7 +56,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_api">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					
@@ -76,10 +77,16 @@ try {
 										<div class="row">&nbsp;</div>
 										<div class="row">&nbsp;</div>
 										<div class="form-group">
-											<div class="col-sm-5">
+											<div class="col-sm-4">
 												<b><?php echo $lang['apikey'] ?></b>
 											</div>
-											<div class="col-sm-6">
+											<div class="col-sm-1">
+												<b><?php echo $lang['permission'] ?></b>
+											</div>
+											<div class="col-sm-1">
+												<b><?php echo "" ?></b>
+											</div>
+											<div class="col-sm-5">
 												<b><?php echo $lang['descr']; ?></b>
 											</div>
 											<div class="col-sm-1"></div>
@@ -89,8 +96,11 @@ try {
 												<input type="text" data-pattern="^[a-zA-Z0-9]{1,64}$" data-error="No special characters allowed and maximum 64 characters!" maxlength="64" class="form-control" name="tempapikey[]" value="<?PHP $apikey= bin2hex(openssl_random_pseudo_bytes(32)); echo $apikey; ?>">
 												<div class="help-block with-errors"></div>
 											</div>
+											<div class="col-sm-1">
+												<span class="d-inline-block" data-toggle="tooltip" title="Permission: Allow to start/stop Ranksystem Bot via API (ON = Allow ; OFF = Deny)"><input class="switch-animate" type="checkbox" data-size="mini" name="temp_perm_bot[]" value=""></span>
+											</div>
 											<div class="col-sm-1 text-left"></div>
-											<div class="col-sm-6">
+											<div class="col-sm-5">
 												<input type="text" data-pattern="^[^,=>]{1,128}$" data-error="No comma, equal sign or greater-than sign allowed and maximum 128 characters!" maxlength="128" class="form-control" name="tempdesc[]" value="" placeholder="set a description..">
 												<div class="help-block with-errors"></div>
 											</div>
@@ -98,26 +108,35 @@ try {
 											<div class="col-sm-2"></div>
 										</div>
 									<?PHP
+									$rowid = 0;
 									if(isset($cfg['stats_api_keys']) && $cfg['stats_api_keys'] != '') {
-										foreach($cfg['stats_api_keys'] as $apikey => $desc) {
+										foreach($cfg['stats_api_keys'] as $apikey) {
 										?>
 										<div class="form-group" name="apidef">
 											<div class="col-sm-4">
-												<input type="text" data-pattern="^[a-zA-Z0-9]{1,64}$" data-error="No special characters allowed and maximum 64 characters!" maxlength="64" class="form-control" name="apikey[]" value="<?PHP echo $apikey; ?>">
+												<input type="text" data-pattern="^[a-zA-Z0-9]{1,64}$" data-error="No special characters allowed and maximum 64 characters!" maxlength="64" class="form-control" name="apikey[]" value="<?PHP echo $apikey['key']; ?>">
 												<div class="help-block with-errors"></div>
 											</div>
-											<div class="col-sm-1 text-left">
-												<i class="fas fa-link" onclick="openurl('../api/?apikey=<?PHP echo $apikey; ?>')" style="margin-top:10px;cursor:pointer;" title="open URL"></i>&nbsp;
-												<i class="fas fa-copy" onclick="copyurl('<?PHP echo $_SERVER['SERVER_NAME'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'api/?apikey=',$apikey; ?>')" style="margin-top:10px;cursor:pointer;" title="copy URL to clipboard"></i>
+											<div class="col-sm-1">
+												<?PHP if ($apikey['perm_bot'] == 1) {
+													echo '<span class="d-inline-block" data-toggle="tooltip" title="'.$lang['apiperm001'].' - '.$lang['apipermdesc'].'"><input class="switch-animate" type="checkbox" checked data-size="mini" name="perm_bot[]" value="',$rowid,'"></span>';
+												} else {
+													echo '<span class="d-inline-block" data-toggle="tooltip" title="'.$lang['apiperm001'].' - '.$lang['apipermdesc'].'"><input class="switch-animate" type="checkbox" data-size="mini" name="perm_bot[]" value="',$rowid,'"></span>';
+												} ?>
 											</div>
-											<div class="col-sm-6">
-												<input type="text" data-pattern="^[^,=>]{1,128}$" data-error="No comma, equal sign or greater-than sign allowed and maximum 128 characters!" maxlength="128" class="form-control" name="desc[]" value="<?PHP echo $desc; ?>" placeholder="set a description..">
+											<div class="col-sm-1 text-left">
+												<span class="item-margin"><i class="fas fa-link" onclick="openurl('../api/?apikey=<?PHP echo $apikey['key']; ?>')" style="margin-top:10px;cursor:pointer;" title="open URL"></i></span>
+												<span class="item-margin"><i class="fas fa-copy" onclick="copyurl('<?PHP echo $_SERVER['SERVER_NAME'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-12),'api/?apikey=',$apikey['key']; ?>')" style="margin-top:10px;cursor:pointer;" title="copy URL to clipboard"></i></span>
+											</div>
+											<div class="col-sm-5">
+												<input type="text" data-pattern="^[^,=>]{1,128}$" data-error="No comma, equal sign or greater-than sign allowed and maximum 128 characters!" maxlength="128" class="form-control" name="desc[]" value="<?PHP echo $apikey['desc']; ?>" placeholder="set a description..">
 												<div class="help-block with-errors"></div>
 											</div>
 											<div class="col-sm-1 text-center delete" name="delete"><i class="fas fa-trash" style="margin-top:10px;cursor:pointer;" title="delete line"></i></div>
 											<div class="col-sm-2"></div>
 										</div>
 										<?PHP
+										$rowid++;
 										}
 									}
 									?>
@@ -129,7 +148,7 @@ try {
 												echo '<div class="col-sm-11"></div>';
 											}?>
 											<div class="col-sm-1 text-center">
-												<span class="d-inline-block" ata-toggle="tooltip" title="Add new line">
+												<span class="d-inline-block" data-toggle="tooltip" title="Add new line">
 													<button class="btn btn-primary" onclick="addapikey()" style="margin-top: 5px;" type="button"><i class="fas fa-plus"></i></button>
 												</span>
 											</div>
@@ -142,7 +161,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>
@@ -184,11 +203,16 @@ try {
 	});
 	function addapikey() {
 		var $clone = $("div[name='template']").last().clone();
+		var $lastvalue = $("div[name='apidef'] input[name='perm_bot[]']").last().val();
+		$lastvalue++;
 		$clone.removeClass("hidden");
 		$clone.attr('name','apidef');
 		$clone.insertBefore("#addapikey");
 		$("input[name='tempapikey[]']").last().attr('name', 'apikey[]');
 		$("input[name='tempdesc[]']").last().attr('name', 'desc[]');
+		$("input[name='temp_perm_bot[]']").last().attr('name', 'perm_bot[]');
+		$("div[name='apidef'] input[name='perm_bot[]']").last().attr('value',$lastvalue);
+		$("div[name='apidef'] input[name='perm_bot[]']").last().bootstrapSwitch();
 		$('.delete').removeClass("hidden");
 		if (document.contains(document.getElementById("noentry"))) {
 			document.getElementById("noentry").remove();
@@ -235,6 +259,10 @@ try {
 	function copyurl(url) {
 	  navigator.clipboard.writeText(url).then(function() { });
 	}
+	$("[name='perm_bot[]']").bootstrapSwitch();
+	$(function () {
+		$('[data-toggle="tooltip"]').tooltip()
+	})
 	</script>
 	</body>
 	</html>

webinterface/boost.php

@@ -52,7 +52,7 @@ try {
 				$err_msg = print_r($mysqlcon->errorInfo(), true);
 				$err_lvl = 3;
 			} else {
-				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 				$err_lvl = NULL;
 			}
 		} else {
@@ -118,7 +118,7 @@ try {
 				$err_msg = print_r($mysqlcon->errorInfo(), true);
 				$err_lvl = 3;
 			} else {
-				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 				$err_lvl = NULL;
 			}
 		} else {
@@ -142,7 +142,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_boost">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					
@@ -187,7 +187,7 @@ try {
 													if($groupParam['type'] == 0) $grouptype=" [TEMPLATE GROUP]"; else $grouptype="";
 													if($groupParam['type'] == 2) $grouptype=" [QUERY GROUP]";
 													if ($groupID != 0) {
-														echo '<option data-content="<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'>&nbsp;&nbsp;',$groupParam['sgidname'],'&nbsp;<span class=\'text-muted small\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$disabled,'></option>';
+													echo '<option data-content="<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'><span class=\'item-margin\'>',$groupParam['sgidname'],'</span><span class=\'text-muted small item-margin\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$disabled,'></option>';
 													}
 												}
 												?>
@@ -218,7 +218,7 @@ try {
 														if ($groupParam['type'] == 0) $grouptype=" [TEMPLATE GROUP]"; else $grouptype="";
 														if ($groupParam['type'] == 2) $grouptype=" [QUERY GROUP]";
 														if ($groupID != 0) {
-															echo '<option data-content="<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'>&nbsp;&nbsp;',$groupParam['sgidname'],'&nbsp;<span class=\'text-muted small\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
+															echo '<option data-content="<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'><span class=\'item-margin\'>',$groupParam['sgidname'],'</span><span class=\'text-muted small item-margin\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
 														}
 													}
 													?>
@@ -259,7 +259,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/bot.php

@@ -103,65 +103,65 @@ try {
 		exit;
 	}
 
-	$logoutput = getlog($cfg,$number_lines,$filters,$filter2,$inactivefilter);
+	$logoutput = getlog($number_lines,$filters,$filter2,$inactivefilter);
 
 	if (isset($_POST['start']) && isset($db_csrf[$_POST['csrf_token']])) {
-		if(!is_writable($cfg['logs_path'])) {
+		if(!is_writable($GLOBALS['logpath'])) {
 			$err_msg = "!!!! Logs folder is not writable !!!!<br>Cancel start request!"; $err_lvl = 3;
 		} else {
 			$output = '';
-			exec($phpcommand." ".substr(__DIR__,0,-12)."worker.php start", $resultexec);
-			if (file_exists($cfg['logs_path']."autostart_deactivated")) {
-				unlink($cfg['logs_path']."autostart_deactivated");
+			exec($phpcommand." ".dirname(__DIR__).DIRECTORY_SEPARATOR."worker.php start", $resultexec);
+			if (file_exists($GLOBALS['autostart'])) {
+				unlink($GLOBALS['autostart']);
 			}
 			foreach($resultexec as $line) $output .= print_r($line, true).'<br>';
 			$err_msg = $lang['wibot2'].'<br><br>Result of worker.php:<br><pre>'.$output.'</pre>';
 			$err_lvl = 1;
 			usleep(80000);
-			$logoutput = getlog($cfg,$number_lines,$filters,$filter2,$inactivefilter);
+			$logoutput = getlog($number_lines,$filters,$filter2,$inactivefilter);
 		}
 	}
 
 	if (isset($_POST['stop']) && isset($db_csrf[$_POST['csrf_token']])) {
-		if(!is_writable($cfg['logs_path'])) {
+		if(!is_writable($GLOBALS['logpath'])) {
 			$err_msg = "!!!! Logs folder is not writable !!!!<br>Cancel stop request!"; $err_lvl = 3;
 		} else {
 			$output = '';
-			exec($phpcommand." ".substr(__DIR__,0,-12)."worker.php stop", $resultexec);
-			file_put_contents($cfg['logs_path']."autostart_deactivated","");
+			exec($phpcommand." ".dirname(__DIR__).DIRECTORY_SEPARATOR."worker.php stop", $resultexec);
+			file_put_contents($GLOBALS['autostart'],"");
 			foreach($resultexec as $line) $output .= print_r($line, true).'<br>';
 			$err_msg = $lang['wibot1'].'<br><br>Result of worker.php:<br><pre>'.$output.'</pre>';;
 			$err_lvl = 1;
 			usleep(80000);
-			$logoutput = getlog($cfg,$number_lines,$filters,$filter2,$inactivefilter);
+			$logoutput = getlog($number_lines,$filters,$filter2,$inactivefilter);
 		}
 	}
 
 	if (isset($_POST['restart']) && isset($db_csrf[$_POST['csrf_token']])) {
-		if(!is_writable($cfg['logs_path'])) {
+		if(!is_writable($GLOBALS['logpath'])) {
 			$err_msg = "!!!! Logs folder is not writable !!!!<br>Cancel restart request!"; $err_lvl = 3;
 		} else {
 			$output = '';
-			exec($phpcommand." ".substr(__DIR__,0,-12)."worker.php restart", $resultexec);
-			if (file_exists($cfg['logs_path']."autostart_deactivated")) {
-				unlink($cfg['logs_path']."autostart_deactivated");
+			exec($phpcommand." ".dirname(__DIR__).DIRECTORY_SEPARATOR."worker.php restart", $resultexec);
+			if (file_exists($GLOBALS['autostart'])) {
+				unlink($GLOBALS['autostart']);
 			}
 			foreach($resultexec as $line) $output .= print_r($line, true).'<br>';
 			$err_msg = $lang['wibot3'].'<br><br>Result of worker.php:<br><pre>'.$output.'</pre>';
 			$err_lvl = 1;
 			usleep(80000);
-			$logoutput = getlog($cfg,$number_lines,$filters,$filter2,$inactivefilter);
+			$logoutput = getlog($number_lines,$filters,$filter2,$inactivefilter);
 		}
 	}
 
 	$disabled = '';
-	if($cfg['teamspeak_host_address'] == NULL || $cfg['teamspeak_query_port'] == NULL || $cfg['teamspeak_voice_port'] == NULL || $cfg['teamspeak_query_user'] == NULL || $cfg['teamspeak_query_pass'] == NULL || $cfg['teamspeak_query_nickname'] == NULL || $cfg['rankup_definition'] == NULL || $cfg['logs_path'] == NULL) {
+	if($cfg['teamspeak_host_address'] == NULL || $cfg['teamspeak_query_port'] == NULL || $cfg['teamspeak_voice_port'] == NULL || $cfg['teamspeak_query_user'] == NULL || $cfg['teamspeak_query_pass'] == NULL || $cfg['teamspeak_query_nickname'] == NULL || $cfg['rankup_definition'] == NULL || $GLOBALS['logpath'] == NULL) {
 		$disabled = 1;
 		$err_msg = $lang['wibot9'];
 		$err_lvl = 2;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_bot">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -177,7 +177,7 @@ try {
 						<div class="row">
 							<div class="text-center">
 								<button type="submit" class="btn btn-primary" name="start"<?PHP if($disabled == 1) echo " disabled"; ?>>
-								<i class="fas fa-power-off"></i>&nbsp;<?PHP echo $lang['wibot5']; ?>
+								<i class="fas fa-power-off"></i><span class="item-margin"><?PHP echo $lang['wibot5']; ?></span>
 								</button>
 							</div>
 						</div>
@@ -189,7 +189,7 @@ try {
 						<div class="row">
 							<div class="text-center">
 								<button type="submit" class="btn btn-primary" name="stop">
-								<i class="fas fa-times"></i>&nbsp;<?PHP echo $lang['wibot6']; ?>
+								<i class="fas fa-times"></i><span class="item-margin"><?PHP echo $lang['wibot6']; ?></span>
 								</button>
 							</div>
 						</div>
@@ -201,7 +201,7 @@ try {
 						<div class="row">
 							<div class="text-center">
 								<button type="submit" class="btn btn-primary" name="restart"<?PHP if($disabled == 1) echo " disabled"; ?>>
-								<i class="fas fa-sync"></i>&nbsp;<?PHP echo $lang['wibot7']; ?>
+								<i class="fas fa-sync"></i><span class="item-margin"><?PHP echo $lang['wibot7']; ?></span>
 								</button>
 							</div>
 						</div>

webinterface/changepassword.php

@@ -19,12 +19,12 @@ try {
 			$err_msg = $lang['wichpw1']; $err_lvl = 3;
 		} else {
 			$cfg['webinterface_pass'] = password_hash($_POST['newpwd1'], PASSWORD_DEFAULT);
-			if ($_POST['newpwd1'] !== $_POST['newpwd2'] || $_POST['newpwd1'] == NULL) {
+			if (!hash_equals($_POST['newpwd1'], $_POST['newpwd2']) || $_POST['newpwd1'] == NULL) {
 				$err_msg = $lang['wichpw2']; $err_lvl = 3;
 			} elseif($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('webinterface_pass','{$cfg['webinterface_pass']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`)") === false) {
 				$err_msg = print_r($mysqlcon->errorInfo(), true); $err_lvl = 3;
 			} else {
-				enter_logfile($cfg,3,sprintf($lang['wichpw3'],getclientip()));
+				enter_logfile(3,sprintf($lang['wichpw3'],getclientip()));
 				$err_msg = $lang['wisvsuc']; $err_lvl = NULL;
 			}
 		}
@@ -34,7 +34,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_changepassword">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div id="login-overlay" class="modal-dialog">
@@ -68,7 +68,7 @@ try {
 											</div>
 											<br>
 											<p>
-												<button type="submit" class="btn btn-success btn-block" name="changepw"><i class="fas fa-save"></i>&nbsp;<?PHP echo $lang['wichpw4']; ?></button>
+												<button type="submit" class="btn btn-success btn-block" name="changepw"><i class="fas fa-save"></i><span class="item-margin"><?PHP echo $lang['wichpw4']; ?></span></button>
 											</p>
 										</form>
 									</div>

webinterface/core.php

@@ -31,7 +31,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_core">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -47,30 +47,34 @@ try {
 							<div class="col-md-3"></div>
 							<div class="col-md-6">
 								<div class="row">&nbsp;</div>
-								<div class="form-group">
-									<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wisupidledesc"><?php echo $lang['wisupidle']; ?><i class="help-hover fas fa-question-circle"></i></label>
-									<div class="col-sm-8">
-										<select class="selectpicker show-tick form-control basic" name="rankup_time_assess_mode">
-										<?PHP
-										echo '<option data-icon="fas fa-microphone-slash" value="0"'; if($cfg['rankup_time_assess_mode']=="0") echo " selected=selected"; echo '>&nbsp;',$lang['wishcolot'],'</option>';
-										echo '<option data-icon="fas fa-microphone" value="1"'; if($cfg['rankup_time_assess_mode']=="1") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wishcolat'],'</option>';
-										?>
-										</select>
-									</div>
-								</div>
-								<div class="row">&nbsp;</div>
-								<div class="form-group">
-									<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wiignidledesc"><?php echo $lang['wiignidle']; ?><i class="help-hover fas fa-question-circle"></i></label>
-									<div class="col-sm-8">
-										<input type="text" class="form-control" name="rankup_ignore_idle_time" value="<?php echo $cfg['rankup_ignore_idle_time']; ?>">
-										<script>
-										$("input[name='rankup_ignore_idle_time']").TouchSpin({
-											min: 0,
-											max: 65535,
-											verticalbuttons: true,
-											prefix: 'Sec.:'
-										});
-										</script>
+								<div class="panel panel-default">
+									<div class="panel-body">
+										<div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wisupidledesc"><?php echo $lang['wisupidle']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<select class="selectpicker show-tick form-control basic" name="rankup_time_assess_mode">
+												<?PHP
+												echo '<option data-icon="fas fa-microphone-slash fa-fw" value="0"'; if($cfg['rankup_time_assess_mode']=="0") echo " selected=selected"; echo '><span class="item-margin">',$lang['wishcolot'],'</span></option>';
+												echo '<option data-icon="fas fa-microphone fa-fw" value="1"'; if($cfg['rankup_time_assess_mode']=="1") echo " selected=selected"; echo '><span class="item-margin">',$lang['wishcolat'],'</span></option>';
+												?>
+												</select>
+											</div>
+										</div>
+										<div class="row">&nbsp;</div>
+										<div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wiignidledesc"><?php echo $lang['wiignidle']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<input type="text" class="form-control" name="rankup_ignore_idle_time" value="<?php echo $cfg['rankup_ignore_idle_time']; ?>">
+												<script>
+												$("input[name='rankup_ignore_idle_time']").TouchSpin({
+													min: 0,
+													max: 65535,
+													verticalbuttons: true,
+													prefix: 'Sec.:'
+												});
+												</script>
+											</div>
+										</div>
 									</div>
 								</div>
 							</div>
@@ -79,7 +83,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/db.php

@@ -31,8 +31,8 @@ try {
 				$err_msg = sprintf($lang['widbcfgerr']);
 				$err_lvl = 3;
 			} else {
-				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button
-			type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button
+			type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 				$err_lvl = 0;
 				$db['type']	= $_POST['dbtype'];
 				$db['host']	= $_POST['dbhost'];
@@ -51,7 +51,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_db">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -74,7 +74,7 @@ try {
 											<div class="col-sm-8">
 												<select class="selectpicker show-tick form-control required" id="basic" name="dbtype" required>
 												<option disabled value=""> -- select database -- </option>
-												<option data-divider="true">&nbsp;</option>
+												<option data-divider="true"></option>
 												<?PHP
 												echo '<option data-subtext="Cubrid" value="cubrid"'; if($db['type']=="cubrid") echo " selected=selected"; echo '>cubrid</option>';
 												echo '<option data-subtext="FreeTDS / Microsoft SQL Server / Sybase" value="dblib"'; if($db['type']=="dblib") echo " selected=selected"; echo '>dblib</option>';
@@ -137,7 +137,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/download_file.php

@@ -12,15 +12,15 @@ try {
 		$err_lvl = 3;
 	}
 
-	if (isset($db_csrf[$_GET['csrf_token']]) && isset($_GET['file']) && substr($_GET['file'],0,10) == "db_export_" && file_exists($cfg['logs_path'].$_GET['file'])) {
+	if (isset($db_csrf[$_GET['csrf_token']]) && isset($_GET['file']) && substr($_GET['file'],0,10) == "db_export_" && file_exists($GLOBALS['logpath'].$_GET['file']) && isset($_SESSION[$rspathhex.'username']) && hash_equals($_SESSION[$rspathhex.'username'], $cfg['webinterface_user']) && hash_equals($_SESSION[$rspathhex.'password'], $cfg['webinterface_pass'])) {
 		header('Content-Description: File Transfer');
 		header('Content-Type: application/octet-stream');
-		header('Content-Disposition: attachment; filename="'.basename($cfg['logs_path'].$_GET['file']).'"');
+		header('Content-Disposition: attachment; filename="'.basename($GLOBALS['logpath'].$_GET['file']).'"');
 		header('Expires: 0');
 		header('Cache-Control: must-revalidate');
 		header('Pragma: public');
-		header('Content-Length: ' . filesize($cfg['logs_path'].$_GET['file']));
-		readfile($cfg['logs_path'].$_GET['file']);
+		header('Content-Length: ' . filesize($GLOBALS['logpath'].$_GET['file']));
+		readfile($GLOBALS['logpath'].$_GET['file']);
 	} else {
 		rem_session_ts3();
 		echo "Error on downloading file. File do not exists (anymore)? If yes, try it again. There could happened a problem with your session.";

webinterface/except.php

@@ -42,13 +42,14 @@ try {
 		if (isset($_POST['channelid']) && $_POST['channelid'] != NULL) {
 			$cfg['rankup_excepted_channel_id_list'] = implode(',',$_POST['channelid']);
 		}
+		if (isset($_POST['rankup_excepted_remove_group_switch'])) $cfg['rankup_excepted_remove_group_switch'] = 1; else $cfg['rankup_excepted_remove_group_switch'] = 0;
 
 		if($errcnf == 0) {
-			if ($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('rankup_excepted_mode','{$cfg['rankup_excepted_mode']}'),('rankup_excepted_unique_client_id_list','{$cfg['rankup_excepted_unique_client_id_list']}'),('rankup_excepted_group_id_list','{$cfg['rankup_excepted_group_id_list']}'),('rankup_excepted_channel_id_list','{$cfg['rankup_excepted_channel_id_list']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
+			if ($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('rankup_excepted_mode','{$cfg['rankup_excepted_mode']}'),('rankup_excepted_unique_client_id_list','{$cfg['rankup_excepted_unique_client_id_list']}'),('rankup_excepted_group_id_list','{$cfg['rankup_excepted_group_id_list']}'),('rankup_excepted_channel_id_list','{$cfg['rankup_excepted_channel_id_list']}'),('rankup_excepted_remove_group_switch','{$cfg['rankup_excepted_remove_group_switch']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
 				$err_msg = print_r($mysqlcon->errorInfo(), true);
 				$err_lvl = 3;
 			} else {
-				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+				$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 				$err_lvl = NULL;
 			}
 		} else {
@@ -70,7 +71,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_except">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -90,9 +91,9 @@ try {
 											<div class="col-sm-8">
 												<select class="selectpicker show-tick form-control basic" name="rankup_excepted_mode">
 												<?PHP
-												echo '<option data-icon="fas fa-stopwatch" value="0"'; if($cfg['rankup_excepted_mode']=="0") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wiexres1'],'</option>';
-												echo '<option data-icon="fas fa-pause" value="1"'; if($cfg['rankup_excepted_mode']=="1") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wiexres2'],'</option>';
-												echo '<option data-icon="fas fa-sync" value="2"'; if($cfg['rankup_excepted_mode']=="2") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wiexres3'],'</option>';
+												echo '<option data-icon="fas fa-stopwatch" value="0"'; if($cfg['rankup_excepted_mode']=="0") echo " selected=selected"; echo '><span class="item-margin">',$lang['wiexres1'],'</span></option>';
+												echo '<option data-icon="fas fa-pause" value="1"'; if($cfg['rankup_excepted_mode']=="1") echo " selected=selected"; echo '><span class="item-margin">',$lang['wiexres2'],'</span></option>';
+												echo '<option data-icon="fas fa-sync" value="2"'; if($cfg['rankup_excepted_mode']=="2") echo " selected=selected"; echo '><span class="item-margin">',$lang['wiexres3'],'</span></option>';
 												?>
 												</select>
 											</div>
@@ -123,7 +124,7 @@ try {
 													if ($groupParam['type'] == 0) $grouptype=" [TEMPLATE GROUP]"; else $grouptype="";
 													if ($groupParam['type'] == 2) $grouptype=" [QUERY GROUP]";
 													if ($groupID != 0) {
-														echo '<option data-content="&nbsp;&nbsp;<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'>&nbsp;&nbsp;',$groupParam['sgidname'],'&nbsp;<span class=\'text-muted small\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
+													echo '<option data-content="<span class=\'item-margin\'><img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'></span><span class=\'item-margin\'>',$groupParam['sgidname'],'</span><span class=\'text-muted small item-margin\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
 													}
 												}
 												?>
@@ -142,13 +143,24 @@ try {
 									</div>
 
 								</div>
+								<div class="row">&nbsp;</div>
+								<div class="form-group expertelement">
+									<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wiexregrpdesc"><?php echo $lang['wiexregrp']; ?><i class="help-hover fas fa-question-circle"></i></label>
+									<div class="col-sm-8">
+										<?PHP if ($cfg['rankup_excepted_remove_group_switch'] == 1) {
+											echo '<input id="switch-animate" type="checkbox" checked data-size="mini" name="rankup_excepted_remove_group_switch" value="',$cfg['rankup_excepted_remove_group_switch'],'">';
+										} else {
+											echo '<input id="switch-animate" type="checkbox" data-size="mini" name="rankup_excepted_remove_group_switch" value="',$cfg['rankup_excepted_remove_group_switch'],'">';
+										} ?>
+									</div>
+								</div>
 							</div>
 							<div class="col-md-3"></div>
 						</div>
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>
@@ -221,7 +233,24 @@ try {
 		</div>
 	  </div>
 	</div>
+	<div class="modal fade" id="wiexregrpdesc" tabindex="-1">
+	  <div class="modal-dialog">
+		<div class="modal-content">
+		  <div class="modal-header">
+			<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+			<h4 class="modal-title"><?php echo $lang['wiexregrp']; ?></h4>
+		  </div>
+		  <div class="modal-body">
+			<?php echo $lang['wiexregrpdesc']; ?>
+		  </div>
+		  <div class="modal-footer">
+			<button type="button" class="btn btn-default" data-dismiss="modal"><?PHP echo $lang['stnv0002']; ?></button>
+		  </div>
+		</div>
+	  </div>
+	</div>
 	<script>
+	$("[name='rankup_excepted_remove_group_switch']").bootstrapSwitch();
 	$('form[data-toggle="validator"]').validator({
 		custom: {
 			pattern: function ($el) {

webinterface/export.php

@@ -14,6 +14,9 @@ try {
 		$err_lvl = 3;
 	}
 
+	if(!is_int($job_check['database_export']['timestamp'])) {
+		$job_check['database_export']['timestamp'] = intval($job_check['database_export']['timestamp']);
+	}
 	function get_status($lang, $job_check, $check = NULL) {
 		$err_msg = "<b>".$lang['wihladmex']."</b>: ";
 		switch($job_check['database_export']['timestamp']) {
@@ -40,7 +43,7 @@ try {
 		$err_msg = '<b>'.$lang['wihladmrs'].":</b><br><br><pre>"; $err_lvl = 2;
 		$err_msg .= get_status($lang, $job_check);
 
-		if(in_array($job_check['database_export']['timestamp'], ["0","3","4"], true)) {
+		if(in_array($job_check['database_export']['timestamp'], [0,3,4], true)) {
 			$err_msg .= '</pre><br>';
 			if($job_check['database_export']['timestamp'] == 4) {
 				$err_msg .= "Exported file successfully.";
@@ -48,14 +51,14 @@ try {
 					$err_msg .= "<br><u>".sprintf($lang['wihladmex2'], "</u>")."<br><pre>".$cfg['teamspeak_query_pass']."</pre>";
 				}
 			}
-			$err_msg .= '<br>'.sprintf($lang['wihladmrs9'], '<form class="btn-group" name="confirm" action="export.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-success btn-sm" name="confirm"><i class="fas fa-check"></i>&nbsp;', '</button></form>');
+			$err_msg .= '<br>'.sprintf($lang['wihladmrs9'], '<form class="btn-group" name="confirm" action="export.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-success btn-sm" name="confirm"><i class="fas fa-check"></i>', '</button></form>');
 		} else {
-			$err_msg .= '</pre><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="export.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>&nbsp;', '</button></form>').'<br><br>'.$lang['wihladmrs8'].'<br><br>'.sprintf($lang['wihladmrs17'], '<form class="btn-group" name="cancel" action="export.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-danger btn-sm" name="cancel"><i class="fas fa-times"></i>&nbsp;', '</button></form>');
+			$err_msg .= '</pre><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="export.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>', '</button></form>').'<br><br>'.$lang['wihladmrs8'].'<br><br>'.sprintf($lang['wihladmrs17'], '<form class="btn-group" name="cancel" action="export.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-danger btn-sm" name="cancel"><i class="fas fa-times"></i>', '</button></form>');
 		}
 	}
 
 	if (isset($_POST['confirm']) && isset($db_csrf[$_POST['csrf_token']])) {
-		if(in_array($job_check['database_export']['timestamp'], ["0","3","4"], true)) {
+		if(in_array($job_check['database_export']['timestamp'], [0,3,4], true)) {
 			if ($mysqlcon->exec("INSERT INTO `$dbname`.`job_check` (`job_name`,`timestamp`) VALUES ('database_export','0') ON DUPLICATE KEY UPDATE `timestamp`=VALUES(`timestamp`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
 				$err_msg = $lang['isntwidbmsg'].print_r($mysqlcon->errorInfo(), true);
 				$err_lvl = 3;
@@ -68,7 +71,7 @@ try {
 			$err_lvl = 3;
 		}
 	} elseif (isset($_POST['cancel']) && isset($db_csrf[$_POST['csrf_token']])) {
-		if(in_array($job_check['database_export']['timestamp'], ["0","1","2","4"], true)) {
+		if(in_array($job_check['database_export']['timestamp'], [0,1,2,4], true)) {
 			if ($mysqlcon->exec("INSERT INTO `$dbname`.`job_check` (`job_name`,`timestamp`) VALUES ('database_export','3') ON DUPLICATE KEY UPDATE `timestamp`=VALUES(`timestamp`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
 				$err_msg = $lang['isntwidbmsg'].print_r($mysqlcon->errorInfo(), true);
 				$err_lvl = 3;
@@ -81,7 +84,7 @@ try {
 			$err_lvl = 3;
 		}
 	} elseif (isset($_POST['delete']) && isset($db_csrf[$_POST['csrf_token']])) {
-		if(substr($_POST['delete'],0,10) == "db_export_" && unlink($cfg['logs_path'].$_POST['delete'])) {
+		if(substr($_POST['delete'],0,10) == "db_export_" && unlink($GLOBALS['logpath'].$_POST['delete'])) {
 			$err_msg = sprintf($lang['wihladmex3'], $_POST['delete']);
 			$err_lvl = NULL;
 		} else {
@@ -96,7 +99,7 @@ try {
 			$err_msg = $lang['isntwidbmsg'].print_r($mysqlcon->errorInfo(), true);
 			$err_lvl = 3;
 		} else {
-			$err_msg = '<b>'.$lang['wihladmex1'].'</b><br><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="export.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>&nbsp;', '</button></form>').'<br><br>'.$lang['wihladmrs8'];
+			$err_msg = '<b>'.$lang['wihladmex1'].'</b><br><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="export.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>', '</button></form>').'<br><br>'.$lang['wihladmrs8'];
 			if(($snapshot = $mysqlcon->query("SELECT COUNT(*) AS `count` from `$dbname`.`user_snapshot`")->fetch()) === false) { } else {
 				$est_time = round($snapshot['count'] * 0.00005) + 5;
 				$dtF = new \DateTime('@0');
@@ -112,7 +115,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_export">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -145,26 +148,26 @@ try {
 										</div>
 										<div class="form-group" name="filegroup">
 										<?PHP
-										foreach(scandir($cfg['logs_path']) as $file) {
+										foreach(scandir($GLOBALS['logpath']) as $file) {
 											if ('.' === $file || '..' === $file) continue;
-											if (is_dir($cfg['logs_path'].$file)) continue;
+											if (is_dir($GLOBALS['logpath'].$file)) continue;
 											if(substr($file, 0, 10) != 'db_export_') continue;
 											if(substr($file, -4, 4) != '.zip' && substr($file, -4, 4) != '.sql') continue;
 										?>
 											<div class="col-sm-6">
-												<?PHP echo $cfg['logs_path'].$file; ?>
+												<?PHP echo $GLOBALS['logpath'].$file; ?>
 											</div>
 											<div class="col-sm-1">
-												<?PHP echo human_readable_size(filesize($cfg['logs_path'].$file),$lang); ?>
+												<?PHP echo human_readable_size(filesize($GLOBALS['logpath'].$file),$lang); ?>
 											</div>
 											<div class="col-sm-3">
-												<?PHP echo md5_file($cfg['logs_path'].$file); ?>
+												<?PHP echo md5_file($GLOBALS['logpath'].$file); ?>
 											</div>
 											<div class="col-sm-1 text-center delete">
 												<form id="<?PHP echo $file.'dow' ?>" method="POST">
 													<input type="hidden" name="csrf_token" value="<?PHP echo $csrf_token; ?>">
 													<input type="hidden" name="download" value="<?PHP echo $file; ?>">
-													<?PHP if(in_array($job_check['database_export']['timestamp'], ["0","4"], true)) { ?>
+													<?PHP if(in_array($job_check['database_export']['timestamp'], [0,4], true)) { ?>
 														<a href="download_file.php?csrf_token=<?PHP echo $csrf_token; ?>&file=<?PHP echo $file ?>">
 														<span onclick="document.getElementById('<?PHP echo $file.'dow' ?>').submit();" style="cursor: pointer; pointer-events: all;">
 														<svg class="svg-inline--fa fa-download fa-w-16" style="margin-top: 10px;cursor: pointer;" title="download file" aria-labelledby="svg-inline--fa-title-D8LEkIGcdqdt" data-prefix="fas" data-icon="download" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg=""><title id="svg-inline--fa-title-D8LEkIGcdqdt"><?PHP echo $lang['wihladmex5']; ?></title><path fill="currentColor" d="M216 0h80c13.3 0 24 10.7 24 24v168h87.7c17.8 0 26.7 21.5 14.1 34.1L269.7 378.3c-7.5 7.5-19.8 7.5-27.3 0L90.1 226.1c-12.6-12.6-3.7-34.1 14.1-34.1H192V24c0-13.3 10.7-24 24-24zm296 376v112c0 13.3-10.7 24-24 24H24c-13.3 0-24-10.7-24-24V376c0-13.3 10.7-24 24-24h146.7l49 49c20.1 20.1 52.5 20.1 72.6 0l49-49H488c13.3 0 24 10.7 24 24zm-124 88c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20zm64 0c0-11-9-20-20-20s-20 9-20 20 9 20 20 20 20-9 20-20z" style="--darkreader-inline-fill:currentColor;" data-darkreader-inline-fill=""></path></svg>
@@ -177,7 +180,7 @@ try {
 												<form id="<?PHP echo $file.'del' ?>" method="POST">
 													<input type="hidden" name="csrf_token" value="<?PHP echo $csrf_token; ?>">
 													<input type="hidden" name="delete" value="<?PHP echo $file ?>">
-													<?PHP if(in_array($job_check['database_export']['timestamp'], ["0","4"], true)) { ?>
+													<?PHP if(in_array($job_check['database_export']['timestamp'], [0,4], true)) { ?>
 														<span onclick="document.getElementById('<?PHP echo $file.'del' ?>').submit();" style="cursor: pointer; pointer-events: all;">
 															<svg class="svg-inline--fa fa-trash fa-w-14" style="margin-top: 10px;cursor: pointer;" title="delete file" onclick="javascript:this.form.submit();" aria-labelledby="svg-inline--fa-title-gtKCZkgszs1S" data-prefix="fas" data-icon="trash" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" data-fa-i2svg=""><title id="svg-inline--fa-title-gtKCZkgszs1S"><?PHP echo $lang['wihladmex6']; ?></title><path fill="currentColor" d="M32 464a48 48 0 0 0 48 48h288a48 48 0 0 0 48-48V128H32zm272-256a16 16 0 0 1 32 0v224a16 16 0 0 1-32 0zm-96 0a16 16 0 0 1 32 0v224a16 16 0 0 1-32 0zm-96 0a16 16 0 0 1 32 0v224a16 16 0 0 1-32 0zM432 32H312l-9.4-18.7A24 24 0 0 0 281.1 0H166.8a23.72 23.72 0 0 0-21.4 13.3L136 32H16A16 16 0 0 0 0 48v32a16 16 0 0 0 16 16h416a16 16 0 0 0 16-16V48a16 16 0 0 0-16-16z" style="--darkreader-inline-fill:currentColor;" data-darkreader-inline-fill=""></path></svg>
 														</span>
@@ -196,7 +199,7 @@ try {
 								<form name="post" id="post" method="POST">
 								<input type="hidden" name="csrf_token" value="<?PHP echo $csrf_token; ?>">
 								<div class="text-center">
-									<button type="submit" class="btn btn-primary" name="export"><?php echo $lang['wihladmex7']; ?></button>
+									<button type="submit" class="btn btn-primary" name="export"><span class="item-margin"><?php echo $lang['wihladmex7']; ?></span></button>
 								</div>
 								</form>
 							</div>

webinterface/imprint.php

@@ -41,7 +41,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_imprint">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -122,7 +122,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/index.php

@@ -29,13 +29,13 @@ try {
 		}
 	}
 
-	if(file_exists($cfg['logs_path'].'ranksystem.log') && !is_writable($cfg['logs_path'].'ranksystem.log')) {
-		$err_msg = sprintf($lang['chkfileperm'], '<pre>chown -R www-data:www-data '.$cfg['logs_path'].'</pre><br>', '<pre>chmod 0740 '.$cfg['logs_path'].'ranksystem.log</pre><br><br>', '<pre>'.$cfg['logs_path'].'ranksystem.log</pre>');
+	if(file_exists($GLOBALS['logfile']) && !is_writable($GLOBALS['logfile'])) {
+		$err_msg = sprintf($lang['chkfileperm'], '<pre>chown -R www-data:www-data '.$GLOBALS['logpath'].'</pre><br>', '<pre>chmod 0740 '.$GLOBALS['logfile'].'</pre><br><br>', '<pre>'.$GLOBALS['logfile'].'</pre>');
 		$err_lvl = 3; $dis_login = 0;
 	}
 
-	if(!is_writable($cfg['logs_path'])) {
-		$err_msg = sprintf($lang['chkfileperm'], '<pre>chown -R www-data:www-data '.$cfg['logs_path'].'</pre><br>', '<pre>chmod 0740 '.$cfg['logs_path'].'</pre><br><br>', '<pre>'.$cfg['logs_path'].'</pre>');
+	if(!is_writable($GLOBALS['logpath'])) {
+		$err_msg = sprintf($lang['chkfileperm'], '<pre>chown -R www-data:www-data '.$GLOBALS['logpath'].'</pre><br>', '<pre>chmod 0740 '.$GLOBALS['logpath'].'</pre><br><br>', '<pre>'.$GLOBALS['logpath'].'</pre>');
 		$err_lvl = 3; $dis_login = 0;
 	}
 
@@ -64,43 +64,47 @@ try {
 		$err_msg = "Your PHP Version: (".PHP_VERSION.") is outdated and no longer supported. Please update it!";
 		$err_lvl = 2;
 	}
+	
+	if(!isset($cfg['webinterface_access_count']) || $cfg['webinterface_access_count'] != NULL) $cfg['webinterface_access_count'] = 0;
+	if(!isset($cfg['webinterface_access_last']) || $cfg['webinterface_access_last'] != NULL) $cfg['webinterface_access_last'] = 0;
 
 	if(($cfg['webinterface_access_last'] + 1) >= time()) {
 		$waittime = $cfg['webinterface_access_last'] + 2 - time();
 		$err_msg = sprintf($lang['errlogin2'],$waittime);
 		$err_lvl = 3;
 	} elseif ($cfg['webinterface_access_count'] >= 10) {
-		enter_logfile($cfg,3,sprintf($lang['brute'], getclientip()));
+		enter_logfile(3,sprintf($lang['brute'], getclientip()));
 		$err_msg = $lang['errlogin3'];
 		$err_lvl = 3;
 		$bantime = time() + 299;
 		if($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('webinterface_access_last','{$bantime}'),('webinterface_access_count','0') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`)") === false) { }
-	} elseif (isset($_POST['username']) && $_POST['username'] == $cfg['webinterface_user'] && password_verify($_POST['password'], $cfg['webinterface_pass'])) {
+	} elseif (isset($_POST['username']) && hash_equals($_POST['username'], $cfg['webinterface_user']) && password_verify($_POST['password'], $cfg['webinterface_pass'])) {
 		$_SESSION[$rspathhex.'username'] = $cfg['webinterface_user'];
 		$_SESSION[$rspathhex.'password'] = $cfg['webinterface_pass'];
 		$_SESSION[$rspathhex.'clientip'] = getclientip();
 		$_SESSION[$rspathhex.'newversion'] = $cfg['version_latest_available'];
-		enter_logfile($cfg,6,sprintf($lang['brute2'], getclientip()));
+		if(isset($cfg['stats_news_html'])) $_SESSION[$rspathhex.'stats_news_html'] = $cfg['stats_news_html'];
+		enter_logfile(6,sprintf($lang['brute2'], getclientip()));
 		if($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('webinterface_access_count','0') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`)") === false) { }
 		header("Location: $prot://".$_SERVER['HTTP_HOST'].rtrim(dirname($_SERVER['PHP_SELF']), '/\\')."/bot.php");
 		exit;
 	} elseif(isset($_POST['username'])) {
 		$nowtime = time();
-		enter_logfile($cfg,5,sprintf($lang['brute1'], getclientip(), htmlspecialchars($_POST['username'])));
+		enter_logfile(5,sprintf($lang['brute1'], getclientip(), htmlspecialchars($_POST['username'])));
 		$cfg['webinterface_access_count']++;
 		if($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('webinterface_access_last','{$nowtime}'),('webinterface_access_count','{$cfg['webinterface_access_count']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`)") === false) { }
 		$err_msg = $lang['errlogin'];
 		$err_lvl = 3;
 	}
 
-	if(isset($_SESSION[$rspathhex.'username']) && $_SESSION[$rspathhex.'username'] == $cfg['webinterface_user'] && $_SESSION[$rspathhex.'password'] == $cfg['webinterface_pass']) {
+	if(isset($_SESSION[$rspathhex.'username']) && hash_equals($_SESSION[$rspathhex.'username'], $cfg['webinterface_user']) && hash_equals($_SESSION[$rspathhex.'password'], $cfg['webinterface_pass'])) {
 		header("Location: $prot://".$_SERVER['HTTP_HOST'].rtrim(dirname($_SERVER['PHP_SELF']), '/\\')."/bot.php");
 		exit;
 	}
 
 	require_once('_nav.php');
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_index">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div id="login-overlay" class="modal-dialog">

webinterface/msg.php

@@ -25,8 +25,8 @@ try {
 			$err_msg = print_r($mysqlcon->errorInfo(), true);
 			$err_lvl = 3;
 		} else {
-			$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button
-			type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+			$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button
+			type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 			$err_lvl = NULL;
 		}
 		$cfg['rankup_message_to_user'] = $_POST['rankup_message_to_user'];
@@ -39,7 +39,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_msg">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -82,9 +82,9 @@ try {
 											<div class="col-sm-8">
 												<select class="selectpicker show-tick form-control" id="basic" name="rankup_next_message_mode">
 												<?PHP
-												echo '<option data-icon="fas fa-ban" value="0"'; if($cfg['rankup_next_message_mode']=="0") echo " selected=selected"; echo '>&nbsp;',$lang['winxmode1'],'</option>';
-												echo '<option data-icon="fas fa-clipboard-check" value="1"'; if($cfg['rankup_next_message_mode']=="1") echo " selected=selected"; echo '>&nbsp;',$lang['winxmode2'],'</option>';
-												echo '<option data-icon="fas fa-clipboard-list" value="2"'; if($cfg['rankup_next_message_mode']=="2") echo " selected=selected"; echo '>&nbsp;',$lang['winxmode3'],'</option>';
+												echo '<option data-icon="fas fa-ban" value="0"'; if($cfg['rankup_next_message_mode']=="0") echo " selected=selected"; echo '><span class="item-margin">',$lang['winxmode1'],'</span></option>';
+												echo '<option data-icon="fas fa-clipboard-check" value="1"'; if($cfg['rankup_next_message_mode']=="1") echo " selected=selected"; echo '><span class="item-margin">',$lang['winxmode2'],'</span></option>';
+												echo '<option data-icon="fas fa-clipboard-list" value="2"'; if($cfg['rankup_next_message_mode']=="2") echo " selected=selected"; echo '><span class="item-margin">',$lang['winxmode3'],'</span></option>';
 												?>
 												</select>
 											</div>
@@ -114,7 +114,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/other.php

@@ -2,6 +2,11 @@
 require_once('_preload.php');
 
 try {
+	if(isset($_POST['update'])) {
+		$cfg['default_style'] = $_SESSION[$rspathhex.'style'] = $_POST['default_style'];
+		$GLOBALS['style'] = get_style($cfg['default_style']);
+	}
+
 	require_once('_nav.php');
 
 	if ($mysqlcon->exec("INSERT INTO `$dbname`.`csrf_token` (`token`,`timestamp`,`sessionid`) VALUES ('$csrf_token','".time()."','".session_id()."')") === false) {
@@ -38,39 +43,22 @@ try {
 		if (isset($_POST['rankup_clean_clients_switch'])) $cfg['rankup_clean_clients_switch'] = 1; else $cfg['rankup_clean_clients_switch'] = 0;
 		$cfg['rankup_clean_clients_period'] = $_POST['rankup_clean_clients_period'];
 
-		if ($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('logs_timezone','{$cfg['logs_timezone']}'),('default_date_format','{$cfg['default_date_format']}'),('logs_path','{$cfg['logs_path']}'),('logs_debug_level','{$cfg['logs_debug_level']}'),('logs_rotation_size','{$cfg['logs_rotation_size']}'),('default_language','{$cfg['default_language']}'),('version_update_channel','{$cfg['version_update_channel']}'),('rankup_hash_ip_addresses_mode','{$cfg['rankup_hash_ip_addresses_mode']}'),('default_session_sametime','{$cfg['default_session_sametime']}'),('default_header_origin','{$cfg['default_header_origin']}'),('default_header_xss','{$cfg['default_header_xss']}'),('default_header_contenttyp','{$cfg['default_header_contenttyp']}'),('default_header_frame','{$cfg['default_header_frame']}'),('default_cmdline_sec_switch','{$cfg['default_cmdline_sec_switch']}'),('rankup_client_database_id_change_switch','{$cfg['rankup_client_database_id_change_switch']}'),('rankup_clean_clients_switch','{$cfg['rankup_clean_clients_switch']}'),('rankup_clean_clients_period','{$cfg['rankup_clean_clients_period']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
+		if ($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('logs_timezone','{$cfg['logs_timezone']}'),('default_date_format','{$cfg['default_date_format']}'),('logs_path','{$cfg['logs_path']}'),('logs_debug_level','{$cfg['logs_debug_level']}'),('logs_rotation_size','{$cfg['logs_rotation_size']}'),('default_language','{$cfg['default_language']}'),('default_style','{$cfg['default_style']}'),('version_update_channel','{$cfg['version_update_channel']}'),('rankup_hash_ip_addresses_mode','{$cfg['rankup_hash_ip_addresses_mode']}'),('default_session_sametime','{$cfg['default_session_sametime']}'),('default_header_origin','{$cfg['default_header_origin']}'),('default_header_xss','{$cfg['default_header_xss']}'),('default_header_contenttyp','{$cfg['default_header_contenttyp']}'),('default_header_frame','{$cfg['default_header_frame']}'),('default_cmdline_sec_switch','{$cfg['default_cmdline_sec_switch']}'),('rankup_client_database_id_change_switch','{$cfg['rankup_client_database_id_change_switch']}'),('rankup_clean_clients_switch','{$cfg['rankup_clean_clients_switch']}'),('rankup_clean_clients_period','{$cfg['rankup_clean_clients_period']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
 			$err_msg = print_r($mysqlcon->errorInfo(), true);
 			$err_lvl = 3;
 		} else {
-			$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button
-			type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+			$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button
+			type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 			$err_lvl = NULL;
 		}
 		$cfg['logs_path'] = $_POST['logs_path'];
-		
-		if(isset($cfg['default_language']) && is_dir(substr(__DIR__,0,-12).'languages/')) {
-			foreach(scandir(substr(__DIR__,0,-12).'languages/') as $file) {
-				if ('.' === $file || '..' === $file || is_dir($file)) continue;
-				$sep_lang = preg_split("/[._]/", $file);
-				if(isset($sep_lang[0]) && $sep_lang[0] == 'core' && isset($sep_lang[1]) && strlen($sep_lang[1]) == 2 && isset($sep_lang[4]) && strtolower($sep_lang[4]) == 'php') {
-					if(strtolower($cfg['default_language']) == strtolower($sep_lang[1])) {
-						require_once('../languages/core_'.$sep_lang[1].'_'.$sep_lang[2].'_'.$sep_lang[3].'.'.$sep_lang[4]);
-						$required_lang = 1;
-						break;
-					}
-				}
-			}
-		}
-		if(!isset($required_lang)) {
-			require_once('../languages/core_en_english_gb.php');
-		}
 	} elseif(isset($_POST['update'])) {
 		echo '<div class="alert alert-danger alert-dismissible">',$lang['errcsrf'],'</div>';
 		rem_session_ts3();
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_other">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 	<?PHP if(isset($err_msg2)) error_handling($err_msg2, $err_lvl2); ?>
 				<div class="container-fluid">
@@ -90,12 +78,12 @@ try {
 									<div class="col-sm-8">
 										<select class="selectpicker show-tick form-control" name="default_language">
 										<?PHP
-										if(is_dir(substr(__DIR__,0,-12).'languages/')) {
-											foreach(scandir(substr(__DIR__,0,-12).'languages/') as $file) {
+										if(is_dir($GLOBALS['langpath'])) {
+											foreach(scandir($GLOBALS['langpath']) as $file) {
 												if ('.' === $file || '..' === $file || is_dir($file)) continue;
 												$sep_lang = preg_split("/[._]/", $file);
 												if(isset($sep_lang[0]) && $sep_lang[0] == 'core' && isset($sep_lang[1]) && strlen($sep_lang[1]) == 2 && isset($sep_lang[4]) && strtolower($sep_lang[4]) == 'php') {
-													echo '<option data-icon="flag-icon flag-icon-'.$sep_lang[3].'" data-subtext="'.$sep_lang[2].'" value="'.$sep_lang[1].'"'.($cfg['default_language'] === $sep_lang[1] ? ' selected="selected"' : '').'>&nbsp;'.strtoupper($sep_lang[1]).'</option>';
+													echo '<option data-icon="flag-icon flag-icon-'.$sep_lang[3].'" data-subtext="'.$sep_lang[2].'" value="'.$sep_lang[1].'"'.($cfg['default_language'] === $sep_lang[1] ? ' selected="selected"' : '').'><span class="item-margin">'.strtoupper($sep_lang[1]).'</span></option>';
 												}
 											}
 										}
@@ -169,13 +157,39 @@ try {
 									</div>
 								</div>
 								<div class="row">&nbsp;</div>
+								<div class="form-group">
+									<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wistyledesc"><?php echo $lang['wistyle']; ?><i class="help-hover fas fa-question-circle"></i></label>
+									<div class="col-sm-8">
+										<select class="selectpicker show-tick form-control" name="default_style">
+										<option data-icon="fas fa-ban" value="" <?PHP if(!isset($cfg['default_style']) || $cfg['default_style'] == "") echo " selected=selected"; ?>><span class="item-margin"><?PHP echo $lang['wihladmrs0']; ?></span></option>
+										<option data-divider="true"></option>
+										<?PHP
+										if(is_dir($GLOBALS['stylepath'])) {
+											foreach(scandir($GLOBALS['stylepath']) as $folder) {
+												if ('.' === $folder || '..' === $folder) continue;
+												if(is_dir($GLOBALS['stylepath'].DIRECTORY_SEPARATOR.$folder)) {
+													foreach(scandir($GLOBALS['stylepath'].DIRECTORY_SEPARATOR.$folder) as $file) {
+														if ('.' === $file || '..' === $file || is_dir($file)) continue;
+														$sep_style = preg_split("/[._]/", $file);
+														if($file == "ST.css") {
+															echo '<option value="'.$folder.'"'.($cfg['default_style'] === $folder ? ' selected="selected"' : '').'><span class="item-margin">'.$folder.'</style></option>';
+														}
+													}
+												}
+											}
+										}
+										?>
+										</select>
+									</div>
+								</div>
+								<div class="row">&nbsp;</div>
 								<div class="form-group">
 									<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wiupchdesc"><?php echo $lang['wiupch']; ?><i class="help-hover fas fa-question-circle"></i></label>
 									<div class="col-sm-8">
 										<select class="selectpicker show-tick form-control basic" name="version_update_channel">
 										<?PHP
-										echo '<option data-icon="fas fa-parachute-box" ata-subtext="[recommended]" value="stable"'; if($cfg['version_update_channel']=="stable") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wiupch0'],'</option>';
-										echo '<option data-icon="fas fa-flask" value="beta"'; if($cfg['version_update_channel']=="beta") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wiupch1'],'</option>';
+										echo '<option data-icon="fas fa-parachute-box" ata-subtext="[recommended]" value="stable"'; if($cfg['version_update_channel']=="stable") echo " selected=selected"; echo '><span class="item-margin">',$lang['wiupch0'],'</span></option>';
+										echo '<option data-icon="fas fa-flask" value="beta"'; if($cfg['version_update_channel']=="beta") echo " selected=selected"; echo '><span class="item-margin">',$lang['wiupch1'],'</span></option>';
 										?>
 										</select>
 									</div>
@@ -187,10 +201,10 @@ try {
 									<div class="col-sm-8">
 										<select class="selectpicker show-tick form-control basic" name="rankup_hash_ip_addresses_mode">
 										<?PHP
-										echo '<option data-icon="fas fa-lock" data-subtext="[recommended]" value="2"'; if($cfg['rankup_hash_ip_addresses_mode']=="2") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wishcolha2'],'</option>';
-										echo '<option data-icon="fas fa-shield-alt" value="1"'; if($cfg['rankup_hash_ip_addresses_mode']=="1") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wishcolha1'],'</option>';
+										echo '<option data-icon="fas fa-lock" data-subtext="[recommended]" value="2"'; if($cfg['rankup_hash_ip_addresses_mode']=="2") echo " selected=selected"; echo '><span class="item-margin">',$lang['wishcolha2'],'</span></option>';
+										echo '<option data-icon="fas fa-shield-alt" value="1"'; if($cfg['rankup_hash_ip_addresses_mode']=="1") echo " selected=selected"; echo '><span class="item-margin">',$lang['wishcolha1'],'</span></option>';
 										echo '<option data-divider="true">&nbsp;</option>';
-										echo '<option data-icon="fas fa-ban" value="0"'; if($cfg['rankup_hash_ip_addresses_mode']=="0") echo " selected=selected"; echo '>&nbsp;&nbsp;',$lang['wishcolha0'],'</option>';
+										echo '<option data-icon="fas fa-ban" value="0"'; if($cfg['rankup_hash_ip_addresses_mode']=="0") echo " selected=selected"; echo '><span class="item-margin">',$lang['wishcolha0'],'</span></option>';
 										?>
 										</select>
 									</div>
@@ -316,7 +330,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>
@@ -501,6 +515,22 @@ try {
 		</div>
 	  </div>
 	</div>
+	<div class="modal fade" id="wistyledesc" tabindex="-1">
+	  <div class="modal-dialog">
+		<div class="modal-content">
+		  <div class="modal-header">
+			<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+			<h4 class="modal-title"><?php echo $lang['wistyle']; ?></h4>
+		  </div>
+		  <div class="modal-body">
+			<?php echo sprintf($lang['wistyledesc'], 'admin@ts-ranksystem.com'); ?>
+		  </div>
+		  <div class="modal-footer">
+			<button type="button" class="btn btn-default" data-dismiss="modal"><?PHP echo $lang['stnv0002']; ?></button>
+		  </div>
+		</div>
+	  </div>
+	</div>
 	<div class="modal fade" id="wivlangdesc" tabindex="-1">
 	  <div class="modal-dialog">
 		<div class="modal-content">

webinterface/rank.php

@@ -41,6 +41,7 @@ try {
 			if(isset($cfg['rankup_definition']) && $cfg['rankup_definition'] != NULL) {
 				foreach($cfg['rankup_definition'] as $time => $value) {
 					if(!isset($groupslist[$value['group']]) && $value['group'] != NULL) {
+						if(!isset($err_msg)) $err_msg = '';
 						$err_msg .= sprintf($lang['upgrp0001'], $value['group'], $lang['wigrptime']).'<br>';
 						$err_lvl = 3;
 						$errcnf++;
@@ -58,7 +59,7 @@ try {
 					$err_msg = print_r($mysqlcon->errorInfo(), true);
 					$err_lvl = 3;
 				} else {
-					$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+					$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 					$err_lvl = NULL;
 				}
 			} else {
@@ -108,7 +109,7 @@ try {
 					$err_msg = print_r($mysqlcon->errorInfo(), true);
 					$err_lvl = 3;
 				} else {
-					$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+					$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 					$err_lvl = NULL;
 				}
 			} else {
@@ -135,7 +136,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_rank">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					
@@ -188,7 +189,7 @@ try {
 													if ($groupParam['type'] == 0) $grouptype=" [TEMPLATE GROUP]"; else $grouptype="";
 													if ($groupParam['type'] == 2) $grouptype=" [QUERY GROUP]";
 													if ($groupID != 0) {
-														echo '<option data-content="<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'>&nbsp;&nbsp;',$groupParam['sgidname'],'&nbsp;<span class=\'text-muted small\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
+														echo '<option data-content="<img src=\'../tsicons/',$iconid,$groupParam['ext'],'\' width=\'16\' height=\'16\'><span class=\'item-margin\'>',$groupParam['sgidname'],'</span><span class=\'text-muted small item-margin\'>SGID:&nbsp;',$groupID,$grouptype,'</span>" value="',$groupID,'"',$selected,$disabled,'></option>';
 													}
 												}
 												?>
@@ -223,7 +224,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>
@@ -262,7 +263,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update_old"><?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update_old"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/ranklist.php

@@ -30,14 +30,24 @@ try {
 		if (isset($_POST['stats_column_next_rankup_switch'])) $cfg['stats_column_next_rankup_switch'] = 1; else $cfg['stats_column_next_rankup_switch'] = 0;
 		if (isset($_POST['stats_column_next_server_group_switch'])) $cfg['stats_column_next_server_group_switch'] = 1; else $cfg['stats_column_next_server_group_switch'] = 0;
 		if (isset($_POST['stats_column_current_group_since_switch'])) $cfg['stats_column_current_group_since_switch'] = 1; else $cfg['stats_column_current_group_since_switch'] = 0;
+		if (isset($_POST['stats_column_online_day_switch'])) $cfg['stats_column_online_day_switch'] = 1; else $cfg['stats_column_online_day_switch'] = 0;
+		if (isset($_POST['stats_column_idle_day_switch'])) $cfg['stats_column_idle_day_switch'] = 1; else $cfg['stats_column_idle_day_switch'] = 0;
+		if (isset($_POST['stats_column_active_day_switch'])) $cfg['stats_column_active_day_switch'] = 1; else $cfg['stats_column_active_day_switch'] = 0;
+		if (isset($_POST['stats_column_online_week_switch'])) $cfg['stats_column_online_week_switch'] = 1; else $cfg['stats_column_online_week_switch'] = 0;
+		if (isset($_POST['stats_column_idle_week_switch'])) $cfg['stats_column_idle_week_switch'] = 1; else $cfg['stats_column_idle_week_switch'] = 0;
+		if (isset($_POST['stats_column_active_week_switch'])) $cfg['stats_column_active_week_switch'] = 1; else $cfg['stats_column_active_week_switch'] = 0;
+		if (isset($_POST['stats_column_online_month_switch'])) $cfg['stats_column_online_month_switch'] = 1; else $cfg['stats_column_online_month_switch'] = 0;
+		if (isset($_POST['stats_column_idle_month_switch'])) $cfg['stats_column_idle_month_switch'] = 1; else $cfg['stats_column_idle_month_switch'] = 0;
+		if (isset($_POST['stats_column_active_month_switch'])) $cfg['stats_column_active_month_switch'] = 1; else $cfg['stats_column_active_month_switch'] = 0;
 		if (isset($_POST['stats_show_excepted_clients_switch'])) $cfg['stats_show_excepted_clients_switch'] = 1; else $cfg['stats_show_excepted_clients_switch'] = 0;
 		if (isset($_POST['stats_show_clients_in_highest_rank_switch'])) $cfg['stats_show_clients_in_highest_rank_switch'] = 1; else $cfg['stats_show_clients_in_highest_rank_switch'] = 0;
+
 		$cfg['stats_column_default_order'] = $_POST['stats_column_default_order'];
 		$cfg['stats_column_default_sort'] = $_POST['stats_column_default_sort'];
 		$cfg['stats_column_default_order_2'] = $_POST['stats_column_default_order_2'];
 		$cfg['stats_column_default_sort_2'] = $_POST['stats_column_default_sort_2'];
 
-		if ($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('stats_column_rank_switch','{$cfg['stats_column_rank_switch']}'),('stats_column_client_name_switch','{$cfg['stats_column_client_name_switch']}'),('stats_column_unique_id_switch','{$cfg['stats_column_unique_id_switch']}'),('stats_column_client_db_id_switch','{$cfg['stats_column_client_db_id_switch']}'),('stats_column_last_seen_switch','{$cfg['stats_column_last_seen_switch']}'),('stats_column_nation_switch','{$cfg['stats_column_nation_switch']}'),('stats_column_version_switch','{$cfg['stats_column_version_switch']}'),('stats_column_platform_switch','{$cfg['stats_column_platform_switch']}'),('stats_column_online_time_switch','{$cfg['stats_column_online_time_switch']}'),('stats_column_idle_time_switch','{$cfg['stats_column_idle_time_switch']}'),('stats_column_active_time_switch','{$cfg['stats_column_active_time_switch']}'),('stats_column_current_server_group_switch','{$cfg['stats_column_current_server_group_switch']}'),('stats_column_current_group_since_switch','{$cfg['stats_column_current_group_since_switch']}'),('stats_column_next_rankup_switch','{$cfg['stats_column_next_rankup_switch']}'),('stats_column_next_server_group_switch','{$cfg['stats_column_next_server_group_switch']}'),('stats_column_default_order','{$cfg['stats_column_default_order']}'),('stats_column_default_sort','{$cfg['stats_column_default_sort']}'),('stats_column_default_order_2','{$cfg['stats_column_default_order_2']}'),('stats_column_default_sort_2','{$cfg['stats_column_default_sort_2']}'),('stats_show_excepted_clients_switch','{$cfg['stats_show_excepted_clients_switch']}'),('stats_show_clients_in_highest_rank_switch','{$cfg['stats_show_clients_in_highest_rank_switch']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
+		if ($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('stats_column_rank_switch','{$cfg['stats_column_rank_switch']}'),('stats_column_client_name_switch','{$cfg['stats_column_client_name_switch']}'),('stats_column_unique_id_switch','{$cfg['stats_column_unique_id_switch']}'),('stats_column_client_db_id_switch','{$cfg['stats_column_client_db_id_switch']}'),('stats_column_last_seen_switch','{$cfg['stats_column_last_seen_switch']}'),('stats_column_nation_switch','{$cfg['stats_column_nation_switch']}'),('stats_column_version_switch','{$cfg['stats_column_version_switch']}'),('stats_column_platform_switch','{$cfg['stats_column_platform_switch']}'),('stats_column_online_time_switch','{$cfg['stats_column_online_time_switch']}'),('stats_column_idle_time_switch','{$cfg['stats_column_idle_time_switch']}'),('stats_column_active_time_switch','{$cfg['stats_column_active_time_switch']}'),('stats_column_current_server_group_switch','{$cfg['stats_column_current_server_group_switch']}'),('stats_column_current_group_since_switch','{$cfg['stats_column_current_group_since_switch']}'),('stats_column_online_day_switch','{$cfg['stats_column_online_day_switch']}'),('stats_column_idle_day_switch','{$cfg['stats_column_idle_day_switch']}'),('stats_column_active_day_switch','{$cfg['stats_column_active_day_switch']}'),('stats_column_online_week_switch','{$cfg['stats_column_online_week_switch']}'),('stats_column_idle_week_switch','{$cfg['stats_column_idle_week_switch']}'),('stats_column_active_week_switch','{$cfg['stats_column_active_week_switch']}'),('stats_column_online_month_switch','{$cfg['stats_column_online_month_switch']}'),('stats_column_idle_month_switch','{$cfg['stats_column_idle_month_switch']}'),('stats_column_active_month_switch','{$cfg['stats_column_active_month_switch']}'),('stats_column_next_rankup_switch','{$cfg['stats_column_next_rankup_switch']}'),('stats_column_next_server_group_switch','{$cfg['stats_column_next_server_group_switch']}'),('stats_column_default_order','{$cfg['stats_column_default_order']}'),('stats_column_default_sort','{$cfg['stats_column_default_sort']}'),('stats_column_default_order_2','{$cfg['stats_column_default_order_2']}'),('stats_column_default_sort_2','{$cfg['stats_column_default_sort_2']}'),('stats_show_excepted_clients_switch','{$cfg['stats_show_excepted_clients_switch']}'),('stats_show_clients_in_highest_rank_switch','{$cfg['stats_show_clients_in_highest_rank_switch']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
 			$err_msg = print_r($mysqlcon->errorInfo(), true);
 			$err_lvl = 3;
 		} else {
@@ -50,7 +60,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_ranklist">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -178,6 +188,88 @@ try {
 												} ?>
 											</div>
 										</div>
+										<div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsumo'] ,' ', $lang['stix0013']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_online_day_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_online_day_switch" value="',$cfg['stats_column_online_day_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_online_day_switch" value="',$cfg['stats_column_online_day_switch'],'">';
+												} ?>
+											</div>
+										</div><div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsumi'] ,' ', $lang['stix0013']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_idle_day_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_idle_day_switch" value="',$cfg['stats_column_idle_day_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_idle_day_switch" value="',$cfg['stats_column_idle_day_switch'],'">';
+												} ?>
+											</div>
+										</div><div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsuma'] ,' ', $lang['stix0013']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_active_day_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_active_day_switch" value="',$cfg['stats_column_active_day_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_active_day_switch" value="',$cfg['stats_column_active_day_switch'],'">';
+												} ?>
+											</div>
+										</div><div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsumo'] ,' ', $lang['stix0014']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_online_week_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_online_week_switch" value="',$cfg['stats_column_online_week_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_online_week_switch" value="',$cfg['stats_column_online_week_switch'],'">';
+												} ?>
+											</div>
+										</div><div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsumi'] ,' ', $lang['stix0014']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_idle_week_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_idle_week_switch" value="',$cfg['stats_column_idle_week_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_idle_week_switch" value="',$cfg['stats_column_idle_week_switch'],'">';
+												} ?>
+											</div>
+										</div><div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsuma'] ,' ', $lang['stix0014']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_active_week_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_active_week_switch" value="',$cfg['stats_column_active_week_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_active_week_switch" value="',$cfg['stats_column_active_week_switch'],'">';
+												} ?>
+											</div>
+										</div><div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsumo'] ,' ', $lang['stix0015']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_online_month_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_online_month_switch" value="',$cfg['stats_column_online_month_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_online_month_switch" value="',$cfg['stats_column_online_month_switch'],'">';
+												} ?>
+											</div>
+										</div><div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsumi'] ,' ', $lang['stix0015']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_idle_month_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_idle_month_switch" value="',$cfg['stats_column_idle_month_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_idle_month_switch" value="',$cfg['stats_column_idle_month_switch'],'">';
+												} ?>
+											</div>
+										</div><div class="form-group">
+											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listsuma'] ,' ', $lang['stix0015']; ?><i class="help-hover fas fa-question-circle"></i></label>
+											<div class="col-sm-8">
+												<?PHP if ($cfg['stats_column_active_month_switch'] == 1) {
+													echo '<input class="switch-animate" type="checkbox" checked data-size="mini" name="stats_column_active_month_switch" value="',$cfg['stats_column_active_month_switch'],'">';
+												} else {
+													echo '<input class="switch-animate" type="checkbox" data-size="mini" name="stats_column_active_month_switch" value="',$cfg['stats_column_active_month_switch'],'">';
+												} ?>
+											</div>
+										</div>
 										<div class="form-group">
 											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wishcoldesc"><?php echo $lang['listacsg']; ?><i class="help-hover fas fa-question-circle"></i></label>
 											<div class="col-sm-8">
@@ -229,21 +321,10 @@ try {
 											<div class="col-sm-8">
 												<select class="selectpicker show-tick form-control basic" name="stats_column_default_sort">
 												<?PHP
-												echo '<option data-icon="fas fa-hashtag" data-subtext="[default]" value="rank"'.($cfg['stats_column_default_sort'] === '1' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listrank'].'</option>';
-												echo '<option data-icon="fas fa-user" value="name"'.($cfg['stats_column_default_sort'] === 'name' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listnick'].'</option>';
-												echo '<option data-icon="fas fa-id-card" value="uuid"'.($cfg['stats_column_default_sort'] === 'uuid' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listuid'].'</option>';
-												echo '<option data-icon="fas fa-database" value="cldbid"'.($cfg['stats_column_default_sort'] === 'cldbid' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listcldbid'].'</option>';
-												echo '<option data-icon="fas fa-user-clock" value="lastseen"'.($cfg['stats_column_default_sort'] === 'lastseen' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listseen'].'</option>';
-												echo '<option data-icon="fas fa-globe-europe" value="nation"'.($cfg['stats_column_default_sort'] === 'nation' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listnat'].'</option>';
-												echo '<option data-icon="fas fa-tag" value="version"'.($cfg['stats_column_default_sort'] === 'version' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listver'].'</option>';
-												echo '<option data-icon="fas fa-server" value="platform"'.($cfg['stats_column_default_sort'] === 'platform' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listpla'].'</option>';
-												echo '<option data-icon="fas fa-hourglass-start" value="count"'.($cfg['stats_column_default_sort'] === 'count' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listsumo'].'</option>';
-												echo '<option data-icon="fas fa-hourglass-end" value="idle"'.($cfg['stats_column_default_sort'] === 'idle' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listsumi'].'</option>';
-												echo '<option data-icon="fas fa-hourglass-half" value="active"'.($cfg['stats_column_default_sort'] === 'active' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listsuma'].'</option>';
-												echo '<option data-icon="fas fa-clipboard-check" value="grpid"'.($cfg['stats_column_default_sort'] === 'grpid' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listacsg'].'</option>';
-												echo '<option data-icon="fas fa-history" value="grpidsince"'.($cfg['stats_column_default_sort'] === 'grpidsince' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listgrps'].'</option>';
-												echo '<option data-icon="fas fa-clock" value="nextup"'.($cfg['stats_column_default_sort'] === 'nextup' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listnxup'].'</option>';
-												echo '<option data-icon="fas fa-clipboard-list" value="active"'.($cfg['stats_column_default_sort'] === 'active' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listnxsg'].'</option>';
+												$arr_sort_options = sort_options($lang);
+												foreach ($arr_sort_options as $opt => $val) {
+													echo '<option data-icon="'.$val['icon'].'" value="'.$val['option'].'"'.($cfg['stats_column_default_sort'] === $val['option'] ? ' selected="selected"' : '').'><span class="item-margin">'.$val['title'].'</span></option>';
+												}
 												?>
 												</select>
 											</div>
@@ -253,8 +334,8 @@ try {
 											<div class="col-sm-8">
 												<select class="selectpicker show-tick form-control basic" name="stats_column_default_order">
 												<?PHP
-												echo '<option data-subtext="[ASC]" data-icon="fas fa-sort-asc" value="asc"'.($cfg['stats_column_default_order'] === 'asc' ? ' selected="selected"' : '').'>&nbsp;'.$lang['asc'].'</option>';
-												echo '<option data-subtext="[DESC]" data-icon="fas fa-sort-desc" value="desc"'.($cfg['stats_column_default_order'] === 'desc' ? ' selected="selected"' : '').'>&nbsp;'.$lang['desc'].'</option>';
+												echo '<option data-subtext="[ASC]" data-icon="fas fa-sort-asc" value="asc"'.($cfg['stats_column_default_order'] === 'asc' ? ' selected="selected"' : '').'><span class="item-margin">'.$lang['asc'].'</span></option>';
+												echo '<option data-subtext="[DESC]" data-icon="fas fa-sort-desc" value="desc"'.($cfg['stats_column_default_order'] === 'desc' ? ' selected="selected"' : '').'><span class="item-margin">'.$lang['desc'].'</span></option>';
 												?>
 												</select>
 											</div>
@@ -265,21 +346,9 @@ try {
 											<div class="col-sm-8">
 												<select class="selectpicker show-tick form-control basic" name="stats_column_default_sort_2">
 												<?PHP
-												echo '<option data-icon="fas fa-hashtag" data-subtext="[default]" value="rank"'.($cfg['stats_column_default_sort_2'] === '1' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listrank'].'</option>';
-												echo '<option data-icon="fas fa-user" value="name"'.($cfg['stats_column_default_sort_2'] === 'name' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listnick'].'</option>';
-												echo '<option data-icon="fas fa-id-card" value="uuid"'.($cfg['stats_column_default_sort_2'] === 'uuid' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listuid'].'</option>';
-												echo '<option data-icon="fas fa-database" value="cldbid"'.($cfg['stats_column_default_sort_2'] === 'cldbid' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listcldbid'].'</option>';
-												echo '<option data-icon="fas fa-user-clock" value="lastseen"'.($cfg['stats_column_default_sort_2'] === 'lastseen' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listseen'].'</option>';
-												echo '<option data-icon="fas fa-globe-europe" value="nation"'.($cfg['stats_column_default_sort_2'] === 'nation' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listnat'].'</option>';
-												echo '<option data-icon="fas fa-tag" value="version"'.($cfg['stats_column_default_sort_2'] === 'version' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listver'].'</option>';
-												echo '<option data-icon="fas fa-server" value="platform"'.($cfg['stats_column_default_sort_2'] === 'platform' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listpla'].'</option>';
-												echo '<option data-icon="fas fa-hourglass-start" value="count"'.($cfg['stats_column_default_sort_2'] === 'count' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listsumo'].'</option>';
-												echo '<option data-icon="fas fa-hourglass-end" value="idle"'.($cfg['stats_column_default_sort_2'] === 'idle' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listsumi'].'</option>';
-												echo '<option data-icon="fas fa-hourglass-half" value="active"'.($cfg['stats_column_default_sort_2'] === 'active' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listsuma'].'</option>';
-												echo '<option data-icon="fas fa-clipboard-check" value="grpid"'.($cfg['stats_column_default_sort_2'] === 'grpid' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listacsg'].'</option>';
-												echo '<option data-icon="fas fa-history" value="grpidsince"'.($cfg['stats_column_default_sort_2'] === 'grpidsince' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listgrps'].'</option>';
-												echo '<option data-icon="fas fa-clock" value="nextup"'.($cfg['stats_column_default_sort_2'] === 'nextup' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listnxup'].'</option>';
-												echo '<option data-icon="fas fa-clipboard-list" value="active"'.($cfg['stats_column_default_sort_2'] === 'active' ? ' selected="selected"' : '').'>&nbsp;'.$lang['listnxsg'].'</option>';
+												foreach ($arr_sort_options as $opt => $val) {
+													echo '<option data-icon="'.$val['icon'].'" value="'.$val['option'].'"'.($cfg['stats_column_default_sort_2'] === $val['option'] ? ' selected="selected"' : '').'><span class="item-margin">'.$val['title'].'</span></option>';
+												}
 												?>
 												</select>
 											</div>
@@ -289,8 +358,8 @@ try {
 											<div class="col-sm-8">
 												<select class="selectpicker show-tick form-control basic" name="stats_column_default_order_2">
 												<?PHP
-												echo '<option data-subtext="[ASC]" data-icon="fas fa-sort-asc" value="asc"'.($cfg['stats_column_default_order_2'] === 'asc' ? ' selected="selected"' : '').'>&nbsp;'.$lang['asc'].'</option>';
-												echo '<option data-subtext="[DESC]" data-icon="fas fa-sort-desc" value="desc"'.($cfg['stats_column_default_order_2'] === 'desc' ? ' selected="selected"' : '').'>&nbsp;'.$lang['desc'].'</option>';
+												echo '<option data-subtext="[ASC]" data-icon="fas fa-sort-asc" value="asc"'.($cfg['stats_column_default_order_2'] === 'asc' ? ' selected="selected"' : '').'><span class="item-margin">'.$lang['asc'].'</span></option>';
+												echo '<option data-subtext="[DESC]" data-icon="fas fa-sort-desc" value="desc"'.($cfg['stats_column_default_order_2'] === 'desc' ? ' selected="selected"' : '').'><span class="item-margin">'.$lang['desc'].'</span></option>';
 												?>
 												</select>
 											</div>
@@ -324,7 +393,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>
@@ -463,6 +532,15 @@ try {
 	$("[name='stats_column_current_group_since_switch']").bootstrapSwitch();
 	$("[name='stats_show_excepted_clients_switch']").bootstrapSwitch();
 	$("[name='stats_show_clients_in_highest_rank_switch']").bootstrapSwitch();
+	$("[name='stats_column_online_day_switch']").bootstrapSwitch();
+	$("[name='stats_column_idle_day_switch']").bootstrapSwitch();
+	$("[name='stats_column_active_day_switch']").bootstrapSwitch();
+	$("[name='stats_column_online_week_switch']").bootstrapSwitch();
+	$("[name='stats_column_idle_week_switch']").bootstrapSwitch();
+	$("[name='stats_column_active_week_switch']").bootstrapSwitch();
+	$("[name='stats_column_online_month_switch']").bootstrapSwitch();
+	$("[name='stats_column_idle_month_switch']").bootstrapSwitch();
+	$("[name='stats_column_active_month_switch']").bootstrapSwitch();
 	</script>
 	</body>
 	</html>

webinterface/reset.php

@@ -120,15 +120,15 @@ try {
 		$err_msg = '<b>'.$lang['wihladmrs'].":</b><br><br><pre>"; $err_lvl = 2;
 		$err_msg .= reset_status($lang, $job_check);
 
-		if(in_array($job_check['reset_user_time']['timestamp'], ["0","4"], true) && in_array($job_check['reset_user_delete']['timestamp'], ["0","4"], true) && in_array($job_check['reset_group_withdraw']['timestamp'], ["0","4"], true) && in_array($job_check['reset_webspace_cache']['timestamp'], ["0","4"], true) && in_array($job_check['reset_usage_graph']['timestamp'], ["0","4"], true)) {
-			$err_msg .= '</pre><br><br><br>'.sprintf($lang['wihladmrs9'], '<form class="btn-group" name="confirm" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-success btn-sm" name="confirm"><i class="fas fa-check"></i>&nbsp;', '</button></form>');
+		if(in_array(intval($job_check['reset_user_time']['timestamp']), [0,4], true) && in_array(intval($job_check['reset_user_delete']['timestamp']), [0,4], true) && in_array(intval($job_check['reset_group_withdraw']['timestamp']), [0,4], true) && in_array(intval($job_check['reset_webspace_cache']['timestamp']), [0,4], true) && in_array(intval($job_check['reset_usage_graph']['timestamp']), [0,4], true)) {
+			$err_msg .= '</pre><br><br><br>'.sprintf($lang['wihladmrs9'], '<form class="btn-group" name="confirm" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-success btn-sm" name="confirm"><i class="fas fa-check"></i>', '</button></form>');
 		} else {
-			$err_msg .= '</pre><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>&nbsp;', '</button></form>').'<br><br>'.$lang['wihladmrs8'];
+			$err_msg .= '</pre><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>', '</button></form>').'<br><br>'.$lang['wihladmrs8'];
 		}
 	}
 
 	if (isset($_POST['confirm']) && isset($db_csrf[$_POST['csrf_token']])) {
-		if(in_array($job_check['reset_user_time']['timestamp'], ["0","4"], true) && in_array($job_check['reset_user_delete']['timestamp'], ["0","4"], true) && in_array($job_check['reset_group_withdraw']['timestamp'], ["0","4"], true) && in_array($job_check['reset_webspace_cache']['timestamp'], ["0","4"], true) && in_array($job_check['reset_usage_graph']['timestamp'], ["0","4"], true)) {
+		if(in_array(intval($job_check['reset_user_time']['timestamp']), [0,4], true) && in_array(intval($job_check['reset_user_delete']['timestamp']), [0,4], true) && in_array(intval($job_check['reset_group_withdraw']['timestamp']), [0,4], true) && in_array(intval($job_check['reset_webspace_cache']['timestamp']), [0,4], true) && in_array(intval($job_check['reset_usage_graph']['timestamp']), [0,4], true)) {
 			if ($mysqlcon->exec("INSERT INTO `$dbname`.`job_check` (`job_name`,`timestamp`) VALUES ('reset_user_time','0'),('reset_user_delete','0'),('reset_group_withdraw','0'),('reset_webspace_cache','0'),('reset_usage_graph','0'),('reset_stop_after','0') ON DUPLICATE KEY UPDATE `timestamp`=VALUES(`timestamp`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
 				$err_msg = $lang['isntwidbmsg'].print_r($mysqlcon->errorInfo(), true);
 				$err_lvl = 3;
@@ -141,7 +141,7 @@ try {
 		}
 	} elseif (isset($_POST['update']) && isset($db_csrf[$_POST['csrf_token']])) {
 		if($job_check['reset_user_time']['timestamp'] != 0 || $job_check['reset_user_delete']['timestamp'] != 0 || $job_check['reset_group_withdraw']['timestamp'] != 0 || $job_check['reset_webspace_cache']['timestamp'] != 0 || $job_check['reset_usage_graph']['timestamp'] != 0) {
-			$err_msg = '<b>'.$lang['wihladmrs6'].'</b><br><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>&nbsp;', '</button></form>').'<br><br>'.$lang['wihladmrs8'];
+			$err_msg = '<b>'.$lang['wihladmrs6'].'</b><br><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>', '</button></form>').'<br><br>'.$lang['wihladmrs8'];
 			$err_lvl = 3;
 		} elseif($_POST['reset_user_time'] == 0 && !isset($_POST['reset_group_withdraw']) && !isset($_POST['reset_webspace_cache']) && !isset($_POST['reset_usage_graph'])) {
 			$err_msg = $lang['wihladmrs15']; $err_lvl = 3;
@@ -173,7 +173,7 @@ try {
 
 			$err_msg = $lang['wihladmrs11'].': '.$est_time.'.<br>'.$lang['wihladmrs12'].'<br><br><pre>';
 			$err_msg .= reset_status($lang, $job_check, $check = 1);
-			$err_msg .= '</pre><br><br><form class="btn-group" name="startjobs" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><input type="hidden" name="reset_user_time" value="'.$_POST['reset_user_time'].'"><input type="hidden" name="reset_group_withdraw" value="'.$_POST['reset_group_withdraw'].'"><input type="hidden" name="reset_webspace_cache" value="'.$_POST['reset_webspace_cache'].'"><input type="hidden" name="reset_usage_graph" value="'.$_POST['reset_usage_graph'].'"><input type="hidden" name="reset_stop_after" value="'.$_POST['reset_stop_after'].'"><button type="submit" class="btn btn-success btn-sm" name="startjobs"><i class="fas fa-check"></i>&nbsp;'.$lang['wihladmrs13'].'</button></form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<form class="btn-group" name="cancel" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-danger btn-sm" name="cancel"><i class="fas fa-times"></i>&nbsp;'.$lang['wihladmrs14'].'</button></form>';
+			$err_msg .= '</pre><br><br><form class="btn-group" name="startjobs" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><input type="hidden" name="reset_user_time" value="'.$_POST['reset_user_time'].'"><input type="hidden" name="reset_group_withdraw" value="'.$_POST['reset_group_withdraw'].'"><input type="hidden" name="reset_webspace_cache" value="'.$_POST['reset_webspace_cache'].'"><input type="hidden" name="reset_usage_graph" value="'.$_POST['reset_usage_graph'].'"><input type="hidden" name="reset_stop_after" value="'.$_POST['reset_stop_after'].'"><button type="submit" class="btn btn-success btn-sm" name="startjobs"><i class="fas fa-check"></i><span class="item-margin">'.$lang['wihladmrs13'].'</span></button></form><span class="item-margin"><form class="btn-group" name="cancel" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-danger btn-sm" name="cancel"><i class="fas fa-times"></i><span class="item-margin">'.$lang['wihladmrs14'].'</span></button></form></span>';
 			$err_lvl = 1;
 		}		
 	} elseif(isset($_POST['startjobs']) && isset($db_csrf[$_POST['csrf_token']])) {
@@ -192,7 +192,7 @@ try {
 			$err_msg = $lang['isntwidbmsg'].print_r($mysqlcon->errorInfo(), true);
 			$err_lvl = 3;
 		} else {
-			$err_msg = '<b>'.$lang['wihladmrs5'].'</b><br><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>&nbsp;', '</button></form>').'<br><br>'.$lang['wihladmrs8'];
+			$err_msg = '<b>'.$lang['wihladmrs5'].'</b><br><br>'.sprintf($lang['wihladmrs7'], '<form class="btn-group" name="refresh" action="reset.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button type="submit" class="btn btn-primary btn-sm" name="refresh"><i class="fas fa-sync"></i>', '</button></form>').'<br><br>'.$lang['wihladmrs8'];
 			$err_lvl = NULL;
 		}
 	} elseif(isset($_POST['update']) || isset($_POST['confirm'])) {
@@ -201,7 +201,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_reset">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -231,36 +231,36 @@ try {
 											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wihladm31desc"><?php echo $lang['wihladm31']; ?><i class="help-hover fas fa-question-circle"></i></label>
 											<div class="col-sm-8">
 													<select class="selectpicker show-tick form-control basic" name="reset_user_time">
-														<option data-icon="fas fa-ban" selected="selected" value="0">&nbsp;<?PHP echo $lang['winxmode1']; ?></option>
-														<option data-divider="true">&nbsp;</option>
-														<option data-icon="fas fa-history" value="1">&nbsp;<?PHP echo $lang['wihladm311']; ?></option>
-														<option data-icon="fas fa-user-slash" value="2">&nbsp;<?PHP echo $lang['wihladm312']; ?></option>
+														<option data-icon="fas fa-ban" selected="selected" value="0"><span class="item-margin"><?PHP echo $lang['winxmode1']; ?></span></option>
+														<option data-divider="true"></option>
+														<option data-icon="fas fa-history" value="1"><span class="item-margin"><?PHP echo $lang['wihladm311']; ?></span></option>
+														<option data-icon="fas fa-user-slash" value="2"><span class="item-margin"><?PHP echo $lang['wihladm312']; ?></span></option>
 													</select>
 											</div>
 										</div>
 										<div class="form-group">
 											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wihladm32desc"><?php echo $lang['wihladm32']; ?><i class="help-hover fas fa-question-circle"></i></label>
 											<div class="col-sm-8">
-												<input class="switch-animate" type="checkbox" data-size="mini" name="reset_group_withdraw" value="0">
+												<input class="switch-animate" type="checkbox" data-size="mini" id="reset_group_withdraw" name="reset_group_withdraw" value="0">
 											</div>
 										</div>
 										<div class="form-group">
 											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wihladm33desc"><?php echo $lang['wihladm33']; ?><i class="help-hover fas fa-question-circle"></i></label>
 											<div class="col-sm-8">
-												<input class="switch-animate" type="checkbox" data-size="mini" name="reset_webspace_cache" value="0">
+												<input class="switch-animate" type="checkbox" data-size="mini" id="reset_webspace_cache" name="reset_webspace_cache" value="0">
 											</div>
 										</div>
 										<div class="form-group">
 											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wihladm34desc"><?php echo $lang['wihladm34']; ?><i class="help-hover fas fa-question-circle"></i></label>
 											<div class="col-sm-8">
-												<input class="switch-animate" type="checkbox" data-size="mini" name="reset_usage_graph" value="0">
+												<input class="switch-animate" type="checkbox" data-size="mini" id="reset_usage_graph" name="reset_usage_graph" value="0">
 											</div>
 										</div>
 										<div class="row">&nbsp;</div>
 										<div class="form-group">
 											<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wihladm36desc"><?php echo $lang['wihladm36']; ?><i class="help-hover fas fa-question-circle"></i></label>
 											<div class="col-sm-8">
-												<input class="switch-animate" type="checkbox" data-size="mini" name="reset_stop_after" value="0">
+												<input class="switch-animate" type="checkbox" data-size="mini" id="reset_stop_after" name="reset_stop_after" value="0">
 											</div>
 										</div>
 									</div>
@@ -377,10 +377,10 @@ try {
 	  </div>
 	</div>
 	<script>
-	$("[name='reset_group_withdraw']").bootstrapSwitch();
-	$("[name='reset_webspace_cache']").bootstrapSwitch();
-	$("[name='reset_usage_graph']").bootstrapSwitch();
-	$("[name='reset_stop_after']").bootstrapSwitch();
+	$("[id='reset_group_withdraw']").bootstrapSwitch();
+	$("[id='reset_webspace_cache']").bootstrapSwitch();
+	$("[id='reset_usage_graph']").bootstrapSwitch();
+	$("[id='reset_stop_after']").bootstrapSwitch();
 	</script>
 	</body>
 	</html>

webinterface/resetpassword.php

@@ -25,7 +25,7 @@ try {
 		$newcount = $cfg['webinterface_access_count'] + 1;
 		if($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('webinterface_access_last','{$nowtime}'),('webinterface_access_count','{$newcount}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`)") === false) { }
 		
-		require_once(substr(__DIR__,0,-12).'libs/ts3_lib/TeamSpeak3.php');
+		require_once(dirname(__DIR__).DIRECTORY_SEPARATOR.'libs/ts3_lib/TeamSpeak3.php');
 		try {
 			if($cfg['teamspeak_query_encrypt_switch'] == 1) {
 				$ts3 = TeamSpeak3::factory("serverquery://".rawurlencode($cfg['teamspeak_query_user']).":".rawurlencode($cfg['teamspeak_query_pass'])."@".$cfg['teamspeak_host_address'].":".$cfg['teamspeak_query_port']."/?server_port=".$cfg['teamspeak_voice_port']."&ssh=1");
@@ -58,7 +58,7 @@ try {
 									usleep($cfg['teamspeak_query_command_delay']);
 									$ts3->clientGetByUid($client['client_unique_identifier'])->message(sprintf($lang['wirtpw4'], $cfg['webinterface_user'], $pwd, '[URL=http'.(!empty($_SERVER['HTTPS'])?"s":"").'://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']).']','[/URL]'));
 									$err_msg .= sprintf($lang['wirtpw5'],'<a href="http'.(!empty($_SERVER['HTTPS'])?"s":"").'://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['SCRIPT_NAME']).'/">','</a>'); $err_lvl = 1;
-									enter_logfile($cfg,3,sprintf($lang['wirtpw6'],getclientip()));
+									enter_logfile(3,sprintf($lang['wirtpw6'],getclientip()));
 								} catch (Exception $e) {
 									$err_msg .= $lang['errorts3'].$e->getCode().': '.$e->getMessage(); $err_lvl = 3;
 								}
@@ -84,7 +84,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_resetpassword">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div id="login-overlay" class="modal-dialog">

webinterface/stats.php

@@ -56,7 +56,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_stats">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -236,7 +236,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>

webinterface/ts.php

@@ -33,7 +33,11 @@ try {
 			$cfg['webinterface_admin_client_unique_id_list'] = implode(',',$_POST['webinterface_admin_client_unique_id_list']);
 		}
 		
-		$cfg['teamspeak_host_address'] = preg_replace('/\s/', '', $_POST['teamspeak_host_address']);
+		if(isset($_POST['teamspeak_host_address']) && $_POST['teamspeak_host_address'] != NULL) {
+			$cfg['teamspeak_host_address'] = preg_replace('/\s/', '', $_POST['teamspeak_host_address']);
+		} else {
+			$cfg['teamspeak_host_address'] = '';
+		}
 		$cfg['teamspeak_query_port'] = $_POST['teamspeak_query_port'];
 		if (isset($_POST['teamspeak_query_encrypt_switch'])) $cfg['teamspeak_query_encrypt_switch'] = 1; else $cfg['teamspeak_query_encrypt_switch'] = 0;
 		$cfg['teamspeak_voice_port'] = $_POST['teamspeak_voice_port'];
@@ -43,13 +47,18 @@ try {
 		$cfg['teamspeak_default_channel_id'] = $_POST['channelid'];
 		$cfg['teamspeak_query_command_delay'] = $_POST['teamspeak_query_command_delay'];
 		$cfg['teamspeak_avatar_download_delay']= $_POST['teamspeak_avatar_download_delay'];
+		if(isset($_POST['teamspeak_chatcommand_prefix']) && $_POST['teamspeak_chatcommand_prefix'] != NULL) {
+			$cfg['teamspeak_chatcommand_prefix'] = htmlspecialchars($_POST['teamspeak_chatcommand_prefix'], ENT_QUOTES);
+		} else {
+			$cfg['teamspeak_chatcommand_prefix'] = "!";
+		}
 
-		if ($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('teamspeak_host_address','{$cfg['teamspeak_host_address']}'),('teamspeak_query_encrypt_switch','{$cfg['teamspeak_query_encrypt_switch']}'),('teamspeak_query_port','{$cfg['teamspeak_query_port']}'),('teamspeak_voice_port','{$cfg['teamspeak_voice_port']}'),('teamspeak_query_user','{$cfg['teamspeak_query_user']}'),('teamspeak_query_pass','{$cfg['teamspeak_query_pass']}'),('teamspeak_query_nickname','{$cfg['teamspeak_query_nickname']}'),('teamspeak_default_channel_id','{$cfg['teamspeak_default_channel_id']}'),('teamspeak_query_command_delay','{$cfg['teamspeak_query_command_delay']}'),('teamspeak_avatar_download_delay','{$cfg['teamspeak_avatar_download_delay']}'),('webinterface_admin_client_unique_id_list','{$cfg['webinterface_admin_client_unique_id_list']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
+		if ($mysqlcon->exec("INSERT INTO `$dbname`.`cfg_params` (`param`,`value`) VALUES ('teamspeak_host_address','{$cfg['teamspeak_host_address']}'),('teamspeak_query_encrypt_switch','{$cfg['teamspeak_query_encrypt_switch']}'),('teamspeak_query_port','{$cfg['teamspeak_query_port']}'),('teamspeak_voice_port','{$cfg['teamspeak_voice_port']}'),('teamspeak_query_user','{$cfg['teamspeak_query_user']}'),('teamspeak_query_pass','{$cfg['teamspeak_query_pass']}'),('teamspeak_query_nickname','{$cfg['teamspeak_query_nickname']}'),('teamspeak_default_channel_id','{$cfg['teamspeak_default_channel_id']}'),('teamspeak_query_command_delay','{$cfg['teamspeak_query_command_delay']}'),('teamspeak_avatar_download_delay','{$cfg['teamspeak_avatar_download_delay']}'),('webinterface_admin_client_unique_id_list','{$cfg['webinterface_admin_client_unique_id_list']}'),('teamspeak_chatcommand_prefix','{$cfg['teamspeak_chatcommand_prefix']}') ON DUPLICATE KEY UPDATE `value`=VALUES(`value`); DELETE FROM `$dbname`.`csrf_token` WHERE `token`='{$_POST['csrf_token']}'") === false) {
 			$err_msg = print_r($mysqlcon->errorInfo(), true);
 			$err_lvl = 3;
 		} else {
-			$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '&nbsp;&nbsp;<form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button
-			type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i>&nbsp;'.$lang['wibot7'].'</button></form>');
+			$err_msg = $lang['wisvsuc']." ".sprintf($lang['wisvres'], '<span class="item-margin"><form class="btn-group" name="restart" action="bot.php" method="POST"><input type="hidden" name="csrf_token" value="'.$csrf_token.'"><button
+			type="submit" class="btn btn-primary" name="restart"><i class="fas fa-sync"></i><span class="item-margin">'.$lang['wibot7'].'</span></button></form></span>');
 			$err_lvl = NULL;
 		}
 		
@@ -63,7 +72,7 @@ try {
 		exit;
 	}
 	?>
-			<div id="page-wrapper">
+			<div id="page-wrapper" class="webinterface_ts">
 	<?PHP if(isset($err_msg)) error_handling($err_msg, $err_lvl); ?>
 				<div class="container-fluid">
 					<div class="row">
@@ -175,7 +184,7 @@ try {
 										<div class="col-sm-8">
 											<select class="selectpicker show-tick form-control" id="basic" name="teamspeak_query_command_delay">
 											<?PHP
-											echo '<option data-icon="fas fa-ban" data-subtext="[recommended]" value="0"'; if($cfg['teamspeak_query_command_delay']=="0") echo ' selected="selected"'; echo '>&nbsp;disabled (Realtime)</option>';
+											echo '<option data-icon="fas fa-ban" data-subtext="[recommended]" value="0"'; if($cfg['teamspeak_query_command_delay']=="0") echo ' selected="selected"'; echo '><span class="item-margin">disabled (Realtime)</span></option>';
 											echo '<option data-divider="true">&nbsp;</option>';
 											echo '<option data-subtext="(0,2 seconds)" value="200000"'; if($cfg['teamspeak_query_command_delay']=="200000") echo ' selected="selected"'; echo '>Low delay</option>';
 											echo '<option data-subtext="(0,5 seconds)" value="500000"'; if($cfg['teamspeak_query_command_delay']=="500000") echo ' selected="selected"'; echo '>Middle delay</option>';
@@ -217,6 +226,13 @@ try {
 											</select>
 										</div>
 									</div>
+									<div class="form-group expertelement">
+										<label class="col-sm-4 control-label" data-toggle="modal" data-target="#wits3predesc"><?php echo $lang['wits3pre']; ?><i class="help-hover fas fa-question-circle"></i></label>
+										<div class="col-sm-8 required-field-block">
+											<input type="text" class="form-control required" name="teamspeak_chatcommand_prefix" value="<?php if(!isset($cfg['teamspeak_chatcommand_prefix']) || $cfg['teamspeak_chatcommand_prefix'] == NULL) { echo "!"; } else { echo $cfg['teamspeak_chatcommand_prefix']; } ?>" minlength="1" maxlength="30" required>
+											<div class="help-block with-errors"></div>
+										</div>
+									</div>
 									<?PHP } ?>
 								</div>
 							</div>
@@ -224,7 +240,7 @@ try {
 						<div class="row">&nbsp;</div>
 						<div class="row">
 							<div class="text-center">
-								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i>&nbsp;<?php echo $lang['wisvconf']; ?></button>
+								<button type="submit" class="btn btn-primary" name="update"><i class="fas fa-save"></i><span class="item-margin"><?php echo $lang['wisvconf']; ?></span></button>
 							</div>
 						</div>
 						<div class="row">&nbsp;</div>
@@ -408,6 +424,22 @@ try {
 		</div>
 	  </div>
 	</div>
+	<div class="modal fade" id="wits3predesc" tabindex="-1">
+	  <div class="modal-dialog">
+		<div class="modal-content">
+		  <div class="modal-header">
+			<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+			<h4 class="modal-title"><?php echo $lang['wits3pre']; ?></h4>
+		  </div>
+		  <div class="modal-body">
+			<?php echo $lang['wits3predesc']; ?>
+		  </div>
+		  <div class="modal-footer">
+			<button type="button" class="btn btn-default" data-dismiss="modal"><?PHP echo $lang['stnv0002']; ?></button>
+		  </div>
+		</div>
+	  </div>
+	</div>
 	<script>
 	$('form[data-toggle="validator"]').validator({
 		custom: {