extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 06:01:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for missing scriptname in function calls which caused several errors

Browse Source
This commit is contained in:
Klaus Leithoff 2010-08-25 10:44:12 +00:00
parent 9074f4f438
commit c4e7ab9e6c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emailadmin/inc/class.emailadmin_sieve.inc.php
View File

@ -108,6 +108,7 @@ class emailadmin_sieve extends Net_Sieve
function setRules($_scriptName, $_rules) function setRules($_scriptName, $_rules)
{ {
if (!$_scriptName) $_scriptName = $this->scriptName;
$script = new emailadmin_script($_scriptName); $script = new emailadmin_script($_scriptName);
$script->debug = $this->debug; $script->debug = $this->debug;
@ -123,6 +124,7 @@ class emailadmin_sieve extends Net_Sieve
function setVacation($_scriptName, $_vacation) function setVacation($_scriptName, $_vacation)
{ {
if (!$_scriptName) $_scriptName = $this->scriptName;
if ($this->debug) error_log(__CLASS__.'::'.__METHOD__."($_scriptName,".print_r($_vacation,true).')'); if ($this->debug) error_log(__CLASS__.'::'.__METHOD__."($_scriptName,".print_r($_vacation,true).')');
$script = new emailadmin_script($_scriptName); $script = new emailadmin_script($_scriptName);
$script->debug = $this->debug; $script->debug = $this->debug;
@ -158,6 +160,7 @@ class emailadmin_sieve extends Net_Sieve
*/ */
function setVactionUser($_euser, $_scriptName, $_vaction) function setVactionUser($_euser, $_scriptName, $_vaction)
{ {
if (!$_scriptName) $_scriptName = $this->scriptName;
if ($this->_connect($this->icServer,$_euser) === true) { if ($this->_connect($this->icServer,$_euser) === true) {
$this->setVacation($_scriptName,$_vacation); $this->setVacation($_scriptName,$_vacation);
// we need to logout, so further vacation's get processed // we need to logout, so further vacation's get processed
@ -169,6 +172,7 @@ class emailadmin_sieve extends Net_Sieve
} }
function setEmailNotification($_scriptName, $_emailNotification) { function setEmailNotification($_scriptName, $_emailNotification) {
if (!$_scriptName) $_scriptName = $this->scriptName;
if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail'])) { if ($_emailNotification['externalEmail'] == '' || !preg_match("/\@/",$_emailNotification['externalEmail'])) {
$_emailNotification['status'] = 'off'; $_emailNotification['status'] = 'off';
$_emailNotification['externalEmail'] = ''; $_emailNotification['externalEmail'] = '';
@ -183,6 +187,7 @@ class emailadmin_sieve extends Net_Sieve
} }
function retrieveRules($_scriptName) { function retrieveRules($_scriptName) {
if (!$_scriptName) $_scriptName = $this->scriptName;
$script = new emailadmin_script($_scriptName); $script = new emailadmin_script($_scriptName);
if($script->retrieveRules($this)) { if($script->retrieveRules($this)) {