Merge branch 'rc1' of andre/whmcsZimbraSingle into master

api/Zm/Account.php

@@ -134,6 +134,66 @@ class Zm_Account
 		return $result;
 	}
 
+	/**
+	 * getAccount
+	 * @param string $name account name
+	 * @return string account informations
+	 */
+	function getAccount($name)
+	{
+		$result = null;
+
+		$params = array(
+			new SoapVar('<ns1:account by="name">' . $name . '</ns1:account>', XSD_ANYXML),
+		);
+
+		try
+		{
+			$result = $this->auth->execSoapCall(
+				"GetAccountRequest",
+				$params
+			);
+
+			$result = $result['SOAP:ENVELOPE']['SOAP:BODY']['GETACCOUNTRESPONSE']['ACCOUNT'];
+		}
+		catch (SoapFault $exception)
+		{
+			$result = $exception;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * getQuota
+	 * @param string $name account name
+	 * @return string account informations
+	 */
+	function getQuota($name)
+	{
+		$result = null;
+
+		$params = array(
+			new SoapVar('<ns1:account by="name">' . $name . '</ns1:account>', XSD_ANYXML),
+		);
+
+		try
+		{
+			$result = $this->auth->execSoapCall(
+				"GetAccountRequest",
+				$params
+			);
+
+			$result = getSoapAttribute($result['SOAP:ENVELOPE']['SOAP:BODY']['GETACCOUNTRESPONSE']['ACCOUNT']['A'], "zimbraMailQuota");
+		}
+		catch (SoapFault $exception)
+		{
+			$result = $exception;
+		}
+
+		return $result;
+	}
+
 	/**
 	 * getAccountId
 	 * @param string $name account name
@@ -236,6 +296,43 @@ class Zm_Account
 		return $result;
 	}
 
+	/**
+	 * getMailbox
+	 * @param string $idOrNameAccount account id or account name
+	 * @return array informations
+	 */
+	function getMailbox($idOrNameAccount, $type="auto")
+	{
+		if($type == "auto")
+			$realType = getAccountType($idOrNameAccount);
+		else
+			$realType = $type;
+		if($realTyp = 'name')
+			$id = $this->getAccountId($idOrNameAccount);
+
+		$result = null;
+		
+		$params = array(
+			new SoapVar('<ns1:mbox id="' . $id . '" />', XSD_ANYXML),
+		);
+
+		try
+		{
+			$result = $this->auth->execSoapCall(
+				"GetMailboxRequest",
+				$params
+			);
+
+			$result = $result['SOAP:ENVELOPE']['SOAP:BODY'];
+		}
+		catch (SoapFault $exception)
+		{
+			$result = $exception;
+		}
+
+		return $result;
+	}
+
 	/**
 	 * getAccountOption
 	 * @param string $idOrNameAccount account id or account name

clientarea.tpl

@@ -0,0 +1,16 @@
+<table width="100%" cellspacing="0" cellpadding="0" class="frame">
+  <tr>
+    <td>
+      <table width="100%" border="0" cellpadding="10" cellspacing="0" class="table table-striped table-framed">
+        <tr>
+          <td align='left'>Webmail</td>
+          <td align="left"><a href="{$webmailurl}" target="_blank">{$webmailurl}</a></td>
+        </tr>
+        <tr>
+          <td align='left'>Mailbox</td>
+          <td align="left">{$usage} Prozent ( {$size} ) von {$quota} benutzt</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>

templates/clientarea.tpl

@@ -1,7 +0,0 @@
-<table width="100%" cellspacing="0" cellpadding="0" class="frame">
-    <tr>
-      <td><table width="100%" border="0" cellpadding="10" cellspacing="0" class="table table-striped table-framed">
-          <tr><td align='left'>Webmail</td>
-            <td align="left"><a href="{$webmailURL}" target="_blank">{$webmailURL}</a></td>
-     </table>
-</td></tr></table>

zimbraSingle.inc

@@ -22,21 +22,47 @@ function zimbraSingle_MetaData()
  */
 function zimbraSingleGetAccess()
 {
+    global $packageid;
     $accessData = array('zimbraServer' => '', 'adminUser' => '', 'adminPass' => '');
     $whmcs = App::self();
+    $productID = $whmcs->get_req_var('id');
     $serverGroupID = $whmcs->get_req_var('servergroup');
-    $serverID = Capsule::table('tblservergroupsrel')
-        ->select('serverid')
-        ->where('groupid', '=', $serverGroupID)
-        ->get();
-    $servers = Capsule::table('tblservers')
+    if($productID) {
+        $serverIDObj = Capsule::table('tblhosting')
+            ->select('server')
+            ->where('id', '=', $productID)
+            ->get();
+            $serverID = $serverIDObj[0]->server;
+    } elseif($serverGroupID) {
+        $serverIDObj = Capsule::table('tblservergroupsrel')
+            ->select('serverid')
+            ->where('groupid', '=', $serverGroupID)
+            ->get();
+        $serverID = $serverIDObj[0]->serverid;
+    } elseif($packageid) {
+        $serverIDObj = Capsule::table('tblhosting')
+            ->select('server')
+            ->where('packageid', '=', $packageid)
+            ->get();
+            $serverID = $serverIDObj[0]->server;
+    } else {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error: could not get accessdata 3",
+            ""
+        );
+        return false;
+    }
+    $server = Capsule::table('tblservers')
         ->select('ipaddress', 'username', 'password')
-        ->where('id', '=', $serverID[0]->serverid)
+        ->where('id', '=', $serverID)
         ->where('active', '=', 1)
         ->get();
-    $accessData['zimbraServer'] = $servers[0]->ipaddress;
-    $accessData['adminUser'] = $servers[0]->username;
-    $adminPassCrypt = $servers[0]->password;
+    $accessData['zimbraServer'] = $server[0]->ipaddress;
+    $accessData['adminUser'] = $server[0]->username;
+    $adminPassCrypt = $server[0]->password;
     $adminPassDecrypt = localAPI('DecryptPassword', array('password2' => $adminPassCrypt));
     if ($adminPassDecrypt['result'] == 'success') {
         $accessData['adminPass'] = $adminPassDecrypt['password'];
@@ -55,7 +81,6 @@ function zimbraSingleDoesEMailExist($emailNameOnly, $domainName)
 {
     $account_name = $emailNameOnly . "@" . $domainName;
     $accessData = zimbraSingleGetAccess();
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -91,7 +116,6 @@ function zimbraSingleCreateAccount($userData)
         $userData['password'] = $passDecrypt['password'];
     }
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -113,7 +137,7 @@ function zimbraSingleCreateAccount($userData)
         __FUNCTION__,
         $params,
         "Error : serviceclass $cosName not available",
-        ""
+        $userData
         );
         return false;
     }
@@ -125,7 +149,7 @@ function zimbraSingleCreateAccount($userData)
         __FUNCTION__,
         $params,
         "Error : account $account_name not created",
-        ""
+        $id
         );
         return false;
     }
