* Contributions by Thomas Uhle:

	. Add support to the LDAP attribute "userCertificate";
	. Move voiceMailTelephoneNumber from the TCL side to ldap_translate;
	. XOAUTH2 state generator changes format specifier from %x to %02x;
	. Clear compiler warnings and correct spelling in documentation.
	. Web Alpine will not attempt to continue a postponed message if the
	  postponed-msgs folder is empty.

1 files changed, 10 insertions, 8 deletions

diff --git a/web/cgi/alpine/1.0/ldapentry.tcl b/web/cgi/alpine/1.0/ldapentry.tcl
index a483f165..a66d7deb 100755
--- a/web/cgi/alpine/1.0/ldapentry.tcl
+++ b/web/cgi/alpine/1.0/ldapentry.tcl
@@ -216,9 +216,6 @@ WPEval $ldap_vars {
 		      name {
 			continue;
 		      }
-		      voicemailtelephonenumber {
-			set fieldname "Voice Mail"
-		      }
 		      "email address" {
 			set do_email 1
 			set fieldname [lindex $item 0]
@@ -232,12 +229,15 @@ WPEval $ldap_vars {
 		      }
 		    }
 
-		    set itematt ""
+		    set vals [list ""]
 		    if {[llength $item] > 2} {
 		      set itematt [lindex $item 2]
-		    }
-		    if {$itematt == "objectclass"} {
 		      set vals [lindex $item 1]
+		    } else {
+		      set itematt [lindex $item 1]
+		    }
+
+		    if {[lsearch -exact $itematt "objectclass"] >= 0} {
 		      continue
 		    }
 
@@ -249,8 +249,6 @@ WPEval $ldap_vars {
 		      set bgwhite 1
 		    }
 
-		    set vals [lindex $item 1]
-
 		    cgi_table_row bgcolor=$bgcolor {
 		      cgi_table_data width=25% nowrap valign=top rowspan=[llength $vals] {
 			cgi_division "style=\"padding-top:2\"" {
@@ -276,6 +274,8 @@ WPEval $ldap_vars {
 			  unset do_fax
 			} elseif {[info exists do_email]} {
 			  cgi_puts [cgi_url [cgi_font size=-1 face=courier [lindex $vals 0]] compose.tcl?ldap=1&dir=${dir}&qn=${qn}&si=${si}&ni=${ni}&ei=0&cid=[WPCmd PEInfo key]&oncancel=addrbook]
+			} elseif {[lsearch -exact -nocase $itematt "binary"] >= 0} {
+			  cgi_puts "[ Binary Data ]"
 			} else {
 			  cgi_puts [lindex $vals 0]
 			}
@@ -291,6 +291,8 @@ WPEval $ldap_vars {
 			  cgi_table_data height=20px {
 			    if {[info exists do_email]} {
 			      cgi_puts [cgi_url [cgi_font size=-1 face=courier $extra] compose.tcl?ldap=1&dir=${dir}&qn=${qn}&si=${si}&ni=${ni}&ei=[incr ei]&cid=[WPCmd PEInfo key]&oncancel=addrbook]
+			    } elseif {[lsearch -exact -nocase $itematt "binary"] >= 0} {
+			      cgi_puts "[ Binary Data ]"
 			    } else {
 			      cgi_puts $extra
 			    }