merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -237,7 +237,7 @@
$content_item = new contentItem( $args->module_srls_info[$module_srl]->browser_title );
$content_item->adds($oDocument->getObjectVars());
$content_item->add('original_content', $oDocument->get('content'));
$content_item->setTitle($oDocument->getTitle());
$content_item->setTitle($oDocument->getTitleText());
$content_item->setCategory( $category_lists[$module_srl][$category_srl]->title );
$content_item->setDomain( $args->module_srls_info[$module_srl]->domain );
$content_item->setContent($oDocument->getSummary($args->content_cut_size));
@ -443,6 +443,7 @@
//$content_item->setCategory($item->category);
$item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->description);
$content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
$content_item->setThumbnail($this->_getRssThumbnail($item->description));
$content_item->setLink($item->link);
$date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
$content_item->setRegdate($date);
@ -477,6 +478,7 @@
//$content_item->setCategory($item->category);
$item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->description);
$content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
$content_item->setThumbnail($this->_getRssThumbnail($item->description));
$content_item->setLink($item->link);
$date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
$content_item->setRegdate($date);
@ -544,6 +546,7 @@
}
}
$content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
$content_item->setThumbnail($this->_getRssThumbnail($item->description));
$content_item->setLink($item->link);
$date = date('YmdHis', strtotime(max($item->published,$item->updated,$item->{'dc:date'})));
$content_item->setRegdate($date);
@ -554,6 +557,28 @@
return $content_items;
}
function _getRssThumbnail($content)
{
@preg_match('@<img[^>]+src\s*=\s*(?:"(.+)"|\'(.+)\'|([^\s>(?:/>)]+))@', $content, $matches);
if($matches[1])
{
return $matches[1];
}
elseif($matches[2])
{
return $matches[2];
}
elseif($matches[3])
{
return $matches[3];
}
else
{
return NULL;
}
}
function _getTrackbackItems($args){
// Get categories
$output = executeQueryArray('widgets.content.getCategories',$obj);
@ -603,6 +628,7 @@
$widget_info->page_count = $args->page_count;
$widget_info->subject_cut_size = $args->subject_cut_size;
$widget_info->content_cut_size = $args->content_cut_size;
$widget_info->new_window = $args->new_window;
$widget_info->duration_new = $args->duration_new * 60*60;
$widget_info->thumbnail_type = $args->thumbnail_type;