From 7b009a981a087b2dcf70633dee6f3ed966a7a049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=BE?= <sahala_2007@126.com>
Date: Thu, 18 Oct 2012 14:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lastRSS.php | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/lastRSS.php b/lastRSS.php
index 4c5d66b..c65a0eb 100644
--- a/lastRSS.php
+++ b/lastRSS.php
@@ -24,17 +24,12 @@ $rssparser->textinputtags = array ();
 $DB = MySql::getInstance();
 
 function urlShort($url){
-	global $lastRSS_urlshort_domain;
-	if (!extension_loaded('curl')) {
+	global $rssparser, $lastRSS_urlshort_domain;
+	$api = 'http://json.so/api/short.htm?d='.$lastRSS_urlshort_domain.'&u='.$url;
+	$results = $rssparser->getRemoteFile($api);
+	if (empty($results)) {
 		return $url;
 	} else {
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_URL, 'http://json.so/api/short.htm?d='.$lastRSS_urlshort_domain.'&u='.$url);
-		curl_setopt($ch, CURLOPT_TIMEOUT, 5);
-		curl_setopt($ch, CURLOPT_USERAGENT, 'PHP Curl/xiaosong.org 1.0 BETA');
-		$results = curl_exec($ch);
-		curl_close($ch);
 		$results = json_decode($results, true);
 		if(isset($results['state']) && $results['state'] == 'success'){
 			return $results['msg'];
@@ -85,7 +80,7 @@ function deleteFeed($id){
 	$cache_file = EMLOG_ROOT.'/content/cache/rsscache_'.md5($rssurl);
 	$DB->query("DELETE FROM ".DB_PREFIX."rssfeeds WHERE id = $id");
 	$DB->query("DELETE FROM ".DB_PREFIX."rsslogs WHERE rssid = $id");
-	@unlink($cache_file);
+	unlink($cache_file);
 }
 function updateFeed($id, $url, $title){
 	global $DB;
@@ -120,15 +115,11 @@ function updateLogs(){
 }
 function displayLog(){
 	global $DB, $lastRSS_item_num;
-	$sql = "SELECT rssid,log FROM ".DB_PREFIX."rsslogs ORDER BY id DESC limit $lastRSS_item_num";
+	$sql = "SELECT ".DB_PREFIX."rsslogs.log,".DB_PREFIX."rssfeeds.title FROM ".DB_PREFIX."rsslogs INNER JOIN ".DB_PREFIX."rssfeeds ON ".DB_PREFIX."rsslogs.rssid = ".DB_PREFIX."rssfeeds.id ORDER BY ".DB_PREFIX."rsslogs.id DESC limit $lastRSS_item_num";
 	$result = $DB->query($sql);
 	$output = '';
 	while ($row = $DB->fetch_array($result)) {
-		$rssid = $row['rssid'];
-		$log = $row['log'];
-		$_sql = "SELECT title FROM ".DB_PREFIX."rssfeeds WHERE id = $rssid";
-		$title = $DB->fetch_array($DB->query($_sql));
-		$output .= '<li>'.$log.' 来自 《'.$title["title"].'》</li>';
+		$output .= '<li>'.$row['log'].' 来自 《'.$row["title"].'》</li>';
 	}
 	$output = empty($output) ? '<li>暂无Rss文章 ^_^' : $output;
 	$output = '<ul class="rsslogs">'.$output.'</ul>';