diff options
| -rw-r--r-- | ajax/selectfromcloud.php | 61 | ||||
| -rw-r--r-- | js/news.js | 12 |
2 files changed, 68 insertions, 5 deletions
diff --git a/ajax/selectfromcloud.php b/ajax/selectfromcloud.php new file mode 100644 index 000000000..6b8289d0d --- /dev/null +++ b/ajax/selectfromcloud.php @@ -0,0 +1,61 @@ +<?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/selectfromcloud.php: '.$msg, OCP\Util::ERROR); + exit(); +} +function debug($msg) { + OCP\Util::writeLog('news','ajax/selectfromcloud.php: '.$msg, OCP\Util::DEBUG); +} + +if(!isset($_GET['path'])) { + bailOut($l->t('No file path was submitted.')); +} + +$localpath = OC_Filesystem::getLocalFile($_GET['path']); +$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); +// } diff --git a/js/news.js b/js/news.js index ba55b963d..541d4e694 100644 --- a/js/news.js +++ b/js/news.js @@ -29,6 +29,10 @@ News={ if(jsondata.status != 'error'){ if(dialogtype == '#import_dialog') { $('#cloudbtn').click(function() { + /* + * it needs to be filtered by MIME type, but there are too many MIME types corresponding to opml + * and filepicker doesn't support multiple MIME types filter. + */ OC.dialogs.filepicker(t('news', 'Select file'), News.UI.cloudFileSelected, false, '', true); }); } @@ -47,14 +51,12 @@ News={ return false; }, cloudFileSelected:function(path){ - $.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':Contacts.UI.Card.id},function(jsondata){ + $.getJSON(OC.filePath('news', 'ajax', 'selectfromcloud.php'),{'path':path},function(jsondata){ if(jsondata.status == 'success'){ - //alert(jsondata.data.page); - Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp) - $('#edit_photo_dialog_img').html(jsondata.data.page); + alert(jsondata.data.page); } else{ - OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error')); + OC.dialogs.alert(jsondata.data.message, t('news', 'Error')); } }); } |