@@ -170,7 +194,6 @@ function zimbraSingleUnsuspendAccount($userData)
 {
     $accessData = zimbraSingleGetAccess();
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -203,8 +226,7 @@ function zimbraSingleUnsuspendAccount($userData)
 function zimbraSingleDeleteAccount($userData)
 {
     $accessData = zimbraSingleGetAccess();
-    $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
+    $accountName = $userData['username'] . '@' . $userData['maildomain'];
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -216,35 +238,34 @@ function zimbraSingleDeleteAccount($userData)
             ""
         );
         return false;
-    } else {
-        $apiAccountManager = new Zm_Account($api);
-        $response = $apiAccountManager->getAccountStatus($account_name);
-        if(is_a($response, "Exception")) {
-            logModuleCall(
-                'zimbrasingle',
-                __FUNCTION__,
-                $params,
-                "Error : account $account_name could not verified",
-                ""
-            );
-            return false;
-        }
-        if ($response != 'locked') {
-            return "Account $account_name active, suspend account first";
-        }
-        $response = $apiAccountManager->deleteAccount($account_name);
-        if(is_a($response, "Exception")) {
-            logModuleCall(
-                'zimbrasingle',
-                __FUNCTION__,
-                $params,
-                "Error : account $account_name could not removed",
-                ""
-            );
-            return false;
-        }
-        return 'success';
     }
