More LDAP fixes

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

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;
                 

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
             );

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');