nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-21 01:54:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix to more uses of continue inside switch discovered by CI

Browse Source 
I wonder why I saw the first few, but not these?
This commit is contained in:
Florian Schlichting 2018-12-22 19:56:25 +01:00
parent a51caa38f1
commit 44bb5cf7b6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inc/caldav-ACL.php
View File

@ -133,8 +133,7 @@ function process_ace( $grantor, $by_principal, $by_collection, $ace ) {
if ( privilege_to_bits('all') != $privileges ) { if ( privilege_to_bits('all') != $privileges ) {
$request->PreconditionFailed(403, 'no-protected-ace-conflict', 'Owner must always have all permissions' ); $request->PreconditionFailed(403, 'no-protected-ace-conflict', 'Owner must always have all permissions' );
} }
continue; // and then we ignore it, since it's protected break; // and then we ignore it, since it's protected
break;
case 'DAV::unauthenticated': case 'DAV::unauthenticated':
$request->PreconditionFailed(403, 'allowed-principal', 'May not set privileges for unauthenticated users' ); $request->PreconditionFailed(403, 'allowed-principal', 'May not set privileges for unauthenticated users' );
@ -175,7 +174,7 @@ function process_ace( $grantor, $by_principal, $by_collection, $ace ) {
case 'DAV::authenticated': case 'DAV::authenticated':
$principal_type = 'authenticated'; $principal_type = 'authenticated';
if ( bindec($grantor->GetProperty('default_privileges')) == $privileges ) continue; // There is no change, so skip it if ( bindec($grantor->GetProperty('default_privileges')) == $privileges ) break; // There is no change, so skip it
$sqlparms = array( ':privileges' => $privileges ); $sqlparms = array( ':privileges' => $privileges );
if ( isset($by_collection) ) { if ( isset($by_collection) ) {
$sql = 'UPDATE collection SET default_privileges=:privileges::INT::BIT(24) WHERE collection_id=:by_collection'; $sql = 'UPDATE collection SET default_privileges=:privileges::INT::BIT(24) WHERE collection_id=:by_collection';