// REVERT MERGE

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd

modules/moneybookers/de.php

@@ -16,9 +16,9 @@ $_MODULE['<{moneybookers}prestashop>moneybookers_6861a58e2be4956b3f2fd6420fe6c28
 $_MODULE['<{moneybookers}prestashop>moneybookers_a356736cbcf740f8648d71067fca090d'] = 'Akzeptiert Zahlungen per Moneybookers';
 $_MODULE['<{moneybookers}prestashop>moneybookers_fa214007826415a21a8456e3e09f999d'] = 'Sie sind sicher, dass Sie Ihre Daten löschen wollen?';
 $_MODULE['<{moneybookers}prestashop>moneybookers_088b74050a381d98fca38d5990b097be'] = 'Sie nutzen zur Zeit die Standard-E-Mail-Adresse von Moneybookers, Sie müssen Ihre eigene E-Mail-Adresse verwenden';
+$_MODULE['<{moneybookers}prestashop>moneybookers_87ef564ed1574eda7e77b4012eef0b85'] = 'Unmöglich,den Aktivierungs-Server zu kontaktieren, bitte versuchen Sie es später';
 $_MODULE['<{moneybookers}prestashop>moneybookers_b863542eebcb27fa230b647b5dd07819'] = 'Konto-Bestätigung fehlgeschlagen, Ihre E-Mail könnte falsch sein';
 $_MODULE['<{moneybookers}prestashop>moneybookers_d70c5b5767846906e0abe68498db887b'] = 'E-Mail-Aktivierung erfolgreich, Sie können nun Ihr Kennwort bestâtigen';
-$_MODULE['<{moneybookers}prestashop>moneybookers_87ef564ed1574eda7e77b4012eef0b85'] = 'Unmöglich,den Aktivierungs-Server zu kontaktieren, bitte versuchen Sie es später';
 $_MODULE['<{moneybookers}prestashop>moneybookers_7757ea03f2a0893e36c7916a2ad07ef8'] = 'Das E-Mail-Feld ist erforderlich';
 $_MODULE['<{moneybookers}prestashop>moneybookers_aa1c444c2ee2f620d5b349fedfa68ba2'] = 'Kennwortbestätigung fehlgeschlagen, max. Versuchszahl überschritten (3 pro Stunde)';
 $_MODULE['<{moneybookers}prestashop>moneybookers_cdbef58d093e0ff38e13686a669e9fee'] = 'Kennwortbestätigung fehlgeschlagen, Ihr Kennwort könnte falsch sein';

modules/moneybookers/es.php

@@ -15,9 +15,9 @@ $_MODULE['<{moneybookers}prestashop>moneybookers_6861a58e2be4956b3f2fd6420fe6c28
 $_MODULE['<{moneybookers}prestashop>moneybookers_a356736cbcf740f8648d71067fca090d'] = 'Acepta pagos por Moneybookers';
 $_MODULE['<{moneybookers}prestashop>moneybookers_fa214007826415a21a8456e3e09f999d'] = '¿Está seguro de que quiere eliminar sus datos?';
 $_MODULE['<{moneybookers}prestashop>moneybookers_088b74050a381d98fca38d5990b097be'] = 'Actualmente utiliza la dirección por defecto del módulo Moneybookers. Debe utilizar sus parámetros.';
+$_MODULE['<{moneybookers}prestashop>moneybookers_87ef564ed1574eda7e77b4012eef0b85'] = 'Imposible contactar con el servidor de activación, por favor inténtelo más tarde';
 $_MODULE['<{moneybookers}prestashop>moneybookers_b863542eebcb27fa230b647b5dd07819'] = 'Error durante la validación de la cuenta, su correo electrónico podría estar equivocado';
 $_MODULE['<{moneybookers}prestashop>moneybookers_d70c5b5767846906e0abe68498db887b'] = 'Activación correcta de su dirección email, ya puede validar su palabra secreta';
-$_MODULE['<{moneybookers}prestashop>moneybookers_87ef564ed1574eda7e77b4012eef0b85'] = 'Imposible contactar con el servidor de activación, por favor inténtelo más tarde';
 $_MODULE['<{moneybookers}prestashop>moneybookers_7757ea03f2a0893e36c7916a2ad07ef8'] = 'El campo email es obligatorio';
 $_MODULE['<{moneybookers}prestashop>moneybookers_aa1c444c2ee2f620d5b349fedfa68ba2'] = 'Error durante la validación de su palabra secreta, ha sobrepasado el número máximo de intentos (3 por hora)';
 $_MODULE['<{moneybookers}prestashop>moneybookers_cdbef58d093e0ff38e13686a669e9fee'] = 'Error durante la validación de la palabra secreta, su palabra secreta podría estar equivocada';

modules/moneybookers/fr.php

@@ -15,28 +15,19 @@ $_MODULE['<{moneybookers}prestashop>moneybookers_6861a58e2be4956b3f2fd6420fe6c28
 $_MODULE['<{moneybookers}prestashop>moneybookers_a356736cbcf740f8648d71067fca090d'] = 'Acceptez des paiements de façon sécurisée par cartes bancaires (Visa, MasterCard, CB, JCB, Amex) , par virement bancaire et par eWallet avec Moneybookers/Skrill';
 $_MODULE['<{moneybookers}prestashop>moneybookers_fa214007826415a21a8456e3e09f999d'] = 'Etes-vous sûr de vouloir supprimer vos paramètres ?';
 $_MODULE['<{moneybookers}prestashop>moneybookers_088b74050a381d98fca38d5990b097be'] = 'Vous utilisez actuellement l\'adresse e-mail par défaut du module Moneybookers, vous devez utiliser vos paramètres.';
-$_MODULE['<{moneybookers}prestashop>moneybookers_7593ded970377fe25371c952eb944770'] = 'Impossibilité de récupérer les données distantes';
+$_MODULE['<{moneybookers}prestashop>moneybookers_87ef564ed1574eda7e77b4012eef0b85'] = 'Serveur d\'activation injoignable, merci d\'essayer ultérieurement';
 $_MODULE['<{moneybookers}prestashop>moneybookers_b863542eebcb27fa230b647b5dd07819'] = 'Erreur lors de la validation du compte, votre adresse e-mail est peut être incorrecte';
 $_MODULE['<{moneybookers}prestashop>moneybookers_d70c5b5767846906e0abe68498db887b'] = 'Activation de votre adresse e-mail OK, vous pouvez désormais valider votre mot secret';
-$_MODULE['<{moneybookers}prestashop>moneybookers_87ef564ed1574eda7e77b4012eef0b85'] = 'Serveur d\'activation injoignable, merci d\'essayer ultérieurement';
 $_MODULE['<{moneybookers}prestashop>moneybookers_7757ea03f2a0893e36c7916a2ad07ef8'] = 'Le champ e-mail est obligatoire';
 $_MODULE['<{moneybookers}prestashop>moneybookers_aa1c444c2ee2f620d5b349fedfa68ba2'] = 'Erreur lors de la validation de votre mot secret, vous avez dépassé le nombre maximum d\'essai (3 par heure)';
 $_MODULE['<{moneybookers}prestashop>moneybookers_cdbef58d093e0ff38e13686a669e9fee'] = 'Erreur lors de la validation de votre mot secret, votre mot secret est peut être incorrect';
 $_MODULE['<{moneybookers}prestashop>moneybookers_cd1dfa342c3c11c17ede212e6429ca01'] = 'Activation du compte réussie, mot secret OK';
 $_MODULE['<{moneybookers}prestashop>moneybookers_2e531f9ad978a2a1a88a00ae0d4dc78e'] = 'Le mot secret est obligatoire';
-$_MODULE['<{moneybookers}prestashop>moneybookers_bcfaccebf745acfd5e75351095a5394a'] = 'Désactivé';
-$_MODULE['<{moneybookers}prestashop>moneybookers_e4abb55720e3790fe55982fec858d213'] = 'Colonne Gauche';
-$_MODULE['<{moneybookers}prestashop>moneybookers_f16072c370ef52db2e329a87b5e7177a'] = 'Colone Droite';
 $_MODULE['<{moneybookers}prestashop>moneybookers_a9dd80641753cafc9c967e317ba92a28'] = 'A propos de Moneybookers';
 $_MODULE['<{moneybookers}prestashop>moneybookers_8342dda89e8c20bb92916fbe052c583a'] = 'Profitez des tarifs spéciaux que Moneybookers offre aux marchands de Prestashop !';
 $_MODULE['<{moneybookers}prestashop>moneybookers_4f4c1b5e5d775709e08ccc3afad1a5c3'] = 'Moneybookers, géré par Skrill Holdings, est un des plus importants systèmes de paiement en ligne d’Europe, proposant plus de 100 options de paiement et 41 devises dans plus de 200 pays et territoires.  Plus de 80 000 marchands utilisent déjà cette solution, parmi lesquels eBay.com, Skype et Thomas Cook. ';
 $_MODULE['<{moneybookers}prestashop>moneybookers_acf2b73b741f10cd1e0d075ed43fed39'] = 'Avec plus de 17 millions de titulaires de comptes et plus de 15 000 nouveaux comptes chaque jour, Moneybookers offre aussi l’un des plus grands portemonnaies électroniques du monde. Vos clients peuvent également régler leur paiement en utilisant seulement leur e-mail et leur mot de passe grâce à notre e-Wallet. ';
 $_MODULE['<{moneybookers}prestashop>moneybookers_76264fd7352f803c63396bc27b0ee893'] = 'Moneybookers change de nom et devient Skrill !';
-$_MODULE['<{moneybookers}prestashop>moneybookers_f4f70727dc34561dfde1a3c529b6205c'] = 'Configuration';
-$_MODULE['<{moneybookers}prestashop>moneybookers_e86e85752dd7a7b31bb935c862480cee'] = 'Choisir la position du logo';
-$_MODULE['<{moneybookers}prestashop>moneybookers_239d45036930947dbf41506d27fa1aa7'] = 'Change la position du logo dans le Front Office. Fonctionne avec ';
-$_MODULE['<{moneybookers}prestashop>moneybookers_81149af5698332fdf2d6869a66b6ad12'] = 'Live edit';
-$_MODULE['<{moneybookers}prestashop>moneybookers_708c440d8915f957ee6717efc426a863'] = 'Envoyer ';
 $_MODULE['<{moneybookers}prestashop>moneybookers_5138738b54f0d4bdf7c72780db651abc'] = 'Ouverture de compte';
 $_MODULE['<{moneybookers}prestashop>moneybookers_41992c760318e60740f7a9b2819af191'] = 'Commencez par ouvrir';
 $_MODULE['<{moneybookers}prestashop>moneybookers_c0302a6fbca061af831bc12f06cadb2f'] = 'un compte gratuit';

modules/moneybookers/it.php

@@ -11,13 +11,14 @@ $_MODULE['<{moneybookers}prestashop>confirmation_df194447dfecf36bb8043bd8d94feed
 $_MODULE['<{moneybookers}prestashop>confirmation_047e219d25b398033511b18041dbfd7a'] = 'Il tuo ordine verrà spedito non appena avremo ricevuto il bonifico bancario.';
 $_MODULE['<{moneybookers}prestashop>confirmation_8de637e24570c1edb0357826a2ad5aea'] = 'Abbiamo notato un problema con il tuo ordine. Se pensi che sia un errore, contatta la nostra';
 $_MODULE['<{moneybookers}prestashop>moneybookers-currency-error_6484c945379d81c37ac734c9768605cf'] = 'Non puoi pagare con Moneybookers con la valuta attuale, scegli un\'altra valuta';
+$_MODULE['<{moneybookers}prestashop>moneybookers_27266fe4d37bf06589c7c6dbf2d5c067'] = 'Paga con';
 $_MODULE['<{moneybookers}prestashop>moneybookers_6861a58e2be4956b3f2fd6420fe6c28c'] = 'Moneybookers';
 $_MODULE['<{moneybookers}prestashop>moneybookers_a356736cbcf740f8648d71067fca090d'] = 'Si accettano pagamenti con Moneybookers';
 $_MODULE['<{moneybookers}prestashop>moneybookers_fa214007826415a21a8456e3e09f999d'] = 'Sei sicuro di voler cancellare i tuoi dati?';
 $_MODULE['<{moneybookers}prestashop>moneybookers_088b74050a381d98fca38d5990b097be'] = 'Si sta attualmente utilizzando l\'indirizzo e-mail Moneybookers di default, è necessario utilizzare il proprio indirizzo e-mail';
+$_MODULE['<{moneybookers}prestashop>moneybookers_87ef564ed1574eda7e77b4012eef0b85'] = 'Impossibile contattare il server di attivazione, riprova più tardi';
 $_MODULE['<{moneybookers}prestashop>moneybookers_b863542eebcb27fa230b647b5dd07819'] = 'convalida account non riuscita, la tua e-mail potrebbe essere errata';
 $_MODULE['<{moneybookers}prestashop>moneybookers_d70c5b5767846906e0abe68498db887b'] = 'attivazione e-mail di successo, ora è possibile convalidare la parola segreta';
-$_MODULE['<{moneybookers}prestashop>moneybookers_87ef564ed1574eda7e77b4012eef0b85'] = 'Impossibile contattare il server di attivazione, riprova più tardi';
 $_MODULE['<{moneybookers}prestashop>moneybookers_7757ea03f2a0893e36c7916a2ad07ef8'] = 'Il campo email è obbligatorio';
 $_MODULE['<{moneybookers}prestashop>moneybookers_aa1c444c2ee2f620d5b349fedfa68ba2'] = 'convalida parola segreta fallita, ha superato il numero massimo di tentativi (3 per ora)';
 $_MODULE['<{moneybookers}prestashop>moneybookers_cdbef58d093e0ff38e13686a669e9fee'] = 'convalida parola segreta fallita, la tua parola segreta potrebbe essere sbagliata';
@@ -54,4 +55,5 @@ $_MODULE['<{moneybookers}prestashop>moneybookers_554fd8768f165251646ce21ba499820
 $_MODULE['<{moneybookers}prestashop>moneybookers_a190bc880b04cf478e0370d1b315a5a3'] = 'Tutti i loghi in 1 blocco';
 $_MODULE['<{moneybookers}prestashop>moneybookers_852d04b5f455aaf5264e9a8c561ced71'] = '1 blocco per ogni logo';
 $_MODULE['<{moneybookers}prestashop>moneybookers_d4dccb8ca2dac4e53c01bd9954755332'] = 'Salva impostazioni';
-$_MODULE['<{moneybookers}prestashop>moneybookers_27266fe4d37bf06589c7c6dbf2d5c067'] = 'Paga con';
+
+?>

modules/moneybookers/moneybookers.php

@@ -30,10 +30,6 @@ if (!defined('_CAN_LOAD_FILES_'))
 
 class MoneyBookers extends PaymentModule
 {
-	const LEFT_COLUMN = 0;
-	const RIGHT_COLUMN = 1;
-	const DISABLE = -1;
-
 	public function __construct()
 	{
 		$this->name = 'moneybookers';
@@ -111,9 +107,7 @@ class MoneyBookers extends PaymentModule
 
 	public function install()
 	{
-		if (!parent::install() OR 
-			!$this->registerHook('payment') OR 
-			!$this->registerHook('paymentReturn'))
+		if (!parent::install() OR !$this->registerHook('payment') OR !$this->registerHook('paymentReturn'))
 			return false;
 		Configuration::updateValue('MB_HIDE_LOGIN', 1);
 		Configuration::updateValue('MB_PAY_TO_EMAIL', Configuration::get('PS_SHOP_EMAIL'));
@@ -249,17 +243,6 @@ class MoneyBookers extends PaymentModule
 			Configuration::updateValue('MB_DISPLAY_MODE', (int)($_POST['mb_display_mode']));
 		}
 
-		if (Tools::getValue('submitSettings'))
-		{
-			foreach(array('leftColumn', 'rightColumn') as $hookName)
-				if ($this->isRegisteredInHook($hookName))
-					$this->unregisterHook(Hook::get($hookName));
-			if (Tools::getValue('logo_position') == self::LEFT_COLUMN)
-				$this->registerHook('leftColumn');
-			else if (Tools::getValue('logo_position') == self::RIGHT_COLUMN)
-				$this->registerHook('rightColumn');
-		}
-			
 		/* Display errors */
 		if (sizeof($errors))
 		{
@@ -283,14 +266,6 @@ class MoneyBookers extends PaymentModule
 		if (!array_key_exists($lang->iso_code, $manual_links))
 			$iso_manual = 'en';
 
-		$blockPositionList = array(
-			self::DISABLE => $this->l('Disable'),
-			self::LEFT_COLUMN => $this->l('Left Column'),
-			self::RIGHT_COLUMN => $this->l('Right Column'));
-		
-		$currentLogoBlockPosition = ($this->isRegisteredInHook('leftColumn')) ? self::LEFT_COLUMN : 
-			(($this->isRegisteredInHook('rightColumn')) ? self::RIGHT_COLUMN : -1); 
-
 		/* Display settings form */
 		$output .= '
 		<b>'.$this->l('About Moneybookers').'</b><br /><br /><p style="font-size: 11px;">'.
@@ -300,30 +275,6 @@ class MoneyBookers extends PaymentModule
 		$this->l('Moneybookers changes its name and becomes Skrill!').'<br /><br />
                 <div style="clear: both;"></div>
 
-		<form method="post" action="'.$_SERVER['REQUEST_URI'].'" id="form-settings">
-			<fieldset class="width2" style="margin: 20px 0; width: 800px;">
-				<legend><img src="'.__PS_BASE_URI__.'modules/moneybookers/logo.gif" alt="" />'.$this->l('Settings').'</legend>
-				<div class="margin-form" style="margin:0; padding:0 0 1em 20px">
-					<b>'.$this->l('Select the logo position').'</b> : 
-					<select name="logo_position">';
-					foreach($blockPositionList as $position => $translation)
-					{
-						$selected = ($currentLogoBlockPosition == $position) ? 'selected="selected"' : '';
-						$output .= '<option value="'.$position.'" '.$selected.'>'.$translation.'</option>';
-					}
-		$link = new Link();
-		$admin_dir =  substr(_PS_ADMIN_DIR_, strrpos(_PS_ADMIN_DIR_,'/') + 1);
-		
-		$output .= '
-					</select>
-					<p>'.$this->l('Change your logo position in the Front Office. Works with').'
-						<a href="'.$link->getPageLink('index.php').'?live_edit&ad='.$admin_dir.'&liveToken='.sha1($admin_dir._COOKIE_KEY_).'">'.$this->l(' Live edit.').'</a></p>
-				</div>
-				<div style="text-align:center;">
-					<input type="submit" name="submitSettings" value="'.$this->l('Submit settings').'" />
-				</div>
-			</fieldset>
-		</form>
 		<form method="post" action="'.$_SERVER['REQUEST_URI'].'" id="form-opening">
 			<fieldset class="width2" style="margin: 20px 0; width: 800px;">
 				<legend><img src="'.__PS_BASE_URI__.'modules/moneybookers/logo.gif" alt="" />'.$this->l('Open Account').'</legend>
@@ -481,25 +432,6 @@ class MoneyBookers extends PaymentModule
 		return $output;
 	}
 
-	private function _displayLogoBlock($position)
-	{
-		$imgPath = 'http://www.prestashop.com/images/logo_partners/logo-skrill.png';
-		if (!@file_get_contents($imgPath))
-			$imgPath = __PS_BASE_URI__.'modules/moneybookers/logo-skrill.png';
-		return '<div style="text-align:center;"><img src="'.$imgPath.'" width=150 /></div>';
-	}
-	
-	public function hookRightColumn($params)
-	{
-		return $this->_displayLogoBlock(self::RIGHT_COLUMN);
-	}
-
-	public function hookLeftColumn($params)
-	{
-		return $this->_displayLogoBlock(self::LEFT_COLUMN);
-	}
-
-
 	public function hookPayment($params)
 	{
 		global $smarty, $cookie;

modules/moneybookers/validation.php

@@ -68,17 +68,17 @@ switch ($status)
 {	
 	/* Bankwire */
 	case 0:
-		$moneyBookers->validateOrder((int)($secure_cart[0]), Configuration::get('PS_OS_BANKWIRE'), (float)($_POST['amount']), $moneyBookers->displayName, $message, array(), NULL, false, $secure_cart[2]);
+		$moneyBookers->validateOrder((int)($secure_cart[0]), _PS_OS_BANKWIRE_, (float)($_POST['amount']), $moneyBookers->displayName, $message, array(), NULL, false, $secure_cart[1]);
 		break;
 
 	/* Payment OK */
 	case 2:
-		$moneyBookers->validateOrder((int)($secure_cart[0]), Configuration::get('PS_OS_PAYMENT'), (float)($_POST['amount']), $moneyBookers->displayName, $message, array(), NULL, false, $secure_cart[2]);
+		$moneyBookers->validateOrder((int)($secure_cart[0]), _PS_OS_PAYMENT_, (float)($_POST['amount']), $moneyBookers->displayName, $message, array(), NULL, false, $secure_cart[1]);
 		break;
 
 	/* Unknown or error */
 	default:
-		$moneyBookers->validateOrder((int)($secure_cart[0]), Configuration::get('PS_OS_ERROR'), 0, $moneyBookers->displayName, $message, array(), NULL, false, $secure_cart[2]);
+		$moneyBookers->validateOrder((int)($secure_cart[0]), _PS_OS_ERROR_, 0, $moneyBookers->displayName, $message, array(), NULL, false, $secure_cart[1]);
 		break;
 }