diff options
author | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-08 14:35:01 -0400 |
---|---|---|
committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-08 14:35:01 -0400 |
commit | 0b4106fab98ab3018601b2d6d51ffb36ffcbc411 (patch) | |
tree | c770ce0d34aa4391df716759c0f47cac1a60ec4a /ajax | |
parent | 3eab4c8e901166e94953d430d3cb0f7fd5d79c39 (diff) | |
parent | 70537725190ed54a4c3cc6a1d603cf3d1582a117 (diff) |
merging merge-requests7
Diffstat (limited to 'ajax')
-rw-r--r-- | ajax/addfeedfolder.php | 17 | ||||
-rw-r--r-- | ajax/createfeed.php (renamed from ajax/newfeed.php) | 7 | ||||
-rw-r--r-- | ajax/createfolder.php | 13 | ||||
-rw-r--r-- | ajax/deletefolder.php | 4 |
4 files changed, 32 insertions, 9 deletions
diff --git a/ajax/addfeedfolder.php b/ajax/addfeedfolder.php index 89785cced..e643c861d 100644 --- a/ajax/addfeedfolder.php +++ b/ajax/addfeedfolder.php @@ -1,7 +1,22 @@ <?php - + OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('news'); +$foldermapper = new OC_News_FolderMapper(OCP\USER::getUser()); + +$allfeeds = $foldermapper->populate('All Feeds', 0); + +if ($allfeeds) { + $feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null; + if ($feedid == null) { + + } +} +else { + $feedid = 0; +} + $output = new OCP\Template("news", "part.addfeedfolder"); +$output -> assign('allfeeds', $allfeeds); $output -> printpage();
\ No newline at end of file diff --git a/ajax/newfeed.php b/ajax/createfeed.php index 2d85bcdc8..e5c0396a6 100644 --- a/ajax/newfeed.php +++ b/ajax/createfeed.php @@ -4,10 +4,10 @@ * * @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 @@ -18,10 +18,11 @@ OCP\JSON::callCheck(); $userid = OCP\USER::getUser(); $feedurl = trim($_POST['feedurl']); +$folderid = trim($_POST['folderid']); $feed = OC_News_Utils::fetch($feedurl); $feedmapper = new OC_News_FeedMapper(); -$feedid = $feedmapper->save($feed, 0); +$feedid = $feedmapper->save($feed, $folderid); $l = OC_L10N::get('news'); diff --git a/ajax/createfolder.php b/ajax/createfolder.php index cbb3d89aa..b5f624604 100644 --- a/ajax/createfolder.php +++ b/ajax/createfolder.php @@ -4,10 +4,10 @@ * * @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 @@ -18,8 +18,15 @@ OCP\JSON::callCheck(); $userid = OCP\USER::getUser(); $name = trim($_POST['name']); -$folder = new OC_News_Folder($name); +$parentid = trim($_POST['parentid']); + $foldermapper = new OC_News_FolderMapper($userid); + +if($parentid != 0) + $folder = new OC_News_Folder($name, NULL, $foldermapper->find($parentid)); +else + $folder = new OC_News_Folder($name); + $folderid = $foldermapper->save($folder); $l = OC_L10N::get('news'); diff --git a/ajax/deletefolder.php b/ajax/deletefolder.php index f11a1975f..bf975c6c3 100644 --- a/ajax/deletefolder.php +++ b/ajax/deletefolder.php @@ -4,10 +4,10 @@ * * @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 |