]> git.mxchange.org Git - friendica.git/commitdiff
Threaded items in every page concerned. Some code cleanup.
authorDomovoy <domovoy@errlock.org>
Fri, 3 Aug 2012 19:55:17 +0000 (21:55 +0200)
committerDomovoy <domovoy@errlock.org>
Fri, 3 Aug 2012 19:55:17 +0000 (21:55 +0200)
include/conversation.php
mod/display.php
mod/item.php
mod/network.php
mod/notes.php
mod/profile.php

index dbdab54f1895370998b9a506ea8a6141c9e9ca3c..e1caa0447388f67dbd35790e878d83c5740718b0 100644 (file)
@@ -606,7 +606,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
  */
 
 if(!function_exists('conversation')) {
-function conversation(&$a, $items, $mode, $update, $preview = false, $thr_c = false) {
+function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 
        require_once('bbcode.php');
@@ -667,6 +667,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false, $thr_c = fa
        // array with html for each thread (parent+comments)
        $threads = array();
        $threadsid = -1;
+
+       $page_template = get_markup_template("conversation.tpl");
                
        if($items && count($items)) {
 
@@ -677,7 +679,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false, $thr_c = fa
 
                        //$tpl = get_markup_template('search_item.tpl');
                        $tpl = 'search_item.tpl';
-                       $thr_c = false;
 
                        foreach($items as $item) {
                                $threadsid++;
@@ -795,392 +796,23 @@ function conversation(&$a, $items, $mode, $update, $preview = false, $thr_c = fa
                else
                {
                        // Normal View
+                       $page_template = get_markup_template("threaded_conversation.tpl");
 
+                       // get all the topmost parents
+                       // this shouldn't be needed, as we should have only them in ou array
+                       // But for now, this array respects the old style, just in case
 
-                       // Threaded comments, $thr_c is used for now since we don't know what other parts of friendica uses this function
-                       // Better not rely on the new code for stuff we haven't examined yet
-                       if($thr_c) {
-                               // get all the topmost parents
-                               // this shouldn't be needed, as we should have only them in ou array
-                               // But for now, this array respects the old style, just in case
-
-                               $threads = array();
-                               foreach($items as $item) {
-                                       if($item['id'] == $item['parent']) {
-                                               $threads[] = $item;
-                                       }
+                       $threads = array();
+                       foreach($items as $item) {
+                               if($item['id'] == $item['parent']) {
+                                       $threads[] = $item;
                                }
-
-                               $threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner);
                        }
-                       else {
-
-                               // Figure out how many comments each parent has
-                               // (Comments all have gravity of 6)
-                               // Store the result in the $comments array
-
-                               $comments = array();
-                               foreach($items as $item) {
-                                       if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
-                                               if(! x($comments,$item['parent']))
-                                                       $comments[$item['parent']] = 1;
-                                               else
-                                                       $comments[$item['parent']] += 1;
-                                       } elseif(! x($comments,$item['parent'])) 
-                                               $comments[$item['parent']] = 0; // avoid notices later on
-                               }
-
-                               // map all the like/dislike activities for each parent item 
-                               // Store these in the $alike and $dlike arrays
-
-                               foreach($items as $item) {
-                                       like_puller($a,$item,$alike,'like');
-                                       like_puller($a,$item,$dlike,'dislike');
-                               }
-
-                               $comments_collapsed = false;
-                               $comments_seen = 0;
-                               $comment_lastcollapsed = false;
-                               $comment_firstcollapsed = false;
-                               $blowhard = 0;
-                               $blowhard_count = 0;
-
-
-                               foreach($items as $item) {
-
-                                       $comment = '';
-                                       $template = $tpl;
-                                       $commentww = '';
-                                       $sparkle = '';
-                                       $owner_url = $owner_photo = $owner_name = '';
-
-                                       // We've already parsed out like/dislike for special treatment. We can ignore them now
-
-                                       if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
-                                               || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-                                               && ($item['id'] != $item['parent']))
-                                               continue;
-
-                                       $toplevelpost = (($item['id'] == $item['parent']) ? true : false);
-
-
-                                       // Take care of author collapsing and comment collapsing
-                                       // (author collapsing is currently disabled)
-                                       // If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
-                                       // If there are more than two comments, squash all but the last 2.
-                               
-                                       if($toplevelpost) {
-
-                                               $item_writeable = (($item['writable'] || $item['self']) ? true : false);
-
-                                               $comments_seen = 0;
-                                               $comments_collapsed = false;
-                                               $comment_lastcollapsed  = false;
-                                               $comment_firstcollapsed = false;
-                                               
-                                               $threadsid++;
-                                               $threads[$threadsid]['id'] = $item['item_id'];
-                                               $threads[$threadsid]['private'] = $item['private'];
-                                               $threads[$threadsid]['items'] = array();
-
-                                       }
-                                       else {
-
-                                               // prevent private email reply to public conversation from leaking.
-                                               if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
-                                                               continue;
-
-                                               $comments_seen ++;
-                                               $comment_lastcollapsed  = false;
-                                               $comment_firstcollapsed = false;
-                                       }       
-
-                                       $override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-                                       // Show comment box on every writable item
-                                       $show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-
-
-                                       if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-
-                                               if (!$comments_collapsed){
-                                                       $threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
-                                                       $threads[$threadsid]['hide_text'] = t('show more');
-                                                       $comments_collapsed = true;
-                                                       $comment_firstcollapsed = true;
-                                               }
-                                       }
-                                       if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-
-                                               $comment_lastcollapsed = true;
-                                       }
-
-                                       $redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
-
-                                       $lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-                                               || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-                                               ? t('Private Message')
-                                               : false);
-
-
-                                       // Top-level wall post not written by the wall owner (wall-to-wall)
-                                       // First figure out who owns it. 
-
-                                       $osparkle = '';
-
-                                       if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
-
-                                               if($item['wall']) {
-
-                                                       // On the network page, I am the owner. On the display page it will be the profile owner.
-                                                       // This will have been stored in $a->page_contact by our calling page.
-                                                       // Put this person as the wall owner of the wall-to-wall notice.
-
-                                                       $owner_url = zrl($a->page_contact['url']);
-                                                       $owner_photo = $a->page_contact['thumb'];
-                                                       $owner_name = $a->page_contact['name'];
-                                                       $template = $wallwall;
-                                                       $commentww = 'ww';      
-                                               }
-
-                                               if((! $item['wall']) && $item['owner-link']) {
-
-                                                       $owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
-                                                       $alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
-                                                       $owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
-                                                       if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
-
-                                                               // The author url doesn't match the owner (typically the contact)
-                                                               // and also doesn't match the contact alias. 
-                                                               // The name match is a hack to catch several weird cases where URLs are 
-                                                               // all over the park. It can be tricked, but this prevents you from
-                                                               // seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-                                                               // well that it's the same Bob Smith. 
-
-                                                               // But it could be somebody else with the same name. It just isn't highly likely. 
-                                                               
-
-                                                               $owner_url = $item['owner-link'];
-                                                               $owner_photo = $item['owner-avatar'];
-                                                               $owner_name = $item['owner-name'];
-                                                               $template = $wallwall;
-                                                               $commentww = 'ww';
-                                                               // If it is our contact, use a friendly redirect link
-                                                               if((link_compare($item['owner-link'],$item['url'])) 
-                                                                       && ($item['network'] === NETWORK_DFRN)) {
-                                                                       $owner_url = $redirect_url;
-                                                                       $osparkle = ' sparkle';
-                                                               }
-                                                               else
-                                                                       $owner_url = zrl($owner_url);
-                                                       }
-                                               }
-                                       }
 
-                                       $likebuttons = '';
-                                       $shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); 
-
-                                       if($page_writeable) {
-       /*                                      if($toplevelpost) {  */
-                                                       $likebuttons = array(
-                                                               'like' => array( t("I like this \x28toggle\x29"), t("like")),
-                                                               'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
-                                                       );
-                                                       if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
-       /*                                      } */
-
-                                               $qc = $qcomment =  null;
-
-                                               if(in_array('qcomment',$a->plugins)) {
-                                                       $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
-                                                       $qcomment = (($qc) ? explode("\n",$qc) : null);
-                                               }
-
-                                               if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
-                                                       $comment = replace_macros($cmnt_tpl,array(
-                                                               '$return_path' => '', 
-                                                               '$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
-                                                               '$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
-                                                               '$id' => $item['item_id'],
-                                                               '$parent' => $item['item_id'],
-                                                               '$qcomment' => $qcomment,
-                                                               '$profile_uid' =>  $profile_owner,
-                                                               '$mylink' => $a->contact['url'],
-                                                               '$mytitle' => t('This is you'),
-                                                               '$myphoto' => $a->contact['thumb'],
-                                                               '$comment' => t('Comment'),
-                                                               '$submit' => t('Submit'),
-                                                               '$edbold' => t('Bold'),
-                                                               '$editalic' => t('Italic'),
-                                                               '$eduline' => t('Underline'),
-                                                               '$edquote' => t('Quote'),
-                                                               '$edcode' => t('Code'),
-                                                               '$edimg' => t('Image'),
-                                                               '$edurl' => t('Link'),
-                                                               '$edvideo' => t('Video'),
-                                                               '$preview' => t('Preview'),
-                                                               '$ww' => (($mode === 'network') ? $commentww : '')
-                                                       ));
-                                               }
-                                       }
-
-                                       if(local_user() && link_compare($a->contact['url'],$item['author-link']))
-                                               $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
-                                       else
-                                               $edpost = false;
-
-                                       $drop = '';
-                                       $dropping = false;
-
-                                       if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-                                               $dropping = true;
-
-                                       $drop = array(
-                                               'dropping' => $dropping,
-                                               'select' => t('Select'), 
-                                               'delete' => t('Delete'),
-                                       );
-
-                                       $star = false;
-                                       $filer = false;
-
-                                       $isstarred = "unstarred";
-                                       if ($profile_owner == local_user()) {
-                                               if($toplevelpost) {
-                                                       $isstarred = (($item['starred']) ? "starred" : "unstarred");
-
-                                                       $star = array(
-                                                               'do' => t("add star"),
-                                                               'undo' => t("remove star"),
-                                                               'toggle' => t("toggle star status"),
-                                                               'classdo' => (($item['starred']) ? "hidden" : ""),
-                                                               'classundo' => (($item['starred']) ? "" : "hidden"),
-                                                               'starred' =>  t('starred'),
-                                                               'tagger' => t("add tag"),
-                                                               'classtagger' => "",
-                                                       );
-                                               }
-                                               $filer = t("save to folder");
-                                       }
-
-
-                                       $photo = $item['photo'];
-                                       $thumb = $item['thumb'];
-
-                                       // Post was remotely authored.
-
-                                       $diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-
-                                       $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-
-                                       if($item['author-link'] && (! $item['author-name']))
-                                               $profile_name = $item['author-link'];
-
-                                       $sp = false;
-                                       $profile_link = best_link_url($item,$sp);
-                                       if($profile_link === 'mailbox')
-                                               $profile_link = '';
-                                       if($sp)
-                                               $sparkle = ' sparkle';
-                                       else
-                                               $profile_link = zrl($profile_link);                                     
-
-                                       $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-                                       if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
-                                               $profile_avatar = $a->contacts[$normalised]['thumb'];
-                                       else
-                                               $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
-
-                                       $like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
-                                       $dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
-
-                                       $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
-                                       call_hooks('render_location',$locate);
-
-                                       $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
-
-                                       $indent = (($toplevelpost) ? '' : ' comment');
-
-                                       if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-                                               $indent .= ' shiny'; 
-
-                                       // 
-                                       localize_item($item);
-
-
-                                       $tags=array();
-                                       foreach(explode(',',$item['tag']) as $tag){
-                                               $tag = trim($tag);
-                                               if ($tag!="") $tags[] = bbcode($tag);
-                                       }
-
-                                       // Build the HTML
-
-                                       $body = prepare_body($item,true);
-                                       //$tmp_item = replace_macros($template,
-                                       $tmp_item = array(
-                                               // collapse comments in template. I don't like this much...
-                                               'comment_firstcollapsed' => $firstcollapsed,
-                                               'comment_lastcollapsed' => $lastcollapsed,
-                                               // template to use to render item (wall, walltowall, search)
-                                               'template' => $template,
-                                               
-                                               'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-                                               'tags' => $tags,
-                                               'body' => template_escape($body),
-                                               'text' => strip_tags(template_escape($body)),
-                                               'id' => $item['item_id'],
-                                               'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-                                               'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner-name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
-                                               'to' => t('to'),
-                                               'wall' => t('Wall-to-Wall'),
-                                               'vwall' => t('via Wall-To-Wall:'),
-                                               'profile_url' => $profile_link,
-                                               'item_photo_menu' => item_photo_menu($item),
-                                               'name' => template_escape($profile_name),
-                                               'thumb' => $profile_avatar,
-                                               'osparkle' => $osparkle,
-                                               'sparkle' => $sparkle,
-                                               'title' => template_escape($item['title']),
-                                               'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-                                               'lock' => $lock,
-                                               'location' => template_escape($location),
-                                               'indent' => $indent,
-                                               'owner_url' => $owner_url,
-                                               'owner_photo' => $owner_photo,
-                                               'owner_name' => template_escape($owner_name),
-                                               'plink' => get_plink($item),
-                                               'edpost' => $edpost,
-                                               'isstarred' => $isstarred,
-                                               'star' => $star,
-                                               'filer' => $filer,
-                                               'drop' => $drop,
-                                               'vote' => $likebuttons,
-                                               'like' => $like,
-                                               'dislike' => $dislike,
-                                               'comment' => $comment,
-                                               'previewing' => $previewing,
-                                               'wait' => t('Please wait'),
-
-                                       );
-
-
-                                       $arr = array('item' => $item, 'output' => $tmp_item);
-                                       call_hooks('display_item', $arr);
-
-                                       $threads[$threadsid]['items'][] = $arr['output'];
-                               }
-
-                       }
+                       $threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode, $profile_owner);
                }
        }
