Changeset 6662

Timestamp:

12/21/07 08:22:20 (2 years ago)

Author:

fabien

Message:

moved 404 management from response to controller, removed sfConfig dependency from response sub-framework

Files:

• branches/1.1/lib/config/sfFactoryConfigHandler.class.php (modified) (1 diff)
• branches/1.1/lib/controller/sfController.class.php (modified) (1 diff)
• branches/1.1/lib/response/sfResponse.class.php (modified) (1 diff)
• branches/1.1/lib/response/sfWebResponse.class.php (modified) (8 diffs)

branches/1.1/lib/config/sfFactoryConfigHandler.class.php

@@ -106 +106 @@
-
-        case 'response':
+          $parameters = array_merge(array('charset' => sfConfig::get('sf_charset'), 'logging' => sfConfig::get('sf_logging_enabled')), is_array($parameters) ? $parameters : array());
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', %s));", $class, var_export($parameters, true));
-

branches/1.1/lib/controller/sfController.class.php

@@ -251 +251 @@
-      $this->context->getEventDispatcher()->notify(new sfEvent($this, 'controller.change_action', array('module' => $moduleName, 'action' => $actionName)));
-
+      if ($moduleName == sfConfig::get('sf_error_404_module') && $actionName == sfConfig::get('sf_error_404_action'))
+      {
+        $this->context->getResponse()->setStatusCode(404);
+        $this->context->getResponse()->setHttpHeader('Status', '404 Not Found');
+
+        $this->dispatcher->notify(new sfEvent($this, 'controller.page_not_found', array('module' => $moduleName, 'action' => $actionName)));
+      }
+
-      // process the filter chain
-      $filterChain->execute();

branches/1.1/lib/response/sfResponse.class.php

@@ -81 +81 @@
-    $content = $event->getReturnValue();
-
-sfConfig::get('sf_logging_enabled
+$this->getParameter('logging
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send content (%s o)', strlen($content)))));

branches/1.1/lib/response/sfWebResponse.class.php

@@ -47 +47 @@
-  {
-    parent::initialize($dispatcher, $parameters);
-
-    $this->dispatcher->connect('controller.change_action', array($this, 'listenToChangeActionEvent'));
-
-    $this->statusTexts = array(
@@ -251 +249 @@
-    if (false === stripos($value, 'charset'))
-    {
-sfConfig::get('sf_
+$this->getParameter('
-    }
-
@@ -264 +262 @@
-  public function getContentType()
-  {
-sfConfig::get('sf_
+$this->getParameter('
-  }
-
@@ -282 +280 @@
-    header($status);
-
-sfConfig::get('sf_logging_enabled
+$this->getParameter('logging
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send status "%s"', $status))));
@@ -292 +290 @@
-      header($name.': '.$value);
-
-sfConfig::get('sf_logging_enabled
+$this->getParameter('logging
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send header "%s": "%s"', $name, $value))));
@@ -310 +308 @@
-      }
-
-sfConfig::get('sf_logging_enabled
+$this->getParameter('logging
-      {
-        $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Send cookie "%s": "%s"', $cookie['name'], $cookie['value']))));
@@ -508 +506 @@
-    if ($escape)
-    {
-sfConfig::get('sf_
+$this->getParameter('
-    }
-
@@ -699 +697 @@
-    list($this->content, $this->statusCode, $this->statusText, $this->parameterHolder, $this->cookies, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots) = $data;
-  }
-
-  /**
-   * Listens to the controller.change_action event.
-   *
-   * @param sfEvent An sfEvent instance
-   *
-   */
-  public function listenToChangeActionEvent(sfEvent $event)
-  {
-    $moduleName = $event['module'];
-    $actionName = $event['action'];
-
-    if ($moduleName == sfConfig::get('sf_error_404_module') && $actionName == sfConfig::get('sf_error_404_action'))
-    {
-      $this->setStatusCode(404);
-      $this->setHttpHeader('Status', '404 Not Found');
-
-      $this->dispatcher->notify(new sfEvent($this, 'controller.page_not_found', array('module' => $moduleName, 'action' => $actionName)));
-    }
-  }
-}