R31782 - /trunk/emailadmin/inc/class.emailadmin_sieve.inc.php

Old eGW-svn
1

Author: leithoff
New Revision: 31782

URL: http://www.egroupware.org/viewvc/egroupware?rev=31782&view=rev
Log:
fix for missing scriptname in function calls which caused several errors

Modified:
trunk/emailadmin/inc/class.emailadmin_sieve.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_sieve.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_sieve.inc.php?rev=31782&r1=31781&r2=31782&view=diff

— trunk/emailadmin/inc/class.emailadmin_sieve.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_sieve.inc.php Wed Aug 25 12:43:19 2010
@@ -108,6 +108,7 @@

function setRules($_scriptName, $_rules) 
{

  •   if (!$_scriptName) $_scriptName = $this->scriptName;
  $script = new emailadmin_script($_scriptName);
  $script->debug = $this->debug;

@@ -123,6 +124,7 @@

function setVacation($_scriptName, $_vacation) 
{

  •   if (!$_scriptName) $_scriptName = $this->scriptName;
  if ($this->debug) error_log(__CLASS__.'::'.__METHOD__."($_scriptName,".print_r($_vacation,true).')');
  $script = new emailadmin_script($_scriptName);
  $script->debug = $this->debug;

@@ -158,6 +160,7 @@
*/
function setVactionUser($_euser, $_scriptName, $_vaction)
{

  •   if (!$_scriptName) $_scriptName = $this->scriptName;
  if ($this->_connect($this->icServer,$_euser) === true) {			
  	$this->setVacation($_scriptName,$_vacation);
  	// we need to logout, so further vacation's get processed

@@ -169,6 +172,7 @@
}

function setEmailNotification($_scriptName, $_emailNotification) {

  •   if (!$_scriptName) $_scriptName = $this->scriptName;
  if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail'])) {
  	$_emailNotification['status'] = 'off';
  	$_emailNotification['externalEmail'] = '';

@@ -183,6 +187,7 @@
}

function retrieveRules($_scriptName) {

  •   if (!$_scriptName) $_scriptName = $this->scriptName;
  $script = new emailadmin_script($_scriptName);
  
  if($script->retrieveRules($this)) {

Sell apps to millions through the Intel® Atom™ Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs