fixed Multiple Sessions bug

Author: Yaroslav Vodvud

zklib/ZKLib.php

@@ -55,16 +55,13 @@ public function _command($command, $command_string, $type = Util::COMMAND_TYPE_G
 
             $u = unpack('H2h1/H2h2/H2h3/H2h4/H2h5/H2h6', substr($this->_data_recv, 0, 8));
 
-            switch ($type) {
-                case Util::COMMAND_TYPE_GENERAL:
-                    $this->_session_id = hexdec($u['h6'] . $u['h5']);
-                    $ret = substr($this->_data_recv, 8);
-                    break;
-                case Util::COMMAND_TYPE_DATA:
-                    $ret = hexdec($u['h6'] . $u['h5']);
-                    break;
-                default:
-                    $ret = false;
+            $ret = false;
+            $session = hexdec($u['h6'] . $u['h5']);
+
+            if ($type === Util::COMMAND_TYPE_GENERAL && $session_id === $session) {
+                $ret = substr($this->_data_recv, 8);
+            } else if ($type === Util::COMMAND_TYPE_DATA && !empty($session)) {
+                $ret = $session;
             }
 
             return $ret;

zklib/src/Attendance.php

@@ -17,13 +17,11 @@ public function get(ZKLib $self)
         $command = Util::CMD_ATT_LOG_RRQ;
         $command_string = '';
 
-        $session_id = $self->_command($command, $command_string, Util::COMMAND_TYPE_DATA);
-
-        if ($session_id === false) {
+        $session = $self->_command($command, $command_string, Util::COMMAND_TYPE_DATA);
+        if ($session === false) {
             return [];
         }
 
-        $self->_session_id = $session_id;
         $attData = Util::recData($self);
 
         $attendance = [];

zklib/src/Connect.php

@@ -31,7 +31,12 @@ public function connect(ZKLib $self)
             if (strlen($self->_data_recv) > 0) {
                 $u = unpack('H2h1/H2h2/H2h3/H2h4/H2h5/H2h6', substr($self->_data_recv, 0, 8));
 
-                $self->_session_id = hexdec($u['h6'] . $u['h5']);
+                $session = hexdec($u['h6'] . $u['h5']);
+                if (empty($session)) {
+                    return false;
+                }
+
+                $self->_session_id = $session;
                 return Util::checkValid($self->_data_recv);
             } else {
                 return false;
@@ -66,6 +71,7 @@ public function disconnect(ZKLib $self)
         try {
             @socket_recvfrom($self->_zkclient, $self->_data_recv, 1024, 0, $self->_ip, $self->_port);
 
+            $self->_session_id = 0;
             return Util::checkValid($self->_data_recv);
         } catch (ErrorException $e) {
             return false;

zklib/src/Fingerprint.php

@@ -46,13 +46,11 @@ public function _getFinger(ZKLib $self, $uid, $finger)
             'tpl' => ''
         ];
 
-        $session_id = $self->_command($command, $command_string, Util::COMMAND_TYPE_DATA);
-
-        if ($session_id === false) {
+        $session = $self->_command($command, $command_string, Util::COMMAND_TYPE_DATA);
+        if ($session === false) {
             return $ret;
         }
 
-        $self->_session_id = $session_id;
         $data = Util::recData($self, 10, false);
 
         if (!empty($data)) {

zklib/src/User.php

@@ -57,13 +57,11 @@ public function get(ZKLib $self)
         $command = Util::CMD_USER_TEMP_RRQ;
         $command_string = chr(Util::FCT_USER);
 
-        $session_id = $self->_command($command, $command_string, Util::COMMAND_TYPE_DATA);
-
-        if ($session_id === false) {
+        $session = $self->_command($command, $command_string, Util::COMMAND_TYPE_DATA);
+        if ($session === false) {
             return [];
         }
 
-        $self->_session_id = $session_id;
         $userData = Util::recData($self);
 
         $users = [];