embr

[embrj/master.git] / favor.php

diff --git a/favor.php b/favor.php
index 50ea4e7..a0d16ed 100644 (file)
--- a/favor.php
+++ b/favor.php
@@ -5,7 +5,7 @@
        if (!loginStatus()) header('location: login.php');\r
 ?>\r
 \r
-<script type="text/javascript" src="js/favor.js"></script>\r
+<script src="js/btns.js"></script>\r
 \r
 <div id="statuses" class="column round-left">\r
 \r
@@ -21,42 +21,20 @@
 \r
        $statuses = $t->getFavorites($p);\r
        if ($statuses === false) {\r
-               header('location: error.php');\r
+               header('location: error.php');exit();\r
        } \r
        $empty = count($statuses) == 0? true: false;\r
        if ($empty) {\r
                echo "<div id=\"empty\">No tweet to display.</div>";\r
        } else {\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\" href=\"a_reply.php?id=$status->id\">回复</a>\r
-                               <a class=\"rt_btn\" 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=\"delete_btn\" href=\"a_del.php?id=$status->id&t=f\">删除</a></span><span class=\"status_info\">\r
-                               ";\r
-                       if ($status->in_reply_to_status_id) $output .= "<span class=\"in_reply_to\"> <a href=\"/status.php?id=$status->in_reply_to_status_id \">in reply to $status->in_reply_to_screen_name</a></span>";\r
-                       $output .= "                            \r
-                               <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
@@ -68,16 +46,10 @@
 \r
                echo $output;\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