|
@@ -29,33 +29,31 @@ $tpl->assign('allEvents',$eventManager->getEventCountPerFolder());
|
|
|
$feedState = new Feed();
|
|
|
$tpl->assign('feedState',$feedState);
|
|
|
|
|
|
-$articleDisplayContent = $configurationManager->get('articleDisplayContent');
|
|
|
-$articleView = $configurationManager->get('articleView');
|
|
|
-$articlePerPages = $configurationManager->get('articlePerPages');
|
|
|
-$articleDisplayLink = $configurationManager->get('articleDisplayLink');
|
|
|
-$articleDisplayDate = $configurationManager->get('articleDisplayDate');
|
|
|
$articleDisplayAuthor = $configurationManager->get('articleDisplayAuthor');
|
|
|
-$articleDisplayHomeSort = $configurationManager->get('articleDisplayHomeSort');
|
|
|
+$articleDisplayDate = $configurationManager->get('articleDisplayDate');
|
|
|
$articleDisplayFolderSort = $configurationManager->get('articleDisplayFolderSort');
|
|
|
+$articleDisplayHomeSort = $configurationManager->get('articleDisplayHomeSort');
|
|
|
+$articleDisplayLink = $configurationManager->get('articleDisplayLink');
|
|
|
+$articleDisplayMode = $configurationManager->get('articleDisplayMode');
|
|
|
+$articlePerPages = $configurationManager->get('articlePerPages');
|
|
|
$displayOnlyUnreadFeedFolder = $configurationManager->get('displayOnlyUnreadFeedFolder');
|
|
|
if (!isset($displayOnlyUnreadFeedFolder)) $displayOnlyUnreadFeedFolder=false;
|
|
|
($displayOnlyUnreadFeedFolder=='true')?$displayOnlyUnreadFeedFolder_reverse='false':$displayOnlyUnreadFeedFolder_reverse='true';
|
|
|
$optionFeedIsVerbose = $configurationManager->get('optionFeedIsVerbose');
|
|
|
|
|
|
-$tpl->assign('articleDisplayContent',$configurationManager->get('articleDisplayContent'));
|
|
|
-$tpl->assign('articleView',$configurationManager->get('articleView'));
|
|
|
-$tpl->assign('articlePerPages',$configurationManager->get('articlePerPages'));
|
|
|
-$tpl->assign('articleDisplayLink',$configurationManager->get('articleDisplayLink'));
|
|
|
-$tpl->assign('articleDisplayDate',$configurationManager->get('articleDisplayDate'));
|
|
|
-$tpl->assign('articleDisplayAuthor',$configurationManager->get('articleDisplayAuthor'));
|
|
|
-$tpl->assign('articleDisplayHomeSort',$configurationManager->get('articleDisplayHomeSort'));
|
|
|
-$tpl->assign('articleDisplayFolderSort',$configurationManager->get('articleDisplayFolderSort'));
|
|
|
+$tpl->assign('articleDisplayAuthor',$articleDisplayAuthor);
|
|
|
+$tpl->assign('articleDisplayDate',$articleDisplayDate);
|
|
|
+$tpl->assign('articleDisplayFolderSort',$articleDisplayFolderSort);
|
|
|
+$tpl->assign('articleDisplayHomeSort',$articleDisplayHomeSort);
|
|
|
+$tpl->assign('articleDisplayLink',$articleDisplayLink);
|
|
|
+$tpl->assign('articleDisplayMode',$articleDisplayMode);
|
|
|
+$tpl->assign('articlePerPages',$articlePerPages);
|
|
|
$tpl->assign('displayOnlyUnreadFeedFolder',$displayOnlyUnreadFeedFolder);
|
|
|
$tpl->assign('displayOnlyUnreadFeedFolder_reverse',$displayOnlyUnreadFeedFolder_reverse);
|
|
|
|
|
|
$target = MYSQL_PREFIX.'event.title,'.MYSQL_PREFIX.'event.unread,'.MYSQL_PREFIX.'event.favorite,'.MYSQL_PREFIX.'event.feed,';
|
|
|
-if($articleDisplayContent && $articleView=='partial') $target .= MYSQL_PREFIX.'event.description,';
|
|
|
-if($articleDisplayContent && $articleView!='partial') $target .= MYSQL_PREFIX.'event.content,';
|
|
|
+if($articleDisplayMode=='summary') $target .= MYSQL_PREFIX.'event.description,';
|
|
|
+if($articleDisplayMode=='content') $target .= MYSQL_PREFIX.'event.content,';
|
|
|
if($articleDisplayLink) $target .= MYSQL_PREFIX.'event.link,';
|
|
|
if($articleDisplayDate) $target .= MYSQL_PREFIX.'event.pubdate,';
|
|
|
if($articleDisplayAuthor) $target .= MYSQL_PREFIX.'event.creator,';
|