-       else {
-               $thr_c = false;
-       }
-
-
-       $page_template = get_markup_template("conversation.tpl");
-       if($thr_c)
-               $page_template = get_markup_template("threaded_conversation.tpl");
+               
        $o = replace_macros($page_template, array(
                '$baseurl' => $a->get_baseurl($ssl_state),
                '$mode' => $mode,
index 65e1781ee1acf8359c246f5e5ae334491db2663a..afa61ef026022256304d3e846b2bb9f7b25ea594 100644 (file)
@@ -115,7 +115,7 @@ function display_content(&$a) {
 
                $items = conv_sort($r,"`commented`");
                
-               $o .= conversation($a,$items,'display', false, false, true);
+               $o .= conversation($a,$items,'display', false);
 
        }
        else {
index 012f2989b0789dd51bf56238c9723d2c7cd1f199..d5c36ef76c5ab934daa4aed6f47a9bc8af6bb4f4 100644 (file)
@@ -601,7 +601,7 @@ function item_post(&$a) {
 
        if($preview) {
                require_once('include/conversation.php');
-               $o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true);
+               $o = conversation($a,array(array_merge($contact_record,$datarray)),'search');
                logger('preview: ' . $o);
                echo json_encode(array('preview' => $o));
                killme();
index 2ca3c5b06fa8c411b04563a1963c3c0db9b1bf10..17368ab92d1f6ce4d7dd1251073b9cac89e97088 100644 (file)
@@ -687,7 +687,7 @@ function network_content(&$a, $update = 0) {
 
        $mode = (($nouveau) ? 'network-new' : 'network');
 
-       $o .= conversation($a,$items,$mode,$update, false, true);
+       $o .= conversation($a,$items,$mode,$update);
 
        if(! $update) {
                if(! get_pconfig(local_user(),'system','alt_pager')) {
index 5d70ba5cd2a4d3c5657b2712a83dbefcf8857f6d..afaa60f7016623c91d36432cd303c5b0fcd6140b 100644 (file)
@@ -133,7 +133,7 @@ function notes_content(&$a,$update = false) {
                if(count($r)) {
                        $items = conv_sort($r,"`commented`");
 
-                       $o .= conversation($a,$items,'notes',$update, false, true);
+                       $o .= conversation($a,$items,'notes',$update);
                }
        }
 
index eeacd15d543703e9ac9dd1b1c5c638d1da790a09..a3e25b76a119324c1fd5e18b379cab4f83035861 100644 (file)
@@ -310,7 +310,7 @@ function profile_content(&$a, $update = 0) {
                );
        }
 
-       $o .= conversation($a,$items,'profile',$update, false, true);
+       $o .= conversation($a,$items,'profile',$update);
 
        if(! $update) {
          if(! get_pconfig($a->profile['profile_uid'],'system','alt_pager')) {