[project @ Rename CSS for server example]

2 files changed, 31 insertions, 9 deletions

diff --git a/examples/server/lib/session.php b/examples/server/lib/session.php
index 392a0fd..f44fb94 100644
--- a/examples/server/lib/session.php
+++ b/examples/server/lib/session.php
@@ -17,19 +17,35 @@ function init()
  */
 function getStyle()
 {
-    $url = htmlspecialchars(dirname(buildURL()) . '/default.css', ENT_QUOTES);
+    $parent = rtrim(dirname(getServerURL()), '/');
+    $url = htmlspecialchars($parent . '/openid-server.css', ENT_QUOTES);
     return sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $url);
 }
 
 /**
+ * Get the URL of the current script
+ */
+function getServerURL()
+{
+    $path = $_SERVER['SCRIPT_NAME'];
+    $host = $_SERVER['HTTP_HOST'];
+    $port = $_SERVER['SERVER_PORT'];
+    $s = $_SERVER['HTTPS'] ? 's' : '';
+    if (($s && $port == "443") || (!$s && $port == "80")) {
+        $p = '';
+    } else {
+        $p = ':' . $port;
+    }
+    
+    return "http$s://$host$p$path";
+}
+
+/**
  * Build a URL to a server action
  */
 function buildURL($action=null, $escaped=true)
 {
-    // from config.php
-    global $server_url;
-
-    $url = $server_url;
+    $url = getServerURL();
     if ($action) {
         $url .= '/' . $action;
     }
@@ -62,12 +78,9 @@ function writeResponse($resp)
  */
 function getServer()
 {
-    // from config.php
-    global $server_url;
-
     static $server = null;
     if (!isset($server)) {
-        $server = new Auth_OpenID_Server($server_url, getOpenIDStore());
+        $server = new Auth_OpenID_Server(getServerURL(), getOpenIDStore());
     }
     return $server;
 }
diff --git a/examples/server/default.css b/examples/server/openid-server.css
index 7448819..badff23 100644
--- a/examples/server/default.css
+++ b/examples/server/openid-server.css
@@ -62,4 +62,13 @@ pre {
 #checkup {
     background: url('http://www.openidenabled.com/favicon.ico') no-repeat;
     padding-left: 16px;
+}
+
+th {
+    text-align: left;
+}
+
+table {
+    border-collapse: collapse;
+    margin-bottom: 1em;
 }
\ No newline at end of file