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

@@ -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
+

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'));
 		}
 	}
 ?>

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 <b>-accountStatus-</b> aus dem QMAIL Schema
+attribute mail explained	admin	de	Dies betrifft das Attribut <b><i>-mail-</i></b> 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 <b>-mailAlternateAddress-</b> aus dem QMAIL Schema. Das experimentelle Schema verwendet dies auch als Alias für mailLocalAddress.
+attribute mailforwardingaddress explained	admin	de	Dies betrifft das Attribut <b>-mailForwardingAddress-</b> 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

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 <b><i>-accountStatus-</i></b> from the QMAIL schema.
+attribute mail explained	admin	en	This handles the attribute <b><i>-mail-</i></b> 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 <b><i>-mailAlternateAddress-</i></b> from the QMAIL schema and can be handled as virtual maps or aliases.
+attribute mailforwardingaddress explained	admin	en	This handles the attribute <b><i>-mailForwardingAddress-</i></b> 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

admin/templates/default/account_form_ldapdata.tpl

@@ -0,0 +1,84 @@
+<!-- BEGIN form -->
+ <form method="POST" action="{form_action}">
+  <center>
+	<table border="0" width="95%">
+		<tr>
+			<td valign="top">
+					{rows}
+			</td>
+			<td>
+				<table border=0 width=100% cellspacing="1" cellpadding="2">
+					<tr bgcolor="{th_bg}">
+						<td colspan="2" style="padding-left:10px; text-align: left">
+							<b>{lang_email_config}<img src="{info_icon}" border="0" onMouseOver="this.T_TITLE='Info:'; this.T_WIDTH=250; return escape('<p>{lang_info_UsageHints}</p>')" /></b>
+						</td>
+						<td align="right">
+							<input type="checkbox" name="accountStatus" {account_checked}>
+							{lang_emailaccount_active}<img src="{info_icon}" border="0" onMouseOver="this.T_TITLE='Info:'; this.T_WIDTH=250; return escape('<p>{lang_info_AccountActive}</p>')" />
+						</td>
+					</tr>
+					<tr bgcolor="{tr_color1}">
+						<td style="padding-left:10px; text-align: left">{lang_masterEmailAddress}<img src="{info_icon}" border="0" onMouseOver="this.T_TITLE='Info:'; this.T_WIDTH=250; return escape('<p>{lang_info_masterEmailAddress}</p>')" /></td>
+						<td colspan="2" style="text-align: left"><input name="mail" value="{mail}" size=35></td>
+					</tr>
+					<tr bgcolor="{tr_color2}">
+						<td rowspan="4" style="padding-left:10px; vertical-align: top; text-align: left;">{lang_mailAliases}<img src="{info_icon}" border="0" onMouseOver="this.T_TITLE='Info:'; this.T_WIDTH=250; return escape('<p>{lang_info_mailAliases}</p>')" /></td>
+						<td rowspan="4" style="text-align: left">{options_mailAlternateAddress}</td>
+						<td align="center">
+							<input type="submit" value="{lang_remove} -->" name="remove_mailAlternateAddress">
+						</td>
+					</tr>
+					<tr bgcolor="{tr_color1}">
+						<td>
+							&nbsp;
+						</td>
+					</tr>
+					<tr bgcolor="{tr_color2}">
+						<td align="center">
+							<input name="mailAlternateAddressInput" value="" size=35>
+						</td>
+					</tr>
+					<tr bgcolor="{tr_color2}">
+						<td align="center">
+							<input type="submit" value="<-- {lang_add}" name="add_mailAlternateAddress">
+						</td>
+					</tr>
+
+					<tr bgcolor="{tr_color1}">
+						<td style="padding-left:10px; text-align: left">
+							{lang_RouteMailsTo}<img src="{info_icon}" border="0" onMouseOver="this.T_TITLE='Info:'; this.T_WIDTH=250; return escape('<p>{lang_info_RouteMailsTo}</p>')" />
+						</td>
+						<td colspan="2" style="text-align: left">
+							<input name="mailForwardingAddress" value="{mailForwardingAddress}" size=35>
+						</td>
+					</tr>
+					<tr>
+						<td colspan="3">
+							&nbsp;
+						</td>
+					</tr>
+					<tr>
+						<td colspan="3">
+							&nbsp;
+						</td>
+					</tr>
+				</table>
+				<table border=0 width=100%>
+					<tr bgcolor="{tr_color1}">
+						<td align="right" colspan="2">
+							<input type="submit" name="save" value="{lang_button}">
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+  </center>
+ </form>
+<!-- END form -->
+
+<!-- BEGIN link_row -->
+					<tr bgcolor="{tr_color}">
+						<td colspan="2">&nbsp;&nbsp;<a href="{row_link}">{row_text}</a></td>
+					</tr>
+<!-- END link_row -->