Cleanup for #3010 - added spaces, thanks to @annando .

[friendica.git] / mod / group.php

diff --git a/mod/group.php b/mod/group.php
index 2f8053eefb8ed5bb717b528841aa91f3930c9a3b..db92ed7de6fb19f1102d6ad4594e6c7c8581d7ba 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -1,21 +1,18 @@
 <?php
 
-if(! function_exists('validate_members')) {
 function validate_members(&$item) {
        $item = intval($item);
 }
-}
 
-if(! function_exists('group_init')) {
 function group_init(&$a) {
        if(local_user()) {
                require_once('include/group.php');
                $a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0));
        }
 }
-}
 
-if(! function_exists('group_post')) {
+
+
 function group_post(&$a) {
 
        if(! local_user()) {
@@ -46,7 +43,7 @@ function group_post(&$a) {
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if(! count($r)) {
+               if(! dbm::is_result($r)) {
                        notice( t('Group not found.') . EOL );
                        goaway($a->get_baseurl() . '/contacts');
                        return; // NOTREACHED
@@ -67,9 +64,7 @@ function group_post(&$a) {
        }
        return;
 }
-}
 
-if(! function_exists('group_content')) {
 function group_content(&$a) {
        $change = false;
 
@@ -112,7 +107,7 @@ function group_content(&$a) {
                                intval($a->argv[2]),
                                intval(local_user())
                        );
-                       if(count($r))
+                       if (dbm::is_result($r))
                                $result = group_rmv(local_user(),$r[0]['name']);
                        if($result)
                                info( t('Group removed.') . EOL);
@@ -130,7 +125,7 @@ function group_content(&$a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        $change = intval($a->argv[2]);
        }
 
@@ -141,7 +136,7 @@ function group_content(&$a) {
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if(! count($r)) {
+               if(! dbm::is_result($r)) {
                        notice( t('Group not found.') . EOL );
                        goaway($a->get_baseurl() . '/contacts');
                }
@@ -214,7 +209,7 @@ function group_content(&$a) {
                intval(local_user())
        );
 
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
                foreach($r as $member) {
                        if(! in_array($member['id'],$preselected)) {
@@ -234,5 +229,5 @@ function group_content(&$a) {
        }
 
        return replace_macros($tpl, $context);
-}
+
 }