X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fplugin.php;h=0108ce62162b72f5b1c2fc0fcf2a44cb0f8f8982;hb=98b727029570b96febd0c5046b688cab1a9bb882;hp=e2bd23ee2a2ba97438ec913f80cad7abb1e44658;hpb=2a088d27d03b92369cbd53dad502a8f706bab549;p=friendica.git

diff --git a/include/plugin.php b/include/plugin.php
index e2bd23ee2a..0108ce6216 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -79,7 +79,7 @@ function reload_plugins() {
 	if(strlen($plugins)) {
 
 		$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-		if(count($r))
+		if (dbm::is_result($r))
 			$installed = $r;
 		else
 			$installed = array();
@@ -129,7 +129,7 @@ function reload_plugins() {
  */
 function plugin_enabled($plugin) {
 	$r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
-	return((bool)(count($r) > 0));
+	return ((dbm::is_result($r)) && (count($r) > 0));
 }
 
 
@@ -150,7 +150,7 @@ function register_hook($hook,$file,$function,$priority=0) {
 		dbesc($file),
 		dbesc($function)
 	);
-	if(count($r))
+	if (dbm::is_result($r))
 		return true;
 
 	$r = q("INSERT INTO `hook` (`hook`, `file`, `function`, `priority`) VALUES ( '%s', '%s', '%s', '%s' ) ",
@@ -187,7 +187,7 @@ function load_hooks() {
 	$a = get_app();
 	$a->hooks = array();
 	$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		foreach($r as $rr) {
 			if(! array_key_exists($rr['hook'],$a->hooks))
 				$a->hooks[$rr['hook']] = array();
@@ -205,37 +205,41 @@ function load_hooks() {
  * @param string $name of the hook to call
  * @param string|array &$data to transmit to the callback handler
  */
-if(! function_exists('call_hooks')) {
 function call_hooks($name, &$data = null) {
 	$stamp1 = microtime(true);
 
 	$a = get_app();
 
-	#logger($name, LOGGER_ALL);
-
-	if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) {
-		foreach($a->hooks[$name] as $hook) {
-			// Don't run a theme's hook if the user isn't using the theme
-			if(strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/'.current_theme()) === false)
-				continue;
+	if (is_array($a->hooks) && array_key_exists($name, $a->hooks))
+		foreach ($a->hooks[$name] as $hook)
+			call_single_hook($a, $name, $hook, $data);
+}
 
-			@include_once($hook[0]);
-			if(function_exists($hook[1])) {
-				$func = $hook[1];
-				//logger($name." => ".$hook[0].":".$func."()", LOGGER_DEBUG);
-				$func($a,$data);
-			}
-			else {
-				// remove orphan hooks
-				q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s'",
-					dbesc($name),
-					dbesc($hook[0]),
-					dbesc($hook[1])
-				);
-			}
-		}
+/**
+ * @brief Calls a single hook.
+ *
+ * @param string $name of the hook to call
+ * @param array $hook Hook data
+ * @param string|array &$data to transmit to the callback handler
+ */
+function call_single_hook($a, $name, $hook, &$data = null) {
+	// Don't run a theme's hook if the user isn't using the theme
+	if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/'.current_theme()) === false)
+		return;
+
+	@include_once($hook[0]);
+	if (function_exists($hook[1])) {
+		$func = $hook[1];
+		$func($a, $data);
+	} else {
+		// remove orphan hooks
+		q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s'",
+			dbesc($name),
+			dbesc($hook[0]),
+			dbesc($hook[1])
+		);
 	}
-}}
+}
 
 //check if an app_menu hook exist for plugin $name.
 //Return true if the plugin is an app
@@ -406,13 +410,12 @@ function get_theme_info($theme){
  * @return string
  */
 function get_theme_screenshot($theme) {
-	$a = get_app();
 	$exts = array('.png','.jpg');
 	foreach($exts as $ext) {
 		if(file_exists('view/theme/' . $theme . '/screenshot' . $ext))
-			return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+			return(App::get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
 	}
-	return($a->get_baseurl() . '/images/blank.png');
+	return(App::get_baseurl() . '/images/blank.png');
 }
 
 // install and uninstall theme
@@ -469,7 +472,7 @@ function service_class_allows($uid,$property,$usage = false) {
 		$r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($uid)
 		);
-		if($r !== false and count($r)) {
+		if (dbm::is_result($r)) {
 			$service_class = $r[0]['service_class'];
 		}
 	}
@@ -499,7 +502,7 @@ function service_class_fetch($uid,$property) {
 		$r = q("SELECT `service_class` FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($uid)
 		);
-		if($r !== false and count($r)) {
+		if (dbm::is_result($r)) {
 			$service_class = $r[0]['service_class'];
 		}
 	}
@@ -551,7 +554,7 @@ function theme_include($file, $root = '') {
 	if($root !== '' && $root[strlen($root)-1] !== '/')
 		$root = $root . '/';
 	$theme_info = $a->theme_info;
-	if(array_key_exists('extends',$theme_info))
+	if(is_array($theme_info) AND array_key_exists('extends',$theme_info))
 		$parent = $theme_info['extends'];
 	else
 		$parent = 'NOPATH';
@@ -571,4 +574,4 @@ function theme_include($file, $root = '') {
 			return $p;
 	}
 	return '';
-}
\ No newline at end of file
+}