added much more curly braces + space between "if" and brace

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 23907669a6a91994f389da881a9afdec73ee7237..4f634bbc1c45cd46357acbd63d3122a7cd4cb857 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -7,9 +7,10 @@ require_once('include/Scrape.php');
 require_once('mod/proxy.php');
 require_once('include/Photo.php');
 
-function contacts_init(&$a) {
-       if(! local_user())
+function contacts_init(App &$a) {
+       if (! local_user()) {
                return;
+       }
 
        $contact_id = 0;
 
@@ -19,7 +20,7 @@ function contacts_init(&$a) {
                        intval(local_user()),
                        intval($contact_id)
                );
-               if(! count($r)) {
+               if (! dbm::is_result($r)) {
                        $contact_id = 0;
                }
        }
@@ -78,20 +79,20 @@ function contacts_init(&$a) {
        $base = z_root();
        $tpl = get_markup_template("contacts-head.tpl");
        $a->page['htmlhead'] .= replace_macros($tpl,array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$baseurl' => App::get_baseurl(true),
                '$base' => $base
        ));
 
        $tpl = get_markup_template("contacts-end.tpl");
        $a->page['end'] .= replace_macros($tpl,array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$baseurl' => App::get_baseurl(true),
                '$base' => $base
        ));
 
 
 }
 
-function contacts_batch_actions(&$a){
+function contacts_batch_actions(App &$a){
        $contacts_id = $_POST['contact_batch'];
        if (!is_array($contacts_id)) return;
 
@@ -136,10 +137,11 @@ function contacts_batch_actions(&$a){
 }
 
 
-function contacts_post(&$a) {
+function contacts_post(App &$a) {
 
-       if(! local_user())
+       if (! local_user()) {
                return;
+       }
 
        if ($a->argv[1]==="batch") {
                contacts_batch_actions($a);
@@ -147,15 +149,16 @@ function contacts_post(&$a) {
        }
 
        $contact_id = intval($a->argv[1]);
-       if(! $contact_id)
+       if (! $contact_id) {
                return;
+       }
 
        $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($contact_id),
                intval(local_user())
        );
 
-       if(! count($orig_record)) {
+       if (! count($orig_record)) {
                notice( t('Could not access contact record.') . EOL);
                goaway('contacts');
                return; // NOTREACHED
@@ -164,12 +167,12 @@ function contacts_post(&$a) {
        call_hooks('contact_edit_post', $_POST);
 
        $profile_id = intval($_POST['profile-assign']);
-       if($profile_id) {
+       if ($profile_id) {
                $r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($profile_id),
                        intval(local_user())
                );
-               if(! count($r)) {
+               if (! dbm::is_result($r)) {
                        notice( t('Could not locate selected profile.') . EOL);
                        return;
                }
@@ -211,7 +214,7 @@ function contacts_post(&$a) {
                intval($contact_id),
                intval(local_user())
        );
-       if($r && count($r))
+       if($r && dbm::is_result($r))
                $a->data['contact'] = $r[0];
 
        return;
@@ -339,14 +342,14 @@ function _contact_drop($contact_id, $orig_record) {
 }
 
 
-function contacts_content(&$a) {
+function contacts_content(App &$a) {
 
        $sort_type = 0;
        $o = '';
        nav_set_selected('contacts');
 
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -480,11 +483,11 @@ function contacts_content(&$a) {
                        $editselect = 'exact';
 
                $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
-                       '$baseurl' => $a->get_baseurl(true),
+                       '$baseurl' => App::get_baseurl(true),
                        '$editselect' => $editselect,
                ));
                $a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
-                       '$baseurl' => $a->get_baseurl(true),
+                       '$baseurl' => App::get_baseurl(true),
                        '$editselect' => $editselect,
                ));
 
@@ -564,7 +567,7 @@ function contacts_content(&$a) {
 
                if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
                        ($contact['rel'] == CONTACT_IS_FOLLOWER))
-                       $follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+                       $follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
 
                // Load contactact related actions like hide, suggest, delete and others
                $contact_actions = contact_actions($contact);
@@ -765,7 +768,7 @@ function contacts_content(&$a) {
        $r = q("SELECT COUNT(*) AS `total` FROM `contact`
                WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
                intval($_SESSION['uid']));
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                $a->set_pager_total($r[0]['total']);
                $total = $r[0]['total'];
        }
@@ -780,8 +783,8 @@ function contacts_content(&$a) {
 
        $contacts = array();
 
-       if(count($r)) {
-               foreach($r as $rr) {
+       if (dbm::is_result($r)) {
+               foreach ($r as $rr) {
                        $contacts[] = _contact_detail_for_template($rr);
                }
        }
@@ -894,16 +897,7 @@ function contact_posts($a, $contact_id) {
 
        $o .= $tab_str;
 
-       $r = q("SELECT `id` FROM `item` WHERE `contact-id` = %d LIMIT 1", intval($contact_id));
-       if ($r)
-               $o .= posts_from_contact($a, $contact_id);
-       elseif ($contact["url"]) {
-               $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-                       dbesc(normalise_link($contact["url"])));
-
-               if ($r[0]["id"] <> 0)
-                       $o .= posts_from_gcontact($a, $r[0]["id"]);
-       }
+       $o .= posts_from_contact_url($a, $contact["url"]);
 
        return $o;
 }