autoloading of Crypt_AES and Crypt_RSA is easier

diff --git a/plugins/LRDD/LRDDPlugin.php b/plugins/LRDD/LRDDPlugin.php
index 16eee335a3079050eb326ee69e68820d5d10fcbf..a7bdb0edbb706a012b981b5a4ac465e037e90b35 100644 (file)
--- a/plugins/LRDD/LRDDPlugin.php
+++ b/plugins/LRDD/LRDDPlugin.php
@@ -41,6 +41,7 @@ class LRDDPlugin extends Plugin
 
         return parent::onAutoload($cls);
     }
+
     public function onStartDiscoveryMethodRegistration(Discovery $disco) {
         $disco->registerMethod('LRDDMethod_WebFinger');
     }

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 5b7147ebee661ae79999574e1be4a7c579c5b4c6..d1eea869a7569e56aef96746ea78d38689cc0abe 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -83,6 +83,20 @@ class OStatusPlugin extends Plugin
         return true;
     }
 
+    public function onAutoload($cls)
+    {
+        switch ($cls) {
+        case 'Crypt_AES':
+        case 'Crypt_RSA':
+            // Crypt_AES becomes Crypt/AES.php which is found in extlib/phpseclib/
+            // which has been added to our include_path before
+            require_once str_replace('_', '/', $cls) . '.php';
+            return false;
+        }
+
+        return parent::onAutoload($cls);
+    }
+
     /**
      * Set up queue handlers for outgoing hub pushes
      * @param QueueManager $qm