extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 16:33:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail/Sieve: tell user of errors while saving rules

Browse Source
This commit is contained in:
Klaus Leithoff 2013-05-10 10:22:51 +00:00
parent 55fb777bdf
commit 87766173ef
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
felamimail/inc/class.uisieve.inc.php
View File

@ -295,7 +295,7 @@
}
else
{
$this->errorStack['message'] = lang('Vacation notice is not saved yet! (But we filled in some defaults to cover some of the above errors. Please correct and check your settings and save again.)');
$this->errorStack['message'] = lang('Vacation notice is not saved yet! (But we filled in some defaults to cover some of the above errors. Please correct and check your settings and save again.)');
return false;
}
}
@ -509,7 +509,11 @@
$this->rules[$ruleID] = $newRule;
$this->bosieve->setRules($this->scriptName, $this->rules);
$ret = $this->bosieve->setRules($this->scriptName, $this->rules);
if (!$ret && !empty($this->bosieve->error))
{
$msg .= lang("Saving the rule failed:")."<br />".$this->bosieve->error."<br />";
}
$this->saveSessionData();
} else {
@ -517,7 +521,7 @@
$error++;
}
// refresh the list
$js = "opener.location.href = '".addslashes(egw::link('/index.php','menuaction=felamimail.uisieve.listRules'))."';";
$js = "opener.location.href = '".addslashes(egw::link('/index.php',array('menuaction'=>'felamimail.uisieve.listRules','message'=>$msg)))."';";
if(isset($_POST['save']) && $error == 0) {
echo "<script type=\"text/javascript\">$js\nwindow.close();\n</script>\n";
} else {
@ -853,7 +857,17 @@
// translate most of the parts
$this->translate();
$errorMessage = get_var('message',array('GET'));
if (!empty($errorMessage))
{
$errorMessage = html::purify($errorMessage);
$this->t->set_var('message',$errorMessage);
unset($_GET['message']);
}
else
{
$this->t->set_var('message','');
}
#if(!empty($this->scriptToEdit))
#{
$listOfImages = array(

4
felamimail/templates/default/listRules.tpl
View File

@ -11,7 +11,7 @@ var refreshURL='{refreshURL}';
</script>
<center>
<div style="color:red;">{message}</div>
<table border='0' width='100%'>
<tr class="text_small">
<td>
@ -61,4 +61,4 @@ var refreshURL='{refreshURL}';
<a href="{url_decrease}"><img src="{url_down}" alt="Move rule down" border="0" onmouseover="window.status='Move rule down'; return true;" onmouseout="window.status='';"></a>
</td>
</tr>
<!-- END filterrow -->
<!-- END filterrow -->