- don't set password via remoting if field is empty

Marius Cramer

2015-08-06 37b29231e47a0c4458dc1c15d98588f16f07e1e2

 interface/web/tools/templates/import_ispconfig.htm

@@ -15,13 +15,11 @@
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">Remote User</label>
                <div class="col-sm-9">
                    <div class="col-sm-9"><input class="form-control" type="text" id="remote_user" value="{tmpl_var name='remote_user'}" name="remote_user" /></div></div>
                <div class="col-sm-9"><input class="form-control" type="text" id="remote_user" value="{tmpl_var name='remote_user'}" name="remote_user" /></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">Remote password</label>
                <div class="col-sm-9">
                    <div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" /></div></div>
                <div class="col-sm-9"><input class="form-control" type="text" id="remote_password" value="{tmpl_var name='remote_password'}" name="remote_password" /></div>
            </div>
        
    </div>
@@ -42,33 +40,27 @@
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">{tmpl_var name="import_mailbox_txt"}</label>
                    <div class="col-sm-9">
                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" /></div></div>
                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_mailbox" value="1" name="import_mailbox" checked="checked" /></div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">{tmpl_var name="import_user_filter_txt"}</label>
                    <div class="col-sm-9">
                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_user_filter" value="1" name="import_user_filter" checked="checked" /></div></div>
                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_user_filter" value="1" name="import_user_filter" checked="checked" /></div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">{tmpl_var name="import_spamfilter_txt"}</label>
                    <div class="col-sm-9">
                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_spamfilter" value="1" name="import_spamfilter" checked="checked" /></div></div>
                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_spamfilter" value="1" name="import_spamfilter" checked="checked" /></div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">{tmpl_var name="import_alias_txt"}</label>
                    <div class="col-sm-9">
                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_alias" value="1" name="import_alias" checked="checked" /></div></div>
                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_alias" value="1" name="import_alias" checked="checked" /></div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">{tmpl_var name="import_forward_txt"}</label>
                    <div class="col-sm-9">
                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_forward" value="1" name="import_forward" checked="checked" /></div></div>
                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_forward" value="1" name="import_forward" checked="checked" /></div>
                </div>
                <div class="form-group">
                    <label class="col-sm-3 control-label">{tmpl_var name="import_aliasdomain_txt"}</label>
                    <div class="col-sm-9">
                        <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" /></div></div>
                    <div class="col-sm-9"><input class="form-control" type="checkbox" id="import_aliasdomain" value="1" name="import_aliasdomain" checked="checked" /></div>
                </div>
            
        </div>
@@ -78,19 +70,19 @@
        <div id="OKMsg"><p><tmpl_var name="msg"></p></div>
    </tmpl_if>
    <tmpl_if name="error">
        <div id="errorMsg"><h3>ERROR</h3><ol><tmpl_var name="error"></ol></div>
        <div id="errorMsg"><h3><tmpl_var name="error_txt"></h3><ol><tmpl_var name="error"></ol></div>
    </tmpl_if>
   
    <input type="hidden" name="remote_session_id" value="{tmpl_var name='remote_session_id'}">
    <input type="hidden" name="connected" value="{tmpl_var name='connected'}">
    <tmpl_if name="connected">
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');">{tmpl_var name="btn_start_txt"}</button>
            <button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/import_ispconfig.php">{tmpl_var name="btn_start_txt"}</button>
            <button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">{tmpl_var name="btn_cancel_txt"}</button>
        </div></div>
    <tmpl_else>
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="Import" onClick="submitForm('pageForm','tools/import_ispconfig.php');">{tmpl_var name="btn_connect_txt"}</button>
            <button class="btn btn-default formbutton-success" type="button" value="Import" data-submit-form="pageForm" data-form-action="tools/import_ispconfig.php">{tmpl_var name="btn_connect_txt"}</button>
            <button class="btn btn-default formbutton-default" type="button" value="Cancel" data-load-content="tools/index.php">{tmpl_var name="btn_cancel_txt"}</button>
        </div></div>
    </tmpl_if>