nexcess / magento-turpentine

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++;
         }

app/code/community/Nexcessnet/Turpentine/Block/Poll/ActivePoll.php

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');

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));

app/code/community/Nexcessnet/Turpentine/Helper/Esi.php

Spacing +1 added lines, -1 removed lines

@@ -373,7 +373,7 @@
      * @param string $blockName value of name= attribute in layout XML
      * @return Mage_Core_Model_Layout_Element
      */
-    public function getEsiLayoutBlockNode($layout,$blockName) {
+    public function getEsiLayoutBlockNode($layout, $blockName) {
         // first try very specific by checking for action setEsiOptions inside block
         $blockNode = current($layout->getNode()->xpath(
             sprintf('//block[@name=\'%s\'][action[@method=\'setEsiOptions\']]',

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

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
         $result = false;
 
         if ($helper->csrfFixupNeeded()) {
-            if ($socket->getVersion() === '4.0' || $socket->getVersion() === '4.1' ) {
+            if ($socket->getVersion() === '4.0' || $socket->getVersion() === '4.1') {
                 $paramName = 'feature';
                 $value = $socket->param_show($paramName);
                 $value = explode("\n", $value['text']);

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

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/Observer/Varnish.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
     public function fixCmRedisSessionLocks($eventObject) {
         if (Mage::helper('core')->isModuleEnabled('Cm_RedisSession')) {
             if ( ! empty($_COOKIE['frontend']) && 'crawler-session' == $_COOKIE['frontend'] &&
-                    !defined('CM_REDISSESSION_LOCKING_ENABLED') ) {
+                    ! defined('CM_REDISSESSION_LOCKING_ENABLED')) {
                 define('CM_REDISSESSION_LOCKING_ENABLED', false);
             }
         }