Löschen von Servern #9

Author: ulrichblock

Diff for: lendserver.php

@@ -7,7 +7,6 @@
  * @author     Ulrich Block <[email protected]>
  * @copyright  Copyright (c) Ulrich Block
  * @license    http://www.gnu.org/licenses/gpl-3.0
- * @version    1.9
  * @link       https://www.easy-wi.com.com/
  *
  * The Easy-WI WHMCS addon is free software: you can redistribute it and/or modify

Diff for: modules/addons/easywi/easywi.php

@@ -7,7 +7,6 @@
  * @author     Ulrich Block <[email protected]>
  * @copyright  Copyright (c) Ulrich Block
  * @license    http://www.gnu.org/licenses/gpl-3.0
- * @version    1.9
  * @link       https://www.easy-wi.com.com/
  *
  * The Easy-WI WHMCS addon is free software: you can redistribute it and/or modify

Diff for: modules/addons/easywi/hooks.php

@@ -7,7 +7,6 @@
  * @author     Ulrich Block <[email protected]>
  * @copyright  Copyright (c) Ulrich Block
  * @license    http://www.gnu.org/licenses/gpl-3.0
- * @version    1.9
  * @link       https://www.easy-wi.com.com/
  *
  * The Easy-WI WHMCS addon is free software: you can redistribute it and/or modify

Diff for: modules/addons/easywi/inc/easywi.php

@@ -666,6 +666,9 @@ public function removeUser ($vars) {
                 $responseRaw = $this->apiCall($this->apiUserCrud("del", $vars));
 
             } else {
+
+                logActivity("Remove users was configured as '{$this->removeUsers}' user will only be deactivated.");
+
                 $vars = $this->localClientDetails($vars["userid"]);
                 $vars["status"] = "Inactive";
 
@@ -675,14 +678,11 @@ public function removeUser ($vars) {
             $response = @simplexml_load_string($responseRaw);
 
             $this->addLogentry($vars, $response, $responseRaw);
+
         } else {
             logActivity("User sync is maintained as {$userSync}. User removal/inactive state will not be send to Easy-Wi");
         }
 
-        if ($this->removeUsers != "Yes" || $userSync != "Y") {
-            $this->addLogentry(array("action" => "delete", "userSync" => $userSync, "syncUsers" => $this->syncUsers));
-        }
-
         $this->deleteUserSyncEntry($vars["userid"]);
 
         return (isset($response) && $response->errors != "") ? $response->errors: true;
@@ -2049,18 +2049,20 @@ private function orderInternalProcess ($vars, $hookAction = false) {
 
                 $leftOrders = $this->getRelevantOrderCount($userID, $serviceID);
 
-                if ($leftOrders == 0) {
+                if ($leftOrders == 0 && $this->removeUsers == "Yes") {
                     return $this->removeUser($this->localClientDetails($userID));
+                }
+
+                if ($leftOrders == 0) {
+                     $this->removeUser($this->localClientDetails($userID));
                 } else {
                     logActivity("{$leftOrders} order(s) left. User with ID {$userID} will not be removed from Easy-Wi after service ID {$serviceID} is gone.");
                 }
             }
 
-
             if ($action == "del" || ($userSynced && ($action == "add" || $action == "mod"))) {
 
                 $options = $this->configOptionsOverwrite($vars);
-                #logActivity("Options:".json_encode($options));
 
                 # allowed list is "Game server,Voice server,TSDNS,Webspace,MySQL"
                 if (isset($options["type"]) and in_array($options["type"], array("Game server", "Voice server", "TSDNS", "Webspace", "MySQL")))  {

Diff for: modules/addons/easywi/lang/english.php

@@ -7,7 +7,6 @@
  * @author     Ulrich Block <[email protected]>
  * @copyright  Copyright (c) Ulrich Block
  * @license    http://www.gnu.org/licenses/gpl-3.0
- * @version    1.9
  * @link       https://www.easy-wi.com.com/
  *
  * The Easy-WI WHMCS addon is free software: you can redistribute it and/or modify

Diff for: modules/addons/easywi/lang/german.php

@@ -7,7 +7,6 @@
  * @author     Ulrich Block <[email protected]>
  * @copyright  Copyright (c) Ulrich Block
  * @license    http://www.gnu.org/licenses/gpl-3.0
- * @version    1.9
  * @link       https://www.easy-wi.com.com/
  *
  * The Easy-WI WHMCS addon is free software: you can redistribute it and/or modify

Diff for: modules/servers/easywi/easywi.php

@@ -7,7 +7,6 @@
  * @author     Ulrich Block <[email protected]>
  * @copyright  Copyright (c) Ulrich Block
  * @license    http://www.gnu.org/licenses/gpl-3.0
- * @version    1.9
  * @link       https://www.easy-wi.com.com/
  *
  * The Easy-WI WHMCS addon is free software: you can redistribute it and/or modify

Diff for: protectioncheck.php

@@ -7,7 +7,6 @@
  * @author     Ulrich Block <[email protected]>
  * @copyright  Copyright (c) Ulrich Block
  * @license    http://www.gnu.org/licenses/gpl-3.0
- * @version    1.9
  * @link       https://www.easy-wi.com.com/
  *
  * The Easy-WI WHMCS addon is free software: you can redistribute it and/or modify