Changeset 1137

Show
Ignore:
Timestamp:
12/11/07 12:53:47 (9 months ago)
Author:
mikey
Message:

added ssl mode as cache variable

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/net/stubbles/websites/memphis/stubMemphisProcessor.php

    r1136 r1137  
    167167        $this->cache->addCacheVar('frame', $frameId); 
    168168        $this->cache->addCacheVar('variant', $this->session->getValue('net.stubbles.websites.variantmanager.variant', '')); 
     169        $sslMode = 'no'; 
     170        if ($this->request->validateValue(new stubEqualValidator(443), 'SERVER_PORT', stubRequest::SOURCE_HEADER) === true) { 
     171            $sslMode = 'yes'; 
     172        } 
     173         
     174        $this->cache->addCacheVar('ssl', $sslMode); 
    169175        foreach ($this->config->getParts() as $part) { 
    170176            $context['part'] = $part; 

  • trunk/src/test/php/net/stubbles/websites/memphis/stubMemphisProcessorTestCase.php

    r1136 r1137  
    471471        $mockCache->expectAt(1, 'addCacheVar', array('frame', 'bar')); 
    472472        $mockCache->expectAt(2, 'addCacheVar', array('variant', null)); 
     473        $mockCache->expectAt(3, 'addCacheVar', array('ssl', 'no')); 
    473474        $mockCache->expectAt(0, 'addCacheVars', array(array('one' => 'defaultMock2'))); 
    474475        $mockCache->expectAt(1, 'addCacheVars', array(array('two' => 'Mock2'))); 
    475476        $mockCache->expectAt(2, 'addCacheVars', array(array('one' => 'defaultMock2'))); 
    476477        $mockCache->expectAt(3, 'addCacheVars', array(array('two' => 'Mock2'))); 
    477         $mockCache->expectCallcount('addCacheVar', 3); 
     478        $mockCache->expectCallcount('addCacheVar', 4); 
    478479        $mockCache->expectCallcount('addCacheVars', 4); 
    479480        $mockCache->expectAt(0, 'addUsedFiles', array(array('defaultMock2.tmpl')));