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 6f951bdf6eade2dcd2321e63f250455892fe152c..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];
+               $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,58 +82,41 @@ function crepair_post(&$a) {
                local_user()
        );
 
-       if($photo) {
+       if ($photo) {
                logger('mod-crepair: updating photo from ' . $photo);
                require_once("include/Photo.php");
 
-               $photos = import_profile_photo($photo,local_user(),$contact['id']);
-
-               $x = q("UPDATE `contact` SET `photo` = '%s',
-                       `thumb` = '%s',
-                       `micro` = '%s',
-                       `name-date` = '%s',
-                       `uri-date` = '%s',
-                       `avatar-date` = '%s'
-                       WHERE `id` = %d
-                       ",
-                       dbesc($photos[0]),
-                       dbesc($photos[1]),
-                       dbesc($photos[2]),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       intval($contact['id'])
-               );
+               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;
        }
@@ -167,15 +156,9 @@ function crepair_content(&$a) {
                '$return'       => t('Return to contact editor'),
                '$update_profile' => update_profile,
                '$udprofilenow' => t('Refetch contact data'),
-               '$label_name' => t('Name'),
-               '$label_nick' => t('Account Nickname'),
-               '$label_attag' => t('@Tagname - overrides Name/Nickname'),
-               '$label_url' => t('Account URL'),
-               '$label_request' => t('Friend Request URL'),
-               '$label_confirm' => t('Friend Confirm URL'),
-               '$label_notify' => t('Notification Endpoint URL'),
-               '$label_poll' => t('Poll/Feed URL'),
-               '$label_photo' => t('New photo from this URL'),
+               '$contact_id'   => $contact['id'],
+               '$lbl_submit'   => t('Submit'),
+
                '$label_remote_self' => t('Remote Self'),
                '$allow_remote_self' => $allow_remote_self,
                '$remote_self' => array('remote_self',
@@ -184,16 +167,16 @@ function crepair_content(&$a) {
                                        t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'),
                                        $remote_self_options
                                ),
-               '$contact_name' => htmlentities($contact['name']),
-               '$contact_nick' => htmlentities($contact['nick']),
-               '$contact_id'   => $contact['id'],
-               '$contact_url'  => $contact['url'],
-               '$request'      => $contact['request'],
-               '$confirm'      => $contact['confirm'],
-               '$notify'       => $contact['notify'],
-               '$poll'         => $contact['poll'],
-               '$contact_attag'  => $contact['attag'],
-               '$lbl_submit'   => t('Submit')
+
+               '$name'         => array('name', t('Name') , htmlentities($contact['name'])),
+               '$nick'         => array('nick', t('Account Nickname'), htmlentities($contact['nick'])),
+               '$attag'        => array('attag', t('@Tagname - overrides Name/Nickname'), $contact['attag']),
+               '$url'          => array('url', t('Account URL'), $contact['url']),
+               '$request'      => array('request', t('Friend Request URL'), $contact['request']),
+               'confirm'       => array('confirm', t('Friend Confirm URL'), $contact['confirm']),
+               'notify'        => array('notify', t('Notification Endpoint URL'), $contact['notify']),
+               'poll'          => array('poll', t('Poll/Feed URL'), $contact['poll']),
+               'photo'         => array('photo', t('New photo from this URL'), ''),
        ));
 
        return $o;