summaryrefslogtreecommitdiffstats
path: root/ajax/selectfromcloud.php
diff options
context:
space:
mode:
authorAlessandro Cosentino <cosenal@gmail.com>2012-07-29 18:04:03 -0400
committerAlessandro Cosentino <cosenal@gmail.com>2012-07-29 18:04:03 -0400
commit1c006551e856244efcaa182d354b3d04675c2d46 (patch)
tree3e1ec81566f1d36b35b7ea1f3e7fce75272646a1 /ajax/selectfromcloud.php
parent42458fad2ff26b95b09342981579e11ae783eaf8 (diff)
select opml dialog improved
Diffstat (limited to 'ajax/selectfromcloud.php')
-rw-r--r--ajax/selectfromcloud.php27
1 files changed, 5 insertions, 22 deletions
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));
+}