implement non-authenticated default status

diff --git a/Wrt3g.php b/Wrt3g.php
index 2fe0db850fb7a68e1adcf978261c8c1cb495be71..07a68216de4fa3bbb47701302d76cf6520a6dca1 100644 (file)
--- a/Wrt3g.php
+++ b/Wrt3g.php
@@ -145,14 +145,40 @@ class Wrt3g
 
 
     /**
-     * Retrieves status information about the router
+     * Retrieves basic connection status information about the router
      *
      * @return array Array with several key-value pairs
      *               connection => connecting, disconnected, connected
      *
-     * @throws Exception When the router can't be reached, or unauthorized
+     * @throws Exception When the router can't be reached
      */
     public function getConnectionStatus()
+    {
+        return array_intersect_key(
+            $this->loadStatus_NoAuth(),
+            array(
+                'connection'      => 0,
+                'type'            => 0,
+                'network'         => 0,
+                'signal strength' => 0,
+                'connection time' => 0,
+                'session usage'   => 0
+            )
+        );
+    }
+
+
+
+    /**
+     * Retrieves connection status information about the router.
+     * Uses pages that can only be reached with authentication.
+     *
+     * @return array Array with several key-value pairs
+     *               connection => connecting, disconnected, connected
+     *
+     * @throws Exception When the router can't be reached, or unauthorized
+     */
+    public function getConnectionStatusAuth()
     {
         $arRetval = array();
 

diff --git a/scripts/linksys-wrt3g.php b/scripts/linksys-wrt3g.php
index f53d76a819364642d83f1918cc9ea1e60b30894b..d9d72884fbd34098e8780f32a0decb05c0e23500 100755 (executable)
--- a/scripts/linksys-wrt3g.php
+++ b/scripts/linksys-wrt3g.php
@@ -90,6 +90,12 @@ $stCmd = $parser->addCommand(
         'description' => 'Show all status details'
     )
 );
+$stCmd = $parser->addCommand(
+    'authstatus',
+    array(
+        'description' => 'Show the connection status the old way (authenticated)'
+    )
+);
 
 
 $parser->addCommand(
@@ -147,9 +153,12 @@ try {
             $arStatus = $router->getFullStatus();
         } else if ($result->command_name == 'card') {
             $arStatus = $router->getCardStatus();
+        } else if ($result->command_name == 'authstatus') {
+            $arStatus = $router->getConnectionStatusAuth();
         } else {
             $arStatus = $router->getConnectionStatus();
         }
+
         foreach ($arStatus as $key => $value) {
             echo $key . ': ';
             if (is_array($value)) {