release 1.1.2

This commit is contained in:
root
2016-10-30 21:38:27 +01:00
parent ab76128c42
commit 5620db46eb
39 changed files with 1687 additions and 415 deletions

View File

@@ -18,7 +18,7 @@ if($language == "ar") {
}
if(!isset($_SESSION['tsuid'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language);
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
function human_readable_size($bytes) {

View File

@@ -6,7 +6,7 @@ require_once('../other/config.php');
require_once('../other/session.php');
if(!isset($_SESSION['tsuid'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language);
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
require_once('nav.php');
?>

View File

@@ -23,7 +23,7 @@ function getclientip() {
}
if(!isset($_SESSION['tsuid'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language);
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
if(isset($_POST['username'])) {
@@ -114,7 +114,7 @@ $keyorder = '';
if (isset($_GET['sort'])) {
$keysort = strip_tags(htmlspecialchars($_GET['sort']));
}
if ($keysort != 'name' && $keysort != 'uuid' && $keysort != 'cldbid' && $keysort != 'rank' && $keysort != 'lastseen' && $keysort != 'count' && $keysort != 'idle' && $keysort != 'active') {
if ($keysort != 'name' && $keysort != 'uuid' && $keysort != 'cldbid' && $keysort != 'rank' && $keysort != 'lastseen' && $keysort != 'count' && $keysort != 'idle' && $keysort != 'active' && $keysort != 'grpsince') {
$keysort = 'nextup';
}
if (isset($_GET['order'])) {
@@ -142,24 +142,24 @@ if(!isset($_GET["user"])) {
$start = $seite * $user_pro_seite - $user_pro_seite;
if ($keysort == 'active' && $keyorder == 'asc') {
$dbdata = $mysqlcon->prepare("SELECT uuid,cldbid,rank,count,name,idle,cldgroup,online,nextup,lastseen,ip,grpid,except FROM $dbname.user WHERE (uuid LIKE :searchvalue OR cldbid LIKE :searchvalue OR name LIKE :searchvalue)$filter ORDER BY (count - idle) LIMIT :start, :userproseite");
$dbdata = $mysqlcon->prepare("SELECT uuid,cldbid,rank,count,name,idle,cldgroup,online,nextup,lastseen,ip,grpid,except,grpsince FROM $dbname.user WHERE (uuid LIKE :searchvalue OR cldbid LIKE :searchvalue OR name LIKE :searchvalue)$filter ORDER BY (count - idle) LIMIT :start, :userproseite");
$dbdata->bindValue(':searchvalue', '%'.$searchstring.'%', PDO::PARAM_STR);
$dbdata->bindValue(':start', (int) $start, PDO::PARAM_INT);
$dbdata->bindValue(':userproseite', (int) $user_pro_seite, PDO::PARAM_INT);
$dbdata->execute();
} elseif ($keysort == 'active' && $keyorder == 'desc') {
$dbdata = $mysqlcon->prepare("SELECT uuid,cldbid,rank,count,name,idle,cldgroup,online,nextup,lastseen,ip,grpid,except FROM $dbname.user WHERE (uuid LIKE :searchvalue OR cldbid LIKE :searchvalue OR name LIKE :searchvalue)$filter ORDER BY (idle - count) LIMIT :start, :userproseite");
$dbdata = $mysqlcon->prepare("SELECT uuid,cldbid,rank,count,name,idle,cldgroup,online,nextup,lastseen,ip,grpid,except,grpsince FROM $dbname.user WHERE (uuid LIKE :searchvalue OR cldbid LIKE :searchvalue OR name LIKE :searchvalue)$filter ORDER BY (idle - count) LIMIT :start, :userproseite");
$dbdata->bindValue(':searchvalue', '%'.$searchstring.'%', PDO::PARAM_STR);
$dbdata->bindValue(':start', (int) $start, PDO::PARAM_INT);
$dbdata->bindValue(':userproseite', (int) $user_pro_seite, PDO::PARAM_INT);
$dbdata->execute();
} elseif ($searchstring == '') {
$dbdata = $mysqlcon->prepare("SELECT uuid,cldbid,rank,count,name,idle,cldgroup,online,nextup,lastseen,ip,grpid,except FROM $dbname.user WHERE 1=1$filter ORDER BY $keysort $keyorder LIMIT :start, :userproseite");
$dbdata = $mysqlcon->prepare("SELECT uuid,cldbid,rank,count,name,idle,cldgroup,online,nextup,lastseen,ip,grpid,except,grpsince FROM $dbname.user WHERE 1=1$filter ORDER BY $keysort $keyorder LIMIT :start, :userproseite");
$dbdata->bindValue(':start', (int) $start, PDO::PARAM_INT);
$dbdata->bindValue(':userproseite', (int) $user_pro_seite, PDO::PARAM_INT);
$dbdata->execute();
} else {
$dbdata = $mysqlcon->prepare("SELECT uuid,cldbid,rank,count,name,idle,cldgroup,online,nextup,lastseen,ip,grpid,except FROM $dbname.user WHERE (uuid LIKE :searchvalue OR cldbid LIKE :searchvalue OR name LIKE :searchvalue)$filter ORDER BY $keysort $keyorder LIMIT :start, :userproseite");
$dbdata = $mysqlcon->prepare("SELECT uuid,cldbid,rank,count,name,idle,cldgroup,online,nextup,lastseen,ip,grpid,except,grpsince FROM $dbname.user WHERE (uuid LIKE :searchvalue OR cldbid LIKE :searchvalue OR name LIKE :searchvalue)$filter ORDER BY $keysort $keyorder LIMIT :start, :userproseite");
$dbdata->bindValue(':searchvalue', '%'.$searchstring.'%', PDO::PARAM_STR);
$dbdata->bindValue(':start', (int) $start, PDO::PARAM_INT);
$dbdata->bindValue(':userproseite', (int) $user_pro_seite, PDO::PARAM_INT);
@@ -213,7 +213,8 @@ foreach($uuids as $uuid) {
"lastseen" => $uuid['lastseen'],
"ip" => $uuid['ip'],
"grpid" => $uuid['grpid'],
"except" => $uuid['except']
"except" => $uuid['except'],
"grpsince" => $uuid['grpsince']
);
$uidarr[] = $uuid['uuid'];
$countentries = $countentries + 1;
@@ -257,7 +258,8 @@ if($adminlogin == 1) {
<?PHP if(isset($err_msg)) error_handling($err_msg, 3); ?>
<div class="container-fluid">
<?PHP
if($user_pro_seite != "all") {
if($user_pro_seite == "all" || $shownav == 0) {
} else {
pagination($keysort,$keyorder,$user_pro_seite,$seiten_anzahl_gerundet,$seite,$getstring);
}
?>
@@ -286,6 +288,8 @@ if($adminlogin == 1) {
echo '<th class="text-center"><a href="?sort=active&amp;order=' , $keyorder2 , '&amp;seite=' , $seite , '&amp;user=' , $user_pro_seite , '&amp;search=' , $getstring , '"><span class="hdcolor">' , $lang['listsuma'] , '</span></a></th>';
if ($showcolas == 1 || $adminlogin == 1)
echo '<th class="text-center"><a href="?sort=grpid&amp;order=' , $keyorder2 , '&amp;seite=' , $seite , '&amp;user=' , $user_pro_seite , '&amp;search=' , $getstring , '"><span class="hdcolor">' , $lang['listacsg'] , '</span></a></th>';
if ($showgrpsince == 1 || $adminlogin == 1)
echo '<th class="text-center"><a href="?sort=grpsince&amp;order=' , $keyorder2 , '&amp;seite=' , $seite , '&amp;user=' , $user_pro_seite , '&amp;search=' , $getstring , '"><span class="hdcolor">' , $lang['listgrps'] , '</span></a></th>';
if ($showcolnx == 1 || $adminlogin == 1)
echo ($keysort == 'nextup') ? '<th class="text-center"><a href="?sort=nextup&amp;order=' . $keyorder2 . '&amp;seite=' . $seite . '&amp;user=' . $user_pro_seite . '&amp;search=' . $getstring . '"><span class="hdcolor">' . $lang['listnxup'] . '</span></a></th>' : '<th class="text-center"><a href="?sort=nextup&amp;order=' . $keyorder2 . '&amp;seite=' . $seite . '&amp;user=' . $user_pro_seite . '&amp;search=' . $getstring . '"><span class="hdcolor">' . $lang['listnxup'] . '</span></a></th>';
if ($showcolsg == 1 || $adminlogin == 1)
@@ -384,6 +388,13 @@ if($adminlogin == 1) {
echo '<td class="text-center">' , $sqlhisgroup[$usergroupid] , '</td>';
}
}
if ($showgrpsince == 1 || $adminlogin == 1) {
if ($sqlhis[$uid]['grpsince'] == 0) {
echo '<td class="text-center"></td>';
} else {
echo '<td class="text-center">' , date('Y-m-d H:i:s',$sqlhis[$uid]['grpsince']), '</td>';
}
}
if ($showcolnx == 1 || $adminlogin == 1) {
echo '<td class="text-center">';
$dtF = new DateTime("@0");
@@ -407,8 +418,10 @@ if($adminlogin == 1) {
echo '<td class="text-center"><em>',$lang['listexcept'],'</em></td>';
} elseif (isset($sqlhisgroup_file[$groupid]) && $sqlhisgroup_file[$groupid]===true) {
echo '<td class="text-center"><img src="../icons/'.$groupid.'.png" alt="groupicon">&nbsp;&nbsp;' , $sqlhisgroup[$groupid] , '</td>';
} else {
} elseif (isset($sqlhisgroup[$groupid])) {
echo '<td class="text-center">' , $sqlhisgroup[$groupid] , '</td>';
} else {
echo '<td class="text-center"></td>';
}
}
echo '</tr>';

View File

@@ -4,7 +4,7 @@ require_once('../other/config.php');
require_once('../other/session.php');
if(!isset($_SESSION['tsuid'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language);
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
$getstring = $_SESSION['tsuid'];

View File

@@ -15,6 +15,7 @@
<link href="../bootstrap/addons/morris/morris.css" rel="stylesheet">
<link href="../bootstrap/addons/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="../bootstrap/flag_icon/css/flag-icon.min.css" rel="stylesheet">
<link href="../bootstrap/css/custom.css" rel="stylesheet">
<script src="../jquerylib/jquery.js"></script>
@@ -22,7 +23,13 @@
<script src="../bootstrap/addons/morris/raphael.min.js"></script>
<script src="../bootstrap/addons/morris/morris.min.js"></script>
<!--<script src="../bootstrap/addons/morris/morris-data.js"></script>-->
<?PHP
if(isset($shownav) && $shownav == 0) { ?>
<style>
body{margin-top:0px!important}
.fixed{top:0px!important;width:calc(100% - 50px)!important;position:fixed;display:none;color:#000;background-color:#fff!important;}
</style>
<?PHP } ?>
</head>
<body>
<div id="myModal" class="modal fade">
@@ -157,6 +164,9 @@
</div>
</div>
</div>
<?PHP
if($shownav == 1) {
?>
<div id="wrapper">
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-header">
@@ -207,7 +217,23 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><?PHP echo '&nbsp;&nbsp;' .($_SESSION['connected'] == 0 ? $lang['stnv0028'] : $_SESSION['tsname']); ?>&nbsp;<b class="caret"></b></a>
<ul class="dropdown-menu">
<?PHP echo (!isset($_SESSION['tsname']) ? ' ' : '<li><a href="my_stats.php"><i class="fa fa-fw fa-user"></i>&nbsp;'.$lang['stmy0001'].'</a></li>'); ?>
<?PHP
if(isset($_SESSION['admin'])) {
echo '<li><a href="http',(!empty($_SERVER['HTTPS'])?'s':''),'://',$_SERVER['SERVER_NAME'],substr(dirname($_SERVER['SCRIPT_NAME']),0,-5),'webinterface/ts.php"><i class="fa fa-fw fa-wrench"></i>&nbsp;',$lang['wi'],'</a></li>';
} elseif ($_SESSION['connected'] == 0) {
echo '<li><a href="ts3server://';
if (($ts['host']=='localhost' || $ts['host']=='127.0.0.1') && strpos($_SERVER['HTTP_HOST'], 'www.') == 0) {
echo preg_replace('/www\./','',$_SERVER['HTTP_HOST']);
} elseif ($ts['host']=='localhost' || $ts['host']=='127.0.0.1') {
echo $_SERVER['HTTP_HOST'];
} else {
echo $ts['host'];
}
echo ':'.$ts['voice'];
echo '"><i class="fa fa-fw fa-headphones"></i>&nbsp;'.$lang['stnv0043'].'</a></li>';
}
echo (!isset($_SESSION['tsname']) ? ' ' : '<li><a href="my_stats.php"><i class="fa fa-fw fa-user"></i>&nbsp;'.$lang['stmy0001'].'</a></li>');
?>
<li>
<a href="#myModal" data-toggle="modal"><i class="fa fa-fw fa-envelope"></i>&nbsp;<?PHP echo $lang['stnv0001']; ?></a>
</li>
@@ -282,6 +308,11 @@
</div>
</nav>
<?PHP
} else {
echo '<div id="container">';
}
function error_handling($msg,$type = NULL) {
switch ($type) {
case NULL: echo '<div class="alert alert-success alert-dismissible">'; break;

View File

@@ -6,7 +6,7 @@ require_once('../other/config.php');
require_once('../other/session.php');
if(!isset($_SESSION['tsuid'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language);
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
if ($substridle == 1) {

View File

@@ -6,7 +6,7 @@ require_once('../other/config.php');
require_once('../other/session.php');
if(!isset($_SESSION['tsuid'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language);
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
if ($substridle == 1) {

View File

@@ -6,7 +6,7 @@ require_once('../other/config.php');
require_once('../other/session.php');
if(!isset($_SESSION['tsuid'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language);
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
if ($substridle == 1) {