// Merge -> revision 9124

2011-10-07 09:54:43 +00:00
parent 22d560688d
commit d46fbbc039
56 changed files with 1682 additions and 1656 deletions
@@ -25,10 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 **/

-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 include_once('../../config/config.inc.php');
 include_once('../../init.php');
 include_once(dirname(__FILE__).'/twenga.php');
@@ -25,10 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 **/

-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 class PrestashopStats
 {
    /**
@@ -35,7 +35,6 @@
 * - compare an array of values to check if required fields are set.
 * - use the twenga API method and throw exceptions if error or exceptions occurred.
 * - Transform the xml response into PHP values.
- * @author Nans Pellicari - Prestashop
 * @version 1.3
 */
 abstract class TwengaFields
@@ -25,10 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 **/

-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 class TwengaFieldsGetSubscriptionLink extends TwengaFields
 {
 	public function __construct()
@@ -25,10 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 **/

-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 class TwengaFieldsGetTrackingScript extends TwengaFields
 {
 	public function __construct()
@@ -24,9 +24,5 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 **/
-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 class TwengaFieldsOrderCancel extends TwengaFieldsOrderValidate
 {}
@@ -25,9 +25,5 @@
 *  International Registered Trademark & Property of PrestaShop SA
 **/

-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 class TwengaFieldsOrderExist extends TwengaFieldsOrderValidate
 {}
@@ -25,10 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 **/

-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 class TwengaFieldsOrderValidate extends TwengaFields
 {
 	public function __construct()
@@ -25,9 +25,5 @@
 *  International Registered Trademark & Property of PrestaShop SA
 **/

-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 class TwengaFieldsSiteActivate extends TwengaFieldsSiteExist
 {}
@@ -25,10 +25,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 **/

-/**
- * @author Nans Pellicari - Prestashop
- * @version 1.3
- */
 class TwengaFieldsSiteExist extends TwengaFields
 {
 	public function __construct()
@@ -29,7 +29,6 @@
 * This Class allow to use Twenga API.
 * See details for more infos.
 * 
- * @author Nans Pellicari - Prestashop
 * @version 1.3
 */
 class TwengaObj
@@ -30,7 +30,6 @@
 * 1. subscribe to their Ready to Sell engine,
 * 2. activate a tracking for order process if user has been used twenga engine,
 * 3. submit a xml feed of shop products to Twenga.
- * @author Nans Pellicari - Prestashop
 * @version 1.3
 */

@@ -524,16 +523,16 @@ class Twenga extends PaymentModule
 	 */
 	public static function getCurrentCountryName()
 	{
-		$id_lang = ((isset(Context::getContext()->language->id)) ? Context::getContext()->language->id :
-			((isset($_POST['id_lang'])) ? $_POST['id_lang'] : NULL));
+		$id_lang = ((Context::getContext()->language) ? Context::getContext()->language->id :
+			((isset($_POST['id_lang'])) ? (int)$_POST['id_lang'] : null));

 		if ($id_lang === NULL)
 			return 'Undefined id_lang';
 		$country = Db::getInstance()->ExecuteS('
 			SELECT c.name as name
 			FROM '._DB_PREFIX_.'country_lang as c
-			WHERE c.id_lang = '.$id_lang.'
-			AND c.id_country = '.	Configuration::get('PS_COUNTRY_DEFAULT'));
+			WHERE c.id_lang = '.(int)$id_lang.'
+			AND c.id_country = '.(int)Configuration::get('PS_COUNTRY_DEFAULT'));

 		if (!isset($country[0]['name']))
 			$country[0]['name'] = 'Undefined';