X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=0cb9e0bf4f749002ca8e8003ee50ec7980f90168;hb=1df3eeba861f9f5b7be7fd1ad4298f614a6cbee5;hp=b19bf7c0faeaa60214b2b4115dfd203e6deb4856;hpb=727c4060a590d12595a0378e5d83b57423d920f5;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index b19bf7c0fa..0cb9e0bf4f 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -10,122 +10,23 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.	 If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/personal.php');
-
-class StreamAction extends PersonalAction {
-
-
-	function public_views_menu() {
-
-		$action = $this->trimmed('action');
-
-		common_debug("action = $action");
-
-		common_element_start('ul', array('id' => 'nav_views'));
-
-		common_menu_item(common_local_url('public'), _('Public'),
-			_('Public timeline'), $action == 'public');
-
-		common_menu_item(common_local_url('tag'), _('Recent tags'),
-			_('Recent tags'), $action == 'tag');
-
-		common_menu_item(common_local_url('featured'), _('Featured'),
-			_('Notices from featured Users'), $action == 'featured');
-
-		common_menu_item(common_local_url('favorited'), _('Favorited'),
-			_("Most favorited notices"), $action == 'favorited');
-
-		common_element_end('ul');
-
-	}
-
-	function show_notice($notice) {
-		global $config;
-		$profile = $notice->getProfile();
-		$user = common_current_user();
-
-		# XXX: RDFa
-		common_element_start('li', array('class' => 'notice_single',
-										  'id' => 'notice-' . $notice->id));
-		if ($user) {
-			if ($user->hasFave($notice)) {
-				common_disfavor_form($notice);
-			} else {
-				common_favor_form($notice);
-			}
-		}
-		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-		common_element_start('a', array('href' => $profile->profileurl));
-		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
-									'class' => 'avatar stream',
-									'width' => AVATAR_STREAM_SIZE,
-									'height' => AVATAR_STREAM_SIZE,
-									'alt' =>
-									($profile->fullname) ? $profile->fullname :
-									$profile->nickname));
-		common_element_end('a');
-		common_element('a', array('href' => $profile->profileurl,
-								  'class' => 'nickname'),
-					   $profile->nickname);
-		# FIXME: URL, image, video, audio
-		common_element_start('p', array('class' => 'content'));
-		if ($notice->rendered) {
-			common_raw($notice->rendered);
-		} else {
-			# XXX: may be some uncooked notices in the DB,
-			# we cook them right now. This should probably disappear in future
-			# versions (>> 0.4.x)
-			common_raw(common_render_content($notice->content, $notice));
-		}
-		common_element_end('p');
-		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-		# XXX: we need to figure this out better. Is this right?
-		if (strcmp($notice->uri, $noticeurl) != 0 && preg_match('/^http/', $notice->uri)) {
-			$noticeurl = $notice->uri;
-		}
-		common_element_start('p', 'time');
-		common_element('a', array('class' => 'permalink',
-								  'href' => $noticeurl,
-								  'title' => common_exact_date($notice->created)),
-					   common_date_string($notice->created));
-		if ($notice->source) {
-			common_text(_(' from '));
-			$this->source_link($notice->source);
-		}
-		if ($notice->reply_to) {
-			$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
-			common_text(' (');
-			common_element('a', array('class' => 'inreplyto',
-									  'href' => $replyurl),
-						   _('in reply to...'));
-			common_text(')');
-		}
-		common_element_start('a',
-							 array('href' => common_local_url('newnotice',
-															  array('replyto' => $profile->nickname)),
-								   'onclick' => 'return doreply("'.$profile->nickname.'", '.$notice->id.');',
-								   'title' => _('reply'),
-								   'class' => 'replybutton'));
-		common_raw('&rarr;');
-		common_element_end('a');
-		if ($user && $notice->profile_id == $user->id) {
-			$deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
-			common_element_start('a', array('class' => 'deletenotice',
-											'href' => $deleteurl,
-											'title' => _('delete')));
-			common_raw('&times;');
-			common_element_end('a');
-		}
-		common_element_end('p');
-		common_element_end('li');
-	}
+require_once(INSTALLDIR.'/lib/noticelist.php');
+
+class StreamAction extends PersonalAction
+{
+    function show_notice_list($notice)
+    {
+        $nl = new NoticeList($notice);
+        return $nl->show();
+    }
 }