Merge pull request #19777 from nextcloud/fix/viewer-public
Properly emit Viewer event on files and files_sharing
This commit is contained in:
commit
9fda1ee39f
|
@ -39,6 +39,7 @@ namespace OCA\Files\Controller;
|
|||
use OCA\Files\Activity\Helper;
|
||||
use OCA\Files\Event\LoadAdditionalScriptsEvent;
|
||||
use OCA\Files\Event\LoadSidebar;
|
||||
use OCA\Viewer\Event\LoadViewer;
|
||||
use OCP\App\IAppManager;
|
||||
use OCP\AppFramework\Controller;
|
||||
use OCP\AppFramework\Http\ContentSecurityPolicy;
|
||||
|
@ -281,6 +282,10 @@ class ViewController extends Controller {
|
|||
$this->eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, $event);
|
||||
|
||||
$this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());
|
||||
// Load Viewer scripts
|
||||
if (class_exists(LoadViewer::class)) {
|
||||
$this->eventDispatcher->dispatchTyped(new LoadViewer());
|
||||
}
|
||||
|
||||
$params = [];
|
||||
$params['usedSpacePercent'] = (int) $storageInfo['relative'];
|
||||
|
|
|
@ -41,11 +41,12 @@
|
|||
|
||||
namespace OCA\Files_Sharing\Controller;
|
||||
|
||||
use OC\Security\CSP\ContentSecurityPolicy;
|
||||
use OC_Files;
|
||||
use OC_Util;
|
||||
use OC\Security\CSP\ContentSecurityPolicy;
|
||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||
use OCA\Files_Sharing\Activity\Providers\Downloads;
|
||||
use OCA\Viewer\Event\LoadViewer;
|
||||
use OCP\AppFramework\AuthPublicShareController;
|
||||
use OCP\AppFramework\Http\NotFoundResponse;
|
||||
use OCP\AppFramework\Http\Template\ExternalShareMenuAction;
|
||||
|
@ -370,6 +371,7 @@ class ShareController extends AuthPublicShareController {
|
|||
$maxUploadFilesize = $freeSpace;
|
||||
|
||||
$folder = new Template('files', 'list', '');
|
||||
|
||||
$folder->assign('dir', $shareNode->getRelativePath($folderNode->getPath()));
|
||||
$folder->assign('dirToken', $this->getToken());
|
||||
$folder->assign('permissions', \OCP\Constants::PERMISSION_READ);
|
||||
|
@ -452,6 +454,11 @@ class ShareController extends AuthPublicShareController {
|
|||
\OCP\Util::addScript('files', 'filelist');
|
||||
\OCP\Util::addScript('files', 'keyboardshortcuts');
|
||||
\OCP\Util::addScript('files', 'operationprogressbar');
|
||||
|
||||
// Load Viewer scripts
|
||||
if (class_exists(LoadViewer::class)) {
|
||||
$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
|
||||
}
|
||||
}
|
||||
|
||||
// OpenGraph Support: http://ogp.me/
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
*/
|
||||
use OCA\Files\Event\LoadAdditionalScriptsEvent;
|
||||
use OCA\Files\Event\LoadSidebar;
|
||||
use OCA\Viewer\Event\LoadViewer;
|
||||
use OCP\EventDispatcher\GenericEvent;
|
||||
|
||||
// Check if we are a user
|
||||
|
@ -44,4 +45,9 @@ $eventDispatcher->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts'
|
|||
$eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, new LoadAdditionalScriptsEvent());
|
||||
$eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar());
|
||||
|
||||
// Load Viewer scripts
|
||||
if (class_exists(LoadViewer::class)) {
|
||||
$eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
|
||||
}
|
||||
|
||||
$tmpl->printPage();
|
||||
|
|
|
@ -27,7 +27,7 @@ $urlGenerator = \OC::$server->getURLGenerator();
|
|||
$token = isset($_GET['t']) ? $_GET['t'] : '';
|
||||
$route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
|
||||
|
||||
if($token !== '') {
|
||||
if ($token !== '') {
|
||||
$protocol = \OC::$server->getRequest()->getHttpProtocol();
|
||||
if ($protocol == 'HTTP/1.0') {
|
||||
http_response_code(302);
|
||||
|
|
Loading…
Reference in New Issue