holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some bugs in hidden uploads

Browse Source 
- Creating the share couldn't handle sqlfs://user@path style paths
- UI namespace issues
This commit is contained in:
nathangray 2020-10-21 09:13:37 -06:00
parent 6a5c6599dd
commit 316adfab5e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Vfs/HiddenUploadSharing.php
View File

@ -131,11 +131,11 @@ class HiddenUploadSharing extends Sharing
{ {
$upload_dir = Vfs::concat($path, self::HIDDEN_UPLOAD_DIR); $upload_dir = Vfs::concat($path, self::HIDDEN_UPLOAD_DIR);
if (($stat = Vfs::stat($upload_dir)) && !Vfs::check_access($upload_dir, Vfs::WRITABLE, $stat)) if (($stat = stat($upload_dir)) && !Vfs::check_access($upload_dir, Vfs::WRITABLE, $stat))
{ {
throw new Api\Exception\NoPermission("Upload directory exists, but you have no write permission"); throw new Api\Exception\NoPermission("Upload directory exists, but you have no write permission");
} }
if (!($stat = Vfs::stat($upload_dir))) if (!($stat = stat($upload_dir)))
{ {
// Directory is not there, create it // Directory is not there, create it
if (!mkdir($upload_dir)) if (!mkdir($upload_dir))

7
filemanager/src/Sharing/HiddenUpload.php
View File

@ -3,7 +3,8 @@
namespace EGroupware\Filemanager\Sharing; namespace EGroupware\Filemanager\Sharing;
use EGroupware\Api\Etemplate;
use EGroupware\Api\Json;
use EGroupware\Api\Vfs; use EGroupware\Api\Vfs;
use EGroupware\Api\Vfs\Sharing; use EGroupware\Api\Vfs\Sharing;
use EGroupware\Api\Vfs\UploadSharingUi; use EGroupware\Api\Vfs\UploadSharingUi;
@ -33,7 +34,7 @@ class HiddenUpload extends AnonymousList
*/ */
function listview(array $content=null,$msg=null) function listview(array $content=null,$msg=null)
{ {
$this->etemplate = $this->etemplate ? $this->etemplate : new Api\Etemplate(static::LIST_TEMPLATE); $this->etemplate = $this->etemplate ? $this->etemplate : new Etemplate(static::LIST_TEMPLATE);
if (isset($GLOBALS['egw']->sharing) && $GLOBALS['egw']->sharing->has_hidden_upload()) if (isset($GLOBALS['egw']->sharing) && $GLOBALS['egw']->sharing->has_hidden_upload())
{ {
@ -120,7 +121,7 @@ class HiddenUpload extends AnonymousList
} }
// tell client-side that this directory is writeable - allows upload + button // tell client-side that this directory is writeable - allows upload + button
$response = Api\Json\Response::get(); $response = Json\Response::get();
$response->call('app.filemanager.set_readonly', $query['path'], false); $response->call('app.filemanager.set_readonly', $query['path'], false);
// Hide the hidden upload directory, mark everything else as readonly // Hide the hidden upload directory, mark everything else as readonly