From 543352cbf9c4eec9c8cb408a6ae8d29110e9ead3 Mon Sep 17 00:00:00 2001
From: Joe Presbrey <presbrey@mit.edu>
Date: Sun, 15 Apr 2007 00:49:05 +0000
Subject: [PATCH] git-svn-id: svn://presbrey.mit.edu/php/lib@126
 a142d4bd-2cfb-0310-9673-cb33a7e74f58

---
 lib/joe/site.lib.php | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/lib/joe/site.lib.php b/lib/joe/site.lib.php
index e780e8d..1670ed1 100755
--- a/lib/joe/site.lib.php
+++ b/lib/joe/site.lib.php
@@ -4,10 +4,10 @@
  */
 
 class Site {
-	var $uri, $argv;
+	var $URI, $ARGV;
 	function __construct($uri) {
-		$this->uri = $uri;
-		$this->argv = array_merge(
+		$this->URI = $uri;
+		$this->ARGV = array_merge(
 			array_prepend_keys($_COOKIE,'c_'),
 			array_prepend_keys($_FILES,'f_'),
 			array_prepend_keys($_GET,'g_'),
@@ -15,8 +15,8 @@ class Site {
 	}
 	function Start() {
 		if (isset($_SESSION)) {
-			$this->argv = array_merge(
-				$this->argv,
+			$this->ARGV = array_merge(
+				$this->ARGV,
 				array_prepend_keys($_SESSION,'s_'));
 		}
 	}
@@ -28,7 +28,7 @@ class Site {
 				$page = new $MODULE($this, $METHOD);
 				$page->Start();
 				$handlers = $page->get_handlers($METHOD);
-				foreach($this->argv as $argk=>$argv) {
+				foreach($this->ARGV as $argk=>$argv) {
 					if (in_array($argk, $handlers) &&
 						false !== $page->Run($argk)) {
 						$nCalls++;
@@ -47,26 +47,22 @@ class Site {
 }
 
 class Page {
-	var $site;
-	var $method;
-	var $uri;
-	var $argv;
+	var $SITE, $METHOD, $URI;
 	function __construct($site, $method) {
-		$this->argv = $site->argv;
-		foreach($this->argv as $k=>$v)
+		$this->SITE = $site;
+		$this->METHOD = $method;
+		foreach($site->ARGV as $k=>$v)
 			$this->$k = $v;
-		$this->site = $site;
-		$this->uri = $site->uri;
-		$this->method = $method;
+		$this->URI = $site->URI;
 	}
 	function get_handlers() {
-		$handlers = isset($this->handlers[$this->method]) ?
-					$this->handlers[$this->method] : array();
+		$handlers = isset($this->handlers[$this->METHOD]) ?
+					$this->handlers[$this->METHOD] : array();
 		return $handlers;
 	}
 	function has_handler($handler) {
-		return isset($this->handlers[$this->method]) ?
-				in_array($handler, $this->handlers[$this->method]) : false;
+		return isset($this->handlers[$this->METHOD]) ?
+				in_array($handler, $this->handlers[$this->METHOD]) : false;
 	}
 
 	function Start() {}
-- 
2.45.0