X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fsieve%2Fclass_sieveManagement.inc;h=0bf128d216c0566b0b5ad79df7f28f4de21f0b39;hb=389a525cdf95358c9c373af5e4e020b5c96060b4;hp=a97652fda450059e15d1c248fa479b5f52bb24cb;hpb=9d45792ebfea9693b701a01fdf6c40b4075f6dba;p=gosa.git
diff --git a/include/sieve/class_sieveManagement.inc b/include/sieve/class_sieveManagement.inc
index a97652fda..0bf128d21 100644
--- a/include/sieve/class_sieveManagement.inc
+++ b/include/sieve/class_sieveManagement.inc
@@ -34,9 +34,10 @@ class sieveManagement extends plugin
var $current_script = -1;
var $current_handler = NULL;
-
+ var $script_to_delete =-1;
var $sieve_handle = NULL;
+ var $create_script = FALSE;
/* Initialize the class and load all sieve scripts
* try to parse them and display errors
@@ -65,7 +66,16 @@ class sieveManagement extends plugin
if($sieve->sieve_listscripts()){
if (is_array($sieve->response)){
foreach($sieve->response as $key => $name){
- $this->scripts[$key]['NAME'] = $name;
+
+ $data = array();
+ $data['NAME'] = $name;
+
+ if($key == "ACTIVE" && $key === "ACTIVE"){
+ $data['ACTIVE'] = TRUE;
+ }else{
+ $data['ACTIVE'] = FALSE;
+ }
+ $this->scripts[] = $data;
}
}
}
@@ -81,13 +91,17 @@ class sieveManagement extends plugin
}
$this->scripts[$key]['SCRIPT'] = $script;
+ $this->scripts[$key]['ORIG_SCRIPT'] = $script;
$this->scripts[$key]['MSG'] = "";
$ret = $p->parse($script);
if(!$ret){
- $this->scripts[$key]['MSG'] = "".$p->status_text." ";
- $this->scripts[$key]['STATUS'] = _("Parse failed");
+ $this->scripts[$key]['STATUS'] = FALSE;
+ $this->scripts[$key]['MODE'] = "Source-Only";
+ $this->scripts[$key]['MSG'] = _("Parse failed")."".$p->status_text." ";
}else{
- $this->scripts[$key]['STATUS'] = _("Parse successful");
+ $this->scripts[$key]['STATUS'] = TRUE;
+ $this->scripts[$key]['MODE'] = "Structured";
+ $this->scripts[$key]['MSG'] = _("Parse successful");
}
$this->scripts[$key]['PARSER'] = $p;
$this->scripts[$key]['EDITED'] = FALSE;
@@ -100,6 +114,64 @@ class sieveManagement extends plugin
*/
function execute()
{
+ if(isset($_POST['create_new_script'])){
+ $this->create_script = TRUE;
+ }
+
+ if(isset($_POST['create_script_cancel'])){
+ $this->create_script = FALSE;
+ }
+
+ if($this->create_script){
+ $smarty = get_smarty();
+
+ $name = "";
+ if(isset($_POST['NewScriptName'])){
+ $name = $_POST['NewScriptName'];
+ }
+
+ $err = "";
+ if($name != strtolower($name)){
+ $err = _("Only lower case names are allowed here.");
+ }
+
+ if(preg_match("/[^a-z]/i",$name)){
+ $err = _("Only a-z are allowed in script names.");
+ }
+
+ if($this->create_script && isset($_POST['create_script_save']) && $err == "" ){
+ $this->create_script = FALSE;
+
+ $script = "/*New script */".
+ "stop;";
+ $p = new My_Parser;
+
+ $sc['SCRIPT'] = $script;
+ $sc['ORIG_SCRIPT'] = $script;
+ $sc['MSG'] = "";
+
+ $ret = $p->parse($script);
+ if(!$ret){
+ $sc['STATUS'] = FALSE;
+ $sc['MODE'] = "Source-Only";
+ $sc['MSG'] = _("Parse failed")."".$p->status_text." ";
+ }else{
+ $sc['STATUS'] = TRUE;
+ $sc['MODE'] = "Strucktured";
+ $sc['MSG'] = _("Parse successful");
+ }
+ $sc['PARSER'] = $p;
+ $sc['EDITED'] = TRUE;
+ $sc['ACTIVE'] = FALSE;
+ $sc['NAME'] = $name;
+ $this->scripts[$name] = $sc;
+ }else{
+ $smarty->assign("NewScriptName",$name);
+ $smarty->assign("Error",$err);
+ return($smarty->fetch(get_template_path("templates/create_script.tpl",TRUE,dirname(__FILE__))));
+ }
+ }
+
$once = TRUE;
foreach($_POST as $name => $value){
if(preg_match("/^editscript_/",$name) && $once && !$this->current_handler){
@@ -110,6 +182,82 @@ class sieveManagement extends plugin
$this->current_script = $script;
$this->current_handler = $this->scripts[$script]['PARSER'];
}
+ if(preg_match("/^delscript_/",$name) && $once && !$this->current_handler){
+ $script = preg_replace("/^delscript_/","",$name);
+ $script = preg_replace("/_(x|y)/","",$script);
+ $once = FALSE;
+
+ $this->script_to_delete = $script;
+ }
+ if(preg_match("/^active_script_/",$name) && $once && !$this->current_handler){
+ $script = preg_replace("/^active_script_/","",$name);
+ $script = preg_replace("/_(x|y)/","",$script);
+ $once = FALSE;
+
+ /* 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;
+ }
+
+ 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)));
+ }else{
+
+ foreach($this->scripts as $key => $data){
+
+ if($key == $script){
+ $this->scripts[$key]['ACTIVE'] = TRUE;
+ }else{
+ $this->scripts[$key]['ACTIVE'] = FALSE;
+ }
+ }
+ }
+ }
+ }
+
+ if(isset($_POST['delete_cancel'])){
+ $this->script_to_delete = -1;
+ }
+
+ if(isset($_POST['delete_script_confirm'])){
+
+ /* 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;
+ }
+
+ 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)));
+ }else{
+ unset($this->scripts[$this->script_to_delete]);
+ }
+ $this->script_to_delete = -1;
+ }
+
+ if($this->script_to_delete != -1){
+ $smarty = get_smarty();
+ $smarty->assign("Warning",
+ sprintf(_("You are going to remove the sieve script '%s' from your mail server."),
+ $this->scripts[$this->script_to_delete]['NAME']));
+
+ return($smarty->fetch(get_template_path("templates/remove_script.tpl",TRUE,dirname(__FILE__))));
}
/* Abort saving */
@@ -119,47 +267,96 @@ class sieveManagement extends plugin
/* Save currently edited sieve script. */
if(isset($_POST['save_sieve_changes'])){
- $this->scripts[$this->current_script]['PARSER'] = $this->current_handler;
- $this->scripts[$this->current_script]['EDITED'] = TRUE;
- $this->current_handler = NULL;
+ $chk = $this->current_handler->check();
+ $chk =array();
+ if(!count($chk)){
+
+ $sc = $this->scripts[$this->current_script]['SCRIPT'];
+ $p = new My_Parser;
+ if($p -> parse($sc)){
+
+ if($this->scripts[$this->current_script]['MODE'] == "Source-Only"){
+ $this->scripts[$this->current_script]['MODE'] = "Source";
+ }
+
+ $this->scripts[$this->current_script]['PARSER'] = $p;
+ $this->scripts[$this->current_script]['EDITED'] = TRUE;
+ $this->scripts[$this->current_script]['STATUS'] = TRUE;
+ $this->scripts[$this->current_script]['MSG'] = _("Edited");
+ $this->current_handler = NULL;
+ }else{
+ print_red($p->status_text);;
+ }
+ }else{
+ print_red(_("Please fix all errors before saving."));
+ }
}
- /* Create output for currently opened sieve script */
+
+ /*************
+ * Display edit dialog
+ *************/
+
+ /* Display edit dialog, depending on Mode display different uis
+ */
if($this->current_handler){
- $ret = $this->current_handler->execute();
- $ret .= "
-
";
+
+ $current = $this->scripts[$this->current_script];
+
+ /* Create html results */
+ $smarty = get_smarty();
+ $smarty->assign("Mode",$current['MODE']);
+ if($current['MODE'] == "Structured"){
+ $smarty->assign("Contents",$this->current_handler->tree_->execute());
+ }else{
+ $smarty->assign("Contents",$current['SCRIPT']);
+ }
+ $ret = $smarty->fetch(get_template_path("templates/edit_frame_base.tpl",TRUE,dirname(__FILE__)));
return($ret);
}
+
/* Create list of available sieve scripts
*/
$List = new divSelectBox("sieveManagement");
foreach($this->scripts as $key => $script){
$edited = $script['EDITED'];
-
- $field1 = array("string" => $script['NAME']);
- $field2 = array("string" => $script['STATUS']);
- $field3 = array("string" => _("Script length")." : ".strlen($script['SCRIPT']));
+ $active = $script['ACTIVE'];
+
+ $field1 = array("string" => " ",
+ "attach" => "style='width:20px;'");
+ if($active){
+ $field1 = array("string" => "Sieve script management ";
$display .= _("Be careful. All your changes will be saved directly to sieve, if you use the save button below.");
+ $display .= "\n";
@@ -173,6 +370,44 @@ class sieveManagement extends plugin
function save_object()
{
if($this->current_handler){
+
+ $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;
+ } else {
+ print_red($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->scripts[$this->current_script]['SCRIPT'] = $sc;
+ $p = new My_Parser;
+ if($p -> parse($sc)){
+ $this->current_handler = $p;
+ } else {
+ print_red($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";
+ }
+ }
+ }
$this->current_handler->save_object();
}
}
@@ -199,12 +434,12 @@ class sieveManagement extends plugin
foreach($this->scripts as $key => $script){
if($script['EDITED']){
- $data = $script['PARSER']->get_sieve_script();
- if(!$this->sieve_handle->sieve_sendscript($script['NAME']."1", $data)){
+ $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));
$everything_went_fine = FALSE;
print_red(to_string($this->sieve_handle->error_raw));
- $this->scripts[$key]['STATUS'] = "".
+ $this->scripts[$key]['MSG'] = "".
_("Failed to save sieve script").": ".
to_string($this->sieve_handle->error_raw).
" ";
",
+ "attach" => "style='width:20px;'");
+ }
+ $field2 = array("string" => $script['NAME']);
+ $field3 = array("string" => $script['MSG']);
+ $field4 = array("string" => _("Script length")." : ".strlen($script['SCRIPT']));
if($edited){
- $field4 = array("string" => "
",
+ $field5 = array("string" => "
".
+ "".
+ "");
+ }else{
+ $field6 = array("string" => "".
+ "".
+ "");
+ }
+ $List ->AddEntry(array($field1,$field2,$field3,$field4,$field5,$field6));
}
$display ="