* Fix issue wit Options Form

modules/CentreonAdministrationModule/controllers/OptionsController.php

@@ -83,19 +83,16 @@ class OptionsController extends Controller
     {
         $givenParameters = clone $this->getParams('post');
         
-        $validationResult = Form::validate("form", $this->getUri(), self::$moduleName, $givenParameters);
-        if ($validationResult['success']) {
+        try {
+            OptionRepository::update($givenParameters, "default", "form", $this->getUri());
+            
             if (isset($givenParameters['token'])) {
                 unset($givenParameters['token']);
             }
             
-            OptionRepository::update($givenParameters);
-            
-            unset($_SESSION['form_token']);
-            unset($_SESSION['form_token_time']);
             $this->router->response()->json(array('success' => true));
-        } else {
-            $this->router->response()->json(array('success' => false,'error' => $validationResult['error']));
+        } catch (Exception $ex) {
+            $this->router->response()->json(array('success' => false,'error' => $ex->getMessage()));
         }
     }
 }

modules/CentreonAdministrationModule/repositories/OptionRepository.php

@@ -36,7 +36,7 @@
 namespace CentreonAdministration\Repository;
 
 use CentreonAdministration\Models\Options;
-use Centreon\Internal\Form;
+use Centreon\Internal\Form\Validators\Validator;
 
 /**
  * @author Lionel Assepo <lassepo@centreon.com>
@@ -45,13 +45,30 @@ use Centreon\Internal\Form;
  */
 class OptionRepository
 {
+    /**
+     * 
+     * @param type $givenParameters
+     * @param type $origin
+     * @param type $route
+     */
+    protected static function validateForm($givenParameters, $origin = "", $route = "")
+    {
+        $formValidator = new Validator($origin, array('route' => $route, 'params' => array(), 'version' => '3.0.0'));
+        if ($origin == 'wizard' || $origin == 'form') {
+            $formValidator->csrf($givenParameters['token']);
+            unset($givenParameters['token']);
+        }
+        $formValidator->validate($givenParameters->all());
+    }
+    
     /**
      * 
      * @param type $submittedValues
      * @param type $group
      */
-    public static function update($submittedValues, $group = "default")
+    public static function update($submittedValues, $group = "default", $origin = "", $route = "")
     {
+        self::validateForm($submittedValues, $origin, $route);
         $currentOptionsList = Options::getOptionsKeysList();
 
         $optionsToSave = array();