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/mail/templates/mail_domain_edit.htm | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 9ad308b..307b0d1 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -11,22 +11,22 @@
<label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='server_id'}
- </select>
- </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </select></div>
+ <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
- </select>
- </div></tmpl_if>
+ </select></div>
+ </tmpl_if>
</div>
<tmpl_unless name="domain_option">
<div class="form-group">
<label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
<div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
</tmpl_unless>
<tmpl_else>
<tmpl_if name="only_one_server">
@@ -37,14 +37,14 @@
<label for="server_id_disabled" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id_disabled" id="server_id_disabled" class="form-control" disabled="disabled">
{tmpl_var name='client_server_id'}
- </select>
- </div><input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
+ </select></div>
+ <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" />
<tmpl_else>
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='client_server_id'}
- </select>
- </div></tmpl_if>
+ </select></div>
+ </tmpl_if>
</div>
</tmpl_if>
</tmpl_if>
@@ -55,8 +55,8 @@
<label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
<div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
{tmpl_var name='client_group_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
</tmpl_unless>
</tmpl_if>
@@ -65,16 +65,16 @@
<tmpl_if name="domain_option">
<div class="col-sm-9"><select name="domain" id="domain" class="form-control">
{tmpl_var name='domain_option'}
- </select>
- </div><tmpl_else>
+ </select></div>
+ <tmpl_else>
<div class="col-sm-9"><input type="text" name="domain" id="domain" value="{tmpl_var name='domain'}" class="form-control" /></div></tmpl_if>
</div>
<div class="form-group">
<label for="policy" class="col-sm-3 control-label">{tmpl_var name='policy_txt'}</label>
<div class="col-sm-9"><select name="policy" id="policy" class="form-control">
{tmpl_var name='policy'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
<div class="col-sm-9">
@@ -86,8 +86,8 @@
<tmpl_else>
<input type="hidden" name="domain_module" value="0" id="domain_module" />
</tmpl_if>
- <div class="subsectiontoggle"><span></span>{tmpl_var name='dkim_settings_txt'}<em></em></div>
- <div style="display:none;">
+ <div class="col-sm-12"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-dkim" aria-expanded="false" aria-controls="toggle-dkim">{tmpl_var name='dkim_settings_txt'}</button></div>
+ <div id="toggle-dkim" class="collapse">
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='dkim_txt'}</label>
<div class="col-sm-9">
@@ -100,8 +100,8 @@
<div class="form-group">
<label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>
<div class="col-sm-9"><textarea class="form-control" name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>
-<a href="javascript:setRequest('create')">{tmpl_var name='dkim_generate_txt'}</a>
</div>
+ <a class="btn btn-default formbutton-default" href="javascript:setRequest('create')" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>
<div class="form-group">
<div class="col-sm-9"><textarea class="form-control" name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
</div>
@@ -118,7 +118,7 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<input type="hidden" name="type" value="local">
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','mail/mail_domain_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_domain_edit.php">{tmpl_var name='btn_save_txt'}</button>
<button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_domain_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
<script language="JavaScript" type="text/javascript" src="js/mail_domain_dkim.js"></script>
--
Gitblit v1.9.1