Development

Changeset 5021

You must first sign up to be able to contribute.

Changeset 5021

Show
Ignore:
Timestamp:
09/09/07 18:26:55 (1 year ago)
Author:
fabien
Message:

small refactoring for redirect and send() method

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/controller/sfWebController.class.php

    r4951 r5021  
    199199    $url = $this->genUrl($url, true); 
    200200 
     201    if (sfConfig::get('sf_logging_enabled')) 
     202    { 
     203      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Redirect to "%s"', $url)))); 
     204    } 
     205 
     206    // redirect 
    201207    $response = $this->context->getResponse(); 
    202  
    203     // redirect 
    204208    $response->clearHttpHeaders(); 
    205209    $response->setStatusCode($statusCode); 
    206210    $response->setHttpHeader('Location', $url); 
    207211    $response->setContent(sprintf('<html><head><meta http-equiv="refresh" content="%d;url=%s"/></head></html>', $delay, htmlentities($url, ENT_QUOTES, sfConfig::get('sf_charset')))); 
    208  
    209     if (sfConfig::get('sf_logging_enabled')) 
    210     { 
    211       $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Redirect to "%s"', $url)))); 
    212     } 
    213  
    214     if (!sfConfig::get('sf_test')) 
    215     { 
    216       $response->sendHttpHeaders(); 
    217     } 
    218     $response->sendContent(); 
     212    $response->send(); 
    219213  } 
    220214} 

  • trunk/lib/filter/sfRenderingFilter.class.php

    r4951 r5021  
    4141    $response = $this->context->getResponse(); 
    4242 
    43     // send headers 
    44     $response->sendHttpHeaders(); 
    45  
    46     // send content 
    47     $response->sendContent(); 
     43    // send headers + content 
     44    $response->send(); 
    4845 
    4946    // log timers information 

  • trunk/lib/response/sfWebResponse.class.php

    r5020 r5021  
    272272  public function sendHttpHeaders() 
    273273  { 
     274    if (sfConfig::get('sf_test')) 
     275    { 
     276      return; 
     277    } 
     278 
    274279    // status 
    275280    $status = 'HTTP/1.0 '.$this->statusCode.' '.$this->statusText;