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

Merge branch 'master' of https://github.com/easy-wi/developer

Browse Source
This commit is contained in:
Ulrich Block 2018-01-06 13:02:02 +01:00
commit 22df9ec708
10 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/default/social_buttons.css
View File

@ -1,5 +1,5 @@
/* Background colors */
.btn-facebook,.btn-github,.btn-google,.btn-linkedin,.btn-live,.btn-windows,.btn-mailru,.btn-openid,.btn-steam,.btn-twitchtv,.btn-twitter,.btn-xing,.btn-yandex {
.btn-facebook,.btn-github,.btn-google,.btn-linkedin,.btn-live,.btn-windows,.btn-mailru,.btn-openid,.btn-steam,.btn-twitch,.btn-twitter,.btn-xing,.btn-yandex {
color: #f9f9f9 !important;
}
.btn-facebook {
@ -29,7 +29,7 @@
.btn-steam {
background-color: #000000 !important;
}
.btn-twitchtv {
.btn-twitch {
background-color: #6441a5 !important;
}
.btn-twitter {

2
stuff/api/api_gserver.php
View File

@ -218,7 +218,7 @@ if (!isset($success['false']) and array_value_exists('action', 'add', $data) and
} else if (isset($externalMasterIDsArray) and count($externalMasterIDsArray) > 0) {
$inSQLArray = 'r.`externalID` IN (' . implode(',', "'" . $externalMasterIDsArray . "'") . ') AND';
$inSQLArray = 'r.`externalID` IN (\'' . implode('\', \'', $externalMasterIDsArray ) . '\') AND';
}
$query = $sql->prepare("SELECT r.`id`,r.`quota_active`,r.`install_paths`,r.`hyperthreading`,r.`cores`,r.`externalID`,r.`connect_ip_only`,r.`ip`,r.`altips`,r.`maxslots`,r.`maxserver`,r.`active` AS `hostactive`,r.`resellerid` AS `resellerid`,(r.`maxserver`-(SELECT COUNT(`id`) FROM `gsswitch` AS g WHERE g.`rootID`=r.`id` )) AS `freeserver`,(r.`maxslots`-(SELECT SUM(g.`slots`) FROM `gsswitch` AS g WHERE g.`rootID`=r.`id`)) AS `leftslots`,(r.`ram`-(SELECT SUM(g.`maxram`) FROM `gsswitch` AS g WHERE g.`rootID`=r.`id`)) AS `free_ram`,(SELECT COUNT(m.`id`) FROM `rservermasterg` AS m WHERE m.`serverid`=r.`id` AND $implodedQuery) `mastercount` FROM `rserverdata` AS r GROUP BY r.`id` HAVING ($inSQLArray `hostactive`='Y' AND r.`resellerid`=? AND (`freeserver`>0 OR `freeserver` IS NULL) AND (`leftslots`>? OR `leftslots` IS NULL) AND (`free_ram`>? OR `free_ram` IS NULL) AND `mastercount`=?) ORDER BY `freeserver` DESC LIMIT 1");

2
stuff/api/api_voice.php
View File

@ -143,7 +143,7 @@ if (!isset($success['false']) and array_value_exists('action','add', $data) and
} else if (isset($externalMasterIDsArray) and count($externalMasterIDsArray) > 0) {
$inSQLArray = 'm.`externalID` IN (' . implode(',', "'" . $externalMasterIDsArray . "'") . ') AND';
$inSQLArray = 'm.`externalID` IN (\'' . implode('\', \'', $externalMasterIDsArray) . '\') AND';
}
$iniConfiguration = array();

2
stuff/cms/init_page.php
View File

@ -296,6 +296,8 @@ if (isset($page_active) and $page_active == 'Y') {
$cssIcon = 'google-plus';
} else if ($cssIcon == 'live') {
$cssIcon = 'windows';
} else if ($cssIcon == 'twitchtv') {
$cssIcon = 'twitch';
}
$serviceProviders[$row['filename']] = strtolower($cssIcon);

2
stuff/methods/functions_social_auth.php
View File

@ -54,6 +54,8 @@ function getServiceProviders () {
$cssIcon = 'google-plus';
} else if ($cssIcon == 'live') {
$cssIcon = 'windows';
} else if ($cssIcon == 'twitchtv') {
$cssIcon = 'twitch';
}
$serviceProviders[$row['filename']] = strtolower($cssIcon);

4
stuff/user/userpanel_gserver.php
View File

@ -100,12 +100,14 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
$id = $ui->id('id', 10, 'get');
$query = $sql->prepare("SELECT g.`serverip`,g.`port`,t.`liveConsole` FROM `gsswitch` AS g INNER JOIN `serverlist` AS s ON g.`serverid`=s.`id` INNER JOIN `servertypes` AS t ON s.`servertype`=t.`id` WHERE g.`id`=? AND g.`userid`=? AND g.`resellerid`=? LIMIT 1");
$query = $sql->prepare("SELECT g.`serverip`,g.`port`,g.`id`,g.`stopped`,t.`liveConsole` FROM `gsswitch` AS g INNER JOIN `serverlist` AS s ON g.`serverid`=s.`id` INNER JOIN `servertypes` AS t ON s.`servertype`=t.`id` WHERE g.`id`=? AND g.`userid`=? AND g.`resellerid`=? LIMIT 1");
$query->execute(array($id, $user_id, $resellerLockupID));
while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
$serverIp = $row['serverip'];
$port = $row['port'];
$liveConsole = $row['liveConsole'];
$id = $row['id'];
$stopped = $row['stopped'];
}
if ($query->rowCount() > 0) {

4
switch.php
View File

@ -70,7 +70,7 @@ if ($ui->id('id', 19, 'get')) {
$sql = null;
if ($row['accounttype'] == 'u') {
if ($row['accounttype'] == 'u' && $row['resellerid'] == $reseller_id) {
$_SESSION['userid'] = $ui->id('id', 19, 'get');
@ -103,4 +103,4 @@ if ($ui->id('id', 19, 'get')) {
}
}
$sql = null;
redirect('login.php');
redirect('login.php');

8
template/default/admin/admin_user_own_md.tpl
View File

@ -30,12 +30,12 @@
<div class="controls">
<?php if (strlen($sp['spUserId'])==0){ ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="login.php?serviceProvider=<?php echo $sp['sp'];?>" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialConnect.' '.$sp['sp'];?>
<a class="btn btn-block btn-social btn-<?php echo str_replace('twitchtv', 'twitch', strtolower($sp['sp']));?> span10" href="login.php?serviceProvider=<?php echo $sp['sp'];?>" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo str_replace('twitchtv', 'twitch', strtolower($sp['sp']));?>"></i> <?php echo $sprache->socialConnect.' '.$sp['sp'];?>
</a>
<?php } else { ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="admin.php?w=su&amp;spUser=<?php echo $sp['spUserId'];?>&amp;spId=<?php echo $sp['spId'];?>&amp;r=su" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialRemove.' '.$sp['sp'];?>
<a class="btn btn-block btn-social btn-<?php echo str_replace('twitchtv', 'twitch', strtolower($sp['sp']));?> span10" href="admin.php?w=su&amp;spUser=<?php echo $sp['spUserId'];?>&amp;spId=<?php echo $sp['spId'];?>&amp;r=su" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo str_replace('twitchtv', 'twitch', strtolower($sp['sp']));?>"></i> <?php echo $sprache->socialRemove.' '.$sp['sp'];?>
</a>
<?php } ?>
</div>

5
template/default/user/userpanel_gserver_log.tpl
View File

@ -1,5 +1,8 @@
<section class="content-header">
<h1><?php echo $imageSprache->liveConsole;?></h1>
<br>
<a href="userpanel.php?w=gs&amp;d=rs&amp;id=<?php echo $id;?>&amp;r=gs" onclick="return confirm('<?php echo $serverIp.':'.$port;?>: <?php echo $sprache->confirm_restart;?>');"><button class="btn btn-sm btn-success inline"><i class="icon-white icon-play"></i> <?php echo $sprache->restarts;?></button></a>
<?php if($stopped=='N'){ ?><a href="userpanel.php?w=gs&amp;d=st&amp;id=<?php echo $id;?>&amp;r=gs" onclick="return confirm('<?php echo $serverIp.':'.$port;?>: <?php echo $sprache->confirm_stop;?>');"><button class="btn btn-sm btn-danger"><i class="fa fa-power-off"></i> <?php echo $sprache->stop;?></button></a><?php } ?>
<ol class="breadcrumb">
<li><a href="userpanel.php"><i class="fa fa-home"></i> Home</a></li>
<li><a href="userpanel.php?w=gs"><i class="fa fa-gamepad"></i> <?php echo $gsprache->gameserver;?></a></li>
@ -110,4 +113,4 @@
setInterval(function(){getLog()},3000);
});
</script>
</script>

8
template/default/user/userpanel_user_md.tpl
View File

@ -112,12 +112,12 @@
<div class="form-group">
<label for="sp<?php echo $sp['sp'];?>"><?php echo $sp['sp'];?></label>
<?php if (strlen($sp['spUserId'])==0){ ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="login.php?serviceProvider=<?php echo $sp['sp'];?>" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialConnect.' '.$sp['sp'];?>
<a class="btn btn-block btn-social btn-<?php echo str_replace('twitchtv', 'twitch', strtolower($sp['sp']));?> span10" href="login.php?serviceProvider=<?php echo $sp['sp'];?>" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo str_replace('twitchtv', 'twitch', strtolower($sp['sp']));?>"></i> <?php echo $sprache->socialConnect.' '.$sp['sp'];?>
</a>
<?php } else { ?>
<a class="btn btn-block btn-social btn-<?php echo strtolower($sp['sp']);?> span10" href="userpanel.php?w=se&amp;spUser=<?php echo $sp['spUserId'];?>&amp;spId=<?php echo $sp['spId'];?>&amp;r=se" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo strtolower($sp['sp']);?>"></i> <?php echo $sprache->socialRemove.' '.$sp['sp'];?>
<a class="btn btn-block btn-social btn-<?php echo str_replace('twitchtv', 'twitch', strtolower($sp['sp']));?> span10" href="userpanel.php?w=se&amp;spUser=<?php echo $sp['spUserId'];?>&amp;spId=<?php echo $sp['spId'];?>&amp;r=se" id="sp<?php echo $sp['sp'];?>">
<i class="fa fa-<?php echo str_replace('twitchtv', 'twitch', strtolower($sp['sp']));?>"></i> <?php echo $sprache->socialRemove.' '.$sp['sp'];?>
</a>
<?php } ?>
</div>