From 5d228c6a5966a80a4884b09339570ff3e7d35247 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 7 Oct 2009 08:16:44 +0000
Subject: [PATCH] Cleaned mail plugin etc directory.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14550 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../mail/etc/{ => mail}/sieve-discard.txt        |  0
 .../mail/etc/{ => mail}/sieve-header.txt         |  0
 .../mail/etc/{ => mail}/sieve-mailsize.txt       |  0
 gosa-plugins/mail/etc/{ => mail}/sieve-spam.txt  |  0
 .../mail/etc/{ => mail}/sieve-vacation.txt       |  0
 .../personal/mail/class_mail-methods-cyrus.inc   | 16 ++++++++--------
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename gosa-plugins/mail/etc/{ => mail}/sieve-discard.txt (100%)
 rename gosa-plugins/mail/etc/{ => mail}/sieve-header.txt (100%)
 rename gosa-plugins/mail/etc/{ => mail}/sieve-mailsize.txt (100%)
 rename gosa-plugins/mail/etc/{ => mail}/sieve-spam.txt (100%)
 rename gosa-plugins/mail/etc/{ => mail}/sieve-vacation.txt (100%)

diff --git a/gosa-plugins/mail/etc/sieve-discard.txt b/gosa-plugins/mail/etc/mail/sieve-discard.txt
similarity index 100%
rename from gosa-plugins/mail/etc/sieve-discard.txt
rename to gosa-plugins/mail/etc/mail/sieve-discard.txt
diff --git a/gosa-plugins/mail/etc/sieve-header.txt b/gosa-plugins/mail/etc/mail/sieve-header.txt
similarity index 100%
rename from gosa-plugins/mail/etc/sieve-header.txt
rename to gosa-plugins/mail/etc/mail/sieve-header.txt
diff --git a/gosa-plugins/mail/etc/sieve-mailsize.txt b/gosa-plugins/mail/etc/mail/sieve-mailsize.txt
similarity index 100%
rename from gosa-plugins/mail/etc/sieve-mailsize.txt
rename to gosa-plugins/mail/etc/mail/sieve-mailsize.txt
diff --git a/gosa-plugins/mail/etc/sieve-spam.txt b/gosa-plugins/mail/etc/mail/sieve-spam.txt
similarity index 100%
rename from gosa-plugins/mail/etc/sieve-spam.txt
rename to gosa-plugins/mail/etc/mail/sieve-spam.txt
diff --git a/gosa-plugins/mail/etc/sieve-vacation.txt b/gosa-plugins/mail/etc/mail/sieve-vacation.txt
similarity index 100%
rename from gosa-plugins/mail/etc/sieve-vacation.txt
rename to gosa-plugins/mail/etc/mail/sieve-vacation.txt
diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
index e054fa29e..3f6192fe1 100644
--- a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
@@ -437,9 +437,9 @@ class mailMethodCyrus extends mailMethod{
     // Check file integrity 
     $files = array();
     foreach(array("sieve-header.txt","sieve-spam.txt","sieve-mailsize.txt","sieve-vacation.txt","sieve-discard.txt") as $file){
-      if(!file_exists(CONFIG_DIR."/".$file) || ! is_readable(CONFIG_DIR."/".$file)){
-        $files[] = CONFIG_DIR."/".$file;
-        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__ , CONFIG_DIR."/".$file,
+      if(!file_exists(CONFIG_DIR."/mail/".$file) || ! is_readable(CONFIG_DIR."/mail/".$file)){
+        $files[] = CONFIG_DIR."/mail/".$file;
+        @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__ , CONFIG_DIR."/mail/".$file,
             "<b>Sieve template missing, please locate and move the template file: </b>");
       }
     }
@@ -527,14 +527,14 @@ class mailMethodCyrus extends mailMethod{
         is_integer(strpos($gosaMailDeliveryMode, "V")) ||
         is_integer(strpos($gosaMailDeliveryMode, "S"))){
 
-      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/sieve-header.txt")));
+      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/mail/sieve-header.txt")));
       eval ("\$script.=\"$text\";");
     }
 
     /* Add anti-spam code */
     if (is_integer(strpos($gosaMailDeliveryMode, "S"))){
       $spambox= $gosaSpamMailbox;
-      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/sieve-spam.txt")));
+      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/mail/sieve-spam.txt")));
       eval ("\$script.=\"$text\";");
     }
 
@@ -542,7 +542,7 @@ class mailMethodCyrus extends mailMethod{
        adjustable through GOsa. */
     if (is_integer(strpos($gosaMailDeliveryMode, "R"))){
       $maxsize= $gosaMailMaxSize;
-      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/sieve-mailsize.txt")));
+      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/mail/sieve-mailsize.txt")));
       eval ("\$script.=\"$text\";");
     }
 
@@ -557,13 +557,13 @@ class mailMethodCyrus extends mailMethod{
         $addrlist .= ", \"$val\"";
       }
       $vacmsg= $gosaVacationMessage;
-      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/sieve-vacation.txt")));
+      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/mail/sieve-vacation.txt")));
       eval ("\$script.=\"$text\";");
     }
 
     /* If no local delivery is wanted, tell the script to discard the mail */
     if (!is_integer(strpos($gosaMailDeliveryMode, "L"))){
-      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/sieve-discard.txt")));
+      $text= preg_replace('/"/', '\\"', implode ("", file(CONFIG_DIR."/mail/sieve-discard.txt")));
       eval ("\$script.=\"$text\";");
     }
 
-- 
2.30.2