Merged

[quix0rs-gnu-social.git] / plugins / LdapAuthentication / LdapAuthenticationPlugin.php

diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
index 38ea6e6592356664bb8289cfa6297d3d186baeb3..8eeb1004b0890d7a912f57db0014003f300f21e1 100644 (file)
--- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
+++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
@@ -54,9 +54,11 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
             require_once(INSTALLDIR.'/plugins/LdapCommon/LdapCommon.php');
             return false;
         }
+
+        return parent::onAutoload($cls);
     }
 
-    function onEndShowPageNotice($action)
+    function onEndShowPageNotice(Action $action)
     {
         $name = $action->trimmed('action');
         $instr = false;
@@ -112,7 +114,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
             }
             $registration_data['nickname'] = $nickname;
             //set the database saved password to a random string.
-            $registration_data['password']=common_good_rand(16);
+            $registration_data['password']=common_random_hexstr(16);
             return User::register($registration_data);
         }else{
             //user isn't in ldap, so we cannot register him
@@ -140,10 +142,10 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
         return common_nicknamize($nickname);
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LDAP Authentication',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:LdapAuthentication',
                             'rawdescription' =>