Updates

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

diff --git a/TODO b/TODO
index 5a1b11351bd024aa4f58f1a8928bce5537132125..4c0cb804e535ef5ba5499be6f514ec3b0c943f0f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,6 +4,7 @@ Things to fix before 2.4:
 * Finish kolab integration
   - mail groups
   - shared folders
+  - Kolab disabled -> check. Check is_account!
 
 * Make it "barrierefrei"
 

diff --git a/html/include/focus.js b/html/include/focus.js
index 978939c84821d76c5864da41f57db266ec06e209..48f7e738e4000ec31d06adec95e822ed4efcc60c 100644 (file)
--- a/html/include/focus.js
+++ b/html/include/focus.js
@@ -39,24 +39,6 @@ function changeSelectState(triggerField, myField) {
   }
 }
 
-function changeSubselectState(triggerField, myField) {
-  if (document.getElementById(triggerField).checked == true){
-         document.getElementById(myField).disabled= false;
-  } else {
-         document.getElementById(myField).disabled= true;
-  }
-}
-
-function changeTripleSelectState(firstTriggerField, secondTriggerField, myField) {
-  if (
-       document.getElementById(firstTriggerField).checked == true &&
-       document.getElementById(secondTriggerField).checked == true){
-         document.getElementById(myField).disabled= false;
-  } else {
-         document.getElementById(myField).disabled= true;
-  }
-}
-
 document.onkeydown= keyDown; // work together to analyze keystrokes
 if (netscape){
   document.captureEvents(Event.KEYDOWN|Event.KEYUP);

diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc
index 2c5c532cb96e60ebccc4efc55ecd2a6dded10dcc..d8b7a184e8be5bf581677494f25188721ed63073 100644 (file)
--- a/include/class_mail-methods-cyrus.inc
+++ b/include/class_mail-methods-cyrus.inc
@@ -33,7 +33,11 @@ class mailMethodCyrus extends mailMethod
   {
     /* Connect to IMAP server. I don't want to see these warning here... */
     $this->gosaMailServer= $gosaMailServer;
-    $cfg= $this->config[$gosaMailServer];
+    if (!isset($this->config[$gosaMailServer])){
+      print_red(_("Warning: Account has an invalid mailserver string! Please check the mail server settings in the mail tab."));
+    } else {
+      $cfg= $this->config[$gosaMailServer];
+    }
 
     /* For some reason, hiding errors with @ does not wor here... */
     $this->mbox = @imap_open($cfg['connect'], $cfg['admin'], $cfg['password'], OP_HALFOPEN);