We now can show "Friendica (AP)" as network name

[friendica.git] / src / Core / Addon.php

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index eb2b7d1aac6b6e22630d20ed45d8d77c913d4cd1..4c20c96ad4705546ed0ab6c429c0e64351a74f9b 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -5,8 +5,7 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -24,7 +23,7 @@ class Addon
        public static function uninstall($addon)
        {
                logger("Addons: uninstalling " . $addon);
-               dba::delete('addon', ['name' => $addon]);
+               DBA::delete('addon', ['name' => $addon]);
 
                @include_once('addon/' . $addon . '/' . $addon . '.php');
                if (function_exists($addon . '_uninstall')) {
@@ -55,7 +54,7 @@ class Addon
 
                        $addon_admin = (function_exists($addon."_addon_admin") ? 1 : 0);
 
-                       dba::insert('addon', ['name' => $addon, 'installed' => true,
+                       DBA::insert('addon', ['name' => $addon, 'installed' => true,
                                                'timestamp' => $t, 'plugin_admin' => $addon_admin]);
 
                        // we can add the following with the previous SQL
@@ -63,7 +62,7 @@ class Addon
                        // This way the system won't fall over dead during the update.
 
                        if (file_exists('addon/' . $addon . '/.hidden')) {
-                               dba::update('addon', ['hidden' => true], ['name' => $addon]);
+                               DBA::update('addon', ['hidden' => true], ['name' => $addon]);
                        }
                        return true;
                } else {
@@ -79,9 +78,9 @@ class Addon
        {
                $addons = Config::get('system', 'addon');
                if (strlen($addons)) {
-                       $r = dba::select('addon', [], ['installed' => 1]);
-                       if (DBM::is_result($r)) {
-                               $installed = dba::inArray($r);
+                       $r = DBA::select('addon', [], ['installed' => 1]);
+                       if (DBA::isResult($r)) {
+                               $installed = DBA::toArray($r);
                        } else {
                                $installed = [];
                        }
@@ -108,7 +107,7 @@ class Addon
                                                                        $func = $addon . '_install';
                                                                        $func();
                                                                }
-                                                               dba::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
+                                                               DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
                                                        }
                                                }
                                        }
@@ -125,7 +124,7 @@ class Addon
         */
        public static function isEnabled($addon)
        {
-               return dba::exists('addon', ['installed' => true, 'name' => $addon]);
+               return DBA::exists('addon', ['installed' => true, 'name' => $addon]);
        }
 
 
@@ -140,13 +139,15 @@ class Addon
         */
        public static function registerHook($hook, $file, $function, $priority = 0)
        {
+               $file = str_replace(get_app()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
+
                $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
-               $exists = dba::exists('hook', $condition);
+               $exists = DBA::exists('hook', $condition);
                if ($exists) {
                        return true;
                }
 
-               $r = dba::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
+               $r = DBA::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
 
                return $r;
        }
@@ -161,8 +162,14 @@ class Addon
         */
        public static function unregisterHook($hook, $file, $function)
        {
+               $relative_file = str_replace(get_app()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
+
+               // This here is only needed for fixing a problem that existed on the develop branch
                $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
-               $r = dba::delete('hook', $condition);
+               DBA::delete('hook', $condition);
+
+               $condition = ['hook' => $hook, 'file' => $relative_file, 'function' => $function];
+               $r = DBA::delete('hook', $condition);
                return $r;
        }
 
@@ -173,15 +180,15 @@ class Addon
        {
                $a = get_app();
                $a->hooks = [];
-               $r = dba::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
+               $r = DBA::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
 
-               while ($rr = dba::fetch($r)) {
+               while ($rr = DBA::fetch($r)) {
                        if (! array_key_exists($rr['hook'], $a->hooks)) {
                                $a->hooks[$rr['hook']] = [];
                        }
                        $a->hooks[$rr['hook']][] = [$rr['file'],$rr['function']];
                }
-               dba::close($r);
+               DBA::close($r);
        }
 
        /**
@@ -245,7 +252,7 @@ class Addon
                } else {
                        // remove orphan hooks
                        $condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];
-                       dba::delete('hook', $condition, ['cascade' => false]);
+                       DBA::delete('hook', $condition, ['cascade' => false]);
                }
        }
 
@@ -312,7 +319,12 @@ class Addon
                        foreach ($ll as $l) {
                                $l = trim($l, "\t\n\r */");
                                if ($l != "") {
-                                       list($type, $v) = array_map("trim", explode(":", $l, 2));
+                                       $addon_info = array_map("trim", explode(":", $l, 2));
+                                       if (count($addon_info) < 2) {
+                                               continue;
+                                       }
+
+                                       list($type, $v) = $addon_info;
                                        $type = strtolower($type);
                                        if ($type == "author" || $type == "maintainer") {
                                                $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m);