andre 1 год назад
Родитель
Сommit
98faebe405
2 измененных файлов с 10 добавлено и 50 удалено
  1. 2 45
      ProxmoxCloudVps.php
  2. 8 5
      core/App/Controllers/Instances/AddonController.php

+ 2 - 45
ProxmoxCloudVps.php

@@ -15,16 +15,9 @@ if (!defined('DS'))
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'WhmcsErrorIntegration.php';
 
-
-
-
-
 function ProxmoxCloudVps_CreateAccount(array $params)
 {
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-    
-    
-    
     $appContext = new AppContext();
     return $appContext->runApp(__FUNCTION__, $params);
 }
@@ -32,80 +25,54 @@ function ProxmoxCloudVps_CreateAccount(array $params)
 function ProxmoxCloudVps_SuspendAccount(array $params)
 {
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-    
-    
-    
     $appContext = new AppContext();    
-    
     return $appContext->runApp(__FUNCTION__, $params);
 }
 
 function ProxmoxCloudVps_UnsuspendAccount(array $params)
 {
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-    
-    
-    
     $appContext = new AppContext();    
-    
     return $appContext->runApp(__FUNCTION__, $params);
 }
 
 function ProxmoxCloudVps_TerminateAccount(array $params)
 {
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-    
-    
-    
     $appContext = new AppContext();    
-    
     return $appContext->runApp(__FUNCTION__, $params);
 }
 
-
 function ProxmoxCloudVps_ChangePackage(array $params)
 {
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-    
-    
-    
     $appContext = new AppContext();    
-    
     return $appContext->runApp(__FUNCTION__, $params);
 }
 
 function ProxmoxCloudVps_TestConnection(array $params)
 {
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-    
     $appContext = new AppContext();
     return $appContext->runApp(__FUNCTION__, $params);
 }
 
 function ProxmoxCloudVps_UsageUpdate(array $params)
 {
-
 }
 
 function ProxmoxCloudVps_ConfigOptions(array $params)
 {
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-    
     $appContext = new AppContext();    
-    
-    $response = $appContext->runApp(__FUNCTION__, $params);
-
-
-    return [];
+    return $appContext->runApp(__FUNCTION__, $params);
 }
 
 function ProxmoxCloudVps_MetaData()
 {
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-    
     $appContext = new AppContext();    
-    
-   return $appContext->runApp(__FUNCTION__, []);
+    return $appContext->runApp(__FUNCTION__, []);
 }
 
 /**
@@ -143,33 +110,23 @@ function ProxmoxCloudVps_AdminServicesTabFields($params)
     return $appContext->runApp(__FUNCTION__, $params);
 }
 
-
-
 function ProxmoxCloudVps_ClientArea($params)
 {
     if($params['status']!='Active'){
         return;
     }
-
-
     require_once __DIR__ . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'App' . DIRECTORY_SEPARATOR . 'AppContext.php';
-
-    
-
     $appContext = new AppContext();
-
     return $appContext->runApp('clientarea', $params);
 }
 
 function ProxmoxCloudVps_GetLicenseData($force = false)
 {
     $class  = '';
-
     if(!class_exists($class ))
     {
         return [];
     }
     $class = '\\'.$class;
-
     return $class::getLicenseData($force);
 }

+ 8 - 5
core/App/Controllers/Instances/AddonController.php

@@ -66,11 +66,14 @@ abstract class AddonController implements DefaultController
     public function isValidIntegrationCallback($callback = null)
     {
         if(!is_array($callback))
-        {
-            return false;
-        }
-
-        return $class && $method && method_exists($class, $method);
+            {
+                return false;
+            }
+        $callback = array_reverse($callback);
+        $class = array_pop($callback);
+        $method = array_pop($callback);
+         
+        return is_string($class) &&  is_string($method) && method_exists($class, $method);
     }
 
     public function resolveAjax($resault)