![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index ef726c91a5c381245f21f2b20ea9cae84142e374..acdcb94d5d6abd1b101abd8efcfb1010236d3fa7 100644 (file)
function sieve_if($elements,$object_id,$parent)
{
$this->parent = $parent;
+ $this->object_id = $object_id;
/* Possible address parts we can select */
$this->address_parts = array(
- ":all" => _("Complete adress")." ("._("Default").")",
- ":domain" => _("Domian part") ,
+ ":all" => _("Complete address")." ("._("Default").")",
+ ":domain" => _("Domain part") ,
":localpart" => _("Local part"));
/* comparator type */
/* Match types */
$this->match_types = array(
":is" => _("is"),
+ ":regex" => _("regex"),
":contains" => _("contains"),
":matches" => _("matches"),
":count" => _("count"),
"gt" => _("greater than"),
"ne" => _("not equal"));
- $this->object_id = $object_id;
- if($elements!=NULL){
- $this->elements = $elements;
- $this->_parsed = $this->_parse($elements['ELEMENTS'],1);
+ /* Skip parsing if this element is new */
+ if($elements != NULL){
+
+ /* Remove comments from tests */
+ $tmp = array();
+ foreach($elements['ELEMENTS'] as $ele){
+ if($ele['class'] != "comment"){
+ $tmp[] = $ele;
+ }
+ }
+ $elements['ELEMENTS'] = $tmp;
+
+ if($elements!=NULL){
+ $this->elements = $elements;
+ $this->_parsed = $this->_parse($elements['ELEMENTS'],1);
+ }
}
}
$parsed = $this->_parsed;
}
+ if($parsed == NULL) {
+ return(array(_("Can't save empty tests.")));
+ }
+
/* Walk through all elements */
foreach($parsed as $key => $data){
*******************/
case "true" :
- case "fasle" :
+ case "false" :
{
/* Can't fail anyway */
break;
}
/* Add allof/anyof tag */
- $script.= " ".$key." ( ";
+ if($Inverse){
+ $script .= "not ";
+ }
+ $script.= $key." ( ";
/* Add each test parameter */
foreach($data as $key2 => $dat){
}
$data[$type]=$values;
+ $this->parent->add_require("relational");
if($type == "envelope"){
$this->parent->add_require("envelope");
}
$tmp= array(
"Inverse" => FALSE,
"Match_type" => ":over",
- "Value_List" => array(1,"M"));
+ "Value_List" => array("1M"));
$tmp['LastError'] = "";
$data[$type] = $tmp;
$parsed = $this->_parsed;
}
- if(!is_array($parsed)) return;
+ if(!is_array($parsed)) {
+ return;
+ }
/* Walk through all elements */
foreach($parsed as $key => $data){
if(!isset($match_types[$mt])){
$parsed[$key]['LastError'] = _("Invalid match type given.");
}
+ if($mt == ":regex"){
+ $this->parent->add_require("regex");
+ }
+ if($mt == ":count"){
+ $this->parent->add_require("comparator-i;ascii-numeric");
+ }
$parsed[$key]['Match_type'] = $mt;
}
$tmp2 = split(",",$vls);
foreach($tmp2 as $val){
- $tmp[] = "\"".trim(preg_replace("/\"/","",$val))."\"";
+ $tmp[] = trim($val);
+
+ if(preg_match("/\"/",$val)){
+ $parsed[$key]['LastError'] = _("Invalid character found in address attribute. Quotes are not allowed here.");
+ }
}
$parsed[$key]['Key_List'] = $tmp;
}
$tmp2 = split(",",$vls);
foreach($tmp2 as $val){
- $tmp[] = "\"".trim(preg_replace("/\"/","",$val))."\"";
+ $tmp[] = trim($val);
+ if(preg_match("/\"/",$val)){
+ $parsed[$key]['LastError'] = _("Invalid character found in value attribute. Quotes are not allowed here.");
+ }
}
$parsed[$key]['Value_List'] = $tmp;
}
$Match_types = array( ":over" => _("greater than") ,
":under" => _("lower than"));
- $Units = array( "M" => _("Megabyte") ,
- "K" => _("Kilobyte"));
+ $Units = array( "M" => _("Megabyte"),
+ "K" => _("Kilobyte"),
+ "" => _("Bytes"));
+
+ /* Toggle Inverse ? */
+ if(isset($_POST['toggle_inverse_'.$element_id])){
+ $parsed[$key]['Inverse'] = !$parsed[$key]['Inverse'];
+ }
/* Reset error */
$parsed[$key]['LastError'] ="";
if($this->TYPE == "if"){
$name .= " - "._("If");
}elseif($this->TYPE == "elsif"){
- $name .= " - "._("Else if");
+ $name .= " - "._("Else If");
}else{
$name .= " - "._("Else");
}
$smarty = get_smarty();
$smarty->assign("ID", $this->object_id);
- /* Only display navigation elements if necessary */
- if($this->TYPE == "if"){
- $object_container = $smarty->fetch(get_template_path("templates/object_container.tpl",TRUE,dirname(__FILE__)));
- }else{
- $object_container = $smarty->fetch(get_template_path("templates/object_container_clear.tpl",TRUE,dirname(__FILE__)));
- }
+ /* Get navigation element container */
+ $object_container = $smarty->fetch(get_template_path("templates/object_container.tpl",TRUE,dirname(__FILE__)));
$smarty->assign("Name", $name);
$smarty->assign("Contents", $this->get_as_html());
}else{
$object = $smarty->fetch(get_template_path("templates/element_elsif.tpl",TRUE,dirname(__FILE__)));
}
- $str = preg_replace("/%%OBJECT_CONTENT%%/",$object,$object_container);
+ $str = preg_replace("/%%OBJECT_CONTENT%%/",addcslashes($object,"\\"),$object_container);
return($str);
}
$values .= $key.", ";
}
$values = preg_replace("/,$/","",trim($values));
+
$smarty->assign("keys",$keys);
- $smarty->assign("values",$values);
+ $smarty->assign("values", $values);
$smarty->assign("ID" , $element_id);
- $ret .= $smarty->fetch(get_template_path("templates/element_address.tpl",TRUE,dirname(__FILE__)));
+ $str = $smarty->fetch(get_template_path("templates/element_address.tpl",TRUE,dirname(__FILE__)));
+ $ret .= $str;
break;
}
$Match_types = array( ":over" => _("greater than") ,
":under" => _("lower than"));
- $Units = array( "M" => _("Megabyte") ,
- "K" => _("Kilobyte"));
+ $Units = array( "M" => _("Megabyte"),
+ "K" => _("Kilobyte"),
+ "" => _("Bytes"));
$Match_type = $data['Match_type'];
$Value = preg_replace("/[^0-9]/","",$data['Value_List'][0]);
$smarty->assign("DisplayAdd",TRUE);
$smarty->assign("DisplayDel",FALSE);
$cont_tmp = $smarty->fetch(get_template_path("templates/object_test_container.tpl",TRUE,dirname(__FILE__)));
- $cont_tmp = preg_replace("/%%OBJECT_CONTENT%%/",_("Click here to add a new test"),$cont_tmp);
+ $cont_tmp = preg_replace("/%%OBJECT_CONTENT%%/","<b>"._("Click here to add a new test")."</b>",$cont_tmp);
$smarty->assign("Inverse",$Inverse);
$smarty->assign("Contents",$cont_tmp.$Contents);
$smarty->assign("DisplayAdd",TRUE);
$smarty->assign("DisplayDel",FALSE);
$cont_tmp = $smarty->fetch(get_template_path("templates/object_test_container.tpl",TRUE,dirname(__FILE__)));
- $cont_tmp = preg_replace("/%%OBJECT_CONTENT%%/",_("Klick here to add a new test"),$cont_tmp);
+ $cont_tmp = preg_replace("/%%OBJECT_CONTENT%%/",_("Click here to add a new test"),$cont_tmp);
$smarty->assign("Inverse",$Inverse);
$smarty->assign("Contents",$cont_tmp.$Contents);
}
default :
{
- $ret = "<table width='100%' cellspacing=0 cellpadding=0>
- <tr>
- <td style='background-color: #FEDCA9 ; border: solid 1px #EEEEEE'>";
- $ret.= $key."<br>";
- $ret.= " </td>
- </tr>
- </table>";
+ trigger_error(_("Unhandled switch type"));
}
}
}
$smarty->assign("DisplayAdd",FALSE);
$smarty->assign("DisplayDel",TRUE);
$str = $smarty->fetch(get_template_path("templates/object_test_container.tpl",TRUE,dirname(__FILE__)));
- $ret = preg_replace("/%%OBJECT_CONTENT%%/",$ret,$str);
+ $ret = preg_replace("/%%OBJECT_CONTENT%%/",addcslashes($ret,"\\"),$str);
return($ret);
}
*/
function _parse($data,$id = 0)
{
- $av_methods = array("address","allof","anyof","exists","false","header","not","size","true","envelope");
- $av_match_type= array(":is",":contains",":matches",":over",":count",":value",":under");
+ $av_match_type = array();
+ foreach($this->match_types as $name => $description){
+ $av_match_type[] = $name;
+ }
+ $av_match_type[] = ":over";
+ $av_match_type[] = ":under";
+
+
+
+ $av_methods= array("address","allof","anyof","exists","false","header","not","size","true","envelope");
$type = $data[$id]['text'];
$tmp = array();
$part = "(:all|:localpart|:domain)";
- $operator = "(:contains|:is|:matches|:count|:value)";
+ $operator = "(:regex|:contains|:is|:matches|:count|:value)";
$value_op = "(lt|le|eq|ge|gt|ne)";
$Address_Part = "";