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 pull request #1283 from Nexus633/master

Browse Source 
FIX for PHP < 7.0.0 -> FILTER_VALIDATE_DOMAIN (Available as of PHP 7.0.0), Prepare to remove the Rootmodule and Network Module, Fix insert Rootmodule without text and links
This commit is contained in:
Andre Rohlf 2020-07-27 22:54:17 +02:00 committed by GitHub
commit 5592efaa08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stuff/admin/admin_modules.php
View File

@ -160,7 +160,7 @@ if ($ui->st('action', 'post') and !token(true)) {
$coreModuleFound = false;
if (!$sub or !in_array($sub, array('gs', 'pa', 'mo', 'my', 'ro', 'ti', 'us', 'vo','ws')) ) {
if (!$sub or !in_array($sub, array('gs', 'pa', 'mo', 'my', 'ti', 'us', 'vo','ws')) ) {
$errors['sub'] = $sprache->sub;
}

24
stuff/methods/class_validator.php
View File

@ -251,8 +251,18 @@ class ValidateUserinput {
$check = $this->if_obj_or_str($value, $type, $object);
// check if is Hostname
// FIX for PHP < 7.0.0 -> FILTER_VALIDATE_DOMAIN (Available as of PHP 7.0.0)
if(!defined("FILTER_VALIDATE_DOMAIN")){
$filter = FILTER_VALIDATE_IP;
if(is_string($check)){
$check = gethostbyname($check);
}
}else{
$filter = FILTER_VALIDATE_DOMAIN;
}
if ($check and is_string($check) and filter_var($check, FILTER_VALIDATE_DOMAIN)){
if ($check and is_string($check) and filter_var($check, $filter)){
return $check;
} else if ($check and is_string($check) and filter_var($check, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)){
return $check;
@ -281,7 +291,17 @@ class ValidateUserinput {
$check = $this->if_obj_or_str($value, $type, $object);
// check if is Hostname
if ($check and is_string($check) and filter_var($check, FILTER_VALIDATE_DOMAIN)){
// FIX for PHP < 7.0.0 -> FILTER_VALIDATE_DOMAIN (Available as of PHP 7.0.0)
if(!defined("FILTER_VALIDATE_DOMAIN")){
$filter = FILTER_VALIDATE_IP;
if(is_string($check)){
$check = gethostbyname($check);
}
}else{
$filter = FILTER_VALIDATE_DOMAIN;
}
if ($check and is_string($check) and filter_var($check, $filter)){
return $check;
} else if ($check and is_string($check) and filter_var($check, FILTER_VALIDATE_IP)){
return $check;

4
stuff/methods/vorlage.php
View File

@ -56,6 +56,10 @@ function isip($value, $ipx) {
}
function ishostname($value){
// FIX for PHP < 7.0.0 -> FILTER_VALIDATE_DOMAIN (Available as of PHP 7.0.0)
if(!defined("FILTER_VALIDATE_DOMAIN")){
return isdomain($value);
}
return (filter_var($value, FILTER_VALIDATE_DOMAIN) !== false) ? $value : false;
}

35
template/default/admin/admin_header.tpl
View File

@ -475,25 +475,26 @@
</li>
<?php } ?>
<?php if($easywiModules['ro'] and (($pa['modvserver'] or $pa['delvserver'] or $pa['usevserver'] or $pa['dedicatedServer'] or ($pa['vserverhost'] and $reseller_id==0)) or ($pa['resellertemplates'] and $reseller_id==0))) { ?>
<li class="treeview <?php if(in_array($w,array('vs','rh','vh','ot')) or isset($customModules['ro'][$ui->smallletters('w',255,'get')])) echo 'active';?>">
<a href="#">
<i class="fa fa-laptop fa-fw"></i>
<span>Rootserver</span>
<span class="pull-right-container">
<!-- Rootmodul -->
<?php /* if($easywiModules['ro'] and (($pa['modvserver'] or $pa['delvserver'] or $pa['usevserver'] or $pa['dedicatedServer'] or ($pa['vserverhost'] and $reseller_id==0)) or ($pa['resellertemplates'] and $reseller_id==0))) { ?>
<li class="treeview <?php if(in_array($w,array('vs','rh','vh','ot')) or isset($customModules['ro'][$ui->smallletters('w',255,'get')])) echo 'active';?>">
<a href="#">
<i class="fa fa-laptop fa-fw"></i>
<span>Rootserver</span>
<span class="pull-right-container">
<i class="fa fa-angle-left pull-right"></i>
</span>
</a>
<ul class="treeview-menu">
<?php if($pa['modvserver'] or $pa['delvserver'] or $pa['usevserver']) { ?><li <?php if($ui->smallletters('w',255,'get')=='vs') echo 'class="active"';?>><a href="admin.php?w=vs&amp;d=md"><i class="fa fa-cloud"></i> <?php echo $gsprache->virtual;?></a></li><?php } ?>
<?php if($pa['dedicatedServer']) { ?><li <?php if($ui->smallletters('w',255,'get')=='rh') echo 'class="active"';?>><a href="admin.php?w=rh"><i class="fa fa-laptop"></i> <?php echo $gsprache->dedicated;?></a></li><?php } ?>
<?php if($pa['vserverhost'] and $reseller_id==0) { ?><li <?php if($ui->smallletters('w',255,'get')=='vh') echo 'class="active"';?>><a href="admin.php?w=vh"><i class="fa fa-server"></i> ESX(I) Host</a></li><?php } ?>
<?php if($pa['resellertemplates'] and $reseller_id==0) { ?><li <?php if($ui->smallletters('w',255,'get')=='ot') echo 'class="active"';?>><a href="admin.php?w=ot"><i class="fa fa-file-text-o"></i> <?php echo $gsprache->template;?></a></li><?php } ?>
<?php foreach ($customModules['ro'] as $k => $v) { echo '<li '; echo ($ui->smallletters('w',255,'get')==$k) ? 'class="active"' : ''; echo '><a href="admin.php?w='.$k.'">'.$v.'</a></li>'; }; ?>
</ul>
</li>
</a>
<ul class="treeview-menu">
<?php if($pa['modvserver'] or $pa['delvserver'] or $pa['usevserver']) { ?><li <?php if($ui->smallletters('w',255,'get')=='vs') echo 'class="active"';?>><a href="admin.php?w=vs&amp;d=md"><i class="fa fa-cloud"></i> <?php echo $gsprache->virtual;?></a></li><?php } ?>
<?php if($pa['dedicatedServer']) { ?><li <?php if($ui->smallletters('w',255,'get')=='rh') echo 'class="active"';?>><a href="admin.php?w=rh"><i class="fa fa-laptop"></i> <?php echo $gsprache->dedicated;?></a></li><?php } ?>
<?php if($pa['vserverhost'] and $reseller_id==0) { ?><li <?php if($ui->smallletters('w',255,'get')=='vh') echo 'class="active"';?>><a href="admin.php?w=vh"><i class="fa fa-server"></i> ESX(I) Host</a></li><?php } ?>
<?php if($pa['resellertemplates'] and $reseller_id==0) { ?><li <?php if($ui->smallletters('w',255,'get')=='ot') echo 'class="active"';?>><a href="admin.php?w=ot"><i class="fa fa-file-text-o"></i> <?php echo $gsprache->template;?></a></li><?php } ?>
<?php foreach ($customModules['ro'] as $k => $v) { echo '<li '; echo ($ui->smallletters('w',255,'get')==$k) ? 'class="active"' : ''; echo '><a href="admin.php?w='.$k.'">'.$v.'</a></li>'; }; ?>
</ul>
</li>
<?php } ?>
<!-- Rootmodul Traffic/Subnet -->
<?php if($easywiModules['ro'] and ($pa['traffic'] or ($reseller_id=='0' and ($pa['trafficsettings'] or $pa['dhcpServer'] or $pa['pxeServer'] or $pa['root'])))) { ?>
<li class="treeview <?php if(in_array($w,array('tf','rd','rp','sn'))) echo 'active';?>">
<a href="#">
@ -511,7 +512,7 @@
<?php if($pa['root'] and $reseller_id==0) { ?><li <?php if($ui->smallletters('w',255,'get')=='sn') echo 'class="active"';?>><a href="admin.php?w=sn"><i class="fa fa-sitemap"></i> <?php echo $gsprache->subnets;?></a></li><?php } ?>
</ul>
</li>
<?php } ?>
<?php } */?>
<?php if(count($customModules['mo'])>0) { ?>
<li class="treeview <?php if(isset($customModules['mo'][$ui->smallletters('w',255,'get')])) echo 'active';?>">