+    $apiAccountManager = new Zm_Account($api);
+    $response = $apiAccountManager->getAccountStatus($accountName);
+    if(is_a($response, "Exception")) {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error : account $accountName could not verified",
+            ""
+        );
+        return false;
+    }
+    if ($response != 'locked') {
+        return "Account $accountName active, suspend account first";
+    }
+    $response = $apiAccountManager->deleteAccount($accountName);
+    if(is_a($response, "Exception")) {
+        logModuleCall(
+        'zimbrasingle',
+        __FUNCTION__,
+        $params,
+        "Error : account $accountName could not removed",
+        ""
+        );
+        return false;
+    }
+    return 'success';
 }
 
 function zimbraSingleChangePassword($userData) {
@@ -257,7 +278,6 @@ function zimbraSingleChangePassword($userData) {
         return $checkPW;
     }
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -269,28 +289,25 @@ function zimbraSingleChangePassword($userData) {
             ""
         );
         return false;
-    } else {
-        $apiAccountManager = new Zm_Account($api);
-        $response = $apiAccountManager->setAccountPassword($account_name, $userData['password']);
-        if(is_a($response, "Exception")) {
-            logModuleCall(
-                'zimbrasingle',
-                __FUNCTION__,
-                $params,
-                "Error : password for $account_name could not be set",
-                ""
-            );
-            return false;
-        } else {
-            return $response;
-        }
     }
+    $apiAccountManager = new Zm_Account($api);
+    $response = $apiAccountManager->setAccountPassword($account_name, $userData['password']);
+    if(is_a($response, "Exception")) {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error : password for $account_name could not be set",
+            ""
+        );
+        return false;
+    }
+    return 'success';
 }
 
 function zimbraSingleChangePackage($userData) {
     $accessData = zimbraSingleGetAccess();
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -321,8 +338,8 @@ function zimbraSingleChangePackage($userData) {
 function zimbraSingleClientArea($userData)
 {
     $accessData = zimbraSingleGetAccess();
+    $clientInfo = array();
     $account_name = $userData['username'] . '@' . $userData['maildomain'];
-
     $api = new Zm_Auth($accessData['zimbraServer'], $accessData['adminUser'], $accessData['adminPass'], "admin");
     $login = $api->login();
     if(is_a($login, "Exception")) {
@@ -334,30 +351,49 @@ function zimbraSingleClientArea($userData)
             ""
         );
         return false;
-    } else {
-        $apiAccountManager = new Zm_Account($api);
-        $response = $apiAccountManager->getAccountInfo($account_name);
-        if(is_a($response, "Exception")) {
-            logModuleCall(
-                'zimbrasingle',
-                __FUNCTION__,
-                $params,
-                "Error : could not gather informations for  $account_name",
-                ""
-            );
-            return false;
-        } else {
-            $webMailURL = recursiveFindAll( $response, 'PUBLICMAILURL');
-            logModuleCall(
-                'zimbrasingle',
-                __FUNCTION__,
-                $params,
-                "debug",
-                $webMailURL
-            );
-            return $webMailURL;
-        }
     }
+    $apiAccountManager = new Zm_Account($api);
+    $quota = $apiAccountManager->getQuota($account_name);
+    if(is_a($quota, "Exception")) {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error : could not find $account_name",
+            ""
+        );
+        return false;
+    }
+    $response = $apiAccountManager->getMailbox($account_name);
+    if(is_a($response, "Exception")) {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error : could not fetch mailbox info for $account_name",
+            ""
+        );
+        return false;
+    }
+    $mboxSize = $response['S'];
+    $usagePercent = $mboxSize * 100 / $quota;
+    $clientInfo['quota'] = bytesToHuman($quota);
+    $clientInfo['size'] = bytesToHuman($mboxSize);
+    $clientInfo['usage'] = round($usagePercent, 2);
+    $response = $apiAccountManager->getAccountInfo($account_name);
+    if(is_a($response, "Exception")) {
+        logModuleCall(
+            'zimbrasingle',
+            __FUNCTION__,
+            $params,
+            "Error : could not gather informations for  $account_name",
+            ""
+        );
+        return false;
+    }
+    $webmailUrl = recursiveFindAll( $response, 'PUBLICMAILURL');
+    $clientInfo['webmailurl'] = $webmailUrl[0]['DATA'];
+    return $clientInfo;
 }
 
 function zimbraSingleConfigOptions($params) {
@@ -435,7 +471,7 @@ function zimbraSingleCreateCustomFields($packageconfigoption)
                 'showorder' => 'on',
                 'sortorder' => '0'
             )
