malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Ulrich Block 2015-02-26 19:07:19 +01:00
parent 8b7ade7183
commit 46aa0284b4
7 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/ajax.php
View File

@ -154,6 +154,11 @@ if ($ui->smallletters('w', 9, 'get') == 'datatable') {
require_once(EASYWIDIR . '/stuff/ajax/datatable_mysqlserver.php');
// Web master
} else if ($ui->smallletters('d', 15, 'get') == 'webmasterserver' and isset($admin_id) and isset($reseller_id) and isset($resellerLockupID) and $pa['webmaster']) {
require_once(EASYWIDIR . '/stuff/ajax/datatable_webmasterserver.php');
// Code wise it seems odd, but this way we can get plausible userIDs for following queries up front without having to repeat ourselves
} else {

2
web/api.php
View File

@ -78,6 +78,8 @@ if (isset($resellerIDs) and count($resellerIDs) == 1 and isset($type)) {
$data = array();
$resellerID = $resellerIDs[0];
$reseller_id = $resellerID;
$resellerLockupID = $resellerID;
$licenceDetails = serverAmount($resellerID);
if (is_numeric($licenceDetails['left']) and (0 > $licenceDetails['left'] or 0 > $licenceDetails['lG'] or 0 > $licenceDetails['lVo'] or 0 > $licenceDetails['lVs'] or 0 > $licenceDetails['lD'])) {

4
web/lend.php
View File

@ -348,9 +348,11 @@ if (isset($servertype)) {
$connection->CloseConnection();
}
} else {
$rcon = $row['rcon'];
$password = $row['password'];
$slots = $row['slots'];
if ($servertype == 'g') {
if (!$ui->id('xml', 1, 'post') and (!isset($_SESSION['lend']['gs']) or $_SESSION['lend']['gs'] != $serverid)) {
@ -926,6 +928,8 @@ if (!isset($template_file) and ((!isset($servertype) and isset($page_include) an
} else {
$debug = (isset($dbConnect['debug']) and $dbConnect['debug'] == 1) ? '<br><pre>' . implode("\r\n", $appServer->debug()) . '</pre>' : '';
if (!isset($nextfree)) {
$nextfree = 0;
}

3
web/stuff/methods/class_app.php
View File

@ -737,7 +737,6 @@ class AppServer {
$script .= 'screen -wipe > /dev/null 2>&1' . "\n";
$script .= 'if [[ `screen -ls | grep ' . $screenName . '` ]]; then' . "\n";
$script .= 'if [ "`screen -ls | grep ' . $screenName . ' | wc -l`" == "1" ]; then screen -r ' . $screenName . ' -X quit; fi' . "\n";
if ($this->appServerDetails['template']['gameq'] == 'minecraft') {
$script .= $this->linuxMcWorldSave(false);
@ -751,6 +750,8 @@ class AppServer {
$script .= 'screen -p 0 -S ' . $screenName . ' -X stuff $\'\n\'' . "\n";
}
$script .= 'if [ "`screen -ls | grep ' . $screenName . ' | wc -l`" == "1" ]; then screen -r ' . $screenName . ' -X quit; fi' . "\n";
$script .= 'fi' . "\n";
$script .= 'ps x | grep -v ' . $scriptName . ' | grep ' . $screenName . ' | grep -v grep | awk \'{print $1}\' | while read PID; do' . "\n";

10
web/stuff/settings.php
View File

@ -231,7 +231,7 @@ if (isset($reseller_id)) {
$logdate = date('Y-m-d H:i:s');
}
if ($loguserip!='localhost') {
if ($loguserip != 'localhost') {
if (isset($_SESSION['language'])) {
$user_language = $_SESSION['language'];
@ -466,4 +466,12 @@ foreach ($dirs as $row) {
if ($ui->escaped('HTTP_REFERER', 'server')) {
$referrer = $ui->escaped('HTTP_REFERER', 'server');
}
if (!isset($reseller_id)) {
$reseller_id = 0;
}
if (!isset($resellerLockupID)) {
$resellerLockupID = $reseller_id;
}

2
web/template/default/admin/admin_gserver_md.tpl
View File

@ -88,7 +88,7 @@
<div class="controls">
<select class="form-control" id="inputLend" name="lendserver">
<option value="N"><?php echo $gsprache->no;?></option>
<option value="Y" <?php if($lendserver=='N') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
<option value="Y" <?php if($lendServer=='Y') echo 'selected="selected"';?>><?php echo $gsprache->yes;?></option>
</select>
</div>
</div>

6
web/template/default/admin/admin_header.tpl
View File

@ -12,7 +12,7 @@
<meta name="author" content="2012 - <?php echo date('Y'); ?> <?php if(isset($ewCfg['title'])) echo $ewCfg['title']; ?>">
<!-- Bootstrap CSS -->
<link href="//netdna.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
<!-- Font Awesome -->
<link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet">
@ -102,8 +102,8 @@
<?php if($statsArray['gameserverNoTag']>0){ ?><li><a href="admin.php?w=gs"><i class="fa fa-warning warning"></i> <?php echo $statsArray['gameserverNoTag'].' '.$sprache_bad->gserver_tag_removed;?></a></li><?php }?>
<?php }?>
<?php if($pa['voiceserver'] and $statsArray['voiceserverCrashed']>0 and $easywiModules['vo']) { ?><li><a href="admin.php?w=vo&amp;d=md"><i class="fa fa-warning danger"></i> <?php echo $statsArray['voiceserverCrashed'].' '.$sprache_bad->voice_crashed;?></a></li><?php }?>
<?php if($pa['voicemasterserver'] and $statsArray['voiceMasterCrashed']>0 and $easywiModules['vo']) { ?><li><a href="admin.php?w=vo&amp;d=md"><i class="fa fa-warning danger"></i><?php echo $statsArray['voiceMasterCrashed'].' '.$sprache_bad->ts3master_crashed;?></a></li><?php }?>
<?php if($pa['voiceserver'] and $statsArray['voiceserverCrashed']>0 and $easywiModules['vo']) { ?><li><a href="admin.php?w=vo"><i class="fa fa-warning danger"></i> <?php echo $statsArray['voiceserverCrashed'].' '.$sprache_bad->voice_crashed;?></a></li><?php }?>
<?php if($pa['voicemasterserver'] and $statsArray['voiceMasterCrashed']>0 and $easywiModules['vo']) { ?><li><a href="admin.php?w=vo"><i class="fa fa-warning danger"></i><?php echo $statsArray['voiceMasterCrashed'].' '.$sprache_bad->ts3master_crashed;?></a></li><?php }?>
<?php if($pa['roots'] and $statsArray['gameMasterCrashed']>0 and $easywiModules['gs']) { ?><li><a href="admin.php?w=ro"><i class="fa fa-warning danger"></i><?php echo $statsArray['gameMasterCrashed'].' '.$sprache_bad->ts3master_crashed;?></a></li><?php }?>
</ul>
</li>