select opml dialog improved

2 files changed, 53 insertions, 22 deletions

diff --git a/ajax/importopml.php b/ajax/importopml.php
new file mode 100644
index 000000000..3b66bb8e7
--- /dev/null
+++ b/ajax/importopml.php
@@ -0,0 +1,48 @@
+<?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();
+
+$l = OC_L10N::get('news');
+
+function bailOut($msg) {
+	OCP\JSON::error(array('data' => array('message' => $msg)));
+	OCP\Util::writeLog('news','ajax/importopml.php: '.$msg, OCP\Util::ERROR);
+	exit();
+}
+function debug($msg) {
+	OCP\Util::writeLog('news','ajax/importopml.php: '.$msg, OCP\Util::DEBUG);
+}
+
+if(!isset($_GET['path'])) {
+	bailOut($l->t('No file path was submitted.'));
+}
+
+require_once('news/opmlparser.php');
+
+$parser = new OPMLParser();
+/*
+$localpath = OC_Filesystem::getLocalFile($_GET['path']);
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
+
+if(!file_exists($localpath)) {
+	bailOut($l->t('File doesn\'t exist:').$localpath);
+}
+
+if (file_put_contents($tmpfname, file_get_contents($localpath))) {
+	OCP\JSON::success(array('data' => array('tmp'=>$tmpfname, 'path'=>$localpath)));
+} else {
+	bailOut(bailOut('Couldn\'t save temporary image: '.$tmpfname));
+}*/
diff --git a/ajax/selectfromcloud.php b/ajax/selectfromcloud.php
index 6b8289d0d..2ea40e377 100644
--- a/ajax/selectfromcloud.php
+++ b/ajax/selectfromcloud.php
@@ -36,26 +36,9 @@ $tmpfname = tempnam(get_temp_dir(), "occOrig");
 if(!file_exists($localpath)) {
 	bailOut($l->t('File doesn\'t exist:').$localpath);
 }
-file_put_contents($tmpfname, file_get_contents($localpath));
 
-OCP\JSON::success(array('data' => array('tmp'=>$tmpfname)));
-
-// $image = new OC_Image();
-// if(!$image) {
-// 	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
-// }
-// if(!$image->loadFromFile($tmpfname)) {
-// 	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
-// }
-// if($image->width() > 400 || $image->height() > 400) {
-// 	$image->resize(400); // Prettier resizing than with browser and saves bandwidth.
-// }
-// if(!$image->fixOrientation()) { // No fatal error so we don't bail out.
-// 	debug('Couldn\'t save correct image orientation: '.$tmpfname);
-// }
-// if($image->save($tmpfname)) {
-// 	OCP\JSON::success(array('data' => array('tmp'=>$tmpfname)));
-// 	exit();
-// } else {
-// 	bailOut('Couldn\'t save temporary image: '.$tmpfname);
-// }
+if (file_put_contents($tmpfname, file_get_contents($localpath))) {
+	OCP\JSON::success(array('data' => array('tmp'=>$tmpfname, 'path'=>$localpath)));
+} else {
+	bailOut(bailOut('Couldn\'t save temporary image: '.$tmpfname));
+}