From f565d590f67d8e953197f6944dc20d3e5c713ab9 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 1 Feb 2020 00:20:50 +0100 Subject: [PATCH 1/3] Move mod/crepair to src/Module/Contact/Repair --- mod/crepair.php | 171 ---------------------------------- src/Module/Contact/Repair.php | 159 +++++++++++++++++++++++++++++++ static/routes.config.php | 4 +- 3 files changed, 162 insertions(+), 172 deletions(-) delete mode 100644 mod/crepair.php create mode 100644 src/Module/Contact/Repair.php diff --git a/mod/crepair.php b/mod/crepair.php deleted file mode 100644 index a3caf95e66..0000000000 --- a/mod/crepair.php +++ /dev/null @@ -1,171 +0,0 @@ -argc > 1) ? intval($a->argv[1]) : 0); - - $contact = null; - if ($cid) { - $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]); - } - - if (!DBA::isResult($contact)) { - return; - } - - $name = ($_POST['name'] ?? '') ?: $contact['name']; - $nick = $_POST['nick'] ?? ''; - $url = $_POST['url'] ?? ''; - $alias = $_POST['alias'] ?? ''; - $request = $_POST['request'] ?? ''; - $confirm = $_POST['confirm'] ?? ''; - $notify = $_POST['notify'] ?? ''; - $poll = $_POST['poll'] ?? ''; - $attag = $_POST['attag'] ?? ''; - $photo = $_POST['photo'] ?? ''; - $remote_self = $_POST['remote_self'] ?? false; - $nurl = Strings::normaliseLink($url); - - $r = DBA::update( - 'contact', - [ - 'name' => $name, - 'nick' => $nick, - 'url' => $url, - 'nurl' => $nurl, - 'alias' => $alias, - 'request' => $request, - 'confirm' => $confirm, - 'notify' => $notify, - 'poll' => $poll, - 'attag' => $attag, - 'remote_self' => $remote_self, - ], - ['id' => $contact['id'], 'uid' => local_user()] - ); - - if ($photo) { - Logger::log('mod-crepair: updating photo from ' . $photo); - - Model\Contact::updateAvatar($photo, local_user(), $contact['id']); - } - - if ($r) { - info(DI::l10n()->t('Contact settings applied.') . EOL); - } else { - notice(DI::l10n()->t('Contact update failed.') . EOL); - } - - return; -} - -function crepair_content(App $a) -{ - if (!local_user()) { - notice(DI::l10n()->t('Permission denied.') . EOL); - return; - } - - $cid = (($a->argc > 1) ? intval($a->argv[1]) : 0); - - $contact = null; - if ($cid) { - $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]); - } - - if (!DBA::isResult($contact)) { - notice(DI::l10n()->t('Contact not found.') . EOL); - return; - } - - if (empty(DI::page()['aside'])) { - DI::page()['aside'] = ''; - } - - if (DBA::isResult($contact)) { - $a->data['contact'] = $contact; - Model\Profile::load($a, "", Model\Contact::getDetailsByURL($contact["url"])); - } - - $warning = DI::l10n()->t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); - $info = DI::l10n()->t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); - - $returnaddr = "contact/$cid"; - - $allow_remote_self = DI::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'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])) { - $allow_remote_self = false; - } - - if ($contact['network'] == Protocol::FEED) { - $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '1' => DI::l10n()->t('Mirror as forwarded posting'), '2' => DI::l10n()->t('Mirror as my own posting')]; - } else { - $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')]; - } - - $update_profile = in_array($contact['network'], Protocol::FEDERATED); - - $tab_str = Module\Contact::getTabsHTML($a, $contact, 6); - - $tpl = Renderer::getMarkupTemplate('crepair.tpl'); - $o = Renderer::replaceMacros($tpl, [ - '$tab_str' => $tab_str, - '$warning' => $warning, - '$info' => $info, - '$returnaddr' => $returnaddr, - '$return' => DI::l10n()->t('Return to contact editor'), - '$update_profile' => $update_profile, - '$udprofilenow' => DI::l10n()->t('Refetch contact data'), - '$contact_id' => $contact['id'], - '$lbl_submit' => DI::l10n()->t('Submit'), - '$label_remote_self' => DI::l10n()->t('Remote Self'), - '$allow_remote_self' => $allow_remote_self, - '$remote_self' => ['remote_self', - DI::l10n()->t('Mirror postings from this contact'), - $contact['remote_self'], - DI::l10n()->t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'), - $remote_self_options - ], - - '$name' => ['name', DI::l10n()->t('Name') , $contact['name']], - '$nick' => ['nick', DI::l10n()->t('Account Nickname'), $contact['nick']], - '$attag' => ['attag', DI::l10n()->t('@Tagname - overrides Name/Nickname'), $contact['attag']], - '$url' => ['url', DI::l10n()->t('Account URL'), $contact['url']], - '$alias' => ['alias', DI::l10n()->t('Account URL Alias'), $contact['alias']], - '$request' => ['request', DI::l10n()->t('Friend Request URL'), $contact['request']], - 'confirm' => ['confirm', DI::l10n()->t('Friend Confirm URL'), $contact['confirm']], - 'notify' => ['notify', DI::l10n()->t('Notification Endpoint URL'), $contact['notify']], - 'poll' => ['poll', DI::l10n()->t('Poll/Feed URL'), $contact['poll']], - 'photo' => ['photo', DI::l10n()->t('New photo from this URL'), ''], - ]); - - return $o; -} diff --git a/src/Module/Contact/Repair.php b/src/Module/Contact/Repair.php new file mode 100644 index 0000000000..a7c68822e6 --- /dev/null +++ b/src/Module/Contact/Repair.php @@ -0,0 +1,159 @@ +t('Permission denied.')); + } + } + + public static function post(array $parameters = []) + { + $cid = $parameters['contact']; + + $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]); + if (empty($contact)) { + throw new BadRequestException(DI::l10n()->t('Contact not found.')); + } + + $name = ($_POST['name'] ?? '') ?: $contact['name']; + $nick = $_POST['nick'] ?? ''; + $url = $_POST['url'] ?? ''; + $alias = $_POST['alias'] ?? ''; + $request = $_POST['request'] ?? ''; + $confirm = $_POST['confirm'] ?? ''; + $notify = $_POST['notify'] ?? ''; + $poll = $_POST['poll'] ?? ''; + $attag = $_POST['attag'] ?? ''; + $photo = $_POST['photo'] ?? ''; + $remote_self = $_POST['remote_self'] ?? false; + $nurl = Strings::normaliseLink($url); + + $r = DI::dba()->update( + 'contact', + [ + 'name' => $name, + 'nick' => $nick, + 'url' => $url, + 'nurl' => $nurl, + 'alias' => $alias, + 'request' => $request, + 'confirm' => $confirm, + 'notify' => $notify, + 'poll' => $poll, + 'attag' => $attag, + 'remote_self' => $remote_self, + ], + ['id' => $contact['id'], 'uid' => local_user()] + ); + + if ($photo) { + DI::logger()->notice('Updating photo.', ['photo' => $photo]); + + Model\Contact::updateAvatar($photo, local_user(), $contact['id']); + } + + if ($r) { + info(DI::l10n()->t('Contact settings applied.') . EOL); + } else { + notice(DI::l10n()->t('Contact update failed.') . EOL); + } + + return; + } + + public static function content(array $parameters = []) + { + $cid = $parameters['contact']; + + $cid = $parameters['contact']; + + $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]); + if (empty($contact)) { + throw new BadRequestException(DI::l10n()->t('Contact not found.')); + } + + if (empty(DI::page()['aside'])) { + DI::page()['aside'] = ''; + } + + $a = DI::app(); + + $a->data['contact'] = $contact; + Model\Profile::load($a, "", Model\Contact::getDetailsByURL($contact["url"])); + + $warning = DI::l10n()->t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); + $info = DI::l10n()->t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); + + $returnaddr = "contact/$cid"; + + $allow_remote_self = DI::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'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])) { + $allow_remote_self = false; + } + + if ($contact['network'] == Protocol::FEED) { + $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '1' => DI::l10n()->t('Mirror as forwarded posting'), '2' => DI::l10n()->t('Mirror as my own posting')]; + } else { + $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')]; + } + + $update_profile = in_array($contact['network'], Protocol::FEDERATED); + + $tab_str = Contact::getTabsHTML($a, $contact, 6); + + $tpl = Renderer::getMarkupTemplate('crepair.tpl'); + return Renderer::replaceMacros($tpl, [ + '$tab_str' => $tab_str, + '$warning' => $warning, + '$info' => $info, + '$returnaddr' => $returnaddr, + '$return' => DI::l10n()->t('Return to contact editor'), + '$update_profile' => $update_profile, + '$udprofilenow' => DI::l10n()->t('Refetch contact data'), + '$contact_id' => $contact['id'], + '$lbl_submit' => DI::l10n()->t('Submit'), + '$label_remote_self' => DI::l10n()->t('Remote Self'), + '$allow_remote_self' => $allow_remote_self, + '$remote_self' => ['remote_self', + DI::l10n()->t('Mirror postings from this contact'), + $contact['remote_self'], + DI::l10n()->t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'), + $remote_self_options + ], + + '$name' => ['name', DI::l10n()->t('Name'), $contact['name']], + '$nick' => ['nick', DI::l10n()->t('Account Nickname'), $contact['nick']], + '$attag' => ['attag', DI::l10n()->t('@Tagname - overrides Name/Nickname'), $contact['attag']], + '$url' => ['url', DI::l10n()->t('Account URL'), $contact['url']], + '$alias' => ['alias', DI::l10n()->t('Account URL Alias'), $contact['alias']], + '$request' => ['request', DI::l10n()->t('Friend Request URL'), $contact['request']], + 'confirm' => ['confirm', DI::l10n()->t('Friend Confirm URL'), $contact['confirm']], + 'notify' => ['notify', DI::l10n()->t('Notification Endpoint URL'), $contact['notify']], + 'poll' => ['poll', DI::l10n()->t('Poll/Feed URL'), $contact['poll']], + 'photo' => ['photo', DI::l10n()->t('New photo from this URL'), ''], + ]); + } +} diff --git a/static/routes.config.php b/static/routes.config.php index 4aad69d8c7..73b7428468 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -103,7 +103,9 @@ return [ '/hovercard' => [Module\Contact\Hovercard::class, [R::GET]], ], - '/credits' => [Module\Credits::class, [R::GET]], + '/credits' => [Module\Credits::class, [R::GET]], + '/crepair/{contact:\d+}' => [Module\Contact\Repair::class, [R::GET, R::POST]], + '/delegation'=> [Module\Delegation::class, [R::GET, R::POST]], '/dirfind' => [Module\Search\Directory::class, [R::GET]], '/directory' => [Module\Directory::class, [R::GET]], From 048bb014d8fcf2b2d9fbb00907402c0afe5675ae Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 1 Feb 2020 00:37:11 +0100 Subject: [PATCH 2/3] Move CRepair to Contact Advanced route --- src/Module/Contact/{Repair.php => Advanced.php} | 12 +++++------- static/routes.config.php | 2 +- view/templates/{crepair.tpl => contact/advanced.tpl} | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) rename src/Module/Contact/{Repair.php => Advanced.php} (96%) rename view/templates/{crepair.tpl => contact/advanced.tpl} (84%) diff --git a/src/Module/Contact/Repair.php b/src/Module/Contact/Advanced.php similarity index 96% rename from src/Module/Contact/Repair.php rename to src/Module/Contact/Advanced.php index a7c68822e6..f0641076d0 100644 --- a/src/Module/Contact/Repair.php +++ b/src/Module/Contact/Advanced.php @@ -14,9 +14,9 @@ use Friendica\Network\HTTPException\ForbiddenException; use Friendica\Util\Strings; /** - * GUI for repairing contact details + * GUI for advanced contact details manipulation */ -class Repair extends BaseModule +class Advanced extends BaseModule { public static function init(array $parameters = []) { @@ -27,7 +27,7 @@ class Repair extends BaseModule public static function post(array $parameters = []) { - $cid = $parameters['contact']; + $cid = $parameters['id']; $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]); if (empty($contact)) { @@ -82,9 +82,7 @@ class Repair extends BaseModule public static function content(array $parameters = []) { - $cid = $parameters['contact']; - - $cid = $parameters['contact']; + $cid = $parameters['id']; $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]); if (empty($contact)) { @@ -124,7 +122,7 @@ class Repair extends BaseModule $tab_str = Contact::getTabsHTML($a, $contact, 6); - $tpl = Renderer::getMarkupTemplate('crepair.tpl'); + $tpl = Renderer::getMarkupTemplate('contact/advanced.tpl'); return Renderer::replaceMacros($tpl, [ '$tab_str' => $tab_str, '$warning' => $warning, diff --git a/static/routes.config.php b/static/routes.config.php index 73b7428468..d145fcffd4 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -87,6 +87,7 @@ return [ '[/]' => [Module\Contact::class, [R::GET]], '/{id:\d+}[/]' => [Module\Contact::class, [R::GET, R::POST]], '/{id:\d+}/archive' => [Module\Contact::class, [R::GET]], + '/{id:\d+}/advanced' => [Module\Contact\Advanced::class, [R::GET, R::POST]], '/{id:\d+}/block' => [Module\Contact::class, [R::GET]], '/{id:\d+}/conversations' => [Module\Contact::class, [R::GET]], '/{id:\d+}/drop' => [Module\Contact::class, [R::GET]], @@ -104,7 +105,6 @@ return [ ], '/credits' => [Module\Credits::class, [R::GET]], - '/crepair/{contact:\d+}' => [Module\Contact\Repair::class, [R::GET, R::POST]], '/delegation'=> [Module\Delegation::class, [R::GET, R::POST]], '/dirfind' => [Module\Search\Directory::class, [R::GET]], diff --git a/view/templates/crepair.tpl b/view/templates/contact/advanced.tpl similarity index 84% rename from view/templates/crepair.tpl rename to view/templates/contact/advanced.tpl index 77fa993e19..6c6065f1cc 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/contact/advanced.tpl @@ -2,14 +2,14 @@ {{$tab_str nofilter}} -
{{$warning nofilter}}

-
+
{{$warning nofilter}}

+
{{$info nofilter}}

-
+ From d9ae813b430eab82eed80cb1b5c6f30865eac2f7 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Sat, 1 Feb 2020 08:45:38 +0100 Subject: [PATCH 3/3] Improvements --- src/Module/Contact/Advanced.php | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php index f0641076d0..ad0afacde1 100644 --- a/src/Module/Contact/Advanced.php +++ b/src/Module/Contact/Advanced.php @@ -89,28 +89,18 @@ class Advanced extends BaseModule throw new BadRequestException(DI::l10n()->t('Contact not found.')); } - if (empty(DI::page()['aside'])) { - DI::page()['aside'] = ''; - } - - $a = DI::app(); - - $a->data['contact'] = $contact; - Model\Profile::load($a, "", Model\Contact::getDetailsByURL($contact["url"])); + Model\Profile::load(DI::app(), "", Model\Contact::getDetailsByURL($contact["url"])); $warning = DI::l10n()->t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); $info = DI::l10n()->t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); $returnaddr = "contact/$cid"; - $allow_remote_self = DI::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'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])) { - $allow_remote_self = false; - } + $allow_remote_self = in_array($contact['network'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER]) + && DI::config()->get('system', 'allow_users_remote_self'); if ($contact['network'] == Protocol::FEED) { $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '1' => DI::l10n()->t('Mirror as forwarded posting'), '2' => DI::l10n()->t('Mirror as my own posting')]; @@ -118,9 +108,7 @@ class Advanced extends BaseModule $remote_self_options = ['0' => DI::l10n()->t('No mirroring'), '2' => DI::l10n()->t('Mirror as my own posting')]; } - $update_profile = in_array($contact['network'], Protocol::FEDERATED); - - $tab_str = Contact::getTabsHTML($a, $contact, 6); + $tab_str = Contact::getTabsHTML(DI::app(), $contact, 6); $tpl = Renderer::getMarkupTemplate('contact/advanced.tpl'); return Renderer::replaceMacros($tpl, [ @@ -129,7 +117,7 @@ class Advanced extends BaseModule '$info' => $info, '$returnaddr' => $returnaddr, '$return' => DI::l10n()->t('Return to contact editor'), - '$update_profile' => $update_profile, + '$update_profile' => in_array($contact['network'], Protocol::FEDERATED), '$udprofilenow' => DI::l10n()->t('Refetch contact data'), '$contact_id' => $contact['id'], '$lbl_submit' => DI::l10n()->t('Submit'),