Fixed a problem with the logout when the php session has ended.

tbrehm

2008-06-08 8b5ccd302bd1497de721a25e4ce086bebf95173f

 server/plugins-available/mail_plugin.inc.php

@@ -45,10 +45,15 @@
      Register for the events
      */
      
      //* Mailboxes
      $app->plugins->registerEvent('mail_user_insert',$this->plugin_name,'user_insert');
      $app->plugins->registerEvent('mail_user_update',$this->plugin_name,'user_update');
      $app->plugins->registerEvent('mail_user_delete',$this->plugin_name,'user_delete');

		
      //* Mail Domains
      //$app->plugins->registerEvent('mail_domain_insert',$this->plugin_name,'domain_insert');
      //$app->plugins->registerEvent('mail_domain_update',$this->plugin_name,'domain_update');
      //$app->plugins->registerEvent('mail_domain_delete',$this->plugin_name,'domain_delete');
      
   }
   
@@ -56,13 +61,18 @@
   function user_insert($event_name,$data) {
      global $app, $conf;
      
      // get the config
      $app->uses("getconf");
      $mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail');
		
      // Create the maildir, if it does not exist
      if(!is_dir($data['new']['maildir'])) {
         mkdir($data['new']['maildir']);
         exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
         exec("su -c 'mkdir -p ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']);
         exec("su -c 'maildirmake ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']);
         //exec('maildirmake '.escapeshellcmd($data['new']['maildir']));
         exec('chown -R '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
         $app->log('Created Maildir: '.$data['new']['maildir'],LOGLEVEL_DEBUG);
      }
		
   }
   
   function user_update($event_name,$data) {
@@ -74,18 +84,18 @@
      
      // Create the maildir, if it does not exist
      if(!is_dir($data['new']['maildir'])) {
         mkdir($data['new']['maildir']);
         exec('mkdir -p '.escapeshellcmd($data['new']['maildir']));
         exec('chown '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
         $app->log('Created Maildir: '.$data['new']['maildir'],LOGLEVEL_DEBUG);
      }
      
      // Move mailbox, if domain has changed and delete old mailbox
      if($data['new']['maildir'] != $data['old']['maildir'] && is_dir($data['old']['maildir'])) {
         exec('mv -f'.escapeshellcmd($data['old']['maildir']).'* '.escapeshellcmd($data['new']['maildir']));
         unlink($data['old']['maildir']);
         exec('mv -f '.escapeshellcmd($data['old']['maildir']).'* '.escapeshellcmd($data['new']['maildir']));
         if(is_file($data['old']['maildir'].'.ispconfig_mailsize'))exec('mv -f '.escapeshellcmd($data['old']['maildir']).'.ispconfig_mailsize '.escapeshellcmd($data['new']['maildir']));
         rmdir($data['old']['maildir']);
         $app->log('Moved Maildir from: '.$data['old']['maildir'].' to '.$data['new']['maildir'],LOGLEVEL_DEBUG);
      }
		
   }
   
   function user_delete($event_name,$data) {
@@ -93,12 +103,11 @@
      
      $old_maildir_path = escapeshellcmd($data['old']['maildir']);
      if(!stristr($old_maildir_path,'..') && !stristr($old_maildir_path,'*') && strlen($old_maildir_path) >= 10) {
         exec('rm -rf '.$old_maildir_path);
         exec('rm -rf '.escapeshellcmd($old_maildir_path));
         $app->log('Deleted the Maildir: '.$data['old']['maildir'],LOGLEVEL_DEBUG);
      } else {
         $app->log('Possible security violation when deleting the maildir: '.$data['old']['maildir'],LOGLEVEL_ERROR);
      }
		
   }