Changeset 1446 for branches/newtoken/wifidog/ws/index.php

Timestamp:

02/11/10 17:34:27 (2 years ago)

Author:

gbastien

Message:

* Merged recent changes in the trunk into this branch
* New token architecture not yet fully functional, nor tested, but ...

• can now edit token templates for different context of tokens (from the edit netork interface at the bottom of page)
• Users connected through a wifidog gateway can view their connection token information

Files:

• branches/newtoken/wifidog/ws/index.php (modified) (2 diffs)

branches/newtoken/wifidog/ws/index.php

@@ -95 +95 @@
     $exceptionClass = get_class($e);
     if (!is_null($output)) {
-        echo $output->outputError(array('type' => $exceptionClass, 
+        if ($exceptionClass == 'WSException') {
+            echo $output->outputError(array('type' => $exceptionClass, 
+                                    'message' => sprintf(_("Web service exception:  %s (%s)"), $e->getMessage(), $e->getCode())));
+        } else
+            echo $output->outputError(array('type' => $exceptionClass, 
                                     'message' => sprintf(_("Detailed error was:  Uncaught %s %s (%s) thrown in file %s, line %d"),get_class($e), $e->getMessage(), $e->getCode(), $e->getFile(), $e->getLine())));
     } else {
-        echo sprintf(_("Detailed error was:  Uncaught %s %s (%s) thrown in file %s, line %d"),get_class($e), $e->getMessage(), $e->getCode(), $e->getFile(), $e->getLine());
+        if ($exceptionClass == 'WSException') {
+            echo sprintf(_("Web service exception:  %s => %s (%s)"),get_class($e), $e->getMessage(), $e->getCode(), $e->getFile(), $e->getLine());
+        } else
+            echo sprintf(_("Detailed error was:  Uncaught %s %s (%s) thrown in file %s, line %d"),get_class($e), $e->getMessage(), $e->getCode(), $e->getFile(), $e->getLine());
     }
 
@@ -105 +112 @@
 set_exception_handler('wifidog_exception_handler');
 
-throw (new WSException(_("The Wifidog API module is not fit for production yet.  The source code has been released to share ideas and help development, but it has not been thoroughly tested yet and may represent a security issue for now.  If you'd like to test the module, you can do so by commenting this line in the auth server's source code.  But it is highly not advised to do so in a production environment for now.  Please stay tuned for more development")));
+//throw (new WSException(_("The Wifidog API module is not fit for production yet.  The source code has been released to share ideas and help development, but it has not been thoroughly tested yet and may represent a security issue for now.  If you'd like to test the module, you can do so by commenting this line in the auth server's source code.  But it is highly not advised to do so in a production environment for now.  Please stay tuned for more development")));
 
 $service->setParams($_GET);