Merge branch '1.0-local' into 1.0
This commit is contained in:
commit
22b08ad2cc
|
@ -139,8 +139,10 @@
|
|||
}
|
||||
|
||||
/* (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;
|
||||
}
|
||||
|
||||
|
||||
/* [4] Manage action depending on the actual STATE
|
||||
|
@ -178,8 +180,10 @@
|
|||
}
|
||||
|
||||
/* (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;
|
||||
}
|
||||
|
||||
/* (7) Extract corresponding action */
|
||||
$action = $grantedFor[$toPerform];
|
||||
|
|
Loading…
Reference in New Issue