X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=37edfc9780b6551c90a1e5afff625c7f2cc9312e;hb=06b234c3977609aae000c990125a48c46e523b56;hp=8da07c3160fb5a219ff2f9d3bd868d53f94da317;hpb=de2e36eeb75a364c3ebecb72af686ee7cc113345;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index 8da07c3160..37edfc9780 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -10,63 +10,63 @@
  *
  * 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); }
 
-define('NOTICES_PER_PAGE', 20);
+require_once(INSTALLDIR.'/lib/personal.php');
 
-class StreamAction extends Action {
+class StreamAction extends PersonalAction {
 
-	function handle($args) {
-		parent::handle($args);
-	}
-
-	function views_menu() {
+	function public_views_menu() {
 
-		$user = NULL;
 		$action = $this->trimmed('action');
-		$nickname = $this->trimmed('nickname');
 
-		if ($nickname) {
-			$user = User::staticGet('nickname', $nickname);
+		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');
+
+		if (count(common_config('nickname', 'featured')) > 0) {
+			common_menu_item(common_local_url('featured'), _('Featured'),
+				_('Notices from featured Users'), $action == 'featured');
 		}
 
-		common_element_start('ul', array('id' => 'nav_views'));
+		common_menu_item(common_local_url('favorited'), _('Favorited'),
+			_("Most favorited notices"), $action == 'favorited');
 
-		common_menu_item(common_local_url('all', array('nickname' =>
-													   $nickname)),
-						 _t('Personal'),
-						 (($user && $user->fullname) ? $user->fullname : $nickname) . _t(' and friends'),
-						 $action == 'all');
-		common_menu_item(common_local_url('replies', array('nickname' =>
-															  $nickname)),
-						 _t('Replies'),  
-						 _t('Replies to ') . (($user && $user->fullname) ? $user->fullname : $nickname),
-						 $action == 'replies');
-		common_menu_item(common_local_url('showstream', array('nickname' =>
-															  $nickname)),
-						 _t('Profile'),
-						 ($user && $user->fullname) ? $user->fullname : $nickname,
-						 $action == 'showstream');
 		common_element_end('ul');
+
 	}
 
-	function show_notice($notice, $replied_id=NULL) {
+	function show_notice($notice) {
 		global $config;
 		$profile = $notice->getProfile();
+		$user = common_current_user();
+
 		# XXX: RDFa
-		common_element_start('li', array('class' => 'notice_single',
+		common_element_start('li', array('class' => 'notice_single hentry',
 										  'id' => 'notice-' . $notice->id));
+		if ($user) {
+			if ($user->hasFave($notice)) {
+				common_disfavor_form($notice);
+			} else {
+				common_favor_form($notice);
+			}
+		}
+ 		common_element_start('span', 'vcard author');
 		$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',
+									'class' => 'avatar stream photo',
 									'width' => AVATAR_STREAM_SIZE,
 									'height' => AVATAR_STREAM_SIZE,
 									'alt' =>
@@ -74,26 +74,59 @@ class StreamAction extends Action {
 									$profile->nickname));
 		common_element_end('a');
 		common_element('a', array('href' => $profile->profileurl,
-								  'class' => 'nickname'),
+								  'class' => 'nickname fn url'),
 					   $profile->nickname);
+		common_element_end('span');
 		# FIXME: URL, image, video, audio
-		common_element_start('p', array('class' => 'content'));
-		common_raw(common_render_content($notice->content, $notice));
+		common_element_start('p', array('class' => 'content entry-title entry-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',
+		common_element('a', array('class' => 'permalink published',
+								  'rel' => 'bookmark',
 								  'href' => $noticeurl,
 								  'title' => common_exact_date($notice->created)),
 					   common_date_string($notice->created));
-		if ($replied_id) {
-			$replyurl = common_local_url('shownotice', array('notice' => $replied_id));
-			common_text('(');
+		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),
-						   _t(' in reply to...'));
+						   _('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');
 	}