summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2012-05-30 14:14:32 +0200
committerFrank Karlitschek <frank@owncloud.org>2012-05-30 14:14:32 +0200
commit22a04d8e938d6f2660e6c88cf954d638fc4321eb (patch)
tree30d24a2dc52cc747a8cbfe4fa14c020e4aefcfe9
parentdbcd26be684461daac7c406cc3f52a2a810d1126 (diff)
downloadnextcloud-server-22a04d8e938d6f2660e6c88cf954d638fc4321eb.tar.gz
nextcloud-server-22a04d8e938d6f2660e6c88cf954d638fc4321eb.zip
don´t hardcode /tmp
-rw-r--r--apps/contacts/ajax/currentphoto.php2
-rw-r--r--apps/contacts/ajax/oc_photo.php2
-rw-r--r--apps/contacts/ajax/savecrop.php2
-rw-r--r--apps/contacts/ajax/uploadimport.php2
-rw-r--r--apps/contacts/ajax/uploadphoto.php4
-rw-r--r--lib/helper.php2
-rw-r--r--lib/migrate.php2
7 files changed, 8 insertions, 8 deletions
diff --git a/apps/contacts/ajax/currentphoto.php b/apps/contacts/ajax/currentphoto.php
index d8afa060b1e..d0654b17d64 100644
--- a/apps/contacts/ajax/currentphoto.php
+++ b/apps/contacts/ajax/currentphoto.php
@@ -40,7 +40,7 @@ if (!isset($_GET['id'])) {
bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
}
-$tmpfname = tempnam("/tmp", "occOrig");
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
$contact = OC_Contacts_App::getContactVCard($_GET['id']);
$image = new OC_Image();
if(!$image) {
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
index 085d2710f5f..184217f2b72 100644
--- a/apps/contacts/ajax/oc_photo.php
+++ b/apps/contacts/ajax/oc_photo.php
@@ -42,7 +42,7 @@ if(!isset($_GET['path'])) {
}
$localpath = OC_Filesystem::getLocalFile($_GET['path']);
-$tmpfname = tempnam("/tmp", "occOrig");
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
if(!file_exists($localpath)) {
bailOut(OC_Contacts_App::$l10n->t('File doesn\'t exist:').$localpath);
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index cd470307125..fe9e5c5b991 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -71,7 +71,7 @@ if(file_exists($tmp_path)) {
OCP\Util::writeLog('contacts','savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h, OCP\Util::DEBUG);
if($image->crop($x1, $y1, $w, $h)) {
if(($image->width() <= 200 && $image->height() <= 200) || $image->resize(200)) {
- $tmpfname = tempnam("/tmp", "occCropped"); // create a new file because of caching issues.
+ $tmpfname = tempnam(get_temp_dir(), "occCropped"); // create a new file because of caching issues.
if($image->save($tmpfname)) {
unlink($tmp_path);
$card = OC_Contacts_App::getContactVCard($id);
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
index f4a13e0a4bb..b11f380fa8a 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -67,7 +67,7 @@ if($error !== UPLOAD_ERR_OK) {
}
$file=$_FILES['importfile'];
-$tmpfname = tempnam("/tmp", "occOrig");
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
if(file_exists($file['tmp_name'])) {
if($view->file_put_contents('/'.$tmpfile, file_get_contents($file['tmp_name']))) {
debug($fn.' uploaded');
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 99015e2d502..dca8ede6d60 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -46,7 +46,7 @@ if ($fn) {
exit();
}
$id = $_GET['id'];
- $tmpfname = tempnam('/tmp', 'occOrig');
+ $tmpfname = tempnam(get_temp_dir(), 'occOrig');
file_put_contents($tmpfname, file_get_contents('php://input'));
debug($tmpfname.' uploaded');
$image = new OC_Image();
@@ -93,7 +93,7 @@ if($error !== UPLOAD_ERR_OK) {
}
$file=$_FILES['imagefile'];
-$tmpfname = tempnam("/tmp", "occOrig");
+$tmpfname = tempnam(get_temp_dir(), "occOrig");
if(file_exists($file['tmp_name'])) {
$image = new OC_Image();
if($image->loadFromFile($file['tmp_name'])) {
diff --git a/lib/helper.php b/lib/helper.php
index e3d292737a4..537465b15ac 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -514,7 +514,7 @@ class OC_Helper {
* remove all files created by self::tmpFile
*/
public static function cleanTmp(){
- $leftoversFile='/tmp/oc-not-deleted';
+ $leftoversFile=get_temp_dir().'/oc-not-deleted';
if(file_exists($leftoversFile)){
$leftovers=file($leftoversFile);
foreach($leftovers as $file) {
diff --git a/lib/migrate.php b/lib/migrate.php
index 8fb949d66e1..f9cab915d04 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -146,7 +146,7 @@ class OC_Migrate{
case 'instance':
self::$content = new OC_Migration_Content( self::$zip );
// Creates a zip that is compatable with the import function
- $dbfile = tempnam( "/tmp", "owncloud_export_data_" );
+ $dbfile = tempnam( get_temp_dir(), "owncloud_export_data_" );
OC_DB::getDbStructure( $dbfile, 'MDB2_SCHEMA_DUMP_ALL');
// Now add in *dbname* and *dbprefix*