changes namespace to OCA\News

9 files changed, 17 insertions, 17 deletions

diff --git a/ajax/createfeed.php b/ajax/createfeed.php
index 728cf4844..896a9b1fa 100644
--- a/ajax/createfeed.php
+++ b/ajax/createfeed.php
@@ -10,7 +10,7 @@
 *
 */
 
-//register_shutdown_function("shutdown");
+register_shutdown_function("shutdown");
 
 /* handle the case of fatal error */
 function shutdown() {
@@ -35,13 +35,13 @@ $userid = OCP\USER::getUser();
 $feedurl = trim($_POST['feedurl']);
 $folderid = trim($_POST['folderid']);
 
-$feedmapper = new OC_News_FeedMapper();
+$feedmapper = new FeedMapper();
 $feedid = $feedmapper->findIdFromUrl($feedurl);
 
 $l = OC_L10N::get('news');
 
 if ($feedid === null) {
-	$feed = OC_News_Utils::fetch($feedurl);
+	$feed = OCA\News\Utils::fetch($feedurl);
 
 	if ($feed !== null) {
 	      $feedid = $feedmapper->save($feed, $folderid);
diff --git a/ajax/createfolder.php b/ajax/createfolder.php
index 09d43e966..6a6add1d1 100644
--- a/ajax/createfolder.php
+++ b/ajax/createfolder.php
@@ -20,12 +20,12 @@ $userid = OCP\USER::getUser();
 $name = trim($_POST['name']);
 $parentid = trim($_POST['parentid']);
 
-$foldermapper = new OC_News_FolderMapper($userid);
+$foldermapper = new OCA\News\FolderMapper($userid);
 
 if($parentid != 0) {
-    $folder = new OC_News_Folder($name, NULL, $foldermapper->find($parentid));
+    $folder = new OCA\News\Folder($name, NULL, $foldermapper->find($parentid));
 } else {
-    $folder = new OC_News_Folder($name);
+    $folder = new OCA\News\Folder($name);
 }
 
 $folderid = $foldermapper->save($folder);
diff --git a/ajax/deletefeed.php b/ajax/deletefeed.php
index 71574aa1b..c9c9056ca 100644
--- a/ajax/deletefeed.php
+++ b/ajax/deletefeed.php
@@ -19,7 +19,7 @@ $userid = OCP\USER::getUser();
 
 $feedid = $_POST['feedid'];
 
-$feedmapper = new OC_News_FeedMapper();
+$feedmapper = new OCA\News\FeedMapper();
 $success = $feedmapper->deleteById($feedid);
 
 $l = OC_L10N::get('news');
diff --git a/ajax/deletefolder.php b/ajax/deletefolder.php
index 65eec5bdf..a6950ed40 100644
--- a/ajax/deletefolder.php
+++ b/ajax/deletefolder.php
@@ -21,7 +21,7 @@ $folderid = trim($_POST['folderid']);
 $shownfeedid = trim($_POST['shownfeedid']);
 $part_items = false;
 
-$foldermapper = new OC_News_FolderMapper();
+$foldermapper = new OCA\News\FolderMapper();
 
 if(!$foldermapper->deleteById($folderid)) {
 	OCP\JSON::error(array('data' => array('message' => $l->t('Error removing folder.'))));
diff --git a/ajax/feedlist.php b/ajax/feedlist.php
index a1a6b7190..ce3128125 100644
--- a/ajax/feedlist.php
+++ b/ajax/feedlist.php
@@ -17,7 +17,7 @@ OCP\JSON::callCheck();
 
 $userid = OCP\USER::getUser();
 
-$feedmapper = new OC_News_FeedMapper($userid);
+$feedmapper = new OCA\News\FeedMapper($userid);
 $feeds = $feedmapper->findAll();
 
 $l = OC_L10N::get('news');
diff --git a/ajax/importopml.php b/ajax/importopml.php
index 04b745db6..7911a4db9 100644
--- a/ajax/importopml.php
+++ b/ajax/importopml.php
@@ -45,13 +45,13 @@ if ($parsed == null) {
 $data = $parsed->getData();
 
 function createFeed($feedurl, $folderid) {
-	$feedmapper = new OC_News_FeedMapper();
+	$feedmapper = new OCA\News\FeedMapper();
 	$feedid = $feedmapper->findIdFromUrl($feedurl);
 
 	$l = OC_L10N::get('news');
 
 	if ($feedid === null) {
-		$feed = OC_News_Utils::fetch($feedurl);
+		$feed = OCA\News\Utils::fetch($feedurl);
 
 		if ($feed !== null) {
 		      $feedid = $feedmapper->save($feed, $folderid);
@@ -71,7 +71,7 @@ function createFeed($feedurl, $folderid) {
 
 $countadded = 0;
 foreach($data as $collection) {
-	if ($collection instanceOf OC_News_Feed) {
+	if ($collection instanceOf Feed) {
 		$feedurl = $collection->getUrl(); 
 		$folderid = 0;
 		if (createFeed($feedurl, $folderid)) {
diff --git a/ajax/markitem.php b/ajax/markitem.php
index c42dc9350..a6efc8521 100644
--- a/ajax/markitem.php
+++ b/ajax/markitem.php
@@ -17,7 +17,7 @@ OCP\JSON::callCheck();
 
 $itemid = $_POST['itemid'];
 
-$itemmapper = new OC_News_ItemMapper();
+$itemmapper = new OCA\News\ItemMapper();
 $item = $itemmapper->find($itemid);
 $item->setRead();
 $success = $itemmapper->update($item);
diff --git a/ajax/populateroot.php b/ajax/populateroot.php
index 73b986a3e..6a258910a 100644
--- a/ajax/populateroot.php
+++ b/ajax/populateroot.php
@@ -3,7 +3,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('news');
 
-$foldermapper = new OC_News_FolderMapper(OCP\USER::getUser());
+$foldermapper = new OCA\News\FolderMapper(OCP\USER::getUser());
 $l = new OC_l10n('news');
 
 $folder = new OC_News_Folder($l->t('Everything'), 0);
diff --git a/ajax/updatefeed.php b/ajax/updatefeed.php
index fe286d3c1..f8dc2b13d 100644
--- a/ajax/updatefeed.php
+++ b/ajax/updatefeed.php
@@ -21,12 +21,12 @@ $feedid = $_POST['feedid'];
 $feedurl = $_POST['feedurl'];
 $folderid = $_POST['folderid'];
 
-$newfeed = OC_News_Utils::fetch($feedurl);
+$newfeed = OCA\News\Utils::fetch($feedurl);
 
 $newfeedid = false;
 
 if ($newfeed !== null) {
-      $feedmapper = new OC_News_FeedMapper();
+      $feedmapper = new OCA\News\FeedMapper();
       $newfeedid = $feedmapper->save($newfeed, $folderid);
 }
 
@@ -39,7 +39,7 @@ if(!$newfeedid) {
 }
 else {
 	//TODO: maybe make this more efficient by coding it into OC_News_FeedMapper->save()
-	$itemmapper = new OC_News_ItemMapper();
+	$itemmapper = new OCA\News\ItemMapper();
 	$items = $itemmapper->findAll($newfeedid);
 	$unreadcounter = 0;
 	foreach($items as $item) {