From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 7 Oct 2009 08:16:44 +0000 (+0000)
Subject: Cleaned mail plugin etc directory.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5d228c6a5966a80a4884b09339570ff3e7d35247;p=gosa.git

Cleaned mail plugin etc directory.


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14550 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/mail/etc/mail/sieve-discard.txt b/gosa-plugins/mail/etc/mail/sieve-discard.txt
new file mode 100644
index 000000000..8ac4db68a
--- /dev/null
+++ b/gosa-plugins/mail/etc/mail/sieve-discard.txt
@@ -0,0 +1,3 @@
+# Do not deliver to own mailbox
+discard;
+
diff --git a/gosa-plugins/mail/etc/mail/sieve-header.txt b/gosa-plugins/mail/etc/mail/sieve-header.txt
new file mode 100644
index 000000000..5222282e5
--- /dev/null
+++ b/gosa-plugins/mail/etc/mail/sieve-header.txt
@@ -0,0 +1,3 @@
+###GOSA
+require ["fileinto", "reject", "vacation"];
+
diff --git a/gosa-plugins/mail/etc/mail/sieve-mailsize.txt b/gosa-plugins/mail/etc/mail/sieve-mailsize.txt
new file mode 100644
index 000000000..de639c26c
--- /dev/null
+++ b/gosa-plugins/mail/etc/mail/sieve-mailsize.txt
@@ -0,0 +1,17 @@
+#  Reject mails with bigger size
+if size :over {$maxsize}M{
+        reject text:
+Dear sender,
+
+the mail you sent to our mailsystem has been rejected due
+to a user configured maximum mail size ($maxsize MB).
+
+Either ask the user to remove the sizelimit, or send smaller pieces.
+
+Thank you,
+ the mailserver
+.
+        ;
+        discard;
+}
+
diff --git a/gosa-plugins/mail/etc/mail/sieve-spam.txt b/gosa-plugins/mail/etc/mail/sieve-spam.txt
new file mode 100644
index 000000000..63392d011
--- /dev/null
+++ b/gosa-plugins/mail/etc/mail/sieve-spam.txt
@@ -0,0 +1,5 @@
+# Sort mails with higher spam level
+if header :contains "X-Spam-Level" "$spamlevel" {
+  fileinto "$spambox";
+}
+
diff --git a/gosa-plugins/mail/etc/mail/sieve-vacation.txt b/gosa-plugins/mail/etc/mail/sieve-vacation.txt
new file mode 100644
index 000000000..3aed3a916
--- /dev/null
+++ b/gosa-plugins/mail/etc/mail/sieve-vacation.txt
@@ -0,0 +1,4 @@
+# Vacation message
+vacation :addresses [$addrlist]
+"$vacmsg" ;
+
diff --git a/gosa-plugins/mail/etc/sieve-discard.txt b/gosa-plugins/mail/etc/sieve-discard.txt
deleted file mode 100644
index 8ac4db68a..000000000
--- a/gosa-plugins/mail/etc/sieve-discard.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Do not deliver to own mailbox
-discard;
-
diff --git a/gosa-plugins/mail/etc/sieve-header.txt b/gosa-plugins/mail/etc/sieve-header.txt
deleted file mode 100644
index 5222282e5..000000000
--- a/gosa-plugins/mail/etc/sieve-header.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-###GOSA
-require ["fileinto", "reject", "vacation"];
-
diff --git a/gosa-plugins/mail/etc/sieve-mailsize.txt b/gosa-plugins/mail/etc/sieve-mailsize.txt
deleted file mode 100644
index de639c26c..000000000
--- a/gosa-plugins/mail/etc/sieve-mailsize.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#  Reject mails with bigger size
-if size :over {$maxsize}M{
-        reject text:
-Dear sender,
-
-the mail you sent to our mailsystem has been rejected due
-to a user configured maximum mail size ($maxsize MB).
-
-Either ask the user to remove the sizelimit, or send smaller pieces.
-
-Thank you,
- the mailserver
-.
-        ;
-        discard;
-}
-
diff --git a/gosa-plugins/mail/etc/sieve-spam.txt b/gosa-plugins/mail/etc/sieve-spam.txt
deleted file mode 100644
index 63392d011..000000000
--- a/gosa-plugins/mail/etc/sieve-spam.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Sort mails with higher spam level
-if header :contains "X-Spam-Level" "$spamlevel" {
-  fileinto "$spambox";
-}
-
diff --git a/gosa-plugins/mail/etc/sieve-vacation.txt b/gosa-plugins/mail/etc/sieve-vacation.txt
deleted file mode 100644
index 3aed3a916..000000000
--- a/gosa-plugins/mail/etc/sieve-vacation.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Vacation message
-vacation :addresses [$addrlist]
-"$vacmsg" ;
-
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\";");
     }