Bugfix for pictures that weren't stored / reworked database calls

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index 3a24235754a0c9c6af1cd546624d59697a36ba48..d5bceafdea82406e6b9ff770e647d325bfcbd50e 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 /**
  * @brief uninstalls an addon.
@@ -56,9 +57,7 @@ function install_plugin($plugin) {
                // 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'",
-                               dbesc($plugin)
-                       );
+                       dba::update('addon', array('hidden' => true), array('name' => $plugin));
                }
                return true;
        }
@@ -106,10 +105,7 @@ function reload_plugins() {
                                                                $func = $pl . '_install';
                                                                $func();
                                                        }
-                                                       q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d",
-                                                               intval($t),
-                                                               intval($i['id'])
-                                                       );
+                                                       dba::update('addon', array('timestamp' => $t), array('id' => $i['id']));
                                                }
                                        }
                                }
@@ -126,8 +122,7 @@ function reload_plugins() {
  * @return boolean
  */
 function plugin_enabled($plugin) {
-       $r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
-       return ((dbm::is_result($r)) && (count($r) > 0));
+       return dba::exists('addon', array('installed' => true, 'name' => $plugin));
 }
 
 
@@ -187,6 +182,7 @@ function load_hooks() {
                }
                $a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']);
        }
+       dba::close($r);
 }
 
 /**
@@ -406,10 +402,10 @@ function get_theme_screenshot($theme) {
        $exts = array('.png','.jpg');
        foreach ($exts as $ext) {
                if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
-                       return(App::get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+                       return(System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext);
                }
        }
-       return(App::get_baseurl() . '/images/blank.png');
+       return(System::baseUrl() . '/images/blank.png');
 }
 
 // install and uninstall theme
@@ -549,6 +545,8 @@ function upgrade_bool_message($bbcode = false) {
  * @return string Path to the file or empty string if the file isn't found
  */
 function theme_include($file, $root = '') {
+       $file = basename($file);
+
        // Make sure $root ends with a slash / if it's not blank
        if ($root !== '' && $root[strlen($root)-1] !== '/') {
                $root = $root . '/';