#27 Usage Update improvements

solusio · May 17, 2018 · 124d21c · 124d21c
1 parent 75fea0b
commit 124d21c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/modules/servers/solusvmpro/VERSION b/modules/servers/solusvmpro/VERSION
@@ -1 +1 @@
-4.1.0
+4.1.1
diff --git a/modules/servers/solusvmpro/lib/SolusVM.php b/modules/servers/solusvmpro/lib/SolusVM.php
@@ -22,7 +22,7 @@ class SolusVM {
     protected $configOptionUsernamePrefix;
     protected $serviceid;
     protected $pid;
-    protected $configIni;
+    public $configIni;
     public $result = '';
     public $rawResult = '';
     public $cpHostname;

diff --git a/modules/servers/solusvmpro/solusvmpro.php b/modules/servers/solusvmpro/solusvmpro.php
@@ -1149,7 +1149,16 @@ function solusvmpro_UsageUpdate($params)
 {
     $solusvm = new SolusVM($params);
 
-    $ownerRows = Capsule::table('tblhosting')->where('server', $params['serverid'])->get();
+    if (!isset($solusvm->configIni['enableUsageUpdate']) || !$solusvm->configIni['enableUsageUpdate']) {
+        return false;
+    }
+    $ownerRowsHosting = Capsule::table('tblhosting')->where('domainstatus', 'Active')->where('server', $params['serverid']);
+
+    if (isset($solusvm->configIni['updateIntervalDay'])) {
+        $ownerRowsHosting->whereRaw('lastupdate < DATE_ADD(CURDATE(),INTERVAL -' . $solusvm->configIni['updateIntervalDay'] . ' DAY)');
+    }
+    $ownerRows = $ownerRowsHosting->get();
+
     if ($ownerRows) {
         foreach ($ownerRows as $ownerRow) {
             if (!$ownerRow->id) {