summaryrefslogtreecommitdiffstats
path: root/controllers
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-10-14 21:15:16 +0200
committerBart Visscher <bartv@thisnet.nl>2012-10-14 21:15:47 +0200
commit1e37bc139bb28e6fe9b0dd0d477e2dbef5a2cab9 (patch)
treefa56b07316b914f39e2dd02b70a61b05b016b967 /controllers
parent365cecd2ec1bf2552ae0d8e064680ed36b0bf04e (diff)
Whitespace cleanup
Diffstat (limited to 'controllers')
-rw-r--r--controllers/controller.php18
-rw-r--r--controllers/news.controller.php16
2 files changed, 15 insertions, 19 deletions
diff --git a/controllers/controller.php b/controllers/controller.php
index 73ad3ad4d..032cb45ee 100644
--- a/controllers/controller.php
+++ b/controllers/controller.php
@@ -16,8 +16,8 @@ class Controller {
protected $userId;
protected $trans;
-
-
+
+
public function __construct(){
$this->userId = \OCP\USER::getUser();
$this->trans = \OC_L10N::get('news');
@@ -51,7 +51,7 @@ class Controller {
* @param $value the value that you want to store
*/
protected function setUserValue($key, $value){
- \OCP\Config::setUserValue($this->userId, 'news', $key, $value);
+ \OCP\Config::setUserValue($this->userId, 'news', $key, $value);
}
@@ -73,22 +73,22 @@ class Controller {
* @param $fullPage if true, it will render a full page, otherwise only a part
* defaults to true
*/
- protected function render($template, $arguments=array(), $safeParams=array(),
+ protected function render($template, $arguments=array(), $safeParams=array(),
$fullPage=true){
-
+
if($fullPage){
$template = new \OCP\Template('news', $template, 'user');
} else {
$template = new \OCP\Template('news', $template);
}
-
+
foreach($arguments as $key => $value){
if(array_key_exists($key, $safeParams)) {
- $template->assign($key, $value, false);
+ $template->assign($key, $value, false);
} else {
$template->assign($key, $value);
}
-
+
}
$template->assign('userId', $this->userId);
@@ -98,5 +98,3 @@ class Controller {
}
-
-?> \ No newline at end of file
diff --git a/controllers/news.controller.php b/controllers/news.controller.php
index 14bef126e..4f498b944 100644
--- a/controllers/news.controller.php
+++ b/controllers/news.controller.php
@@ -57,7 +57,7 @@ class NewsController extends Controller {
// always show the last viewed feed on reload
$lastViewedFeedId = (int)$this->getUserValue('lastViewedFeed');
$lastViewedFeedType = (int)$this->getUserValue('lastViewedFeedType');
- $showAll = $this->getUserValue('showAll');
+ $showAll = $this->getUserValue('showAll');
if( $lastViewedFeedId === null || $lastViewedFeedType === null) {
$lastViewedFeedId = $feedMapper->mostRecent();
@@ -66,7 +66,7 @@ class NewsController extends Controller {
if( (
$lastViewedFeedType === FeedType::FEED &&
$feedMapper->findById($lastViewedFeedId) === null
- ) ||
+ ) ||
(
$lastViewedFeedType === FeedType::FOLDER &&
$folderMapper->findById($lastViewedFeedId) === null
@@ -106,14 +106,14 @@ class NewsController extends Controller {
$itemMapper = new ItemMapper($this->userId);
// starred or subscriptions
- if ($feedType === FeedType::STARRED || $feedType === FeedType::SUBSCRIPTIONS) {
+ if ($feedType === FeedType::STARRED || $feedType === FeedType::SUBSCRIPTIONS) {
if($feedType === FeedType::STARRED){
$statusFlag = StatusFlag::IMPORTANT;
}
if($feedType === FeedType::SUBSCRIPTIONS){
- $statusFlag = StatusFlag::UNREAD;
+ $statusFlag = StatusFlag::UNREAD;
}
$items = $itemMapper->findEveryItemByStatus($statusFlag);
@@ -125,7 +125,7 @@ class NewsController extends Controller {
$items = $itemMapper->findByFeedId($feedId);
} else {
$items = $itemMapper->findAllStatus($feedId, StatusFlag::UNREAD);
- }
+ }
// folder
} elseif ($feedType === FeedType::FOLDER){
@@ -136,7 +136,7 @@ class NewsController extends Controller {
if($showAll) {
$items = array_merge($items, $itemMapper->findByFeedId($feed->getId()));
} else {
- $items = array_merge($items,
+ $items = array_merge($items,
$itemMapper->findAllStatus($feed->getId(), StatusFlag::UNREAD));
}
}
@@ -163,7 +163,7 @@ class NewsController extends Controller {
case FeedType::SUBSCRIPTIONS:
$unreadCount = $itemMapper->countEveryItemByStatus(StatusFlag::UNREAD);
break;
-
+
case FeedType::FOLDER:
$feedMapper = new FeedMapper($this->userId);
$feeds = $feedMapper->findByFolderId($feedId);
@@ -182,5 +182,3 @@ class NewsController extends Controller {
}
-
-?> \ No newline at end of file