maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

beautify ip-list when editing a domain as customer; correct 'sed'-command for fpm-setup for debian wheezy; add note for ftp-path validation (bug #1231)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-09-20 10:58:36 +02:00
parent 0475751cee
commit 98f1bc49fd
3 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
customer_domains.php
View File

@@ -429,8 +429,6 @@ elseif($page == 'domains')
$alias_check = $alias_check['count']; $alias_check = $alias_check['count'];
$_doredirect = false; $_doredirect = false;
if(isset($result['customerid']) if(isset($result['customerid'])
&& $result['customerid'] == $userinfo['customerid']) && $result['customerid'] == $userinfo['customerid'])
{ {
@@ -625,22 +623,8 @@ elseif($page == 'domains')
$resultips = $db->query("SELECT `p`.`ip` AS `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` `p` LEFT JOIN `".TABLE_DOMAINTOIP."` `dip` ON ( `dip`.`id_ipandports` = `p`.`id` ) WHERE `dip`.`id_domain` = '".(int)$result['id']."' GROUP BY `p`.`ip`"); $resultips = $db->query("SELECT `p`.`ip` AS `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` `p` LEFT JOIN `".TABLE_DOMAINTOIP."` `dip` ON ( `dip`.`id_ipandports` = `p`.`id` ) WHERE `dip`.`id_domain` = '".(int)$result['id']."' GROUP BY `p`.`ip`");
$result_ipandport['ip'] = ''; $result_ipandport['ip'] = '';
while ($rowip = $db->fetch_array($resultips)) while ($rowip = $db->fetch_array($resultips)) {
{ $result_ipandport['ip'] .= $rowip['ip'] . "<br />";
if(filter_var($rowip['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
{
$result_ipandport['ip'] .= '[' . $rowip['ip'] . ']' . "&nbsp;&nbsp;\n";
}
else
{
$result_ipandport['ip'] .= $rowip['ip'] . "&nbsp;&nbsp;\n";
}
}
if(filter_var($result_ipandport['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
{
$result_ipandport['ip'] = '[' . $result_ipandport['ip'] . ']';
} }
$domainip = $result_ipandport['ip']; $domainip = $result_ipandport['ip'];

2
customer_ftp.php
View File

@@ -112,6 +112,7 @@ if ($page == 'overview') {
if (isset($_POST['send']) if (isset($_POST['send'])
&& $_POST['send'] == 'send' && $_POST['send'] == 'send'
) { ) {
// @FIXME use a good path-validating regex here (refs #1231)
$path = validate($_POST['path'], 'path'); $path = validate($_POST['path'], 'path');
$password = validate($_POST['ftp_password'], 'password'); $password = validate($_POST['ftp_password'], 'password');
$password = validatePassword($password); $password = validatePassword($password);
@@ -241,6 +242,7 @@ if ($page == 'overview') {
if (isset($_POST['send']) if (isset($_POST['send'])
&& $_POST['send'] == 'send' && $_POST['send'] == 'send'
) { ) {
// @FIXME use a good path-validating regex here (refs #1231)
$path = validate($_POST['path'], 'path'); $path = validate($_POST['path'], 'path');
$_setnewpass = false; $_setnewpass = false;

2
lib/configfiles/wheezy.inc.php
View File

@@ -421,7 +421,7 @@ return Array(
'# this is needed for libapache2-mod-fastcgi to install', '# this is needed for libapache2-mod-fastcgi to install',
'apt-get install apache2-suexec libapache2-mod-fastcgi php5-fpm', 'apt-get install apache2-suexec libapache2-mod-fastcgi php5-fpm',
'# change fpm-configuration directory to "/etc/php5/fpm/pool.d/" in froxlor', '# change fpm-configuration directory to "/etc/php5/fpm/pool.d/" in froxlor',
'sed -i.bak \'s/^;include=\/etc\/php5\/fpm/*.conf/include=include=\/etc\/php5\/fpm\/pool.d\/*.conf/\' /etc/php5/fpm/php-fpm.conf', 'sed -e \'s|;include=\/etc\/php5\/fpm\/\*.conf|include=\/etc\/php5\/fpm\/pool.d\/\*.conf|g\' -i /etc/php5/fpm/php-fpm.conf',
'rm /etc/php5/fpm/pool.d/www.conf', 'rm /etc/php5/fpm/pool.d/www.conf',
'a2enmod suexec fastcgi actions', 'a2enmod suexec fastcgi actions',
($settings['phpfpm']['enabled_ownvhost'] == '1') ? 'groupadd -f '.$settings['phpfpm']['vhost_httpgroup'] : null, ($settings['phpfpm']['enabled_ownvhost'] == '1') ? 'groupadd -f '.$settings['phpfpm']['vhost_httpgroup'] : null,