Merged

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

diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
index 0dfc4c63be15437841b6705871da3af637088eca..8eeb1004b0890d7a912f57db0014003f300f21e1 100644 (file)
--- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
+++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php
@@ -22,7 +22,7 @@
  * @category  Plugin
  * @package   StatusNet
  * @author    Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -36,25 +36,29 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->attributes['nickname'])){
-            throw new Exception("must specify a nickname attribute");
+            // TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+            throw new Exception(_m('You must specify a nickname attribute.'));
         }
         if($this->password_changeable && (! isset($this->attributes['password']) || !isset($this->password_encoding))){
-            throw new Exception("if password_changeable is set, the password attribute and password_encoding must also be specified");
+            // TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+            throw new Exception(_m('If password_changeable is set, the password attribute and password_encoding must also be specified.'));
         }
         $this->ldapCommon = new LdapCommon(get_object_vars($this));
     }
 
     function onAutoload($cls)
-    {   
+    {
         switch ($cls)
         {
          case 'LdapCommon':
             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;
@@ -63,11 +67,13 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
         {
          case 'register':
             if($this->autoregistration) {
-                $instr = 'Have an LDAP account? Use your standard username and password.';
+                // TRANS: Instructions for LDAP authentication.
+                $instr = _m('Do you have an LDAP account? Use your standard username and password.');
             }
             break;
          case 'login':
-            $instr = 'Have an LDAP account? Use your standard username and password.';
+            // TRANS: Instructions for LDAP authentication.
+            $instr = _m('Do you have an LDAP account? Use your standard username and password.');
             break;
          default:
             return true;
@@ -79,7 +85,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
         }
         return true;
     }
-    
+
     //---interface implementation---//
 
     function checkPassword($username, $password)
@@ -108,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
@@ -136,13 +142,14 @@ 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' =>
+                            // TRANS: Plugin description.
                             _m('The LDAP Authentication plugin allows for StatusNet to handle authentication through LDAP.'));
         return true;
     }