From 231aee6755d6df2e5c0029b801554a7a22225c87 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 31 May 2005 17:24:43 +0000
Subject: [PATCH] Fixed W3C conformance of addressbook

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@565 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/addons/addressbook/address_edit.tpl            |  2 +-
 plugins/addons/addressbook/class_addressbook.inc       |  2 +-
 plugins/addons/addressbook/contents.tpl                |  6 ++++--
 plugins/addons/addressbook/dial.tpl                    |  7 +------
 .../admin/applications/class_applicationGeneric.inc    | 10 ++++++----
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/plugins/addons/addressbook/address_edit.tpl b/plugins/addons/addressbook/address_edit.tpl
index 1d87a222d..9cf55638e 100644
--- a/plugins/addons/addressbook/address_edit.tpl
+++ b/plugins/addons/addressbook/address_edit.tpl
@@ -1,7 +1,7 @@
 <table style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" cellpadding=4 cellspacing=0 border=0>
 <tr style="background-color: #E8E8E8; height:26px;font-weight:bold;">
 <td align=left width="100%">{$storage_info}
- <select name="storage_base" size=1" title="{t}Choose the department to store entry in{/t}">
+ <select name="storage_base" size="1" title="{t}Choose the department to store entry in{/t}">
   {html_options options=$deplist selected=$storage_base}
  </select>
 </td>
diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc
index 952e3230d..1c3c87e2a 100644
--- a/plugins/addons/addressbook/class_addressbook.inc
+++ b/plugins/addons/addressbook/class_addressbook.inc
@@ -452,7 +452,7 @@ $this->telephone_list[$attrs['sn'][0].$attrs['dn']]=
 					$smarty->assign("info_$name", preg_replace("/\n/", "<br>", $info["$name"][0]));
                                 }
 				error_reporting(E_ALL);
-			} elseif ($_SESSION['show_info'] == "ADD") {
+			} elseif ($_SESSION['show_info'] == "ADD" && isset($this->$name)) {
 				$smarty->assign("info_$name", $this->$name);
 			} else {
 				$smarty->assign("info_$name", "-");
diff --git a/plugins/addons/addressbook/contents.tpl b/plugins/addons/addressbook/contents.tpl
index 266328d9e..6e65a0853 100644
--- a/plugins/addons/addressbook/contents.tpl
+++ b/plugins/addons/addressbook/contents.tpl
@@ -78,8 +78,9 @@
 			&nbsp;{t}Display results for department{/t}
 		</td>
     	<td>
-			<select name="search_base" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
+			<select name="search_base" size="1" onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
 		      	{html_options options=$deplist selected=$depselect}
+				<option disabled></option>
     		</select>
 		</td>
 	</tr>
@@ -102,8 +103,9 @@
 			<img alt="" src="{$search_image}" align=middle>&nbsp;{t}Match object{/t}
 		</td>
 	    <td>
-	      	<select name="object_type" size=1 onChange="mainform.submit()" title="{t}Choose the object that will be searched in{/t}">
+	      	<select name="object_type" size="1" onChange="mainform.submit()" title="{t}Choose the object that will be searched in{/t}">
     	   		{html_options options=$objlist selected=$object_type}
+				<option disabled></option>
 	      	</select>
 	    </td>
 	</tr>
diff --git a/plugins/addons/addressbook/dial.tpl b/plugins/addons/addressbook/dial.tpl
index 4cf4a0014..4b350ec7e 100644
--- a/plugins/addons/addressbook/dial.tpl
+++ b/plugins/addons/addressbook/dial.tpl
@@ -1,10 +1,9 @@
 <table style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" cellpadding=4 cellspacing=0 border=0>
 <tr style="background-color: #E8E8E8; height:26px;font-weight:bold;">
 <td align=left width="100%">{t}Dial connection...{/t}</td>
-<td><a href="{$url}">X</a></td>
 </tr>
 <tr style="background-color: white">
-<td colspan=2 style="text-align:center;">
+<td style="text-align:center;">
  <div style="height:50px;">&nbsp;</div>
  <a style="font-size:22px"><img alt="" src="{$phone_image}" align=middle>{$dial_info}</a>
  <div style="height:60px;">&nbsp;</div>
@@ -14,7 +13,3 @@
 
 </tr>
 </table>
-
-</td>
-</tr>
-</table>
diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index 4330a54e0..27cf79eb1 100644
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -31,7 +31,9 @@ class application extends plugin
 
 	/* Load icon */
 	$ldap= $config->get_ldap_link();
-	$this->iconData= $ldap->get_attribute($dn, "gosaApplicationIcon");
+	if ($dn != 'new'){
+		$this->iconData= $ldap->get_attribute($dn, "gosaApplicationIcon");
+	}
 	if ($this->iconData == ""){
 		$this->set_picture("");
 	}
@@ -41,12 +43,12 @@ class application extends plugin
 	/* This is always an account */
 	$this->is_account= TRUE;
 
-        if ($this->dn == "new"){
+	if ($this->dn == "new"){
 		$ui= get_userinfo();
 		$this->base= dn2base($ui->dn);
 	} else {
-                $this->base= preg_replace ("/^[^,]+,[^,]+,/", "", $this->dn);
-        }
+		$this->base= preg_replace ("/^[^,]+,[^,]+,/", "", $this->dn);
+	}
   }
 
   function execute()
-- 
2.30.2