Merge branch 'dev' into sabre32

2 files changed, 16 insertions, 11 deletions

diff --git a/include/group.php b/include/group.php
index a4938b848..10853ff6b 100644
--- a/include/group.php
+++ b/include/group.php
@@ -17,7 +17,7 @@ function group_add($uid,$name,$public = 0) {
 			$z = q("SELECT * FROM `groups` WHERE `id` = %d LIMIT 1",
 				intval($r)
 			);
-			if(count($z) && $z[0]['deleted']) {
+			if(($z) && $z[0]['deleted']) {
 				/*$r = q("UPDATE `groups` SET `deleted` = 0 WHERE `uid` = %d AND `gname` = '%s' LIMIT 1",
 					intval($uid),
 					dbesc($name)
@@ -129,7 +129,7 @@ function group_byname($uid,$name) {
 		intval($uid),
 		dbesc($name)
 	);
-	if(count($r))
+	if($r)
 		return $r[0]['id'];
 	return false;
 }
@@ -178,11 +178,11 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 		intval($gid),
 		dbesc($member)
 	);
-	if(count($r))
+	if($r)
 		return true;	// You might question this, but 
 				// we indicate success because the group member was in fact created
 				// -- It was just created at another time
- 	if(! count($r))
+ 	if(! $r)
 		$r = q("INSERT INTO `group_member` (`uid`, `gid`, `xchan`)
 			VALUES( %d, %d, '%s' ) ",
 			intval($uid),
@@ -205,7 +205,7 @@ function group_get_members($gid) {
 			intval(local_channel()),
 			intval(local_channel())
 		);
-		if(count($r))
+		if($r)
 			$ret = $r;
 	}
 	return $ret;
@@ -218,7 +218,7 @@ function group_get_members_xchan($gid) {
 			intval($gid),
 			intval(local_channel())
 		);
-		if(count($r)) {
+		if($r) {
 			foreach($r as $rr) {
 				$ret[] = $rr['xchan'];
 			}
@@ -236,7 +236,7 @@ function mini_group_select($uid,$group = '') {
 		intval($uid)
 	);
 	$grps[] = array('name' => '', 'hash' => '0', 'selected' => '');
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr) {
 			$grps[] = array('name' => $rr['gname'], 'id' => $rr['hash'], 'selected' => (($group == $rr['hash']) ? 'true' : ''));
 		}
@@ -279,7 +279,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 		$member_of = groups_containing(local_channel(),$cid);
 	} 
 
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr) {
 			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 			
@@ -356,7 +356,7 @@ function groups_containing($uid,$c) {
 	);
 
 	$ret = array();
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr)
 			$ret[] = $rr['gid'];
 	}
diff --git a/include/network.php b/include/network.php
index d922799b6..062f2c2bf 100644
--- a/include/network.php
+++ b/include/network.php
@@ -189,6 +189,10 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
  */
 function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 
+//	logger('url: ' . $url);
+//	logger('params: ' . print_r($params,true));
+//	logger('opts: ' . print_r($opts,true));
+
 	$ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => "");
 
 	$ch = curl_init($url);
@@ -214,14 +218,15 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 
 	if(x($opts,'headers')) {
 		@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
-logger('headers: ' . print_r($opts['headers'],true) . 'redir: ' . $redirects);
 	}
  
 	if(x($opts,'nobody'))
 		@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
 
-	if(x($opts,'custom'))
+	if(x($opts,'custom')) {
 		@curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $opts['custom']);
+		@curl_setopt($ch, CURLOPT_POST,0);
+	}
 
 
 	if(x($opts,'timeout') && intval($opts['timeout'])) {