Added type-hint for RedirectToLogin hooks. Please note that User $user=null

[quix0rs-gnu-social.git] / plugins / LdapAuthorization / LdapAuthorizationPlugin.php

diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
index 97103d158e8c2e0c689cb0f0d31b8abe228c00f2..eca8e037a03d066598d0033d6880cf93f970c342 100644 (file)
--- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
+++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.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/
  */
@@ -38,10 +38,12 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
 
     function onInitializePlugin(){
         if(!isset($this->provider_name)){
-            throw new Exception("provider_name must be set. Use the provider_name from the LDAP Authentication plugin.");
+            // TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+            throw new Exception(_m('provider_name must be set. Use the provider_name from the LDAP Authentication plugin.'));
         }
         if(!isset($this->uniqueMember_attribute)){
-            throw new Exception("uniqueMember_attribute must be set.");
+            // TRANS: Exception thrown when initialising the LDAP Auth plugin fails because of an incorrect configuration.
+            throw new Exception(_m('uniqueMember_attribute must be set.'));
         }
         $this->ldapCommon = new LdapCommon(get_object_vars($this));
     }
@@ -54,6 +56,8 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
             require_once(INSTALLDIR.'/plugins/LdapCommon/LdapCommon.php');
             return false;
         }
+
+        return parent::onAutoload($cls);
     }
 
     //---interface implementation---//
@@ -114,13 +118,14 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
         return false;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LDAP Authorization',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:LdapAuthorization',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('The LDAP Authorization plugin allows for StatusNet to handle authorization through LDAP.'));
         return true;
     }