- ported some patches

Marius Cramer

2015-04-15 0998a322e2704bfde459a34c39e92ebaa2dd638d

- ported some patches

 install/install.php

@@ -627,19 +627,7 @@
        //* Configure Bastille Firewall
        $conf['services']['firewall'] = true;
        swriteln('Configuring Bastille Firewall');
        $inst->configure_firewall();
        /*} elseif($conf['ufw']['installed'] == true) {
            //* Configure Ubuntu Firewall
            $conf['services']['firewall'] = true;
            swriteln('Configuring Ubuntu Firewall');
            $inst->configure_ufw_firewall();
        } else {
            //* Configure Bastille Firewall
            $conf['services']['firewall'] = true;
            swriteln('Configuring Bastille Firewall');
            $inst->configure_bastille_firewall();
        }
        */
        $inst->configure_bastille_firewall();
    }

    //** Configure Firewall

 interface/web/admin/templates/language_import.htm

@@ -23,7 +23,7 @@
                <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="id" value="{tmpl_var name='id'}">

 interface/web/admin/templates/system_config_misc_edit.htm

@@ -109,7 +109,7 @@
                <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="id" id="id" value="{tmpl_var name='id'}">

 interface/web/client/templates/client_message.htm

@@ -9,7 +9,7 @@
                <div id="OKMsg"><p><tmpl_var name="okmsg"></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>
            <div class="form-group">
                <label for="sender" class="col-sm-3 control-label">{tmpl_var name='sender_txt'}</label>

 interface/web/dns/templates/dns_import.htm

@@ -49,7 +49,7 @@
                <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="id" value="{tmpl_var name='id'}">

 interface/web/dns/templates/dns_wizard.htm

@@ -4,7 +4,7 @@
<p><tmpl_var name="list_desc_txt"></p>

<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>



 interface/web/login/logout.php

@@ -43,9 +43,11 @@
if ((isset($_SESSION['s_old']) && ($_SESSION['s_old']['user']['typ'] == 'admin' || $app->auth->has_clients($_SESSION['s_old']['user']['userid']))) &&
    (!$forceLogout)){
    $utype = ($_SESSION['s_old']['user']['typ'] == 'admin' ? 'admin' : 'reseller');
    $lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_login_as.lng';
    include $lng_file;
    echo '
        <br /> <br />    <br /> <br />
        Do you want to re-login as ' . $utype . ' or log out?<br />
        '.str_replace('{UTYPE}', $utype, $wb['login_as_or_logout_txt']).'<br />
        <div style="visibility:hidden">
            <input type="text" name="username" value="' . $_SESSION['s_old']['user']['username'] . '" />
            <input type="password" name="passwort" value="' . $_SESSION['s_old']['user']['passwort'] .'" />

 interface/web/login/templates/password_reset.htm

@@ -9,7 +9,7 @@
        <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>

    <div class="pnl_formsarea">

 interface/web/mail/templates/mail_user_backup_list.htm

@@ -2,7 +2,7 @@
    <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>
<h3><tmpl_var name="list_head_txt"></h3>


 interface/web/sites/templates/web_backup_list.htm

@@ -2,7 +2,7 @@
    <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>
<h3><tmpl_var name="list_head_txt"></h3>


 interface/web/sites/web_vhost_domain_edit.php

@@ -693,6 +693,10 @@
                $domain_select .= "<option value=''></option>\r\n";
            }
            $app->tpl->setVar("domain_option", $domain_select);
        } else {

            // remove the parent domain part of the domain name before we show it in the text field.
            if($this->dataRecord["type"] == 'vhostsubdomain') $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
        }
        if($this->_vhostdomain_type != 'domain') $app->tpl->setVar("domain", $this->dataRecord["domain"]);


 interface/web/tools/templates/dns_import_tupa.htm

@@ -25,7 +25,7 @@
            <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="id" value="{tmpl_var name='id'}">

 interface/web/tools/templates/import_ispconfig.htm

@@ -70,7 +70,7 @@
        <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'}">

 interface/web/tools/templates/import_plesk.htm

@@ -42,7 +42,7 @@
            <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="id" value="{tmpl_var name='id'}">

 interface/web/tools/templates/import_vpopmail.htm

@@ -34,7 +34,7 @@
        <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'}">

 interface/web/vm/templates/openvz_action.htm

@@ -10,7 +10,7 @@
                <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>
                
            <div class="form-group">