@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * ESI DECODER |
|
4 | - * |
|
5 | - * This tool can be used to decode an ESI request. |
|
6 | - * You can just paste the whole ESI URL and push the button to decode it. |
|
7 | - * |
|
8 | - * Make sure you place this utility on a protected spot on your web server where only authorized users can use it. |
|
9 | - * |
|
10 | - * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item: |
|
11 | - * https://github.com/nexcess/magento-turpentine/wiki/FAQ#im-using-varnishncsa-to-generate-logs-and-the-esi-urls-are-cut-off-how-do-i-get-the-full-url-in-the-logs |
|
12 | - * |
|
13 | - */ |
|
3 | + * ESI DECODER |
|
4 | + * |
|
5 | + * This tool can be used to decode an ESI request. |
|
6 | + * You can just paste the whole ESI URL and push the button to decode it. |
|
7 | + * |
|
8 | + * Make sure you place this utility on a protected spot on your web server where only authorized users can use it. |
|
9 | + * |
|
10 | + * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item: |
|
11 | + * https://github.com/nexcess/magento-turpentine/wiki/FAQ#im-using-varnishncsa-to-generate-logs-and-the-esi-urls-are-cut-off-how-do-i-get-the-full-url-in-the-logs |
|
12 | + * |
|
13 | + */ |
|
14 | 14 | |
15 | 15 | $tries = 5; |
16 | 16 | $dir = dirname(__FILE__); |
@@ -56,7 +56,7 @@ |
||
56 | 56 | */ |
57 | 57 | public function renewFormKey() |
58 | 58 | { |
59 | - $this->setData('_form_key', Mage::helper('core')->getRandomString(16)); |
|
59 | + $this->setData('_form_key', Mage::helper('core')->getRandomString(16)); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -183,9 +183,9 @@ |
||
183 | 183 | } |
184 | 184 | } |
185 | 185 | $layout = Mage::getSingleton('core/layout'); |
186 | - Mage::getSingleton( 'core/design_package' ) |
|
187 | - ->setPackageName( $esiData->getDesignPackage() ) |
|
188 | - ->setTheme( $esiData->getDesignTheme() ); |
|
186 | + Mage::getSingleton('core/design_package') |
|
187 | + ->setPackageName($esiData->getDesignPackage()) |
|
188 | + ->setTheme($esiData->getDesignTheme()); |
|
189 | 189 | |
190 | 190 | // dispatch event for adding handles to layout update |
191 | 191 | Mage::dispatchEvent( |
@@ -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 | } |
@@ -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), |
@@ -21,19 +21,19 @@ |
||
21 | 21 | |
22 | 22 | class Nexcessnet_Turpentine_Block_Poll_ActivePoll extends Mage_Poll_Block_ActivePoll { |
23 | 23 | |
24 | - public function setTemplate($template) |
|
25 | - { |
|
26 | - if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) && |
|
27 | - (!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll'))) |
|
28 | - { |
|
29 | - $this->_template = $template; |
|
30 | - $this->setPollTemplate('turpentine/ajax.phtml', 'poll'); |
|
31 | - $this->setPollTemplate('turpentine/ajax.phtml', 'results'); |
|
32 | - } |
|
33 | - else |
|
34 | - { |
|
35 | - // Mage_Poll is disabled, so do nothing |
|
36 | - } |
|
37 | - return $this; |
|
38 | - } |
|
24 | + public function setTemplate($template) |
|
25 | + { |
|
26 | + if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) && |
|
27 | + (!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll'))) |
|
28 | + { |
|
29 | + $this->_template = $template; |
|
30 | + $this->setPollTemplate('turpentine/ajax.phtml', 'poll'); |
|
31 | + $this->setPollTemplate('turpentine/ajax.phtml', 'results'); |
|
32 | + } |
|
33 | + else |
|
34 | + { |
|
35 | + // Mage_Poll is disabled, so do nothing |
|
36 | + } |
|
37 | + return $this; |
|
38 | + } |
|
39 | 39 | } |
@@ -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'); |
@@ -29,8 +29,7 @@ |
||
29 | 29 | $this->_template = $template; |
30 | 30 | $this->setPollTemplate('turpentine/ajax.phtml', 'poll'); |
31 | 31 | $this->setPollTemplate('turpentine/ajax.phtml', 'results'); |
32 | - } |
|
33 | - else |
|
32 | + } else |
|
34 | 33 | { |
35 | 34 | // Mage_Poll is disabled, so do nothing |
36 | 35 | } |
@@ -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 | /** |
@@ -150,8 +150,7 @@ discard block |
||
150 | 150 | Mage::getStoreConfig('turpentine_varnish/servers/custom_vcl_template'), |
151 | 151 | array('root_dir' => Mage::getBaseDir()) |
152 | 152 | ); |
153 | - if (is_file($filePath)) { return $filePath; } |
|
154 | - else { return null; } |
|
153 | + if (is_file($filePath)) { return $filePath; } else { return null; } |
|
155 | 154 | } |
156 | 155 | |
157 | 156 | |
@@ -988,7 +987,7 @@ discard block |
||
988 | 987 | } |
989 | 988 | } |
990 | 989 | EOS; |
991 | - }else{ |
|
990 | + } else{ |
|
992 | 991 | $tpl_750 = ' |
993 | 992 | sub vcl_synth { |
994 | 993 | if (resp.status == 750) { |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | * |
132 | 132 | * @return string |
133 | 133 | */ |
134 | - protected function _getCustomIncludeFilename($position='') { |
|
134 | + protected function _getCustomIncludeFilename($position = '') { |
|
135 | 135 | $key = 'custom_include_file'; |
136 | 136 | $key .= ($position) ? '_'.$position : ''; |
137 | 137 | return $this->_formatTemplate( |
@@ -193,8 +193,8 @@ discard block |
||
193 | 193 | */ |
194 | 194 | protected function _getAdminFrontname() { |
195 | 195 | if (Mage::getStoreConfig('admin/url/use_custom_path')) { |
196 | - if(Mage::getStoreConfig('web/url/use_store')) { |
|
197 | - return Mage::getModel('core/store')->load(0)->getCode() . "/" . Mage::getStoreConfig('admin/url/custom_path'); |
|
196 | + if (Mage::getStoreConfig('web/url/use_store')) { |
|
197 | + return Mage::getModel('core/store')->load(0)->getCode()."/".Mage::getStoreConfig('admin/url/custom_path'); |
|
198 | 198 | } else { |
199 | 199 | return Mage::getStoreConfig('admin/url/custom_path'); |
200 | 200 | } |
@@ -909,8 +909,8 @@ discard block |
||
909 | 909 | */ |
910 | 910 | protected function _vcl_sub_https_redirect_fix() { |
911 | 911 | $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB); |
912 | - $baseUrl = str_replace(array('http://','https://'), '', $baseUrl); |
|
913 | - $baseUrl = rtrim($baseUrl,'/'); |
|
912 | + $baseUrl = str_replace(array('http://', 'https://'), '', $baseUrl); |
|
913 | + $baseUrl = rtrim($baseUrl, '/'); |
|
914 | 914 | |
915 | 915 | switch (Mage::getStoreConfig('turpentine_varnish/servers/version')) { |
916 | 916 | case 4.0: |
@@ -982,7 +982,7 @@ discard block |
||
982 | 982 | { |
983 | 983 | $tpl = $this->_vcl_sub_synth(); |
984 | 984 | |
985 | - if(!$tpl){ |
|
985 | + if ( ! $tpl) { |
|
986 | 986 | $tpl = <<<EOS |
987 | 987 | sub vcl_synth { |
988 | 988 | if (resp.status == 750) { |
@@ -992,7 +992,7 @@ discard block |
||
992 | 992 | } |
993 | 993 | } |
994 | 994 | EOS; |
995 | - }else{ |
|
995 | + } else { |
|
996 | 996 | $tpl_750 = ' |
997 | 997 | sub vcl_synth { |
998 | 998 | if (resp.status == 750) { |
@@ -1089,12 +1089,12 @@ discard block |
||
1089 | 1089 | |
1090 | 1090 | if (Mage::getStoreConfig('turpentine_varnish/general/https_redirect_fix')) { |
1091 | 1091 | $vars['https_redirect'] = $this->_vcl_sub_https_redirect_fix(); |
1092 | - if(Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.0' || Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.1'){ |
|
1092 | + if (Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.0' || Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.1') { |
|
1093 | 1093 | $vars['vcl_synth'] = $this->_vcl_sub_synth_https_fix(); |
1094 | 1094 | } |
1095 | 1095 | } |
1096 | 1096 | |
1097 | - foreach (array('','top') as $position) { |
|
1097 | + foreach (array('', 'top') as $position) { |
|
1098 | 1098 | $customIncludeFile = $this->_getCustomIncludeFilename($position); |
1099 | 1099 | if (is_readable($customIncludeFile)) { |
1100 | 1100 | $key = 'custom_vcl_include'; |
@@ -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 @@ discard block |
||
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 && |
@@ -332,8 +332,8 @@ discard block |
||
332 | 332 | $methodParam = $esiHelper->getEsiMethodParam(); |
333 | 333 | $esiData = new Varien_Object(); |
334 | 334 | $esiData->setStoreId(Mage::app()->getStore()->getId()); |
335 | - $esiData->setDesignPackage( Mage::getDesign()->getPackageName() ); |
|
336 | - $esiData->setDesignTheme( Mage::getDesign()->getTheme( 'layout' ) ); |
|
335 | + $esiData->setDesignPackage(Mage::getDesign()->getPackageName()); |
|
336 | + $esiData->setDesignTheme(Mage::getDesign()->getTheme('layout')); |
|
337 | 337 | $esiData->setNameInLayout($blockObject->getNameInLayout()); |
338 | 338 | $esiData->setBlockType(get_class($blockObject)); |
339 | 339 | $esiData->setLayoutHandles($this->_getBlockLayoutHandles($blockObject)); |