Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index 3abbe343b26d0d09709fe0bcd9f3e47a50ab9757..c5b4983d5bdadbee07556dd1b38eefbbd3afda96 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -2,49 +2,55 @@
 require_once("include/contact_selectors.php");
 require_once("mod/contacts.php");
 
-function crepair_init(&$a) {
-       if(! local_user())
+function crepair_init(App $a) {
+       if (! local_user()) {
                return;
+       }
 
        $contact_id = 0;
 
-       if(($a->argc == 2) && intval($a->argv[1])) {
+       if (($a->argc == 2) && intval($a->argv[1])) {
                $contact_id = intval($a->argv[1]);
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
                        intval(local_user()),
                        intval($contact_id)
                );
-               if(! count($r)) {
+               if (! dbm::is_result($r)) {
                        $contact_id = 0;
                }
        }
 
-       if(! x($a->page,'aside'))
+       if (! x($a->page,'aside')) {
                $a->page['aside'] = '';
+       }
 
-       if($contact_id) {
+       if ($contact_id) {
                $a->data['contact'] = $r[0];
                $contact = $r[0];
                profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
        }
 }
 
-
-function crepair_post(&$a) {
-       if(! local_user())
+function crepair_post(App $a) {
+       if (! local_user()) {
                return;
+       }
+
+       // Init $r here if $cid is not set
+       $r = false;
 
        $cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-       if($cid) {
+       if ($cid) {
                $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($cid),
                        intval(local_user())
                );
        }
 
-       if(! count($r))
+       if (! dbm::is_result($r)) {
                return;
+       }
 
        $contact = $r[0];
 
@@ -76,41 +82,41 @@ function crepair_post(&$a) {
                local_user()
        );
 
-       if($photo) {
+       if ($photo) {
                logger('mod-crepair: updating photo from ' . $photo);
                require_once("include/Photo.php");
 
                update_contact_avatar($photo,local_user(),$contact['id']);
        }
 
-       if($r)
+       if ($r) {
                info( t('Contact settings applied.') . EOL);
-       else
+       } else {
                notice( t('Contact update failed.') . EOL);
-
+       }
 
        return;
 }
 
 
 
-function crepair_content(&$a) {
+function crepair_content(App $a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
        $cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-       if($cid) {
+       if ($cid) {
                $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($cid),
                        intval(local_user())
                );
        }
 
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                notice( t('Contact not found.') . EOL);
                return;
        }