From 341ef7175af7c8f21d27262b58da8f5bc2c06ef0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 08:44:59 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'
---
interface/lib/classes/remote.d/mail.inc.php | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/remote.d/mail.inc.php b/interface/lib/classes/remote.d/mail.inc.php
index 6695814..e579fb6 100644
--- a/interface/lib/classes/remote.d/mail.inc.php
+++ b/interface/lib/classes/remote.d/mail.inc.php
@@ -215,8 +215,8 @@
}
//* Set a few params to non empty values that will be overwritten by mail_plugin
- if (!isset($params['uid'])) $params['uid'] = 999989999;
- if (!isset($params['gid'])) $params['gid'] = 999989999;
+ if (!isset($params['uid'])) $params['uid'] = -1;
+ if (!isset($params['gid'])) $params['gid'] = -1;
$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
return $affected_rows;
@@ -1024,6 +1024,19 @@
}
}
+ //** quota functions -----------------------------------------------------------------------------------
+ public function mailquota_get_by_user($session_id, $client_id)
+ {
+ global $app;
+ $app->uses('quota_lib');
+
+ if(!$this->checkPerm($session_id, 'mailquota_get_by_user')) {
+ $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+ return false;
+ }
+
+ return $app->quota_lib->get_mailquota_data($client_id, false);
+ }
}
--
Gitblit v1.9.1