![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/addons/addressbook/class_addressbook.inc b/plugins/addons/addressbook/class_addressbook.inc
index 461cb574a21fdbf48f58ba50adee421b7c0cb2f6..5d5a24a9b85ce5c3e280a69e06ffd8a2d046f28e 100644 (file)
/* Include config object */
$this->config= $config;
+ print $dn;
+
#FIXME: ACL is set to default for testing
$this->acl= "#all#";
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
$smarty= get_smarty();
#! Hickert
break;
case "remove":
$this->dn= $_SESSION['show_info'];
-
+ $this->load();
/* Load permissions for selected 'dn' and check if
we're allowed to remove this 'dn' */
$ui= get_userinfo();
foreach ($bases as $base){
$ldap->cd ($base);
if ($phonefilter['object_type'] == '*'){
- $ldap->search ("(&(objectClass=person)$filter(!(objectClass=gosaUserTemplate))".
+ $ldap->search ("(&(objectClass=person)$filter(!(objectClass=gosaUserTemplate))(!(uid=*$))".
"(|(uid=$s)(homePhone=$s)(telephoneNumber=$s)".
"(facsimileTelephoneNumber=$s)(mobile=$s)(givenName=$s)(sn=$s)))", array("sn", "givenName", "telephoneNumber", "facsimileTelephoneNumber", "mobile", "homePhone", "uid", "mail", "cn"));
} else {
- $ldap->search ("(&$filter(!(objectClass=gosaUserTemplate))".
+ $ldap->search ("(&$filter(!(uid=*$))(!(objectClass=gosaUserTemplate))".
"(".$phonefilter['object_type']."=$s))", array("sn", "givenName", "telephoneNumber", "facsimileTelephoneNumber", "mobile", "homePhone", "uid", "mail", "cn"));
}
isset($attrs['homePhone'][0]) ||
isset($attrs['mail'][0])){
- $this->telephone_list[$attrs['sn'][0].$attrs['dn']]=
- "<td class=\"phonelist\" title=\"".$attrs['sn'][0].", ".$attrs['givenName'][0]."\" onClick='location.href=\"main.php?plug=".validate($_GET['plug'])."&start=".validate($_GET['start'])."&show=".base64_encode($attrs['dn'])."\"'><a href=main.php?plug=".validate($_GET['plug'])."&start=".validate($_GET['start'])."&show=".base64_encode($attrs['dn']).">".$attrs['sn'][0].", ".$attrs['givenName'][0]."</a></td>".
- "<td title=\""._("Dial")." ".$attrs['telephoneNumber'][0]."\"><a href=main.php?plug=".validate($_GET['plug'])."&dial=telephoneNumber&start=".validate($_GET['start'])."&target=".base64_encode($attrs['dn']).">".$attrs['telephoneNumber'][0]."</a></td>".
- "<td title=\"".$attrs['facsimileTelephoneNumber'][0]."\">".$attrs['facsimileTelephoneNumber'][0]."</td>".
- "<td title=\""._("Dial")." ".$attrs['mobile'][0]."\"><a href=main.php?plug=".validate($_GET['plug'])."&dial=mobile&start=".validate($_GET['start'])."&target=".base64_encode($attrs['dn']).">".$attrs['mobile'][0]."</a></td>".
- "<td title=\""._("Dial")." ".$attrs['homePhone'][0]."\"><a href=main.php?plug=".validate($_GET['plug'])."&dial=homePhone&start=".validate($_GET['start'])."&target=".base64_encode($attrs['dn']).">".$attrs['homePhone'][0]."</a></td><td>".
- "<a href=\"getvcard.php?dn=".base64_encode($attrs['dn'])."\">".
- "<img align=\"top\" border=0 src=\"images/save.png\"".
- "alt=\"vcf\" title=\"".sprintf(_("Save contact for %s as vcard"), $attrs['givenName'][0]." ".$attrs['sn'][0])."\"></a>";
+$this->telephone_list[$attrs['sn'][0].$attrs['dn']]=
+
+"<td class=\"phonelist\" title=\"".$attrs['sn'][0].", ".$attrs['givenName'][0]."\" onClick='location.href=\"main.php?plug=".validate($_GET['plug'])."&start=".validate($_GET['start'])."&show=".base64_encode($attrs['dn'])."\"'><a href=\"main.php?plug=".validate($_GET['plug'])."&start=".validate($_GET['start'])."&show=".base64_encode($attrs['dn'])."\">".$attrs['sn'][0].", ".$attrs['givenName'][0].
+ "</a>
+</td>
+<td title=\""._("Dial")." ".$attrs['telephoneNumber'][0]."\">
+ <a href=\"main.php?plug=".validate($_GET['plug'])."&dial=telephoneNumber&start=".validate($_GET['start'])."&target=".base64_encode($attrs['dn'])."\">".$attrs['telephoneNumber'][0]."
+ </a>
+</td>
+<td title=\"".$attrs['facsimileTelephoneNumber'][0]."\">
+ ".$attrs['facsimileTelephoneNumber'][0]."
+</td>
+<td title=\""._("Dial")." ".$attrs['mobile'][0]."\">
+ <a href=\"main.php?plug=".validate($_GET['plug'])."&dial=mobile&start=".validate($_GET['start'])."&target=".base64_encode($attrs['dn'])."\">".$attrs['mobile'][0]."
+ </a>
+</td>
+<td title=\""._("Dial")." ".$attrs['homePhone'][0]."\">
+ <a href=\"main.php?plug=".validate($_GET['plug'])."&dial=homePhone&start=".validate($_GET['start'])."&target=".base64_encode($attrs['dn'])."\">".$attrs['homePhone'][0]."
+ </a>
+</td>
+<td>
+ <a href=\"getvcard.php?dn=".base64_encode($attrs['dn'])."\">
+ <img align=\"top\" border=0 src=\"images/save.png\" alt=\"vcf\" title=\"".sprintf(_("Save contact for %s as vcard"), $attrs['givenName'][0]." ".$attrs['sn'][0])."\">
+ </a>";
if (isset($attrs['mail'])){
$dest= sprintf(_("Send mail to %s"), $attrs['mail'][0]);
$this->telephone_list[$attrs['sn'][0].$attrs['dn']].=
- "<a href=\"mailto:".$attrs['givenName'][0]." ".$attrs['sn'][0]." <".$attrs['mail'][0].">\">".
- "<img align=\"top\" border=0 src=\"images/mailto.png\"".
+
+ "<a href=\"mailto:".$attrs['mail'][0]."\">".
+ "<img align=\"top\" border=0 src=\"images/mailto.png\" ".
"alt=\"vcf\" title=\"$dest\"></a>";
}
$this->telephone_list[$attrs['sn'][0].$attrs['dn']].= "</td>";
$smarty->assign("global", $phonefilter['global']);
$smarty->assign("organizational", $phonefilter['organizational']);
$smarty->assign("search_image", get_template_path('images/search.png'));
+ $smarty->assign("obj_image", get_template_path('images/list_ogroup.png'));
$smarty->assign("tree_image", get_template_path('images/tree.png'));
$smarty->assign("infoimage", get_template_path('images/info.png'));
$smarty->assign("actionimage", get_template_path('images/action.png'));
/* Build list output */
$output= "";
$mod= 0;
+
+ #! hickert
+ if(!isset($_SESSION['show_info'])) $smarty->assign("show_info", "");;
+
if (isset($_SESSION['show_info'])){
$range= 4;
$smarty->assign("show_info", "1");
$name == "homePhone" ||
$name == "telephoneNumber"){
$smarty->assign("info_$name",
- "<a title=\""._("Dial")." ".$info["$name"][0]."\" href=main.php?plug=".validate($_GET['plug'])."&dial=$name&start=".validate($_GET['start'])."&target=".base64_encode($_SESSION['show_info']).">".$info["$name"][0]."</a>");
+ "<a title=\""._("Dial")." ".$info["$name"][0]."\" href=\"main.php?plug=".validate($_GET['plug'])."&dial=$name&start=".validate($_GET['start'])."&target=".base64_encode($_SESSION['show_info'])."\">".$info["$name"][0]."</a>");
} else {
$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", "-");
}
if (preg_match("/,dc=addressbook,/", $_SESSION['show_info'])){
$storage= _("global addressbook");
+ $smarty->assign("internal", 0);
} else {
- $storage= _("organizations user database");
+ $storage= _("user database");
$smarty->assign("internal", 1);
}
if ($_SESSION['show_info'] != "ADD"){
- $smarty->assign("storage_info", sprintf(_("Contact stored in %s"), $storage));
+ $smarty->assign("storage_info", sprintf(_("Contact stored in '%s'"), $storage));
} else {
$smarty->assign("storage_info", _("Creating new entry in"));
}
} else {
$col= "style=\"background-color: #F5F5F5;\"";
}
- $output.= "<tr $col>$val</tr>";
+ $output.= "<tr $col>\n$val</tr>\n";
}
$smarty->assign("search_result", $output);
$smarty->assign("apply", apply_filter());