From 50cf668f4837a22c451b53a2cf9b809c2edc3d63 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Tue, 9 Oct 2007 21:37:47 +0000
Subject: [PATCH] More LDAP fixes

---
 docs/changelog/7.x.x.txt                                    | 1 +
 lib/WebGUI/Auth/LDAP.pm                                     | 6 ++++--
 lib/WebGUI/Workflow/Activity/SyncProfileToLdap.pm           | 2 +-
 .../jscripts/tiny_mce/themes/advanced/jscripts/link.js      | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 8a8138079..49c3666a2 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -16,6 +16,7 @@
  - fix: SQL Reports only work on MySQL databases
  - More complete error messages from spectre
  - fix: Wiki uploads didn't obey image and thumbnail size
+ - fix: Doesn't copy LDAP link to user on create, also wrong search base
 
 7.4.8
  - fix: Syndicated Content doesn't display all items with multiple feeds in interleaved mode
diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm
index 39f6509bf..85180d9f0 100644
--- a/lib/WebGUI/Auth/LDAP.pm
+++ b/lib/WebGUI/Auth/LDAP.pm
@@ -300,7 +300,8 @@ sub createAccountSave {
    my $properties;
    $properties->{connectDN} = $connectDN;
    $properties->{ldapUrl} = $connection->{ldapUrl};
-   
+   $properties->{ldapConnection} = $connection->{ldapLinkId};
+
    return $self->SUPER::createAccountSave($username,$properties,$password,$profile);
 }
 
@@ -503,7 +504,8 @@ sub login {
          if ($self->validUsername($username)) {
             $self->SUPER::createAccountSave($username, {
                  connectDN => $self->getConnectDN,
-                 ldapUrl   => $self->getLDAPConnection->{ldapUrl}
+                 ldapUrl   => $self->getLDAPConnection->{ldapUrl},
+                 ldapConnection  => $self->getLDAPConnection->{ldapLinkId},
             },$identifier);
             $hasAuthenticated = 1;
                 
diff --git a/lib/WebGUI/Workflow/Activity/SyncProfileToLdap.pm b/lib/WebGUI/Workflow/Activity/SyncProfileToLdap.pm
index fdb8e6d33..6e0093d23 100644
--- a/lib/WebGUI/Workflow/Activity/SyncProfileToLdap.pm
+++ b/lib/WebGUI/Workflow/Activity/SyncProfileToLdap.pm
@@ -127,7 +127,7 @@ sub execute {
         if($ldap) {
             my $uri    = $ldapLink->getURI();
             my $search = $ldap->search(
-                base   =>$ldapLink->getValue("ldapUserRDN"),
+                base   => $uri->dn,
                 scope  =>"sub", 
                 filter =>$ldapLink->getValue("ldapIdentity").'='.$userObject->username
             );
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/themes/advanced/jscripts/link.js b/www/extras/tinymce2/jscripts/tiny_mce/themes/advanced/jscripts/link.js
index e195497e1..f9d025e2c 100644
--- a/www/extras/tinymce2/jscripts/tiny_mce/themes/advanced/jscripts/link.js
+++ b/www/extras/tinymce2/jscripts/tiny_mce/themes/advanced/jscripts/link.js
@@ -8,7 +8,7 @@ if (url != null) {
 }
 
 function init() {
-	tinyMCEPopup.resizeToInnerSize();
+	try { tinyMCEPopup.resizeToInnerSize(); } catch(e) {}
 
 	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','theme_advanced_link');