@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * |
131 | 131 | * @return string |
132 | 132 | */ |
133 | - protected function _getCustomIncludeFilename($position='') { |
|
133 | + protected function _getCustomIncludeFilename($position = '') { |
|
134 | 134 | $key = 'custom_include_file'; |
135 | 135 | $key .= ($position) ? '_'.$position : ''; |
136 | 136 | return $this->_formatTemplate( |
@@ -192,8 +192,8 @@ discard block |
||
192 | 192 | */ |
193 | 193 | protected function _getAdminFrontname() { |
194 | 194 | if (Mage::getStoreConfig('admin/url/use_custom_path')) { |
195 | - if(Mage::getStoreConfig('web/url/use_store')) { |
|
196 | - return Mage::getModel('core/store')->load(0)->getCode() . "/" . Mage::getStoreConfig('admin/url/custom_path'); |
|
195 | + if (Mage::getStoreConfig('web/url/use_store')) { |
|
196 | + return Mage::getModel('core/store')->load(0)->getCode()."/".Mage::getStoreConfig('admin/url/custom_path'); |
|
197 | 197 | } else { |
198 | 198 | return Mage::getStoreConfig('admin/url/custom_path'); |
199 | 199 | } |
@@ -907,8 +907,8 @@ discard block |
||
907 | 907 | */ |
908 | 908 | protected function _vcl_sub_https_redirect_fix() { |
909 | 909 | $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB); |
910 | - $baseUrl = str_replace(array('http://','https://'), '', $baseUrl); |
|
911 | - $baseUrl = rtrim($baseUrl,'/'); |
|
910 | + $baseUrl = str_replace(array('http://', 'https://'), '', $baseUrl); |
|
911 | + $baseUrl = rtrim($baseUrl, '/'); |
|
912 | 912 | |
913 | 913 | $tpl = <<<EOS |
914 | 914 | if ( (req.http.host ~ "^(?i)www.$baseUrl" || req.http.host ~ "^(?i)$baseUrl") && req.http.X-Forwarded-Proto !~ "(?i)https") { |
@@ -1042,7 +1042,7 @@ discard block |
||
1042 | 1042 | $vars['https_redirect'] = $this->_vcl_sub_https_redirect_fix(); |
1043 | 1043 | } |
1044 | 1044 | |
1045 | - foreach (array('','top') as $position) { |
|
1045 | + foreach (array('', 'top') as $position) { |
|
1046 | 1046 | $customIncludeFile = $this->_getCustomIncludeFilename($position); |
1047 | 1047 | if (is_readable($customIncludeFile)) { |
1048 | 1048 | $key = 'custom_vcl_include'; |