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 902a129303972a7e18b7c426f84aff37231c5fc8..c5b4983d5bdadbee07556dd1b38eefbbd3afda96 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -9,7 +9,7 @@ function crepair_init(App $a) {
 
        $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()),
@@ -20,10 +20,11 @@ function crepair_init(App $a) {
                }
        }
 
-       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"]));
@@ -35,9 +36,12 @@ function crepair_post(App $a) {
                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())
@@ -78,18 +82,18 @@ function crepair_post(App $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;
 }
@@ -105,7 +109,7 @@ function crepair_content(App $a) {
 
        $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())