move status_noauth loading into separate function since we need it several times

diff --git a/Wrt3g.php b/Wrt3g.php
index 18e8608ebd5205336459bf49af77ab8947495439..150b68c741877df41ccc390d9d119b25c21e43ba 100644 (file)
--- a/Wrt3g.php
+++ b/Wrt3g.php
@@ -153,17 +153,15 @@ class Wrt3g
 
 
     /**
 
 
     /**

-     * Retrieves pc card/SIM status information
+     * Loads "Status_NoAuth.asp" page and parses the body.

      *
      *

-     * @return array Array with several key-value pairs
-     *               connection => connecting, disconnected, connected
+     * @return array Associative array with connection status.

      *
      *

-     * @throws Exception When the router can't be reached
+     * @throws Exception When something goes wrong, i.e. router not
+     *                   reachable

      */
      */

-    public function getCardStatus()
+    protected function loadStatus_NoAuth()

     {
     {

-        $arRetval = array();
-

         $strUrlBase = $this->getAnonBaseUrl();
 
         $url = $strUrlBase . '/Status_NoAuth.asp';
         $strUrlBase = $this->getAnonBaseUrl();
 
         $url = $strUrlBase . '/Status_NoAuth.asp';


@@ -177,7 +175,25 @@ class Wrt3g
         //FIXME: check status
 
         $parser = new Wrt3g_HtmlParser();
         //FIXME: check status
 
         $parser = new Wrt3g_HtmlParser();

-        $arRetval = $parser->status_noauth($resp->getBody());
+
+        return $parser->status_noauth(
+            $this->loadStatus_NoAuth()->getBody()
+        );
+    }
+
+
+
+    /**
+     * Retrieves pc card/SIM status information
+     *
+     * @return array Array with several key-value pairs
+     *               connection => connecting, disconnected, connected
+     *
+     * @throws Exception When the router can't be reached
+     */
+    public function getCardStatus()
+    {
+        $arRetval = $this->loadStatus_NoAuth();

 
         return array_intersect_key(
             $arRetval,
 
         return array_intersect_key(
             $arRetval,


@@ -202,22 +218,7 @@ class Wrt3g
      */
     public function getFullStatus()
     {
      */
     public function getFullStatus()
     {

-        $arRetval = array();
-
-        $strUrlBase = $this->getAnonBaseUrl();
-
-        $url = $strUrlBase . '/Status_NoAuth.asp';
-        $this->log('Connecting to ' . $url, 1);
-
-        $r = new HTTP_Request2();
-        $r->setMethod(HTTP_Request2::METHOD_GET);
-        $r->setUrl($url);
-        $resp = $r->send();
-        $this->log($resp->getStatus() . ' ' . $resp->getReasonPhrase(), 1);
-        //FIXME: check status
-
-        $parser = new Wrt3g_HtmlParser();
-        return $parser->status_noauth($resp->getBody());
+        return $this->loadStatus_NoAuth();

     }
 
 
     }