mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18221 from nextcloud/backport/17850/stable17 

[stable17] Mark "Talk" active on /call/token URLs
This commit is contained in:
Roeland Jago Douma 2019-12-04 14:11:17 +01:00 committed by GitHub
parent 658c951d68 c17d86c081
commit d4adc27792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
View File

@ -121,6 +121,8 @@ class SecurityMiddleware extends Middleware {
* @param Controller $controller the controller
* @param string $methodName the name of the method
* @throws SecurityException when a security check fails
*
* @suppress PhanUndeclaredClassConstant
*/
public function beforeController($controller, $methodName) {
@ -128,6 +130,10 @@ class SecurityMiddleware extends Middleware {
// for normal HTML requests and not for AJAX requests
$this->navigationManager->setActiveEntry($this->appName);
if ($controller === \OCA\Spreed\Controller\PageController::class && $methodName === 'showCall') {
$this->navigationManager->setActiveEntry('spreed');
}
// security checks
$isPublicPage = $this->reflector->hasAnnotation('PublicPage');
if(!$isPublicPage) {