Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index 1cf562d64cae885e45fd9e07f3939b3041e40224..91b22dbc92b1c9085ce4709b361d4fa67cf009a7 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -6,10 +6,13 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module;
+use Friendica\Util\Strings;
 
 function crepair_init(App $a)
 {
@@ -22,7 +25,7 @@ function crepair_init(App $a)
                $contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
        }
 
-       if (!x($a->page, 'aside')) {
+       if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }
 
@@ -59,7 +62,7 @@ function crepair_post(App $a)
        $attag       = defaults($_POST, 'attag'      , '');
        $photo       = defaults($_POST, 'photo'      , '');
        $remote_self = defaults($_POST, 'remote_self', false);
-       $nurl        = normalise_link($url);
+       $nurl        = Strings::normaliseLink($url);
 
        $r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `nurl` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d
                WHERE `id` = %d AND `uid` = %d",
@@ -78,7 +81,7 @@ function crepair_post(App $a)
        );
 
        if ($photo) {
-               logger('mod-crepair: updating photo from ' . $photo);
+               Logger::log('mod-crepair: updating photo from ' . $photo);
 
                Model\Contact::updateAvatar($photo, local_user(), $contact['id']);
        }
@@ -135,8 +138,8 @@ function crepair_content(App $a)
 
        $tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
 
-       $tpl = get_markup_template('crepair.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('crepair.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$tab_str'        => $tab_str,
                '$warning'        => $warning,
                '$info'           => $info,
@@ -155,8 +158,8 @@ function crepair_content(App $a)
                        $remote_self_options
                ],
 
-               '$name'         => ['name', L10n::t('Name') , htmlentities($contact['name'])],
-               '$nick'         => ['nick', L10n::t('Account Nickname'), htmlentities($contact['nick'])],
+               '$name'         => ['name', L10n::t('Name') , $contact['name']],
+               '$nick'         => ['nick', L10n::t('Account Nickname'), $contact['nick']],
                '$attag'        => ['attag', L10n::t('@Tagname - overrides Name/Nickname'), $contact['attag']],
                '$url'          => ['url', L10n::t('Account URL'), $contact['url']],
                '$request'      => ['request', L10n::t('Friend Request URL'), $contact['request']],