holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: warn user when there's no space left for storing sieve rules because of sieve_maxscriptsize limit

Browse Source
This commit is contained in:
Hadi Nategh 2018-06-15 15:49:34 +02:00
parent aea2b4d216
commit 8f53e3d9f1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail/Script.php
View File

@ -607,7 +607,12 @@ class Script
//error_log(__METHOD__.__LINE__.array2string($newscript)); //error_log(__METHOD__.__LINE__.array2string($newscript));
//print "<pre>$newscript</pre>"; exit; //print "<pre>$newscript</pre>"; exit;
//print "<hr><pre>".htmlentities($newscript)."</pre><hr>"; //print "<hr><pre>".htmlentities($newscript)."</pre><hr>";
try { try {
if (!$connection->hasSpace($this->name, mb_strlen($newscript)))
{
throw new \Exception(lang("There is no space left to store sieve script, please check sieve_maxscriptsize option on your mailserver's config."));
}
$connection->installScript($this->name, $newscript, true); $connection->installScript($this->name, $newscript, true);
} }
catch (\Exception $e) { catch (\Exception $e) {

4
mail/inc/class.mail_sieve.inc.php
View File

@ -963,7 +963,7 @@ class mail_sieve
if($result) if($result)
{ {
$response->error($result); $response->message($result);
return; return;
} }
$this->saveSessionData(); $this->saveSessionData();
@ -1170,7 +1170,7 @@ class mail_sieve
{ {
if (!$this->account->imapServer()->setRules($this->rules)) if (!$this->account->imapServer()->setRules($this->rules))
{ {
return "update failed"; return $this->account->imapServer()->error;
} }
} }