Update hook names

update hook names and other plugin references.

diff --git a/mod/admin.php b/mod/admin.php
index 33ea343c8140d7fa8d434fd2db89f0bd8a91237f..0b53dc93d812942f685438af3f19881c7e21f52a 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -62,8 +62,8 @@ function admin_post(App $a)
                                if ($a->argc > 2 &&
                                        is_file("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php")) {
                                        @include_once("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php");
-                                       if (function_exists($a->argv[2] . '_plugin_admin_post')) {
-                                               $func = $a->argv[2] . '_plugin_admin_post';
+                                       if (function_exists($a->argv[2] . '_addon_admin_post')) {
+                                               $func = $a->argv[2] . '_addon_admin_post';
                                                $func($a);
                                        }
                                }
@@ -1790,7 +1790,7 @@ function admin_page_addons(App $a)
                $admin_form = "";
                if (in_array($addon, $a->addons_admin)) {
                        @require_once("addon/$addon/$addon.php");
-                       $func = $addon . '_plugin_admin';
+                       $func = $addon . '_addon_admin';
                        $func($a, $admin_form);
                }
 

diff --git a/mod/settings.php b/mod/settings.php
index c067f3db19a3fdcbd1cc66ce1f8c34840b96781d..a5a4d4ad50781d341b25b47eeb6b34a619bfa938 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -170,23 +170,25 @@ function settings_post(App $a)
                                                        icon='%s',
                                                        uid=%d
                                                WHERE client_id='%s'",
-                                               dbesc($key),
-                                               dbesc($secret),
-                                               dbesc($name),
-                                               dbesc($redirect),
-                                               dbesc($icon),
-                                               local_user(),
-                                               dbesc($key));
+                                       dbesc($key),
+                                       dbesc($secret),
+                                       dbesc($name),
+                                       dbesc($redirect),
+                                       dbesc($icon),
+                                       local_user(),
+                                       dbesc($key)
+                               );
                        } else {
                                q("INSERT INTO clients
                                                        (client_id, pw, name, redirect_uri, icon, uid)
                                                VALUES ('%s', '%s', '%s', '%s', '%s',%d)",
-                                               dbesc($key),
-                                               dbesc($secret),
-                                               dbesc($name),
-                                               dbesc($redirect),
-                                               dbesc($icon),
-                                               local_user());
+                                       dbesc($key),
+                                       dbesc($secret),
+                                       dbesc($name),
+                                       dbesc($redirect),
+                                       dbesc($icon),
+                                       local_user()
+                               );
                        }
                }
                goaway(System::baseUrl(true)."/settings/oauth/");
@@ -196,12 +198,12 @@ function settings_post(App $a)
        if (($a->argc > 1) && ($a->argv[1] == 'addon')) {
                check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
 
-               Addon::callHooks('plugin_settings_post', $_POST);
+               Addon::callHooks('addon_settings_post', $_POST);
                return;
        }
 
