Removed management method 'mailaccount' as long as maildomain hook is not i...

Michael Fürmann

2015-02-19 029167ad5dd7cc28a94c703a14d5d41ef92629a7

Removed management method 'mailaccount' as long as maildomain hook is not implemented

 interface/web/js/xmpp_domain_registration.js

@@ -1,4 +1,6 @@
$('document').ready(function(){
    // Not needed as long as maildomain hook is not implemented
    return;
    $('#management_method').on('select2-selecting', function(e){
        val = e.choice ? e.choice.id : e.target.selectedIndex;
        if(val == 0){

 interface/web/mail/templates/xmpp_domain_edit.htm

@@ -73,13 +73,16 @@




<!--
management by maildomain is currently not supported
<div class="form-group">
    <label for="management_method" class="col-sm-3 control-label">{tmpl_var name='management_method_txt'}</label>
    <div class="col-sm-9"><select name="management_method" id="management_method" class="form-control">
        {tmpl_var name='management_method'}
    </select></div>
</div>
-->
<input type="hidden" name="management_method" id="management_method" value="0" />

<div id="toggle-management-normal" class="collapse">
    <!--
@@ -92,7 +95,7 @@
    </div-->
</div>
        <input type="hidden" name="public_registration" id="public_registration" value="n" />
<div id="toggle-registration-closed" class="collapse">
<div id="toggle-registration-closed" class="collapse in">
    <div class="form-group">
        <label for="registration_url" class="col-sm-3 control-label">{tmpl_var name='registration_url_txt'}</label>
        <div class="col-sm-9">

 interface/web/mail/xmpp_domain_edit.php

@@ -264,6 +264,8 @@

        // Read management method
        if(isset($this->dataRecord["management_method"]))
            // Set management method to 0 as long as the mailaccount hook is not implemented
            $this->dataRecord["management_method"] = 0;
            switch($this->dataRecord["management_method"]){
                case 0:
                    $this->dataRecord["management_method"] = 'normal';