@@ -138,7 +138,7 @@ |
||
138 | 138 | $result = false; |
139 | 139 | |
140 | 140 | if ($helper->csrfFixupNeeded()) { |
141 | - if ($socket->getVersion() === '4.0' || $socket->getVersion() === '4.1' ) { |
|
141 | + if ($socket->getVersion() === '4.0' || $socket->getVersion() === '4.1') { |
|
142 | 142 | $paramName = 'feature'; |
143 | 143 | $value = $socket->param_show($paramName); |
144 | 144 | $value = explode("\n", $value['text']); |
@@ -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'; |