nexcess / magento-turpentine

contrib/tools/esi-decoder.php

Indentation +11 added lines, -11 removed lines

@@ -1,16 +1,16 @@
 <?php
 /**
-     * ESI DECODER
-     *
-     * This tool can be used to decode an ESI request.
-     * You can just paste the whole ESI URL and push the button to decode it.
-     *
-     * Make sure you place this utility on a protected spot on your web server where only authorized users can use it.
-     *
-     * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item:
-     * 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
-     *
-     */
+ * ESI DECODER
+ *
+ * This tool can be used to decode an ESI request.
+ * You can just paste the whole ESI URL and push the button to decode it.
+ *
+ * Make sure you place this utility on a protected spot on your web server where only authorized users can use it.
+ *
+ * If the URLs you see in "varnishlog" or "varnishncsa" are not working because they are cut off, read this FAQ item:
+ * 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
+ *
+ */
 
 $tries = 5;
 $dir = dirname(__FILE__);

app/code/community/Nexcessnet/Turpentine/Model/Core/Session.php

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      */
     public function renewFormKey()
     {
-     	$this->setData('_form_key', Mage::helper('core')->getRandomString(16));
+            $this->setData('_form_key', Mage::helper('core')->getRandomString(16));
     }
 
     /**

app/code/community/Nexcessnet/Turpentine/controllers/EsiController.php

Spacing +3 added lines, -3 removed lines

@@ -183,9 +183,9 @@
             }
         }
         $layout = Mage::getSingleton('core/layout');
-        Mage::getSingleton( 'core/design_package' )
-                ->setPackageName( $esiData->getDesignPackage() )
-                ->setTheme( $esiData->getDesignTheme() );
+        Mage::getSingleton('core/design_package')
+                ->setPackageName($esiData->getDesignPackage())
+                ->setTheme($esiData->getDesignTheme());
 
         // dispatch event for adding handles to layout update
         Mage::dispatchEvent(

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

Spacing +4 added lines, -4 removed lines

@@ -87,13 +87,13 @@ 
         $backendNodes = Mage::helper('turpentine/data')->cleanExplode(PHP_EOL,
             Mage::getStoreConfig('turpentine_vcl/backend/backend_nodes'));
 
-        for($i = 0, $iMax = count($backendNodes); $i < $iMax; $i++) {
+        for ($i = 0, $iMax = count($backendNodes); $i < $iMax; $i++) {
             $tpl .= <<<EOS
     vdir.add_backend(web{$i});
 EOS;
         }
 
-        for($i = 0, $iMax = count($adminBackendNodes); $i < $iMax; $i++) {
+        for ($i = 0, $iMax = count($adminBackendNodes); $i < $iMax; $i++) {
             $tpl .= <<<EOS
     vdir_admin.add_backend(webadmin{$i});
 EOS;
@@ -125,7 +125,7 @@ 
                 Mage::getStoreConfig('turpentine_vcl/backend/backend_nodes'));
             $probeUrl = Mage::getStoreConfig('turpentine_vcl/backend/backend_probe_url');
 
-            if('admin' == $name) {
+            if ('admin' == $name) {
                 $prefix = 'admin';
             } else {
                 $prefix = '';
@@ -138,7 +138,7 @@ 
             $parts = explode(':', $backendNode, 2);
             $host = (empty($parts[0])) ? '127.0.0.1' : $parts[0];
             $port = (empty($parts[1])) ? '80' : $parts[1];
-            $backends .= $this->_vcl_director_backend($host, $port, $prefix . $number, $probeUrl, $backendOptions);
+            $backends .= $this->_vcl_director_backend($host, $port, $prefix.$number, $probeUrl, $backendOptions);
 
             $number++;
         }

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/Block/Poll/ActivePoll.php

Indentation +15 added lines, -15 removed lines

@@ -21,19 +21,19 @@
 
 class Nexcessnet_Turpentine_Block_Poll_ActivePoll extends Mage_Poll_Block_ActivePoll {
 
-	public function setTemplate($template)
-	{
-		if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) &&
-		(!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
-		{
-			$this->_template = $template;
-			$this->setPollTemplate('turpentine/ajax.phtml', 'poll');
-			$this->setPollTemplate('turpentine/ajax.phtml', 'results');
-		}
-		else
-		{
-			// Mage_Poll is disabled, so do nothing
-		}
-		return $this;
-	}
+    public function setTemplate($template)
+    {
+        if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) &&
+        (!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
+        {
+            $this->_template = $template;
+            $this->setPollTemplate('turpentine/ajax.phtml', 'poll');
+            $this->setPollTemplate('turpentine/ajax.phtml', 'results');
+        }
+        else
+        {
+            // Mage_Poll is disabled, so do nothing
+        }
+        return $this;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	public function setTemplate($template)
 	{
 		if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) &&
-		(!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
+		( ! Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
 		{
 			$this->_template = $template;
 			$this->setPollTemplate('turpentine/ajax.phtml', 'poll');

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
 			$this->_template = $template;
 			$this->setPollTemplate('turpentine/ajax.phtml', 'poll');
 			$this->setPollTemplate('turpentine/ajax.phtml', 'results');
-		}
-		else
+		} else
 		{
 			// Mage_Poll is disabled, so do nothing
 		}

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 +2 added lines, -3 removed lines

@@ -150,8 +150,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; }
     }
 
 
@@ -988,7 +987,7 @@ 
     }
 }
 EOS;
-        }else{
+        } else{
             $tpl_750 = '
 sub vcl_synth {
     if (resp.status == 750) {

Spacing +9 added lines, -9 removed lines

@@ -131,7 +131,7 @@ 
      *
      * @return string
      */
