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

Instantiate all sieve templates from etemplate_new

Browse Source
This commit is contained in:
Hadi Nategh 2013-08-12 08:56:38 +00:00
parent 6fdeb9f5f8
commit c6a4c751d0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,11 +119,12 @@ class mail_sieve
function index(array $content=null,$msg=null) function index(array $content=null,$msg=null)
{ {
//Initialize the Grid contents //Instantiate an etemplate_new object
$tmpl = new etemplate('mail.sieve.index'); $tmpl = new etemplate_new('mail.sieve.index');
if ($_GET['msg']) $msg = $_GET['msg']; if ($_GET['msg']) $msg = $_GET['msg'];
//Initializes the Grid contents
$content['rg']= $this->get_rows($rows,$readonlys); $content['rg']= $this->get_rows($rows,$readonlys);
// Set content-menu actions // Set content-menu actions
@ -148,7 +149,8 @@ class mail_sieve
*/ */
function editEmailNotification($content=null, $msg='') function editEmailNotification($content=null, $msg='')
{ {
$eNotitmpl = new etemplate('mail.sieve.emailNotification'); //Instantiate an etemplate_new object, representing sieve.emailNotification
$eNotitmpl = new etemplate_new('mail.sieve.emailNotification');
$eNotification = $this->getEmailNotification(); $eNotification = $this->getEmailNotification();
@ -233,7 +235,8 @@ class mail_sieve
*/ */
function edit ($content=null) function edit ($content=null)
{ {
$etmpl = new etemplate('mail.sieve.edit'); //Instantiate an etemplate_new object, representing sieve.edit template
$etmpl = new etemplate_new('mail.sieve.edit');
error_log(__METHOD__.'() content before the action ' .array2string($content)); error_log(__METHOD__.'() content before the action ' .array2string($content));
if (!is_array($content)) if (!is_array($content))
{ {
@ -518,7 +521,9 @@ class mail_sieve
*/ */
function editVacation($content=null, $msg='') function editVacation($content=null, $msg='')
{ {
$vtmpl = new etemplate('mail.sieve.vacation');
//Instantiate an etemplate_new object, representing the sieve.vacation template
$vtmpl = new etemplate_new('mail.sieve.vacation');
$vacRules = $this->getVacation($vacation,$msg); $vacRules = $this->getVacation($vacation,$msg);