@@ -35,8 +35,7 @@ |
||
35 | 35 | $customTemplate = $this->_getCustomTemplateFilename(); |
36 | 36 | if ($customTemplate) { |
37 | 37 | $tplFile = $customTemplate; |
38 | - } |
|
39 | - else { |
|
38 | + } else { |
|
40 | 39 | $tplFile = $this->_getVclTemplateFilename(self::VCL_TEMPLATE_FILE); |
41 | 40 | } |
42 | 41 | $vcl = $this->_formatTemplate(file_get_contents($tplFile), |
@@ -110,8 +110,8 @@ |
||
110 | 110 | * @return string |
111 | 111 | */ |
112 | 112 | protected function _getVclTemplateFilename($baseFilename) { |
113 | - $extensionDir = Mage::getModuleDir('', 'Nexcessnet_Turpentine'); |
|
114 | - return sprintf('%s/misc/%s', $extensionDir, $baseFilename); |
|
113 | + $extensionDir = Mage::getModuleDir('', 'Nexcessnet_Turpentine'); |
|
114 | + return sprintf('%s/misc/%s', $extensionDir, $baseFilename); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -148,8 +148,7 @@ discard block |
||
148 | 148 | Mage::getStoreConfig('turpentine_varnish/servers/custom_vcl_template'), |
149 | 149 | array('root_dir' => Mage::getBaseDir()) |
150 | 150 | ); |
151 | - if (is_file($filePath)) { return $filePath; } |
|
152 | - else { return null; } |
|
151 | + if (is_file($filePath)) { return $filePath; } else { return null; } |
|
153 | 152 | } |
154 | 153 | |
155 | 154 | |
@@ -414,8 +413,7 @@ discard block |
||
414 | 413 | * @return string |
415 | 414 | */ |
416 | 415 | protected function _getGenerateSessionStart() { |
417 | - if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return ''; } |
|
418 | - else { return '/* -- REMOVED'; } |
|
416 | + if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return ''; } else { return '/* -- REMOVED'; } |
|
419 | 417 | } |
420 | 418 | |
421 | 419 | /** |
@@ -424,8 +422,7 @@ discard block |
||
424 | 422 | * @return string |
425 | 423 | */ |
426 | 424 | protected function _getGenerateSessionEnd() { |
427 | - if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return ''; } |
|
428 | - else { return '-- */'; } |
|
425 | + if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return ''; } else { return '-- */'; } |
|
429 | 426 | } |
430 | 427 | |
431 | 428 | |
@@ -435,8 +432,7 @@ discard block |
||
435 | 432 | * @return string |
436 | 433 | */ |
437 | 434 | protected function _getGenerateSession() { |
438 | - if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return 'call generate_session;'; } |
|
439 | - else { return 'return (pipe);'; } |
|
435 | + if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return 'call generate_session;'; } else { return 'return (pipe);'; } |
|
440 | 436 | } |
441 | 437 | |
442 | 438 | |
@@ -446,8 +442,7 @@ discard block |
||
446 | 442 | * @return string |
447 | 443 | */ |
448 | 444 | protected function _getGenerateSessionExpires() { |
449 | - if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return 'call generate_session_expires;'; } |
|
450 | - else { return ''; } |
|
445 | + if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return 'call generate_session_expires;'; } else { return ''; } |
|
451 | 446 | } |
452 | 447 | |
453 | 448 | /** |
@@ -35,8 +35,7 @@ |
||
35 | 35 | $customTemplate = $this->_getCustomTemplateFilename(); |
36 | 36 | if ($customTemplate) { |
37 | 37 | $tplFile = $customTemplate; |
38 | - } |
|
39 | - else { |
|
38 | + } else { |
|
40 | 39 | $tplFile = $this->_getVclTemplateFilename(self::VCL_TEMPLATE_FILE); |
41 | 40 | } |
42 | 41 | $vcl = $this->_formatTemplate(file_get_contents($tplFile), |