Keep reject-sender-mismatch-setting also when updating Fixed missing parts ...

Dominik

2015-04-05 20f478fd5e36bb03dd6850d3f5e8a2a459a6dc2b

 interface/web/mail/xmpp_domain_edit.php

@@ -49,14 +49,16 @@
$app->load('tform_actions');

class page_action extends tform_actions {
    var $_xmpp_type = 'domain';
    var $_xmpp_type = 'server';

    function onLoad() {
        $show_type = 'server';
        if(isset($_GET['type']) && $_GET['type'] == 'modules') {
        if(isset($_REQUEST['type']) && $_REQUEST['type'] == 'modules') {
            $show_type = 'modules';
        } elseif(isset($_GET['type']) && $_GET['type'] == 'muc') {
        } elseif(isset($_REQUEST['type']) && $_REQUEST['type'] == 'muc') {
            $show_type = 'muc';
        }elseif(isset($_REQUEST['type']) && $_REQUEST['type'] == 'ssl') {
            $show_type = 'ssl';
        }

        $_SESSION['s']['var']['xmpp_type'] = $show_type;
@@ -70,18 +72,18 @@

      // we will check only users, not admins
      if($_SESSION["s"]["user"]["typ"] == 'user') {
         if(!$app->tform->checkClientLimit('limit_xmppdomain')) {
         if(!$app->tform->checkClientLimit('limit_xmpp_domain')) {
            $app->error($app->tform->wordbook["limit_xmppdomain_txt"]);
         }
         if(!$app->tform->checkResellerLimit('limit_xmppdomain')) {
         if(!$app->tform->checkResellerLimit('limit_xmpp_domain')) {
            $app->error('Reseller: '.$app->tform->wordbook["limit_xmppdomain_txt"]);
         }
      } else {
         $settings = $app->getconf->get_global_config('xmpp');
         $app->tform->formDef['tabs']['domain']['fields']['server_id']['default'] = intval($settings['default_xmppserver']);
      }
        }
        $app->tform->formDef['tabs']['domain']['fields']['server_id']['default'] = intval($settings['default_xmppserver']);

      parent::onShowNew();
        parent::onShowNew();
   }

   function onShowEnd() {
@@ -89,6 +91,17 @@

      $app->uses('ini_parser,getconf');
      $settings = $app->getconf->get_global_config('domains');

        $read_limits = array('limit_xmpp_pastebin', 'limit_xmpp_httparchive', 'limit_xmpp_anon', 'limit_xmpp_vjud', 'limit_xmpp_proxy', 'limit_xmpp_status');
        if($_SESSION["s"]["user"]["typ"] != 'admin') {
            $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
            $client = $app->db->queryOneRecord("SELECT client." . implode(", client.", $read_limits) . " FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
            // add limits to template to be able to hide settings
            foreach($read_limits as $limit) $app->tpl->setVar($limit, $client[$limit]);
        }else{
            foreach($read_limits as $limit) $app->tpl->setVar($limit, 'y');
        }


      if($_SESSION["s"]["user"]["typ"] == 'admin' && $settings['use_domain_module'] != 'y') {
         // Getting Clients of the user
@@ -110,12 +123,7 @@

         // Get the limits of the client
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, client.default_xmppserver, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by client.contact_name");

         // Set the xmppserver to the default server of the client
         $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_xmppserver]");
         $app->tpl->setVar("server_id", "<option value='$client[default_xmppserver]'>$tmp[server_name]</option>");
         unset($tmp);
         $client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by client.contact_name");

         if ($settings['use_domain_module'] != 'y') {
            // Fill the client select field
@@ -231,7 +239,7 @@
      if($_SESSION["s"]["user"]["typ"] != 'admin') {
         // Get the limits of the client
         $client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
         $client = $app->db->queryOneRecord("SELECT limit_xmppdomain, default_xmppserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
         $client = $app->db->queryOneRecord("SELECT limit_xmpp_domain FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
         // When the record is updated
         if($this->id > 0) {
            // restore the server ID if the user is not admin and record is edited
@@ -247,9 +255,9 @@
               $app->error($app->tform->wordbook['error_not_allowed_server_id']);
            }

            if($client["limit_xmppdomain"] >= 0) {
            if($client["limit_xmpp_domain"] >= 0) {
               $tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM xmpp_domain WHERE sys_groupid = $client_group_id");
               if($tmp["number"] >= $client["limit_xmppdomain"]) {
               if($tmp["number"] >= $client["limit_xmpp_domain"]) {
                  $app->error($app->tform->wordbook["limit_xmppdomain_txt"]);
               }
            }
@@ -264,6 +272,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';
@@ -272,7 +282,7 @@
                    $this->dataRecord["management_method"] = 'maildomain';
                    // Check for corresponding mail domain
                    $tmp = $app->db->queryOneRecord("SELECT count(domain_id) AS number FROM mail_domain WHERE domain = '".$this->dataRecord["domain"]."' AND ".$app->tform->getAuthSQL('r')." ORDER BY domain");
                    if($tmp['count']==0){
                    if($tmp['number']==0){
                        $app->error($app->tform->wordbook["no_corresponding_maildomain_txt"]);
                        break;
                    }
@@ -295,6 +305,9 @@
            }
        }

        // Reset public registration to 'n', is not yet supported
        $this->dataRecord["public_registration"] = 'n';

      parent::onSubmit();
   }

@@ -316,8 +329,8 @@
        if(isset($this->dataRecord["domain"])) $this->dataRecord["domain"] = strtolower($this->dataRecord["domain"]);

        // create new accounts from mail domain
        if($this->dataRecord['management_method']=='maildomain')
            $this->syncMailusers($this->dataRecord['domain']);
        //if($this->dataRecord['management_method']=='maildomain')
        //    $this->syncMailusers($this->dataRecord['domain']);

        // Insert DNS Records
        $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, server_id, ttl, serial FROM dns_soa WHERE active = 'Y' AND origin = ?", $this->dataRecord['domain'].'.');
@@ -348,13 +361,28 @@
                //* If the user is neither admin nor reseller
            } else {
                //* We do not allow users to change a domain which has been created by the admin
                $rec = $app->db->queryOneRecord("SELECT sys_perm_group, domainfrom xmpp_domain WHERE domain_id = ".$this->id);
                $rec = $app->db->queryOneRecord("SELECT sys_perm_group, domain from xmpp_domain WHERE domain_id = ".$this->id);
                if(isset($this->dataRecord["domain"]) && $rec['domain'] != $this->dataRecord["domain"] && $app->tform->checkPerm($this->id, 'u')) {
                    //* Add a error message and switch back to old server
                    $app->tform->errorMessage .= $app->lng('The Domain can not be changed. Please ask your Administrator if you want to change the domain name.');
                    $this->dataRecord["domain"] = $rec['domain'];
                }
                unset($rec);
            }
        }

        if($this->_xmpp_type == 'ssl'){
            //* 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 />';
            }

            if(isset($this->dataRecord['ssl_action']) && $this->dataRecord['ssl_action'] == 'save') {
                if(trim($this->dataRecord['ssl_cert']) == '') $app->tform->errorMessage .= $app->tform->lng('error_ssl_cert_empty').'<br />';
            }
        }

@@ -367,17 +395,15 @@
      global $app, $conf;

        // create new accounts from mail domain
        if($this->oldDataRecord['management_method'] != 'maildomain' && $this->dataRecord['management_method']=='maildomain')
            $this->syncMailusers($this->dataRecord['domain']);
        //if($this->oldDataRecord['management_method'] != 'maildomain' && $this->dataRecord['management_method']=='maildomain')
        //    $this->syncMailusers($this->dataRecord['domain']);
        // or reset to normal permissions
        elseif($this->oldDataRecord['management_method'] == 'maildomain' && $this->dataRecord['management_method']!='maildomain')
            $this->desyncMailusers($this->dataRecord['domain']);
        //elseif($this->oldDataRecord['management_method'] == 'maildomain' && $this->dataRecord['management_method']!='maildomain')
        //    $this->desyncMailusers($this->dataRecord['domain']);
        // Update DNS Records
        // TODO: Update gets only triggered from main form. WHY?
        // TODO: if(in_array($this->_xmpp_type, array('muc', 'modules'))){
            $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM dns_soa WHERE active = 'Y' AND  = ?", $this->dataRecord['domain'].'.');
            if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
        //}
        $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM dns_soa WHERE active = 'Y' AND  = ?", $this->dataRecord['domain'].'.');
        if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
   }


@@ -445,6 +471,8 @@
        $app->db->datalogUpdate('dns_soa', "serial = '".$new_serial."'", 'id', $zone['id']);
    }

    /*
     * NOT YET FINISHED

    private function syncMailusers($domain){
        global $app, $conf;
@@ -505,6 +533,7 @@
            $app->db->datalogUpdate('xmpp_user', $u, 'xmppuser_id', $u['xmppuser_id']);
        }
    }
    */

}