some changes

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

diff --git a/TODO b/TODO
index 70a10b06a6e5420fb1c73b39de589f46955497ba..91caf6cf5f98da44c371335bc03bebe0083a1176 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,11 +6,6 @@ Things to fix before 2.4:
   - shared folders
   - Kolab disabled -> check. Check is_account!
 
-* Check moving of servers
-
-* Check for empty mail server settings in mail tab
-
-
 Target for 2.5:
 ===============
 

diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc
index 6013439a2cb817b20125a90242ceb4519b4ff994..9eaaab93460a3d7f1744ba1e445079c8775cbe09 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroParameters.inc
+++ b/plugins/gofon/macro/class_gofonMacroParameters.inc
@@ -1,4 +1,5 @@
 <?php
+
 class macroParameter extends plugin
 {
   /* CLI vars */

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index cdf374a8fef433b0ffdbdaf8e0bcd5247fa0b46e..3212cd4aa0139e2ec2258f2a7d3e9052cfe5040d 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -10,7 +10,7 @@
  */
 
 /* Load sieve support */
-@require_once ("class_sieve.inc");
+require_once ("class_sieve.inc");
 
 /* Load mail methods */
 global $BASE_DIR;
@@ -178,15 +178,29 @@ class mailAccount extends plugin
     $smarty= get_smarty();
     $display= "";
 
+    $mailserver= array();
+    foreach ($this->config->data['SERVERS']['IMAP'] as $key => $val){
+      $mailserver[]= $key;
+    }
+
+
     /* Do we need to flip is_account state? */
     if (isset($_POST['modify_state'])){
       $this->is_account= !$this->is_account;
     }
 
+    /* Show main page */
+    $mailserver= array();
+    foreach ($this->config->data['SERVERS']['IMAP'] as $key => $val){
+      $mailserver[]= $key;
+    }
+
+
     /* Do we represent a valid account? */
     if (!$this->is_account && $this->parent == NULL){
       $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
         _("This account has no mail extensions.")."</b>";
+
       $display.= back_to_main();
       return ($display);
     }
@@ -197,8 +211,7 @@ class mailAccount extends plugin
         $display= $this->show_header(_("Remove mail account"),
             _("This account has mail features enabled. You can disable them by clicking below."));
       } else {
-        $display= $this->show_header(_("Create mail account"),
-            _("This account has mail features disabled. You can enable them by clicking below."));
+        $display= $this->show_header(_("Create mail account"), _("This account has mail features disabled. You can enable them by clicking below."));
         return ($display);
       }
     }
@@ -419,11 +432,6 @@ class mailAccount extends plugin
       return ($display);
     }
 
-    /* Show main page */
-    $mailserver= array();
-    foreach ($this->config->data['SERVERS']['IMAP'] as $key => $val){
-      $mailserver[]= $key;
-    }
     $smarty->assign("mailServers", $mailserver);
     foreach(array("gosaMailServer", "gosaMailQuota", "perms", "mail",
           "gosaMailAlternateAddress", "gosaMailForwardingAddress",
@@ -665,6 +673,10 @@ class mailAccount extends plugin
 
     $message= array();
 
+    if(empty($this->gosaMailServer)){
+      $message[]= _("There is no valid mailserver specified, please add one in the system setup.");
+    }
+
     /* must: mail */
     if ($this->mail == ""){
       $message[]= _("The required field 'Primary address' is not set.");