embr

[embrj/master.git] / list.php

diff --git a/list.php b/list.php
index 28090b0..d1df369 100644 (file)
--- a/list.php
+++ b/list.php
@@ -5,7 +5,7 @@
        if (!loginStatus()) header('location: login.php');\r
 ?>\r
 \r
-<script type="text/javascript" src="js/list.js"></script>\r
+<script src="js/list.js"></script>\r
 \r
 <div id="statuses">\r
        <?php \r
@@ -20,7 +20,7 @@
                $statuses = $t->listStatus($id, $p);\r
                $listInfo = $t->listInfo($id);\r
                if ($statuses === false) {\r
-                       header('location: error.php');\r
+                       header('location: error.php');exit();\r
                } \r
                \r
                $isFollower = false;\r
@@ -37,9 +37,9 @@
                <div id="info_name"><?php echo $id?></div>\r
                <div id="info_relation">\r
                <?php if ($isFollower) {?>\r
-                       <a id="list_block_btn" class="info_btn_hover" href="a_list.php?action=destory&id=">Unfollow</a>\r
+                       <a id="list_block_btn" class="info_btn_hover" href="#">Unfollow</a>\r
                <?php } else { ?>\r
-                       <a id="list_follow_btn" class="info_btn" href="a_list.php?action=create&id=">Follow</a>\r
+                       <a id="list_follow_btn" class="info_btn" href="#">Follow</a>\r
                <?php } ?>\r
                        <a id="list_send_btn" class="info_btn" href="#">Tweet</a>\r
                        <a class="info_btn" href="list_followers.php?id=<?php echo $id?>">Followers (<?php echo $listInfo->subscriber_count?>)</a>\r
@@ -51,35 +51,13 @@
        <?php \r
                \r
                        $output = '<ol class="timeline" id="allTimeline">';\r
-                       \r
+                       include('lib/timeline_format.php');\r
                        foreach ($statuses as $status) {\r
-                               $user = $status->user;\r
-                               $date = formatDate($status->created_at);\r
-                               $text = formatText($status->text);\r
-                               \r
-                               $output .= "\r
-                                       <li>\r
-                                               <span class=\"status_author\">\r
-                                                       <a href=\"user.php?id=$user->screen_name\" target=\"_blank\"><img src=\"".getAvatar($user->profile_image_url)."\" title=\"$user->screen_name\" /></a>\r
-                                               </span>\r
-                                               <span class=\"status_body\">\r
-                                                       <span class=\"status_id\">$status->id</span>\r
-                                                       <span class=\"status_word\"><a class=\"user_name\" href=\"user.php?id=$user->screen_name\">$user->screen_name</a> $text </span>";\r
-                               if ($shorturl = unshortUrl($text)) $output .= "<span class=\"unshorturl\"><p>URL</p><a href=\"$shorturl\" target=\"_blank\" rel=\"noreferrer\">$shorturl</a></span>";\r
-                               $output .= "<span class=\"actions\">\r
-                                                       <a class=\"replie_btn\" title=\"Reply\" href=\"a_reply.php?id=$status->id\">回复</a>\r
-                                                       <a class=\"rt_btn\" title=\"Retweet\" href=\"a_rt.php?id=$status->id\">回推</a>\r
-                                                       <a class=\"retw_btn\" title=\"New Retweet\" href=\"javascript:void(0);\">New Retweet</a>\r
-                                                       <a class=\"favor_btn\" title=\"Favorite\" href=\"a_favor.php?id=$status->id\">收藏</a>";\r
-                               if ($user->screen_name == $t->username) $output .= "<a class=\"delete_btn\" title=\"Delete\" href=\"a_del.php?id=$status->id&t=s\">删除</a>";\r
-                               $output .= "</span><span class=\"status_info\">";\r
-                               if ($status->in_reply_to_status_id) $output .= "<span class=\"in_reply_to\"> <a class=\"ajax_reply\" href=\"ajax/status.php?id=$status->in_reply_to_status_id&uid=$user->id \">in reply to $status->in_reply_to_screen_name</a></span>";\r
-                               $output .= "<span class=\"source\">from $status->source</span>\r
-                                                       <span class=\"date\"><a href=\"status.php?id=$status->id\" target=\"_blank\">$date</a></span>\r
-                                                   </span>\r
-                                               </span>\r
-                                       </li>\r
-                               ";\r
+                               if (isset($status->retweeted_status)) {\r
+                                       $output .= format_retweet($status);\r
+                               } else { \r
+                                       $output .= format_timeline($status,$t->username);\r
+                               }\r
                        }\r
                        \r
                        $output .= "</ol><div id=\"pagination\">";\r
@@ -91,16 +69,11 @@
                        \r
                        echo $output;\r
                }\r
-               \r
-               \r
-               \r
+\r
        ?>\r
 </div>\r
 \r
 <?php \r
        include ('inc/sidebar.php');\r
-?>\r
-\r
-<?php \r
        include ('inc/footer.php');\r
 ?>\r