Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

florian030

2014-02-25 cce9d63279d9078dd0292dd015be497600ac5f32

 interface/web/mail/mail_user_del.php

@@ -39,8 +39,8 @@
* End Form configuration
******************************************/

require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';

//* Check permissions for module
$app->auth->check_module_permissions('mail');
@@ -53,21 +53,22 @@

   function onBeforeDelete() {
      global $app; $conf;
			
         $tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".$app->db->quote($this->dataRecord["email"])."'");
         $app->db->datalogDelete('spamfilter_users', 'id', $tmp_user["id"]);
			
         $tmp_filters = $app->db->queryAllRecords("SELECT filter_id FROM mail_user_filter WHERE mailuser_id = '".$this->id."'");
         if(is_array($tmp_filters)) {
            foreach($tmp_filters as $tmp) {
               $app->db->datalogDelete('mail_user_filter', 'filter_id', $tmp["filter_id"]);
            }

      $tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".$app->db->quote($this->dataRecord["email"])."'");
      $app->db->datalogDelete('spamfilter_users', 'id', $tmp_user["id"]);

      $tmp_filters = $app->db->queryAllRecords("SELECT filter_id FROM mail_user_filter WHERE mailuser_id = '".$this->id."'");
      if(is_array($tmp_filters)) {
         foreach($tmp_filters as $tmp) {
            $app->db->datalogDelete('mail_user_filter', 'filter_id', $tmp["filter_id"]);
         }
			
      }

   }

}

$page = new page_action;
$page->onDelete();

?>
?>