-       if (($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-
+       if (($a->argc > 1) && ($a->argv[1] == 'connectors'))
+       {
                check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
 
                if (x($_POST, 'general-submit')) {
@@ -749,12 +751,12 @@ function settings_content(App $a)
        if (($a->argc > 1) && ($a->argv[1] === 'addon')) {
                $settings_addons = "";
 
-               $r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
+               $r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
                if (!DBM::is_result($r)) {
                        $settings_addons = t('No Addon settings configured');
                }
 
-               Addon::callHooks('plugin_settings', $settings_addons);
+               Addon::callHooks('addon_settings', $settings_addons);
 
 
                $tpl = get_markup_template('settings/addons.tpl');

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 7d5115b27d254c52fe06c5a556639f139887c08d..af3d843a9ad79bca639148d8b5ec36095285eac3 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -17,298 +17,299 @@ require_once 'include/dba.php';
  */\r
 class Addon\r
 {\r
-    /**\r
-     * @brief uninstalls an addon.\r
-     *\r
-     * @param string $addon name of the addon\r
-     * @return boolean\r
-     */\r
-    public static function uninstall($addon)\r
-    {\r
-        logger("Addons: uninstalling " . $addon);\r
-        dba::delete('addon', ['name' => $addon]);\r
-\r
-        @include_once('addon/' . $addon . '/' . $addon . '.php');\r
-        if (function_exists($addon . '_uninstall')) {\r
-            $func = $addon . '_uninstall';\r
-            $func();\r
-        }\r
-    }\r
-\r
-    /**\r
-     * @brief installs an addon.\r
-     *\r
-     * @param string $addon name of the addon\r
-     * @return bool\r
-     */\r
-    public static function install($addon)\r
-    {\r
-        // silently fail if addon was removed\r
-\r
-        if (!file_exists('addon/' . $addon . '/' . $addon . '.php')) {\r
-            return false;\r
-        }\r
-        logger("Addons: installing " . $addon);\r
-        $t = @filemtime('addon/' . $addon . '/' . $addon . '.php');\r
-        @include_once('addon/' . $addon . '/' . $addon . '.php');\r
-        if (function_exists($addon . '_install')) {\r
-            $func = $addon . '_install';\r
-            $func();\r
-\r
-            $addon_admin = (function_exists($addon."_plugin_admin") ? 1 : 0);\r
-\r
-            dba::insert('addon', ['name' => $addon, 'installed' => true,\r
-                        'timestamp' => $t, 'plugin_admin' => $addon_admin]);\r
-\r
-            // we can add the following with the previous SQL\r
-            // once most site tables have been updated.\r
-            // This way the system won't fall over dead during the update.\r
-\r
-            if (file_exists('addon/' . $addon . '/.hidden')) {\r
-                dba::update('addon', ['hidden' => true], ['name' => $addon]);\r
-            }\r
-            return true;\r
-        } else {\r
-            logger("Addons: FAILED installing " . $addon);\r
-            return false;\r
-        }\r
-    }\r
-\r
-    /**\r
-     * reload all updated addons\r
-     */\r
-    public static function reload()\r
-    {\r
-        $addons = Config::get('system', 'addon');\r
-        if (strlen($addons)) {\r
-\r
-            $r = dba::select('addon', [], ['installed' => 1]);\r
-            if (DBM::is_result($r)) {\r
-                $installed = $r;\r
-            } else {\r
-                $installed = [];\r
-            }\r
-\r
-            $addon_list = explode(',', $addons);\r
-\r
-            if (count($addon_list)) {\r
-                foreach ($addon_list as $addon) {\r
-\r
-                    $addon = trim($addon);\r
-\r
-                    $fname = 'addon/' . $addon . '/' . $addon . '.php';\r
-\r
-                    if (file_exists($fname)) {\r
-                        $t = @filemtime($fname);\r
-                        foreach ($installed as $i) {\r
-                            if (($i['name'] == $addon) && ($i['timestamp'] != $t)) {\r
-                                logger('Reloading addon: ' . $i['name']);\r
-                                @include_once($fname);\r
-\r
-                                if (function_exists($addon . '_uninstall')) {\r
-                                    $func = $addon . '_uninstall';\r
-                                    $func();\r
-                                }\r
-                                if (function_exists($addon . '_install')) {\r
-                                    $func = $addon . '_install';\r
-                                    $func();\r
-                                }\r
-                                dba::update('addon', ['timestamp' => $t], ['id' => $i['id']]);\r
-                            }\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * @brief check if addon is enabled\r
-     *\r
-     * @param string $addon\r
-     * @return boolean\r
-     */\r
-    public static function isEnabled($addon)\r
-    {\r
-        return dba::exists('addon', ['installed' => true, 'name' => $addon]);\r
-    }\r
-\r
-\r
-    /**\r
-     * @brief registers a hook.\r
-     *\r
-     * @param string $hook the name of the hook\r
-     * @param string $file the name of the file that hooks into\r
-     * @param string $function the name of the function that the hook will call\r
-     * @param int $priority A priority (defaults to 0)\r
-     * @return mixed|bool\r
-     */\r
-    public static function registerHook($hook, $file, $function, $priority = 0)\r
-    {\r
-        $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];\r
-        $exists = dba::exists('hook', $condition);\r
-        if ($exists) {\r
-            return true;\r
-        }\r
-\r
-        $r = dba::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);\r
-\r
-        return $r;\r
-    }\r
-\r
-    /**\r
-     * @brief unregisters a hook.\r
-     *\r
-     * @param string $hook the name of the hook\r
-     * @param string $file the name of the file that hooks into\r
-     * @param string $function the name of the function that the hook called\r
-     * @return array\r
-     */\r
-    public static function unregisterHook($hook, $file, $function)\r
-    {\r
-        $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];\r
-        $r = dba::delete('hook', $condition);\r
-        return $r;\r
-    }\r
-\r
-\r
-    public static function loadHooks() {\r
-        $a = get_app();\r
-        $a->hooks = [];\r
-        $r = dba::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);\r
-\r
-        while ($rr = dba::fetch($r)) {\r
-            if (! array_key_exists($rr['hook'],$a->hooks)) {\r
-                $a->hooks[$rr['hook']] = [];\r
-            }\r
-            $a->hooks[$rr['hook']][] = [$rr['file'],$rr['function']];\r
-        }\r
-        dba::close($r);\r
-    }\r
-\r
-    /**\r
-     * @brief Calls a hook.\r
-     *\r
-     * Use this function when you want to be able to allow a hook to manipulate\r
-     * the provided data.\r
-     *\r
-     * @param string $name of the hook to call\r
-     * @param string|array &$data to transmit to the callback handler\r
-     */\r
-    public static function callHooks($name, &$data = null)\r
-    {\r
-        $a = get_app();\r
-\r
-        if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {\r
-            foreach ($a->hooks[$name] as $hook) {\r
-                self::callSingleHook($a, $name, $hook, $data);\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * @brief Calls a single hook.\r
-     *\r
-     * @param string $name of the hook to call\r
-     * @param array $hook Hook data\r
-     * @param string|array &$data to transmit to the callback handler\r
-     */\r
-    public static function callSingleHook($a, $name, $hook, &$data = null)\r
-    {\r
-        // Don't run a theme's hook if the user isn't using the theme\r
-        if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/'.current_theme()) === false)\r
-            return;\r
-\r
-        @include_once($hook[0]);\r
-        if (function_exists($hook[1])) {\r
-            $func = $hook[1];\r
-            $func($a, $data);\r
-        } else {\r
-            // remove orphan hooks\r
-            $condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];\r
-            dba::delete('hook', $condition);\r
-        }\r
-    }\r
-\r
-    /**\r
-     * check if an app_menu hook exist for addon $name.\r
-     * Return true if the addon is an app\r
-     */\r
-    function isApp($name)\r
-    {\r
-        $a = get_app();\r
-\r
-        if (is_array($a->hooks) && (array_key_exists('app_menu',$a->hooks))) {\r
-            foreach ($a->hooks['app_menu'] as $hook) {\r
-                if ($hook[0] == 'addon/'.$name.'/'.$name.'.php')\r
-                    return true;\r
-            }\r
-        }\r
-\r
-        return false;\r
-    }\r
-\r
-    /**\r
-     * @brief Parse addon comment in search of addon infos.\r
-     *\r
-     * like\r
-     * \code\r
-     *...* Name: addon\r
-    *   * Description: An addon which plugs in\r
-    * . * Version: 1.2.3\r
-    *   * Author: John <profile url>\r
-    *   * Author: Jane <email>\r
-    *   *\r
-    *  *\endcode\r
-    * @param string $addon the name of the addon\r
-    * @return array with the addon information\r
-    */\r
-\r
-    public static function getInfo($addon) {\r
-\r
-        $a = get_app();\r
-\r
-        $info=[\r
-            'name' => $addon,\r
-            'description' => "",\r
-            'author' => [],\r
-            'version' => "",\r
-            'status' => ""\r
-        ];\r
-\r
-        if (!is_file("addon/$addon/$addon.php")) {\r
-            return $info;\r
-        }\r
-\r
-        $stamp1 = microtime(true);\r
-        $f = file_get_contents("addon/$addon/$addon.php");\r
-        $a->save_timestamp($stamp1, "file");\r
-\r
-        $r = preg_match("|/\*.*\*/|msU", $f, $m);\r
-\r
-        if ($r) {\r
-            $ll = explode("\n", $m[0]);\r
-            foreach ( $ll as $l ) {\r
-                $l = trim($l,"\t\n\r */");\r
-                if ($l != "") {\r
-                    list($k,$v) = array_map("trim", explode(":",$l,2));\r
-                    $k= strtolower($k);\r
-                    if ($k == "author") {\r
-                        $r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);\r
-                        if ($r) {\r
-                            $info['author'][] = ['name'=>$m[1], 'link'=>$m[2]];\r
-                        } else {\r
-                            $info['author'][] = ['name'=>$v];\r
-                        }\r
-                    } else {\r
-                        if (array_key_exists($k,$info)) {\r
-                            $info[$k]=$v;\r
-                        }\r
-                    }\r
-\r
-                }\r
-            }\r
-        }\r
-        return $info;\r
-    }\r
+       /**\r
+        * @brief uninstalls an addon.\r
+        *\r
+        * @param string $addon name of the addon\r
+        * @return boolean\r
+        */\r
+       public static function uninstall($addon)\r
+       {\r
+               logger("Addons: uninstalling " . $addon);\r
+               dba::delete('addon', ['name' => $addon]);\r
+\r
+               @include_once('addon/' . $addon . '/' . $addon . '.php');\r
+               if (function_exists($addon . '_uninstall')) {\r
+                       $func = $addon . '_uninstall';\r
+                       $func();\r
+               }\r
+       }\r
+\r
+       /**\r
+        * @brief installs an addon.\r
+        *\r
+        * @param string $addon name of the addon\r
+        * @return bool\r
+        */\r
+       public static function install($addon)\r
+       {\r
+               // silently fail if addon was removed\r
+\r
+               if (!file_exists('addon/' . $addon . '/' . $addon . '.php')) {\r
+                       return false;\r
+               }\r
+               logger("Addons: installing " . $addon);\r
+               $t = @filemtime('addon/' . $addon . '/' . $addon . '.php');\r
+               @include_once('addon/' . $addon . '/' . $addon . '.php');\r
+               if (function_exists($addon . '_install')) {\r
+                       $func = $addon . '_install';\r
+                       $func();\r
+\r
+                       $addon_admin = (function_exists($addon."_addon_admin") ? 1 : 0);\r
+\r
+                       dba::insert('addon', ['name' => $addon, 'installed' => true,\r
+                                               'timestamp' => $t, 'plugin_admin' => $addon_admin]);\r
+\r
+                       // we can add the following with the previous SQL\r
+                       // once most site tables have been updated.\r
+                       // This way the system won't fall over dead during the update.\r
+\r
+                       if (file_exists('addon/' . $addon . '/.hidden')) {\r
+                               dba::update('addon', ['hidden' => true], ['name' => $addon]);\r
+                       }\r
+                       return true;\r
+               } else {\r
+                       logger("Addons: FAILED installing " . $addon);\r
+                       return false;\r
+               }\r
+       }\r
+\r
+       /**\r
+        * reload all updated addons\r
+        */\r
+       public static function reload()\r
+       {\r
+               $addons = Config::get('system', 'addon');\r
+               if (strlen($addons)) {\r
+                       $r = dba::select('addon', [], ['installed' => 1]);\r
+                       if (DBM::is_result($r)) {\r
+                               $installed = $r;\r
+                       } else {\r
+                               $installed = [];\r
+                       }\r
+\r
+                       $addon_list = explode(',', $addons);\r
+\r
+                       if (count($addon_list)) {\r
+                               foreach ($addon_list as $addon) {\r
+                                       $addon = trim($addon);\r
+                                       $fname = 'addon/' . $addon . '/' . $addon . '.php';\r
+\r
+                                       if (file_exists($fname)) {\r
+                                               $t = @filemtime($fname);\r
+                                               foreach ($installed as $i) {\r
+                                                       if (($i['name'] == $addon) && ($i['timestamp'] != $t)) {\r
+                                                               logger('Reloading addon: ' . $i['name']);\r
+                                                               @include_once($fname);\r
+\r
+                                                               if (function_exists($addon . '_uninstall')) {\r
+                                                                       $func = $addon . '_uninstall';\r
+                                                                       $func();\r
+                                                               }\r
+                                                               if (function_exists($addon . '_install')) {\r
+                                                                       $func = $addon . '_install';\r
+                                                                       $func();\r
+                                                               }\r
+                                                               dba::update('addon', ['timestamp' => $t], ['id' => $i['id']]);\r
+                                                       }\r
+                                               }\r
+                                       }\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       /**\r
+        * @brief check if addon is enabled\r
+        *\r
+        * @param string $addon\r
+        * @return boolean\r
+        */\r
+       public static function isEnabled($addon)\r
+       {\r
+               return dba::exists('addon', ['installed' => true, 'name' => $addon]);\r
+       }\r
+\r
+\r
+       /**\r
+        * @brief registers a hook.\r
+        *\r
+        * @param string $hook the name of the hook\r
+        * @param string $file the name of the file that hooks into\r
+        * @param string $function the name of the function that the hook will call\r
+        * @param int $priority A priority (defaults to 0)\r
+        * @return mixed|bool\r
+        */\r
+       public static function registerHook($hook, $file, $function, $priority = 0)\r
+       {\r
+               $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];\r
+               $exists = dba::exists('hook', $condition);\r
+               if ($exists) {\r
+                       return true;\r
+               }\r
+\r
+               $r = dba::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);\r
+\r
+               return $r;\r
+       }\r
+\r
+       /**\r
+        * @brief unregisters a hook.\r
+        *\r
+        * @param string $hook the name of the hook\r
+        * @param string $file the name of the file that hooks into\r
+        * @param string $function the name of the function that the hook called\r
+        * @return array\r
+        */\r
+       public static function unregisterHook($hook, $file, $function)\r
+       {\r
+               $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];\r
+               $r = dba::delete('hook', $condition);\r
+               return $r;\r
+       }\r
+\r
+       /**\r
+        * Load hooks\r
+        */\r
+       public static function loadHooks()\r
+       {\r
+               $a = get_app();\r
+               $a->hooks = [];\r
+               $r = dba::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);\r
+\r
+               while ($rr = dba::fetch($r)) {\r
+                       if (! array_key_exists($rr['hook'], $a->hooks)) {\r
+                               $a->hooks[$rr['hook']] = [];\r
+                       }\r
+                       $a->hooks[$rr['hook']][] = [$rr['file'],$rr['function']];\r
+               }\r
+               dba::close($r);\r
+       }\r
+\r
+       /**\r
+        * @brief Calls a hook.\r
+        *\r
+        * Use this function when you want to be able to allow a hook to manipulate\r
+        * the provided data.\r
+        *\r
+        * @param string $name of the hook to call\r
+        * @param string|array &$data to transmit to the callback handler\r
+        */\r
+       public static function callHooks($name, &$data = null)\r
+       {\r
+               $a = get_app();\r
+\r
+               if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {\r
+                       foreach ($a->hooks[$name] as $hook) {\r
+                               self::callSingleHook($a, $name, $hook, $data);\r
+                       }\r
+               }\r
+       }\r
+\r
+       /**\r
+        * @brief Calls a single hook.\r
+        *\r
+        * @param string $name of the hook to call\r
+        * @param array $hook Hook data\r
+        * @param string|array &$data to transmit to the callback handler\r
+        */\r
+       public static function callSingleHook($a, $name, $hook, &$data = null)\r
+       {\r
+               // Don't run a theme's hook if the user isn't using the theme\r
+               if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/'.current_theme()) === false) {\r
+                       return;\r
+               }\r
+\r
+               @include_once($hook[0]);\r
+               if (function_exists($hook[1])) {\r
+                       $func = $hook[1];\r
+                       $func($a, $data);\r
+               } else {\r
+                       // remove orphan hooks\r
+                       $condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];\r
+                       dba::delete('hook', $condition);\r
+               }\r
+       }\r
+\r
+       /**\r
+        * check if an app_menu hook exist for addon $name.\r
+        * Return true if the addon is an app\r
+        */\r
+       public static function isApp($name)\r
+       {\r
+               $a = get_app();\r
+\r
+               if (is_array($a->hooks) && (array_key_exists('app_menu', $a->hooks))) {\r
+                       foreach ($a->hooks['app_menu'] as $hook) {\r
+                               if ($hook[0] == 'addon/'.$name.'/'.$name.'.php') {\r
+                                       return true;\r
+                               }\r
+                       }\r
+               }\r
+\r
+               return false;\r
+       }\r
+\r
+       /**\r
+        * @brief Parse addon comment in search of addon infos.\r
+        *\r
+        * like\r
+        * \code\r
+        *...* Name: addon\r
+       *   * Description: An addon which plugs in\r
+       * . * Version: 1.2.3\r
+       *   * Author: John <profile url>\r
+       *   * Author: Jane <email>\r
+       *   *\r
+       *  *\endcode\r
+       * @param string $addon the name of the addon\r
+       * @return array with the addon information\r
+       */\r
+\r
+       public static function getInfo($addon)\r
+       {\r
+               $a = get_app();\r
+\r
+               $info=[\r
+                       'name' => $addon,\r
+                       'description' => "",\r
+                       'author' => [],\r
+                       'version' => "",\r
+                       'status' => ""\r
+               ];\r
+\r
+               if (!is_file("addon/$addon/$addon.php")) {\r
+                       return $info;\r
+               }\r
+\r
+               $stamp1 = microtime(true);\r
+               $f = file_get_contents("addon/$addon/$addon.php");\r
+               $a->save_timestamp($stamp1, "file");\r
+\r
+               $r = preg_match("|/\*.*\*/|msU", $f, $m);\r
+\r
+               if ($r) {\r
+                       $ll = explode("\n", $m[0]);\r
+                       foreach ($ll as $l) {\r
+                               $l = trim($l, "\t\n\r */");\r
+                               if ($l != "") {\r
+                                       list($k,$v) = array_map("trim", explode(":", $l, 2));\r
+                                       $k= strtolower($k);\r
+                                       if ($k == "author") {\r
+                                               $r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);\r
+                                               if ($r) {\r
+                                                       $info['author'][] = ['name'=>$m[1], 'link'=>$m[2]];\r
+                                               } else {\r
+                                                       $info['author'][] = ['name'=>$v];\r
+                                               }\r
+                                       } else {\r
+                                               if (array_key_exists($k, $info)) {\r
+                                                       $info[$k]=$v;\r
+                                               }\r
+                                       }\r
+                               }\r
+                       }\r
+               }\r
+               return $info;\r
+       }\r
 }\r

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 973098d460ae717d258458ae94235ec693818285..3f4614b6c7fd7e073c436f530d07a7ceef2b86b3 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -661,7 +661,7 @@ class DBStructure {
                $database = [];
 
                $database["addon"] = [
-                               "comment" => "registered plugins",
+                               "comment" => "registered addons",
                                "fields" => [
                                                "id" => ["type" => "int", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
                                                "name" => ["type" => "varchar(190)", "not null" => "1", "default" => "", "comment" => ""],
@@ -1081,7 +1081,7 @@ class DBStructure {
                                                ]
                                ];
                $database["hook"] = [
-                               "comment" => "plugin hook registry",
+                               "comment" => "addon hook registry",
                                "fields" => [
                                                "id" => ["type" => "int", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
                                                "hook" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],