[project @ Trust decision logic fixes]

4 files changed, 5 insertions, 5 deletions

diff --git a/examples/server/lib/actions.php b/examples/server/lib/actions.php
index 0f73b8b..c346dae 100644
--- a/examples/server/lib/actions.php
+++ b/examples/server/lib/actions.php
@@ -13,7 +13,7 @@ require_once "lib/render/sites.php";
 function action_default()
 {
     $server = getServer();
-    return handleResponse($server->getOpenIDResponse());
+    return handleResponse($server->getOpenIDResponse('isTrusted'));
 }
 
 /**
diff --git a/examples/server/lib/common.php b/examples/server/lib/common.php
index 74e16ab..68ab0d9 100644
--- a/examples/server/lib/common.php
+++ b/examples/server/lib/common.php
@@ -64,7 +64,7 @@ function doAuth($info, $trusted=null, $fail_cancels=false)
     }
 
     $trust_root = $info->getTrustRoot();
-    $trusted = isset($trusted) ? $trusted : isTrusted($trust_root);
+    $trusted = isset($trusted) ? $trusted : isTrusted($req_url, $trust_root);
     if ($trusted) {
         setRequestInfo();
         $server = getServer();
diff --git a/examples/server/lib/render/sites.php b/examples/server/lib/render/sites.php
index 63d1245..4c0427f 100644
--- a/examples/server/lib/render/sites.php
+++ b/examples/server/lib/render/sites.php
@@ -31,7 +31,7 @@ define('sites_row',
 <td><label for=%s>%s %s</label></td>
 </tr>');
 
-function siteListRow_render($i, $site)
+function siteListRow_render($i, $site, $trusted)
 {
     $esc_site = htmlspecialchars($site, ENT_QUOTES);
     if ($trusted) {
@@ -48,7 +48,7 @@ function siteList_render($sites)
     $rows = '';
     $i = 0;
     foreach ($sites as $site => $trusted) {
-        $rows .= siteListRow_render($i, $site);
+        $rows .= siteListRow_render($i, $site, $trusted);
         $i += 1;
     }
     return $rows;
diff --git a/examples/server/lib/session.php b/examples/server/lib/session.php
index fceb8de..956e914 100644
--- a/examples/server/lib/session.php
+++ b/examples/server/lib/session.php
@@ -75,7 +75,7 @@ function getServer()
 /**
  * Return whether the trust root is currently trusted
  */
-function isTrusted($trust_root)
+function isTrusted($identity_url, $trust_root)
 {
     // from config.php
     global $trusted_sites;