@@ -87,13 +87,13 @@ discard block |
||
87 | 87 | $backendNodes = Mage::helper('turpentine/data')->cleanExplode(PHP_EOL, |
88 | 88 | Mage::getStoreConfig('turpentine_vcl/backend/backend_nodes')); |
89 | 89 | |
90 | - for($i = 0, $iMax = count($backendNodes); $i < $iMax; $i++) { |
|
90 | + for ($i = 0, $iMax = count($backendNodes); $i < $iMax; $i++) { |
|
91 | 91 | $tpl .= <<<EOS |
92 | 92 | vdir.add_backend(web{$i}); |
93 | 93 | EOS; |
94 | 94 | } |
95 | 95 | |
96 | - for($i = 0, $iMax = count($adminBackendNodes); $i < $iMax; $i++) { |
|
96 | + for ($i = 0, $iMax = count($adminBackendNodes); $i < $iMax; $i++) { |
|
97 | 97 | $tpl .= <<<EOS |
98 | 98 | vdir_admin.add_backend(webadmin{$i}); |
99 | 99 | EOS; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | Mage::getStoreConfig('turpentine_vcl/backend/backend_nodes')); |
126 | 126 | $probeUrl = Mage::getStoreConfig('turpentine_vcl/backend/backend_probe_url'); |
127 | 127 | |
128 | - if('admin' == $name) { |
|
128 | + if ('admin' == $name) { |
|
129 | 129 | $prefix = 'admin'; |
130 | 130 | } else { |
131 | 131 | $prefix = ''; |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | $parts = explode(':', $backendNode, 2); |
139 | 139 | $host = (empty($parts[0])) ? '127.0.0.1' : $parts[0]; |
140 | 140 | $port = (empty($parts[1])) ? '80' : $parts[1]; |
141 | - $backends .= $this->_vcl_director_backend($host, $port, $prefix . $number, $probeUrl, $backendOptions); |
|
141 | + $backends .= $this->_vcl_director_backend($host, $port, $prefix.$number, $probeUrl, $backendOptions); |
|
142 | 142 | |
143 | 143 | $number++; |
144 | 144 | } |
@@ -24,7 +24,7 @@ |
||
24 | 24 | public function setTemplate($template) |
25 | 25 | { |
26 | 26 | if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) && |
27 | - (!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll'))) |
|
27 | + ( ! Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll'))) |
|
28 | 28 | { |
29 | 29 | $this->_template = $template; |
30 | 30 | $this->setPollTemplate('turpentine/ajax.phtml', 'poll'); |
@@ -500,7 +500,7 @@ |
||
500 | 500 | $response['code'], $response['text'] )); |
501 | 501 | } else { |
502 | 502 | if (Mage::getStoreConfig('turpentine_varnish/general/varnish_log_commands')) { |
503 | - Mage::helper('turpentine/debug')->logDebug('VARNISH command sent: ' . $data); |
|
503 | + Mage::helper('turpentine/debug')->logDebug('VARNISH command sent: '.$data); |
|
504 | 504 | } |
505 | 505 | return $response; |
506 | 506 | } |
@@ -227,9 +227,9 @@ |
||
227 | 227 | 'Checking ESI block candidate: %s', |
228 | 228 | $blockObject->getNameInLayout() ? $blockObject->getNameInLayout() : $blockObject->getModuleName() ); |
229 | 229 | |
230 | - $debugHelper->logInfo( "-- block testing: shouldResponseUseEsi = " . $esiHelper->shouldResponseUseEsi()); |
|
231 | - $debugHelper->logInfo( "-- block testing: instanceof Mage_Core_Block_Template = " . $blockObject instanceof Mage_Core_Block_Template ); |
|
232 | - $debugHelper->logInfo( "-- block testing: Esi Options = " . print_r($blockObject->getEsiOptions(), true) ); |
|
230 | + $debugHelper->logInfo("-- block testing: shouldResponseUseEsi = ".$esiHelper->shouldResponseUseEsi()); |
|
231 | + $debugHelper->logInfo("-- block testing: instanceof Mage_Core_Block_Template = ".$blockObject instanceof Mage_Core_Block_Template); |
|
232 | + $debugHelper->logInfo("-- block testing: Esi Options = ".print_r($blockObject->getEsiOptions(), true)); |
|
233 | 233 | } |
234 | 234 | if ($esiHelper->shouldResponseUseEsi() && |
235 | 235 | $blockObject instanceof Mage_Core_Block_Template && |
@@ -190,8 +190,8 @@ discard block |
||
190 | 190 | */ |
191 | 191 | protected function _getAdminFrontname() { |
192 | 192 | if (Mage::getStoreConfig('admin/url/use_custom_path')) { |
193 | - if(Mage::getStoreConfig('web/url/use_store')) { |
|
194 | - return Mage::getModel('core/store')->load(0)->getCode() . "/" . Mage::getStoreConfig('admin/url/custom_path'); |
|
193 | + if (Mage::getStoreConfig('web/url/use_store')) { |
|
194 | + return Mage::getModel('core/store')->load(0)->getCode()."/".Mage::getStoreConfig('admin/url/custom_path'); |
|
195 | 195 | } else { |
196 | 196 | return Mage::getStoreConfig('admin/url/custom_path'); |
197 | 197 | } |
@@ -905,8 +905,8 @@ discard block |
||
905 | 905 | */ |
906 | 906 | protected function _vcl_sub_https_redirect_fix() { |
907 | 907 | $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB); |
908 | - $baseUrl = str_replace(array('http://','https://'), '', $baseUrl); |
|
909 | - $baseUrl = rtrim($baseUrl,'/'); |
|
908 | + $baseUrl = str_replace(array('http://', 'https://'), '', $baseUrl); |
|
909 | + $baseUrl = rtrim($baseUrl, '/'); |
|
910 | 910 | |
911 | 911 | $tpl = <<<EOS |
912 | 912 | if ( (req.http.host ~ "^(?i)www.$baseUrl" || req.http.host ~ "^(?i)$baseUrl") && req.http.X-Forwarded-Proto !~ "(?i)https") { |