Back to working

This commit is contained in:
Ulrich Block 2015-09-07 18:38:07 +02:00
parent 26baa8372b
commit daa8ce22da
34 changed files with 80 additions and 77 deletions

View File

@ -66,7 +66,7 @@ include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php');
include(EASYWIDIR . '/stuff/methods/class_ts3.php');
include(EASYWIDIR . '/stuff/methods/class_app.php');
$validaccess= false;
$validacces = false;
if ($ui->ip4('REMOTE_ADDR', 'server') and $ui->names('user', 255, 'post') and !isset($page_include)) {
@ -82,16 +82,16 @@ if ($ui->ip4('REMOTE_ADDR', 'server') and $ui->names('user', 255, 'post') and !i
if (isset($resellerIDs) and count($resellerIDs) == 1 and passwordhash($ui->password('pwd', 255, 'post'), $salt) == $pwd) {
$reseller_id = $resellerIDs[0];
$validaccess= true;
$validacces = true;
}
}
} else {
$reseller_id = 0;
$validaccess= true;
$validacces = true;
}
if ($validaccess== false) {
if ($validacces == false) {
header('HTTP/1.1 403 Forbidden');
die('403 Forbidden: Access data not valid');
}

View File

@ -74,7 +74,7 @@ include(EASYWIDIR . '/stuff/methods/functions_gs.php');
include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php');
include(EASYWIDIR . '/stuff/methods/class_app.php');
include(EASYWIDIR . '/stuff/methods/class_ts3.php');
include(EASYWIDIR . '/third_party/gameq/GameQ.php');
include(EASYWIDIR . '/third_party/gameq/GameQ/Autoloader.php');
include(EASYWIDIR . '/stuff/methods/class_mysql.php');
include(EASYWIDIR . '/stuff/methods/class_httpd.php');
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -216,21 +216,19 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
// without the gameq value we cannot query. So this results need to be sorted out.
if (!in_array($row2['gameq'], array('', null, false))) {
$checkAtIPPort = $row2['serverip'] . ':';
if ($row2['useQueryPort'] == 5) {
$checkAtIPPort .= $row2['port5'];
$queryPort = $row2['port5'];
} else if ($row2['useQueryPort'] == 4) {
$checkAtIPPort .= $row2['port4'];
$queryPort = $row2['port4'];
} else if ($row2['useQueryPort'] == 3) {
$checkAtIPPort .= $row2['port3'];
$queryPort = $row2['port3'];
} else if ($row2['useQueryPort'] == 2) {
$checkAtIPPort .= $row2['port2'];
$queryPort = $row2['port2'];
} else {
$checkAtIPPort .= $row2['port'];
$queryPort = $row2['port'];
}
$serverBatchArray[] = array('id' => $row2['id'], 'type' => $row2['gameq'], 'host' => $checkAtIPPort);
$serverBatchArray[] = array('id' => $row2['id'], 'type' => $row2['gameq'], 'host' => $row2['serverip'] . ':' . $row2['port'], 'options' => array('query_port' => $queryPort));
$i++;
if ($i == 5) {
@ -256,17 +254,18 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
foreach ($allServersArray as $servers) {
$gq = new GameQ();
$gq = new \GameQ\GameQ();
$gq->addServers($servers);
$gq->setOption('timeout', 60);
if (isset($dbConnect['debug']) and $dbConnect['debug'] == 1) {
$gq->setOption('debug', true);
}
$gq->setFilter('normalise');
$gq->addServers($servers);
$gq->addFilter('normalise');
$gq->addFilter('stripcolor');
foreach($gq->requestData() as $switchID => $v) {
foreach($gq->process() as $switchID => $v) {
unset($userid, $resellerid, $lendserver, $stopserver, $doNotRestart);

View File

@ -38,7 +38,7 @@
if ((!isset($admin_id) or !$main == 1) or (isset($admin_id) and !$pa['addons'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('images', $user_language, $reseller_id);
@ -515,4 +515,4 @@ if ($ui->w('action',4, 'post') and !token(true)) {
configureDateTables('-1', '1, "asc"', 'ajax.php?w=datatable&d=gameserveraddons');
$template_file = 'admin_addons_list.tpl';
}
}

View File

@ -38,7 +38,7 @@
*/
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !isanyadmin($admin_id) and !rsellerpermisions($admin_id)) or (!isset($pa))) {
header('Location: login.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('search',$user_language,$reseller_id);
$results = array();
@ -315,4 +315,4 @@ if (isset($ui->get['q'])) {
configureDateTables('-1', '1, "DESC"');
$q=implode(' ',$q);
$template_file = 'admin_search.tpl';
$template_file = 'admin_search.tpl';

View File

@ -39,7 +39,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['root'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$loguserid = $admin_id;
@ -244,4 +244,4 @@ if ($ui->w('action',4, 'post') and !token(true)) {
configureDateTables('-1');
$template_file = 'admin_social_provider_list.tpl';
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !isanyadmin($admin_id) and !rsellerpermisions($admin_id))) {
header('Location: login.php');
die('No access');
die('No acces');
}
$sprache_bad = getlanguagefile('home', $user_language, $reseller_id);

View File

@ -39,7 +39,7 @@
if ($main != 1 or !isset($admin_id) or (isset($admin_id) and !$pa['apiSettings'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -111,4 +111,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
}
$template_file = 'admin_api_external_auth_settings.tpl';
}
}

View File

@ -38,7 +38,7 @@
*/
if ($main != 1 or !isset($admin_id) or (isset($admin_id) and !$pa['apiSettings'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
$sprache = getlanguagefile('api',$user_language,$reseller_id);
@ -224,4 +224,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
configureDateTables('-1', '2, "desc"');
$template_file = 'admin_api_import_users_list.tpl';
}
}

View File

@ -39,7 +39,7 @@
if ($main != 1 or !isset($admin_id) or (isset($admin_id) and !$pa['apiSettings'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('api',$user_language,$reseller_id);
$loguserid = $admin_id;
@ -112,4 +112,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
$pwd='encrypted';
}
$template_file = "admin_api_settings.tpl";
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['eac'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -116,4 +116,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
} else {
$template_file = $spracheResponse->error_table;
}
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['gimages'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/third_party/gameq/GameQ/Autoloader.php');
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -563,4 +563,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
configureDateTables('-1', '0, "asc"', 'ajax.php?w=datatable&d=gameimages');
$template_file = 'admin_images_list.tpl';
}
}

View File

@ -39,7 +39,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['ipBans'] and $reseller_id != 0)) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('logs', $user_language, $reseller_id);
@ -70,4 +70,4 @@ if ($ui->w('action', 2, 'post') == 'dl' and $ui->id('id', 19, 'post')) {
configureDateTables('-1', '1, "desc"', 'ajax.php?w=datatable&d=ipbans');
$template_file = 'admin_ip_bans.tpl';
}
}

View File

@ -40,7 +40,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['jobs'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('api', $user_language, $reseller_id);

View File

@ -37,11 +37,11 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['log'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('logs', $user_language,$reseller_id);
configureDateTables('', '0, "desc"', 'ajax.php?w=datatable&d=adminuserlog');
$template_file = 'admin_logs.tpl';
$template_file = 'admin_logs.tpl';

View File

@ -37,11 +37,11 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['log'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('logs', $user_language, $reseller_id);
configureDateTables('', '0, "desc"', 'ajax.php?w=datatable&d=maillog');
$template_file = 'admin_logs_mail.tpl';
$template_file = 'admin_logs_mail.tpl';

View File

@ -38,7 +38,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['masterServer'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -273,4 +273,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
}
$template_file = 'admin_master_ud.tpl';
}
}

View File

@ -39,7 +39,7 @@
if (!isset($admin_id) or $main != 1 or !isset($reseller_id) or !$pa['root']) {
header('Location: admin.php');
die('No access');
die('No acces');
}
@ -269,4 +269,4 @@ if ($ui->st('d', 'get') == 'bu' and $ui->st('action', 'post') == 'bu' and $resel
} else {
$template_file = 'admin_db_operations.tpl';
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['cms_settings']) or $reseller_id != 0) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('page',$user_language,$reseller_id);
$loguserid = $admin_id;
@ -215,4 +215,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
}
}
$template_file = "admin_page_settings.tpl";
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['roots'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -475,4 +475,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
configureDateTables('-1', '1, "asc"', 'ajax.php?w=datatable&d=appserver');
$template_file = 'admin_roots_list.tpl';
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and (!isset($reseller_id) or $reseller_id != 0)) or !$pa['settings']) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('system_check', $user_language, $reseller_id);
@ -164,4 +164,4 @@ $query = $sql->prepare("SELECT `pageurl` FROM `page_settings` WHERE `id`=1 LIMIT
$query->execute();
$pageUrl = $query->fetchColumn();
$template_file = 'admin_system_check.tpl';
$template_file = 'admin_system_check.tpl';

View File

@ -36,7 +36,7 @@
*/
if (!isset($admin_id) or $main != 1 or (isset($admin_id) and !$pa['traffic'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('traffic',$user_language,$reseller_id);
if ($d== 'se' and $reseller_id == 0) {
@ -438,4 +438,4 @@ if ($d== 'se' and $reseller_id == 0) {
}
$trafficdata = "images.php?img=tr&from=admin&d={$dmy}&w={$unit}&p={$year}&id={$day}&po={$month}&m={$amount}{$whichdata}";
$template_file = "admin_traffic.tpl";
}
}

View File

@ -40,7 +40,7 @@
if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['userGroups'])) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('user', $user_language, $reseller_id);
@ -467,4 +467,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
configureDateTables('-1');
$template_file = 'admin_user_groups_list.tpl';
}
}

View File

@ -39,7 +39,7 @@
if (!isset($admin_id) or $main != 1 or !isset($admin_id) or !isset($reseller_id) or !$pa['webmaster']) {
header('Location: admin.php');
die;
die('No access');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');

View File

@ -40,7 +40,7 @@
if (!isset($displayToUser) and (!isset($admin_id) or !isset($reseller_id) or $main != 1 or $reseller_id != 0)) {
header('Location: admin.php');
die('No access');
die('No Acces');
}
$query = "CREATE TABLE IF NOT EXISTS `addons` (
@ -1636,6 +1636,7 @@ $query = "CREATE TABLE IF NOT EXISTS `voice_masterserver` (
`latest_version` varchar(10) DEFAULT NULL,
`active` enum('Y','N') DEFAULT 'Y',
`description` varchar(255) DEFAULT NULL,
`iniConfiguration` text,
`type` varchar(30) NOT NULL DEFAULT 'ts3',
`usedns` enum('Y','N') DEFAULT 'Y',
`tsdnsServerID` int(10) unsigned DEFAULT NULL,
@ -1683,6 +1684,7 @@ $add->execute();
$query = "CREATE TABLE IF NOT EXISTS `voice_server` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`active` enum('Y','N') DEFAULT 'Y',
`iniConfiguration` text,
`autoRestart` enum('Y','N') DEFAULT 'Y',
`backup` enum('Y','N') DEFAULT 'Y',
`lendserver` enum('Y','N') NOT NULL DEFAULT 'N',
@ -1780,4 +1782,4 @@ $query = "CREATE TABLE IF NOT EXISTS `voice_tsdns` (
PRIMARY KEY (`id`),KEY(`rootid`),KEY(`externalID`),KEY(`resellerid`)
) ENGINE=InnoDB";
$add = $sql->prepare($query);
$add->execute();
$add->execute();

View File

@ -40,7 +40,7 @@
if (!isset($displayToUser) and (!isset($admin_id) or $main != 1 or $reseller_id != 0)) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$query = $sql->prepare("SELECT DISTINCT(`id`) FROM `userdata` u WHERE `accounttype`='r' AND NOT EXISTS (SELECT 1 FROM `settings` WHERE `resellerid`=u.`id`)");
@ -55,4 +55,4 @@ $query2 = $sql->prepare("INSERT INTO `lendsettings` (`resellerid`) VALUES (?)");
$query->execute();
while ($row = $query->fetch(PDO::FETCH_ASSOC)) {
$query2->execute(array($row['id']));
}
}

View File

@ -40,7 +40,7 @@
if (!isset($displayToUser) and (!isset($admin_id) or $main != 1 or $reseller_id != 0)) {
header('Location: admin.php');
die('No access');
die('No acces');
}
$defined['addons'] = array(
@ -1429,6 +1429,7 @@ $defined['voice_masterserver'] = array(
'latest_version' => array("Type"=>"varchar(10)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
'active' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"Y","Extra"=>""),
'description' => array("Type"=>"varchar(255)","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
'iniConfiguration' => array("Type"=>"text","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
'type' => array("Type"=>"varchar(30)","Null"=>"NO","Key"=>"","Default"=>"ts3","Extra"=>""),
'usedns' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"Y","Extra"=>""),
'tsdnsServerID' => array("Type"=>"int(10) unsigned","Null"=>"YES","Key"=>"MUL","Default"=>"","Extra"=>""),
@ -1473,6 +1474,7 @@ $defined['voice_masterserver'] = array(
$defined['voice_server'] = array(
'id' => array("Type"=>"int(10) unsigned","Null"=>"NO","Key"=>"PRI","Default"=>"","Extra"=>"auto_increment"),
'active' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"Y","Extra"=>""),
'iniConfiguration' => array("Type"=>"text","Null"=>"YES","Key"=>"","Default"=>"","Extra"=>""),
'autoRestart' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"Y","Extra"=>""),
'backup' => array("Type"=>"enum('Y','N')","Null"=>"YES","Key"=>"","Default"=>"Y","Extra"=>""),
'lendserver' => array("Type"=>"enum('Y','N')","Null"=>"NO","Key"=>"","Default"=>"N","Extra"=>""),
@ -1715,4 +1717,4 @@ foreach ($defined as $table => $t_p) {
$response->add('ADD: ' . $remove_query . '<br />');
}
}
}
}

View File

@ -43,7 +43,7 @@ include(EASYWIDIR . '/stuff/methods/class_app.php');
if ((!isset($user_id) or $main != 1) or (isset($user_id) and !$pa['useraddons'])) {
header('Location: userpanel.php');
die('No access');
die('No acces');
}
$sprache = getlanguagefile('images', $user_language, $resellerLockupID);
@ -246,4 +246,4 @@ if ($ui->id('id', 10, 'get') and $ui->id('adid', 10, 'get') and in_array($ui->st
} else {
$template_file = 'userpanel_404.tpl';
}
}

View File

@ -39,7 +39,7 @@
if ((!isset($main) or $main != 1) or (!isset($user_id) or (isset($user_id) and !$pa['restart']))) {
header('Location: userpanel.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -183,4 +183,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
}
}
$template_file = 'userpanel_root_dedicated_list.tpl';
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($user_id) or $main != 1) or (isset($user_id) and !$pa['fastdl'])) {
header('Location: userpanel.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');

View File

@ -37,7 +37,7 @@
*/
if ((!isset($main) or $main != 1) or (!isset($user_id) or (isset($user_id) and !$pa['restart']))) {
header('Location: userpanel.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -1110,4 +1110,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
}
$template_file = 'userpanel_gserver_list.tpl';
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($user_id) or !$main == "1") or (isset($user_id) and !isanyuser($user_id))) {
header('Location: login.php');
die('No access');
die('No acces');
}
$sprache_bad = getlanguagefile('home', $user_language, $reseller_id);
@ -210,4 +210,4 @@ if ($ui->smallletters('w', 2, 'get') == 'da' or (!$ui->smallletters('w', 2, 'get
}
}
}
}
}

View File

@ -40,7 +40,7 @@
if ((!isset($main) or $main != 1) or (!isset($user_id) or (isset($user_id) and !$pa['restart']))) {
header('Location: userpanel.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -184,4 +184,4 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
}
}
$template_file = 'userpanel_root_virtual_list.tpl';
}
}

View File

@ -38,7 +38,7 @@
if ((!isset($user_id) or $main != 1) or (isset($user_id) and !$pa['voiceserver'])) {
header('Location: userpanel.php');
die('No access');
die('No acces');
}
include(EASYWIDIR . '/stuff/keyphrasefile.php');
@ -970,4 +970,4 @@ if ($ui->st('d', 'get') == 'bu' and $ui->id('id', 10, 'get') and (!isset($_SESSI
$template_file = 'userpanel_voiceserver_list.tpl';
}
}

View File

@ -53,7 +53,7 @@
if (!isset($userPanelInclude)) {
header('Location: userpanel.php');
die('No access');
die('No acces');
}
// Include the language file
@ -182,4 +182,4 @@ if ($monsta->loggedIn === true and in_array($ftpAction, array("download", "ifram
}
$template_file = $monsta->errorResponse;
}
}