Add pwdreset_time field to user table

[friendica.git] / mod / unfollow.php

diff --git a/mod/unfollow.php b/mod/unfollow.php
index 3f94fb5760eb48ad69986fab4cf162d10019ac21..246cb8bad03a7cb53451d2219cfcfee732f23c63 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -1,15 +1,15 @@
 <?php
-
+/**
+ * @file mod/unfollow.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
-
-require_once 'include/follow.php';
-require_once 'include/contact_selectors.php';
-
-function unfollow_post(App $a) {
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
+function unfollow_post(App $a)
+{
        if (!local_user()) {
                notice(t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
@@ -24,15 +24,15 @@ function unfollow_post(App $a) {
        $url = notags(trim($_REQUEST['url']));
        $return_url = $_SESSION['return_url'];
 
-       $condition = array("`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
+       $condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
                        $uid, CONTACT_IS_FRIEND, normalise_link($url),
-                       normalise_link($url), $url, NETWORK_STATUSNET);
-       $contact = dba::select('contact', array(), $condition, array('limit' => 1));
+                       normalise_link($url), $url, NETWORK_STATUSNET];
+       $contact = dba::selectFirst('contact', [], $condition);
 
        if (!DBM::is_result($contact)) {
                notice(t("Contact wasn't found or can't be unfollowed."));
        } else {
-               if (in_array($contact['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+               if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA])) {
                        $r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
                                WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
                                intval($uid)
@@ -41,7 +41,7 @@ function unfollow_post(App $a) {
                                Contact::terminateFriendship($r[0], $contact);
                        }
                }
-               dba::update('contact', array('rel' => CONTACT_IS_FOLLOWER), array('id' => $contact['id']));
+               dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
 
                info(t('Contact unfollowed').EOL);
                goaway(System::baseUrl().'/contacts/'.$contact['id']);
@@ -63,10 +63,10 @@ function unfollow_content(App $a) {
 
        $submit = t('Submit Request');
 
-       $condition = array("`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
+       $condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
                        local_user(), CONTACT_IS_FRIEND, normalise_link($url),
-                       normalise_link($url), $url, NETWORK_STATUSNET);
-       $contact = dba::select('contact', array('url', 'network', 'addr', 'name'), $condition, array('limit' => 1));
+                       normalise_link($url), $url, NETWORK_STATUSNET];
+       $contact = dba::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
 
        if (!DBM::is_result($contact)) {
                notice(t("You aren't a friend of this contact.").EOL);
@@ -74,7 +74,7 @@ function unfollow_content(App $a) {
                // NOTREACHED
        }
 
-       if (!in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS))) {
+       if (!in_array($contact['network'], [NETWORK_DIASPORA, NETWORK_OSTATUS])) {
                notice(t("Unfollowing is currently not supported by your network.").EOL);
                $submit = "";
                // NOTREACHED
@@ -98,7 +98,7 @@ function unfollow_content(App $a) {
 
        $header = t("Disconnect/Unfollow");
 
-       $o  = replace_macros($tpl,array(
+       $o  = replace_macros($tpl,[
                        '$header' => htmlentities($header),
                        '$desc' => "",
                        '$pls_answer' => "",
@@ -117,20 +117,18 @@ function unfollow_content(App $a) {
                        '$nickname' => "",
                        '$name' => $contact["name"],
                        '$url' => $contact["url"],
-                       '$zrl' => zrl($contact["url"]),
+                       '$zrl' => Profile::zrl($contact["url"]),
                        '$url_label' => t("Profile URL"),
                        '$myaddr' => $myaddr,
                        '$request' => $request,
                        '$keywords' => "",
                        '$keywords_label' => ""
-       ));
+       ]);
 
        $a->page['aside'] = "";
-       profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+       Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 
-       $o .= replace_macros(get_markup_template('section_title.tpl'),
-                                       array('$title' => t('Status Messages and Posts')
-       ));
+       $o .= replace_macros(get_markup_template('section_title.tpl'), ['$title' => t('Status Messages and Posts')]);
 
        // Show last public posts
        $o .= Contact::getPostsFromUrl($contact["url"]);