bugfixes by Roland

templates/clientarea.tpl

@@ -42,14 +42,14 @@
         <div class="product-details">
           <div class="row row-eq-height row-eq-height-sm">
             <div class="col-md-6">
-              <div class="product-holder product-status-{$rawstatus|strtolower}">
+              <div class="product-holder product-status-{$rawstatus|strtolower}" style="min-height: unset; height:210px">
                 <div class="product-content">
                   <div class="product-image">
                     <div class="feature-icon">
                       {if $moduleParams.configoption3 == 'on'}
-                        <img src="/templates/croster/thurdata/logo2-color.svg" class="img-fluid">
+                        <img src="/templates/croster/thurdata/logo2-color.svg" class="img-fluid" style="height:100px;">
                       {else}
-                        <img src="/templates/croster/thurdata/logo2-color.svg" class="img-fluid">
+                        <img src="/templates/croster/thurdata/logo2-color.svg" class="img-fluid" style="height:100px;">
                       {/if}
                     </div>
                   </div>
@@ -63,55 +63,54 @@
               </div>
             </div>
             <div class="col-md-6">
-              <div class="product-info">
-                <ul class="list-info list-v">
-                  <li>
-                    <span class="list-heading">{$LANG.clientareahostingregdate}</span>
-                    <span class="list-text">{$regdate}</span>
-                  </li>
-                  {if $billingcycle != 'Gratis-Account'}
-                    {if $firstpaymentamount neq $recurringamount}
-                      <li>
-                        <span class="list-heading">{$LANG.firstpaymentamount}</span>
-                        <span class="list-text">{$firstpaymentamount}</span>
-                      </li>
-                    {/if}
-                    {if $billingcycle != $LANG.orderpaymenttermonetime && $billingcycle != $LANG.orderfree}
-                      <li>
-                        <span class="list-heading">{$LANG.recurringamount}</span>
-                        <span class="list-text">{$recurringamount}</span>
-                      </li>
-                    {/if}
-                    <li>
-                      <span class="list-heading">{$LANG.orderbillingcycle}</span>
-                      <span class="list-text">{$billingcycle}</span>
-                    </li>
-                    {if $nextduedate == '-'}{else}
-                      <li>
-                        <span class="list-heading">{$LANG.clientareahostingnextduedate}</span>
-                        <span class="list-text">{$nextduedate}</span>
-                      </li>
-                    {/if}
-                    <li>
-                      <span class="list-heading">{$LANG.orderpaymentmethod}</span>
-                      <span class="list-text">{$paymentmethod}</span>
-                    </li>
+              <div class="product-info" style="min-height: unset; height:210px;">
+                <table width="100%" border="0">
+                    <tr>
+                        <td>{$LANG.clientareahostingregdate}</td>
+                        <td>{$regdate}</td>
+                    </tr>
+                    {if $billingcycle != 'Gratis-Account'}
+                        <tr>
+                            <td>{$LANG.firstpaymentamount}</td>
+                            <td>{$firstpaymentamount}</td>
+                        </tr>
+                        <tr>
+                            <td>{$LANG.recurringamount}</td>
+                            <td>{$recurringamount}</td>
+                        </tr>
+                        <tr>
+                            <td>{$LANG.orderbillingcycle}</td>
+                            <td>{$billingcycle}</td>
+                        </tr>
+                        <tr>
+                            <td>{$LANG.clientareahostingnextduedate}</td>
+                            <td>{$nextduedate}</td>
+                        </tr>
+                        <tr>
+                            <td>{$LANG.orderpaymentmethod}</td>
+                            <td>{$paymentmethod}</td>
+                        </tr>
                   {else}
-                    <li>
-                      <span class="list-heading">Trial Account</span>
-                      {if ($smarty.now - ($regdate|@strtotime)) > 950400} {* wenn Heute - RegisterDatum > 11 Tage *}
-                        <span class="list-text" style="color:yellow;">Endet in {(14 - (($smarty.now - ($regdate|@strtotime)) / 86400)|round)} Tagen</span>
-                      {elseif ($smarty.now - ($regdate|@strtotime)) > 1123200} {* wenn Heute - RegisterDatum > 13 Tage *}
-                        <span class="list-text" style="color:red;">Letzter Tag der Trial Periode</span>
-                      {else}
-                        <span class="list-text">Endet in {(14 - (($smarty.now - ($regdate|@strtotime)) / 86400)|round)} Tagen</span>
-                      {/if}                                                
-                    </li>
-                    <li>
-                      <a href="/upgrade.php?type=package&id={$id}" class="btn btn-block btn-primary">Jetzt upgraden</a>
-                    </li>
+                        <tr>
+                            <td class="list-heading"><strong>Trial Account</strong></td>
+                            {if ($smarty.now - ($regdate|@strtotime)) > 950400} {* wenn Heute - RegisterDatum > 11 Tage *}
+                                <td class="list-text" style="color:yellow;">Endet in {(14 - (($smarty.now - ($regdate|@strtotime)) / 86400)|round)} Tagen</td>
+                            {elseif ($smarty.now - ($regdate|@strtotime)) > 1123200} {* wenn Heute - RegisterDatum > 13 Tage *}
+                                <td class="list-text" style="color:red;">Letzter Tag der Trial Periode</td>
+                            {else}
+                                <td class="list-text">Endet in {(14 - (($smarty.now - ($regdate|@strtotime)) / 86400)|round)} Tagen</td>
+                            {/if}
+                        </tr>
+                        <tr>
+                            <td colspan="2"><br /><br /></td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td><a href="/upgrade.php?type=package&id={$id}" class="btn btn-block btn-primary">Jetzt upgraden</a></td>
+                        </tr>
                   {/if}
