Index: branches/5.2.x/core/units/ban_rules/ban_rules_config.php =================================================================== diff -u -N -r14244 -r14572 --- branches/5.2.x/core/units/ban_rules/ban_rules_config.php (.../ban_rules_config.php) (revision 14244) +++ branches/5.2.x/core/units/ban_rules/ban_rules_config.php (.../ban_rules_config.php) (revision 14572) @@ -1,6 +1,6 @@ Array ( 'RuleId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'RuleType' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'use_phrases' => 1, 'formatter'=>'kOptionsFormatter', 'options'=>Array( - 0 => 'la_opt_Deny', -// 1 => 'la_opt_Allow' - ) + 'RuleType' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_opt_Deny', 1 => 'la_opt_Allow'), 'use_phrases' => 1, + 'not_null' => 1, 'required' => 1, 'default' => 0 ), - 'ItemField' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL, 'use_phrases' => 1, 'formatter'=>'kOptionsFormatter', 'options' => Array( + 'ItemField' => Array ( + 'type' => 'string', 'max_len' => 255, + 'formatter'=>'kOptionsFormatter', 'options' => Array( 'ip' => 'la_opt_IP_Address', 'Login' => 'la_opt_Username', 'Email' => 'la_opt_Email', @@ -97,12 +99,21 @@ 'State' => 'la_opt_State', 'Zip' => 'la_opt_Zip', 'Phone' => 'la_opt_Phone', - ) + ), 'use_phrases' => 1, + 'required' => 1, + 'default' => NULL, ), - 'ItemVerb' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'use_phrases' => 1, 'formatter'=>'kOptionsFormatter', 'options'=>Array( + 'ItemVerb' => Array ( + 'type' => 'int', + 'formatter'=>'kOptionsFormatter', 'options'=>Array( 1 => 'la_opt_Exact', - 3 => 'la_opt_Sub-match' - ) + 2 => 'la_opt_DoesntMatch', + 3 => 'la_opt_Sub-match', + 4 => 'la_opt_NotLike', + 7 => 'la_opt_NotEmpty', + 8 => 'la_opt_IsUnique', + ), 'use_phrases' => 1, + 'not_null' => 1, 'required' => 1, 'default' => 0, ), 'ItemValue' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'required' => 1, 'default' => ''), 'ItemType' => Array ('type' => 'int', 'not_null' => 1, 'default' => 6),