diff options
| -rw-r--r-- | src/openid/wrapper.php | 27 | ||||
| -rw-r--r-- | www/css/debug.css | 85 | ||||
| -rw-r--r-- | www/login.php | 12 |
3 files changed, 2 insertions, 122 deletions
diff --git a/src/openid/wrapper.php b/src/openid/wrapper.php deleted file mode 100644 index cb57f4e..0000000 --- a/src/openid/wrapper.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -/** - * OpenID - * - * PHP Version 5.2.0+ - * - * @category Auth - * @package OpenID - * @author Bill Shupp <hostmaster@shupp.org> - * @copyright 2009 Bill Shupp - * @license http://www.opensource.org/licenses/bsd-license.php FreeBSD - * @link http://github.com/shupp/openid - */ -?> -<html> - <head> - <title>PEAR OpenID Debug</title> - <link rel="stylesheet" href="/css/debug.css" type="text/css" /> - </head> - <body> -<?php -if (isset($contents)) { - echo $contents; -} -?> - </body> -</html> diff --git a/www/css/debug.css b/www/css/debug.css deleted file mode 100644 index 634243a..0000000 --- a/www/css/debug.css +++ /dev/null @@ -1,85 +0,0 @@ -html, body { - background: #ededed; - font: 82.5% Helvetica Neue, HelveticaNeue, Helvetica, sans-serif; - margin: 30px 0 0; padding: 0px; } - -h3 { - color: #aaa; - margin: 0; padding: 0; - font-size: 1.3em; - - position: absolute; - top: 30px; - width: 100%; - text-align: center; - left: 0; -} - -h3 a { - color: #111; - text-decoration: none; -} - -h3 a:hover { - text-decoration: underline; - -} - -form { - padding: 30px; - background: #fff; - -moz-border-radius: 6px; - -webkit-border-radius: 6px; - width: 400px; - margin: 50px auto 0; - } - -table { - font-size: 1.1em !important; - font-weight: bold; -} - -td { - width: 200px; -} -.discover_results { - margin: 60px 0 ; - padding: 30px; - background: #111; - text-align: center; -} - - -.discover_results b { - color: #fff; - font-size: 2.4em; -} - -.relyingparty_results { - width: 100%; -} - -.relyingparty_results table b { - display: block; - width: 300px; - font-size: 1.7em; - color: #fff; -} - - -pre, .relyingparty_results p table { - font-size: 1.2em; - width: 900px !important; - text-align: left; - margin: 0 auto; - - color: #ddd; - padding: 30px; - -} - -.relyingparty_results { - background: #111; - padding: 30px; - margin: 60px 0; -} diff --git a/www/login.php b/www/login.php index 9c1b136..a97246f 100644 --- a/www/login.php +++ b/www/login.php @@ -34,11 +34,7 @@ $returnTo = Tools::fullUrl('/login'); try { $o = new \OpenID_RelyingParty($returnTo, $realm, $openid_url); } catch (OpenID_Exception $e) { - $contents = "<div class='openid_results'>\n"; - $contents .= "<pre>" . $e->getMessage() . "</pre>\n"; - $contents .= "</div class='openid_results'>"; - include_once 'openid/wrapper.php'; - exit; + throw new Exception($e->getMessage()); } if (!empty($_POST['disable_associations']) || !empty($_SESSION['disable_associations'])) { @@ -55,11 +51,7 @@ if (isset($_POST['openid_url'])) { try { $authRequest = $o->prepare(); } catch (OpenID_Exception $e) { - $contents = "<div class='openid_results'>\n"; - $contents .= "<pre>" . $e->getMessage() . "</pre>\n"; - $contents .= "</div class='openid_results'>"; - include_once 'openid/wrapper.php'; - exit; + throw new Exception($e->getMessage()); } // SREG |