fixed handler processing for new argv

[sql-web.git] / lib / joe / site.lib.php

diff --git a/lib/joe/site.lib.php b/lib/joe/site.lib.php
index 3496242ae8920edab9ea0abd876dcfa3f02c4f61..e780e8dbc15b70c6d2e38cc717e7b3b1c2aac595 100755 (executable)
--- a/lib/joe/site.lib.php
+++ b/lib/joe/site.lib.php
@@ -4,55 +4,78 @@
  */
 
 class Site {
-       function Start() {}
-       function Finish() {}
-
-       function Call($MODULE, $METHOD) {
+       var $uri, $argv;
+       function __construct($uri) {
+               $this->uri = $uri;
+               $this->argv = array_merge(
+                       array_prepend_keys($_COOKIE,'c_'),
+                       array_prepend_keys($_FILES,'f_'),
+                       array_prepend_keys($_GET,'g_'),
+                       array_prepend_keys($_POST,'p_'));
+       }
+       function Start() {
+               if (isset($_SESSION)) {
+                       $this->argv = array_merge(
+                               $this->argv,
+                               array_prepend_keys($_SESSION,'s_'));
+               }
+       }
+       function Run($MODULE, $METHOD) {
                $nCalls = 0;
-               if (file_exists('site/'.$MODULE.'.php')) {
+               if (file_exists(strtolower('site/'.$MODULE.'.php'))) {
                        require_once strtolower('site/'.$MODULE.'.php');
                        if (class_exists($MODULE)) {
-                               $object = new $MODULE;
-                               $object->Start();
-                               $handlers = $object->get_handlers($METHOD);
-                               switch ($METHOD) {
-                                       case 'GET':
-                                       case 'get':
-                                               $argv = array_merge($_COOKIE, $_FILES, $_POST, $_GET, isset($_SESSION)?$_SESSION:array()); break;
-                                       case 'POST':
-                                       case 'post':
-                                       default:
-                                               $argv = array_merge($_COOKIE, $_FILES, $_GET, $_POST, isset($_SESSION)?$_SESSION:array()); break;
-                               }
-                               foreach($handlers as $handler) {
-                                       if (isset($argv[$handler]) &&
-                                               is_callable($object, $handler)) {
-                                               call_user_func_array(array($object, $handler), $argv);
+                               $page = new $MODULE($this, $METHOD);
+                               $page->Start();
+                               $handlers = $page->get_handlers($METHOD);
+                               foreach($this->argv as $argk=>$argv) {
+                                       if (in_array($argk, $handlers) &&
+                                               false !== $page->Run($argk)) {
                                                $nCalls++;
                                        }
                                }
-                               if ($nCalls == 0 && is_callable($object, 'default')) {
-                                       call_user_func_array(array($object, $handler), $argv);
+                               if ($nCalls == 0 && is_callable(array($page, '_default'))) {
+                                       $page->Run('_default');
                                        $nCalls++;
                                }
-                               $object->Finish();
+                               $page->Finish();
                        }
                }
                return $nCalls;
        }
+       function Finish() {}
 }
 
 class Page {
-       function Start() {}
-       function Finish() {}
-
-       function get_handlers($method) {
-               $handlers = isset($this->handlers[$method]) ?
-                                       $this->handlers[$method] :
-                                       array('default');
+       var $site;
+       var $method;
+       var $uri;
+       var $argv;
+       function __construct($site, $method) {
+               $this->argv = $site->argv;
+               foreach($this->argv as $k=>$v)
+                       $this->$k = $v;
+               $this->site = $site;
+               $this->uri = $site->uri;
+               $this->method = $method;
+       }
+       function get_handlers() {
+               $handlers = isset($this->handlers[$this->method]) ?
+                                       $this->handlers[$this->method] : array();
                return $handlers;
-               //return array_map(
-               //      create_function('$a','return "_'.$method.'_".$a;'),
-               //      $this->handlers[$method]);
        }
+       function has_handler($handler) {
+               return isset($this->handlers[$this->method]) ?
+                               in_array($handler, $this->handlers[$this->method]) : false;
+       }
+
+       function Start() {}
+       function Run($handler) {
+               if (is_callable(array($this, $handler))) {
+                       return array(0, call_user_func(array($this, $handler)));
+               } else {
+                       return false;
+               }
+       }
+       function Finish() {}
 }