瀏覽代碼

bugfix configoptions

andre 1 年之前
父節點
當前提交
6b41b902f3

+ 1 - 7
core/App/Controllers/Instances/Addon/ConfigOptions.php

@@ -153,14 +153,8 @@ class ConfigOptions extends \ThurData\Servers\KerioEmail\Core\App\Controllers\In
 
         $data = [
             'content' =>
-//                '<tr><td class="fieldlabel" style="width:0%; display:none;"></td><td style="width=100%;" class="fieldarea">' . $content . '</td></tr>',
-                '<div style="border: 3px solid #e2e7e9; margin: 12px 0 12px 0; border-collapse: separate; border-radius: 4px;">
-                    <div style="padding: 1px 3px 1px 3px; margin: 2px; background-color: #efefef;">
-                        <div style="width: 100%; margin: 2px;" class="alert alert-danger">' . $message . '</div>
-                    </div>
-                </div>',
+                '<tr><td class="fieldlabel" style="width:0%; display:none;"></td><td style="width=100%;" class="fieldarea">' . $content . '</td></tr>',
             'mode' => 'advanced'
-
         ];
 
         return $this->returnAjaxResponse($data);

+ 9 - 6
core/App/Controllers/Instances/AddonController.php

@@ -105,12 +105,15 @@ abstract class AddonController implements DefaultController
      */
     public function isValidIntegrationCallback($callback = null)
     {
-        if (is_callable($callback))
-        {
-            return true;
-        }
-
-        return false;
+        if(!is_array($callback))
+            {
+                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);
     }
 
     /**