// Merge -> revision 8097

modules/authorizeaim/authorizeaim.php

@@ -140,7 +140,7 @@ class authorizeAIM extends PaymentModule
 
 	public function hookPayment($params)
 	{
-		if (!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) != 'off' AND Configuration::get('PS_SSL_ENABLED'))
+		if (Tools::usingSecureMode() AND Configuration::get('PS_SSL_ENABLED'))
 		{
 			$invoiceAddress = new Address((int)$params['cart']->id_address_invoice);
 			

modules/blocksearch/blocksearch.php

@@ -80,9 +80,8 @@ class BlockSearch extends Module
 	 */
 	private function _hookCommon($params)
 	{
-
 		$this->context->smarty->assign('ENT_QUOTES', ENT_QUOTES);
-		$this->context->smarty->assign('search_ssl', (int)(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'));
+		$this->context->smarty->assign('search_ssl', Tools::usingSecureMode());
 		
 		$ajaxSearch=(int)(Configuration::get('PS_SEARCH_AJAX'));
 		$this->context->smarty->assign('ajaxsearch', $ajaxSearch);

modules/blockwishlist/mywishlist.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 <div id="mywishlist">
 	{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockwishlist'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My wishlists' mod='blockwishlist'}{/capture}
 	{include file="$tpl_dir./breadcrumb.tpl"}

modules/loyalty/loyalty.php

@@ -525,6 +525,8 @@ class Loyalty extends Module
 				 'voucher' => LoyaltyModule::getVoucherValue((int)$points),
 				 'guest_checkout' => (int)Configuration::get('PS_GUEST_CHECKOUT_ENABLED')
 			));
+		} else {
+			$smarty->assign(array('points' => 0));
 		}
 		
 		return $this->display(__FILE__, 'shopping-cart.tpl');

modules/loyalty/loyalty.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 {capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='loyalty'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My loyalty points' mod='loyalty'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}
 

modules/mailalerts/myalerts.tpl

@@ -24,12 +24,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<script type="text/javascript">
-//<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
 <div id="myalerts">
 	{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='mailalerts'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My alerts' mod='mailalerts'}{/capture}
 	{include file="$tpl_dir./breadcrumb.tpl"}

modules/mondialrelay/mondialrelay.php

@@ -368,8 +368,7 @@ class MondialRelay extends Module
 		self::$modulePath =	_PS_MODULE_DIR_. 'mondialrelay/';
 		self::$MRToken = sha1('mr'._COOKIE_KEY_.'mrAgain');
 	
-		$protocol = (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) 
-			&& strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
+		$protocol = (Configuration::get('PS_SSL_ENABLED') || Tools::usingSecureMode()) ? 'https://' : 'http://';
 		
 		$endURL = __PS_BASE_URI__.'/modules/mondialrelay/';
 	

modules/paypal/paypal.php

@@ -1033,7 +1033,7 @@ class PayPal extends PaymentModule
 		// Amount for refund
 		$amt = 0.00;
 		foreach ($products AS $product)
-			$amt += (float)($product['total_price']) * ($product['product_quantity'] - $product['product_quantity_refunded']);
+			$amt += (float)($product['product_price_wt']) * ($product['product_quantity'] - $product['product_quantity_refunded']);
 		$amt += (float)($order->total_shipping) + (float)($order->total_wrapping) - (float)($order->total_discounts);
 
 		// check if total or partial

modules/referralprogram/referralprogram-program.tpl

@@ -26,12 +26,6 @@
 
 <script type="text/javascript">
 //<![CDATA[
-	var baseDir = '{$base_dir_ssl}';
-//]]>
-</script>
-
-<script type="text/javascript">
-// <![CDATA[
 	ThickboxI18nClose = "{l s='Close' mod='referralprogram'}";
 	ThickboxI18nOrEscKey = "{l s='or Esc key' mod='referralprogram'}";
 	tb_pathToImage = "{$img_ps_dir}loadingAnimation.gif";

modules/treepodia/treepodia.php

@@ -86,7 +86,7 @@ class Treepodia extends Module
 		if (!($domain = Configuration::get('PS_SHOP_DOMAIN')))
 			$domain = $_SERVER['HTTP_HOST'];
 
-		$host = ((Configuration::get('PS_SSL_ENABLED') OR (!empty($_SERVER['HTTPS']) AND strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://'.$domain : 'http://'.$domain).__PS_BASE_URI__;
+		$host = ((Configuration::get('PS_SSL_ENABLED') OR Tools::usingSecureMode()) ? 'https://'.$domain : 'http://'.$domain).__PS_BASE_URI__;
 
 		return $host;
 	}

modules/uspscarrier/config.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <module>
 	<name>uspscarrier</name>
-	<displayName><![CDATA[USPS Carrier]]></displayName>
+	<displayName><![CDATA[U.S.P.S Rate Calulator]]></displayName>
 	<version><![CDATA[1.1]]></version>
 	<description><![CDATA[Offer your customers, different delivery methods with USPS]]></description>
 	<author><![CDATA[PrestaShop]]></author>