Moved around

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

diff --git a/gosa-plugins/uw-imap/personal/mail/uw-imap/class_mail-methods-uwimap.inc b/gosa-plugins/uw-imap/personal/mail/uw-imap/class_mail-methods-uwimap.inc
new file mode 100644 (file)
index 0000000..4aa558c
--- /dev/null
+++ b/gosa-plugins/uw-imap/personal/mail/uw-imap/class_mail-methods-uwimap.inc
@@ -0,0 +1,146 @@
+<?php
+/*
+   This code is part of GOsa (https://gosa.gonicus.de)
+   Copyright (C) 2004  Cajus Pollmeier
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+class mailMethodUwimap extends mailMethod{
+
+  protected $ServerList = array();
+  protected $imap_handle = NULL;
+  protected $quota_loaded = FALSE;
+   
+  /* Allow modification of account_ids for existing mail accounts */
+  protected $modifyableMail   = FALSE;
+
+  /* Allow modification of the mail server attribute existing mail accounts */
+  protected $modifyableServer = FALSE;
+
+  /* Enforces same value for 'mail' as used for 'cn' */
+  protected $mailEqualsCN   = FALSE; 
+
+  protected $enableDomainSelection= FALSE;
+  protected $enableQuota          = FALSE;
+  protected $enableSieveManager   = FALSE;
+  protected $enableVacationRange  = FALSE;
+  protected $enableFolderTypes    = FALSE;
+
+  /* the attribute used to create accounts */
+  protected $uattrib        = "uid";  // Naming attribute for accounts, e.g. imap.
+
+  /* The account prefixes, keep the '.' here! See FAQ cyrusUseSlashes */
+  protected $user_prefix    = "~.";
+  protected $share_prefix   = "share.";
+
+  protected $procmaildir = "";
+
+  protected function init()
+  {
+    mailMethod::init();
+    if(isset($this->config->data['SERVERS']['IMAP'])){
+      $this->ServerList = $this->config->data['SERVERS']['IMAP'];
+    }
+
+    /* Check for required PROCMAIL_PATH configuration 
+     */
+    if($this->config->get_cfg_value("procMailPath","") == ""){
+      msg_dialog::display(_("Configuration error"),msgPool::invalidConfigurationAttribute("procMailPath"), ERROR_DIALOG);
+      $this->procmaildir = "";
+    }else{
+      $this->procmaildir = $this->config->data['MAIN']['PROCMAIL_PATH'];
+    }
+  }
+
+
+  public function saveSieveSettings()
+  {
+    if(empty($this->procmaildir)){
+      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "",
+          "<b>MAIL</b>: Skippend writting scripts, 'procMailPath' is not configured");
+      return;
+    }
+
+    mailMethod::saveSieveSettings();
+    /* Map attribute from parent class
+     */
+    $mail = $this->parent->mail;
+    $gosaMailDeliveryMode = $this->parent->gosaMailDeliveryMode;
+    $gosaMailAlternateAddress = $this->parent->gosaMailAlternateAddress;
+    $gosaMailMaxSize = $this->parent->gosaMailMaxSize;
+    $gosaSpamMailbox = $this->parent->gosaSpamMailbox;
+    $gosaSpamSortLevel = $this->parent->gosaSpamSortLevel;
+    $gosaVacationMessage = $this->parent->gosaVacationMessage;
+
+    $recipe = "";
+    $addrlist = $mail;
+    foreach ($gosaMailAlternateAddress as $val){
+      $addrlist .= "|$val";
+    }
+    $user = $this->getUAttribValue();
+
+    /* Only create a new one, if it is not empty */
+    if (is_integer(strpos($gosaMailDeliveryMode, "R")) ||
+        is_integer(strpos($gosaMailDeliveryMode, "C")) ||
+        !is_integer(strpos($gosaMailDeliveryMode, "L")) ||
+        is_integer(strpos($gosaMailDeliveryMode, "V")) ||
+        is_integer(strpos($gosaMailDeliveryMode, "S"))) {
+      $text= implode ("", file(CONFIG_DIR."/procmail-header.txt"));
+      $text = preg_replace('/"/', '\\"', $text);
+      eval ("\$recipe.=\"$text\";");
+    }
+
+    /* Add anti-spam variables */
+    if (is_integer(strpos($gosaMailDeliveryMode, "S"))) {
+      $spambox = $gosaSpamMailbox;
+      $spamlevel = $gosaSpamSortLevel;
+      $text= implode ("", file(CONFIG_DIR."/procmail-spam.txt"));
+      $text = preg_replace('/"/', '\\"', $text);
+      eval ("\$recipe.=\"$text\";");
+    }
+
+    /* Add vacation recipe */
+    if (is_integer(strpos($gosaMailDeliveryMode, "V"))) {
+      $vacmsg = $gosaVacationMessage;
+      $text= implode ("", file(CONFIG_DIR."/procmail-vacation.txt"));
+      $text = preg_replace('/"/', '\\"', $text);
+      eval ("\$recipe.=\"$text\";");
+    }
+
+    /* Check if no local delivery is wanted */
+    if (!is_integer(strpos($gosaMailDeliveryMode, "L"))) {
+      $text= implode ("", file(CONFIG_DIR."/procmail-discard.txt"));
+      $text = preg_replace('/"/', '\\"', $text);
+      eval ("\$recipe.=\"$text\";");
+    }
+
+    /* Write procmail script */
+    if (!empty($recipe)) {
+      $text= implode ("", file(CONFIG_DIR."/procmail-footer.txt"));
+      $text = preg_replace('/"/', '\\"', $text);
+      eval ("\$recipe.=\"$text\";");
+      $file = $this->procmaildir . "/" . $this->getUAttribValue();
+
+      if (!file_put_contents($file, $recipe)) {
+        msg_dialog::display(_("Error"),(sprintf(_("Unable to write procmail script to '%s'."), $file)),ERROR_DIALOG);
+      }
+    }
+  }
+
+}
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>

