quattro: in post display page, scroll to and flash selected comment

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index e37ae84357e2bba73d9a702ba3bb2fb6993d1fe9..ae8eee78a429cd38c1fc7b1a00dd07041ce7c37f 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -5,7 +5,7 @@
 if (! function_exists('uninstall_plugin')){
 function uninstall_plugin($plugin){
        logger("Addons: uninstalling " . $plugin);
-       q("DELETE FROM `addon` WHERE `name` = '%s' LIMIT 1",
+       q("DELETE FROM `addon` WHERE `name` = '%s' ",
                dbesc($plugin)
        );
 
@@ -17,7 +17,12 @@ function uninstall_plugin($plugin){
 }}
 
 if (! function_exists('install_plugin')){
-function install_plugin($plugin){
+function install_plugin($plugin) {
+
+       // silently fail if plugin was removed
+
+       if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php'))
+               return false;
        logger("Addons: installing " . $plugin);
        $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php');
        @include_once('addon/' . $plugin . '/' . $plugin . '.php');
@@ -32,9 +37,21 @@ function install_plugin($plugin){
                        intval($t),
                        $plugin_admin
                );
+
+               // we can add the following with the previous SQL
+               // once most site tables have been updated.
+               // This way the system won't fall over dead during the update.
+
+               if(file_exists('addon/' . $plugin . '/.hidden')) {
+                       q("update addon set hidden = 1 where name = '%s' limit 1",
+                               dbesc($plugin)
+                       );
+               }
+               return true;
        }
        else {
                logger("Addons: FAILED installing " . $plugin);
+               return false;
        }
 
 }}
@@ -53,8 +70,10 @@ function reload_plugins() {
                        $installed = array();
 
                $parr = explode(',',$plugins);
+
                if(count($parr)) {
                        foreach($parr as $pl) {
+
                                $pl = trim($pl);
 
                                $fname = 'addon/' . $pl . '/' . $pl . '.php';
@@ -84,6 +103,7 @@ function reload_plugins() {
                        }
                }
        }
+
 }}
                                
 
@@ -146,6 +166,14 @@ function call_hooks($name, &$data = null) {
                                        $func = $hook[HOOK_FUNCTION];
                                        $func($a,$data);
                                }
+                               else {
+                                       // remove orphan hooks
+                                       q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
+                                               dbesc($hook[HOOK_HOOK]),
+                                               dbesc($hook[HOOK_FILE]),
+                                               dbesc($hook[HOOK_FUNCTION])
+                                       );
+                               }
                        }
                }
        }