Changeset 1412

Timestamp:

12/08/06 04:35:31 (2 years ago)

Author:

dominik

Message:

add a method which allows the validator to provide the keys for the current base
refs #361

Location:

branches/0.11/src/validator

Files:

• AgaviBaseFileValidator.class.php (modified) (1 diff)
• AgaviValidator.class.php (modified) (3 diffs)

branches/0.11/src/validator/AgaviBaseFileValidator.class.php

@@ -109 +109 @@
     return true;
   }
+
+  /**
+   * Returns all available keys in the currently set base.
+   *
+   * @return     array The available keys.
+   *
+   * @author     Dominik del Bondio <ddb@bitxtender.com
+   * @since      0.11.0
+   */
+  protected function getKeysInCurrentBase()
+  {
+    $files = $this->getContext()->getRequest()->getFiles();
+    $array = array();
+    foreach($files as $name => $file) {
+      $array[$name] = $file['name'];
+    }
+
+    $names = $this->curBase->getValue($array, array());
+    return array_keys($names);
+  }
+
 }
 

branches/0.11/src/validator/AgaviValidator.class.php

@@ -576 +576 @@
        * names
        */
-      $array = $this->validationParameters->getParameters();
-      $names = $this->curBase->getValue($array, array());
+      $names = $this->getKeysInCurrentBase();
+
+      // if the names array is empty this means we need to throw an error since
+      // this means the input doesn't exist
+      if(count($names) == 0) {
+        if($this->getParameter('required', true)) {
+          $this->throwError();
+          return self::mapErrorCode($this->getParameter('severity', 'error'));
+        } else {
+          // no reason to throw any error since it wouldn't be included anyways
+          return self::NONE;
+        }
+      }
 
       // throw the wildcard away
@@ -585 +596 @@
 
       // validate in every name defined in the request
-      foreach(array_keys($names) as $name) {
+      foreach($names as $name) {
         $t = $this->validateInBase($base->pushRetNew($name));
 
@@ -654 +665 @@
   }
 
+
+  /**
+   * Returns all available keys in the currently set base.
+   *
+   * @return     array The available keys.
+   *
+   * @author     Dominik del Bondio <ddb@bitxtender.com
+   * @since      0.11.0
+   */
+  protected function getKeysInCurrentBase()
+  {
+    $array = $this->validationParameters->getParameters();
+    $names = $this->curBase->getValue($array, array());
+
+    return array_keys($names);
+  }
+
 }