Merge pull request #3369 from Quix0r/rewrites/coding-convention-split2-2-2

Coding convention applied split 2-2-2 (of 2-14-2)

include/datetime.php

@@ -15,12 +15,19 @@ use \Friendica\Core\Config;
  */
 function timezone_cmp($a, $b) {
 	if (strstr($a, '/') && strstr($b, '/')) {
-		if ( t($a) == t($b)) return 0;
+		if ( t($a) == t($b)) {
+			return 0;
+		}
 		return ( t($a) < t($b)) ? -1 : 1;
 	}
-	if(strstr($a,'/')) return -1;
+
-	if(strstr($b,'/')) return  1;
+	if (strstr($a, '/')) {
-	if ( t($a) == t($b)) return 0;
+		return -1;
+	} elseif (strstr($b, '/')) {
+		return  1;
+	} elseif ( t($a) == t($b)) {
+		return 0;
+	}
 
 	return ( t($a) < t($b)) ? -1 : 1;
 }
@@ -43,17 +50,18 @@ function select_timezone($current = 'America/Los_Angeles') {
 		$ex = explode("/", $value);
 		if (count($ex) > 1) {
 			if ($ex[0] != $continent) {
-				if($continent != '')
+				if ($continent != '') {
 					$o .= '</optgroup>';
+				}
 				$continent = $ex[0];
 				$o .= '<optgroup label="' . t($continent) . '">';
 			}
-			if(count($ex) > 2)
+			if (count($ex) > 2) {
 				$city = substr($value,strpos($value,'/')+1);
-			else
+			} else {
 				$city = $ex[1];
 			}
-		else {
+		} else {
 			$city = $ex[0];
 			if ($continent != t('Miscellaneous')) {
 				$o .= '</optgroup>';
@@ -114,17 +122,22 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
 	// Defaults to UTC if nothing is set, but throws an exception if set to empty string.
 	// Provide some sane defaults regardless.
 
-	if($from === '')
+	if ($from === '') {
 		$from = 'UTC';
-	if($to === '')
+	}
+	if ($to === '') {
 		$to = 'UTC';
-	if( ($s === '') || (! is_string($s)) )
+	}
+	if ( ($s === '') || (! is_string($s)) ) {
 		$s = 'now';
+	}
 
-	// Slight hackish adjustment so that 'zero' datetime actually returns what is intended
+	/*
-	// otherwise we end up with -0001-11-30 ...
+	 * Slight hackish adjustment so that 'zero' datetime actually returns what is intended
-	// add 32 days so that we at least get year 00, and then hack around the fact that
+	 * otherwise we end up with -0001-11-30 ...
-	// months and days always start with 1.
+	 * add 32 days so that we at least get year 00, and then hack around the fact that
+	 * months and days always start with 1.
+	 */
 
 	if (substr($s,0,10) <= '0001-01-01') {
 		$d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC'));
@@ -133,29 +146,26 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
 
 	try {
 		$from_obj = new DateTimeZone($from);
-	}
+	} catch (Exception $e) {
-	catch(Exception $e) {
 		$from_obj = new DateTimeZone('UTC');
 	}
 
 	try {
 		$d = new DateTime($s, $from_obj);
-	}
+	} catch (Exception $e) {
-	catch(Exception $e) {
 		logger('datetime_convert: exception: ' . $e->getMessage());
 		$d = new DateTime('now', $from_obj);
 	}
 
 	try {
 		$to_obj = new DateTimeZone($to);
-	}
+	} catch (Exception $e) {
-	catch(Exception $e) {
 		$to_obj = new DateTimeZone('UTC');
 	}
 
 	$d->setTimeZone($to_obj);
 
-	return($d->format($fmt));
+	return $d->format($fmt);
 }
 
 
@@ -169,12 +179,14 @@ function dob($dob) {
 	list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
 
 	$f = get_config('system','birthday_input_format');
-	if(! $f)
+	if (! $f) {
 		$f = 'ymd';
-	if($dob <= '0001-01-01')
+	}
+	if ($dob <= '0001-01-01') {
 		$value = '';
-	else
+	} else {
 		$value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d'));
+	}
 
 	$age = ((intval($value)) ? age($value, $a->user["timezone"], $a->user["timezone"]) : "");
 
@@ -189,6 +201,7 @@ function dob($dob) {
 		)
 	));
 
+	/// @TODO Old-lost code?
 //	if ($dob && $dob > '0001-01-01')
 //		$o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob');
 //	else
@@ -267,7 +280,9 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
 
 	// First day of the week (0 = Sunday)
 	$firstDay = get_pconfig(local_user(),'system','first_day_of_week');
-	if ($firstDay === false) $firstDay=0;
+	if ($firstDay === false) {
+		$firstDay=0;
+	}
 
 	$lang = substr(get_browser_language(), 0, 2);
 
@@ -279,9 +294,15 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
 	$o = '';
 	$dateformat = '';
 
-	if($pickdate) $dateformat .= 'Y-m-d';
+	if ($pickdate) {
-	if($pickdate && $picktime) $dateformat .= ' ';
+		$dateformat .= 'Y-m-d';
-	if($picktime) $dateformat .= 'H:i';
+	}
+	if ($pickdate && $picktime) {
+		$dateformat .= ' ';
+	}
+	if ($picktime) {
+		$dateformat .= 'H:i';
+	}
 
 	$minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : '';
 	$maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : '';
@@ -290,15 +311,21 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
 	$defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : '';
 
 	$pickers = '';
-	if(!$pickdate) $pickers .= ',datepicker: false';
+	if (!$pickdate) {
-	if(!$picktime) $pickers .= ',timepicker: false';
+		$pickers .= ',datepicker: false';
+	}
+	if (!$picktime) {
+		$pickers .= ',timepicker: false';
+	}
 
 	$extra_js = '';
 	$pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'";
-	if($minfrom != '')
+	if ($minfrom != '') {
 		$extra_js .= "\$('#id_$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})";
-	if($maxfrom != '')
+	}
+	if ($maxfrom != '') {
 		$extra_js .= "\$('#id_$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#id_$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})";
+	}
 
 	$readable_format = $dateformat;
 	$readable_format = str_replace('Y','yyyy',$readable_format);
@@ -394,12 +421,15 @@ function relative_date($posted_date, $format = null) {
  * @return int Age in years
  */
 function age($dob, $owner_tz = '', $viewer_tz = '') {
-	if(! intval($dob))
+	if (! intval($dob)) {
 		return 0;
-	if(! $owner_tz)
+	}
+	if (! $owner_tz) {
 		$owner_tz = date_default_timezone_get();
-	if(! $viewer_tz)
+	}
+	if (! $viewer_tz) {
 		$viewer_tz = date_default_timezone_get();
+	}
 
 	$birthdate = datetime_convert('UTC',$owner_tz,$dob . ' 00:00:00+00:00','Y-m-d');
 	list($year,$month,$day) = explode("-",$birthdate);
@@ -407,8 +437,9 @@ function age($dob,$owner_tz = '',$viewer_tz = '') {
 	$curr_month = datetime_convert('UTC',$viewer_tz,'now','m');
 	$curr_day   = datetime_convert('UTC',$viewer_tz,'now','d');
 
-	if(($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day)))
+	if (($curr_month < $month) || (($curr_month == $month) && ($curr_day < $day))) {
 		$year_diff--;
+	}
 
 	return $year_diff;
 }
@@ -430,11 +461,11 @@ function get_dim($y,$m) {
 		31, 28, 31, 30, 31, 30,
 		31, 31, 30, 31, 30, 31);
 
-	if($m != 2)
+	if ($m != 2) {
 		return $dim[$m];
-
+	} elseif (((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0)) {
-	if(((($y % 4) == 0) && (($y % 100) != 0)) || (($y % 400) == 0))
 		return 29;
+	}
 
 	return $dim[2];
 }
@@ -473,8 +504,6 @@ function get_first_dim($y,$m) {
  * @todo Provide (prev,next) links, define class variations for different size calendars
  */
 function cal($y = 0,$m = 0, $links = false, $class='') {
-
-
 	// month table - start at 1 to match human usage.
 
 	$mtab = array(' ',
@@ -486,10 +515,12 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
 
 	$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
 	$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
-	if(! $y)
+	if (! $y) {
 		$y = $thisyear;
-	if(! $m)
+	}
+	if (! $m) {
 		$m = intval($thismonth);
+	}
 
 	$dn = array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday');
 	$f = get_first_dim($y,$m);
@@ -498,29 +529,33 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
 	$dow = 0;
 	$started = false;
 
-	if(($y == $thisyear) && ($m == $thismonth))
+	if (($y == $thisyear) && ($m == $thismonth)) {
 		$tddate = intval(datetime_convert('UTC',date_default_timezone_get(),'now','j'));
+	}
 
 	$str_month = day_translate($mtab[$m]);
 	$o = '<table class="calendar' . $class . '">';
 	$o .= "<caption>$str_month $y</caption><tr>";
-	for($a = 0; $a < 7; $a ++)
+	for ($a = 0; $a < 7; $a ++) {
 		$o .= '<th>' . mb_substr(day_translate($dn[$a]),0,3,'UTF-8') . '</th>';
+	}
 
 	$o .= '</tr><tr>';
 
 	while ($d <= $l) {
-		if(($dow == $f) && (! $started))
+		if (($dow == $f) && (! $started)) {
 			$started = true;
+		}
 
 		$today = (((isset($tddate)) && ($tddate == $d)) ? "class=\"today\" " : '');
 		$o .= "<td $today>";
 		$day = str_replace(' ','&nbsp;',sprintf('%2.2d', $d));
 		if ($started) {
-			if(is_array($links) && isset($links[$d]))
+			if (is_array($links) && isset($links[$d])) {
 				$o .=  "<a href=\"{$links[$d]}\">$day</a>";
-			else
+			} else {
 				$o .= $day;
+			}
 
 			$d ++;
 		} else {
@@ -534,9 +569,11 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
 			$o .= '</tr><tr>';
 		}
 	}
-	if($dow)
+	if ($dow) {
-		for($a = $dow; $a < 7; $a ++)
+		for ($a = $dow; $a < 7; $a ++) {
 			$o .= '<td>&nbsp;</td>';
+		}
+	}
 
 	$o .= '</tr></table>'."\r\n";
 

include/diaspora.php

@@ -3649,17 +3649,20 @@ class Diaspora {
 		}
 
 		$r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
-		if(!$r)
+		if (!dbm::is_result($r)) {
 			return false;
+		}
 
 		$contact["uprvkey"] = $r[0]['prvkey'];
 
 		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id));
-		if (!$r)
+		if (!dbm::is_result($r)) {
 			return false;
+		}
 
-		if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE)))
+		if (!in_array($r[0]["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
 			return false;
+		}
 
 		$message = self::construct_like($r[0], $contact);
 		$message["author_signature"] = self::signature($contact, $message);

include/directory.php

@@ -1,4 +1,5 @@
 <?php
+/// @TODO no longer used?
 use \Friendica\Core\Config;
 
 function directory_run(&$argv, &$argc){
@@ -23,6 +24,7 @@ function directory_run(&$argv, &$argc){
 	if (strlen($arr['url'])) {
 		fetch_url($dir . '?url=' . bin2hex($arr['url']));
 	}
+
 	return;
 }
 

include/discover_poco.php

@@ -212,7 +212,7 @@ function discover_directory($search) {
 		foreach ($j->results as $jj) {
 			// Check if the contact already exists
 			$exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url));
-			if ($exists) {
+			if (dbm::is_result($exists)) {
 				logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
 
 				if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND
@@ -272,11 +272,15 @@ function gs_search_user($search) {
 	if (!$result["success"]) {
 		return false;
 	}
+
 	$contacts = json_decode($result["body"]);
 
 	if ($contacts->status == 'ERROR') {
 		return false;
 	}
+
+	/// @TODO AS is considered as a notation for constants (as they usually being written all upper-case)
+	/// @TODO find all those and convert to all lower-case which is a keyword then
 	foreach ($contacts->data AS $user) {
 		$contact = probe_url($user->site_address."/".$user->name);
 		if ($contact["network"] != NETWORK_PHANTOM) {

include/enotify.php

@@ -411,10 +411,12 @@ function notification($params) {
 			$hash = random_string();
 			$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
 				dbesc($hash));
-			if (dbm::is_result($r))
+			if (dbm::is_result($r)) {
 				$dups = true;
+			}
 		} while ($dups == true);
 
+		/// @TODO One statement is enough
 		$datarray = array();
 		$datarray['hash']  = $hash;
 		$datarray['name']  = $params['source_name'];

include/expire.php

@@ -11,12 +11,13 @@ function expire_run(&$argv, &$argc){
 
 	// physically remove anything that has been deleted for more than two months
 
-	$r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY");
+	$r = q("DELETE FROM `item` WHERE `deleted` = 1 AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
 
 	// make this optional as it could have a performance impact on large sites
 
-	if(intval(get_config('system','optimize_items')))
+	if (intval(get_config('system','optimize_items'))) {
-		q("optimize table item");
+		q("OPTIMIZE TABLE `item`");
+	}
 
 	logger('expire: start');