From 80de23d08b8021709adceac626bbac5aab45d86a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 5 Jun 2012 23:58:46 +0200
Subject: [PATCH] Contacts: Removed temp dir cleanup after using OC_Cache.
---
apps/contacts/ajax/cleanupphoto.php | 37 -----------------------------
apps/contacts/js/contacts.js | 17 +------------
2 files changed, 1 insertion(+), 53 deletions(-)
delete mode 100644 apps/contacts/ajax/cleanupphoto.php
diff --git a/apps/contacts/ajax/cleanupphoto.php b/apps/contacts/ajax/cleanupphoto.php
deleted file mode 100644
index 2bb4bd6584..0000000000
--- a/apps/contacts/ajax/cleanupphoto.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2012 Thomas Tanghus <thomas@tanghus.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$tmp_path = isset($_POST['tmp_path']) ? $_POST['tmp_path'] : '';
-
-// give some time to save the photo
-sleep(5);
-
-if($tmp_path != '' && file_exists($tmp_path) && !is_dir($tmp_path) && dirname($tmp_path)==get_temp_dir()) {
- unlink($tmp_path);
- OCP\JSON::success();
- exit();
-} else {
- error_log('Couldn\'t find: '.$tmp_path);
- OCP\JSON::error();
-}
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 8b9a80c952..458c9ab8fc 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -135,13 +135,7 @@ Contacts={
/* Initialize the photo edit dialog */
$('#edit_photo_dialog').dialog({
- autoOpen: false,
- modal: true,
- height: 'auto', width: 'auto',
- beforeClose: function(event, ui) {
- Contacts.UI.Card.cleanupPhoto(this);
- return true;
- }
+ autoOpen: false, modal: true, height: 'auto', width: 'auto'
});
$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
{
@@ -1199,15 +1193,6 @@ Contacts={
});
Contacts.UI.Contacts.refreshThumbnail(this.id);
},
- cleanupPhoto:function(){
- var tmp_path = $('#cropform').find('#tmp_path').val();
- console.log('Trying to remove: ' + tmp_path);
- $.post(OC.filePath('contacts', 'ajax', 'cleanupphoto.php'), {tmp_path: tmp_path}, function(data){
- if(data.status != 'success'){
- console.log('Error deleting ' + tmp_path);
- }
- });
- },
addMail:function() {
//alert('addMail');
$('#emaillist li.template:first-child').clone(true).appendTo($('#emaillist')).show().find('a .tip').tipsy();
--
GitLab