summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-03-31 19:55:10 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-03-31 19:55:10 (GMT)
commit3d422c58f3a48c2b0e01b193ada93abf0d00cd5e (patch)
treece77452ff96dded5d425bd930480efe74d051bb8 /www
parent79a0c1fc6f3b6e32db585acffa2911233d936713 (diff)
downloadkolab-webadmin-3d422c58f3a48c2b0e01b193ada93abf0d00cd5e.tar.gz
Move the sieve utilities into the default PHP library location. There is no need to keep the code separate.
Diffstat (limited to 'www')
-rw-r--r--www/admin/user/deliver.php.in6
-rw-r--r--www/admin/user/forward.php.in6
-rw-r--r--www/admin/user/vacation.php.in14
3 files changed, 13 insertions, 13 deletions
diff --git a/www/admin/user/deliver.php.in b/www/admin/user/deliver.php.in
index d9c44f2..d9d966d 100644
--- a/www/admin/user/deliver.php.in
+++ b/www/admin/user/deliver.php.in
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004 Klaršlvdalens Datakonsult AB
+ * Copyright (c) 2004 Klarälvdalens Datakonsult AB
*
* Written by Steffen Hansen <steffen@klaralvdalens-datakonsult.se>
*
@@ -21,7 +21,7 @@
require_once '@kolab_php_module_prefix@admin/include/mysmarty.php';
require_once '@kolab_php_module_prefix@admin/include/headers.php';
require_once '@kolab_php_module_prefix@admin/include/authenticate.php';
-require_once '@kolab_php_module_prefix@admin/include/sieveutils.class.php';
+require_once 'KolabAdmin/Sieve/Script.php';
// Funny multiline string escaping in Sieve
function dotstuff( $str ) {
@@ -84,7 +84,7 @@ if( !$errors ) {
if( in_array( $scriptname, $scripts ) ) {
// Fetch script data from server
$script = $sieve->getScript($scriptname);
- $inbox = SieveUtils::getDeliverFolder( $script );
+ $inbox = KolabAdmin_Sieve_Script::getDeliverFolder( $script );
}
if( $inbox === false ) $inbox = 'Inbox';
$active = ( $sieve->getActive() === $scriptname );
diff --git a/www/admin/user/forward.php.in b/www/admin/user/forward.php.in
index 5b02070..db83d2f 100644
--- a/www/admin/user/forward.php.in
+++ b/www/admin/user/forward.php.in
@@ -22,7 +22,7 @@ require_once '@kolab_php_module_prefix@admin/include/mysmarty.php';
require_once '@kolab_php_module_prefix@admin/include/headers.php';
require_once('@kolab_php_module_prefix@admin/include/locale.php');
require_once '@kolab_php_module_prefix@admin/include/authenticate.php';
-require_once '@kolab_php_module_prefix@admin/include/sieveutils.class.php';
+require_once 'KolabAdmin/Sieve/Script.php';
// Funny multiline string escaping in Sieve
function dotstuff( $str ) {
@@ -87,8 +87,8 @@ if( !$errors ) {
$scripts = $sieve->listScripts();
if( in_array( $scriptname, $scripts ) ) {
$script = $sieve->getScript($scriptname);
- $address = SieveUtils::getForwardAddress( $script );
- $keep = SieveUtils::getKeepOnServer( $script );
+ $address = KolabAdmin_Sieve_Script::getForwardAddress( $script );
+ $keep = KolabAdmin_Sieve_Script::getKeepOnServer( $script );
} else {
$address = '';
$keep = true;
diff --git a/www/admin/user/vacation.php.in b/www/admin/user/vacation.php.in
index dba3d77..cbd47c4 100644
--- a/www/admin/user/vacation.php.in
+++ b/www/admin/user/vacation.php.in
@@ -10,7 +10,7 @@ require_once '@kolab_php_module_prefix@admin/include/mysmarty.php';
require_once '@kolab_php_module_prefix@admin/include/headers.php';
require_once('@kolab_php_module_prefix@admin/include/locale.php');
require_once '@kolab_php_module_prefix@admin/include/authenticate.php';
-require_once '@kolab_php_module_prefix@admin/include/sieveutils.class.php';
+require_once 'KolabAdmin/Sieve/Script.php';
$errors = array();
if( (@include_once '@kolab_php_module_prefix@admin/include/Sieve.php' ) === false ) {
@@ -51,7 +51,7 @@ if( !$errors ) {
($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
"vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".
$_REQUEST['days']." text:\r\n".
- SieveUtils::dotstuff(trim($_REQUEST['text']))."\r\n.\r\n;\r\n\r\n";
+ KolabAdmin_Sieve_Script::dotstuff(trim($_REQUEST['text']))."\r\n.\r\n;\r\n\r\n";
$active = isset($_REQUEST['active']);
if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {
@@ -74,12 +74,12 @@ if( !$errors ) {
$scripts = $sieve->listScripts();
if( in_array( $scriptname, $scripts ) ) {
$script = $sieve->getScript($scriptname);
- $maildomain = SieveUtils::getMailDomain( $script );
- $reacttospam = SieveUtils::getReactToSpam( $script );
+ $maildomain = KolabAdmin_Sieve_Script::getMailDomain( $script );
+ $reacttospam = KolabAdmin_Sieve_Script::getReactToSpam( $script );
debug("reacttospam=".($reacttospam?"true":"false"));
- $addresses = SieveUtils::getVacationAddresses( $script );
- $days = SieveUtils::getVacationDays( $script );
- $text = SieveUtils::getVacationText( $script );
+ $addresses = KolabAdmin_Sieve_Script::getVacationAddresses( $script );
+ $days = KolabAdmin_Sieve_Script::getVacationDays( $script );
+ $text = KolabAdmin_Sieve_Script::getVacationText( $script );
} else $reacttospam = true;
if( $addresses === false ) {
$object = $ldap->read( $auth->dn() );