index 80e893ebc9bb6af397d74229fc87ed3ca939f026..da6f6998b5eb57b4ec00ef393114e0adcfd71885 100644 (file)
'valid_after' => array('require', 'if', 'elsif', 'else', 'reject', 'fileinto', 'redirect', 'stop', 'keep', 'discard'),
'arguments' => array(
array('class' => 'string', 'occurrences' => '1', 'values' => array(
- array('occurrences' => '1', 'regex' => '".*"', 'name' => 'reason')
+ array('occurrences' => '1', 'regex' => '.*', 'name' => 'reason')
))
)
);
array('occurrences' => '?', 'regex' => ':mime', 'name' => 'mime')
)),
array('class' => 'string', 'occurrences' => '1', 'values' => array(
- array('occurrences' => '1', 'regex' => '".*"', 'name' => 'reason')
+ array('occurrences' => '1', 'regex' => '.*', 'name' => 'reason')
))
)
);
function validToken($class, &$text, &$line)
{
+ global $requires_;
+
+ if(!is_array($requires_)){
+ $requires_ = array();
+ }
+
$name = $class . ($class != $text ? " $text" : '');
// Check if the command needs to be required
// TODO: move this to somewhere more appropriate
- global $requires_;
if (isset($this->s_['requires']) &&
!in_array('"'.$this->s_['requires'].'"', $requires_))
{
$arg = &$this->s_['arguments'][0];
foreach ($arg['values'] as $val)
{
+
if (preg_match('/^'. $val['regex'] .'$/m', $text))
{
// Check if the argument value needs a 'require'