X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=a9ff0c30c340d55e247610af6f70b3a6ff7ccf2f;hb=1a7ec34e714667f86d6c60694140e993afcfbf96;hp=4d57d21e62d92ba3cb72f6b05c753df3fa6430b9;hpb=65d6d45f8cdb2e1f84fc0c345043598a221312de;p=friendica.git

diff --git a/boot.php b/boot.php
index 4d57d21e62..a9ff0c30c3 100644
--- a/boot.php
+++ b/boot.php
@@ -927,7 +927,7 @@ class App {
 		} else {
 			$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
 				$common_filename);
-			if(! count($r)){
+			if(! dba::is_result($r)){
 				$this->cached_profile_image[$avatar_image] = $avatar_image;
 			} else {
 				$this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
@@ -1098,6 +1098,11 @@ class App {
 		return($this->is_friendica_app);
 	}
 
+	/**
+	 * @brief Checks if the maximum load is reached
+	 *
+	 * @return bool Is the load reached?
+	 */
 	function maxload_reached() {
 
 		$maxsysload = intval(get_config('system', 'maxloadavg'));
@@ -1114,6 +1119,15 @@ class App {
 		return false;
 	}
 
+	/**
+	 * @brief Checks if the process is already running
+	 *
+	 * @param string $taskname The name of the task that will be used for the name of the lockfile
+	 * @param string $task The path and name of the php script
+	 * @param int $timeout The timeout after which a task should be killed
+	 *
+	 * @return bool Is the process running?
+	 */
 	function is_already_running($taskname, $task = "", $timeout = 540) {
 
 		$lockpath = get_lockpath();
@@ -1398,7 +1412,7 @@ function run_update_function($x) {
 function check_plugins(&$a) {
 
 	$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-	if(count($r))
+	if(dba::is_result($r))
 		$installed = $r;
 	else
 		$installed = array();
@@ -1544,7 +1558,7 @@ function killme() {
  * @brief Redirect to another URL and terminate this process.
  */
 function goaway($s) {
-	if (!strstr(normalise_link($s), normalise_link(App::get_baseurl())))
+	if (!strstr(normalise_link($s), "http://"))
 		$s = App::get_baseurl()."/".$s;
 
 	header("Location: $s");
@@ -1729,7 +1743,7 @@ function current_theme(){
 		$r = q("select theme from user where uid = %d limit 1",
 			intval($a->profile_uid)
 		);
-		if($r)
+		if(dba::is_result($r))
 			$page_theme = $r[0]['theme'];
 	}
 
@@ -1842,7 +1856,7 @@ function feed_birthday($uid,$tz) {
 			intval($uid)
 	);
 
-	if($p && count($p)) {
+	if(dba::is_result($p)) {
 		$tmp_dob = substr($p[0]['dob'],5);
 		if(intval($tmp_dob)) {
 			$y = datetime_convert($tz,$tz,'now','Y');
@@ -1887,7 +1901,8 @@ function load_contact_links($uid) {
 	$r = q("SELECT `id`,`network`,`url`,`thumb`, `rel` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `thumb` != ''",
 			intval($uid)
 	);
-	if(count($r)) {
+
+	if(dba::is_result($r)) {
 		foreach($r as $rr){
 			$url = normalise_link($rr['url']);
 			$ret[$url] = $rr;