![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 3a4cc1f7a4cadf13eadebd2ee17441d1f2657c21..94b8a1116a3667a421f0d85af585fe721261282f 100644 (file)
var $add_above_below = "below";
var $add_element_type = "sieve_comment";
+ /* If this variable is TRUE, this indicates that we have the
+ * import dialog opened.
+ */
+ var $Import_Script = FALSE;
/* Initialize the class and load all sieve scripts
* try to parse them and display errors
$ret = $p->parse($script);
if(!$ret){
$this->scripts[$key]['STATUS'] = FALSE;
- $this->scripts[$key]['MODE'] = "Source-Only";
+ $this->scripts[$key]['MODE'] = "Source";
$this->scripts[$key]['MSG'] = _("Parse failed")."<font color='red'>".$p->status_text."</font>";
}else{
$this->scripts[$key]['STATUS'] = TRUE;
/* Try to activate the given script and update
* class script array.
*/
- if(!$this->sieve_handle->sieve_setactivescript($this->scripts[$script]['NAME'])){
- print_red(sprintf(_("Can't activate sieve script on server. Server says '%s'."),to_string($this->sieve_handle->error_raw)));
+ if(!$sieve->sieve_setactivescript($this->scripts[$script]['NAME'])){
+ print_red(sprintf(_("Can't activate sieve script on server. Server says '%s'."),to_string($sieve->error_raw)));
}else{
foreach($this->scripts as $key => $data){
if($key == $script){
to_string($this->Sieve_Error)));
}
- if(!$this->sieve_handle->sieve_deletescript($this->scripts[$this->script_to_delete]['NAME'])){
- print_red(sprintf(_("Can't remove sieve script from server. Server says '%s'."),to_string($this->sieve_handle->error_raw)));
+ if(!$sieve->sieve_deletescript($this->scripts[$this->script_to_delete]['NAME'])){
+ print_red(sprintf(_("Can't remove sieve script from server. Server says '%s'."),to_string($sieve->error_raw)));
}else{
unset($this->scripts[$this->script_to_delete]);
}
*/
if($this->current_handler){
+ if(isset($_POST['Import_Script'])){
+ $this->Import_Script = TRUE;
+ }
+
+ if(isset($_POST['Import_Script_Cancel'])){
+ $this->Import_Script = FALSE;
+ }
+
+ if(isset($_POST['Import_Script_Save']) && isset($_FILES['Script_To_Import'])){
+
+ $file = $_FILES['Script_To_Import'];
+
+ if($file['size'] == 0){
+ print_red(_("Specified file seams to empty."));
+ }elseif(!file_exists($file['tmp_name'])){
+ print_red(_("Upload failed, somehow nothing was uploaded or the temporary file can't be accessed."));
+ }elseif(!is_readable ($file['tmp_name'])){
+ print_red(sprintf(_("Can't open file '%s' to read uploaded file contents."),$file['tmp_name']));
+ }else{
+
+
+
+ $contents = file_get_contents($file['tmp_name']);
+
+ $this->scripts[$this->current_script]['SCRIPT'] = $contents;
+ if(!$this->current_handler->parse($contents)){
+ $this->scripts[$this->current_script]['MODE'] = "Source";
+ }else{
+ $this->scripts[$this->current_script]['MODE'] = "Structured";
+ }
+ $this->Import_Script = FALSE;
+ }
+ }
+
+ if($this->Import_Script){
+ $smarty = get_smarty();
+ $str = $smarty->fetch(get_template_path("templates/import_script.tpl",TRUE,dirname(__FILE__)));
+ return($str);
+ }
+
+
/* Create dump of current sieve script */
if(isset($_POST['Save_Copy'])){
/* Element selected */
- if(isset($_POST['element_type']) && isset($element_types[$_POST['element_type']])){
+ if(isset($_POST['element_type']) && isset($element_types[$_POST['element_type']])
+ || isset($_POST['element_type']) &&in_array($_POST['element_type'],array("sieve_else","sieve_elsif"))){
$this->add_element_type = $_POST['element_type'];
}
if(isset($_POST['select_new_element_type'])){
$this->add_new_id;
-
$data = $this->current_handler->tree_->pap;
/* Get index of the element identified by object_id == $this->add_new_id; */
$next_free = $this->current_handler->tree_->_get_next_free_move_slot($index,$direction);
$next_free ++;
}else{
- $next_free = $this->current_handler->tree_->_get_next_free_move_slot($index,$direction);
$direction = "down";
+ $next_free = $this->current_handler->tree_->_get_next_free_move_slot($index,$direction);
}
$this->add_new_id = $this->current_handler->tree_->pap[$next_free]->object_id;
}
/* Create elements we should add */
- $ele[] = new $this->add_element_type(NULL, preg_replace("/[^0-9]/","",microtime()));
if($this->add_element_type == "sieve_if"){
+ $ele[] = new $this->add_element_type(NULL, preg_replace("/[^0-9]/","",microtime()));
+ $ele[] = new sieve_block_start(NULL,preg_replace("/[^0-9]/","",microtime()));
+ $ele[] = new sieve_block_end(NULL,preg_replace("/[^0-9]/","",microtime()));
+ }elseif($this->add_element_type == "sieve_else"){
+ $ele[] = new sieve_block_end(NULL,preg_replace("/[^0-9]/","",microtime()));
+ $ele[] = new $this->add_element_type(NULL, preg_replace("/[^0-9]/","",microtime()));
$ele[] = new sieve_block_start(NULL,preg_replace("/[^0-9]/","",microtime()));
+ }elseif($this->add_element_type == "sieve_elsif"){
$ele[] = new sieve_block_end(NULL,preg_replace("/[^0-9]/","",microtime()));
+ $ele[] = new $this->add_element_type(NULL, preg_replace("/[^0-9]/","",microtime()));
+ $ele[] = new sieve_block_start(NULL,preg_replace("/[^0-9]/","",microtime()));
+ }else{
+ $ele[] = new $this->add_element_type(NULL, preg_replace("/[^0-9]/","",microtime()));
}
+
$start = $end = array();
$found = false;
}
}
+
/* Only add, if current element could be located */
if($found){
$new = array();
/* Only display select dialog if it is necessary */
if($this->add_new_element){
$smarty = get_smarty();
+
+ $add_else_elsif = FALSE;
+ foreach($this->current_handler->tree_->pap as $obj){
+ if($obj->object_id == $this->add_new_id && in_array(get_class($obj),array("sieve_if","sieve_elsif"))){
+ $add_else_elsif = TRUE;
+ }
+ }
+
+ if($add_else_elsif && $this->add_above_below == "below"){
+ $element_types['sieve_else'] = _("Else");
+ $element_types['sieve_elsif'] = _("Else if");
+ }
+
$smarty->assign("element_types",$element_types );
$smarty->assign("element_type",$this->add_element_type);
$str = $smarty->fetch(get_template_path("templates/add_element.tpl",TRUE,dirname(__FILE__)));
}
}
}
-
+
/* Skip Mode changes and Parse tests
* if we are currently in a subdialog
*/
- if(!$this->add_new_element) {
-
- $Mode = $this->scripts[$this->current_script]['MODE'];
- $skip_mode_change = false;
- if(in_array($Mode,array("Source-Only","Source"))){
- if(isset($_POST['script_contents'])){
- $sc = stripslashes($_POST['script_contents']);
- $this->scripts[$this->current_script]['SCRIPT'] = $sc;
- $p = new My_Parser;
- if($p -> parse($sc)){
- $this->current_handler = $p;
- $this->Script_Error = "";
- } else {
- $this->Script_Error = $p->status_text;
- $skip_mode_change = TRUE;
- }
- }
- }
- if(in_array($Mode,array("Structured"))){
- $this->current_handler->save_object();
- $sc = $this->current_handler->get_sieve_script();
+
+ $this->current_handler->save_object();
+ $Mode = $this->scripts[$this->current_script]['MODE'];
+ $skip_mode_change = false;
+ if(in_array($Mode,array("Source-Only","Source"))){
+ if(isset($_POST['script_contents'])){
+ $sc = stripslashes($_POST['script_contents']);
$this->scripts[$this->current_script]['SCRIPT'] = $sc;
$p = new My_Parser;
if($p -> parse($sc)){
- $this->current_handler = $p;
$this->Script_Error = "";
} else {
$this->Script_Error = $p->status_text;
$skip_mode_change = TRUE;
}
}
- if(!$skip_mode_change){
- if($this->scripts[$this->current_script]['MODE'] != "Source-Only"){
- if(isset($_POST['View_Source'])){
- $this->scripts[$this->current_script]['MODE'] = "Source";
- }
- if(isset($_POST['View_Structured'])){
- $this->scripts[$this->current_script]['MODE'] = "Structured";
- }
+ }
+ if(in_array($Mode,array("Structured"))){
+ $sc = $this->current_handler->get_sieve_script();
+ $this->scripts[$this->current_script]['SCRIPT'] = $sc;
+ $p = new My_Parser;
+ if($p -> parse($sc)){
+ $this->Script_Error = "";
+ } else {
+ $this->Script_Error = $p->status_text;
+ $skip_mode_change = TRUE;
+ }
+ }
+ if(!$skip_mode_change){
+ if($this->scripts[$this->current_script]['MODE'] != "Source-Only"){
+ $old_mode = $this->scripts[$this->current_script]['MODE'];
+ if(isset($_POST['View_Source'])){
+ $this->scripts[$this->current_script]['MODE'] = "Source";
}
+ if(isset($_POST['View_Structured'])){
+ $this->scripts[$this->current_script]['MODE'] = "Structured";
+ }
+ $new_mode = $this->scripts[$this->current_script]['MODE'];
+
+ if($old_mode != $new_mode){
+
+ $sc = $this->scripts[$this->current_script]['SCRIPT'];
+ $p = new My_Parser;
+
+ if($p -> parse($sc)){
+ $this->current_handler->parse($sc);
+ $this->Script_Error = "";
+ } else {
+ $this->Script_Error = $p->status_text;
+ }
+ }
}
}
- $this->current_handler->save_object();
}
}
function save()
{
- /* Connect to sieve class and try to get all available sieve scripts */
- $cfg= $this->config->data['SERVERS']['IMAP'][$this->parent->gosaMailServer];
-
- $this->sieve_handle=
- new sieve( $cfg["sieve_server"],
- $cfg["sieve_port"],
- $this->parent->mail,
- $cfg["password"],
- $cfg["admin"]);
-
- if (!$this->sieve_handle->sieve_login()){
- print_red(sprintf(_("Can't log into SIEVE server. Server says '%s'."),to_string($this->sieve_handle->error_raw)));
- return;
+ /* Get sieve */
+ if(!$sieve = $this->get_sieve()){
+ print_red(
+ sprintf(
+ _("Can't log into SIEVE server. Server says '%s'."),
+ to_string($this->Sieve_Error)));
}
$everything_went_fine = TRUE;
foreach($this->scripts as $key => $script){
if($script['EDITED']){
$data = $this->scripts[$key]['SCRIPT'];
- if(!$this->sieve_handle->sieve_sendscript($script['NAME'], $data)){
- gosa_log("Failed to save sieve script named '".$script['NAME']."': ".to_string($this->sieve_handle->error_raw));
+ if(!$sieve->sieve_sendscript($script['NAME'], $data)){
+ gosa_log("Failed to save sieve script named '".$script['NAME']."': ".to_string($sieve->error_raw));
$everything_went_fine = FALSE;
- print_red(to_string($this->sieve_handle->error_raw));
+ print_red(to_string($sieve->error_raw));
$this->scripts[$key]['MSG'] = "<font color='red'>".
_("Failed to save sieve script").": ".
- to_string($this->sieve_handle->error_raw).
+ to_string($sieve->error_raw).
"</font>";
}
}