nexcess / magento-turpentine

app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version3.php

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
         $customTemplate = $this->_getCustomTemplateFilename();
         if ($customTemplate) { 
             $tplFile = $customTemplate;
-        }
-        else { 
+        } else { 
             $tplFile = $this->_getVclTemplateFilename(self::VCL_TEMPLATE_FILE);
         }
         $vcl = $this->_formatTemplate(file_get_contents($tplFile),

app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php

Indentation +2 added lines, -2 removed lines

@@ -110,8 +110,8 @@
      * @return string
      */
     protected function _getVclTemplateFilename($baseFilename) {
-           $extensionDir = Mage::getModuleDir('', 'Nexcessnet_Turpentine');
-           return sprintf('%s/misc/%s', $extensionDir, $baseFilename);
+            $extensionDir = Mage::getModuleDir('', 'Nexcessnet_Turpentine');
+            return sprintf('%s/misc/%s', $extensionDir, $baseFilename);
     }
 
     /**

Braces +5 added lines, -10 removed lines

@@ -148,8 +148,7 @@ 
             Mage::getStoreConfig('turpentine_varnish/servers/custom_vcl_template'),
             array('root_dir' => Mage::getBaseDir())
         );
-        if (is_file($filePath)) { return $filePath; }
-        else { return null; }
+        if (is_file($filePath)) { return $filePath; } else { return null; }
     }
 
 
@@ -414,8 +413,7 @@ 
      * @return string
      */
     protected function _getGenerateSessionStart() {
-        if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return ''; }
-        else { return '/* -- REMOVED'; }
+        if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return ''; } else { return '/* -- REMOVED'; }
     }
 
     /**
@@ -424,8 +422,7 @@ 
      * @return string
      */
     protected function _getGenerateSessionEnd() {
-        if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return ''; }
-        else { return '-- */'; }
+        if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return ''; } else { return '-- */'; }
     }
 
 
@@ -435,8 +432,7 @@ 
      * @return string
      */
     protected function _getGenerateSession() {
-        if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return 'call generate_session;'; }
-        else { return 'return (pipe);'; }
+        if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return 'call generate_session;'; } else { return 'return (pipe);'; }
     }
 
 
@@ -446,8 +442,7 @@ 
      * @return string
      */
     protected function _getGenerateSessionExpires() {
-        if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return 'call generate_session_expires;'; }
-        else { return ''; }
+        if (Mage::getStoreConfig('turpentine_varnish/general/vcl_fix') == 1) { return 'call generate_session_expires;'; } else { return ''; }
     }
 
     /**

app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version4.php

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
         $customTemplate = $this->_getCustomTemplateFilename();
         if ($customTemplate) { 
             $tplFile = $customTemplate;
-        }
-        else { 
+        } else { 
             $tplFile = $this->_getVclTemplateFilename(self::VCL_TEMPLATE_FILE);
         }
         $vcl = $this->_formatTemplate(file_get_contents($tplFile),