dont use mock folders, use html delivered from server; deleted unecessary templates and ajax files

1 files changed, 9 insertions, 5 deletions

diff --git a/index.php b/index.php
index 3f7839c76..b7e688ba2 100644
--- a/index.php
+++ b/index.php
@@ -40,25 +40,29 @@ if ($allfeeds) {
 	$feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null;
 	if ($feedid == null) {
 		$feedmapper = new OCA\News\FeedMapper(OCP\USER::getUser($userid));
-		if(OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed') == null){
+		$lastViewedId = OCP\Config::getUserValue($userid, 'news', 'lastViewedFeed');
+		$lastViewedType = OCP\Config::getUserValue($userid, 'news', 'lastViewedFeedType');
+		if( $lastViewedId == null || $lastViewedType == null){
 		    $feedid =  $feedmapper->mostRecent();
 		} else {
-		    $feedid = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed');
+		    $feedid = $lastViewedId;
+		    $feedtype = $lastViewedType;
 		    // check if feed exists in table
 		    if($feedmapper->findById($feedid) === null){
-			$feedid =  $feedmapper->mostRecent();
+				$feedid =  $feedmapper->mostRecent();
 		    }
 		}
 	}
-}
-else {
+} else {
 	$feedid = 0;
+	$feedtype = 0;
 }
 
 $tmpl = new OCP\Template( 'news', 'main', 'user' );
 $tmpl->assign('allfeeds', $allfeeds);
 $tmpl->assign('folderforest', $folderforest);
 $tmpl->assign('feedid', $feedid);
+$tmpl->assign('feedtype', $feedtype);
 $tmpl->printPage();
 
 ?>