Changeset 20236

Timestamp:

09/30/08 00:04:49 (5 years ago)

Author:

sabel

Message:

update Sabel rev. 2825

Location:

events/phpframework/sabel/trunk/Sabel/sabel

Files:

• Context.php (modified) (3 diffs)
• request/Internal.php (modified) (3 diffs)
• request/Object.php (modified) (1 diff)
• response/Object.php (modified) (1 diff)
• response/Redirector.php (modified) (2 diffs)

events/phpframework/sabel/trunk/Sabel/sabel/Context.php

@@ -14 +14 @@
   protected static $context = null;
   
-  protected $bus        = null;
-  protected $candidate  = null;
-  protected $redirector = null;
-  protected $exception  = null;
+  protected $bus       = null;
+  protected $candidate = null;
+  protected $exception = null;
   
   public static function setContext($context)
@@ -53 +52 @@
   }
   
-  public function setRedirector($redirector)
-  {
-    $this->redirector = $redirector;
-  }
-  
-  public function getRedirector()
-  {
-    return $this->redirector;
-  }
-  
   public function setException($exception)
   {
@@ -72 +61 @@
     return $this->exception;
   }
+  
+  public static function getRequest()
+  {
+    $context = self::getContext();
+    return ($context->bus) ? $context->bus->get("request") : null;
+  }
+  
+  public static function getDestination()
+  {
+    $context = self::getContext();
+    return ($context->bus) ? $context->bus->get("destination") : null;
+  }
+  
+  public static function getSession()
+  {
+    $context = self::getContext();
+    return ($context->bus) ? $context->bus->get("session") : null;
+  }
+  
+  public static function getController()
+  {
+    $context = self::getContext();
+    return ($context->bus) ? $context->bus->get("controller") : null;
+  }
+  
+  public static function getResponse()
+  {
+    $context = self::getContext();
+    return ($context->bus) ? $context->bus->get("response") : null;
+  }
 }

events/phpframework/sabel/trunk/Sabel/sabel/request/Internal.php

@@ -60 +60 @@
   public function request($uri, Sabel_Bus_Config $config = null)
   {
-    if (strpos($uri, ":")) {
-      $uri = uri($uri);
+    if ($config === null) {
+      if (class_exists("Config_Bus", false)) {
+        $config = new Config_Bus();
+      } else {
+        $message = __METHOD__ . "() class Config_Bus not found.";
+        throw new Sabel_Exception_Runtime($message);
+      }
     }
     
-    $uri = "http://localhost/{$uri}";
-    $parsedUri = parse_url($uri);
-    $request = new Sabel_Request_Object(ltrim($parsedUri["path"], "/"));
+    if (strpos($uri, ":")) {
+      $context = Sabel_Context::getContext();
+      $uri = $context->getCandidate()->uri($uri);
+    } else {
+      $uri = ltrim($uri, "/");
+    }
+    
+    $request = new Sabel_Request_Object($uri);
     
     if (isset($parsedUri["query"])) {
@@ -79 +89 @@
     $currentContext = Sabel_Context::getContext();
     $currentBus = $currentContext->getBus();
-    
     $request->method($this->method);
     $request->values($this->values);
     
+    Sabel_Context::setContext(new Sabel_Context());
+    
     $bus = new Sabel_Bus();
-    $bus->set("request",  $request);
-    $bus->set("session",  $currentBus->get("session"));
-    $bus->set("noLayout", !$this->withLayout);
-    
-    $context = new Sabel_Context();
-    $context->setBus($bus);
-    Sabel_Context::setContext($context);
-    
-    if ($config === null) {
-      $config = new Config_Bus();
-    }
-    
+    $bus->set("request",   $request);
+    $bus->set("session",   $currentBus->get("session"));
+    $bus->set("NO_LAYOUT", !$this->withLayout);
     $bus->run($config);
     
@@ -101 +103 @@
     $this->response["result"]   = $bus->get("result");
     
+    // restore context.
     $currentContext->setBus($currentBus);
     Sabel_Context::setContext($currentContext);

events/phpframework/sabel/trunk/Sabel/sabel/request/Object.php

@@ -281 +281 @@
     
     $result = null;
-    $values = array($this->fetchPostValues(),
-                    $this->fetchGetValues(),
-                    $this->fetchParameterValues());
+    $values = array(
+      $this->fetchPostValues(),
+      $this->fetchGetValues(),
+      $this->fetchParameterValues()
+    );
     
     foreach ($values as $value) {

events/phpframework/sabel/trunk/Sabel/sabel/response/Object.php

@@ -129 +129 @@
   }
   
-  public function setLocation($to, $host = null)
+  public function setLocation($location)
   {
-    if ($host === null) {
-      $this->location = $to;
-    } else {
-      $this->location = "http://" . $host . "/" . ltrim($to, "/");
-    }
-    
+    $this->location = $location;
     $this->status->setCode(Sabel_Response::FOUND);
     

events/phpframework/sabel/trunk/Sabel/sabel/response/Redirector.php

@@ -50 +50 @@
   public function to($uriParameter, $parameters = array())
   {
-    $this->parameters = $parameters;
-    return $this->uri(uri($uriParameter));
+    $context = Sabel_Context::getContext();
+    $uri = $context->getCandidate()->uri($uriParameter);
+    
+    if ($this->parameters = $parameters) {
+      $uri .= "?" . http_build_query($this->parameters, "", "&");
+    }
+    
+    return $this->uri($uri);
   }
   
@@ -80 +86 @@
   public function uri($uri)
   {
+    $this->uri = "/" . ltrim($uri, "/");
     $this->redirected = true;
-    
-    if ($this->hasParameters()) {
-      $this->uri = $uri . "?" . http_build_query($this->parameters, "", "&");
-    } else {
-      $this->uri = $uri;
-    }
     
     return $this->uri;