From d2586ba500f7d9d0cbf695644c48b92de880c3e9 Mon Sep 17 00:00:00 2001 From: ak703 Date: Thu, 26 Aug 2004 21:11:25 +0000 Subject: [PATCH] improvements of the ui and some error checking for emtpy fields, implemented tooltip info images for better explanation of the module. Started the README --- admin/doc/README.ldapman | 16 ++++ admin/inc/class.uildap_mgr.inc.php | 27 +++++- admin/setup/phpgw_de.lang | 5 ++ admin/setup/phpgw_en.lang | 5 ++ .../default/account_form_ldapdata.tpl | 84 ++++++++++++++++++ phpgwapi/templates/idots/images/info.gif | Bin 0 -> 75 bytes phpgwapi/templates/jerryr/images/info.gif | Bin 0 -> 75 bytes 7 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 admin/doc/README.ldapman create mode 100644 admin/templates/default/account_form_ldapdata.tpl create mode 100644 phpgwapi/templates/idots/images/info.gif create mode 100644 phpgwapi/templates/jerryr/images/info.gif diff --git a/admin/doc/README.ldapman b/admin/doc/README.ldapman new file mode 100644 index 0000000000..70f8594cf1 --- /dev/null +++ b/admin/doc/README.ldapman @@ -0,0 +1,16 @@ +The add-on LDAP-Manager for Admin currently manages the following configuration: + +1. Postfix 2.x +2. LDAP v3 +3. Courier-Imap 3.x + +Example for Postfix-configuration: + + + + +Usage of LDAP schemas: + +core.schema +qmail.schema + diff --git a/admin/inc/class.uildap_mgr.inc.php b/admin/inc/class.uildap_mgr.inc.php index 17c829d215..f9143e7e02 100644 --- a/admin/inc/class.uildap_mgr.inc.php +++ b/admin/inc/class.uildap_mgr.inc.php @@ -62,7 +62,9 @@ $this->t->set_var("lang_edit_email_settings",lang("edit email settings")); $this->t->set_var("lang_ready",lang("Done")); $this->t->set_var("link_back",$phpgw->link('/admin/accounts.php')); + $this->t->set_var("info_icon",PHPGW_IMAGES_DIR.'/info.gif'); + $linkData = array ( 'menuaction' => 'admin.uildap_mgr.saveUserData', @@ -91,8 +93,17 @@ } $this->t->set_var("mail",$userData["mail"]); -// $this->t->set_var("mailAlternateAddress",''); - $this->t->set_var("mailForwardingAddress",$userData["mailForwardingAddress"]); + //$this->t->set_var("mailAlternateAddress",''); could be deleted? + + if ($userData["mailForwardingAddress"] == "") + { + $this->t->set_var("mailForwardingAddress",$userData["mail"]); + } + else + { + $this->t->set_var("mailForwardingAddress",$userData["mailForwardingAddress"]); + } + $this->t->set_var("options_mailAlternateAddress",$options_mailAlternateAddress); $this->t->set_var("uid",rawurlencode($_accountData["dn"])); @@ -151,9 +162,12 @@ if($HTTP_POST_VARS["add_mailAlternateAddress"]) $bo_action='add_mailAlternateAddress'; if($HTTP_POST_VARS["remove_mailAlternateAddress"]) $bo_action='remove_mailAlternateAddress'; if($HTTP_POST_VARS["save"]) $bo_action='save'; - - $this->boldapmgr->saveUserData($_GET['account_id'], $formData, $bo_action); + if (!$HTTP_POST_VARS["mail"]== "") //attribute 'mail'is not allowed to be empty + { +// error generator necessary!! + $this->boldapmgr->saveUserData($_GET['account_id'], $formData, $bo_action); + } if ($bo_action == 'save') { // read date fresh from ldap storage @@ -185,8 +199,13 @@ $this->t->set_var('lang_0forunlimited',lang('leave empty for no quota')); $this->t->set_var('lang_forward_only',lang('forward only')); $this->t->set_var('lang_mailAliases',lang('Aliases')); + $this->t->set_var('lang_info_mailAliases',lang('Attribute mailAlternateAddress explained')); $this->t->set_var('lang_masterEmailAddress',lang('Main Email-Address')); + $this->t->set_var('lang_info_masterEmailAddress',lang('Attribute mail explained')); $this->t->set_var('lang_RouteMailsTo',lang('Route all Mails to')); + $this->t->set_var('lang_info_RouteMailsTo',lang('Attribute mailForwardingAddress explained')); + $this->t->set_var('lang_info_AccountActive',lang('Attribute accountstatus explained')); + $this->t->set_var('lang_info_UsageHints',lang('Explanation of LDAPMAN')); } } ?> diff --git a/admin/setup/phpgw_de.lang b/admin/setup/phpgw_de.lang index 52104dea69..9a99d770ad 100644 --- a/admin/setup/phpgw_de.lang +++ b/admin/setup/phpgw_de.lang @@ -65,6 +65,10 @@ async services last executed admin de Asynchroner Dienst zuletzt ausgef asynchronous timed services admin de Asynchroner zeitgesteuerter Dienst asyncservices not yet installed or other error (%1) !!! admin de Asynchroner Dienst is noch nicht installiert oder ein anderer Fehler ist aufgetreten (%1) !!! attempt to use correct mimetype for ftp instead of default 'application/octet-stream' admin de Soll versucht werden den richtigen MINE-typ für FTP zu verwenden, statt dem Vorgabewert "application/octet-stream" +attribute accountstatus explained admin de Dies betrifft das Attribut -accountStatus- aus dem QMAIL Schema +attribute mail explained admin de Dies betrifft das Attribut -mail- aus dem CORE Schema. Dieses Attribut darf nicht leer sein und wird gleichzeitig als Emailadresse innerhalb eGW verwendet. +attribute mailalternateaddress explained admin de Dies betrifft das Attribut -mailAlternateAddress- aus dem QMAIL Schema. Das experimentelle Schema verwendet dies auch als Alias für mailLocalAddress. +attribute mailforwardingaddress explained admin de Dies betrifft das Attribut -mailForwardingAddress- aus dem QMAIL Schema. Darf nicht leer sein. Der Begriff mailRoutingAddress wurde hierfür früher als Alias verwendet. authentication / accounts admin de Benutzerauthentifizierung/Benutzerkonten auto create account records for authenticated users admin de Automatisch Benutzerkonten für authentifizierte Benutzer anlegen back to the list admin de Zurück zur Liste @@ -177,6 +181,7 @@ error canceling timer, maybe there's none set !!! admin de Fehler beim Abbrechen error setting timer, wrong syntax or maybe there's one already running !!! admin de Fehler beim Starten des Testjobs, falsche Syntax oder es läuft schon einer!!! error: %1 not found or other error !!! admin de Fehler: %1 nicht gefunden oder anderer Fehler!!! expires admin de abgelaufen +explanation of ldapman admin de Dieses Modul ist derzeit nur für folgende Konfiguration getestet: Postfix, LDAP, Courier-Imap, Procmail und erfordert die Schemas: core und qmail(OID 7914). Weitere Konfigurationshinweise sind im README.ldapman im DOC Verzeichnis des Moduls ADMIN zu finden. fallback (after each pageview) admin de Ausweichmöglichkeit (nach jedem Seitenaufbau) file space admin de Dateiraum file space must be an integer admin de Speicherplatz muss eine Zahl sein diff --git a/admin/setup/phpgw_en.lang b/admin/setup/phpgw_en.lang index 4f3d28c5c7..be1e873955 100644 --- a/admin/setup/phpgw_en.lang +++ b/admin/setup/phpgw_en.lang @@ -64,6 +64,10 @@ async services last executed admin en Async services last executed asynchronous timed services admin en Asynchronous timed services asyncservices not yet installed or other error (%1) !!! admin en asyncservices not yet installed or other error (%1) !!! attempt to use correct mimetype for ftp instead of default 'application/octet-stream' admin en Attempt to use correct mimetype for FTP instead of default 'application/octet-stream' +attribute accountstatus explained admin en This handles the attribute -accountStatus- from the QMAIL schema. +attribute mail explained admin en This handles the attribute -mail- from the QMAIL schema and should never be empty. It is also the eGW internal email field. +attribute mailalternateaddress explained admin en This handles the attribute -mailAlternateAddress- from the QMAIL schema and can be handled as virtual maps or aliases. +attribute mailforwardingaddress explained admin en This handles the attribute -mailForwardingAddress- from QMAIL Schema and must not be empty if assigned. authentication / accounts admin en Authentication / Accounts auto create account records for authenticated users admin en Auto create account records for authenticated users back to the list admin en back to the list @@ -175,6 +179,7 @@ error canceling timer, maybe there's none set !!! admin en Error canceling timer error setting timer, wrong syntax or maybe there's one already running !!! admin en Error setting timer, wrong syntax or maybe there's one already running !!! error: %1 not found or other error !!! admin en Error: %1 not found or other error !!! expires admin en Expires +explanation of ldapman admin en This module has been tested so far for POSTFIX,LDAP,Courier-IMAP and need the schemas CORE and QMAIL (OID7914). More details about using and configuring this systrem can be found in README.ldapman in the doc folder of ADMIN. fallback (after each pageview) admin en fallback (after each pageview) file space admin en File space file space must be an integer admin en File space must be an integer diff --git a/admin/templates/default/account_form_ldapdata.tpl b/admin/templates/default/account_form_ldapdata.tpl new file mode 100644 index 0000000000..a47be48b92 --- /dev/null +++ b/admin/templates/default/account_form_ldapdata.tpl @@ -0,0 +1,84 @@ + +
+
+ + + + + +
+ {rows} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {lang_email_config} + + + {lang_emailaccount_active} +
{lang_masterEmailAddress}
{lang_mailAliases}{options_mailAlternateAddress} + +
+   +
+ +
+ +
+ {lang_RouteMailsTo} + + +
+   +
+   +
+ + + + +
+ +
+
+
+
+ + + + +   {row_text} + + diff --git a/phpgwapi/templates/idots/images/info.gif b/phpgwapi/templates/idots/images/info.gif new file mode 100644 index 0000000000000000000000000000000000000000..7d580a470808d1b126e98dcbaa2abea6908cb0af GIT binary patch literal 75 zcmZ?wbhEHb