extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show vacation notice in popup window

Browse Source
This commit is contained in:
Hadi Nategh 2013-12-17 17:10:02 +00:00
parent e73e01d71a
commit e4cf9ac9b3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,7 +350,7 @@ class mail_sieve
$error++; $error++;
} }
//refresh the rules list //refresh the rules list
$this->sieve_egw_refresh($msg); //$this->sieve_egw_refresh($msg);
if ($button == "apply") break; if ($button == "apply") break;
//fall through //fall through
@ -608,10 +608,12 @@ class mail_sieve
{ {
$msg .= implode("\n",$this->errorStack); $msg .= implode("\n",$this->errorStack);
} }
egw_framework::refresh_opener($msg, 'mail','edit');
if ($button === 'apply') break; if ($button === 'apply') break;
} }
case 'cancel': case 'cancel':
egw::redirect_link('/mail/index.php'); egw_framework::window_close();
} }
$vacation = $newVacation; $vacation = $newVacation;
@ -636,7 +638,7 @@ class mail_sieve
$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity['identity_string'],$this->mailbo->profileID); $content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity['identity_string'],$this->mailbo->profileID);
$content['hideIfSieveDisabled']='mail_DisplayNone'; $content['hideIfSieveDisabled']='mail_DisplayNone';
} }
$vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$preserv); $vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$readonlys,array(),2);
} }
/** /**