From 327124d51ae99f45b83d689fe6ceaa14b202e924 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 17 Nov 2008 12:45:57 -0500
Subject: [PATCH] Fixed: SSL vhost configuration not created when not all fields are filled.
---
interface/web/sites/web_domain_edit.php | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index 0a39a25..0c9fec1 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -75,6 +75,7 @@
function onShowEnd() {
global $app, $conf;
+ // If the logged in user is not admin and has no sub clients (no rseller)
if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the limits of the client
@@ -89,7 +90,8 @@
// Fill the IP select field with the IP addresses that are allowed for this client
$ip_select = "<option value='*'>*</option>";
$app->tpl->setVar("ip_address",$ip_select);
-
+
+ // If the logged in user is not admin and has sub clients (is a rseller)
} elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the limits of the client
@@ -116,12 +118,13 @@
// Fill the IP select field with the IP addresses that are allowed for this client
$ip_select = "<option value='*'>*</option>";
$app->tpl->setVar("ip_address",$ip_select);
-
+
+ // If the logged in user is admin
} else {
// The user is admin, so we fill in all IP addresses of the server
if($this->id > 0) {
- $server_id = $this->dataRecord["server_id"];
+ $server_id = @$this->dataRecord["server_id"];
} else {
// Get the first server ID
$tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
@@ -242,6 +245,22 @@
$app->db->query($sql);
}
+ function onBeforeUpdate () {
+ global $app, $conf;
+
+ //* Check that all fields for the SSL cert creation are filled
+ if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'create') {
+ if($this->dataRecord['ssl_state'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_state_empty').'<br />';
+ if($this->dataRecord['ssl_locality'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_locality_empty').'<br />';
+ if($this->dataRecord['ssl_organisation'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_empty').'<br />';
+ if($this->dataRecord['ssl_organisation_unit'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_organisation_unit_empty').'<br />';
+ if($this->dataRecord['ssl_country'] == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_country_empty').'<br />';
+ }
+
+ }
+
+
+
function onAfterUpdate() {
global $app, $conf;
--
Gitblit v1.9.1