Skip to content

Commit a2ed7b4

Browse files
lgundlgund
committed
Update to 1.3.12
1 parent c40350f commit a2ed7b4

11 files changed

+56
-55
lines changed

‎php/admin/web_admin_settings.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,13 @@
126126
<h4 class="card-title"><i class="fa fa-info"></i> <?php echo $language['version_info']; ?></h4>
127127
</div>
128128
<div class="card-block">
129+
<?php $versionPossible = isUpdatePossible(); ?>
129130
<div class="row" style="padding:.75rem;">
130131
<div class="col-lg-1"></div>
131132
<div class="col-lg-5 col-md-6">
132133
<?php echo $language['installed_version']; ?>:
133134
</div>
134-
<div class="col-lg-5 col-md-6 <?php echo (INTERFACE_VERSION == checkNewVersion()) ? "text-success" : "text-danger"; ?>" style="text-align:center;">
135+
<div class="col-lg-5 col-md-6 <?php echo (!$versionPossible) ? "text-success" : "text-danger"; ?>" style="text-align:center;">
135136
<?php echo INTERFACE_VERSION; ?>
136137
</div>
137138
<div class="col-lg-1"></div>
@@ -146,7 +147,7 @@
146147
</div>
147148
<div class="col-lg-1"></div>
148149
</div>
149-
<?php if(INTERFACE_VERSION != checkNewVersion(false)) { ?>
150+
<?php if($versionPossible) { ?>
150151
<div class="row" style="padding:.75rem;">
151152
<div class="alert alert-danger">
152153
<b><i class="fa fa-warning"></i> <?php echo $language['attention']; ?>!</b>

‎php/admin/web_admin_user_serverpermission.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,6 @@ function closeModalServerEdit()
512512
},
513513
success: function(data)
514514
{
515-
console.log(data);
516515
if(data == 'null')
517516
{
518517
$('.serverEditChangeClass').each(function() {
@@ -528,7 +527,8 @@ function closeModalServerEdit()
528527
var informations = JSON.parse(data);
529528

530529
$('.serverEditChangeClass').each(function() {
531-
if(typeof(informations[$(this).attr("right")]) != 'undefined')
530+
console.log(informations[$(this).attr("right")]);
531+
if(typeof(informations[$(this).attr("right")]) != 'undefined' && informations[$(this).attr("right")] != 'false')
532532
{
533533
$(this).bootstrapToggle('on');
534534
}

‎php/functions/functions.php‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/*
3535
Installed Webinterface version
3636
*/
37-
define("INTERFACE_VERSION", "1.3.11-OPEN-BETA");
37+
define("INTERFACE_VERSION", "1.3.12-OPEN-BETA");
3838

3939
/*
4040
Anti XSS
@@ -204,6 +204,26 @@ function checkNewVersion($withInfo = true)
204204
};
205205
};
206206

207+
/*
208+
Update possible
209+
*/
210+
function isUpdatePossible()
211+
{
212+
try
213+
{
214+
$client = new SoapClient(null, array(
215+
'location' => 'http://wiki.first-coder.de/soap/soap_server.php',
216+
'uri' => 'https://wiki.first-coder.de/soap/soap_server.php'
217+
));
218+
219+
return $client->isUpdatePossible(INTERFACE_VERSION, DONATOR_MAIL, (SEND_VERSION == "true") ? true : false);
220+
}
221+
catch(Exception $e)
222+
{
223+
return false;
224+
};
225+
};
226+
207227
/*
208228
Set instance config
209229
*/

‎php/functions/functionsSql.php‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -652,12 +652,12 @@ function getCheckedClientServerEditRights($pk, $instanz, $port)
652652
{
653653
if(!in_array($key, $clientKeys) && strpos($clientKeys[$key][$instanz], $port) !== false)
654654
{
655-
unset($returnKeys[$keyname]);
655+
$returnKeys[$keyname] = "false";
656656
};
657657
}
658658
else
659659
{
660-
unset($returnKeys[$keyname]);
660+
$returnKeys[$keyname] = "false";
661661
};
662662
};
663663

@@ -1711,13 +1711,6 @@ function getUserRights($type, $key, $withTime = true, $just = "all")
17111711
$returnData[$row['rights_name']][$row['access_instanz']] = $row['access_ports'];
17121712
};
17131713
};
1714-
foreach($mysql_keys AS $name=>$key)
1715-
{
1716-
if(!isSet($returnData[$name]))
1717-
{
1718-
$returnData[$name]['key'] = "NONE";
1719-
};
1720-
};
17211714
break;
17221715
case "global":
17231716
foreach($result AS $row)
@@ -1734,13 +1727,6 @@ function getUserRights($type, $key, $withTime = true, $just = "all")
17341727
};
17351728
};
17361729
};
1737-
foreach($mysql_keys AS $name=>$key)
1738-
{
1739-
if(!isSet($returnData[$name]))
1740-
{
1741-
$returnData[$name] = "NONE";
1742-
};
1743-
};
17441730
break;
17451731
case "time":
17461732
foreach($result AS $row)
@@ -1751,14 +1737,6 @@ function getUserRights($type, $key, $withTime = true, $just = "all")
17511737
$returnData[$row['rights_name']]['time'] = $row['timestamp'];
17521738
};
17531739
};
1754-
foreach($mysql_keys AS $name=>$key)
1755-
{
1756-
if(!isSet($returnData[$name]))
1757-
{
1758-
$returnData[$name]['key'] = "NONE";
1759-
$returnData[$name]['time'] = "0";
1760-
};
1761-
};
17621740
break;
17631741
default:
17641742
foreach($result AS $row)
@@ -1774,13 +1752,6 @@ function getUserRights($type, $key, $withTime = true, $just = "all")
17741752
$returnData[$row['rights_name']][$row['access_instanz']] = $row['access_ports'];
17751753
};
17761754
};
1777-
foreach($mysql_keys AS $name=>$key)
1778-
{
1779-
if(!isSet($returnData[$name]))
1780-
{
1781-
$returnData[$name]['key'] = "NONE";
1782-
};
1783-
};
17841755
break;
17851756
};
17861757

