diff options
| author | Gregor Tätzner <gregor@freenet.de> | 2012-08-08 14:29:28 +0200 |
|---|---|---|
| committer | Gregor Tätzner <gregor@freenet.de> | 2012-08-08 14:29:28 +0200 |
| commit | 8dc1c6c6ea83f4ffe5fc0c290e317cd9bacb6d6f (patch) | |
| tree | 28f3e946e5ba56131d7ed22b39fa6720fc7357d8 /ajax | |
| parent | dea84256ab39c1d6cd8338c2c8f6247bc817e9f6 (diff) | |
highlight currently shown feed and load feeds always in ajax style
Diffstat (limited to 'ajax')
| -rw-r--r-- | ajax/createfeed.php | 7 | ||||
| -rw-r--r-- | ajax/loadfeed.php | 30 |
2 files changed, 31 insertions, 6 deletions
diff --git a/ajax/createfeed.php b/ajax/createfeed.php index 884958b08..627b0e36b 100644 --- a/ajax/createfeed.php +++ b/ajax/createfeed.php @@ -17,7 +17,7 @@ function shutdown() { $l = OC_L10N::get('news'); $error = error_get_last(); if($error['type'] & (E_ERROR | E_COMPILE_ERROR | E_CORE_ERROR)) { //all fatal errors - if (strpos($error['message'], 'get_uri')) { + if (strpos($error['message'], 'get_uri')) { //handle a fatal error caused by a SimplePie bug (https://github.com/simplepie/simplepie/issues/214) OCP\Util::writeLog('news','ajax/createfeed.php: Fatal error:' . $error['message'] , OCP\Util::ERROR); exit(); @@ -67,13 +67,8 @@ $tmpl_newfeed = new OCP\Template("news", "part.items.new"); $tmpl_newfeed->assign('title', $feed->getTitle()); $part_newfeed = $tmpl_newfeed->fetchPage(); -$tmpl_items = new OCP\Template("news", "part.items"); -$tmpl_items->assign('feedid', $feedid); -$part_items = $tmpl_items->fetchPage(); - OCP\JSON::success(array('data' => array( 'message' => $l->t('Feed added!'), 'feedid' => $feedid, 'listfeed' => $listfeed, - 'part_items' => $part_items, 'part_newfeed' => $part_newfeed ))); diff --git a/ajax/loadfeed.php b/ajax/loadfeed.php new file mode 100644 index 000000000..40c873e2b --- /dev/null +++ b/ajax/loadfeed.php @@ -0,0 +1,30 @@ +<?php +/** +* ownCloud - News app +* +* @author Alessandro Cosentino +* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com> +* +* This file is licensed under the Affero General Public License version 3 or later. +* See the COPYING-README file +* +*/ + +// Check if we are a user +OCP\JSON::checkLoggedIn(); +OCP\JSON::checkAppEnabled('news'); +OCP\JSON::callCheck(); + +$userid = OCP\USER::getUser(); + +$feedid = trim($_POST['feedid']); + +$l = OC_L10N::get('news'); + +$tmpl_items = new OCP\Template("news", "part.items"); +$tmpl_items->assign('feedid', $feedid); +$part_items = $tmpl_items->fetchPage(); + +OCP\JSON::success(array('data' => array( 'message' => $l->t('Feed loaded!'), + 'part_items' => $part_items ))); + |