Completed
Pull Request — devel (#1470)
by Chris
02:50 queued 01:09
created
app/code/community/Nexcessnet/Turpentine/Block/Poll/ActivePoll.php 2 patches
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.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,8 +29,7 @@
 block discarded – undo
29 29
             $this->_template = $template;
30 30
             $this->setPollTemplate('turpentine/ajax.phtml', 'poll');
31 31
             $this->setPollTemplate('turpentine/ajax.phtml', 'results');
32
-        }
33
-        else
32
+        } else
34 33
         {
35 34
             // Mage_Poll is disabled, so do nothing
36 35
         }
Please login to merge, or discard this patch.
community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -991,7 +991,7 @@
 block discarded – undo
991 991
     }
992 992
 }
993 993
 EOS;
994
-        } else{
994
+        } else {
995 995
             $tpl_750 = '
996 996
 sub vcl_synth {
997 997
     if (resp.status == 750) {
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -686,13 +686,13 @@  discard block
 block discarded – undo
686 686
             }
687 687
         }
688 688
         $backends = '';
689
-		$number = 0;
689
+        $number = 0;
690 690
         foreach ($backendNodes as $backendNode) {
691 691
             $parts = explode(':', $backendNode, 2);
692 692
             $host = (empty($parts[0])) ? '127.0.0.1' : $parts[0];
693 693
             $port = (empty($parts[1])) ? '80' : $parts[1];
694 694
             $backends .= $this->_vcl_director_backend($host, $port, $prefix.$number, $probeUrl, $backendOptions);
695
-			$number++;
695
+            $number++;
696 696
         }
697 697
         $vars = array(
698 698
             'name' => $name,
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
      *
707 707
      * @param string $host     backend host
708 708
      * @param string $port     backend port
709
-	 * @param string $descriptor backend descriptor
709
+     * @param string $descriptor backend descriptor
710 710
      * @param string $probeUrl URL to check if backend is up
711 711
      * @param array  $options  extra options for backend
712 712
      * @return string
Please login to merge, or discard this patch.
app/code/community/Nexcessnet/Turpentine/Model/Varnish/Admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
                 $result[$socketName] = 'Failed to load configurator';
105 105
             } else {
106 106
                 $vcl = $cfgr->generate($helper->shouldStripVclWhitespace('apply'));
107
-                $vclName = 'vcl_' . Mage::helper('turpentine/data')
107
+                $vclName = 'vcl_'.Mage::helper('turpentine/data')
108 108
                     ->secureHash(microtime());
109 109
                 try {
110 110
                     $this->_testEsiSyntaxParam($socket);
Please login to merge, or discard this patch.