diff --git a/gosa-plugins/uw-imap/personal/mail/uwimap/class_mail-methods-uwimap.inc b/gosa-plugins/uw-imap/personal/mail/uwimap/class_mail-methods-uwimap.inc
deleted file mode 100644 (file)
index 4aa558c..0000000
--- a/gosa-plugins/uw-imap/personal/mail/uwimap/class_mail-methods-uwimap.inc
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/*
-   This code is part of GOsa (https://gosa.gonicus.de)
-   Copyright (C) 2004  Cajus Pollmeier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-class mailMethodUwimap extends mailMethod{
-
-  protected $ServerList = array();
-  protected $imap_handle = NULL;
-  protected $quota_loaded = FALSE;
-   
-  /* Allow modification of account_ids for existing mail accounts */
-  protected $modifyableMail   = FALSE;
-
-  /* Allow modification of the mail server attribute existing mail accounts */
-  protected $modifyableServer = FALSE;
-
-  /* Enforces same value for 'mail' as used for 'cn' */
-  protected $mailEqualsCN   = FALSE; 
-
-  protected $enableDomainSelection= FALSE;
-  protected $enableQuota          = FALSE;
-  protected $enableSieveManager   = FALSE;
-  protected $enableVacationRange  = FALSE;
-  protected $enableFolderTypes    = FALSE;
-
-  /* the attribute used to create accounts */
-  protected $uattrib        = "uid";  // Naming attribute for accounts, e.g. imap.
-
-  /* The account prefixes, keep the '.' here! See FAQ cyrusUseSlashes */
-  protected $user_prefix    = "~.";
-  protected $share_prefix   = "share.";
-
-  protected $procmaildir = "";
-
-  protected function init()
-  {
-    mailMethod::init();
-    if(isset($this->config->data['SERVERS']['IMAP'])){
-      $this->ServerList = $this->config->data['SERVERS']['IMAP'];
-    }
-
-    /* Check for required PROCMAIL_PATH configuration 
-     */
-    if($this->config->get_cfg_value("procMailPath","") == ""){
-      msg_dialog::display(_("Configuration error"),msgPool::invalidConfigurationAttribute("procMailPath"), ERROR_DIALOG);
-      $this->procmaildir = "";
-    }else{
-      $this->procmaildir = $this->config->data['MAIN']['PROCMAIL_PATH'];
-    }
-  }
-
-
-  public function saveSieveSettings()
-  {
-    if(empty($this->procmaildir)){
-      @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__, "",
-          "<b>MAIL</b>: Skippend writting scripts, 'procMailPath' is not configured");
-      return;
-    }
-
-    mailMethod::saveSieveSettings();
-    /* Map attribute from parent class
-     */
-    $mail = $this->parent->mail;
-    $gosaMailDeliveryMode = $this->parent->gosaMailDeliveryMode;
-    $gosaMailAlternateAddress = $this->parent->gosaMailAlternateAddress;
-    $gosaMailMaxSize = $this->parent->gosaMailMaxSize;
-    $gosaSpamMailbox = $this->parent->gosaSpamMailbox;
-    $gosaSpamSortLevel = $this->parent->gosaSpamSortLevel;
-    $gosaVacationMessage = $this->parent->gosaVacationMessage;
-
-    $recipe = "";
-    $addrlist = $mail;
-    foreach ($gosaMailAlternateAddress as $val){
-      $addrlist .= "|$val";
-    }
-    $user = $this->getUAttribValue();
-
-    /* Only create a new one, if it is not empty */
-    if (is_integer(strpos($gosaMailDeliveryMode, "R")) ||
-        is_integer(strpos($gosaMailDeliveryMode, "C")) ||
-        !is_integer(strpos($gosaMailDeliveryMode, "L")) ||
-        is_integer(strpos($gosaMailDeliveryMode, "V")) ||
-        is_integer(strpos($gosaMailDeliveryMode, "S"))) {
-      $text= implode ("", file(CONFIG_DIR."/procmail-header.txt"));
-      $text = preg_replace('/"/', '\\"', $text);
-      eval ("\$recipe.=\"$text\";");
-    }
-
-    /* Add anti-spam variables */
-    if (is_integer(strpos($gosaMailDeliveryMode, "S"))) {
-      $spambox = $gosaSpamMailbox;
-      $spamlevel = $gosaSpamSortLevel;
-      $text= implode ("", file(CONFIG_DIR."/procmail-spam.txt"));
-      $text = preg_replace('/"/', '\\"', $text);
-      eval ("\$recipe.=\"$text\";");
-    }
-
-    /* Add vacation recipe */
-    if (is_integer(strpos($gosaMailDeliveryMode, "V"))) {
-      $vacmsg = $gosaVacationMessage;
-      $text= implode ("", file(CONFIG_DIR."/procmail-vacation.txt"));
-      $text = preg_replace('/"/', '\\"', $text);
-      eval ("\$recipe.=\"$text\";");
-    }
-
-    /* Check if no local delivery is wanted */
-    if (!is_integer(strpos($gosaMailDeliveryMode, "L"))) {
-      $text= implode ("", file(CONFIG_DIR."/procmail-discard.txt"));
-      $text = preg_replace('/"/', '\\"', $text);
-      eval ("\$recipe.=\"$text\";");
-    }
-
-    /* Write procmail script */
-    if (!empty($recipe)) {
-      $text= implode ("", file(CONFIG_DIR."/procmail-footer.txt"));
-      $text = preg_replace('/"/', '\\"', $text);
-      eval ("\$recipe.=\"$text\";");
-      $file = $this->procmaildir . "/" . $this->getUAttribValue();
-
-      if (!file_put_contents($file, $recipe)) {
-        msg_dialog::display(_("Error"),(sprintf(_("Unable to write procmail script to '%s'."), $file)),ERROR_DIALOG);
-      }
-    }
-  }
-
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>