the altertable for the groups

latham

2011-05-25 f99b37f56dad8e3a1f844f8d3b33ee1ba4b86d62

 interface/web/mail/mail_user_edit.php

@@ -75,7 +75,7 @@
      $app->tpl->setVar("email_local_part",$email_parts[0]);
      
      // Getting Domains of the user
      $sql = "SELECT domain FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
      $sql = "SELECT domain, server_id FROM mail_domain WHERE ".$app->tform->getAuthSQL('r').' ORDER BY domain';
      $domains = $app->db->queryAllRecords($sql);
      $domain_select = '';
      if(is_array($domains)) {
@@ -112,6 +112,14 @@
         $app->tpl->setVar("ar_active", 'checked="checked"');
      } else {
         $app->tpl->setVar("ar_active", '');
      }
		
    $app->uses('getconf');
    $mail_config = $app->getconf->get_global_config('mail');
      if($mail_config["enable_custom_login"] == "y") {
          $app->tpl->setVar("enable_custom_login", 1);
      } else {
          $app->tpl->setVar("enable_custom_login", 0);
      }
      
      parent::onShowEnd();
@@ -165,6 +173,9 @@
      } // end if user is not admin
      

    $app->uses('getconf');
    $mail_config = $app->getconf->get_server_config($domain["server_id"],'mail');
		
      //* compose the email field
      if(isset($_POST["email_local_part"]) && isset($_POST["email_domain"])) {
         $this->dataRecord["email"] = strtolower($_POST["email_local_part"]."@".$_POST["email_domain"]);
@@ -179,8 +190,6 @@
         if($this->dataRecord["quota"] != -1) $this->dataRecord["quota"] = $this->dataRecord["quota"] * 1024 * 1024;
      
         // setting Maildir, Homedir, UID and GID
         $app->uses('getconf');
         $mail_config = $app->getconf->get_server_config($domain["server_id"],'mail');
         $maildir = str_replace("[domain]",$domain["domain"],$mail_config["maildir_path"]);
         $maildir = str_replace("[localpart]",strtolower($_POST["email_local_part"]),$maildir);
         $this->dataRecord["maildir"] = $maildir;
@@ -195,6 +204,13 @@
         
      }
      
    $sys_config = $app->getconf->get_global_config('mail');
    if($sys_config["enable_custom_login"] == "y") {
        if(!isset($_POST["login"])) $this->dataRecord["login"] = $this->dataRecord["email"];
        elseif(strpos($_POST["login"], '@') !== false && $_POST["login"] != $this->dataRecord["email"]) $app->tform->errorMessage .= $app->tform->lng("error_login_email_txt")."<br>";
      } else {
        $this->dataRecord["login"] = $this->dataRecord["email"];
      }
      //* if autoresponder checkbox not selected, do not save dates
      if (!isset($_POST['autoresponder']) && array_key_exists('autoresponder_start_date', $_POST)) {
         $this->dataRecord['autoresponder_start_date'] = array_map(create_function('$item','return 0;'), $this->dataRecord['autoresponder_start_date']);
@@ -214,6 +230,9 @@
      // send a welcome email to create the mailbox
//      mail($this->dataRecord["email"],$app->tform->wordbook["welcome_mail_subject"],$app->tform->wordbook["welcome_mail_message"]);
      
      /*
      // the conversion to iso-8859-1 causes compatibility problems, therefore the transition to utf-8

      // tries to detect current charset, and encode subject-header and body from it to ISO-8859-1.
      $fromCharset      = mb_detect_encoding($app->tform->lng("welcome_mail_subject"));
      $iconvPreferences = array("input-charset" => $fromCharset,
@@ -235,13 +254,35 @@

      mail($mailTarget, $mailSubject, $mailBody, $mailHeaders);
      
      */

      $welcomeFromName  = $app->tform->lng("welcome_mail_fromname_txt");
      $welcomeFromEmail = $app->tform->lng("welcome_mail_fromemail_txt");
		
      $app->uses('getconf');
      $global_config = $app->getconf->get_global_config('mail');
      if(!empty($global_config['admin_mail']))$welcomeFromEmail = $global_config['admin_mail'];
      if(!empty($global_config['admin_name']))$welcomeFromName = $global_config['admin_name'];

      $mailHeaders      = "MIME-Version: 1.0" . "\n";
      $mailHeaders     .= "Content-type: text/plain; charset=utf-8" . "\n";
      $mailHeaders     .= "Content-Transfer-Encoding: 8bit" . "\n";
      $mailHeaders     .= "From: $welcomeFromName  <$welcomeFromEmail>" . "\n";
      $mailHeaders     .= "Reply-To: <$welcomeFromEmail>" . "\n";
      $mailTarget       = $this->dataRecord["email"];

      $mailSubject = "=?utf-8?Q?" . imap_8bit($app->tform->lng("welcome_mail_subject")) . "?=";
      $mailBody = $app->tform->lng("welcome_mail_message");

      mail($mailTarget, $mailSubject, $mailBody, $mailHeaders);
		
      // Spamfilter policy
      $policy_id = intval($this->dataRecord["policy"]);
      if($policy_id > 0) {
         $tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".mysql_real_escape_string($this->dataRecord["email"])."'");
         if($tmp_user["id"] > 0) {
            // There is already a record that we will update
            $app->db->datalogUpdate('spamfilter_users', "policy_id = $ploicy_id", 'id', $tmp_user["id"]);
            $app->db->datalogUpdate('spamfilter_users', "policy_id = $policy_id", 'id', $tmp_user["id"]);
         } else {
            // We create a new record
            $insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `priority`, `policy_id`, `email`, `fullname`, `local`) 
@@ -304,7 +345,8 @@
      }
      
      //** If the email address has been changed, change it in all aliases too
      if($this->oldDataRecord['email'] != $this->dataRecord['email']) {
      if(isset($this->dataRecord['email']) && $this->oldDataRecord['email'] != $this->dataRecord['email']) {
      //if($this->oldDataRecord['email'] != $this->dataRecord['email']) {
         
         //* Update the aliases
         $forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE destination = '".$app->db->quote($this->oldDataRecord['email'])."'");