-                </ul>
+                </table>              
+              <!--- HERE --->
               </div>
             </div>
           </div>

zimbraSingle.php

@@ -220,9 +220,11 @@ function zimbraSingle_ClientArea($params) {
  * @see https://developers.whmcs.com/provisioning-modules/usage-update/
  */
 function zimbraSingle_UsageUpdate($params) {
+    error_log("Zimbra Single: Update: Staring Usage Update");
     $api = new Zm_Auth($params['serverhostname'], $params['serverusername'], $params['serverpassword'], 'admin');
     $login = $api->login();
     if(is_a($login, 'Exception')) {
+	error_log("Zimbra Single: Update: Cannot Login to server: " . $params['severhostname'] . " width " . $params['severusername']);
         logModuleCall(
             'zimbrasingle',
             __FUNCTION__,
@@ -232,6 +234,7 @@ function zimbraSingle_UsageUpdate($params) {
         );
         return false;
     }
+    
     $apiAccountManager = new Zm_Account($api);
     $productsObj = Capsule::table('tblhosting')
         ->select('*')
@@ -242,6 +245,7 @@ function zimbraSingle_UsageUpdate($params) {
         foreach($productArray as $product) {
             $accountQuota = $apiAccountManager->getQuota($product->username);
             if(is_a($accountQuota, 'Exception')) {
+        	error_log("Zimbra Single: Update: Error while getting quota for: " . $product->username);
                 logModuleCall(
                     'zimbrasingle',
                     __FUNCTION__,
@@ -253,6 +257,7 @@ function zimbraSingle_UsageUpdate($params) {
             }
             $mboxInfo = $apiAccountManager->getMailbox($product->username);
             if(is_a($mboxInfo, 'Exception')) {
+        	error_log("Zimbra Single: Update: Error while getting mailbox info for: " . $product->username);
                 logModuleCall(
                     'zimbrasingle',
                     __FUNCTION__,
@@ -262,7 +267,7 @@ function zimbraSingle_UsageUpdate($params) {
                 );
                 continue;
             }
-            $mboxSize = $mboxInfo['S'];
+            $mboxSize = $mboxInfo['GETMAILBOXRESPONSE']['MBOX']['S'];
             try {
                 Capsule::table('tblhosting')
                     ->where('id', '=', $product->id)
@@ -396,7 +401,7 @@ function zimbraSingle_CreateAccount($params) {
         return 'Error: could not find serviceclass ' . $params['configoption1'];
     }
     $attrs['zimbraCOSId'] = $cosID;
-	$baseQuota = $params['configoption2'] ? $params['configoption2'] : 1;
+    $baseQuota = $params['configoption2'] ? $params['configoption2'] : 1;
     $addonQuota = $params['configoptions']['addonQuota'] ? $params['configoptions']['addonQuota'] : 0;
     $newAddQuota = $params['configoptions']['newAddQuota'] ? $params['configoptions']['newAddQuota'] : 0;
     $attrs['zimbraMailQuota'] = ($baseQuota + $addonQuota + $newAddQuota) * 1073741824;
@@ -556,9 +561,10 @@ function zimbraSingle_TerminateAccount($params) {
         );
         return 'Error : account ' . $params['username'] . ' Name could not verified';
     }
-    if ($accountStatus != 'locked') {
-        return 'Account '. $params['username'] . ' is active, suspend account first!';
-    }
+    
+    //if ($accountStatus != 'locked') {
+    //    return 'Account '. $params['username'] . ' is active, suspend account first!';
+    //}
     $response = $apiAccountManager->deleteAccount($params['username']);
     if(is_a($response, 'Exception')) {
         logModuleCall(
@@ -614,7 +620,7 @@ function zimbraSingle_ChangePackage($params) {
         );
         return 'Error: could not set class of service for '. $params['username'];
     }
-	$baseQuota = $params['configoption2'] ? $params['configoption2'] : 1;
+    $baseQuota = $params['configoption2'] ? $params['configoption2'] : 1;
     $addonQuota = $params['configoptions']['addonQuota'] ? $params['configoptions']['addonQuota'] : 0;
     $newAddQuota = $params['configoptions']['newAddQuota'] ? $params['configoptions']['newAddQuota'] : 0;
     $attrs['zimbraMailQuota'] = ($baseQuota + $addonQuota + $newAddQuota) * 1073741824;