From 6eca510a65b361cb4a20fd168c5dd454701e709b Mon Sep 17 00:00:00 2001
From: Dominik Mueller <info@profi-webdesign.net>
Date: Sun, 2 Mar 2014 21:42:33 +0100
Subject: [PATCH] Moved quotafunctions to monitor.inc.php

---
 .../lib/classes/remote.d/monitor.inc.php      | 77 +++++++++++++++++++
 interface/lib/classes/remoting.inc.php        | 29 -------
 2 files changed, 77 insertions(+), 29 deletions(-)
 create mode 100644 interface/lib/classes/remote.d/monitor.inc.php

diff --git a/interface/lib/classes/remote.d/monitor.inc.php b/interface/lib/classes/remote.d/monitor.inc.php
new file mode 100644
index 0000000000..b77eb178e9
--- /dev/null
+++ b/interface/lib/classes/remote.d/monitor.inc.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+--UPDATED 08.2009--
+Full SOAP support for ISPConfig 3.1.4 b
+Updated by Arkadiusz Roch & Artur Edelman
+Copyright (c) Tri-Plex technology
+
+--UPDATED 08.2013--
+Migrated into new remote classes system
+by Marius Cramer <m.cramer@pixcept.de>
+
+--UPDATED 03.2013
+Added Quota-Functions to remote class system
+by Dominik Müller <info@profi-webdesign.net>
+
+*/
+
+class remoting_monitor extends remoting {
+	//** quota functions -----------------------------------------------------------------------------------
+	public function quota_get_by_user($session_id, $group_id)
+	{
+		global $app;
+		$app->uses('quota_lib');
+		
+		if(!$this->checkPerm($session_id, 'quota_get_by_user')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		$group_id = $app->functions->intval($group_id);
+		
+		return $app->quota_lib->get_quota_data($group_id, false);
+	}
+	
+	public function mailquota_get_by_user($session_id, $group_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;
+		}
+		$group_id = $app->functions->intval($group_id);
+		
+		return $app->quota_lib->get_mailquota_data($group_id, false);
+	}
+
+}
+
+?>
diff --git a/interface/lib/classes/remoting.inc.php b/interface/lib/classes/remoting.inc.php
index 904e2ebf15..5541fcb835 100644
--- a/interface/lib/classes/remoting.inc.php
+++ b/interface/lib/classes/remoting.inc.php
@@ -187,35 +187,6 @@ class remoting {
 		}
 	}
 
-	//** quota functions -----------------------------------------------------------------------------------
-	public function quota_get_by_user($session_id, $group_id)
-	{
-		global $app;
-		$app->uses('quota_lib');
-		
-		if(!$this->checkPerm($session_id, 'quota_get_by_user')) {
-			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
-			return false;
-		}
-		$group_id = $app->functions->intval($group_id);
-		
-		return $app->quota_lib->get_quota_data($group_id, false);
-	}
-	
-	public function mailquota_get_by_user($session_id, $group_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;
-		}
-		$group_id = $app->functions->intval($group_id);
-		
-		return $app->quota_lib->get_mailquota_data($group_id, false);
-	}
-
 	//** protected functions -----------------------------------------------------------------------------------
 
 	protected function klientadd($formdef_file, $reseller_id, $params)
-- 
GitLab