Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / crepair.php

diff --git a/mod/crepair.php b/mod/crepair.php
index 29aa01572657ec7622d8a5fb441e0f58f12f3035..91b22dbc92b1c9085ce4709b361d4fa67cf009a7 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -2,14 +2,17 @@
 /**
  * @file mod/crepair.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Profile;
-
-require_once 'mod/contacts.php';
+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)
 {
@@ -19,16 +22,16 @@ function crepair_init(App $a)
 
        $contact = null;
        if (($a->argc == 2) && intval($a->argv[1])) {
-               $contact = dba::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
+               $contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
        }
 
-       if (!x($a->page, 'aside')) {
+       if (empty($a->page['aside'])) {
                $a->page['aside'] = '';
        }
 
-       if (DBM::is_result($contact)) {
+       if (DBA::isResult($contact)) {
                $a->data['contact'] = $contact;
-               Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+               Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
        }
 }
 
@@ -42,10 +45,10 @@ function crepair_post(App $a)
 
        $contact = null;
        if ($cid) {
-               $contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
+               $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
        }
 
-       if (!DBM::is_result($contact)) {
+       if (!DBA::isResult($contact)) {
                return;
        }
 
@@ -59,28 +62,28 @@ 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",
-               dbesc($name),
-               dbesc($nick),
-               dbesc($url),
-               dbesc($nurl),
-               dbesc($request),
-               dbesc($confirm),
-               dbesc($notify),
-               dbesc($poll),
-               dbesc($attag),
+               DBA::escape($name),
+               DBA::escape($nick),
+               DBA::escape($url),
+               DBA::escape($nurl),
+               DBA::escape($request),
+               DBA::escape($confirm),
+               DBA::escape($notify),
+               DBA::escape($poll),
+               DBA::escape($attag),
                intval($remote_self),
                intval($contact['id']),
                local_user()
        );
 
        if ($photo) {
-               logger('mod-crepair: updating photo from ' . $photo);
+               Logger::log('mod-crepair: updating photo from ' . $photo);
 
-               Contact::updateAvatar($photo, local_user(), $contact['id']);
+               Model\Contact::updateAvatar($photo, local_user(), $contact['id']);
        }
 
        if ($r) {
@@ -101,12 +104,12 @@ function crepair_content(App $a)
 
        $cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-               $contact = null;
+       $contact = null;
        if ($cid) {
-               $contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
+               $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
        }
 
-       if (!DBM::is_result($contact)) {
+       if (!DBA::isResult($contact)) {
                notice(L10n::t('Contact not found.') . EOL);
                return;
        }
@@ -114,29 +117,29 @@ function crepair_content(App $a)
        $warning = L10n::t('<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working.');
        $info = L10n::t('Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.');
 
-       $returnaddr = "contacts/$cid";
+       $returnaddr = "contact/$cid";
 
        $allow_remote_self = Config::get('system', 'allow_users_remote_self');
 
        // Disable remote self for everything except feeds.
        // There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter
        // Problem is, you couldn't reply to both networks.
-       if (!in_array($contact['network'], [NETWORK_FEED, NETWORK_DFRN, NETWORK_DIASPORA])) {
+       if (!in_array($contact['network'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])) {
                $allow_remote_self = false;
        }
 
-       if ($contact['network'] == NETWORK_FEED) {
+       if ($contact['network'] == Protocol::FEED) {
                $remote_self_options = ['0' => L10n::t('No mirroring'), '1' => L10n::t('Mirror as forwarded posting'), '2' => L10n::t('Mirror as my own posting')];
        } else {
                $remote_self_options = ['0' => L10n::t('No mirroring'), '2' => L10n::t('Mirror as my own posting')];
        }
 
-       $update_profile = in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]);
+       $update_profile = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]);
 
-       $tab_str = contacts_tab($a, $contact['id'], 5);
+       $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']],