Changeset 2686

Timestamp:

08/20/08 11:11:40 (5 months ago)

Author:

david

Message:

merge [2663:2685/branches/0.11]

Location:

branches/1.0

Files:

• CHANGELOG (modified) (1 diff)
• src/database/AgaviDoctrineDatabase.class.php (modified) (1 diff)
• src/filter/AgaviFormPopulationFilter.class.php (modified) (2 diffs)
• src/request/AgaviWebserviceRequest.class.php (modified) (1 diff)
• src/response/AgaviWebResponse.class.php (modified) (3 diffs)
• src/view/AgaviView.class.php (modified) (1 diff)

branches/1.0/CHANGELOG

@@ -41 +41 @@
 ----------------------------
 
-ADD: Set current Context instance on Doctrine connections (#800) (David)
+ADD: Allow ignoring of (X)HTML parse errors in FPF (#613) (David)
+ADD: Set current Context instance on Doctrine connections (#800, #808) (David)
 ADD: Support for doctrine connection settings and options (#788) (David)
 
+CHG: Enhance HTTP status code validation for AgaviWebResponse::setRedirect() (#804) (David)
 CHG: Update timezone database to 2008e (#806) (David)
 CHG: Dump "xhtml" output type from sample app and introduce a replacement (#802) (David)
 CHG: Assigning of "inner" content to $slots template array should be configurable (#793) (David)
 
+FIX: AgaviView::initialize() incorrectly assigns container's response to a property (#813) (David)
 FIX: AgaviExecutionTimeFilter runs only once (#801) (David)
 FIX: PEAR installations place src/routing/soap files in the data directory rather than the source directory (#799) (Noah)

branches/1.0/src/database/AgaviDoctrineDatabase.class.php

@@ -113 +113 @@
       
       // set the context instance as a connection parameter
-      $this->connection->setParam('context', $this->context, 'org.agavi');
+      $this->connection->setParam('context', $databaseManager->getContext(), 'org.agavi');
       
       // charset

branches/1.0/src/filter/AgaviFormPopulationFilter.class.php

@@ -192 +192 @@
         $lm->log($m, $cfg['logging_logger']);
       }
+      
+      // all in all, that didn't go so well. let's see if we should just silently abort instead of throwin an exception
+      if($cfg['ignore_parse_errors']) {
+        return;
+      }
+      
       throw new AgaviParseException($emsg);
     }
@@ -896 +902 @@
       'multi_field_error_messages' => array(),
 
+      'ignore_parse_errors'        => false,
       'log_parse_errors'           => true,
       'logging_severity'           => AgaviLogger::FATAL,

branches/1.0/src/request/AgaviWebserviceRequest.class.php

@@ -115 +115 @@
     $this->invokedMethod = $method;
     
-    // let the routing update it's input
+    // let the routing update its input
     $this->context->getRouting()->updateInput();
   }

branches/1.0/src/response/AgaviWebResponse.class.php

@@ -297 +297 @@
   }
   
+  /**
+   * Check if the given HTTP status code is valid.
+   *
+   * @param      string A numeric HTTP status code.
+   *
+   * @return     bool True, if the code is valid, or false otherwise.
+   *
+   * @author     David Zülke <david.zuelke@bitextender.com>
+   * @since      0.11.3
+   */
+  public function validateHttpStatusCode($code)
+  {
+    $code = (string)$code;
+    return isset($this->httpStatusCodes[$code]);
+  }
   
   /**
    * Sets a HTTP status code for the response.
    *
-   * @param      string A numeric HTTP status code between 100 and 505.
-   *
-   * @author     David Zülke <dz@bitxtender.com>
-   * @since      0.11.0
-   */
-  public function setHttpStatusCode($code) {
+   * @param      string A numeric HTTP status code.
+   *
+   * @author     David Zülke <dz@bitxtender.com>
+   * @since      0.11.0
+   */
+  public function setHttpStatusCode($code)
+  {
     $code = (string)$code;
-    if(isset($this->httpStatusCodes[$code])) {
+    if($this->validateHttpStatusCode($code)) {
       $this->httpStatusCode = $code;
     } else {
@@ -324 +340 @@
    * @since      0.11.0
    */
-  public function getHttpStatusCode() {
+  public function getHttpStatusCode()
+  {
     return $this->httpStatusCode;
   }
@@ -684 +701 @@
   public function setRedirect($location, $code = 302)
   {
+    if(!$this->validateHttpStatusCode($code)) {
+      throw new AgaviException(sprintf('Invalid %s Redirect Status code: %s', $this->context->getRequest()->getProtocol(), $code));
+    }
     $this->redirect = array('location' => $location, 'code' => $code);
   }

branches/1.0/src/view/AgaviView.class.php

@@ -120 +120 @@
 
     $this->context = $container->getContext();
-
-    $this->response = $container->getResponse();
   }