-    protected function _getCustomIncludeFilename($position='') {
+    protected function _getCustomIncludeFilename($position = '') {
         $key = 'custom_include_file';
         $key .= ($position) ? '_'.$position : '';
         return $this->_formatTemplate(
@@ -193,8 +193,8 @@ 
      */
     protected function _getAdminFrontname() {
         if (Mage::getStoreConfig('admin/url/use_custom_path')) {
-            if(Mage::getStoreConfig('web/url/use_store')) {
-                return Mage::getModel('core/store')->load(0)->getCode() . "/" . Mage::getStoreConfig('admin/url/custom_path');
+            if (Mage::getStoreConfig('web/url/use_store')) {
+                return Mage::getModel('core/store')->load(0)->getCode()."/".Mage::getStoreConfig('admin/url/custom_path');
             } else {
                 return Mage::getStoreConfig('admin/url/custom_path');
             }
@@ -909,8 +909,8 @@ 
      */
     protected function _vcl_sub_https_redirect_fix() {
         $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
-        $baseUrl = str_replace(array('http://','https://'), '', $baseUrl);
-        $baseUrl = rtrim($baseUrl,'/');
+        $baseUrl = str_replace(array('http://', 'https://'), '', $baseUrl);
+        $baseUrl = rtrim($baseUrl, '/');
         
         switch (Mage::getStoreConfig('turpentine_varnish/servers/version')) {
             case 4.0:
@@ -982,7 +982,7 @@ 
     {
         $tpl = $this->_vcl_sub_synth();
 
-        if(!$tpl){
+        if ( ! $tpl) {
             $tpl = <<<EOS
 sub vcl_synth {
     if (resp.status == 750) {
@@ -992,7 +992,7 @@ 
     }
 }
 EOS;
-        }else{
+        } else {
             $tpl_750 = '
 sub vcl_synth {
     if (resp.status == 750) {
@@ -1089,12 +1089,12 @@ 
         
         if (Mage::getStoreConfig('turpentine_varnish/general/https_redirect_fix')) {
             $vars['https_redirect'] = $this->_vcl_sub_https_redirect_fix();
-            if(Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.0' || Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.1'){
+            if (Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.0' || Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.1') {
                 $vars['vcl_synth'] = $this->_vcl_sub_synth_https_fix();
             }
         }
 
-        foreach (array('','top') as $position) {
+        foreach (array('', 'top') as $position) {
             $customIncludeFile = $this->_getCustomIncludeFilename($position);
             if (is_readable($customIncludeFile)) {
                 $key = 'custom_vcl_include';

app/code/community/Nexcessnet/Turpentine/Model/Varnish/Admin/Socket.php

Spacing +1 added lines, -1 removed lines

@@ -500,7 +500,7 @@
                 $response['code'], $response['text'] ));
         } else {
             if (Mage::getStoreConfig('turpentine_varnish/general/varnish_log_commands')) { 
-                Mage::helper('turpentine/debug')->logDebug('VARNISH command sent: ' . $data);
+                Mage::helper('turpentine/debug')->logDebug('VARNISH command sent: '.$data);
             }
             return $response;
         }

app/code/community/Nexcessnet/Turpentine/Model/Observer/Esi.php

Spacing +5 added lines, -5 removed lines

@@ -227,9 +227,9 @@ 
                 'Checking ESI block candidate: %s',
                 $blockObject->getNameInLayout() ? $blockObject->getNameInLayout() : $blockObject->getModuleName() );
 
-            $debugHelper->logInfo( "-- block testing: shouldResponseUseEsi = " . $esiHelper->shouldResponseUseEsi());
-            $debugHelper->logInfo( "-- block testing: instanceof Mage_Core_Block_Template = " . $blockObject instanceof Mage_Core_Block_Template );
-            $debugHelper->logInfo( "-- block testing: Esi Options = " . print_r($blockObject->getEsiOptions(), true) );
+            $debugHelper->logInfo("-- block testing: shouldResponseUseEsi = ".$esiHelper->shouldResponseUseEsi());
+            $debugHelper->logInfo("-- block testing: instanceof Mage_Core_Block_Template = ".$blockObject instanceof Mage_Core_Block_Template);
+            $debugHelper->logInfo("-- block testing: Esi Options = ".print_r($blockObject->getEsiOptions(), true));
         }        
         if ($esiHelper->shouldResponseUseEsi() &&
                 $blockObject instanceof Mage_Core_Block_Template &&
@@ -332,8 +332,8 @@ 
         $methodParam = $esiHelper->getEsiMethodParam();
         $esiData = new Varien_Object();
         $esiData->setStoreId(Mage::app()->getStore()->getId());
-        $esiData->setDesignPackage( Mage::getDesign()->getPackageName() );
-        $esiData->setDesignTheme( Mage::getDesign()->getTheme( 'layout' ) );
+        $esiData->setDesignPackage(Mage::getDesign()->getPackageName());
+        $esiData->setDesignTheme(Mage::getDesign()->getTheme('layout'));
         $esiData->setNameInLayout($blockObject->getNameInLayout());
         $esiData->setBlockType(get_class($blockObject));
         $esiData->setLayoutHandles($this->_getBlockLayoutHandles($blockObject));