Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / CasAuthentication / CasAuthenticationPlugin.php

diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php
index 71e54d41f9127e8a6a5f67d41c0e0e73913213d0..7f467173b0766616d5f3d53575a8ca2520c42e77 100644 (file)
--- a/plugins/CasAuthentication/CasAuthenticationPlugin.php
+++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php
@@ -54,13 +54,13 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
          case 'phpCAS':
             require_once(INSTALLDIR.'/plugins/CasAuthentication/extlib/CAS.php');
             return false;
-         case 'CasloginAction':
-            require_once(INSTALLDIR.'/plugins/CasAuthentication/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
-            return false;
         }
+
+        // if it's not our exception, try standard places
+        return parent::onAutoload($cls);
     }
 
-    function onArgsInitialize(&$args)
+    function onArgsInitialize(array &$args)
     {
         if($this->takeOverLogin && $args['action'] == 'login')
         {
@@ -74,7 +74,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
         return true;
     }
 
-    function onEndLoginGroupNav(&$action)
+    function onEndLoginGroupNav($action)
     {
         $action_name = $action->trimmed('action');
 
@@ -125,12 +125,15 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->server)){
+            // TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
             throw new Exception(_m("Specifying a server is required."));
         }
         if(!isset($this->port)){
+            // TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
             throw new Exception(_m("Specifying a port is required."));
         }
         if(!isset($this->path)){
+            // TRANS: Exception thrown when the CAS Authentication plugin has been configured incorrectly.
             throw new Exception(_m("Specifying a path is required."));
         }
         //These values need to be accessible to a action object
@@ -144,10 +147,10 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
         $casSettings['takeOverLogin']=$this->takeOverLogin;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'CAS Authentication',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:CasAuthentication',
                             // TRANS: Plugin description. CAS is Central Authentication Service.