From 22e2654edd759859ca0ec9f7e6b905d9325d709f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 5 Dec 2007 15:56:54 +0100
Subject: [PATCH] catch a few more LDAP errors and display them in a nicer way

darcs-hash:20071205145654-6e07b-5775495f3f5d527beec66ed368b6aceea42d3b65.gz
---
 entry.php            |   5 +++--
 inc/functions.php    |   6 ++++--
 inc/template.php     |   1 -
 pix/ldaperror.png    | Bin 0 -> 5190 bytes
 styles/design.css    |  17 +++++++++++++++++
 templates/header.tpl |  10 +++++++---
 templates/style.css  |   1 +
 7 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 pix/ldaperror.png

diff --git a/entry.php b/entry.php
index bb207ce..524bb54 100644
--- a/entry.php
+++ b/entry.php
@@ -89,8 +89,9 @@ function _fetchData($dn){
   global $smarty;
   global $users; //contains the users for manager role
 
-  $sr = ldap_search($LDAP_CON,$dn,'(objectClass=inetOrgPerson)');
-  if(!ldap_count_entries($LDAP_CON,$sr)){
+  $sr = @ldap_search($LDAP_CON,$dn,'(objectClass=inetOrgPerson)');
+  tpl_ldaperror();
+  if(!@ldap_count_entries($LDAP_CON,$sr)){
     return false;
   }
   $result = ldap_get_binentries($LDAP_CON, $sr);
diff --git a/inc/functions.php b/inc/functions.php
index bb24f23..33300c6 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -386,8 +386,9 @@ function ldap_queryabooks($filter,$types){
   $result2 = array();
 
   // public addressbook
-  $sr      = ldap_list($LDAP_CON,$conf['publicbook'],
-                       $filter,$types);
+  $sr      = @ldap_list($LDAP_CON,$conf['publicbook'],
+                        $filter,$types);
+  tpl_ldaperror();
   $result1 = ldap_get_binentries($LDAP_CON, $sr);
   ldap_free_result($sr);
 
@@ -396,6 +397,7 @@ function ldap_queryabooks($filter,$types){
     $sr      = @ldap_list($LDAP_CON,$conf['privatebook'].
                           ','.$_SESSION['ldapab']['binddn'],
                           $filter,$types);
+    tpl_ldaperror();
     $result2 = ldap_get_binentries($LDAP_CON, $sr);
   }
 
diff --git a/inc/template.php b/inc/template.php
index 8ebe359..93095a1 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -97,7 +97,6 @@ function tpl_ldaperror($message=""){
     if(!empty($message)){
       $__LDAPERROR__ .= "($message)";
     }
-    $__LDAPERROR__ .= '\n';
   }
   $smarty->assign("LDAPERRORS",$__LDAPERROR__);
 }
diff --git a/pix/ldaperror.png b/pix/ldaperror.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fb7d19152ad36c14816f542726a51b7e14b7544
GIT binary patch
literal 5190
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
A6aWAK

literal 0
HcmV?d00001

diff --git a/styles/design.css b/styles/design.css
index f23a280..aab3323 100644
--- a/styles/design.css
+++ b/styles/design.css
@@ -148,3 +148,20 @@ a.cloud_4 {font-size: 160%; }
 a.cloud_5 {font-size: 180%; }
 a.cloud_6 {font-size: 200%; }
 
+
+div.ldaperror {
+  border: 1px solid #c33;
+  background: #fcc url(../pix/ldaperror.png) 10px 10px no-repeat;
+  width: 50%;
+  position: absolute;
+  z-index: 555;
+  top: 20%;
+  left: 25%;
+  padding: 0.5em 0.5em 1em 80px;
+  height: auto !important;
+  height: 60px;
+  min-height: 60px;
+  opacity: 0.9;
+  cursor: pointer;
+}
+
diff --git a/templates/header.tpl b/templates/header.tpl
index 4939c97..224538e 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -28,9 +28,6 @@
     <script src="scripts/gui.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-        {if $LDAPERRORS != ''}
-            window.alert('{$lang.err_ldap}:\n\n{$LDAPERRORS|escape:quotes}');
-        {/if}
         {if $entry.dn}
             DN = '{$entry.dn|escape:javascript}';
         {/if}
@@ -42,6 +39,13 @@
 <body>
 
 <div id="ldapab">
+    {if $LDAPERRORS != ''}
+        <div class="ldaperror" onclick="this.style.display = 'none'">
+            <h3>{$lang.err_ldap}</h3>
+            <p>{$LDAPERRORS|escape}</p>
+        </div>
+    {/if}
+
 
     <div id="titlerow">
         <div class="logo">
diff --git a/templates/style.css b/templates/style.css
index 6034799..78f4cd9 100644
--- a/templates/style.css
+++ b/templates/style.css
@@ -152,3 +152,4 @@ a.tag {
   background: url(../pix/tag_blue.png) left center no-repeat;
   padding-left: 18px;
 }
+
-- 
2.39.5