From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 06 Aug 2015 03:18:44 -0400 Subject: [PATCH] - don't set password via remoting if field is empty --- interface/web/sites/form/web_vhost_domain.tform.php | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/interface/web/sites/form/web_vhost_domain.tform.php b/interface/web/sites/form/web_vhost_domain.tform.php index c342605..d232f12 100644 --- a/interface/web/sites/form/web_vhost_domain.tform.php +++ b/interface/web/sites/form/web_vhost_domain.tform.php @@ -41,16 +41,19 @@ $vhostdomain_type = 'domain'; $form_title = "Web Domain"; $validator_function = 'web_domain'; +$first_tab_title = "Domain"; if(isset($_SESSION['s']['var']['vhostdomain_type'])) { if($_SESSION['s']['var']['vhostdomain_type'] == 'subdomain') { $vhostdomain_type = 'subdomain'; $form_title = "Subdomain"; $validator_function = 'sub_domain'; + $first_tab_title = "Subomain"; } elseif($_SESSION['s']['var']['vhostdomain_type'] == 'aliasdomain') { $vhostdomain_type = 'aliasdomain'; $form_title = "Aliasdomain"; $validator_function = 'alias_domain'; + $first_tab_title = "Aliasomain"; } } @@ -85,7 +88,7 @@ $backup_available = ($vhostdomain_type == 'domain'); if(!$app->auth->is_admin()) { $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT limit_wildcard, limit_ssl, limit_backup FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + $client = $app->db->queryOneRecord("SELECT limit_wildcard, limit_ssl, limit_backup FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = ?", $client_group_id); if($client['limit_wildcard'] != 'y') $wildcard_available = false; if($client['limit_ssl'] != 'y') $ssl_available = false; @@ -96,7 +99,7 @@ $web_config = $app->getconf->get_global_config('sites'); $form["tabs"]['domain'] = array ( - 'title' => "Domain", + 'title' => $first_tab_title, 'width' => 100, 'template' => "templates/web_vhost_domain_edit.htm", 'readonly' => $web_domain_edit_readonly, @@ -273,6 +276,15 @@ 'default' => 'n', 'value' => array(0 => 'n', 1 => 'y') ), + 'enable_pagespeed' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array ( + 0 => 'n', + 1 => 'y' + ) + ), 'active' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', @@ -388,6 +400,15 @@ 'width' => '30', 'maxlength' => '255' ), + 'rewrite_to_https' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array ( + 0 => 'n', + 1 => 'y' + ) + ), //################################# // ENDE Datatable fields //################################# -- Gitblit v1.9.1