mirror of
https://github.com/easy-wi/developer.git
synced 2025-02-20 11:23:28 +08:00
#30 New theme based on Bootstrap3
statuscheck adds missing stats entries ajax corrected for datatables remove not needed code from userpanel_home not needed toggle attributes removed from user header
This commit is contained in:
Ulrich Block
parent
e60300039e
commit
d01ae7f165
14
web/ajax.php
14
web/ajax.php
@ -67,7 +67,7 @@ if ($ui->smallletters('w', 9, 'get') == 'datatable') {
|
||||
$array = array('iTotalRecords' => 0, 'iTotalDisplayRecords' => 0, 'aaData' => array());
|
||||
|
||||
$iDisplayStart = ($ui->isinteger('iDisplayStart', 'get')) ? $ui->isinteger('iDisplayStart', 'get') : 0;
|
||||
$iDisplayLength = ($ui->isinteger('iDisplayLength', 'get') and $ui->isinteger('iDisplayLength', 'get') < 51) ? $ui->isinteger('iDisplayLength', 'get') : 10;
|
||||
$iDisplayLength = ($ui->isinteger('iDisplayLength', 'get')) ? $ui->isinteger('iDisplayLength', 'get') : 10;
|
||||
$iSortCol = ($ui->isinteger('iSortCol_0', 'get')) ? $ui->isinteger('iSortCol_0', 'get') : 0;
|
||||
$sSortDir = ($ui->smallletters('sSortDir_0', 4, 'get') == 'desc') ? 'DESC' : 'ASC';
|
||||
$sSearch = (strlen($ui->escaped('sSearch', 'get')) > 0) ? $ui->escaped('sSearch', 'get') : false;
|
||||
@ -77,10 +77,10 @@ if ($ui->smallletters('w', 9, 'get') == 'datatable') {
|
||||
$sprache = getlanguagefile('logs', $user_language, $reseller_id);
|
||||
$gssprache = getlanguagefile('gserver', $user_language, $reseller_id);
|
||||
|
||||
$placeholders = array('%%', '%add%', '%dl%', '%del%', '%md%', '%mod%', '%start%', '%restart%', '%stop%', '%upd%', '%fail%', '%ok%', '%psw%', '%cfg%', '%import%', '%reinstall%', '%backup%', '%use%');
|
||||
$replace = array('', $gsprache->add.': ',$gsprache->del.': ',$gsprache->del.': ',$gsprache->mod.': ',$gsprache->mod.': ',$gsprache->start.': ',$gsprache->start.': ',$gsprache->stop.': ',$gsprache->update.': ','','',$gssprache->password.': ',$gssprache->config.': ',$gsprache->import.': ',$gssprache->reinstall.': ',$gsprache->backup,$gsprache->use.': ');
|
||||
$placeholders2 = array('%voserver%', '%gserver%', '%user%', '%fastdl%', '%master%', '%user%', '%root%', '%addon%', '%settings%', '%vserver%', '%ticket_subject%', '%reseller%', '%virtual%', '%eac%', '%resync%', '%virtualimage%', '%template%', '%voserver%', '%emailsettings%', '%dns%', '%tsdns%', '%pmode%');
|
||||
$replace2 = array($gsprache->voiceserver,$gsprache->gameserver,$gsprache->user,$gsprache->fastdownload,$gsprache->master,$gsprache->user,$gsprache->root,$gsprache->addon2,$gsprache->settings,$gsprache->virtual,$gsprache->support,$gsprache->reseller,$gsprache->hostsystem,'Easy Anti Cheat',$gssprache->resync,$gsprache->virtual . ' ' . $gsprache->template,$gsprache->template,$gsprache->voiceserver,'E-Mail '.$gsprache->settings,'TSDNS','TSDNS',$gssprache->protect);
|
||||
$placeholders = array('%%', '%ad%', '%add%', '%dl%', '%del%', '%md%', '%mod%', '%start%', '%restart%', '%stop%', '%upd%', '%fail%', '%ok%', '%psw%', '%cfg%', '%import%', '%reinstall%', '%backup%', '%use%');
|
||||
$replace = array('', $gsprache->add, $gsprache->add, $gsprache->del, $gsprache->del, $gsprache->mod, $gsprache->mod, $gsprache->start, $gsprache->start, $gsprache->stop, $gsprache->update,'','', $gssprache->password, $gssprache->config, $gsprache->import, $gssprache->reinstall, $gsprache->backup, $gsprache->use);
|
||||
$placeholders2 = array('%voserver%', '%gserver%', '%user%', '%fastdl%', '%master%', '%user%', '%root%', '%addon%', '%settings%', '%vserver%', '%ticket_subject%', '%reseller%', '%virtual%', '%eac%', '%resync%', '%virtualimage%', '%template%', '%voserver%', '%emailsettings%', '%dns%', '%tsdns%', '%pmode%', '%file%');
|
||||
$replace2 = array($gsprache->voiceserver, $gsprache->gameserver, $gsprache->user, $gsprache->fastdownload, $gsprache->master, $gsprache->user, $gsprache->root, $gsprache->addon2, $gsprache->settings, $gsprache->virtual, $gsprache->support, $gsprache->reseller, $gsprache->hostsystem,'Easy Anti Cheat', $gssprache->resync, $gsprache->virtual . ' ' . $gsprache->template, $gsprache->template, $gsprache->voiceserver,'E-Mail '.$gsprache->settings, 'TSDNS', 'TSDNS', $gssprache->protect, $gsprache->file);
|
||||
|
||||
if ($sSearch) {
|
||||
$sSearch = str_replace($replace, $placeholders, str_replace($replace2, $placeholders2, $sSearch));
|
||||
@ -123,10 +123,10 @@ if ($ui->smallletters('w', 9, 'get') == 'datatable') {
|
||||
$ip = $row['ip'];
|
||||
} else {
|
||||
$username = $row['cname'];
|
||||
$ip = (isanyadmin($row['subuser']) and !isset($admin_id)) ? '' : $row['ip'];
|
||||
$ip = (isanyadmin($row['subuser'])) ? 'admin' : $row['ip'];
|
||||
}
|
||||
|
||||
$array['aaData'][] = array(($user_language == 'de') ? date('d.m.Y H:m:s', strtotime($row['logdate'])) : $row['logdate'], $username, str_replace($placeholders2, $replace2, str_replace($placeholders, $replace, $row['useraction'])), $ip);
|
||||
$array['aaData'][] = array($row['logdate'], $username, str_replace($placeholders2, $replace2, str_replace($placeholders, $replace, $row['useraction'])), $ip);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1469,13 +1469,15 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
|
||||
}
|
||||
|
||||
if (isset($updateString)) {
|
||||
$query2 = $sql->prepare("INSERT INTO `easywi_statistics_current` (`userID`) VALUES (?) ON DUPLICATE KEY UPDATE `userID`=`userID`");
|
||||
$query2->execute(array($insertID));
|
||||
|
||||
$query2 = $sql->prepare("UPDATE `easywi_statistics_current` SET " . $updateString . " WHERE `userID`= " . $insertID . " LIMIT 1");
|
||||
$query2->execute();
|
||||
|
||||
$query2 = $sql->prepare("INSERT INTO `easywi_statistics` (" . $insertColumns . ",`userID`,`statDate`,`countUpdates`) VALUES (" . implode(',', $statsArray) . "," . $insertID . ",'" . date('Y-m-d H:00:00') . "',1) ON DUPLICATE KEY UPDATE " . $duplicateString . ",`countUpdates`=`countUpdates`+1");
|
||||
$query2->execute();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -46,80 +46,6 @@ if (isset($admin_id) and $reseller_id != 0 and $admin_id != $reseller_id) {
|
||||
$reseller_id = $admin_id;
|
||||
}
|
||||
|
||||
// remove from here on once AdminLTE becomes default
|
||||
$reseller_brandname = $rSA['brandname'];
|
||||
$removed = array();
|
||||
$i_removed = 0;
|
||||
$crashed = array();
|
||||
$i_crashed = 0;
|
||||
$tag_removed = array();
|
||||
$steamAppIDsArray = array();
|
||||
$i_tag_removed = 0;
|
||||
$crashedArray = array('all' => 0, 'gsTotal' => 0, 'gsCrashed' => 0,'gsPWD' => 0,'gsTag' => 0,'ticketsOpen' => 0,'tickets' => 0,'ts3' => 0);
|
||||
|
||||
$query = $sql->prepare("SELECT g.`stopped`,CONCAT(g.`serverip`,':',g.`port`) AS `server`,g.`userid`,g.`war`,g.`brandname`,g.`queryName`,g.`queryPassword`,t.`steamgame`,t.`appID`,t.`shorten` FROM `gsswitch` AS g INNER JOIN `serverlist` AS s ON s.`id`=g.`serverid` INNER JOIN `servertypes` AS t ON s.`servertype`=t.`id` WHERE g.`active`='Y' AND g.`userid`=? AND g.`resellerid`=?");
|
||||
$query->execute(array($user_id, $reseller_id));
|
||||
$customer = getusername($user_id);
|
||||
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
|
||||
|
||||
$war = $row['war'];
|
||||
$brandname = $row['brandname'];
|
||||
$password = $row['queryPassword'];
|
||||
$name = $row['queryName'];
|
||||
|
||||
if ($name != 'OFFLINE' and $row['stopped'] == 'N' and $war == 'Y' and $password == 'N') {
|
||||
$pwd_removed[] = array('userid' => $row['userid'], 'address' => $row['server']);
|
||||
$i_removed++;
|
||||
$crashedArray['gsPWD']++;
|
||||
} else if ($name == 'OFFLINE' and $row['stopped'] == 'N') {
|
||||
$crashed[] = array('userid' => $row['userid'], 'address' => $row['server']);
|
||||
$i_crashed++;
|
||||
$crashedArray['gsCrashed']++;
|
||||
}
|
||||
|
||||
if ($name != '' and $row['stopped'] == 'N' and $name != 'OFFLINE' and $brandname == 'Y' and isset($reseller_brandname) and $reseller_brandname != '' and strpos(strtolower($name), strtolower($reseller_brandname)) === false) {
|
||||
$tag_removed[] = array('userid' => $row['userid'], 'username' => getusername($row['userid']),'address' => $row['server']);
|
||||
$i_tag_removed++;
|
||||
$crashedArray['gsTag']++;
|
||||
}
|
||||
|
||||
if ($row['steamgame'] != 'N' and isid($row['appID'], 10)) {
|
||||
$steamAppIDsArray[] = workAroundForValveChaos($row['appID'], $row['shorten']);
|
||||
}
|
||||
}
|
||||
|
||||
$query = $sql->prepare("SELECT `id` FROM `tickets` WHERE `userid`=? AND `state` != 'C' AND `resellerid`=?");
|
||||
$query2 = $sql->prepare("SELECT `userID` FROM `tickets_text` WHERE `ticketID`=? ORDER BY `writeDate` DESC LIMIT 1");
|
||||
$query->execute(array($user_id,$reseller_id));
|
||||
$counttickets_open = 0;
|
||||
$counttickets_unanswered = 0;
|
||||
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
|
||||
$counttickets_open++;
|
||||
$crashedArray['ticketsOpen']++;
|
||||
$query2->execute(array($row['id']));
|
||||
|
||||
if ($user_id == $query2->fetchColumn()) {
|
||||
$counttickets_unanswered++;
|
||||
$crashedArray['tickets']++;
|
||||
}
|
||||
}
|
||||
|
||||
$query = $sql->prepare("SELECT CONCAT(`ip`,':',`port`) AS `address` FROM `voice_server` WHERE `active`='Y' AND `uptime`='0' AND `userid`=? AND `resellerid`=?");
|
||||
$query->execute(array($user_id,$reseller_id));
|
||||
$crached_ts3_virtual = 0;
|
||||
$crashed_ts3 = array();
|
||||
foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
|
||||
$crashed_ts3[] = array('address' => $row['address']);
|
||||
$crached_ts3_virtual++;
|
||||
}
|
||||
|
||||
$crashedArray['ts3'] = $crached_ts3_virtual;
|
||||
|
||||
$crashedArray['gsTotal'] = $crashedArray['gsTag'] + $crashedArray['gsCrashed'] + $crashedArray['gsPWD'];
|
||||
$crashedArray['all'] = $crashedArray['gsTotal'] + $crashedArray['ticketsOpen'] + $crashedArray['tickets'] + $crashedArray['ts3'];
|
||||
|
||||
// Remove code until this point once AdminLTE becomes default
|
||||
|
||||
$statsArray = array(
|
||||
'gameserverActive' => 0,
|
||||
'gameserverSlotsActive' => 0,
|
||||
@ -151,7 +77,7 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
|
||||
}
|
||||
|
||||
$statsArray['warningTotal'] = $statsArray['gameserverNoPassword'] + $statsArray['gameserverNoTag'] + $statsArray['gameserverNotRunning'] + $statsArray['voiceserverCrashed'];
|
||||
$statsArray['ticketsTotal'] = $statsArray['ticketsInProcess'] + $statsArray['ticketsNew'];
|
||||
$statsArray['ticketsTotal'] = $statsArray['ticketsInProcess'];
|
||||
|
||||
$lastdate = null;
|
||||
$feedArray = array();
|
||||
|
||||
@ -68,7 +68,7 @@
|
||||
<?php if($statsArray['ticketsTotal']>0){ ?>
|
||||
<!-- Messages: style can be found in dropdown.less-->
|
||||
<li class="dropdown messages-menu">
|
||||
<a href="userpanel.php?w=ti" class="dropdown-toggle" data-toggle="dropdown">
|
||||
<a href="userpanel.php?w=ti">
|
||||
<i class="fa fa-life-ring"></i>
|
||||
<span class="label label-success"><?php echo $statsArray['ticketsTotal'];?></span>
|
||||
</a>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user