X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fplugin.php;h=2814b246479bf67246adc2d9ab043ce16494b77c;hb=98686e9091189b536d7a08ced3bcafe3f41cca7c;hp=1ce13139fbeac4bf935ba481016995af771f43a8;hpb=d810b21f8722190754cb5b9a0cb27896b8648dae;p=friendica.git

diff --git a/include/plugin.php b/include/plugin.php
index 1ce13139fb..2814b24647 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -6,6 +6,9 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 /**
  * @brief uninstalls an addon.
@@ -71,11 +74,11 @@ function install_plugin($plugin) {
 
 if (! function_exists('reload_plugins')) {
 function reload_plugins() {
-	$plugins = get_config('system','addon');
+	$plugins = Config::get('system','addon');
 	if (strlen($plugins)) {
 
 		$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$installed = $r;
 		else
 			$installed = array();
@@ -121,8 +124,7 @@ function reload_plugins() {
  * @return boolean
  */
 function plugin_enabled($plugin) {
-	$r = dba::select('addon', array('id'), array('installed' => true, 'name' => $plugin), array('limit' => 1));
-	return ((dbm::is_result($r)) && (count($r) > 0));
+	return dba::exists('addon', array('installed' => true, 'name' => $plugin));
 }
 
 
@@ -143,7 +145,7 @@ function register_hook($hook,$file,$function,$priority=0) {
 		dbesc($file),
 		dbesc($function)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		return true;
 
 	$r = dba::insert('hook', array('hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority));
@@ -402,10 +404,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
@@ -443,96 +445,6 @@ function install_theme($theme) {
 
 }}
 
-
-
-// check service_class restrictions. If there are no service_classes defined, everything is allowed.
-// if $usage is supplied, we check against a maximum count and return true if the current usage is
-// less than the subscriber plan allows. Otherwise we return boolean true or false if the property
-// is allowed (or not) in this subscriber plan. An unset property for this service plan means
-// the property is allowed, so it is only necessary to provide negative properties for each plan,
-// or what the subscriber is not allowed to do.
-
-
-function service_class_allows($uid,$property,$usage = false) {
-
-	if ($uid == local_user()) {
-		$service_class = $a->user['service_class'];
-	} else {
-		$r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1",
-			intval($uid)
-		);
-		if (dbm::is_result($r)) {
-			$service_class = $r[0]['service_class'];
-		}
-	}
-
-	if (! x($service_class)) {
-		// everything is allowed
-		return true;
-	}
-
-	$arr = get_config('service_class',$service_class);
-	if (! is_array($arr) || (! count($arr))) {
-		return true;
-	}
-
-	if ($usage === false) {
-		return ((x($arr[$property])) ? (bool) $arr['property'] : true);
-	} else {
-		if (! array_key_exists($property,$arr)) {
-			return true;
-		}
-		return (((intval($usage)) < intval($arr[$property])) ? true : false);
-	}
-}
-
-
-function service_class_fetch($uid,$property) {
-
-	if ($uid == local_user()) {
-		$service_class = $a->user['service_class'];
-	} else {
-		$r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1",
-			intval($uid)
-		);
-		if (dbm::is_result($r)) {
-			$service_class = $r[0]['service_class'];
-		}
-	}
-	if (! x($service_class))
-		return false; // everything is allowed
-
-	$arr = get_config('service_class',$service_class);
-	if (! is_array($arr) || (! count($arr)))
-		return false;
-
-	return((array_key_exists($property,$arr)) ? $arr[$property] : false);
-
-}
-
-function upgrade_link($bbcode = false) {
-	$l = get_config('service_class','upgrade_link');
-	if (! $l) {
-		return '';
-	}
-	if ($bbcode) {
-		$t = sprintf('[url=%s]' . t('Click here to upgrade.') . '[/url]', $l);
-	} else {
-		$t = sprintf('<a href="%s">' . t('Click here to upgrade.') . '</div>', $l);
-	}
-	return $t;
-}
-
-function upgrade_message($bbcode = false) {
-	$x = upgrade_link($bbcode);
-	return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ;
-}
-
-function upgrade_bool_message($bbcode = false) {
-	$x = upgrade_link($bbcode);
-	return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ;
-}
-
 /**
  * @brief Get the full path to relevant theme files by filename
  *
@@ -545,6 +457,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 . '/';