‎php/functions/functionsTeamspeak.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,7 +1874,7 @@ function getTeamspeakslotsArray($serverList, $instanz, $forceInfo = false)
18741874
{
18751875
if(isSet($server['virtualserver_clientsonline']) && isSet($server['virtualserver_queryclientsonline']) && isSet($server['virtualserver_maxclients']))
18761876
{
1877-
if(strpos($user_right['right_web_server_view'][$instanz], $server['virtualserver_port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server'])
1877+
if(isPortPermission($user_right, $instanz, $server['virtualserver_port'], 'right_web_server_view') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server'])
18781878
{
18791879
$returnArray[0]['virtualserver_clientsonline'] = $returnArray[0]['virtualserver_clientsonline'] + ($server['virtualserver_clientsonline'] - $server['virtualserver_queryclientsonline']);
18801880
$returnArray[0]['virtualserver_maxclients'] = $returnArray[0]['virtualserver_maxclients'] + $server['virtualserver_maxclients'];
@@ -1889,7 +1889,7 @@ function getTeamspeakslotsArray($serverList, $instanz, $forceInfo = false)
18891889
$newServerList = array();
18901890
foreach($serverList AS $server)
18911891
{
1892-
if(strpos($user_right['right_web_server_view'][$instanz], $server['virtualserver_port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server'])
1892+
if(isPortPermission($user_right, $instanz, $server['virtualserver_port'], 'right_web_server_view') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server'])
18931893
{
18941894
$server['virtualserver_clientsonline'] = $server['virtualserver_clientsonline'] - $server['virtualserver_queryclientsonline'];
18951895
$newServerList[] = $server;

‎php/main/web_main.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
logged = '<?php echo ($LoggedIn) ? "true" : "false"; ?>',
397397
wantServer = new Array(),
398398
checkClientInterval = <?php echo CHECK_CLIENT_PERMS; ?>,
399-
updateAvalible = "<?php echo (checkNewVersion(false) != INTERFACE_VERSION) ? "true" : "false"; ?>",
399+
updateAvalible = "<?php echo (isUpdatePossible()) ? "true" : "false"; ?>",
400400
hasPermission = "<?php echo $hasPermission; ?>",
401401
timer = 10,
402402
emailRegex = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;

‎php/profile/web_profil_dashboard.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,24 +192,24 @@
192192
</thead>
193193
<tbody class="table-dashboard">
194194
<?php foreach($getTeamspeakInfo AS $server) {
195-
if(strpos($user_right['right_web_server_view'][$instanz], $server['virtualserver_port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
195+
if(isPortPermission($user_right, $instanz, $server['virtualserver_port'], 'right_web_server_view') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
196196
<tr class="rightClickContextMenu" onClick="showTeamspeakserver('<?php echo $server['virtualserver_id']; ?>', '<?php echo $instanz; ?>');">
197197
<td port="<?php echo $server['virtualserver_port']; ?>" instanz="<?php echo $instanz; ?>" sid="<?php echo $server['virtualserver_id']; ?>"
198-
permission="<?php echo (strpos($user_right['right_web_server_start_stop'][$instanz], $server['virtualserver_port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) ? "true" : "false"; ?>">
198+
permission="<?php echo (isPortPermission($user_right, $instanz, $server['virtualserver_port'], 'right_web_server_start_stop') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) ? "true" : "false"; ?>">
199199
<?php xssEcho($server['virtualserver_name']); ?>
200200
</td>
201201
<td style="text-align: center;" port="<?php echo $server['virtualserver_port']; ?>" instanz="<?php echo $instanz; ?>" sid="<?php echo $server['virtualserver_id']; ?>"
202-
permission="<?php echo (strpos($user_right['right_web_server_start_stop'][$instanz], $server['virtualserver_port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) ? "true" : "false"; ?>">
202+
permission="<?php echo (isPortPermission($user_right, $instanz, $server['virtualserver_port'], 'right_web_server_start_stop') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) ? "true" : "false"; ?>">
203203
<?php echo $server['virtualserver_port']; ?>
204204
</td>
205205
<td port="<?php echo $server['virtualserver_port']; ?>" instanz="<?php echo $instanz; ?>" sid="<?php echo $server['virtualserver_id']; ?>" style="text-align: center;cursor: pointer !important;"
206206
id="status-<?php echo $instanz; ?>-<?php echo $server['virtualserver_id']; ?>" class="<?php echo ($server['virtualserver_status'] == "online") ? "text-success" : "text-danger"; ?>"
207-
permission="<?php echo (strpos($user_right['right_web_server_start_stop'][$instanz], $server['virtualserver_port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) ? "true" : "false"; ?>">
207+
permission="<?php echo (isPortPermission($user_right, $instanz, $server['virtualserver_port'], 'right_web_server_start_stop') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) ? "true" : "false"; ?>">
208208
<?php xssEcho($server['virtualserver_status']); ?>
209209
</td>
210210
<td style="text-align: center;" port="<?php echo $server['virtualserver_port']; ?>" instanz="<?php echo $instanz; ?>" sid="<?php echo $server['virtualserver_id']; ?>"
211211
id="clients-<?php echo $instanz; ?>-<?php echo $server['virtualserver_id']; ?>"
212-
permission="<?php echo (strpos($user_right['right_web_server_start_stop'][$instanz], $server['virtualserver_port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) ? "true" : "false"; ?>">
212+
permission="<?php echo (isPortPermission($user_right, $instanz, $server['virtualserver_port'], 'right_web_server_start_stop') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) ? "true" : "false"; ?>">
213213
<?php if($server['virtualserver_status'] == "online")
214214
{
215215
echo $server['virtualserver_clientsonline']." / ".$server['virtualserver_maxclients'];
@@ -226,7 +226,6 @@
226226
</table>
227227
</div>
228228
</div>
229-
<p style="text-align: center;margin-top: 10px;"><?php echo $language['dashbord_right_click_info']; ?></p>
230229
<?php }; ?>
231230

232231
<ul id="contextMenu" class="dropdown-menu" role="menu" >

‎php/teamspeak/web_teamspeak_serverview_modal_channelview.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
/*
5757
Has the Client the Permission
5858
*/
59-
if((strpos($user_right['right_web_server_view'][$_REQUEST['instanz']], $_REQUEST['port']) === false && $user_right['right_web_global_server']['key'] != $mysql_keys['right_web_global_server']) || $user_right['right_web']['key'] != $mysql_keys['right_web'])
59+
if((!isPortPermission($user_right, $_REQUEST['instanz'], $_REQUEST['port'], 'right_web_server_view') && $user_right['right_web_global_server']['key'] != $mysql_keys['right_web_global_server']) || $user_right['right_web']['key'] != $mysql_keys['right_web'])
6060
{
6161
reloadSite(RELOAD_TO_SERVERVIEW);
6262
};
@@ -91,7 +91,7 @@
9191
<a class="nav-link active" href="#channelInformations" data-toggle="tab"><?php echo $language['informations']; ?></a>
9292
</li>
9393
<li class="nav-item channelViewPills">
94-
<?php if(strpos($user_right['right_web_channel_actions'][$_REQUEST['instanz']], $_REQUEST['port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
94+
<?php if(isPortPermission($user_right, $_REQUEST['instanz'], $_REQUEST['port'], 'right_web_channel_actions') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
9595
<a class="nav-link" href="#channelActions" data-toggle="tab"><?php echo $language['actions']; ?></a>
9696
<?php } else { ?>
9797
<a class="nav-link disabled" href="#"><?php echo $language['actions']; ?></a>
@@ -248,7 +248,7 @@
248248
<div class="col-lg-3 col-md-3"></div>
249249
</div>
250250
</div>
251-
<?php if(strpos($user_right['right_web_channel_actions'][$_REQUEST['instanz']], $_REQUEST['port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
251+
<?php if(isPortPermission($user_right, $_REQUEST['instanz'], $_REQUEST['port'], 'right_web_channel_actions') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
252252
<div class="tab-pane" id="channelActions">
253253
<table class="table table-condensed">
254254
<thead>

‎php/teamspeak/web_teamspeak_serverview_modal_clientview.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
/*
5656
Has the Client the Permission
5757
*/
58-
if((strpos($user_right['right_web_server_view'][$_REQUEST['instanz']], $_REQUEST['port']) === false && $user_right['right_web_global_server']['key'] != $mysql_keys['right_web_global_server']) || $user_right['right_web']['key'] != $mysql_keys['right_web'])
58+
if((!isPortPermission($user_right, $_REQUEST['instanz'], $_REQUEST['port'], 'right_web_server_view') && $user_right['right_web_global_server']['key'] != $mysql_keys['right_web_global_server']) || $user_right['right_web']['key'] != $mysql_keys['right_web'])
5959
{
6060
reloadSite(RELOAD_TO_SERVERVIEW);
6161
};
@@ -118,14 +118,14 @@ function getTime($timestamp)
118118
<a class="nav-link active" href="#clientInformations" data-toggle="tab"><?php echo $language['informations']; ?></a>
119119
</li>
120120
<li class="nav-item clientViewPills">
121-
<?php if(strpos($user_right['right_web_client_actions'][$_REQUEST['instanz']], $_REQUEST['port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
121+
<?php if(isPortPermission($user_right, $_REQUEST['instanz'], $_REQUEST['port'], 'right_web_client_actions') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
122122
<a class="nav-link" href="#clientActions" data-toggle="tab"><?php echo $language['actions']; ?></a>
123123
<?php } else { ?>
124124
<a class="nav-link disabled" href="#"><?php echo $language['actions']; ?></a>
125125
<?php } ?>
126126
</li>
127127
<li class="nav-item clientViewPills">
128-
<?php if(strpos($user_right['right_web_client_rights'][$_REQUEST['instanz']], $_REQUEST['port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
128+
<?php if(isPortPermission($user_right, $_REQUEST['instanz'], $_REQUEST['port'], 'right_web_client_rights') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
129129
<a class="nav-link" href="#clientRights" data-toggle="tab"><?php echo $language['permission']; ?></a>
130130
<?php } else { ?>
131131
<a class="nav-link disabled" href="#"><?php echo $language['permission']; ?></a>
@@ -358,7 +358,7 @@ function getTime($timestamp)
358358
</tbody>
359359
</table>
360360
</div>
361-
<?php if(strpos($user_right['right_web_client_actions'][$_REQUEST['instanz']], $_REQUEST['port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
361+
<?php if(isPortPermission($user_right, $_REQUEST['instanz'], $_REQUEST['port'], 'right_web_client_actions') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
362362
<div class="tab-pane" id="clientActions">
363363
<table class="table table-condensed table-hover">
364364
<thead>
@@ -445,7 +445,7 @@ function getTime($timestamp)
445445
</div>
446446
</div>
447447
<?php } ?>
448-
<?php if(strpos($user_right['right_web_client_rights'][$_REQUEST['instanz']], $_REQUEST['port']) !== false || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
448+
<?php if(isPortPermission($user_right, $_REQUEST['instanz'], $_REQUEST['port'], 'right_web_client_rights') || $user_right['right_web_global_server']['key'] == $mysql_keys['right_web_global_server']) { ?>
449449
<div class="tab-pane" id="clientRights">
450450
<table class="table table-condensed table-hover">
451451
<thead>

‎updater/functions.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@
115115
};
116116
};
117117

118+
// Check local config
119+
if(!is_writable(__dir__."/../config/config.php"))
120+
{
121+
if(!chmod(__dir__."/../config/config.php", 0666))
122+
{
123+
echo '<li>config/config.php........... FAILED (CAN NOT SET PERMISSION TO 0666)</li>';
124+
$permissionCheck = false;
125+
};
126+
};
127+
118128
$zipHandle = zip_open($filename);
119129
if($permissionCheck)
120130
{

0 commit comments

Comments
 (0)