From cd2ae5fd9cb0d53e4f2d94336552b6cb174a731f Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Thu, 23 Feb 2017 14:47:25 +0100
Subject: [PATCH] [Fix]

---
 lib/mfrc522/source/.loop.php.swp | Bin 12288 -> 0 bytes
 lib/mfrc522/source/loop.php      |  25 +++++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 delete mode 100644 lib/mfrc522/source/.loop.php.swp

diff --git a/lib/mfrc522/source/.loop.php.swp b/lib/mfrc522/source/.loop.php.swp
deleted file mode 100644
index 8bdfea5420d19e8e32743dca7b3336f94237d986..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
S&&{u2n~y}8uW(-#lYao1s<WX0

diff --git a/lib/mfrc522/source/loop.php b/lib/mfrc522/source/loop.php
index 03f4776..56018ff 100755
--- a/lib/mfrc522/source/loop.php
+++ b/lib/mfrc522/source/loop.php
@@ -248,7 +248,7 @@
 				continue;
 
 			/* (3) Add key (timeout) to cache */
-			if( !isset($actions[$parsed[0]] )
+			if( !isset($actions[$parsed[0]]) )
 				$actions[$parsed[0]] = [];
 
 			/* (4) Add entry to cache */
@@ -290,7 +290,7 @@
 		=========================================================*/
 		/* (1) Check file */
 		if( $f_gstate === false )
-			return;
+			return false;
 
 		/* (2) Remove surrounding spaces */
 		$f_gstate = preg_replace('@^\s+@', '', $f_gstate);
@@ -300,7 +300,7 @@
 		for( $c = 0 ; $c < strlen($f_gstate) ; $c++ )
 			$state[] = $c;
 	
-
+		return true;
 	}
 
 
@@ -323,7 +323,7 @@
 		/* [1] Wait for rfid card
 		=========================================================*/
 		/* (1) Read card */
-		$code = syscall(SOURCE_DIR.'/lib/mfrc522/read'));
+		$code = syscall(SOURCE_DIR.'/lib/mfrc522/read');
 		
 		/* (2) If no card read -> reset @last_user / @timeout + abort */
 		if( $code === false ){
@@ -351,6 +351,7 @@
 		/* (2) If not found -> reset @last_user / @timeout + abort */
 		if( is_null($user) ){
 			
+			slog("Unknown user (not authenticated)", "mfrc522:loop");
 			$last_user = null;
 			$timeout   = 0;
 			return false;
@@ -404,10 +405,26 @@
 
 
 
+	/* [1] Set up daemon
+	=========================================================*/
+	/* (1) Set up */
+	$exec = mfrc522_setup();
 
+	/* (2) Manage error */
+	if( $exec === false ){
+		slog('cannot set up the daemon', 'mfrc522:loop');
+		echo $exec;
+		die($exec);
+	}
 
+	/* (3) Success message */
 	slog('daemon started (loop)', 'mfrc522:loop');
 
+
+
+
+	/* [2] Daemon loop
+	=========================================================*/
 	while( true ){
 
 		$start_ts = microtime(true);