Merge branch 'develop' into rewrites/dbm_is_result

include/Core/Config.php

@@ -97,7 +97,7 @@ class Config {
 			dbesc($family),
 			dbesc($key)
 		);
-		if (dbm::is_result($ret)) {
+		if (count($ret)) {
 			// manage array value
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 			$a->config[$family][$key] = $val;

include/Core/PConfig.php

@@ -92,7 +92,7 @@ class PConfig {
 			dbesc($key)
 		);
 
-		if (dbm::is_result($ret)) {
+		if (count($ret)) {
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 			$a->config[$uid][$family][$key] = $val;
 

include/diaspora.php

@@ -1906,20 +1906,23 @@ class Diaspora {
 		$author = unxmlify($data->author);
 		$recipient = unxmlify($data->recipient);
 
-		if (!$author || !$recipient)
+		if (!$author || !$recipient) {
 			return false;
+		}
 
 		// the current protocol version doesn't know these fields
 		// That means that we will assume their existance
-		if (isset($data->following))
+		if (isset($data->following)) {
 			$following = (unxmlify($data->following) == "true");
-		else
+		} else {
 			$following = true;
+		}
 
-		if (isset($data->sharing))
+		if (isset($data->sharing)) {
 			$sharing = (unxmlify($data->sharing) == "true");
-		else
+		} else {
 			$sharing = true;
+		}
 
 		$contact = self::contact_by_handle($importer["uid"],$author);
 

mod/crepair.php

@@ -30,7 +30,6 @@ function crepair_init(App &$a) {
 	}
 }
 
-
 function crepair_post(App &$a) {
 	if (! local_user()) {
 		return;

mod/dfrn_confirm.php

@@ -588,7 +588,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc($decrypted_source_url),
 			intval($local_uid)
 		);
-		if(! dbm::is_result($ret)) {
+		if(! count($ret)) {
 			if(strstr($decrypted_source_url,'http:'))
 				$newurl = str_replace('http:','https:',$decrypted_source_url);
 			else
@@ -598,7 +598,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				dbesc($newurl),
 				intval($local_uid)
 			);
-			if(! dbm::is_result($ret)) {
+			if(! count($ret)) {
 				// this is either a bogus confirmation (?) or we deleted the original introduction.
 				$message = t('Contact record was not found for you on our site.');
 				xml_status(3,$message);

mod/install.php

@@ -565,7 +565,6 @@ function check_imagik(&$checks) {
 	}
 }
 
-
 function manual_config(App &$a) {
 	$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
 	$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');

mod/network.php

@@ -6,8 +6,9 @@ function network_init(App &$a) {
 	}
 
 	$is_a_date_query = false;
-	if(x($_GET['cid']) && intval($_GET['cid']) != 0)
+	if (x($_GET['cid']) && intval($_GET['cid']) != 0) {
 		$cid = $_GET['cid'];
+	}
 
 	if ($a->argc > 1) {
 		for ($x = 1; $x < $a->argc; $x ++) {

mod/videos.php

@@ -167,10 +167,11 @@ function videos_post(App &$a) {
 				$url = App::get_baseurl();
 				$drop_id = intval($i[0]['id']);
 
-				if($i[0]['visible'])
+				if ($i[0]['visible']) {
 					proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
 				}
 			}
+		}
 
 		goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
 		return; // NOTREACHED

view/theme/duepuntozero/config.php

@@ -4,7 +4,6 @@
  */
 
 
-
 function theme_content(App &$a){
 	if (!local_user()) {
 		return;

view/theme/quattro/config.php

@@ -3,8 +3,6 @@
  * Theme settings
  */
 
-
-
 function theme_content(App &$a){
 	if (!local_user()) {
 		return;
@@ -51,15 +49,19 @@ function theme_admin_post(App &$a){
 }
 
 /// @TODO $a is no longer used here
-function quattro_form(&$a, $align, $color, $tfs, $pfs){
+function quattro_form(App &$a, $align, $color, $tfs, $pfs){
 	$colors = array(
 		"dark"  => "Quattro",
 		"lilac" => "Lilac",
-		"green"=>"Green"
+		"green" => "Green",
 	);
 
-    if ($tfs===false) $tfs="20";
+	if ($tfs === false) {
-    if ($pfs===false) $pfs="12";
+		$tfs = "20";
+	}
+	if ($pfs === false) {
+		$pfs = "12";
+	}
 
 	$t = get_markup_template("theme_settings.tpl" );
 	$o .= replace_macros($t, array(