summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ajax/loadfeed.php5
-rw-r--r--controllers/controller.php2
-rw-r--r--controllers/news.controller.php8
-rw-r--r--index.php4
-rw-r--r--js/menu.js29
-rw-r--r--lib/feedtypes.php21
-rw-r--r--templates/part.feeds.php4
-rw-r--r--templates/part.listfeed.php3
-rw-r--r--templates/part.listfolder.php3
9 files changed, 49 insertions, 30 deletions
diff --git a/ajax/loadfeed.php b/ajax/loadfeed.php
index 4eaf0082d..45d6071e5 100644
--- a/ajax/loadfeed.php
+++ b/ajax/loadfeed.php
@@ -16,8 +16,9 @@ OCP\JSON::checkAppEnabled('news');
OCP\JSON::callCheck();
session_write_close();
-require_once('news/controllers/controller.php');
-require_once('news/controllers/news.controller.php');
+require_once(OC_App::getAppPath('news') . '/lib/feedtypes.php');
+require_once(OC_App::getAppPath('news') . '/controllers/controller.php');
+require_once(OC_App::getAppPath('news') . '/controllers/news.controller.php');
$userid = OCP\USER::getUser();
diff --git a/controllers/controller.php b/controllers/controller.php
index 82f60df76..73ad3ad4d 100644
--- a/controllers/controller.php
+++ b/controllers/controller.php
@@ -86,7 +86,7 @@ class Controller {
if(array_key_exists($key, $safeParams)) {
$template->assign($key, $value, false);
} else {
- $template->assign($key, $value, false);
+ $template->assign($key, $value);
}
}
diff --git a/controllers/news.controller.php b/controllers/news.controller.php
index ba3005b01..0ad4302d9 100644
--- a/controllers/news.controller.php
+++ b/controllers/news.controller.php
@@ -12,13 +12,7 @@
namespace OCA\News;
-
-class FeedType {
- const FEED = 0;
- const FOLDER = 1;
- const STARRED = 2;
- const SUBSCRIPTIONS = 3;
-}
+require_once(\OC_App::getAppPath('news') . '/lib/feedtypes.php');
class NewsController extends Controller {
diff --git a/index.php b/index.php
index f4c63d01c..57e782a37 100644
--- a/index.php
+++ b/index.php
@@ -11,8 +11,8 @@
*
*/
-require_once('controllers/controller.php');
-require_once('controllers/news.controller.php');
+require_once(OC_App::getAppPath('news') . '/controllers/controller.php');
+require_once(OC_App::getAppPath('news') . '/controllers/news.controller.php');
OCP\User::checkLoggedIn();
OCP\App::checkAppEnabled('news');
diff --git a/js/menu.js b/js/menu.js
index 90c623f6f..25f5ae135 100644
--- a/js/menu.js
+++ b/js/menu.js
@@ -135,12 +135,10 @@ var News = News || {};
* @param html the html to add
*/
Menu.prototype.addNode = function(parentId, html){
- parentId = parseInt(parentId);
+ parentId = parseInt(parentId, 10);
var $parentNode;
var $html = $(html);
- console.log($html);
-
if(parentId === 0){
$parentNode = this._$root;
} else {
@@ -172,7 +170,7 @@ var News = News || {};
*/
Menu.prototype.updateNode = function(type, id, data){
var $node = this._getNodeFromTypeAndId(type, id);
- id = parseInt(id);
+ id = parseInt(id, 10);
if(data.title !== undefined){
// prevent xss
@@ -188,10 +186,10 @@ var News = News || {};
/**
* Removes a node and its subnodes from the menu
* @param type the type (MenuNodeType)
- * @param id the id
+ * @param id the id
*/
Menu.prototype.removeNode = function(type, id){
- id = parseInt(id);
+ id = parseInt(id, 10);
var $node = this._getNodeFromTypeAndId(type, id);
$node.remove();
};
@@ -276,9 +274,9 @@ var News = News || {};
*/
Menu.prototype.getFeedIdsOfFolder = function(folderId) {
$folder = this._getNodeFromTypeAndId(MenuNodeType.Folder, folderId);
- var ids = new Array();
+ var ids = [];
$folder.children('ul').children('li').each(function(){
- ids.push(parseInt($(this).data('id')));
+ ids.push(parseInt($(this).data('id'), 10));
});
return ids;
};
@@ -546,7 +544,6 @@ var News = News || {};
Menu.prototype._edit = function(type, id){
var $node = this._getNodeFromTypeAndId(type, id);
var name = $node.children('.title').html();
- var id = $node.data('id');
$('#changefolder_dialog').find('input[type=text]').val(name);
$('#changefolder_dialog').find('input[type=hidden]').val(id);
$('#changefolder_dialog').dialog('open');
@@ -590,7 +587,7 @@ var News = News || {};
$.post(OC.filePath('news', 'ajax', 'setallitemsread.php'), data, function(jsonData) {
if(jsonData.status == 'success'){
- self._setUnreadCount(type, id, parseInt(jsonData.data.unreadCount));
+ self._setUnreadCount(type, id, parseInt(jsonData.data.unreadCount, 10));
} else {
OC.dialogs.alert(jsonData.data.message, t('news', 'Error'));
}
@@ -692,7 +689,7 @@ var News = News || {};
*/
Menu.prototype._getAndRemoveUnreadCount = function($listItem){
var $unreadCounter = $listItem.children('.unread_items_counter');
- var unreadCount = parseInt($unreadCounter.html());
+ var unreadCount = parseInt($unreadCounter.html(), 10);
$unreadCounter.remove();
return unreadCount;
};
@@ -720,7 +717,7 @@ var News = News || {};
*/
Menu.prototype._getIdAndTypeFromNode = function($listItem) {
return {
- id: parseInt($listItem.data('id')),
+ id: parseInt($listItem.data('id'), 10),
type: this._listItemToMenuNodeType($listItem)
};
};
@@ -782,7 +779,7 @@ var News = News || {};
* @param unreadCount the count of unread items
*/
Menu.prototype._setUnreadCount = function(type, id, unreadCount){
- unreadCount = parseInt(unreadCount);
+ unreadCount = parseInt(unreadCount, 10);
if(unreadCount < 0){
unreadCount = 0;
}
@@ -865,9 +862,9 @@ var News = News || {};
var $dropped = $(this);
var $dragged = $(ui.draggable);
- var feedId = parseInt($dragged.data('id'));
- var folderId = parseInt($dropped.data('id'));
- var fromFolderId = parseInt($dragged.parent().data('id'));
+ var feedId = parseInt($dragged.data('id'), 10);
+ var folderId = parseInt($dropped.data('id'), 10);
+ var fromFolderId = parseInt($dragged.parent().data('id'), 10);
// ignore when dragged to the same folder
if(folderId === fromFolderId){
diff --git a/lib/feedtypes.php b/lib/feedtypes.php
new file mode 100644
index 000000000..b4f7d6f3a
--- /dev/null
+++ b/lib/feedtypes.php
@@ -0,0 +1,21 @@
+<?php
+/**
+* ownCloud - News app
+*
+* @author Bernhard Posselt
+* Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com>
+*
+* This file is licensed under the Affero General Public License version 3 or later.
+* See the COPYING-README file
+*
+*/
+
+namespace OCA\News;
+
+
+class FeedType {
+ const FEED = 0;
+ const FOLDER = 1;
+ const STARRED = 2;
+ const SUBSCRIPTIONS = 3;
+}; \ No newline at end of file
diff --git a/templates/part.feeds.php b/templates/part.feeds.php
index 12020fa4a..77afb8d5e 100644
--- a/templates/part.feeds.php
+++ b/templates/part.feeds.php
@@ -5,7 +5,7 @@ function print_collection_list($list, $lastViewedFeedId, $lastViewedFeedType) {
foreach($list as $collection) {
if ($collection instanceOf OCA\News\Folder) {
$tmpl_folder = new OCP\Template("news", "part.listfolder");
- $tmpl_folder->assign('folder', $collection);
+ $tmpl_folder->assign('folder', $collection, false);
$tmpl_folder->assign('lastViewedFeedId', $lastViewedFeedId);
$tmpl_folder->assign('lastViewedFeedType', $lastViewedFeedType);
$tmpl_folder->printpage();
@@ -23,7 +23,7 @@ function print_collection_list($list, $lastViewedFeedId, $lastViewedFeedType) {
++$counter;
}
$tmpl_feed = new OCP\Template("news", "part.listfeed");
- $tmpl_feed->assign('feed', $collection);
+ $tmpl_feed->assign('feed', $collection, false);
$tmpl_feed->assign('unreadItemsCount',$counter);
$tmpl_feed->assign('lastViewedFeedId', $lastViewedFeedId);
$tmpl_feed->assign('lastViewedFeedType', $lastViewedFeedType);
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index aef4bb4b3..7cba9abf6 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -1,5 +1,8 @@
<?php
+require_once(\OC_App::getAppPath('news') . '/lib/feedtypes.php');
+
+
$l = new OC_l10n('news');
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 7851d54af..847c05cad 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -1,5 +1,8 @@
<?php
+require_once(\OC_App::getAppPath('news') . '/lib/feedtypes.php');
+
+
$l = new OC_l10n('news');
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 16:05:42 +0000