Changeset 671 for trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

Timestamp:

Jul 19, 2014, 1:21:24 AM (10 years ago)

Author:

chronos

Message:

• Upraveno: Příprava pro sledování signálu bezdrátových spojů.

File:

• trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php (modified) (5 diffs)

trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php

@@ -11 +11 @@
   var $Timeout;        // Connection attempt timeout and data read timeout
   var $Socket;             // Variable for storing socket resource
-  
+
   function __construct()
   {
@@ -43 +43 @@
     if($this->Connected) $this->Disconnect();
     $this->Socket = @fsockopen($IP, $this->Port, $this->ErrorNo, $this->ErrorStr, $this->Timeout);
-    if($this->Socket) 
+    if($this->Socket)
     {
       socket_set_timeout($this->Socket, $this->Timeout);
@@ -59 +59 @@
         }
       }
-      if(!$this->Connected) fclose($this->Socket);      
-    }    
-  }
-  
+      if(!$this->Connected) fclose($this->Socket);
+    }
+  }
+
   function Connect($IP, $Login, $Password)
   {
-    for($Attempt = 1; $Attempt <= $this->Attempts; $Attempt++) 
+    for($Attempt = 1; $Attempt <= $this->Attempts; $Attempt++)
     {
       $this->ConnectOnce($IP, $Login, $Password);
@@ -182 +182 @@
         $Response[] = $Line;
       }
+      echo($Line."\n");
       // If we get a !done, make a note of it.
       if ($Line == "!done") $ReceivedDone = true;
+        else $ReceivedDone = false;
       $Status = socket_get_status($this->Socket);
-      if ((!$this->Connected && !$Status['unread_bytes']) || 
+      if ((!$this->Connected && !$Status['unread_bytes']) ||
           ($this->Connected && !$Status['unread_bytes'] && $ReceivedDone))
         break;
@@ -195 +197 @@
   function Write($Command, $Param2 = true)
   {
-    if($Command) 
+    if($Command)
     {
       $Data = explode("\n", $Command);
       foreach ($Data as $Com) {
         $Com = trim($Com);
-        fwrite($this->Socket, $this->EncodeLength(strlen($Com)).$Com);        
+        fwrite($this->Socket, $this->EncodeLength(strlen($Com)).$Com);
       }
       if (gettype($Param2) == 'integer') {