Merge branch '1.0-local' into 1.0

This commit is contained in:
xdrm-brackets 2017-02-23 16:33:38 +01:00
commit 22b08ad2cc
1 changed files with 6 additions and 2 deletions

View File

@ -139,8 +139,10 @@
} }
/* (4) If no action found -> abort */ /* (4) If no action found -> abort */
if( count($grantedFor) == 0 ) if( count($grantedFor) == 0 ){
slog('user not granted to any action', 'mfrc522:loop');
return false; return false;
}
/* [4] Manage action depending on the actual STATE /* [4] Manage action depending on the actual STATE
@ -178,8 +180,10 @@
} }
/* (6) If no action cant be performed -> abort */ /* (6) If no action cant be performed -> abort */
if( is_null($toPerform) ) if( is_null($toPerform) ){
slog('global state allows no action to be performed', 'mfrc522:loop');
return false; return false;
}
/* (7) Extract corresponding action */ /* (7) Extract corresponding action */
$action = $grantedFor[$toPerform]; $action = $grantedFor[$toPerform];