diff msitegen.inc.php @ 907:affd8bd8c910

Add new check type(s) CHK_ARRAY_KEY and CHK_ARRAY_VAL, remove CHK_ARRAY as we need to be specific.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 27 Nov 2014 10:05:26 +0200
parents 0fe53c3ddcfb
children 21b163500ed6
line wrap: on
line diff
--- a/msitegen.inc.php	Thu Nov 27 09:59:53 2014 +0200
+++ b/msitegen.inc.php	Thu Nov 27 10:05:26 2014 +0200
@@ -26,7 +26,8 @@
 define("CHK_LTEQ", 6);
 define("CHK_RANGE", 7);
 define("CHK_CUSTOM", 8);
-define("CHK_ARRAY", 9);
+define("CHK_ARRAY_KEY", 9);
+define("CHK_ARRAY_VAL", 9);
 
 
 function stDebug($msg)
@@ -475,11 +476,16 @@
         }
         break;
 
-      case CHK_ARRAY:
+      case CHK_ARRAY_KEY:
         if (!isset($check[1][$data]))
           return stErrorStrF($check[2], $data);
         break;
 
+      case CHK_ARRAY_VAL:
+        if (!in_array($data, $check[1], TRUE))
+          return stErrorStrF($check[2], $data);
+        break;
+
       case CHK_CUSTOM:
         // Call a custom function (or closure)
         $func = $check[1];