release 1.2.3

This commit is contained in:
Newcomer1989
2017-12-24 14:52:25 +01:00
parent 45220099c3
commit c7fb3673df
39 changed files with 1655 additions and 657 deletions

View File

@@ -30,7 +30,7 @@ if(count($multiple_uuid) > 1 and !isset($_SESSION['uuid_verified'])) {
$servergroups = $dbgroups->fetchAll(PDO::FETCH_ASSOC);
foreach($servergroups as $servergroup) {
$sqlhisgroup[$servergroup['sgid']] = $servergroup['sgidname'];
if(file_exists('../icons/'.$servergroup['sgid'].'.png')) {
if(file_exists('../tsicons/'.$servergroup['sgid'].'.png')) {
$sqlhisgroup_file[$servergroup['sgid']] = true;
} else {
$sqlhisgroup_file[$servergroup['sgid']] = false;
@@ -112,7 +112,7 @@ require_once('nav.php');
<div class="form-group">
<?PHP if (isset($sqlhisgroup_file[$allowed_group]) && $sqlhisgroup_file[$allowed_group]===true) { ?>
<label class="col-sm-5 control-label"><?php echo $sqlhisgroup[$allowed_group]; ?></label>
<label class="col-sm-1 control-label"><img src="../icons/<?PHP echo $allowed_group; ?>.png" alt="groupicon"></label>
<label class="col-sm-1 control-label"><img src="../tsicons/<?PHP echo $allowed_group; ?>.png" alt="groupicon"></label>
<label class="col-sm-2 control-label"></label>
<?PHP } else { ?>
<label class="col-sm-5 control-label"><?php echo $sqlhisgroup[$allowed_group]; ?></label>
@@ -120,9 +120,9 @@ require_once('nav.php');
<?PHP } ?>
<div class="col-sm-2">
<?PHP if(in_array($allowed_group, $cld_groups)) {
echo '<input id="switch-animate" type="checkbox" checked data-size="mini" name="',$allowed_group,'" value="',$msgtouser,'">';
echo '<input type="checkbox" checked data-size="mini" name="',$allowed_group,'" value="1">';
} else {
echo '<input id="switch-animate" type="checkbox" data-size="mini" name="',$allowed_group,'" value="',$msgtouser,'">';
echo '<input type="checkbox" data-size="mini" name="',$allowed_group,'" value="1">';
} ?>
</div>
</div>

View File

@@ -16,20 +16,24 @@ if($language == "ar") {
require_once('../languages/nations_fr.php');
} elseif($language == "it") {
require_once('../languages/nations_it.php');
} elseif($language == "nl") {
require_once('../languages/nations_en.php');
} elseif($language == "ro") {
require_once('../languages/nations_en.php');
} elseif($language == "ru") {
require_once('../languages/nations_ru.php');
} elseif($language == "pt") {
require_once('../languages/nations_pt.php');
}
if(!isset($_SESSION['tsuid'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
function human_readable_size($bytes) {
$size = array(' B',' KiB',' MiB',' GiB',' TiB',' PiB',' EiB',' ZiB',' YiB');
function human_readable_size($bytes,$lang) {
$size = array($lang['size_byte'],$lang['size_kib'],$lang['size_mib'],$lang['size_gib'],$lang['size_tib'],$lang['size_pib'],$lang['size_eib'],$lang['size_zib'],$lang['size_yib']);
$factor = floor((strlen($bytes) - 1) / 3);
return sprintf("%.2f", $bytes / pow(1024, $factor)) . @$size[$factor];
return sprintf("%.2f", $bytes / pow(1024, $factor)) . ' ' . @$size[$factor];
}
$sql = $mysqlcon->query("SELECT * FROM $dbname.stats_server");
@@ -357,15 +361,15 @@ require_once('nav.php');
</tr>
<tr>
<td><?PHP echo $lang['stix0028']; ?></td>
<td><?PHP if($sql_res[0]['server_status'] == 0) { echo '-';} else { echo $sql_res[0]['server_ping'] . ' ms';} ?></td>
<td><?PHP if($sql_res[0]['server_status'] == 0) { echo '-';} else { echo $sql_res[0]['server_ping'] . ' ' . $lang['time_ms'];} ?></td>
</tr>
<tr>
<td><?PHP echo $lang['stix0029']; ?></td>
<td><?PHP echo human_readable_size($sql_res[0]['server_bytes_down']); ?></td>
<td><?PHP echo human_readable_size($sql_res[0]['server_bytes_down'],$lang); ?></td>
</tr>
<tr>
<td><?PHP echo $lang['stix0030']; ?></td>
<td><?PHP echo human_readable_size($sql_res[0]['server_bytes_up']); ?></td>
<td><?PHP echo human_readable_size($sql_res[0]['server_bytes_up'],$lang); ?></td>
</tr>
<tr>
<td><?PHP echo $lang['stix0031']; ?></td>
@@ -386,9 +390,9 @@ require_once('nav.php');
<tbody>
<tr>
<td><?PHP echo $lang['stix0036']; ?></td>
<td><?PHP if(file_exists("../icons/servericon.png")) {
$img_content = file_get_contents("../icons/servericon.png");
echo $sql_res[0]['server_name'] .'<div class="pull-right"><img src="data:image/',mime_content_type("../icons/servericon.png"),';base64,'.base64_encode($img_content).'" alt="servericon"></div>';
<td><?PHP if(file_exists("../tsicons/servericon.png")) {
$img_content = file_get_contents("../tsicons/servericon.png");
echo $sql_res[0]['server_name'] .'<div class="pull-right"><img src="data:image;',mime_content_type("../tsicons/servericon.png"),';base64,'.base64_encode($img_content).'" alt="servericon"></div>';
} else { echo $sql_res[0]['server_name']; } ?></td>
</tr>
<tr>
@@ -555,7 +559,7 @@ require_once('nav.php');
} elseif ($usage == 'year') {
$server_usage = $mysqlcon->query("SELECT u1.timestamp, u1.clients, u1.channel FROM (SELECT @a:=@a+1,mod(@a,64) AS test,timestamp,clients,channel FROM $dbname.server_usage) AS u2, $dbname.server_usage AS u1 WHERE u1.timestamp=u2.timestamp AND u2.test='1' ORDER BY u2.timestamp DESC LIMIT 548");
} else {
$server_usage = $mysqlcon->query("SELECT u1.timestamp, u1.clients, u1.channel FROM (SELECT timestamp,clients,channel FROM $dbname.server_usage) AS u2, $dbname.server_usage AS u1 WHERE u1.timestamp=u2.timestamp ORDER BY u2.timestamp DESC LIMIT 96");
$server_usage = $mysqlcon->query("SELECT timestamp, clients, channel FROM $dbname.server_usage ORDER BY timestamp DESC LIMIT 96");
}
$server_usage = $server_usage->fetchAll(PDO::FETCH_ASSOC);
foreach($server_usage as $chart_value) {
@@ -572,7 +576,7 @@ require_once('nav.php');
hideHover: 'auto',
hoverCallback:
function (index, options, content, row) {
return "<b>" + row.y + "</b><br><div class='morris-hover-point' style='color:#2677B5'>Clients: " + row.a + "</div><div class='morris-hover-point' style='color:#868F96'>Channel: " + (row.b + row.a) + "</div>";
return "<b>" + row.y + "</b><br><div class='morris-hover-point text-primary'>Clients: " + row.a + "</div><div class='morris-hover-point text-muted'>Channel: " + (row.b + row.a) + "</div>";
} ,
labels: ['Clients', 'Channel']
});

View File

@@ -77,6 +77,7 @@ require_once('nav.php');
<p><?PHP echo $lang['stri0017']; ?></p>
<p><?PHP echo $lang['stri0018']; ?></p>
<p><?PHP echo $lang['stri0019']; ?></p>
<p><?PHP echo $lang['stri0020']; ?></p>
<br>
</div>
</div>

View File

@@ -78,17 +78,19 @@ if(isset($getstring) && strstr($getstring, 'filter:country:')) {
if(isset($getstring) && strstr($getstring, 'filter:lastseen:')) {
preg_match('/filter\:lastseen\:(.*)\:(.*)\:/',$searchstring,$seenvalue);
$searchstring = preg_replace('/filter\:lastseen\:(.*)\:(.*)\:/','',$searchstring);
if(is_numeric($seenvalue[2])) {
if(isset($seenvalue[2]) && is_numeric($seenvalue[2])) {
$lastseen = $seenvalue[2];
} else {
} elseif(isset($seenvalue[2])) {
$r = date_parse_from_format("Y-m-d H-i",$seenvalue[2]);
$lastseen = mktime($r['hour'], $r['minute'], $r['second'], $r['month'], $r['day'], $r['year']);
} else {
$lastseen = 0;
}
if($seenvalue[1] == '&lt;' || $seenvalue[1] == '<') {
if(isset($seenvalue[1]) && ($seenvalue[1] == '&lt;' || $seenvalue[1] == '<')) {
$operator = '<';
} elseif($seenvalue[1] == '&gt;' || $seenvalue[1] == '>') {
} elseif(isset($seenvalue[1]) && ($seenvalue[1] == '&gt;' || $seenvalue[1] == '>')) {
$operator = '>';
} elseif($seenvalue[1] == '!=') {
} elseif(isset($seenvalue[1]) && $seenvalue[1] == '!=') {
$operator = '!=';
} else {
$operator = '=';
@@ -116,7 +118,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' && $keysort != 'grpsince') {
if ($keysort != 'name' && $keysort != 'uuid' && $keysort != 'cldbid' && $keysort != 'rank' && $keysort != 'lastseen' && $keysort != 'count' && $keysort != 'idle' && $keysort != 'active' && $keysort != 'grpid' && $keysort != 'grpsince') {
$keysort = 'nextup';
}
if (isset($_GET['order'])) {
@@ -232,7 +234,7 @@ $dbgroups = $mysqlcon->query("SELECT * FROM $dbname.groups");
$servergroups = $dbgroups->fetchAll(PDO::FETCH_ASSOC);
foreach($servergroups as $servergroup) {
$sqlhisgroup[$servergroup['sgid']] = $servergroup['sgidname'];
if(file_exists('../icons/'.$servergroup['sgid'].'.png')) {
if(file_exists('../tsicons/'.$servergroup['sgid'].'.png')) {
$sqlhisgroup_file[$servergroup['sgid']] = true;
} else {
$sqlhisgroup_file[$servergroup['sgid']] = false;
@@ -384,7 +386,7 @@ if($adminlogin == 1) {
if ($sqlhis[$uid]['grpid'] == 0) {
echo '<td class="text-center"></td>';
} elseif ($sqlhisgroup_file[$sqlhis[$uid]['grpid']]===true) {
echo '<td class="text-center"><img src="../icons/'.$sqlhis[$uid]['grpid'].'.png" alt="groupicon">&nbsp;&nbsp;' , $sqlhisgroup[$usergroupid] , '</td>';
echo '<td class="text-center"><img src="../tsicons/'.$sqlhis[$uid]['grpid'].'.png" alt="groupicon">&nbsp;&nbsp;' , $sqlhisgroup[$usergroupid] , '</td>';
} else {
echo '<td class="text-center">' , $sqlhisgroup[$usergroupid] , '</td>';
}
@@ -418,7 +420,7 @@ if($adminlogin == 1) {
} elseif ($except == 2 || $except == 3) {
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>';
echo '<td class="text-center"><img src="../tsicons/'.$groupid.'.png" alt="groupicon">&nbsp;&nbsp;' , $sqlhisgroup[$groupid] , '</td>';
} elseif (isset($sqlhisgroup[$groupid])) {
echo '<td class="text-center">' , $sqlhisgroup[$groupid] , '</td>';
} else {

View File

@@ -10,91 +10,99 @@ if(!isset($_SESSION['tsuid']) || isset($_SESSION['uuid_verified'])) {
set_session_ts3($ts['voice'], $mysqlcon, $dbname, $language, $adminuuid);
}
$getstring = $_SESSION['tsuid'];
$searchmysql = 'WHERE uuid LIKE \'%'.$getstring.'%\'';
$multiple_uuid = explode(',', substr($_SESSION['multiple'], 0, -1));
$dbdata = $mysqlcon->query("SELECT * FROM $dbname.user $searchmysql");
$dbdata_fetched = $dbdata->fetchAll();
$count_hours = round($dbdata_fetched[0]['count']/3600);
$idle_hours = round($dbdata_fetched[0]['idle']/3600);
$except = $dbdata_fetched[0]['except'];
if ($substridle == 1) {
$activetime = $dbdata_fetched[0]['count'] - $dbdata_fetched[0]['idle'];
if(count($multiple_uuid) > 1 and !isset($_SESSION['uuid_verified'])) {
$err_msg = sprintf($lang['stag0006'], '<a href="verify.php">', '</a>'); $err_lvl = 3;
} else {
$activetime = $dbdata_fetched[0]['count'];
}
$active_count = $dbdata_fetched[0]['count'] - $dbdata_fetched[0]['idle'];
krsort($grouptime);
$grpcount = 0;
$nextgrp = '';
$getstring = $_SESSION['tsuid'];
$searchmysql = 'WHERE uuid LIKE \'%'.$getstring.'%\'';
foreach ($grouptime as $time => $groupid) {
$grpcount++;
$actualgrp = $time;
if ($activetime > $time) {
break;
$dbdata = $mysqlcon->query("SELECT * FROM $dbname.user $searchmysql");
$dbdata_fetched = $dbdata->fetchAll();
$count_hours = round($dbdata_fetched[0]['count']/3600);
$idle_hours = round($dbdata_fetched[0]['idle']/3600);
$except = $dbdata_fetched[0]['except'];
if ($substridle == 1) {
$activetime = $dbdata_fetched[0]['count'] - $dbdata_fetched[0]['idle'];
} else {
$nextup = $time - $activetime;
$nextgrp = $time;
$activetime = $dbdata_fetched[0]['count'];
}
}
if($actualgrp==$nextgrp) {
$actualgrp = 0;
}
if($activetime>$nextgrp) {
$percentage_rankup = 100;
} else {
$takedtime = $activetime - $actualgrp;
$neededtime = $nextgrp - $actualgrp;
$percentage_rankup = round($takedtime/$neededtime*100);
}
$active_count = $dbdata_fetched[0]['count'] - $dbdata_fetched[0]['idle'];
$stats_user = $mysqlcon->query("SELECT * FROM $dbname.stats_user WHERE uuid='$getstring'");
$stats_user = $stats_user->fetchAll();
krsort($grouptime);
$grpcount = 0;
$nextgrp = '';
if (isset($stats_user[0]['count_week'])) $count_week = $stats_user[0]['count_week']; else $count_week = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$count_week"); $count_week = $dtF->diff($dtT)->format($timeformat);
if (isset($stats_user[0]['active_week'])) $active_week = $stats_user[0]['active_week']; else $active_week = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$active_week"); $active_week = $dtF->diff($dtT)->format($timeformat);
if (isset($stats_user[0]['count_month'])) $count_month = $stats_user[0]['count_month']; else $count_month = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$count_month"); $count_month = $dtF->diff($dtT)->format($timeformat);
if (isset($stats_user[0]['active_month'])) $active_month = $stats_user[0]['active_month']; else $active_month = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$active_month"); $active_month = $dtF->diff($dtT)->format($timeformat);
if (isset($dbdata_fetched[0]['count'])) $count_total = $dbdata_fetched[0]['count']; else $count_total = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$count_total"); $count_total = $dtF->diff($dtT)->format($timeformat);
$dtF = new DateTime("@0"); $dtT = new DateTime("@$active_count"); $active_count = $dtF->diff($dtT)->format($timeformat);
foreach ($grouptime as $time => $groupid) {
$grpcount++;
$actualgrp = $time;
if ($activetime > $time) {
break;
} else {
$nextup = $time - $activetime;
$nextgrp = $time;
}
}
if($actualgrp==$nextgrp) {
$actualgrp = 0;
}
if($activetime>$nextgrp) {
$percentage_rankup = 100;
} else {
$takedtime = $activetime - $actualgrp;
$neededtime = $nextgrp - $actualgrp;
$percentage_rankup = round($takedtime/$neededtime*100);
}
$time_for_bronze = 50;
$time_for_silver = 100;
$time_for_gold = 250;
$time_for_legendary = 500;
$stats_user = $mysqlcon->query("SELECT * FROM $dbname.stats_user WHERE uuid='$getstring'");
$stats_user = $stats_user->fetchAll();
$connects_for_bronze = 50;
$connects_for_silver = 100;
$connects_for_gold = 250;
$connects_for_legendary = 500;
if (isset($stats_user[0]['count_week'])) $count_week = $stats_user[0]['count_week']; else $count_week = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$count_week"); $count_week = $dtF->diff($dtT)->format($timeformat);
if (isset($stats_user[0]['active_week'])) $active_week = $stats_user[0]['active_week']; else $active_week = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$active_week"); $active_week = $dtF->diff($dtT)->format($timeformat);
if (isset($stats_user[0]['count_month'])) $count_month = $stats_user[0]['count_month']; else $count_month = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$count_month"); $count_month = $dtF->diff($dtT)->format($timeformat);
if (isset($stats_user[0]['active_month'])) $active_month = $stats_user[0]['active_month']; else $active_month = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$active_month"); $active_month = $dtF->diff($dtT)->format($timeformat);
if (isset($dbdata_fetched[0]['count'])) $count_total = $dbdata_fetched[0]['count']; else $count_total = 0;
$dtF = new DateTime("@0"); $dtT = new DateTime("@$count_total"); $count_total = $dtF->diff($dtT)->format($timeformat);
$dtF = new DateTime("@0"); $dtT = new DateTime("@$active_count"); $active_count = $dtF->diff($dtT)->format($timeformat);
$achievements_done = 0;
$time_for_bronze = 50;
$time_for_silver = 100;
$time_for_gold = 250;
$time_for_legendary = 500;
if($count_hours >= $time_for_legendary) {
$achievements_done = $achievements_done + 4;
} elseif($count_hours >= $time_for_gold) {
$achievements_done = $achievements_done + 3;
} elseif($count_hours >= $time_for_silver) {
$achievements_done = $achievements_done + 2;
} else {
$achievements_done = $achievements_done + 1;
}
if($_SESSION['tsconnections'] >= $connects_for_legendary) {
$achievements_done = $achievements_done + 4;
} elseif($_SESSION['tsconnections'] >= $connects_for_gold) {
$achievements_done = $achievements_done + 3;
} elseif($_SESSION['tsconnections'] >= $connects_for_silver) {
$achievements_done = $achievements_done + 2;
} else {
$achievements_done = $achievements_done + 1;
$connects_for_bronze = 50;
$connects_for_silver = 100;
$connects_for_gold = 250;
$connects_for_legendary = 500;
$achievements_done = 0;
if($count_hours >= $time_for_legendary) {
$achievements_done = $achievements_done + 4;
} elseif($count_hours >= $time_for_gold) {
$achievements_done = $achievements_done + 3;
} elseif($count_hours >= $time_for_silver) {
$achievements_done = $achievements_done + 2;
} else {
$achievements_done = $achievements_done + 1;
}
if($_SESSION['tsconnections'] >= $connects_for_legendary) {
$achievements_done = $achievements_done + 4;
} elseif($_SESSION['tsconnections'] >= $connects_for_gold) {
$achievements_done = $achievements_done + 3;
} elseif($_SESSION['tsconnections'] >= $connects_for_silver) {
$achievements_done = $achievements_done + 2;
} else {
$achievements_done = $achievements_done + 1;
}
}
function get_percentage($max_value, $value) {
@@ -103,7 +111,8 @@ function get_percentage($max_value, $value) {
require_once('nav.php');
?>
<div id="page-wrapper">
<?PHP if(isset($err_msg)) error_handling($err_msg, 3); ?>
<?PHP if(isset($err_msg)) error_handling($err_msg, 3);
if(count($multiple_uuid) > 1) { echo "</div></div></body></html>"; exit; } ?>
<div class="container-fluid">
<!-- Page Heading -->
@@ -357,7 +366,7 @@ require_once('nav.php');
</div>
</div>
<div class="progress">
<div class="progress-bar progress-bar-warning progress-bar-striped active role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 15em; width:<?PHP echo get_percentage($connects_for_bronze, $_SESSION['tsconnections']); ?>%;">
<div class="progress-bar progress-bar-warning progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="min-width: 15em; width:<?PHP echo get_percentage($connects_for_bronze, $_SESSION['tsconnections']); ?>%;">
<?PHP echo get_percentage($connects_for_bronze, $_SESSION['tsconnections']),$lang['stmy0022']; ?>
</div>
</div>

View File

@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html>
<html lang="<?PHP echo $language; ?>">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="version" content="<?PHP echo $currvers; ?>">
<link rel="icon" href="../icons/rs.png">
<link rel="icon" href="../tsicons/rs.png">
<title>TS-N.NET Ranksystem</title>
<link href="../libs/combined_stats.css?v=<?PHP echo $currvers; ?>" rel="stylesheet">
<script src="../libs/combined_stats.js?v=<?PHP echo $currvers; ?>"></script>
<link href="../libs/combined_st.css?v=<?PHP echo $currvers; ?>" rel="stylesheet">
<script src="../libs/combined_st.js?v=<?PHP echo $currvers; ?>"></script>
<?PHP
if(isset($shownav) && $shownav == 0) { ?>
<style>
@@ -250,16 +250,19 @@
<a href="?lang=fr"><span class="flag-icon flag-icon-fr"></span>&nbsp;&nbsp;FR - français</a>
</li>
<li>
<a href="?lang=it"><span class="flag-icon flag-icon-it"></span>&nbsp;&nbsp;IT - italiano</a>
<a href="?lang=it"><span class="flag-icon flag-icon-it"></span>&nbsp;&nbsp;IT - Italiano</a>
</li>
<li>
<a href="?lang=it"><span class="flag-icon flag-icon-nl"></span>&nbsp;&nbsp;NL - Nederlands</a>
<a href="?lang=nl"><span class="flag-icon flag-icon-nl"></span>&nbsp;&nbsp;NL - Nederlands</a>
</li>
<li>
<a href="?lang=ro"><span class="flag-icon flag-icon-ro"></span>&nbsp;&nbsp;RO - românesc</a>
<a href="?lang=ro"><span class="flag-icon flag-icon-ro"></span>&nbsp;&nbsp;RO - Română</a>
</li>
<li>
<a href="?lang=ru"><span class="flag-icon flag-icon-ru"></span>&nbsp;&nbsp;RU - русский</a>
<a href="?lang=ru"><span class="flag-icon flag-icon-ru"></span>&nbsp;&nbsp;RU - Pусский</a>
</li>
<li>
<a href="?lang=pt"><span class="flag-icon flag-icon-ptbr"></span>&nbsp;&nbsp;PT - Português</a>
</li>
</ul>
</li>