refactor properly

Author: adrianspeyer

app/design/frontend/base/default/template/piwikanalytics/piwik.phtml

@@ -19,30 +19,9 @@
 
     if ($siteId) {
 
-<<<<<<< HEAD
         /*remove https or https*/
 	   $installPath = preg_replace('#^https?:#', '', $installPath);
 
-=======
-        /*path for noscript should take unaltered path*/
-        $bugPath = $installPath;
-        	
-        if (strpos($installPath, 'https://') !== false) {
-            $secureInstallPath = $installPath;
-            $installPath = str_replace('https://', 'http://', $installPath);
-        }
-        if (strpos($installPath, 'http://') === false) {
-            $installPath = 'http://' . $installPath;
-            $secureInstallPath = str_replace('http://', 'https://', $installPath);
-        }
-
-        $last = $installPath[strlen($installPath) - 1];
-
-        if ($last != '/') {
-            $installPath .= '/';
-            $secureInstallPath .= '/';
-        }
->>>>>>> origin/master
 
         // 0 Search Results
         if($this->getRequest()->getControllerName()=='result') {
@@ -59,14 +38,9 @@
         <script type="text/javascript">
             //<![CDATA[
             var _paq = _paq || [];
-<<<<<<< HEAD
             (function(){ 
 				var u="<?php echo $installPath ?>";
 			    _paq.push(['setSiteId', <?php echo $siteId ?>]);
-=======
-            (function(){ var u=(("https:" == document.location.protocol) ? "<?php echo $secureInstallPath ?>" : "<?php echo $installPath ?>");
-                _paq.push(['setSiteId', <?php echo $siteId ?>]);
->>>>>>> origin/master
                 _paq.push(['setTrackerUrl', u+'piwik.php']);
                 <?php echo $this->_getEcommerceCartUpdate()?>
                 <?php echo $this->_getOrdersTrackingCode()?>