-        );
+    );
     Capsule::table('tblcustomfields')
         ->insert(
             array(
@@ -447,7 +483,7 @@ function zimbraSingleCreateCustomFields($packageconfigoption)
                 'showorder' => 'on',
                 'sortorder' => '1'
             )
-        );
+    );
     Capsule::table('tblcustomfields')
         ->insert(
             array(
@@ -459,7 +495,7 @@ function zimbraSingleCreateCustomFields($packageconfigoption)
                 'showorder' => 'on',
                 'sortorder' => '2'
             )
-        );
+    );
     Capsule::table('tblcustomfields')
         ->insert(
             array(
@@ -472,7 +508,7 @@ function zimbraSingleCreateCustomFields($packageconfigoption)
                 'showorder' => 'on',
                 'sortorder' => '3'
             )
-        );
+    );
     Capsule::table('tblcustomfields')
         ->insert(
             array(
@@ -484,7 +520,7 @@ function zimbraSingleCreateCustomFields($packageconfigoption)
                 'showorder' => 'on',
                 'sortorder' => '4'
             )
-        );
+    );
     Capsule::table('tblcustomfields')
         ->insert(
             array(
@@ -497,7 +533,7 @@ function zimbraSingleCreateCustomFields($packageconfigoption)
                 'required' => 'on',
                 'sortorder' => '5'
             )
-        );
+    );
 }
 
 function recursiveFindAll($haystack, $needle)
@@ -520,29 +556,26 @@ function zimbraSingleCheckPassword($pwd)
 {
     $message = '';
     if (strlen($pwd) < 9) {
-        $message .= "Das das Passwort ist zu kurz. Es werden mind. 9 Zeichen benötigt<br>";
+        $message .= "Das das Passwort ist zu kurz. Es werden mind. 9 Zeichen benötigt" . PHP_EOL;
     }
-
     if (!preg_match("#[0-9]+#", $pwd)) {
-        $message .= "Das Passwort muss mindestens eine Zahl enthalten<br>";
+        $message .= "Das Passwort muss mindestens eine Zahl enthalten" . PHP_EOL;
     }
-
     if (!preg_match("#[A-Z]+#", $pwd)) {
-        $message .= "Das Passwort muss mindestens einen Grossbuchstaben (A-Z) enthalten<br>";
+        $message .= "Das Passwort muss mindestens einen Grossbuchstaben (A-Z) enthalten" . PHP_EOL;
     }
-
     if (!preg_match("#[a-z]+#", $pwd)) {
-        $message .= "Das Passwort muss mindestens einen Kleinbuchstaben (a-z) enthalten<br>";
+        $message .= "Das Passwort muss mindestens einen Kleinbuchstaben (a-z) enthalten" . PHP_EOL;
     }
-
     if (!preg_match("#[^\w]+#", $pwd)) {
-        $message .= "Das Passwort muss mindestens ein Sonderzeichen (.,-:=) enthalten<br>";
+        $message .= "Das Passwort muss mindestens ein Sonderzeichen (.,-:=) enthalten" . PHP_EOL;
     }
     return $message;
 }
 
-function zimbraSingleTestFunction()
+function bytesToHuman($bytes)
 {
-    return 'blubb';
-}
-
+    $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
+    for ($i = 0; $bytes > 1024; $i++) $bytes /= 1024;
+    return round($bytes, 2) . ' ' . $units[$i];
+}

zimbraSingle.php

@@ -39,25 +39,19 @@ function zimbraSingle_TestConnection($params)
     }
 }
 
-function zimbraSingle_UsageUpdate($params)
-{
-}
-
 function zimbraSingle_ClientArea($params)
 {
     $response = zimbraSingleClientArea($params['customfields']);
     return array(
         'templatefile' => 'clientarea',
-        'vars' => array(
-            'webmailURL' => $response[0]['DATA'],
-        ),
+        'vars' => $response,
     );
 }
 
 function zimbraSingle_ChangePassword($params)
 {
     $response = zimbraSingleChangePassword($params['customfields']);
-    if($response) {
+    if($response == 'success') {
         return 'success';
     }
     return $response;
@@ -93,10 +87,10 @@ function zimbraSingle_UnsuspendAccount($params)
 function zimbraSingle_TerminateAccount($params)
 {
     $response = zimbraSingleDeleteAccount($params['customfields']);
-    if($response) {
+    if($response == 'success') {
         return 'success';
     }
-    return 'Error deleting account';
+    return $response;
 }
 
 function zimbraSingle_ChangePackage($params)