Skip to content

Commit d395404

Browse files
lgundlgund
committed
Upload Version 1.1.8
1 parent bdc1ae1 commit d395404

17 files changed

+828
-215
lines changed

‎check_database.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
};
6868

6969
if(substr(sprintf('%o', fileperms('config.php')), -4) != $wantedFilePermissions || substr(sprintf('%o', fileperms('config_instanz.php')), -4) != $wantedFilePermissions || substr(sprintf('%o', fileperms('TicketBereich.txt')), -4) != $wantedFilePermissions
70-
|| substr(sprintf('%o', fileperms('logs/system.log')), -4) != $wantedFilePermissions || substr(sprintf('%o', fileperms('logs/user.log')), -4) != $wantedFilePermissions || substr(sprintf('%o', fileperms('shell/teamspeakCommands.sh')), -4) != "0777")
70+
|| substr(sprintf('%o', fileperms('logs/system.log')), -4) != $wantedFilePermissions || substr(sprintf('%o', fileperms('logs/user.log')), -4) != $wantedFilePermissions || !is_executable('shell/teamspeakCommands.sh'))
7171
{
7272
$permissions = false;
7373
};
@@ -100,7 +100,7 @@
100100
};
101101
$installFolderExists = file_exists("install");
102102

103-
if($verbindung != 'done' || !$users || !$permissions || $installFolderExists)
103+
if($verbindung != 'done' || !$users || !$permissions || $installFolderExists || !extension_loaded("soap"))
104104
{ ?>
105105
<html>
106106
<head>
@@ -300,6 +300,22 @@
300300
</div>
301301
</div>
302302
</section>
303+
<?php } else if(!extension_loaded("soap")) { ?>
304+
<section class="container first-row">
305+
<div class="row">
306+
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
307+
<div class="card">
308+
<div class="card-block card-block-header">
309+
<i class="fa fa-warning" aria-hidden="true"></i> SOAP <?php echo $language['deactive']; ?>
310+
</div>
311+
<div class="card-block">
312+
<p style="text-align: center;"><?php echo $language['soap_deactive']; ?></p>
313+
<a href="index.php"><button style="width: 100%;" class="btn btn-success"><i class="fa fa-refresh" aria-hidden="true"></i> <?php echo $language['refresh']; ?></button></a>
314+
</div>
315+
</div>
316+
</div>
317+
</div>
318+
</section>
303319
<?php } else { ?>
304320
<!-- Install folder exists -->
305321
<section class="container first-row">

‎functions.php

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/*
2323
Installed Webinterface version
2424
*/
25-
define("INTERFACE_VERSION", "1.1.7-OPEN-BETA");
25+
define("INTERFACE_VERSION", "1.1.8-OPEN-BETA");
2626

2727
/*
2828
Session start
@@ -118,7 +118,7 @@ function writeInLog($loglevel, $logtext, $userlog = false)
118118

119119
$loghandle = fopen($file.".log", 'a');
120120
fwrite($loghandle, $input);
121-
if (filesize($file) > 10242880) // 10MB
121+
if (filesize($file.".log") > 10242880) // 10MB
122122
{
123123
fwrite($loghandle, $date."\tNOTICE\t\tLogfile filesie of 10 MiB reached.. Rotate logfile.\n");
124124

@@ -142,9 +142,12 @@ function writeInLog($loglevel, $logtext, $userlog = false)
142142
unlink($file.".log");
143143
};
144144

145-
if (filesize($file.".zip") > 20485760) // 20 MB
145+
if(file_exists($file.".zip"))
146146
{
147-
unlink($file.".zip");
147+
if (filesize($file.".zip") > 20485760) // 20 MB
148+
{
149+
unlink($file.".zip");
150+
};
148151
};
149152
};
150153

@@ -509,8 +512,14 @@ function getCheckedClientServerEditRights($pk, $instanz, $port)
509512

510513
foreach($databaseKeys AS $keyname => $key)
511514
{
512-
513-
if(!in_array($key, $clientKeys) && strpos($clientKeys[$key][$instanz], $port) !== false)
515+
if(!empty($clientKeys))
516+
{
517+
if(!in_array($key, $clientKeys) && strpos($clientKeys[$key][$instanz], $port) !== false)
518+
{
519+
unset($returnKeys[$keyname]);
520+
};
521+
}
522+
else
514523
{
515524
unset($returnKeys[$keyname]);
516525
};

‎iframeServerView.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<link rel="stylesheet" type="text/css" href="css/sonstige/font-awesome.min.css" />
5151
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.css" />
5252
</head>
53-
<body style="color:#<?php echo htmlspecialchars($_GET['color']); ?>;font-size:<?php echo htmlspecialchars($_GET['fontsize']); ?>">
54-
<div class="col-lg-12 col-md-12" id="tree_loading" style="margin-top:20px;margin-bottom:20px;text-align:center;">
53+
<body style="color:#<?php echo htmlspecialchars($_GET['color']); ?>;background-color:#<?php echo htmlspecialchars($_GET['bodybgcolor']); ?>;font-size:<?php echo htmlspecialchars($_GET['fontsize']); ?>">
54+
<div class="col-lg-12 col-md-12" id="tree_loading" style="margin-top:20px;margin-bottom:20px;text-align:center;background-color:#<?php echo htmlspecialchars($_GET['spinbgcolor']); ?>;">
5555
<h3><?php echo $language['ts_tree_loading']; ?></h3><br /><i style="font-size:100px;" class="fa fa-cogs fa-spin"></i>
5656
</div>
5757
<div class="col-lg-12 col-md-12 tree" id="tree" style="padding:20px;display:none;<?php if($server['data']['virtualserver_status'] == 'online') { echo 'background-color:rgba(0,199,0,0.2);'; } else { echo 'background-color:rgba(199, 0,0,0.2);'; } ?>">

‎js/webinterface/main.js

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
}
5252
else if(typeof(doc[2]) != 'undefined' && typeof(doc[3]) != 'undefined')
5353
{
54+
//alert(typeof(teamspeakTokenInit));
5455
switch(doc[1])
5556
{
5657
case "web_teamspeak_serverview":
@@ -171,11 +172,11 @@
171172
$(this).addClass("active");
172173
});
173174

174-
$('#mainContent').fadeOut("slow", function()
175+
$('#mainContent').fadeOut("fast", function()
175176
{
176177
$('#mainContent').load("web_main_main.php", function()
177178
{
178-
$('#mainContent').fadeIn("slow");
179+
$('#mainContent').fadeIn("fast");
179180
});
180181
});
181182
};
@@ -213,7 +214,7 @@
213214
$(this).addClass("active");
214215
});
215216

216-
$('#mainContent').fadeOut("slow", function()
217+
$('#mainContent').fadeOut("fast", function()
217218
{
218219
$('#mainContent').load("web_main_apply_server.php", function()
219220
{
@@ -222,7 +223,7 @@
222223
$('#wantServerStep1').remove();
223224
$('#wantServerStep2').show();
224225
};
225-
$('#mainContent').fadeIn("slow");
226+
$('#mainContent').fadeIn("fast");
226227
});
227228
});
228229
};
@@ -260,11 +261,11 @@
260261
$(this).addClass("active");
261262
});
262263

263-
$('#mainContent').fadeOut("slow", function()
264+
$('#mainContent').fadeOut("fast", function()
264265
{
265266
$('#mainContent').load("web_main_masterserver.php", function()
266267
{
267-
$('#mainContent').fadeIn("slow");
268+
$('#mainContent').fadeIn("fast");
268269
});
269270
});
270271
};
@@ -388,11 +389,11 @@
388389

389390
$(".teamspeakView").addClass("active");
390391

391-
$("#mainContent").fadeOut("slow", function()
392+
$("#mainContent").fadeOut("fast", function()
392393
{
393394
$("#mainContent").load('web_teamspeak_serverview.php', function()
394395
{
395-
$("#mainContent").fadeIn("slow");
396+
$("#mainContent").fadeIn("fast");
396397
});
397398
});
398399
};
@@ -447,11 +448,11 @@
447448

448449
$("."+activeClass).addClass("active");
449450

450-
$("#mainContent").fadeOut("slow", function()
451+
$("#mainContent").fadeOut("fast", function()
451452
{
452453
$("#mainContent").load(link+'.php', function()
453454
{
454-
$("#mainContent").fadeIn("slow");
455+
$("#mainContent").fadeIn("fast");
455456
});
456457
});
457458
};

‎js/webinterface/teamspeak.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@
8585

8686
$("."+activeClass).addClass("active");
8787

88-
$("#mainContent").fadeOut("slow", function()
88+
$("#mainContent").fadeOut("fast", function()
8989
{
9090
$("#mainContent").load(link+'.php', function()
9191
{
92-
$("#mainContent").fadeIn("slow");
92+
$("#mainContent").fadeIn("fast");
9393
});
9494
});
9595
};
@@ -2030,22 +2030,22 @@
20302030

20312031
if(informations.length <= 1)
20322032
{
2033-
if(informations[0] == 'move')
2033+
if(informations[0] == 'move' && document.getElementById("infoMove"))
20342034
{
20352035
document.getElementById("infoMove").innerHTML = ts3_mass_no_affected_user;
20362036
};
20372037

2038-
if(informations[0] == 'kick')
2038+
if(informations[0] == 'kick' && document.getElementById("infoKick"))
20392039
{
20402040
document.getElementById("infoKick").innerHTML = ts3_mass_no_affected_user;
20412041
};
20422042

2043-
if(informations[0] == 'ban')
2043+
if(informations[0] == 'ban' && document.getElementById("infoBan"))
20442044
{
20452045
document.getElementById("infoBan").innerHTML = ts3_mass_no_affected_user;
20462046
};
20472047

2048-
if(informations[0] == 'msg')
2048+
if(informations[0] == 'msg' && document.getElementById("infoMessagePoke"))
20492049
{
20502050
document.getElementById("infoMessagePoke").innerHTML = ts3_mass_no_affected_user;
20512051
};
@@ -2065,22 +2065,22 @@
20652065
};
20662066
};
20672067

2068-
if(informations[0] == 'move')
2068+
if(informations[0] == 'move' && document.getElementById("infoMove"))
20692069
{
20702070
document.getElementById("infoMove").innerHTML = clients;
20712071
};
20722072

2073-
if(informations[0] == 'kick')
2073+
if(informations[0] == 'kick' && document.getElementById("infoKick"))
20742074
{
20752075
document.getElementById("infoKick").innerHTML = clients;
20762076
};
20772077

2078-
if(informations[0] == 'ban')
2078+
if(informations[0] == 'ban' && document.getElementById("infoBan"))
20792079
{
20802080
document.getElementById("infoBan").innerHTML = clients;
20812081
};
20822082

2083-
if(informations[0] == 'msg')
2083+
if(informations[0] == 'msg' && document.getElementById("infoMessagePoke"))
20842084
{
20852085
document.getElementById("infoMessagePoke").innerHTML = clients;
20862086
};

‎lang.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
"german" => "First-Coder.de",
3333
"english" => "lorixon.com",
3434
"italian" => "Grafic404",
35-
"turkish" => "sezerondr"
35+
"turkish" => "sezerondr",
36+
"french" => "glougloubot"
3637
);
3738
if(LANGUAGE == '' || LANGUAGE == 'english')
3839
{
@@ -49,5 +50,9 @@
4950
else if(LANGUAGE == 'turkish')
5051
{
5152
include("lang/tr.php");
53+
}
54+
else if(LANGUAGE == 'french')
55+
{
56+
include("lang/fr.php");
5257
};
5358
?>

‎lang/de.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,4 +592,9 @@
592592
$language['reset_server'] = "Serverrechte zur&uuml;cksetzen";
593593
$language['reset_server_info'] = "Hierbei werden alle Rechte zur&uuml;ckgesetzt. Server- und Channelgruppen werden gel&ouml;scht!";
594594
$language['reset_server_success'] = "Serverrechte wurden erfolgreich zur&uuml;ckgesetzt!";
595+
596+
// new in Version 1.1.9
597+
$language['soap_deactive'] = "SOAP Erweiterung wurde nicht gefunden. Bitte aktivieren Sie diese, bevor Sie die Seite verwenden.";
598+
$language['admin_query_add'] = "Server Admin Query hinzuf&uuml;gen";
599+
$language['admin_query_del'] = "Server Admin Query l&ouml;schen";
595600
?>

0 commit comments

Comments
 (0)