diff --git a/modules/login/jsx/loginIndex.js b/modules/login/jsx/loginIndex.js index 33242423ca..5773653ad6 100644 --- a/modules/login/jsx/loginIndex.js +++ b/modules/login/jsx/loginIndex.js @@ -162,7 +162,7 @@ class Login extends Component { // test URL as string if (typeof redirectUrl !== 'string') { window.location.href = window.location.origin; - }; + } // parse URL try { diff --git a/modules/media/ajax/FileUpload.php b/modules/media/ajax/FileUpload.php index c2e4f577fe..73e93e274b 100644 --- a/modules/media/ajax/FileUpload.php +++ b/modules/media/ajax/FileUpload.php @@ -63,7 +63,8 @@ function editFile() } if (!$user->hasPermission('media_write') - || (!$user->hasPermission('access_all_profiles') && !$user->hasCenter(new \CenterID(strval($row['CenterID'])))) + || (!$user->hasPermission('access_all_profiles') + && !$user->hasCenter(new \CenterID(strval($row['CenterID'])))) ) { showMediaError("Permission Denied", 403); exit(0); diff --git a/modules/media/php/files.class.inc b/modules/media/php/files.class.inc index 50114843ff..8c3304eee6 100644 --- a/modules/media/php/files.class.inc +++ b/modules/media/php/files.class.inc @@ -25,14 +25,17 @@ class Files extends \LORIS\Http\FilesPassthroughEndpoint /** * {@inheritDoc} * - * @param \Psr\Http\Message\ServerRequestInterface $request The PSR15 Request being handled + * @param \Psr\Http\Message\ServerRequestInterface $request The PSR15 + * Request being handled * * @return \Psr\Http\Message\ResponseInterface */ #[\Override] - public function handle(\Psr\Http\Message\ServerRequestInterface $request) : \Psr\Http\Message\ResponseInterface - { + public function handle( + \Psr\Http\Message\ServerRequestInterface $request + ) : \Psr\Http\Message\ResponseInterface { $user = \User::singleton(); + // @phan-suppress-next-line PhanUndeclaredMethod if (!$this->isAccessibleBy($user)) { return new \LORIS\Http\Response\JSON\Forbidden("Permission Denied"); } @@ -42,7 +45,7 @@ class Files extends \LORIS\Http\FilesPassthroughEndpoint $idx = strpos($url, $prefix); $file = substr($url, $idx + strlen($prefix)); - $db = $this->loris->getDatabaseConnection(); + $db = $this->loris->getDatabaseConnection(); $row = $db->pselectRow( "SELECT s.CenterID FROM media m JOIN session s ON m.session_id = s.ID @@ -54,8 +57,12 @@ class Files extends \LORIS\Http\FilesPassthroughEndpoint return new \LORIS\Http\Response\JSON\NotFound("File not found"); } - if (!$user->hasPermission('access_all_profiles') && !$user->hasCenter(new \CenterID(strval($row['CenterID'])))) { - return new \LORIS\Http\Response\JSON\Forbidden("Permission Denied for this site"); + if (!$user->hasPermission('access_all_profiles') + && !$user->hasCenter(new \CenterID(strval($row['CenterID']))) + ) { + return new \LORIS\Http\Response\JSON\Forbidden( + "Permission Denied for this site" + ); } return parent::handle($request); diff --git a/modules/media/php/media.class.inc b/modules/media/php/media.class.inc index a42aeb9f3d..1fb576aa1b 100644 --- a/modules/media/php/media.class.inc +++ b/modules/media/php/media.class.inc @@ -161,7 +161,9 @@ class Media extends \DataFrameworkMenu } if (!$user->hasPermission('access_all_profiles')) { - $provisioner = $provisioner->filter(new \LORIS\Data\Filters\UserSiteMatch()); + $provisioner = $provisioner->filter( + new \LORIS\Data\Filters\UserSiteMatch() + ); } return $provisioner->filter(new HideFileFilter()); diff --git a/php/libraries/Module.class.inc b/php/libraries/Module.class.inc index 558c29aa26..2178d60313 100644 --- a/php/libraries/Module.class.inc +++ b/php/libraries/Module.class.inc @@ -249,8 +249,8 @@ abstract class Module extends \LORIS\Router\PrefixRouter public function getHelp(string $page): string { $helpFile = realpath($this->dir . "/help/$page.md"); - if ($helpFile && file_exists($helpFile) && - str_starts_with($helpFile, realpath($this->dir)) + if ($helpFile && file_exists($helpFile) + && str_starts_with($helpFile, realpath($this->dir)) ) { return file_get_contents($helpFile); } diff --git a/test/integrationtests/LorisIntegrationTest.class.inc b/test/integrationtests/LorisIntegrationTest.class.inc index 216286c41c..8b9102c1d6 100755 --- a/test/integrationtests/LorisIntegrationTest.class.inc +++ b/test/integrationtests/LorisIntegrationTest.class.inc @@ -712,9 +712,12 @@ abstract class LorisIntegrationTest extends TestCase ); $el_dropdown->selectByVisibleText($test_value); } + $bodyText = $this->safeFindElement( - WebDriverBy::cssSelector("$row") + WebDriverBy::cssSelector("$row"), + 15 )->getText(); + // 4 means there are 4 records under this site. $this->assertStringContainsString($expect_records, $bodyText); //test clear filter