aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-10-01 07:14:05 +0000
committerMario <mario@mariovavti.com>2021-10-01 07:14:05 +0000
commit22dff49673d7732b846107c888259170332746cb (patch)
treeb4f371f8347c71ce81f79df334bc6579e135c84e /Zotlabs
parent6ed160e4fa05e880bc81720b626f2bdc68a20db8 (diff)
downloadvolse-hubzilla-22dff49673d7732b846107c888259170332746cb.tar.gz
volse-hubzilla-22dff49673d7732b846107c888259170332746cb.tar.bz2
volse-hubzilla-22dff49673d7732b846107c888259170332746cb.zip
improve file upload performance: start uploading next file only after the previous finished, make sure to not return when uploading via ajax
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/File_upload.php3
-rw-r--r--Zotlabs/Module/Photos.php4
2 files changed, 7 insertions, 0 deletions
diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php
index e18067e20..d4c9ad59a 100644
--- a/Zotlabs/Module/File_upload.php
+++ b/Zotlabs/Module/File_upload.php
@@ -99,6 +99,9 @@ class File_upload extends \Zotlabs\Web\Controller {
}
}
+ if(is_ajax())
+ killme();
+
goaway(z_root() . '/' . $_REQUEST['return_url']);
}
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 3aad70d18..57126df5f 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -171,6 +171,7 @@ class Photos extends \Zotlabs\Web\Controller {
}
goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
+
}
if((argc() > 2) && (x($_REQUEST,'delete')) && ($_REQUEST['delete'] === t('Delete Photo'))) {
@@ -501,6 +502,9 @@ class Photos extends \Zotlabs\Web\Controller {
goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address']);
}
+ if(is_ajax())
+ killme();
+
goaway(z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/album/' . $r['data']['folder']);
}