logauth
/
SATS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '1.0-local' into 1.0

This commit is contained in:
xdrm-brackets 2017-02-23 17:04:47 +01:00
parent ca869eec8f 08d18b187a
commit d96b3eae88
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mfrc522/source/loop.php
View File

@ -164,7 +164,7 @@
$action = $actionlist[$id_action]; $action = $actionlist[$id_action];
/* (4) Check if the state allows the action to be performed */ /* (4) Check if the state allows the action to be performed */
for( $c = 0 ; $c < strlen($state) || $c < strlen($action['prev']) ; $c++ ){ for( $c = 0 ; $c < strlen($state) && $c < strlen($action['prev']) ; $c++ ){
// {1} 'X' = any state -> so ignore // // {1} 'X' = any state -> so ignore //
if( $action['prev'][$c] == 'X' ) if( $action['prev'][$c] == 'X' )
continue; continue;
@ -197,7 +197,7 @@
/* [5] Process the action on the STATE /* [5] Process the action on the STATE
=========================================================*/ =========================================================*/
/* (1) Update the state with the found action */ /* (1) Update the state with the found action */
for( $c = 0 ; $c < strlen($state) || $c < strlen($action['next']) ; $c++ ){ for( $c = 0 ; $c < strlen($state) && $c < strlen($action['next']) ; $c++ ){
// {1} If 'x' -> let the current state // // {1} If 'x' -> let the current state //
if( $action['next'][$c] == 'X' ) if( $action['next'][$c] == 'X' )