Merge pull request #3985 from hoergen/develop

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 838a550944dc8a80120bedc8f4ee6e4b48a86a6d..59835bd4cbf5b3bf85b78818b7f1809c41de0363 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,9 +1,14 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
 require_once('include/contact_widgets.php');
 require_once('include/redir.php');
 
-
 function profile_init(App $a) {
 
        if(! x($a->page,'aside'))
@@ -13,8 +18,8 @@ function profile_init(App $a) {
                $which = htmlspecialchars($a->argv[1]);
        else {
                $r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
-               if (dbm::is_result($r)) {
-                       goaway(App::get_baseurl() . '/profile/' . $r[0]['nickname']);
+               if (DBM::is_result($r)) {
+                       goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
                }
                else {
                        logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
@@ -35,7 +40,7 @@ function profile_init(App $a) {
 
        profile_load($a,$which,$profile);
 
-       $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+       $blocked = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
        $userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
 
        if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
@@ -57,16 +62,16 @@ function profile_init(App $a) {
        }
 
        $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
-       $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . App::get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
+       $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
        $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-       $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . App::get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
-       header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
+       $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
+       header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
        $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
        foreach ($dfrn_pages as $dfrn) {
-               $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+               $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".System::baseUrl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
        }
-       $a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";
+       $a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".System::baseUrl()."/poco/{$which}\" />\r\n";
 
 }
 
@@ -93,7 +98,9 @@ function profile_content(App $a, $update = 0) {
                $category = ((x($_GET,'category')) ? $_GET['category'] : '');
        }
 
-       if (get_config('system','block_public') && (! local_user()) && (! remote_user())) {
+       $hashtags = (x($_GET, 'tag') ? $_GET['tag'] : '');
+
+       if (Config::get('system','block_public') && (! local_user()) && (! remote_user())) {
                return login();
        }
 
@@ -135,7 +142,7 @@ function profile_content(App $a, $update = 0) {
                        intval($contact_id),
                        intval($a->profile['profile_uid'])
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $contact = $r[0];
                        $remote_contact = true;
                }
@@ -178,8 +185,9 @@ function profile_content(App $a, $update = 0) {
                $commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
                $commvisitor = (($commpage && $remote_contact == true) ? true : false);
 
-               $a->page['aside'] .= posted_date_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
-               $a->page['aside'] .= categories_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
+               $a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
+               $a->page['aside'] .= categories_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
+               $a->page['aside'] .= tagcloud_wall_widget();
 
                if (can_write_wall($a,$a->profile['profile_uid'])) {
 
@@ -236,7 +244,7 @@ function profile_content(App $a, $update = 0) {
                        intval($a->profile['profile_uid'])
                );
 
-               if (!dbm::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        return '';
                }
 
@@ -249,6 +257,11 @@ function profile_content(App $a, $update = 0) {
                        //$sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category'));
                }
 
+               if (x($hashtags)) {
+                       $sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+                               dbesc(protect_sprintf($hashtags)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval($a->profile['profile_uid']));
+               }
+
                if ($datequery) {
                        $sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery))));
                }
@@ -263,17 +276,17 @@ function profile_content(App $a, $update = 0) {
                        intval(PAGE_COMMUNITY),
                        intval(PAGE_PRVGROUP));
 
-               if (!dbm::is_result($r)) {
+               if (!DBM::is_result($r)) {
                        $sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
                }
 
                //  check if we serve a mobile device and get the user settings
                //  accordingly
                if ($a->is_mobile) {
-                       $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
+                       $itemspage_network = PConfig::get(local_user(),'system','itemspage_mobile_network');
                        $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10);
                } else {
-                       $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+                       $itemspage_network = PConfig::get(local_user(),'system','itemspage_network');
                        $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
                }
                //  now that we have the user settings, see if the theme forces
@@ -309,7 +322,7 @@ function profile_content(App $a, $update = 0) {
        // search for new items (update routine)
        $_SESSION['last_updated'][$last_updated_key] = time();
 
-       if (dbm::is_result($r)) {
+       if (DBM::is_result($r)) {
                foreach($r as $rr)
                        $parents_arr[] = $rr['item_id'];
                $parents_str = implode(', ', $parents_arr);
@@ -326,17 +339,18 @@ function profile_content(App $a, $update = 0) {
                $items = array();
        }
 
-       if($is_owner && (! $update) && (! get_config('theme','hide_eventlist'))) {
+       if($is_owner && (! $update) && (! Config::get('theme','hide_eventlist'))) {
                $o .= get_birthdays();
                $o .= get_events();
        }
 
 
-       if($is_owner) {
-               $r = q("UPDATE `item` SET `unseen` = 0
-                       WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
-                       intval(local_user())
-               );
+       if ($is_owner) {
+               $unseen = dba::exists('item', array('wall' => true, 'unseen' => true, 'uid' => local_user()));
+               if ($unseen) {
+                       $r = dba::update('item', array('unseen' => false),
+                                       array('wall' => true, 'unseen' => true, 'uid' => local_user()));
+               }
        }
 
        $o .= conversation($a, $items, 'profile', $update);