X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fplugin.php;h=9427827eda04c3b6c4d06aba3038d05a9f637e4e;hb=b53e1439969bfa2c0b551d8cc2fc8fe15652c62a;hp=80a3e96207e3001d64c652a4fdbf12c993dcf922;hpb=a0e107f17f27bc1dfc49de2a4493a461213e782e;p=quix0rs-gnu-social.git

diff --git a/lib/plugin.php b/lib/plugin.php
index 80a3e96207..9427827eda 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -99,7 +99,11 @@ class Plugin
      */
     public function onAutoload($cls) {
         $cls = basename($cls);
-        $basedir = INSTALLDIR . '/plugins/' . mb_substr(get_called_class(), 0, -6);
+        $basedir = INSTALLDIR . '/local/plugins/' . mb_substr(get_called_class(), 0, -6);
+        if (!file_exists($basedir)) {
+            $basedir = INSTALLDIR . '/plugins/' . mb_substr(get_called_class(), 0, -6);
+        }
+
         $file = null;
 
         if (preg_match('/^(\w+)(Action|Form)$/', $cls, $type)) {
@@ -158,13 +162,23 @@ class Plugin
         $this->log(LOG_DEBUG, $msg);
     }
     
-    function name()
+    public function name()
     {
         $cls = get_class($this);
         return mb_substr($cls, 0, -6);
     }
 
-    function onPluginVersion(&$versions)
+    public function version()
+    {
+        return GNUSOCIAL_VERSION;
+    }
+
+    protected function userAgent() {
+        return HTTPClient::userAgent()
+                . ' (' . get_class($this) . ' v' . $this->version() . ')';
+    }
+
+    function onPluginVersion(array &$versions)
     {
         $name = $this->name();
 
@@ -182,7 +196,7 @@ class Plugin
 
     static function staticPath($plugin, $relative)
     {
-        $isHTTPS = StatusNet::isHTTPS();
+        $isHTTPS = GNUsocial::isHTTPS();
 
         if ($isHTTPS) {
             $server = common_config('plugins', 'sslserver');