This commit is contained in:
2012-10-18 14:20:56 +08:00
parent 5849e9cdd0
commit 7b009a981a

View File

@@ -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>';