Completed
Pull Request — master (#1284)
by
unknown
02:47
created
community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -173,8 +173,8 @@
 block discarded – undo
173 173
      */
174 174
     protected function _getAdminFrontname() {
175 175
         if (Mage::getStoreConfig('admin/url/use_custom_path')) {
176
-            if(Mage::getStoreConfig('web/url/use_store')) {
177
-                return Mage::getModel('core/store')->load(0)->getCode() . "/" . Mage::getStoreConfig('admin/url/custom_path');
176
+            if (Mage::getStoreConfig('web/url/use_store')) {
177
+                return Mage::getModel('core/store')->load(0)->getCode()."/".Mage::getStoreConfig('admin/url/custom_path');
178 178
             } else {
179 179
                 return Mage::getStoreConfig('admin/url/custom_path');
180 180
             }
Please login to merge, or discard this patch.
community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Version4.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
87 87
         $backendNodes = Mage::helper('turpentine/data')->cleanExplode(PHP_EOL,
88 88
             Mage::getStoreConfig('turpentine_vcl/backend/backend_nodes'));
89 89
 
90
-        for($i = 0, $iMax = count($backendNodes); $i < $iMax; $i++) {
90
+        for ($i = 0, $iMax = count($backendNodes); $i < $iMax; $i++) {
91 91
             $tpl .= <<<EOS
92 92
     vdir.add_backend(web{$i});
93 93
 EOS;
94 94
         }
95 95
 
96
-        for($i = 0, $iMax = count($adminBackendNodes); $i < $iMax; $i++) {
96
+        for ($i = 0, $iMax = count($adminBackendNodes); $i < $iMax; $i++) {
97 97
             $tpl .= <<<EOS
98 98
     vdir_admin.add_backend(webadmin{$i});
99 99
 EOS;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
                 Mage::getStoreConfig('turpentine_vcl/backend/backend_nodes'));
126 126
             $probeUrl = Mage::getStoreConfig('turpentine_vcl/backend/backend_probe_url');
127 127
 
128
-            if('admin' == $name) {
128
+            if ('admin' == $name) {
129 129
                 $prefix = 'admin';
130 130
             } else {
131 131
                 $prefix = '';
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
             $parts = explode(':', $backendNode, 2);
139 139
             $host = (empty($parts[0])) ? '127.0.0.1' : $parts[0];
140 140
             $port = (empty($parts[1])) ? '80' : $parts[1];
141
-            $backends .= $this->_vcl_director_backend($host, $port, $prefix . $number, $probeUrl, $backendOptions);
141
+            $backends .= $this->_vcl_director_backend($host, $port, $prefix.$number, $probeUrl, $backendOptions);
142 142
 
143 143
             $number++;
144 144
         }
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Block/Poll/ActivePoll.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
 	public function setTemplate($template)
25 25
 	{
26 26
 		if ((Mage::getConfig()->getModuleConfig('Mage_Poll')->is('active', 'true')) &&
27
-		(!Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
27
+		( ! Mage::getStoreConfig('advanced/modules_disable_output/Mage_Poll')))
28 28
 		{
29 29
 			$this->_template = $template;
30 30
 			$this->setPollTemplate('turpentine/ajax.phtml', 'poll');
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Model/Varnish/Admin/Socket.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -500,7 +500,7 @@
 block discarded – undo
500 500
                 $response['code'], $response['text'] ));
501 501
         } else {
502 502
             if (Mage::getStoreConfig('turpentine_varnish/general/varnish_log_commands')) { 
503
-                Mage::helper('turpentine/debug')->logDebug('VARNISH command sent: ' . $data);
503
+                Mage::helper('turpentine/debug')->logDebug('VARNISH command sent: '.$data);
504 504
             }
505 505
             return $response;
506 506
         }
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Model/Observer/Esi.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -227,9 +227,9 @@
 block discarded – undo
227 227
                 'Checking ESI block candidate: %s',
228 228
                 $blockObject->getNameInLayout() ? $blockObject->getNameInLayout() : $blockObject->getModuleName() );
229 229
 
230
-            $debugHelper->logInfo( "-- block testing: shouldResponseUseEsi = " . $esiHelper->shouldResponseUseEsi());
231
-            $debugHelper->logInfo( "-- block testing: instanceof Mage_Core_Block_Template = " . $blockObject instanceof Mage_Core_Block_Template );
232
-            $debugHelper->logInfo( "-- block testing: Esi Options = " . print_r($blockObject->getEsiOptions(), true) );
230
+            $debugHelper->logInfo("-- block testing: shouldResponseUseEsi = ".$esiHelper->shouldResponseUseEsi());
231
+            $debugHelper->logInfo("-- block testing: instanceof Mage_Core_Block_Template = ".$blockObject instanceof Mage_Core_Block_Template);
232
+            $debugHelper->logInfo("-- block testing: Esi Options = ".print_r($blockObject->getEsiOptions(), true));
233 233
         }        
234 234
         if ($esiHelper->shouldResponseUseEsi() &&
235 235
                 $blockObject instanceof Mage_Core_Block_Template &&
Please login to merge, or discard this patch.