Skip to content

GitLab

Commit 0e6d0529 authored by Till Brehm's avatar Till Brehm
Browse files
Options

Some improvements for Commit a39f3677

parent a39f3677
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
interface/web/admin/form/server_config.tform.php
View file @ 0e6d0529
...@@ -1101,6 +1101,14 @@ $form["tabs"]['web'] = array( ...@@ -1101,6 +1101,14 @@ $form["tabs"]['web'] = array(
'validators' => array( 0 => array('type' => 'NOTEMPTY', 'validators' => array( 0 => array('type' => 'NOTEMPTY',
'errmsg' => 'php_default_name_error_empty'), 'errmsg' => 'php_default_name_error_empty'),
), ),
'filters' => array(
0 => array( 'event' => 'SAVE',
'type' => 'TRIM'),
1 => array( 'event' => 'SAVE',
'type' => 'STRIPTAGS'),
2 => array( 'event' => 'SAVE',
'type' => 'STRIPNL')
),
'width' => '40', 'width' => '40',
'maxlength' => '255' 'maxlength' => '255'
), ),
......
interface/web/sites/web_vhost_domain_edit.php
View file @ 0e6d0529
...@@ -257,7 +257,7 @@ class page_action extends tform_actions { ...@@ -257,7 +257,7 @@ class page_action extends tform_actions {
$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y'", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']); $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y'", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
} }
} }
$php_select = "<option value=''>".$web_config['php_default_name']."</option>"; $php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
if(is_array($php_records) && !empty($php_records)) { if(is_array($php_records) && !empty($php_records)) {
foreach( $php_records as $php_record) { foreach( $php_records as $php_record) {
if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){ if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
...@@ -404,7 +404,7 @@ class page_action extends tform_actions { ...@@ -404,7 +404,7 @@ class page_action extends tform_actions {
$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y'", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']); $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND (client_id = 0 OR client_id=?) AND active = 'y'", $parent_domain['server_id'], $_SESSION['s']['user']['client_id']);
} }
} }
$php_select = "<option value=''>".$web_config['php_default_name']."</option>"; $php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
if(is_array($php_records) && !empty($php_records)) { if(is_array($php_records) && !empty($php_records)) {
foreach( $php_records as $php_record) { foreach( $php_records as $php_record) {
if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){ if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
...@@ -624,7 +624,7 @@ class page_action extends tform_actions { ...@@ -624,7 +624,7 @@ class page_action extends tform_actions {
$php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y'", $parent_domain['server_id']); $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = ? AND active = 'y'", $parent_domain['server_id']);
} }
} }
$php_select = "<option value=''>".$web_config['php_default_name']."</option>"; $php_select = "<option value=''>".$app->functions->htmlentities($web_config['php_default_name'])."</option>";
if(is_array($php_records) && !empty($php_records)) { if(is_array($php_records) && !empty($php_records)) {
foreach( $php_records as $php_record) { foreach( $php_records as $php_record) {
if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){ if($this->dataRecord['php'] == 'php-fpm' || ($this->dataRecord['php'] == 'hhvm' && $server_type == 'nginx')){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment