From 7368280d37b930f2328bc9c9ea3b23b36b936e6a Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 7 Jun 2006 06:24:35 +0000 Subject: [PATCH] Reverted servDB changes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3663 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_servDB.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/admin/systems/class_servDB.inc b/plugins/admin/systems/class_servDB.inc index f7bd9b618..6d4e25bc7 100644 --- a/plugins/admin/systems/class_servDB.inc +++ b/plugins/admin/systems/class_servDB.inc @@ -39,8 +39,11 @@ class servdb extends plugin "goLogAdmin", "goLogPassword", "goFonAdmin", "goFonPassword", "goFonAreaCode", "goFonCountryCode","goGlpiAdmin","goGlpiDatabase","goGlpiPassword"); var $objectclasses= array("top", "goServer"); - var $additionaloc= array( - "goKrbServer" => array("goKrbRealm", "goKrbAdmin", + var $additionaloc= array("goImapServer" => array("goImapName", "goImapConnect", + "goImapAdmin", "goImapPassword", + "goImapSieveServer", + "goImapSievePort"), + "goKrbServer" => array("goKrbRealm", "goKrbAdmin", "goKrbPassword"), "goFaxServer" => array("goFaxAdmin", "goFaxPassword"), "goLogDBServer" => array("goLogAdmin", "goLogPassword"), @@ -136,7 +139,7 @@ class servdb extends plugin } /* All fields are marked as *must* */ - if (1 == 0 && in_array("goImapServer", $this->objectclasses)){ + if (in_array("goImapServer", $this->objectclasses)){ foreach (array("goImapAdmin", "goImapName") as $attr){ if ($this->$attr == "" || preg_match("/ /", $this->$attr)){ $message[]= sprintf(_("The attribute '%s' is empty or contains invalid characters."), $attr); -- 2.30.2