Removed code line from previous commit

Marius Cramer

2014-02-18 d58816c09edb3d1e2da2251ed4ea3a6657a1a06c

 server/plugins-available/mail_plugin.inc.php

@@ -93,7 +93,7 @@
      $base_path = implode('/', $tmp_basepath_parts);

      //* Set the email-uid and gid if not given
      if (($data['new']['uid'] == 999989999) || ($data['new']['gid'] == 999989999)) {
      if (($data['new']['uid'] == -1) || ($data['new']['gid'] == -1)) {
         $app->log('Setting uid and gid automatically',LOGLEVEL_DEBUG);
         if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') {
            $app->log('Map uid to linux-user',LOGLEVEL_DEBUG);
@@ -113,8 +113,8 @@
         }
      }
      // if nothing set before -> use standard mailuser uid and gid vmail
      if ($data['new']['uid'] == 999989999) $data['new']['uid'] = $mail_config["mailuser_uid"];
      if ($data['new']['gid'] == 999989999) $data['new']['gid'] = $mail_config["mailuser_gid"];
      if ($data['new']['uid'] == -1) $data['new']['uid'] = $mail_config["mailuser_uid"];
      if ($data['new']['gid'] == -1) $data['new']['gid'] = $mail_config["mailuser_gid"];
      $app->log('Mailuser uid: '.$data['new']['uid'].', gid: '.$data['new']['gid'],LOGLEVEL_DEBUG);

      // update DB if values changed
@@ -148,7 +148,7 @@
      if(!empty($maildomain_path) && !is_dir($maildomain_path)) {

         //exec("su -c 'maildirmake ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         $app->system->maildirmake($maildomain_path, $user, $group);
         $app->system->maildirmake($maildomain_path, $user, '', $group);

         //* This is to fix the maildrop quota not being rebuilt after the quota is changed.
         if($mail_config['pop3_imap_daemon'] != 'dovecot') {
@@ -160,22 +160,22 @@
      if(!is_dir($data['new']['maildir'].'/.Sent')) {
         //exec("su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log('Created submaildir Sent: '."su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group, 'Sent');
         $app->system->maildirmake($maildomain_path, $user, 'Sent', $group);
      }
      if(!is_dir($data['new']['maildir'].'/.Drafts')) {
         //exec("su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log('Created submaildir Drafts: '."su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group, 'Drafts');
         $app->system->maildirmake($maildomain_path, $user, 'Drafts', $group);
      }
      if(!is_dir($data['new']['maildir'].'/.Trash')) {
         //exec("su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log('Created submaildir Trash: '."su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group, 'Trash');
         $app->system->maildirmake($maildomain_path, $user, 'Trash', $group);
      }
      if(!is_dir($data['new']['maildir'].'/.Junk')) {
         //exec("su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log('Created submaildir Junk: '."su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group, 'Junk');
         $app->system->maildirmake($maildomain_path, $user, 'Junk', $group);
      }

      // Set permissions now recursive
@@ -257,6 +257,34 @@
      unset($tmp_basepath_parts[count($tmp_basepath_parts)-1]);
      $base_path = implode('/', $tmp_basepath_parts);

      //* Set the email-uid and gid if not given -> in case of changed settings again setting here
      if (($data['new']['uid'] == -1) || ($data['new']['gid'] == -1)) {
         $app->log('Setting uid and gid automatically',LOGLEVEL_DEBUG);
         if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') {
            $app->log('Map uid to linux-user',LOGLEVEL_DEBUG);
            $email_parts = explode('@',$data['new']['email']);
            $webdomain = $app->db->queryOneRecord("SELECT domain_id, server_id, system_user, parent_domain_id FROM web_domain WHERE domain = '".$app->db->quote($email_parts[1])."'");
            if ($webdomain) {
               while ($webdomain['parent_domain_id'] != 0) {
                  $webdomain = $app->db->queryOneRecord("SELECT domain_id, server_id, system_user, parent_domain_id FROM web_domain WHERE domain_id = '".$webdomain['parent_domain_id']."'");
               }
               $app->log($data['new']['server_id'].' == '.$webdomain['server_id'],LOGLEVEL_DEBUG);

               // only if web and mailserver are identical
               if ($data['new']['server_id'] == $webdomain['server_id']) {
                  $data['new']['uid'] = $app->system->getuid($webdomain['system_user']);
               }
            }
         }
      }
      // if nothing set before -> use standard mailuser uid and gid vmail
      if ($data['new']['uid'] == -1) $data['new']['uid'] = $mail_config["mailuser_uid"];
      if ($data['new']['gid'] == -1) $data['new']['gid'] = $mail_config["mailuser_gid"];
      $app->log('Mailuser uid: '.$data['new']['uid'].', gid: '.$data['new']['gid'],LOGLEVEL_DEBUG);

      // update DB if values changed
      $app->db->query("UPDATE mail_user SET uid = ".$data['new']['uid'].", gid = ".$data['new']['gid']." WHERE mailuser_id = ".$data['new']['mailuser_id']);

      $user = $app->system->getuser($data['new']['uid']);
      $group = $app->system->getgroup($data['new']['gid']);

@@ -284,7 +312,7 @@
      if(!empty($maildomain_path) && !is_dir($maildomain_path.'/new')) {
         //exec("su -c 'maildirmake ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log("Created Maildir "."su -c 'maildirmake ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group);
         $app->system->maildirmake($maildomain_path, $user, '', $group);

         //* This is to fix the maildrop quota not being rebuilt after the quota is changed.
         if($mail_config['pop3_imap_daemon'] != 'dovecot') {
@@ -301,22 +329,22 @@
      if(!is_dir($data['new']['maildir'].'/.Sent')) {
         //exec("su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log('Created submaildir Sent: '."su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group, 'Sent');
         $app->system->maildirmake($maildomain_path, $user, 'Sent', $group);
      }
      if(!is_dir($data['new']['maildir'].'/.Drafts')) {
         //exec("su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log('Created submaildir Drafts: '."su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group, 'Drafts');
         $app->system->maildirmake($maildomain_path, $user, 'Drafts', $group);
      }
      if(!is_dir($data['new']['maildir'].'/.Trash')) {
         //exec("su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log('Created submaildir Trash: '."su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group, 'Trash');
         $app->system->maildirmake($maildomain_path, $user, 'Trash', $group);
      }
      if(!is_dir($data['new']['maildir'].'/.Junk')) {
         //exec("su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
         //$app->log('Created submaildir Junk: '."su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
         $app->system->maildirmake($maildomain_path, $user, $group, 'Junk');
         $app->system->maildirmake($maildomain_path, $user, 'Junk', $group);
      }

      // Set permissions now recursive