Merge branch 'ticket/r13031-colissimo-webservice' into dev

This reverts commit 3fae485c69.

.gitignore

@@ -34,6 +34,8 @@ cache/tcpdf/*
 !cache/tcpdf/index.php
 tools/smarty*/cache/*.php
 !tools/smarty*/cache/index.php
+modules/privatesales/cache/*
+!modules/privatesales/cache/index.php
 
 #### CONFIG ####
 config/settings.*.php
@@ -102,7 +104,9 @@ modules/psblog/sitemap-blog.xml
 modules/privatesales/img/*
 themes/site/img/slider/*
 !modules/ant_export_privatesales_newsletter/mails/*
-
+modules/__MACOSX/*
+adm.php
+modules/atos/logs/*
 
 ##PERSO
-test.php
+test.php

adm/filemanager/LICENSE

@@ -0,0 +1 @@
+This work is licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.

adm/filemanager/ajax_calls.php

@@ -2,132 +2,131 @@
 
 include('config/config.php');
 
-if ($_SESSION['verify'] != 'RESPONSIVEfilemanager')
-	die('forbiden');
+if ($_SESSION['verify'] != 'RESPONSIVEfilemanager') {
+    die('forbiden');
+}
 
 include('include/utils.php');
 
-if (isset($_GET['action']))
-	switch ($_GET['action'])
-	{
-		case 'view':
-			if (isset($_GET['type']))
-				$_SESSION['view_type'] = $_GET['type'];
-			else
-				die('view type number missing');
-			break;
-		case 'sort':
-			if (isset($_GET['sort_by']))
-				$_SESSION['sort_by'] = $_GET['sort_by'];
-			if (isset($_GET['descending']))
-				$_SESSION['descending'] = $_GET['descending'] === 'true';
-			break;
-		case 'image_size':
-			if (realpath(dirname(_PS_ROOT_DIR_.$_POST['path'])) != realpath(_PS_ROOT_DIR_.$upload_dir))
-				die();
-			$pos = strpos($_POST['path'], $upload_dir);
-			if ($pos !== false)
-			{
-				$info = getimagesize(substr_replace($_POST['path'], $current_path, $pos, strlen($upload_dir)));
-				echo json_encode($info);
-			}
+if (isset($_GET['action'])) {
+    switch ($_GET['action']) {
+        case 'view':
+            if (isset($_GET['type'])) {
+                $_SESSION['view_type'] = $_GET['type'];
+            } else {
+                die('view type number missing');
+            }
+            break;
+        case 'sort':
+            if (isset($_GET['sort_by'])) {
+                $_SESSION['sort_by'] = $_GET['sort_by'];
+            }
+            if (isset($_GET['descending'])) {
+                $_SESSION['descending'] = $_GET['descending'] === 'true';
+            }
+            break;
+        case 'image_size':
+            if (realpath(dirname(_PS_ROOT_DIR_.$_POST['path'])) != realpath(_PS_ROOT_DIR_.$upload_dir)) {
+                die();
+            }
+            $pos = strpos($_POST['path'], $upload_dir);
+            if ($pos !== false) {
+                $info = getimagesize(substr_replace($_POST['path'], $current_path, $pos, strlen($upload_dir)));
+                echo json_encode($info);
+            }
 
-			break;
-		case 'save_img':
-			$info = pathinfo($_POST['name']);
-			if (strpos($_POST['path'], '/') === 0
-				|| strpos($_POST['path'], '../') !== false
-				|| strpos($_POST['path'], './') === 0
-				|| strpos($_POST['url'], 'http://featherfiles.aviary.com/') !== 0
-				|| $_POST['name'] != fix_filename($_POST['name'], $transliteration)
-				|| !in_array(strtolower($info['extension']), array('jpg', 'jpeg', 'png'))
-			)
-				die('wrong data');
-			$image_data = get_file_by_url($_POST['url']);
-			if ($image_data === false)
-			{
-				die('file could not be loaded');
-			}
+            break;
+        case 'save_img':
+            $info = pathinfo($_POST['name']);
+            if (strpos($_POST['path'], '/') === 0
+                || strpos($_POST['path'], '../') !== false
+                || strpos($_POST['path'], './') === 0
+                || strpos($_POST['url'], 'http://featherfiles.aviary.com/') !== 0
+                || $_POST['name'] != fix_filename($_POST['name'], $transliteration)
+                || !in_array(strtolower($info['extension']), array('jpg', 'jpeg', 'png'))
+            ) {
+                die('wrong data');
+            }
+            $image_data = get_file_by_url($_POST['url']);
+            if ($image_data === false) {
+                die('file could not be loaded');
+            }
 
-			$put_contents_path = $current_path;
+            $put_contents_path = $current_path;
 
-			if (isset($_POST['path']))
-				$put_contents_path .= str_replace("\0", "", $_POST['path']);
+            if (isset($_POST['path'])) {
+                $put_contents_path .= str_replace("\0", "", $_POST['path']);
+            }
 
-			if (isset($_POST['name']))
-				$put_contents_path .= str_replace("\0", "", $_POST['name']);
-			
-			file_put_contents($put_contents_path, $image_data);
-			//new thumb creation
-			//try{
-			create_img_gd($current_path.$_POST['path'].$_POST['name'], $thumbs_base_path.$_POST['path'].$_POST['name'], 122, 91);
-			new_thumbnails_creation($current_path.$_POST['path'], $current_path.$_POST['path'].$_POST['name'], $_POST['name'], $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height);
-			/*} catch (Exception $e) {
-			$src_thumb=$mini_src="";
-			}*/
-			break;
-		case 'extract':
-			if (strpos($_POST['path'], '/') === 0 || strpos($_POST['path'], '../') !== false || strpos($_POST['path'], './') === 0)
-				die('wrong path');
-			$path = $current_path.$_POST['path'];
-			$info = pathinfo($path);
-			$base_folder = $current_path.fix_dirname($_POST['path']).'/';
-			switch ($info['extension'])
-			{
-				case 'zip':
-					$zip = new ZipArchive;
-					if ($zip->open($path) === true)
-					{
-						//make all the folders
-						for ($i = 0; $i < $zip->numFiles; $i++)
-						{
-							$OnlyFileName = $zip->getNameIndex($i);
-							$FullFileName = $zip->statIndex($i);
-							if ($FullFileName['name'][strlen($FullFileName['name']) - 1] == '/')
-							{
-								create_folder($base_folder.$FullFileName['name']);
-							}
-						}
-						//unzip into the folders
-						for ($i = 0; $i < $zip->numFiles; $i++)
-						{
-							$OnlyFileName = $zip->getNameIndex($i);
-							$FullFileName = $zip->statIndex($i);
+            if (isset($_POST['name'])) {
+                $put_contents_path .= str_replace("\0", "", $_POST['name']);
+            }
 
-							if (!($FullFileName['name'][strlen($FullFileName['name']) - 1] == '/'))
-							{
-								$fileinfo = pathinfo($OnlyFileName);
-								if (in_array(strtolower($fileinfo['extension']), $ext))
-								{
-									copy('zip://'.$path.'#'.$OnlyFileName, $base_folder.$FullFileName['name']);
-								}
-							}
-						}
-						$zip->close();
-					} 
-					else
-						echo 'failed to open file';
-					break;
-				case 'gz':
-					$p = new PharData($path);
-					$p->decompress(); // creates files.tar
-					break;
-				case 'tar':
-					// unarchive from the tar
-					$phar = new PharData($path);
-					$phar->decompressFiles();
-					$files = array();
-					check_files_extensions_on_phar($phar, $files, '', $ext);
-					$phar->extractTo($current_path.fix_dirname($_POST['path']).'/', $files, true);
+            file_put_contents($put_contents_path, $image_data);
+            //new thumb creation
+            //try{
+            create_img_gd($current_path.$_POST['path'].$_POST['name'], $thumbs_base_path.$_POST['path'].$_POST['name'], 122, 91);
+            new_thumbnails_creation($current_path.$_POST['path'], $current_path.$_POST['path'].$_POST['name'], $_POST['name'], $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height);
+            /*} catch (Exception $e) {
+            $src_thumb=$mini_src="";
+            }*/
+            break;
+        case 'extract':
+            if (strpos($_POST['path'], '/') === 0 || strpos($_POST['path'], '../') !== false || strpos($_POST['path'], './') === 0) {
+                die('wrong path');
+            }
+            $path = $current_path.$_POST['path'];
+            $info = pathinfo($path);
+            $base_folder = $current_path.fix_dirname($_POST['path']).'/';
+            switch ($info['extension']) {
+                case 'zip':
+                    $zip = new ZipArchive;
+                    if ($zip->open($path) === true) {
+                        //make all the folders
+                        for ($i = 0; $i < $zip->numFiles; $i++) {
+                            $OnlyFileName = $zip->getNameIndex($i);
+                            $FullFileName = $zip->statIndex($i);
+                            if ($FullFileName['name'][strlen($FullFileName['name']) - 1] == '/') {
+                                create_folder($base_folder.$FullFileName['name']);
+                            }
+                        }
+                        //unzip into the folders
+                        for ($i = 0; $i < $zip->numFiles; $i++) {
+                            $OnlyFileName = $zip->getNameIndex($i);
+                            $FullFileName = $zip->statIndex($i);
 
-					break;
-			}
-			break;
-		case 'media_preview':
+                            if (!($FullFileName['name'][strlen($FullFileName['name']) - 1] == '/')) {
+                                $fileinfo = pathinfo($OnlyFileName);
+                                if (in_array(strtolower($fileinfo['extension']), $ext)) {
+                                    copy('zip://'.$path.'#'.$OnlyFileName, $base_folder.$FullFileName['name']);
+                                }
+                            }
+                        }
+                        $zip->close();
+                    } else {
+                        echo 'failed to open file';
+                    }
+                    break;
+                case 'gz':
+                    $p = new PharData($path);
+                    $p->decompress(); // creates files.tar
+                    break;
+                case 'tar':
+                    // unarchive from the tar
+                    $phar = new PharData($path);
+                    $phar->decompressFiles();
+                    $files = array();
+                    check_files_extensions_on_phar($phar, $files, '', $ext);
+                    $phar->extractTo($current_path.fix_dirname($_POST['path']).'/', $files, true);
 
-			$preview_file = $_GET['file'];
-			$info = pathinfo($preview_file);
-			?>
+                    break;
+            }
+            break;
+        case 'media_preview':
+
+            $preview_file = $_GET['file'];
+            $info = pathinfo($preview_file);
+            ?>
 			<div id="jp_container_1" class="jp-video " style="margin:0 auto;">
 				<div class="jp-type-single">
 					<div id="jquery_jplayer_1" class="jp-jplayer"></div>
@@ -179,14 +178,13 @@ if (isset($_GET['action']))
 					<div class="jp-no-solution">
 						<span>Update Required</span>
 						To play the media you will need to either update your browser to a recent version or update your
-						<a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
+						<a href="http://get.adobe.com/flashplayer/" class="_blank">Flash plugin</a>.
 					</div>
 				</div>
 			</div>
 			<?php
-			if (in_array(strtolower($info['extension']), $ext_music))
-			{
-				?>
+            if (in_array(strtolower($info['extension']), $ext_music)) {
+                ?>
 
 				<script type="text/javascript">
 					$(document).ready(function () {
@@ -194,11 +192,16 @@ if (isset($_GET['action']))
 						$("#jquery_jplayer_1").jPlayer({
 							ready: function () {
 								$(this).jPlayer("setMedia", {
-									title: "<?php Tools::safeOutput($_GET['title']); ?>",
-									mp3: "<?php echo Tools::safeOutput($preview_file); ?>",
-									m4a: "<?php echo Tools::safeOutput($preview_file); ?>",
-									oga: "<?php echo Tools::safeOutput($preview_file); ?>",
-									wav: "<?php echo Tools::safeOutput($preview_file); ?>"
+									title: "<?php Tools::safeOutput($_GET['title']);
+                ?>",
+									mp3: "<?php echo Tools::safeOutput($preview_file);
+                ?>",
+									m4a: "<?php echo Tools::safeOutput($preview_file);
+                ?>",
+									oga: "<?php echo Tools::safeOutput($preview_file);
+                ?>",
+									wav: "<?php echo Tools::safeOutput($preview_file);
+                ?>"
 								});
 							},
 							swfPath: "js",
@@ -211,9 +214,9 @@ if (isset($_GET['action']))
 				</script>
 
 			<?php
-			} elseif (in_array(strtolower($info['extension']), $ext_video))
-			{
-				?>
+
+            } elseif (in_array(strtolower($info['extension']), $ext_video)) {
+                ?>
 
 				<script type="text/javascript">
 					$(document).ready(function () {
@@ -221,9 +224,12 @@ if (isset($_GET['action']))
 						$("#jquery_jplayer_1").jPlayer({
 							ready: function () {
 								$(this).jPlayer("setMedia", {
-									title: "<?php Tools::safeOutput($_GET['title']); ?>",
-									m4v: "<?php echo Tools::safeOutput($preview_file); ?>",
-									ogv: "<?php echo Tools::safeOutput($preview_file); ?>"
+									title: "<?php Tools::safeOutput($_GET['title']);
+                ?>",
+									m4v: "<?php echo Tools::safeOutput($preview_file);
+                ?>",
+									ogv: "<?php echo Tools::safeOutput($preview_file);
+                ?>"
 								});
 							},
 							swfPath: "js",
@@ -237,9 +243,11 @@ if (isset($_GET['action']))
 				</script>
 
 			<?php
-			}
-			break;
-	}
-else
-	die('no action passed');
-?>
+
+            }
+            break;
+    }
+} else {
+    die('no action passed');
+}
+?>

adm/filemanager/config/config.php

@@ -1,17 +1,23 @@
 <?php
 session_start();
-mb_internal_encoding('UTF-8');
 
-if (!defined('_PS_ADMIN_DIR_'))
-		define('_PS_ADMIN_DIR_', getcwd().'/../');
+if (!defined('_PS_ADMIN_DIR_')) {
+    define('_PS_ADMIN_DIR_', dirname(__FILE__).'/../../');
+}
 
 require_once(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 require_once(_PS_ADMIN_DIR_.'/init.php');
+
+if (function_exists('mb_internal_encoding')) {
+    mb_internal_encoding('UTF-8');
+}
+
 $products_accesses = Profile::getProfileAccess(Context::getContext()->employee->id_profile, Tab::getIdFromClassName('AdminProducts'));
 $cms_accesses = Profile::getProfileAccess(Context::getContext()->employee->id_profile, Tab::getIdFromClassName('AdminCmsContent'));
 
-if (!$products_accesses['edit'] && !$cms_accesses['edit'])
-	die(Tools::displayError());
+if (!$products_accesses['edit'] && !$cms_accesses['edit']) {
+    die(Tools::displayError());
+}
 //------------------------------------------------------------------------------
 // DON'T COPY THIS VARIABLES IN FOLDERS config.php FILES
 //------------------------------------------------------------------------------
@@ -30,12 +36,13 @@ if (!$products_accesses['edit'] && !$cms_accesses['edit'])
 //    |   |   |   |- responsivefilemanager
 //    |   |   |   |   |- plugin.min.js
 
-$base_url="http://".$_SERVER['HTTP_HOST'];  // DON'T TOUCH (base url (only domain) of site (without final /)).
-$upload_dir = __PS_BASE_URI__.'img/cms/'; // path from base_url to base of upload folder (with start and final /)
+
+$base_url = Tools::getHttpHost(true);  // DON'T TOUCH (base url (only domain) of site (without final /)).
+$base_url = Configuration::get('PS_SSL_ENABLED') && Configuration::get('PS_SSL_ENABLED_EVERYWHERE') ? $base_url : str_replace('https', 'http', $base_url);
+$upload_dir = Context::getContext()->shop->getBaseURI().'img/cms/'; // path from base_url to base of upload folder (with start and final /)
 $current_path = _PS_ROOT_DIR_.'/img/cms/'; // relative path from filemanager folder to upload folder (with final /)
 //thumbs folder can't put inside upload folder
 $thumbs_base_path = _PS_ROOT_DIR_.'/img/tmp/cms/'; // relative path from filemanager folder to thumbs folder (with final /)
-$thumbs_base_path = _PS_ROOT_DIR_.'/img/cms/'; // relative path from filemanager folder to thumbs folder (with final /)
 
 //--------------------------------------------------------------------------------------------------------
 // YOU CAN COPY AND CHANGE THESE VARIABLES INTO FOLDERS config.php FILES TO CUSTOMIZE EACH FOLDER OPTIONS
@@ -79,7 +86,7 @@ $image_resizing_height=0;
 //******************
 $default_view=0;
 
-//set if the filename is truncated when overflow first row 
+//set if the filename is truncated when overflow first row
 $ellipsis_title_after_first_row=true;
 
 //*************************
@@ -97,12 +104,12 @@ $duplicate_files=true;
 //Allowed extensions (lowercase insert)
 //**********************
 $ext_img = array('jpg', 'jpeg', 'png', 'gif', 'bmp', 'tiff', 'svg'); //Images
-$ext_file = array('doc', 'docx','rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv','html','xhtml','psd','sql','log','fla','xml','ade','adp','mdb','accdb','ppt','pptx','odt','ots','ott','odb','odg','otp','otg','odf','ods','odp','css','ai'); //Files
-$ext_video = array('mov', 'mpeg', 'mp4', 'avi', 'mpg','wma',"flv","webm"); //Video 
-$ext_music = array('mp3', 'm4a', 'ac3', 'aiff', 'mid','ogg','wav'); //Audio
-$ext_misc = array('zip', 'rar','gz','tar','iso','dmg'); //Archives
+$ext_file = array('pdf'); // array('doc', 'docx','rtf', 'pdf', 'xls', 'xlsx', 'txt', 'csv','html','xhtml','psd','sql','log','fla','xml','ade','adp','mdb','accdb','ppt','pptx','odt','ots','ott','odb','odg','otp','otg','odf','ods','odp','css','ai'); //Files
+$ext_video = array('mov', 'mpeg', 'mp4', 'avi', 'mpg', 'wma', 'flv', 'webm'); //Video
+$ext_music = array();//array('mp3', 'm4a', 'ac3', 'aiff', 'mid','ogg','wav'); //Audio
+$ext_misc = array();// array('zip', 'rar','gz','tar','iso','dmg'); //Archives
 
-$ext=array_merge($ext_img, $ext_file, $ext_misc, $ext_video,$ext_music); //allowed extensions
+$ext=array_merge($ext_img, $ext_file, $ext_misc, $ext_video, $ext_music); //allowed extensions
 
 
 /******************
@@ -129,7 +136,7 @@ $hidden_folders = array();
 $hidden_files = array('config.php');
 
 /*******************
- * JAVA upload 
+ * JAVA upload
  *******************/
 $java_upload=false;
 $JAVAMaxSizeUpload=200; //Gb
@@ -141,7 +148,7 @@ $JAVAMaxSizeUpload=200; //Gb
 
 
 // New image resized creation with fixed path from filemanager folder after uploading (thumbnails in fixed mode)
-// If you want create images resized out of upload folder for use with external script you can choose this method, 
+// If you want create images resized out of upload folder for use with external script you can choose this method,
 // You can create also more than one image at a time just simply add a value in the array
 // Remember than the image creation respect the folder hierarchy so if you are inside source/test/test1/ the new image will create at
 // path_from_filemanager/test/test1/
@@ -164,5 +171,3 @@ $relative_image_creation_name_to_prepend= array('','test_'); //name to prepend o
 $relative_image_creation_name_to_append = array('_test',''); //name to append on filename
 $relative_image_creation_width          = array(300,400); //width of image (you can leave empty if you set height)
 $relative_image_creation_height         = array(200,''); //height of image (you can leave empty if you set width)
-
-?>

adm/filemanager/config/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/css/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/execute.php

@@ -1,205 +1,207 @@
 <?php
 include('config/config.php');
-if ($_SESSION['verify'] != 'RESPONSIVEfilemanager') die('forbiden');
+if ($_SESSION['verify'] != 'RESPONSIVEfilemanager') {
+    die('forbiden');
+}
 include('include/utils.php');
 
 $_POST['path_thumb'] = $thumbs_base_path.$_POST['path_thumb'];
-if (!isset($_POST['path_thumb']) && trim($_POST['path_thumb']) == '')
-	die('wrong path');
+if (!isset($_POST['path_thumb']) && trim($_POST['path_thumb']) == '') {
+    die('wrong path');
+}
 
 $thumb_pos = strpos($_POST['path_thumb'], $thumbs_base_path);
 if ($thumb_pos === false
-	|| preg_match('/\.{1,2}[\/|\\\]/', $_POST['path_thumb']) !== 0
-	|| preg_match('/\.{1,2}[\/|\\\]/', $_POST['path']) !== 0
-)
-	die('wrong path');
+    || preg_match('/\.{1,2}[\/|\\\]/', $_POST['path_thumb']) !== 0
+    || preg_match('/\.{1,2}[\/|\\\]/', $_POST['path']) !== 0
+) {
+    die('wrong path');
+}
 
 $language_file = 'lang/en.php';
-if (isset($_GET['lang']) && $_GET['lang'] != 'undefined' && $_GET['lang'] != '')
-{
-	$path_parts = pathinfo($_GET['lang']);
-	if (is_readable('lang/'.$path_parts['basename'].'.php'))
-		$language_file = 'lang/'.$path_parts['basename'].'.php';
+if (isset($_GET['lang']) && $_GET['lang'] != 'undefined' && $_GET['lang'] != '') {
+    $path_parts = pathinfo($_GET['lang']);
+    if (is_readable('lang/'.$path_parts['basename'].'.php')) {
+        $language_file = 'lang/'.$path_parts['basename'].'.php';
+    }
 }
 require_once $language_file;
 
 $base = $current_path;
 
-if (isset($_POST['path']))
-	$path = $current_path.str_replace("\0", "", $_POST['path']);
-else
-	$path = $current_path;
+if (isset($_POST['path'])) {
+    $path = $current_path.str_replace("\0", "", $_POST['path']);
+} else {
+    $path = $current_path;
+}
 
 $cycle = true;
 $max_cycles = 50;
 $i = 0;
-while ($cycle && $i < $max_cycles)
-{
-	$i++;
-	if ($path == $base) $cycle = false;
+while ($cycle && $i < $max_cycles) {
+    $i++;
+    if ($path == $base) {
+        $cycle = false;
+    }
 
-	if (file_exists($path.'config.php'))
-	{
-		require_once($path.'config.php');
-		$cycle = false;
-	}
-	$path = fix_dirname($path).'/';
-	$cycle = false;
+    if (file_exists($path.'config.php')) {
+        require_once($path.'config.php');
+        $cycle = false;
+    }
+    $path = fix_dirname($path).'/';
+    $cycle = false;
 }
 
 $path = $current_path.str_replace("\0", "", $_POST['path']);
 $path_thumb = $_POST['path_thumb'];
-if (isset($_POST['name']))
-{
-	$name = $_POST['name'];
-	if (preg_match('/\.{1,2}[\/|\\\]/', $name) !== 0) die('wrong name');
+if (isset($_POST['name'])) {
+    $name = $_POST['name'];
+    if (preg_match('/\.{1,2}[\/|\\\]/', $name) !== 0) {
+        die('wrong name');
+    }
 }
 
 $info = pathinfo($path);
-if (isset($info['extension']) && !(isset($_GET['action']) && $_GET['action'] == 'delete_folder') && !in_array(strtolower($info['extension']), $ext))
-	die('wrong extension');
-
-if (isset($_GET['action']))
-{
-
-	switch ($_GET['action'])
-	{
-		case 'delete_file':
-			if ($delete_files)
-			{
-				unlink($path);
-				if (file_exists($path_thumb))
-					unlink($path_thumb);
-
-				$info = pathinfo($path);
-				if ($relative_image_creation)
-				{
-					foreach ($relative_path_from_current_pos as $k => $path)
-					{
-						if ($path != '' && $path[strlen($path) - 1] != '/')
-							$path .= '/';
-						if (file_exists($info['dirname'].'/'.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].'.'.$info['extension']))
-							unlink($info['dirname'].'/'.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].'.'.$info['extension']);
-					}
-				}
-
-				if ($fixed_image_creation)
-				{
-					foreach ($fixed_path_from_filemanager as $k => $path)
-					{
-						if ($path != '' && $path[strlen($path) - 1] != '/')
-							$path .= '/';
-						$base_dir = $path.substr_replace($info['dirname'].'/', '', 0, strlen($current_path));
-						if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension']))
-							unlink($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension']);
-					}
-				}
-			}
-			break;
-		case 'delete_folder':
-			if ($delete_folders)
-			{
-				if (is_dir($path_thumb))
-					deleteDir($path_thumb);
-				if (is_dir($path))
-				{
-					deleteDir($path);
-					if ($fixed_image_creation)
-					{
-						foreach ($fixed_path_from_filemanager as $k => $paths)
-						{
-							if ($paths != '' && $paths[strlen($paths) - 1] != '/') $paths .= '/';
-							$base_dir = $paths.substr_replace($path, '', 0, strlen($current_path));
-							if (is_dir($base_dir))
-								deleteDir($base_dir);
-						}
-					}
-				}
-			}
-			break;
-		case 'create_folder':
-			if ($create_folders)
-				create_folder(fix_path($path, $transliteration), fix_path($path_thumb, $transliteration));
-			break;
-		case 'rename_folder':
-			if ($rename_folders)
-			{
-				$name = fix_filename($name, $transliteration);
-				$name = str_replace('.', '', $name);
-
-				if (!empty($name))
-				{
-					if (!rename_folder($path, $name, $transliteration))
-						die(lang_Rename_existing_folder);
-					rename_folder($path_thumb, $name, $transliteration);
-					if ($fixed_image_creation)
-					{
-						foreach ($fixed_path_from_filemanager as $k => $paths)
-						{
-							if ($paths != '' && $paths[strlen($paths) - 1] != '/') $paths .= '/';
-							$base_dir = $paths.substr_replace($path, '', 0, strlen($current_path));
-							rename_folder($base_dir, $name, $transliteration);
-						}
-					}
-				} else
-					die(lang_Empty_name);
-			}
-			break;
-		case 'rename_file':
-			if ($rename_files)
-			{
-				$name = fix_filename($name, $transliteration);
-				if (!empty($name))
-				{
-					if (!rename_file($path, $name, $transliteration))
-						die(lang_Rename_existing_file);
-					rename_file($path_thumb, $name, $transliteration);
-					if ($fixed_image_creation)
-					{
-						$info = pathinfo($path);
-						foreach ($fixed_path_from_filemanager as $k => $paths)
-						{
-							if ($paths != '' && $paths[strlen($paths) - 1] != '/') $paths .= '/';
-							$base_dir = $paths.substr_replace($info['dirname'].'/', '', 0, strlen($current_path));
-							if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension']))
-								rename_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension'], $fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k], $transliteration);
-						}
-					}
-				} else
-					die(lang_Empty_name);
-			}
-			break;
-		case 'duplicate_file':
-			if ($duplicate_files)
-			{
-				$name = fix_filename($name, $transliteration);
-				if (!empty($name))
-				{
-					if (!duplicate_file($path, $name))
-						die(lang_Rename_existing_file);
-					duplicate_file($path_thumb, $name);
-					if ($fixed_image_creation)
-					{
-						$info = pathinfo($path);
-						foreach ($fixed_path_from_filemanager as $k => $paths)
-						{
-							if ($paths != '' && $paths[strlen($paths) - 1] != '/') $paths .= '/';
-							$base_dir = $paths.substr_replace($info['dirname'].'/', '', 0, strlen($current_path));
-							if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension']))
-								duplicate_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension'], $fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k]);
-						}
-					}
-				} else
-					die(lang_Empty_name);
-			}
-			break;
-		default:
-			die('wrong action');
-			break;
-	}
-
+if (isset($info['extension']) && !(isset($_GET['action']) && $_GET['action'] == 'delete_folder') && !in_array(strtolower($info['extension']), $ext)) {
+    die('wrong extension');
 }
 
+if (isset($_GET['action'])) {
+    switch ($_GET['action']) {
+        case 'delete_file':
+            if ($delete_files) {
+                unlink($path);
+                if (file_exists($path_thumb)) {
+                    unlink($path_thumb);
+                }
 
+                $info = pathinfo($path);
+                if ($relative_image_creation) {
+                    foreach ($relative_path_from_current_pos as $k => $path) {
+                        if ($path != '' && $path[strlen($path) - 1] != '/') {
+                            $path .= '/';
+                        }
+                        if (file_exists($info['dirname'].'/'.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].'.'.$info['extension'])) {
+                            unlink($info['dirname'].'/'.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].'.'.$info['extension']);
+                        }
+                    }
+                }
 
-?>
+                if ($fixed_image_creation) {
+                    foreach ($fixed_path_from_filemanager as $k => $path) {
+                        if ($path != '' && $path[strlen($path) - 1] != '/') {
+                            $path .= '/';
+                        }
+                        $base_dir = $path.substr_replace($info['dirname'].'/', '', 0, strlen($current_path));
+                        if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension'])) {
+                            unlink($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension']);
+                        }
+                    }
+                }
+            }
+            break;
+        case 'delete_folder':
+            if ($delete_folders) {
+                if (is_dir($path_thumb)) {
+                    deleteDir($path_thumb);
+                }
+                if (is_dir($path)) {
+                    deleteDir($path);
+                    if ($fixed_image_creation) {
+                        foreach ($fixed_path_from_filemanager as $k => $paths) {
+                            if ($paths != '' && $paths[strlen($paths) - 1] != '/') {
+                                $paths .= '/';
+                            }
+                            $base_dir = $paths.substr_replace($path, '', 0, strlen($current_path));
+                            if (is_dir($base_dir)) {
+                                deleteDir($base_dir);
+                            }
+                        }
+                    }
+                }
+            }
+            break;
+        case 'create_folder':
+            if ($create_folders) {
+                create_folder(fix_path($path, $transliteration), fix_path($path_thumb, $transliteration));
+            }
+            break;
+        case 'rename_folder':
+            if ($rename_folders) {
+                $name = fix_filename($name, $transliteration);
+                $name = str_replace('.', '', $name);
+
+                if (!empty($name)) {
+                    if (!rename_folder($path, $name, $transliteration)) {
+                        die(lang_Rename_existing_folder);
+                    }
+                    rename_folder($path_thumb, $name, $transliteration);
+                    if ($fixed_image_creation) {
+                        foreach ($fixed_path_from_filemanager as $k => $paths) {
+                            if ($paths != '' && $paths[strlen($paths) - 1] != '/') {
+                                $paths .= '/';
+                            }
+                            $base_dir = $paths.substr_replace($path, '', 0, strlen($current_path));
+                            rename_folder($base_dir, $name, $transliteration);
+                        }
+                    }
+                } else {
+                    die(lang_Empty_name);
+                }
+            }
+            break;
+        case 'rename_file':
+            if ($rename_files) {
+                $name = fix_filename($name, $transliteration);
+                if (!empty($name)) {
+                    if (!rename_file($path, $name, $transliteration)) {
+                        die(lang_Rename_existing_file);
+                    }
+                    rename_file($path_thumb, $name, $transliteration);
+                    if ($fixed_image_creation) {
+                        $info = pathinfo($path);
+                        foreach ($fixed_path_from_filemanager as $k => $paths) {
+                            if ($paths != '' && $paths[strlen($paths) - 1] != '/') {
+                                $paths .= '/';
+                            }
+                            $base_dir = $paths.substr_replace($info['dirname'].'/', '', 0, strlen($current_path));
+                            if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension'])) {
+                                rename_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension'], $fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k], $transliteration);
+                            }
+                        }
+                    }
+                } else {
+                    die(lang_Empty_name);
+                }
+            }
+            break;
+        case 'duplicate_file':
+            if ($duplicate_files) {
+                $name = fix_filename($name, $transliteration);
+                if (!empty($name)) {
+                    if (!duplicate_file($path, $name)) {
+                        die(lang_Rename_existing_file);
+                    }
+                    duplicate_file($path_thumb, $name);
+                    if ($fixed_image_creation) {
+                        $info = pathinfo($path);
+                        foreach ($fixed_path_from_filemanager as $k => $paths) {
+                            if ($paths != '' && $paths[strlen($paths) - 1] != '/') {
+                                $paths .= '/';
+                            }
+                            $base_dir = $paths.substr_replace($info['dirname'].'/', '', 0, strlen($current_path));
+                            if (file_exists($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension'])) {
+                                duplicate_file($base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].'.'.$info['extension'], $fixed_image_creation_name_to_prepend[$k].$name.$fixed_image_creation_to_append[$k]);
+                            }
+                        }
+                    }
+                } else {
+                    die(lang_Empty_name);
+                }
+            }
+            break;
+        default:
+            die('wrong action');
+            break;
+    }
+}

adm/filemanager/force_download.php

@@ -1,20 +1,25 @@
 <?php
 include('config/config.php');
-if ($_SESSION['verify'] != 'RESPONSIVEfilemanager') die('forbiden');
+if ($_SESSION['verify'] != 'RESPONSIVEfilemanager') {
+    die('forbiden');
+}
 include('include/utils.php');
 
-if (preg_match('/\.{1,2}[\/|\\\]/', $_POST['path']) !== 0)
-	die('wrong path');
+if (preg_match('/\.{1,2}[\/|\\\]/', $_POST['path']) !== 0) {
+    die('wrong path');
+}
 
-if (strpos($_POST['name'], '/') !== false || strpos($_POST['name'], '\\') !== false)
-	die('wrong path');
+if (strpos($_POST['name'], '/') !== false || strpos($_POST['name'], '\\') !== false) {
+    die('wrong path');
+}
 
 $path = $current_path.$_POST['path'];
 $name = $_POST['name'];
 
 $info = pathinfo($name);
-if (!in_array(fix_strtolower($info['extension']), $ext))
-	die('wrong extension');
+if (!in_array(fix_strtolower($info['extension']), $ext)) {
+    die('wrong extension');
+}
 
 header('Pragma: private');
 header('Cache-control: private, must-revalidate');
@@ -24,4 +29,3 @@ header('Content-Disposition: attachment; filename="'.($name).'"');
 readfile($path.$name);
 
 exit;
-?>

adm/filemanager/img/ico/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/img/ico_dark/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/img/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/include/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/include/utils.php

@@ -1,251 +1,291 @@
-<?php 
+<?php
 
-if($_SESSION["verify"] != "RESPONSIVEfilemanager") die('forbiden');
+if ($_SESSION["verify"] != "RESPONSIVEfilemanager") {
+    die('forbiden');
+}
 
-function deleteDir($dir) {
-    if (!file_exists($dir)) return true;
-    if (!is_dir($dir)) return unlink($dir);
+function deleteDir($dir)
+{
+    if (!file_exists($dir)) {
+        return true;
+    }
+    if (!is_dir($dir)) {
+        return unlink($dir);
+    }
     foreach (scandir($dir) as $item) {
-        if ($item == '.' || $item == '..') continue;
-        if (!deleteDir($dir.DIRECTORY_SEPARATOR.$item)) return false;
+        if ($item == '.' || $item == '..') {
+            continue;
+        }
+        if (!deleteDir($dir.DIRECTORY_SEPARATOR.$item)) {
+            return false;
+        }
     }
     return rmdir($dir);
 }
 
-function duplicate_file($old_path,$name){
-    if(file_exists($old_path)){
-	$info=pathinfo($old_path);
-	$new_path=$info['dirname']."/".$name.".".$info['extension'];
-	if(file_exists($new_path)) return false;
-	return copy($old_path,$new_path);
+function duplicate_file($old_path, $name)
+{
+    if (file_exists($old_path)) {
+        $info=pathinfo($old_path);
+        $new_path=$info['dirname']."/".$name.".".$info['extension'];
+        if (file_exists($new_path)) {
+            return false;
+        }
+        return copy($old_path, $new_path);
     }
 }
 
-function rename_file($old_path,$name,$transliteration){
-    $name=fix_filename($name,$transliteration);
-    if(file_exists($old_path)){
-	$info=pathinfo($old_path);
-	$new_path=$info['dirname']."/".$name.".".$info['extension'];
-	if(file_exists($new_path)) return false;
-	return rename($old_path,$new_path);
+function rename_file($old_path, $name, $transliteration)
+{
+    $name=fix_filename($name, $transliteration);
+    if (file_exists($old_path)) {
+        $info=pathinfo($old_path);
+        $new_path=$info['dirname']."/".$name.".".$info['extension'];
+        if (file_exists($new_path)) {
+            return false;
+        }
+        return rename($old_path, $new_path);
     }
 }
 
-function rename_folder($old_path,$name,$transliteration){
-    $name=fix_filename($name,$transliteration);
-    if(file_exists($old_path)){
-	$new_path=fix_dirname($old_path)."/".$name;
-	if(file_exists($new_path)) return false;
-	return rename($old_path,$new_path);
+function rename_folder($old_path, $name, $transliteration)
+{
+    $name=fix_filename($name, $transliteration);
+    if (file_exists($old_path)) {
+        $new_path=fix_dirname($old_path)."/".$name;
+        if (file_exists($new_path)) {
+            return false;
+        }
+        return rename($old_path, $new_path);
     }
 }
 
-function create_img_gd($imgfile, $imgthumb, $newwidth, $newheight="") {
-    if(image_check_memory_usage($imgfile,$newwidth,$newheight)){
-	require_once('php_image_magician.php');
-	$magicianObj = new imageLib($imgfile);
-	$magicianObj -> resizeImage($newwidth, $newheight, 'crop');
-	$magicianObj -> saveImage($imgthumb,80);
-	return true;
+function create_img_gd($imgfile, $imgthumb, $newwidth, $newheight="")
+{
+    if (image_check_memory_usage($imgfile, $newwidth, $newheight)) {
+        require_once('php_image_magician.php');
+        $magicianObj = new imageLib($imgfile);
+        $magicianObj -> resizeImage($newwidth, $newheight, 'crop');
+        $magicianObj -> saveImage($imgthumb, 80);
+        return true;
     }
     return false;
 }
 
-function create_img($imgfile, $imgthumb, $newwidth, $newheight="") {
-    if(image_check_memory_usage($imgfile,$newwidth,$newheight)){
-	require_once('php_image_magician.php');  
-	$magicianObj = new imageLib($imgfile);
-	$magicianObj -> resizeImage($newwidth, $newheight, 'auto');  
-	$magicianObj -> saveImage($imgthumb,80);
-	return true;
-    }else{
-	return false;
+function create_img($imgfile, $imgthumb, $newwidth, $newheight="")
+{
+    if (image_check_memory_usage($imgfile, $newwidth, $newheight)) {
+        require_once('php_image_magician.php');
+        $magicianObj = new imageLib($imgfile);
+        $magicianObj -> resizeImage($newwidth, $newheight, 'auto');
+        $magicianObj -> saveImage($imgthumb, 80);
+        return true;
+    } else {
+        return false;
     }
 }
 
-function makeSize($size) {
-   $units = array('B','KB','MB','GB','TB');
-   $u = 0;
-   while ( (round($size / 1024) > 0) && ($u < 4) ) {
-     $size = $size / 1024;
-     $u++;
-   }
-   return (number_format($size, 0) . " " . $units[$u]);
+function makeSize($size)
+{
+    $units = array('B','KB','MB','GB','TB');
+    $u = 0;
+    while ((round($size / 1024) > 0) && ($u < 4)) {
+        $size = $size / 1024;
+        $u++;
+    }
+    return (number_format($size, 0) . " " . $units[$u]);
 }
 
-function foldersize($path) {
+function foldersize($path)
+{
     $total_size = 0;
     $files = scandir($path);
     $cleanPath = rtrim($path, '/'). '/';
 
-    foreach($files as $t) {
+    foreach ($files as $t) {
         if ($t<>"." && $t<>"..") {
             $currentFile = $cleanPath . $t;
             if (is_dir($currentFile)) {
                 $size = foldersize($currentFile);
                 $total_size += $size;
-            }
-            else {
+            } else {
                 $size = filesize($currentFile);
                 $total_size += $size;
             }
-        }   
+        }
     }
 
     return $total_size;
 }
 
-function create_folder($path=false,$path_thumbs=false){
+function create_folder($path=false, $path_thumbs=false)
+{
     $oldumask = umask(0);
-    if ($path && !file_exists($path))
-        mkdir($path, 0777, true); // or even 01777 so you get the sticky bit set 
-    if($path_thumbs && !file_exists($path_thumbs)) 
-        mkdir($path_thumbs, 0777, true) or die("$path_thumbs cannot be found"); // or even 01777 so you get the sticky bit set 
+    if ($path && !file_exists($path)) {
+        mkdir($path, 0777, true);
+    } // or even 01777 so you get the sticky bit set
+    if ($path_thumbs && !file_exists($path_thumbs)) {
+        mkdir($path_thumbs, 0777, true) or die("$path_thumbs cannot be found");
+    } // or even 01777 so you get the sticky bit set
     umask($oldumask);
 }
 
-function check_files_extensions_on_path($path,$ext){
-    if(!is_dir($path)){
-	$fileinfo = pathinfo($path);
-	if(!in_array(mb_strtolower($fileinfo['extension']),$ext))
-	    unlink($path);
-    }else{
-	$files = scandir($path);
-	foreach($files as $file){
-	    check_files_extensions_on_path(trim($path,'/')."/".$file,$ext);
-	}
+function check_files_extensions_on_path($path, $ext)
+{
+    if (!is_dir($path)) {
+        $fileinfo = pathinfo($path);
+        if (function_exists('mb_strtolower')) {
+            if (!in_array(mb_strtolower($fileinfo['extension']), $ext)) {
+                unlink($path);
+            } elseif (!in_array(Tools::strtolower($fileinfo['extension']), $ext)) {
+                unlink($path);
+            }
+        }
+    } else {
+        $files = scandir($path);
+        foreach ($files as $file) {
+            check_files_extensions_on_path(trim($path, '/')."/".$file, $ext);
+        }
     }
 }
 
-function check_files_extensions_on_phar( $phar, &$files, $basepath, $ext ) {
-    foreach( $phar as $file )
-    {
-        if( $file->isFile() )
-        {
-            if(in_array(mb_strtolower($file->getExtension()),$ext))
-            {
-                $files[] = $basepath.$file->getFileName( );
+function check_files_extensions_on_phar($phar, &$files, $basepath, $ext)
+{
+    foreach ($phar as $file) {
+        if ($file->isFile()) {
+            if (function_exists('mb_strtolower')) {
+                if (in_array(mb_strtolower($file->getExtension()), $ext)) {
+                    $files[] = $basepath.$file->getFileName();
+                } elseif (in_array(Tools::strtolower($file->getExtension()), $ext)) {
+                    $files[] = $basepath.$file->getFileName();
+                }
             }
-        }
-        else if( $file->isDir() )
-        {
-            $iterator = new DirectoryIterator( $file );
+        } elseif ($file->isDir()) {
+            $iterator = new DirectoryIterator($file);
             check_files_extensions_on_phar($iterator, $files, $basepath.$file->getFileName().'/', $ext);
         }
     }
 }
 
-function fix_filename($str,$transliteration){
-    if($transliteration){
-	if( function_exists( 'transliterator_transliterate' ) )
-	{
-	   $str = transliterator_transliterate( 'Accents-Any', $str );
-	}
-	else
-	{
-	   $str = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
-	}
-		
-	$str = preg_replace( "/[^a-zA-Z0-9\.\[\]_| -]/", '', $str );
+function fix_filename($str, $transliteration)
+{
+    if ($transliteration) {
+        if (function_exists('transliterator_transliterate')) {
+            $str = transliterator_transliterate('Accents-Any', $str);
+        } else {
+            $str = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $str);
+        }
+
+        $str = preg_replace("/[^a-zA-Z0-9\.\[\]_| -]/", '', $str);
     }
-    
-    $str=str_replace(array('"',"'","/","\\"),"",$str);
+
+    $str=str_replace(array('"', "'", "/", "\\"), "", $str);
     $str=strip_tags($str);
-			   
+
     // Empty or incorrectly transliterated filename.
     // Here is a point: a good file UNKNOWN_LANGUAGE.jpg could become .jpg in previous code.
     // So we add that default 'file' name to fix that issue.
-    if( strpos( $str, '.' ) === 0 )
-    {
-       $str = 'file'.$str;
+    if (strpos($str, '.') === 0) {
+        $str = 'file'.$str;
     }
-	    
-    return trim( $str );
+
+    return trim($str);
 }
 
-function fix_dirname($str){
-    return str_replace('~',' ',dirname(str_replace(' ','~',$str)));
+function fix_dirname($str)
+{
+    return str_replace('~', ' ', dirname(str_replace(' ', '~', $str)));
 }
 
-function fix_strtoupper($str){
-    if( function_exists( 'mb_strtoupper' ) )
-	return mb_strtoupper($str);
-    else
-	return strtoupper($str);
+function fix_strtoupper($str)
+{
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtoupper($str);
+    } else {
+        return strtoupper($str);
+    }
 }
 
 
-function fix_strtolower($str){
-    if( function_exists( 'mb_strtoupper' ) )
-	return mb_strtolower($str);
-    else
-	return strtolower($str);
+function fix_strtolower($str)
+{
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtolower($str);
+    } else {
+        return strtolower($str);
+    }
 }
 
-function fix_path($path,$transliteration){
+function fix_path($path, $transliteration)
+{
     $info=pathinfo($path);
-    if (($s = strrpos($path, '/')) !== false) $s++; 
-    if (($e = strrpos($path, '.') - $s) !== strlen($info['filename']))
-    {
-       $info['filename'] = substr($path, $s, $e); 
-       $info['basename'] = substr($path, $s); 
+    if (($s = strrpos($path, '/')) !== false) {
+        $s++;
+    }
+    if (($e = strrpos($path, '.') - $s) !== strlen($info['filename'])) {
+        $info['filename'] = substr($path, $s, $e);
+        $info['basename'] = substr($path, $s);
     }
     $tmp_path = $info['dirname'].DIRECTORY_SEPARATOR.$info['basename'];
-    
-    $str=fix_filename($info['filename'],$transliteration);
-    if($tmp_path!="")
-	return $tmp_path.DIRECTORY_SEPARATOR.$str;
-    else
-	return $str;
+
+    $str=fix_filename($info['filename'], $transliteration);
+    if ($tmp_path!="") {
+        return $tmp_path.DIRECTORY_SEPARATOR.$str;
+    } else {
+        return $str;
+    }
 }
 
-function base_url(){
-  return sprintf(
+function base_url()
+{
+    return sprintf(
     "%s://%s",
     isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https' : 'http',
     $_SERVER['HTTP_HOST']
   );
 }
 
-function config_loading($current_path,$fld){
-    if(file_exists($current_path.$fld.".config")){
-	require_once($current_path.$fld.".config");
-	return true;
+function config_loading($current_path, $fld)
+{
+    if (file_exists($current_path.$fld.".config")) {
+        require_once($current_path.$fld.".config");
+        return true;
     }
     echo "!!!!".$parent=fix_dirname($fld);
-    if($parent!="." && !empty($parent)){
-	config_loading($current_path,$parent);
+    if ($parent!="." && !empty($parent)) {
+        config_loading($current_path, $parent);
     }
-    
+
     return false;
 }
 
 
-function image_check_memory_usage($img, $max_breedte, $max_hoogte){
-    if(file_exists($img)){
-	$K64 = 65536;    // number of bytes in 64K
-	$memory_usage = memory_get_usage();
-	$memory_limit = abs(intval(str_replace('M','',ini_get('memory_limit'))*1024*1024));
-	$image_properties = getimagesize($img);
-	$image_width = $image_properties[0];
-	$image_height = $image_properties[1];
-	$image_bits = $image_properties['bits'];
-	$image_memory_usage = $K64 + ($image_width * $image_height * ($image_bits )  * 2);
-	$thumb_memory_usage = $K64 + ($max_breedte * $max_hoogte * ($image_bits ) * 2);
-	$memory_needed = intval($memory_usage + $image_memory_usage + $thumb_memory_usage);
- 
-        if($memory_needed > $memory_limit){
-                ini_set('memory_limit',(intval($memory_needed/1024/1024)+5) . 'M');
-                if(ini_get('memory_limit') == (intval($memory_needed/1024/1024)+5) . 'M'){
+function image_check_memory_usage($img, $max_breedte, $max_hoogte)
+{
+    if (file_exists($img)) {
+        $K64 = 65536;    // number of bytes in 64K
+    $memory_usage = memory_get_usage();
+        $memory_limit = abs(intval(str_replace('M', '', ini_get('memory_limit'))*1024*1024));
+        $image_properties = getimagesize($img);
+        $image_width = $image_properties[0];
+        $image_height = $image_properties[1];
+        $image_bits = $image_properties['bits'];
+        $image_memory_usage = $K64 + ($image_width * $image_height * ($image_bits)  * 2);
+        $thumb_memory_usage = $K64 + ($max_breedte * $max_hoogte * ($image_bits) * 2);
+        $memory_needed = intval($memory_usage + $image_memory_usage + $thumb_memory_usage);
+
+        if ($memory_needed > $memory_limit) {
+            ini_set('memory_limit', (intval($memory_needed/1024/1024)+5) . 'M');
+            if (ini_get('memory_limit') == (intval($memory_needed/1024/1024)+5) . 'M') {
                 return true;
-            }else{
+            } else {
                 return false;
             }
-        }else{
+        } else {
             return true;
         }
-	    }else{
-	    return false;
+    } else {
+        return false;
     }
 }
 
@@ -254,44 +294,57 @@ function endsWith($haystack, $needle)
     return $needle === "" || substr($haystack, -strlen($needle)) === $needle;
 }
 
-function new_thumbnails_creation($targetPath,$targetFile,$name,$current_path,$relative_image_creation,$relative_path_from_current_pos,$relative_image_creation_name_to_prepend,$relative_image_creation_name_to_append,$relative_image_creation_width,$relative_image_creation_height,$fixed_image_creation,$fixed_path_from_filemanager,$fixed_image_creation_name_to_prepend,$fixed_image_creation_to_append,$fixed_image_creation_width,$fixed_image_creation_height){
+function new_thumbnails_creation($targetPath, $targetFile, $name, $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height)
+{
     //create relative thumbs
     $all_ok=true;
-    if($relative_image_creation){
-	foreach($relative_path_from_current_pos as $k=>$path){
-	    if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
-	    if (!file_exists($targetPath.$path)) create_folder($targetPath.$path,false);
-	    $info=pathinfo($name);
-	    if(!endsWith($targetPath,$path))
-		if(!create_img($targetFile, $targetPath.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension'], $relative_image_creation_width[$k], $relative_image_creation_height[$k]))
-		    $all_ok=false;
-	}
+    if ($relative_image_creation) {
+        foreach ($relative_path_from_current_pos as $k=>$path) {
+            if ($path!="" && $path[strlen($path)-1]!="/") {
+                $path.="/";
+            }
+            if (!file_exists($targetPath.$path)) {
+                create_folder($targetPath.$path, false);
+            }
+            $info=pathinfo($name);
+            if (!endsWith($targetPath, $path)) {
+                if (!create_img($targetFile, $targetPath.$path.$relative_image_creation_name_to_prepend[$k].$info['filename'].$relative_image_creation_name_to_append[$k].".".$info['extension'], $relative_image_creation_width[$k], $relative_image_creation_height[$k])) {
+                    $all_ok=false;
+                }
+            }
+        }
     }
-    
+
     //create fixed thumbs
-    if($fixed_image_creation){
-	foreach($fixed_path_from_filemanager as $k=>$path){
-	    if($path!="" && $path[strlen($path)-1]!="/") $path.="/";
-	    $base_dir=$path.substr_replace($targetPath, '', 0, strlen($current_path));
-	    if (!file_exists($base_dir)) create_folder($base_dir,false);
-	    $info=pathinfo($name);
-	    if(!create_img($targetFile, $base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_width[$k], $fixed_image_creation_height[$k]))
-		$all_ok=false;
-	}
+    if ($fixed_image_creation) {
+        foreach ($fixed_path_from_filemanager as $k=>$path) {
+            if ($path!="" && $path[strlen($path)-1]!="/") {
+                $path.="/";
+            }
+            $base_dir=$path.substr_replace($targetPath, '', 0, strlen($current_path));
+            if (!file_exists($base_dir)) {
+                create_folder($base_dir, false);
+            }
+            $info=pathinfo($name);
+            if (!create_img($targetFile, $base_dir.$fixed_image_creation_name_to_prepend[$k].$info['filename'].$fixed_image_creation_to_append[$k].".".$info['extension'], $fixed_image_creation_width[$k], $fixed_image_creation_height[$k])) {
+                $all_ok=false;
+            }
+        }
     }
     return $all_ok;
 }
 
 
 // Get a remote file, using whichever mechanism is enabled
-function get_file_by_url($url) {
+function get_file_by_url($url)
+{
     if (ini_get('allow_url_fopen')) {
         return file_get_contents($url);
     }
     if (!function_exists('curl_version')) {
         return false;
     }
-    
+
     $ch = curl_init();
 
     curl_setopt($ch, CURLOPT_HEADER, 0);
@@ -303,5 +356,3 @@ function get_file_by_url($url) {
 
     return $data;
 }
-
-?>

adm/filemanager/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/jPlayer/add-on/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/jPlayer/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/jPlayer/popcorn/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/jPlayer/skin/blue.monday/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/jPlayer/skin/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/js/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/lang/az.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Seç');
-define('lang_Erase','Sil');
-define('lang_Open','Aç');
-define('lang_Confirm_del','Bu faylı silmek istədiyinizdə əminsinizmi?');
-define('lang_All','Hamısı');
-define('lang_Files','Fayllar');
-define('lang_Images','Şəkillər');
-define('lang_Archives','Arxivlər');
-define('lang_Error_Upload','Yükləmək istədiyiniz fayl maksimum limiti keçdi.');
-define('lang_Error_extension','Fayl uzantısı icazəsi yoxdur.');
-define('lang_Upload_file','Fayl Yüklə');
-define('lang_Filters','Filtrlər');
-define('lang_Videos','Videolar');
-define('lang_Music','Mahnılar');
-define('lang_New_Folder','Yeni Folder');
-define('lang_Folder_Created','Folder müvəffəqiyyətlə yaradıldı.');
-define('lang_Existing_Folder','Mövcud folder');
-define('lang_Confirm_Folder_del','Bu folderi və içindəkiləri silmək istədiyinizə əminsinizmi?');
-define('lang_Return_Files_List','Faylların siyahısına geri qayıt');
-define('lang_Preview','İlk baxış');
-define('lang_Download','Yüklə');
-define('lang_Insert_Folder_Name','Folder adı əlavə et:');
-define('lang_Root','kök');
-define('lang_Rename','Yenidən Adlandır');
-define('lang_Back','geri');
-define('lang_View','Görünüş');
-define('lang_View_list','List görünüşü');
-define('lang_View_columns_list','Sütunlu list görünüşü');
-define('lang_View_boxes','Qutu görünüşü');
-define('lang_Toolbar','Alətlər Paneli');
-define('lang_Actions','Fəaliyyətlər');
-define('lang_Rename_existing_file','Bu fayl var artıq');
-define('lang_Rename_existing_folder','Bu folder var artıq');
-define('lang_Empty_name','Ad sahəsi boşdur.');
-define('lang_Text_filter','filtrlə...');
-define('lang_Swipe_help','Variantları görmək üçün file/folder adına tıklayın');
-define('lang_Upload_base','Normal Yükləmə');
-define('lang_Upload_java','JAVA Yükləmə (Böyük fayllar üçün)');
-define('lang_Upload_java_help',"Əgər Java tətbiqi yüklənmədisə; 1- Kompüterinizdə Java yüklənmiş olduğundan əmin olun yada <a href='http://java.com/en/download/'>[Java'nı Buradan Yükləyin]</a> 2- Təhlükəsizlik divarının heç bir şeyə mane olmadığından əmin olun.");
-define('lang_Upload_base_help',"Faylları aşağıdakı sahəyə Gətir & Burax ve ya tıklayaraq açılan pəncərədən fayllarınızı seçin. Yükləmə başa çatdığında 'Return to files list' düyməsinə tıklayın.");
-define('lang_Type_dir','Kataloq');
-define('lang_Type','Növ');
-define('lang_Dimension','Ölçü');
-define('lang_Size','Çəki');
-define('lang_Date','Tarix');
-define('lang_Filename','Fayl adı');
-define('lang_Operations','Əməliyyatlar');
-define('lang_Date_type','d-m-Y');
-define('lang_OK','Razıyam');
-define('lang_Cancel','Ləğv Et');
-define('lang_Sorting','sıralama');
-define('lang_Show_url','URL göstər');
-define('lang_Extract','bura çıxart');
-define('lang_File_info','fayl məlumatı');
-define('lang_Edit_image','şəkli redaktə et');
-define('lang_Duplicate','Dublikat');
-?>
+define('lang_Select', 'Seç');
+define('lang_Erase', 'Sil');
+define('lang_Open', 'Aç');
+define('lang_Confirm_del', 'Bu faylı silmek istədiyinizdə əminsinizmi?');
+define('lang_All', 'Hamısı');
+define('lang_Files', 'Fayllar');
+define('lang_Images', 'Şəkillər');
+define('lang_Archives', 'Arxivlər');
+define('lang_Error_Upload', 'Yükləmək istədiyiniz fayl maksimum limiti keçdi.');
+define('lang_Error_extension', 'Fayl uzantısı icazəsi yoxdur.');
+define('lang_Upload_file', 'Fayl Yüklə');
+define('lang_Filters', 'Filtrlər');
+define('lang_Videos', 'Videolar');
+define('lang_Music', 'Mahnılar');
+define('lang_New_Folder', 'Yeni Folder');
+define('lang_Folder_Created', 'Folder müvəffəqiyyətlə yaradıldı.');
+define('lang_Existing_Folder', 'Mövcud folder');
+define('lang_Confirm_Folder_del', 'Bu folderi və içindəkiləri silmək istədiyinizə əminsinizmi?');
+define('lang_Return_Files_List', 'Faylların siyahısına geri qayıt');
+define('lang_Preview', 'İlk baxış');
+define('lang_Download', 'Yüklə');
+define('lang_Insert_Folder_Name', 'Folder adı əlavə et:');
+define('lang_Root', 'kök');
+define('lang_Rename', 'Yenidən Adlandır');
+define('lang_Back', 'geri');
+define('lang_View', 'Görünüş');
+define('lang_View_list', 'List görünüşü');
+define('lang_View_columns_list', 'Sütunlu list görünüşü');
+define('lang_View_boxes', 'Qutu görünüşü');
+define('lang_Toolbar', 'Alətlər Paneli');
+define('lang_Actions', 'Fəaliyyətlər');
+define('lang_Rename_existing_file', 'Bu fayl var artıq');
+define('lang_Rename_existing_folder', 'Bu folder var artıq');
+define('lang_Empty_name', 'Ad sahəsi boşdur.');
+define('lang_Text_filter', 'filtrlə...');
+define('lang_Swipe_help', 'Variantları görmək üçün file/folder adına tıklayın');
+define('lang_Upload_base', 'Normal Yükləmə');
+define('lang_Upload_java', 'JAVA Yükləmə (Böyük fayllar üçün)');
+define('lang_Upload_java_help', "Əgər Java tətbiqi yüklənmədisə; 1- Kompüterinizdə Java yüklənmiş olduğundan əmin olun yada <a href='http://java.com/en/download/'>[Java'nı Buradan Yükləyin]</a> 2- Təhlükəsizlik divarının heç bir şeyə mane olmadığından əmin olun.");
+define('lang_Upload_base_help', "Faylları aşağıdakı sahəyə Gətir & Burax ve ya tıklayaraq açılan pəncərədən fayllarınızı seçin. Yükləmə başa çatdığında 'Return to files list' düyməsinə tıklayın.");
+define('lang_Type_dir', 'Kataloq');
+define('lang_Type', 'Növ');
+define('lang_Dimension', 'Ölçü');
+define('lang_Size', 'Çəki');
+define('lang_Date', 'Tarix');
+define('lang_Filename', 'Fayl adı');
+define('lang_Operations', 'Əməliyyatlar');
+define('lang_Date_type', 'd-m-Y');
+define('lang_OK', 'Razıyam');
+define('lang_Cancel', 'Ləğv Et');
+define('lang_Sorting', 'sıralama');
+define('lang_Show_url', 'URL göstər');
+define('lang_Extract', 'bura çıxart');
+define('lang_File_info', 'fayl məlumatı');
+define('lang_Edit_image', 'şəkli redaktə et');
+define('lang_Duplicate', 'Dublikat');

adm/filemanager/lang/bg.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Избери');
-define('lang_Erase','Изтрий');
-define('lang_Open','Отвори');
-define('lang_Confirm_del','Сигурни ли сте, че искате да изтриете този файл?');
-define('lang_All','Всичко');
-define('lang_Files','Файлове');
-define('lang_Images','Изображения');
-define('lang_Archives','Архиви');
-define('lang_Error_Upload','Каченият файл надминава максимално разрешената големина.');
-define('lang_Error_extension','Това файлово разширение не е позволено.');
-define('lang_Upload_file','Качете файл');
-define('lang_Filters','Папка');
-define('lang_Videos','Видео');
-define('lang_Music','Музика');
-define('lang_New_Folder','Нова папка');
-define('lang_Folder_Created','Папката е правилно създадена');
-define('lang_Existing_Folder','Съществуваща папка');
-define('lang_Confirm_Folder_del','Сигурни ли сте, че искате да изтриете папката и всичко, което се съдържа с нея?');
-define('lang_Return_Files_List','Връщане към списъка с файлове');
-define('lang_Preview','Преглед');
-define('lang_Download','Свали');
-define('lang_Insert_Folder_Name','Въведете име на папката:');
-define('lang_Root','root');
-define('lang_Rename','Преименуване');
-define('lang_Back','обратно');
-define('lang_View','View');
-define('lang_View_list','List view');
-define('lang_View_columns_list','Columns list view');
-define('lang_View_boxes','Box view');
-define('lang_Toolbar','Toolbar');
-define('lang_Actions','Actions');
-define('lang_Rename_existing_file','The file is already existing');
-define('lang_Rename_existing_folder','The folder is already existing');
-define('lang_Empty_name','The name is empty');
-define('lang_Text_filter','text filter');
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
-define('lang_Upload_base','Base upload');
-define('lang_Upload_java','JAVA upload (big size files)');
-define('lang_Upload_java_help',"If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
-define('lang_Upload_base_help',"Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
-define('lang_Type_dir','dir');
-define('lang_Type','Type');
-define('lang_Dimension','Dimension');
-define('lang_Size','Size');
-define('lang_Date','Date');
-define('lang_Filename','Name');
-define('lang_Operations','Operations');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Cancel');
-define('lang_Sorting','sorting');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Избери');
+define('lang_Erase', 'Изтрий');
+define('lang_Open', 'Отвори');
+define('lang_Confirm_del', 'Сигурни ли сте, че искате да изтриете този файл?');
+define('lang_All', 'Всичко');
+define('lang_Files', 'Файлове');
+define('lang_Images', 'Изображения');
+define('lang_Archives', 'Архиви');
+define('lang_Error_Upload', 'Каченият файл надминава максимално разрешената големина.');
+define('lang_Error_extension', 'Това файлово разширение не е позволено.');
+define('lang_Upload_file', 'Качете файл');
+define('lang_Filters', 'Папка');
+define('lang_Videos', 'Видео');
+define('lang_Music', 'Музика');
+define('lang_New_Folder', 'Нова папка');
+define('lang_Folder_Created', 'Папката е правилно създадена');
+define('lang_Existing_Folder', 'Съществуваща папка');
+define('lang_Confirm_Folder_del', 'Сигурни ли сте, че искате да изтриете папката и всичко, което се съдържа с нея?');
+define('lang_Return_Files_List', 'Връщане към списъка с файлове');
+define('lang_Preview', 'Преглед');
+define('lang_Download', 'Свали');
+define('lang_Insert_Folder_Name', 'Въведете име на папката:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Преименуване');
+define('lang_Back', 'обратно');
+define('lang_View', 'View');
+define('lang_View_list', 'List view');
+define('lang_View_columns_list', 'Columns list view');
+define('lang_View_boxes', 'Box view');
+define('lang_Toolbar', 'Toolbar');
+define('lang_Actions', 'Actions');
+define('lang_Rename_existing_file', 'The file is already existing');
+define('lang_Rename_existing_folder', 'The folder is already existing');
+define('lang_Empty_name', 'The name is empty');
+define('lang_Text_filter', 'text filter');
+define('lang_Swipe_help', 'Swipe the name of file/folder to show options');
+define('lang_Upload_base', 'Base upload');
+define('lang_Upload_java', 'JAVA upload (big size files)');
+define('lang_Upload_java_help', "If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
+define('lang_Upload_base_help', "Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Dimension');
+define('lang_Size', 'Size');
+define('lang_Date', 'Date');
+define('lang_Filename', 'Name');
+define('lang_Operations', 'Operations');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Cancel');
+define('lang_Sorting', 'sorting');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/br.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Selecionar');
-define('lang_Erase','Apagar');
-define('lang_Open','Abrir');
-define('lang_Confirm_del','Tem certeza que quer deletar este arquivo?');
-define('lang_All','Todos');
-define('lang_Files','Arquivos');
-define('lang_Images','Imagens');
-define('lang_Archives','Compactados');
-define('lang_Error_Upload','O arquivo enviado é maior que o limite permitido.');
-define('lang_Error_extension','Extensão não permitida.');
-define('lang_Upload_file','Enviar um arquivo');
-define('lang_Filters','Filtro');
-define('lang_Videos','Vídeos');
-define('lang_Music','Musica');
-define('lang_New_Folder','Nova pasta');
-define('lang_Folder_Created','Pasta criada corretamente');
-define('lang_Existing_Folder','Pasta existente');
-define('lang_Confirm_Folder_del','Tem certeza que você quer deletar a pasta e todo o seu conteúdo?');
-define('lang_Return_Files_List','Voltar à lista de arquivos');
-define('lang_Preview','Prévia');
-define('lang_Download','Baixar');
-define('lang_Insert_Folder_Name','Insira o nome da pasta:');
-define('lang_Root','root');
-define('lang_Rename','Mudar o nome');
-define('lang_Back','de volta');
-define('lang_View','View');
-define('lang_View_list','List view');
-define('lang_View_columns_list','Columns list view');
-define('lang_View_boxes','Box view');
-define('lang_Toolbar','Toolbar');
-define('lang_Actions','Actions');
-define('lang_Rename_existing_file','The file is already existing');
-define('lang_Rename_existing_folder','The folder is already existing');
-define('lang_Empty_name','The name is empty');
-define('lang_Text_filter','text filter');
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
-define('lang_Upload_base','Base upload');
-define('lang_Upload_java','JAVA upload (big size files)');
-define('lang_Upload_java_help',"If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
-define('lang_Upload_base_help',"Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
-define('lang_Type_dir','dir');
-define('lang_Type','Type');
-define('lang_Dimension','Dimension');
-define('lang_Size','Size');
-define('lang_Date','Date');
-define('lang_Filename','Name');
-define('lang_Operations','Operations');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Cancel');
-define('lang_Sorting','sıralama');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Selecionar');
+define('lang_Erase', 'Apagar');
+define('lang_Open', 'Abrir');
+define('lang_Confirm_del', 'Tem certeza que quer deletar este arquivo?');
+define('lang_All', 'Todos');
+define('lang_Files', 'Arquivos');
+define('lang_Images', 'Imagens');
+define('lang_Archives', 'Compactados');
+define('lang_Error_Upload', 'O arquivo enviado é maior que o limite permitido.');
+define('lang_Error_extension', 'Extensão não permitida.');
+define('lang_Upload_file', 'Enviar um arquivo');
+define('lang_Filters', 'Filtro');
+define('lang_Videos', 'Vídeos');
+define('lang_Music', 'Musica');
+define('lang_New_Folder', 'Nova pasta');
+define('lang_Folder_Created', 'Pasta criada corretamente');
+define('lang_Existing_Folder', 'Pasta existente');
+define('lang_Confirm_Folder_del', 'Tem certeza que você quer deletar a pasta e todo o seu conteúdo?');
+define('lang_Return_Files_List', 'Voltar à lista de arquivos');
+define('lang_Preview', 'Prévia');
+define('lang_Download', 'Baixar');
+define('lang_Insert_Folder_Name', 'Insira o nome da pasta:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Mudar o nome');
+define('lang_Back', 'de volta');
+define('lang_View', 'View');
+define('lang_View_list', 'List view');
+define('lang_View_columns_list', 'Columns list view');
+define('lang_View_boxes', 'Box view');
+define('lang_Toolbar', 'Toolbar');
+define('lang_Actions', 'Actions');
+define('lang_Rename_existing_file', 'The file is already existing');
+define('lang_Rename_existing_folder', 'The folder is already existing');
+define('lang_Empty_name', 'The name is empty');
+define('lang_Text_filter', 'text filter');
+define('lang_Swipe_help', 'Swipe the name of file/folder to show options');
+define('lang_Upload_base', 'Base upload');
+define('lang_Upload_java', 'JAVA upload (big size files)');
+define('lang_Upload_java_help', "If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
+define('lang_Upload_base_help', "Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Dimension');
+define('lang_Size', 'Size');
+define('lang_Date', 'Date');
+define('lang_Filename', 'Name');
+define('lang_Operations', 'Operations');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Cancel');
+define('lang_Sorting', 'sıralama');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/cs.php

@@ -1,54 +1,53 @@
 <?php
-define('lang_Select','Vybrat');
-define('lang_Erase','Smazat');
-define('lang_Open','Otevřít');
-define('lang_Confirm_del','Opravdu chcete smazat tento soubor?');
-define('lang_All','Vše');
-define('lang_Files','Soubory');
-define('lang_Images','Obrázky');
-define('lang_Archives','Archivy');
-define('lang_Error_Upload','Nahrávaný soubor je příliš velký.');
-define('lang_Error_extension','Nahrání souborů s touto příponou není povoleno.');
-define('lang_Upload_file','Nahrát soubor');
-define('lang_Filters','Filtr');
-define('lang_Videos','Videa');
-define('lang_Music','Hudba');
-define('lang_New_Folder','Nová složka');
-define('lang_Folder_Created','Složka vytvořena');
-define('lang_Existing_Folder','Existující složka');
-define('lang_Confirm_Folder_del','Opravdu chcete smazat tuto složku a její obsah?');
-define('lang_Return_Files_List','Zpět k seznamu souborů');
-define('lang_Preview','Náhled');
-define('lang_Download','Stáhnout');
-define('lang_Insert_Folder_Name','Vložte název složky:');
-define('lang_Root','root');
-define('lang_Rename','Přejmenovat');
-define('lang_Back','zpátky');
-define('lang_View','Zobrazení');
-define('lang_View_list','Seznam souborů');
-define('lang_View_columns_list','Dvousloucpvý seznam souborů');
-define('lang_View_boxes','Dlaždicové zobrazení');
-define('lang_Toolbar','Toolbar');
-define('lang_Actions','Akce');
-define('lang_Rename_existing_file','Tento soubor již existuje');
-define('lang_Rename_existing_folder','Tato složka již existuje');
-define('lang_Empty_name','Zadali jste prázdný název');
-define('lang_Text_filter','textový filtr');
-define('lang_Swipe_help','Pro zobrazení možností klikněte na jméno souboru/složky.');
-define('lang_Upload_base','Základní nahrávání');
-define('lang_Upload_java','JAVA upload (pro velké soubory)');
-define('lang_Upload_java_help',"Pokud se Java Applet nechce načíst: 1. ujistěte se, že Java je nainstalována ve vašem počítači <a href='http://java.com/en/download/'>[odkaz pro stažení]</a> 2. ujistěte se, že nic není blokováno firewallem");
-define('lang_Upload_base_help',"Přetáhněte soubor(y) do prostoru výše nebo do něj klikněte myší (pro novější prohlížeče) v krajním případě vyberte soubory a klikněte na tlačítko. Po dokončení nahrávání klikněte na tlačítko zpět umístěné v horní části okna.");
-define('lang_Type_dir','adresář');
-define('lang_Type','Typ');
-define('lang_Dimension','Rozměr');
-define('lang_Size','Velikost');
-define('lang_Date','Datum');
-define('lang_Filename','Jméno');
-define('lang_Operations','Operace');
-define('lang_Date_type','d.m.Y');
-define('lang_OK','OK');
-define('lang_Cancel','Zrušit');
-define('lang_Sorting','řazení');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Vybrat');
+define('lang_Erase', 'Smazat');
+define('lang_Open', 'Otevřít');
+define('lang_Confirm_del', 'Opravdu chcete smazat tento soubor?');
+define('lang_All', 'Vše');
+define('lang_Files', 'Soubory');
+define('lang_Images', 'Obrázky');
+define('lang_Archives', 'Archivy');
+define('lang_Error_Upload', 'Nahrávaný soubor je příliš velký.');
+define('lang_Error_extension', 'Nahrání souborů s touto příponou není povoleno.');
+define('lang_Upload_file', 'Nahrát soubor');
+define('lang_Filters', 'Filtr');
+define('lang_Videos', 'Videa');
+define('lang_Music', 'Hudba');
+define('lang_New_Folder', 'Nová složka');
+define('lang_Folder_Created', 'Složka vytvořena');
+define('lang_Existing_Folder', 'Existující složka');
+define('lang_Confirm_Folder_del', 'Opravdu chcete smazat tuto složku a její obsah?');
+define('lang_Return_Files_List', 'Zpět k seznamu souborů');
+define('lang_Preview', 'Náhled');
+define('lang_Download', 'Stáhnout');
+define('lang_Insert_Folder_Name', 'Vložte název složky:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Přejmenovat');
+define('lang_Back', 'zpátky');
+define('lang_View', 'Zobrazení');
+define('lang_View_list', 'Seznam souborů');
+define('lang_View_columns_list', 'Dvousloucpvý seznam souborů');
+define('lang_View_boxes', 'Dlaždicové zobrazení');
+define('lang_Toolbar', 'Toolbar');
+define('lang_Actions', 'Akce');
+define('lang_Rename_existing_file', 'Tento soubor již existuje');
+define('lang_Rename_existing_folder', 'Tato složka již existuje');
+define('lang_Empty_name', 'Zadali jste prázdný název');
+define('lang_Text_filter', 'textový filtr');
+define('lang_Swipe_help', 'Pro zobrazení možností klikněte na jméno souboru/složky.');
+define('lang_Upload_base', 'Základní nahrávání');
+define('lang_Upload_java', 'JAVA upload (pro velké soubory)');
+define('lang_Upload_java_help', "Pokud se Java Applet nechce načíst: 1. ujistěte se, že Java je nainstalována ve vašem počítači <a href='http://java.com/en/download/'>[odkaz pro stažení]</a> 2. ujistěte se, že nic není blokováno firewallem");
+define('lang_Upload_base_help', "Přetáhněte soubor(y) do prostoru výše nebo do něj klikněte myší (pro novější prohlížeče) v krajním případě vyberte soubory a klikněte na tlačítko. Po dokončení nahrávání klikněte na tlačítko zpět umístěné v horní části okna.");
+define('lang_Type_dir', 'adresář');
+define('lang_Type', 'Typ');
+define('lang_Dimension', 'Rozměr');
+define('lang_Size', 'Velikost');
+define('lang_Date', 'Datum');
+define('lang_Filename', 'Jméno');
+define('lang_Operations', 'Operace');
+define('lang_Date_type', 'd.m.Y');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Zrušit');
+define('lang_Sorting', 'řazení');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/de.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Ausw&auml;hlen');
-define('lang_Erase','L&ouml;schen');
-define('lang_Open','&Ouml;ffnen');
-define('lang_Confirm_del','Wollen Sie wirklich diese Datei l&ouml;schen?');
-define('lang_All','Alle');
-define('lang_Files','Dateien');
-define('lang_Images','Bilder');
-define('lang_Archives','Archive');
-define('lang_Error_Upload','Dateigr&ouml;&szlig;e &uuml;berschritten.');
-define('lang_Error_extension','Dateityp nicht erlaubt.');
-define('lang_Upload_file','Datei hochladen');
-define('lang_Filters','Filter');
-define('lang_Videos','Videos');
-define('lang_Music','Musik');
-define('lang_New_Folder','Ordner anlegen');
-define('lang_Folder_Created','Ordner erfolgreich erstellt');
-define('lang_Existing_Folder','Ordner existiert bereichts');
-define('lang_Confirm_Folder_del','Sind Sie sich, dass Sie diesen Ordner mit allen enthaltenen Dateien l&ouml;schen m&ouml;chten?');
-define('lang_Return_Files_List','Zur&uuml;ck zur Dateiliste');
-define('lang_Preview','Vorschau');
-define('lang_Download','Download');
-define('lang_Insert_Folder_Name','Ordnername eingeben:');
-define('lang_Root','Basis');
-define('lang_Rename','Umbenennen');
-define('lang_Back','zur&uuml;ck');
-define('lang_View','Ansicht');
-define('lang_View_list','Liste');
-define('lang_View_columns_list','Spalten');
-define('lang_View_boxes','Boxen');
-define('lang_Toolbar','Werkzeugleiste');
-define('lang_Actions','Aktionen');
-define('lang_Rename_existing_file','Die existiert bereits');
-define('lang_Rename_existing_folder','Das Verzeichnis existiert bereits');
-define('lang_Empty_name','Der Name ist leer');
-define('lang_Text_filter','Suchen...');
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
-define('lang_Upload_base','Base upload');
-define('lang_Upload_java','JAVA upload (gro&szlig;e Dateien)');
-define('lang_Upload_java_help',"Sollte das Java Applet nicht laden, stellen Sie sicher, dass 1. Java installiert ist <a href='http://java.com/en/download/'>[download link]</a> und 2. stellen Sie sicher, dass nichts von Ihrer Firewall geblockt wird");
-define('lang_Upload_base_help',"Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
-define('lang_Type_dir','Ordner');
-define('lang_Type','Art');
-define('lang_Dimension','Dimensionen');
-define('lang_Size','Gr&ouml;&szlig;e');
-define('lang_Date','Datum');
-define('lang_Operations','Aktionen');
-define('lang_Filename','Dateiname');
-define('lang_Date_type','d.m.Y');	//y-m-d
-define('lang_OK','OK');
-define('lang_Cancel','Abbrechen');
-define('lang_Sorting','sorting');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Ausw&auml;hlen');
+define('lang_Erase', 'L&ouml;schen');
+define('lang_Open', '&Ouml;ffnen');
+define('lang_Confirm_del', 'Wollen Sie wirklich diese Datei l&ouml;schen?');
+define('lang_All', 'Alle');
+define('lang_Files', 'Dateien');
+define('lang_Images', 'Bilder');
+define('lang_Archives', 'Archive');
+define('lang_Error_Upload', 'Dateigr&ouml;&szlig;e &uuml;berschritten.');
+define('lang_Error_extension', 'Dateityp nicht erlaubt.');
+define('lang_Upload_file', 'Datei hochladen');
+define('lang_Filters', 'Filter');
+define('lang_Videos', 'Videos');
+define('lang_Music', 'Musik');
+define('lang_New_Folder', 'Ordner anlegen');
+define('lang_Folder_Created', 'Ordner erfolgreich erstellt');
+define('lang_Existing_Folder', 'Ordner existiert bereichts');
+define('lang_Confirm_Folder_del', 'Sind Sie sich, dass Sie diesen Ordner mit allen enthaltenen Dateien l&ouml;schen m&ouml;chten?');
+define('lang_Return_Files_List', 'Zur&uuml;ck zur Dateiliste');
+define('lang_Preview', 'Vorschau');
+define('lang_Download', 'Download');
+define('lang_Insert_Folder_Name', 'Ordnername eingeben:');
+define('lang_Root', 'Basis');
+define('lang_Rename', 'Umbenennen');
+define('lang_Back', 'zur&uuml;ck');
+define('lang_View', 'Ansicht');
+define('lang_View_list', 'Liste');
+define('lang_View_columns_list', 'Spalten');
+define('lang_View_boxes', 'Boxen');
+define('lang_Toolbar', 'Werkzeugleiste');
+define('lang_Actions', 'Aktionen');
+define('lang_Rename_existing_file', 'Die existiert bereits');
+define('lang_Rename_existing_folder', 'Das Verzeichnis existiert bereits');
+define('lang_Empty_name', 'Der Name ist leer');
+define('lang_Text_filter', 'Suchen...');
+define('lang_Swipe_help', 'Swipe the name of file/folder to show options');
+define('lang_Upload_base', 'Base upload');
+define('lang_Upload_java', 'JAVA upload (gro&szlig;e Dateien)');
+define('lang_Upload_java_help', "Sollte das Java Applet nicht laden, stellen Sie sicher, dass 1. Java installiert ist <a href='http://java.com/en/download/'>[download link]</a> und 2. stellen Sie sicher, dass nichts von Ihrer Firewall geblockt wird");
+define('lang_Upload_base_help', "Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
+define('lang_Type_dir', 'Ordner');
+define('lang_Type', 'Art');
+define('lang_Dimension', 'Dimensionen');
+define('lang_Size', 'Gr&ouml;&szlig;e');
+define('lang_Date', 'Datum');
+define('lang_Operations', 'Aktionen');
+define('lang_Filename', 'Dateiname');
+define('lang_Date_type', 'd.m.Y');    //y-m-d
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Abbrechen');
+define('lang_Sorting', 'sorting');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/en.php

@@ -1,59 +1,57 @@
 <?php
-define('lang_Select','Select');
-define('lang_Erase','Erase');
-define('lang_Open','Open');
-define('lang_Confirm_del','Are you sure you want to delete this file?');
-define('lang_All','All');
-define('lang_Files','Files');
-define('lang_Images','Images');
-define('lang_Archives','Archives');
-define('lang_Error_Upload','The uploaded file exceeds the max size allowed.');
-define('lang_Error_extension','File extension is not allowed.');
-define('lang_Upload_file','Upload');
-define('lang_Filters','Filters');
-define('lang_Videos','Videos');
-define('lang_Music','Music');
-define('lang_New_Folder','New Folder');
-define('lang_Folder_Created','Folder correctly created');
-define('lang_Existing_Folder','Existing folder');
-define('lang_Confirm_Folder_del','Are you sure to delete the folder and all the elements in it?');
-define('lang_Return_Files_List','Return to files list');
-define('lang_Preview','Preview');
-define('lang_Download','Download');
-define('lang_Insert_Folder_Name','Insert folder name:');
-define('lang_Root','root');
-define('lang_Rename','Rename');
-define('lang_Back','back');
-define('lang_View','View');
-define('lang_View_list','List view');
-define('lang_View_columns_list','Columns list view');
-define('lang_View_boxes','Box view');
-define('lang_Toolbar','Toolbar');
-define('lang_Actions','Actions');
-define('lang_Rename_existing_file','The file is already existing');
-define('lang_Rename_existing_folder','The folder is already existing');
-define('lang_Empty_name','The name is empty');
-define('lang_Text_filter','text filter');
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
-define('lang_Upload_base','Base upload');
-define('lang_Upload_java','JAVA upload (big size files)');
-define('lang_Upload_java_help',"If the Java Applet doesn't load, 1. make sure you have Java installed, otherwise <a href='http://java.com/en/download/'>[download link]</a>   2. make sure nothing is blocked by your firewall");
-define('lang_Upload_base_help',"Drag & Drop files or click in the area above (modern browsers) and select the file(s). When the upload is complete, click the 'Return to files list' button.");
-define('lang_Type_dir','dir');
-define('lang_Type','Type');
-define('lang_Dimension','Dimension');
-define('lang_Size','Size');
-define('lang_Date','Date');
-define('lang_Filename','Filename');
-define('lang_Operations','Operations');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Cancel');
-define('lang_Sorting','sorting');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
-
-?>
+define('lang_Select', 'Select');
+define('lang_Erase', 'Erase');
+define('lang_Open', 'Open');
+define('lang_Confirm_del', 'Are you sure you want to delete this file?');
+define('lang_All', 'All');
+define('lang_Files', 'Files');
+define('lang_Images', 'Images');
+define('lang_Archives', 'Archives');
+define('lang_Error_Upload', 'The uploaded file exceeds the max size allowed.');
+define('lang_Error_extension', 'File extension is not allowed.');
+define('lang_Upload_file', 'Upload');
+define('lang_Filters', 'Filters');
+define('lang_Videos', 'Videos');
+define('lang_Music', 'Music');
+define('lang_New_Folder', 'New Folder');
+define('lang_Folder_Created', 'Folder correctly created');
+define('lang_Existing_Folder', 'Existing folder');
+define('lang_Confirm_Folder_del', 'Are you sure to delete the folder and all the elements in it?');
+define('lang_Return_Files_List', 'Return to files list');
+define('lang_Preview', 'Preview');
+define('lang_Download', 'Download');
+define('lang_Insert_Folder_Name', 'Insert folder name:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Rename');
+define('lang_Back', 'back');
+define('lang_View', 'View');
+define('lang_View_list', 'List view');
+define('lang_View_columns_list', 'Columns list view');
+define('lang_View_boxes', 'Box view');
+define('lang_Toolbar', 'Toolbar');
+define('lang_Actions', 'Actions');
+define('lang_Rename_existing_file', 'The file is already existing');
+define('lang_Rename_existing_folder', 'The folder is already existing');
+define('lang_Empty_name', 'The name is empty');
+define('lang_Text_filter', 'text filter');
+define('lang_Swipe_help', 'Swipe the name of file/folder to show options');
+define('lang_Upload_base', 'Base upload');
+define('lang_Upload_java', 'JAVA upload (big size files)');
+define('lang_Upload_java_help', "If the Java Applet doesn't load, 1. make sure you have Java installed, otherwise <a href='http://java.com/en/download/'>[download link]</a>   2. make sure nothing is blocked by your firewall");
+define('lang_Upload_base_help', "Drag & Drop files or click in the area above (modern browsers) and select the file(s). When the upload is complete, click the 'Return to files list' button.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Dimension');
+define('lang_Size', 'Size');
+define('lang_Date', 'Date');
+define('lang_Filename', 'Filename');
+define('lang_Operations', 'Operations');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Cancel');
+define('lang_Sorting', 'sorting');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/es.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Seleccionar');
-define('lang_Erase','Eliminar');
-define('lang_Open','Abrir');
-define('lang_Confirm_del','¿Seguro que deseas eliminar este archivo?');
-define('lang_All','Todos');
-define('lang_Files','Archivos');
-define('lang_Images','Imágenes');
-define('lang_Archives','Ficheros');
-define('lang_Error_Upload','El archivo que intenta subir excede el máximo permitido.');
-define('lang_Error_extension','La extensión del archivo no está permitida.');
-define('lang_Upload_file','Subir');
-define('lang_Filters','Filtros');
-define('lang_Videos','Videos');
-define('lang_Music','Musica');
-define('lang_New_Folder','Nueva carpeta');
-define('lang_Folder_Created','La carpeta ha sido creada exitosamente.');
-define('lang_Existing_Folder','Carpeta existente');
-define('lang_Confirm_Folder_del','¿Seguro que deseas eliminar la carpeta y todos los elementos que contiene?');
-define('lang_Return_Files_List','Regresar a la lista de archivos');
-define('lang_Preview','Vista previa');
-define('lang_Download','Descargar');
-define('lang_Insert_Folder_Name','Nombre de la carpeta:');
-define('lang_Root','raíz');
-define('lang_Rename','Renombrar');
-define('lang_Back','atrás');
-define('lang_View','Vista');
-define('lang_View_list','Vista de lista');
-define('lang_View_columns_list','Vista de columnas');
-define('lang_View_boxes','Vista de miniaturas');
-define('lang_Toolbar','Barra de herramientas');
-define('lang_Actions','Acciones');
-define('lang_Rename_existing_file','El archivo ya existe');
-define('lang_Rename_existing_folder','La carpeta ya existe');
-define('lang_Empty_name','El nombre se encuentra vacío');
-define('lang_Text_filter','filtro de texto');
-define('lang_Swipe_help','Deslize el nombre del archivo/carpeta para mostrar las opciones');
-define('lang_Upload_base','Subida de archivos SIMPLE');
-define('lang_Upload_java','Subida de archivos JAVA (para archivos pesados)');
-define('lang_Upload_java_help',"Si el applet no carga: 1. Asegúrate de tener Java instalado; sino descárgalo e instálalo <a href='http://java.com/en/download/'>desde aquí</a> 2. Asegúrate que tu firewall no esté bloqueando nada.");
-define('lang_Upload_base_help',"Arrastra y suelta los archivos dentro de esta área o haga clic en ella (para navegadores modernos) de lo contrario, seleccione el archivo y haga clic en el botón. Cuando finalice la subida, haga clic en el botón superior para regresar.");
-define('lang_Type_dir','Carpeta');
-define('lang_Type','Tipo');
-define('lang_Dimension','Dimensiones');
-define('lang_Size','Peso');
-define('lang_Date','Fecha');
-define('lang_Filename','Nombre');
-define('lang_Operations','Operaciones');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Cancelar');
-define('lang_Sorting','Ordenar');
-define('lang_Show_url','Mostrar URL');
-define('lang_Extract','Extraer aquí');
-define('lang_File_info','Información');
-define('lang_Edit_image','Editar imagen');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Seleccionar');
+define('lang_Erase', 'Eliminar');
+define('lang_Open', 'Abrir');
+define('lang_Confirm_del', '¿Seguro que deseas eliminar este archivo?');
+define('lang_All', 'Todos');
+define('lang_Files', 'Archivos');
+define('lang_Images', 'Imágenes');
+define('lang_Archives', 'Ficheros');
+define('lang_Error_Upload', 'El archivo que intenta subir excede el máximo permitido.');
+define('lang_Error_extension', 'La extensión del archivo no está permitida.');
+define('lang_Upload_file', 'Subir');
+define('lang_Filters', 'Filtros');
+define('lang_Videos', 'Videos');
+define('lang_Music', 'Musica');
+define('lang_New_Folder', 'Nueva carpeta');
+define('lang_Folder_Created', 'La carpeta ha sido creada exitosamente.');
+define('lang_Existing_Folder', 'Carpeta existente');
+define('lang_Confirm_Folder_del', '¿Seguro que deseas eliminar la carpeta y todos los elementos que contiene?');
+define('lang_Return_Files_List', 'Regresar a la lista de archivos');
+define('lang_Preview', 'Vista previa');
+define('lang_Download', 'Descargar');
+define('lang_Insert_Folder_Name', 'Nombre de la carpeta:');
+define('lang_Root', 'raíz');
+define('lang_Rename', 'Renombrar');
+define('lang_Back', 'atrás');
+define('lang_View', 'Vista');
+define('lang_View_list', 'Vista de lista');
+define('lang_View_columns_list', 'Vista de columnas');
+define('lang_View_boxes', 'Vista de miniaturas');
+define('lang_Toolbar', 'Barra de herramientas');
+define('lang_Actions', 'Acciones');
+define('lang_Rename_existing_file', 'El archivo ya existe');
+define('lang_Rename_existing_folder', 'La carpeta ya existe');
+define('lang_Empty_name', 'El nombre se encuentra vacío');
+define('lang_Text_filter', 'filtro de texto');
+define('lang_Swipe_help', 'Deslize el nombre del archivo/carpeta para mostrar las opciones');
+define('lang_Upload_base', 'Subida de archivos SIMPLE');
+define('lang_Upload_java', 'Subida de archivos JAVA (para archivos pesados)');
+define('lang_Upload_java_help', "Si el applet no carga: 1. Asegúrate de tener Java instalado; sino descárgalo e instálalo <a href='http://java.com/en/download/'>desde aquí</a> 2. Asegúrate que tu firewall no esté bloqueando nada.");
+define('lang_Upload_base_help', "Arrastra y suelta los archivos dentro de esta área o haga clic en ella (para navegadores modernos) de lo contrario, seleccione el archivo y haga clic en el botón. Cuando finalice la subida, haga clic en el botón superior para regresar.");
+define('lang_Type_dir', 'Carpeta');
+define('lang_Type', 'Tipo');
+define('lang_Dimension', 'Dimensiones');
+define('lang_Size', 'Peso');
+define('lang_Date', 'Fecha');
+define('lang_Filename', 'Nombre');
+define('lang_Operations', 'Operaciones');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Cancelar');
+define('lang_Sorting', 'Ordenar');
+define('lang_Show_url', 'Mostrar URL');
+define('lang_Extract', 'Extraer aquí');
+define('lang_File_info', 'Información');
+define('lang_Edit_image', 'Editar imagen');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/fa.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','انتخاب');
-define('lang_Erase','حذف');
-define('lang_Open','بازگشایی');
-define('lang_Confirm_del','میخواهید این فایل را حذف کنید؟');
-define('lang_All','همه');
-define('lang_Files','فایلها');
-define('lang_Images','تصاویر');
-define('lang_Archives','آرشیو');
-define('lang_Error_Upload','فایل آپلود شده بیش از حداکثر اندازه مجاز است.');
-define('lang_Error_extension','نوع فایل مجاز نیست.');
-define('lang_Upload_file','آپلود');
-define('lang_Filters','فیلترها');
-define('lang_Videos','ویدئوها');
-define('lang_Music','موزیک');
-define('lang_New_Folder','فولدر جدید');
-define('lang_Folder_Created','پوشه به درستی ایجاد شد');
-define('lang_Existing_Folder','پوشه های موجود');
-define('lang_Confirm_Folder_del','آیا میخواهید این فولدر را با تمام محتوایش حذف کنید؟');
-define('lang_Return_Files_List','برگشت به لیست فایلها');
-define('lang_Preview','پیش نمایش');
-define('lang_Download','دانلود');
-define('lang_Insert_Folder_Name','نام فولدر:');
-define('lang_Root','شاخه اصلی');
-define('lang_Rename','تغییر نام');
-define('lang_Back','برگشت');
-define('lang_View','نمایش');
-define('lang_View_list','نمایش لیست');
-define('lang_View_columns_list','نمایش لیست ستونی');
-define('lang_View_boxes','نمایش باکسها');
-define('lang_Toolbar','نوار ابزار');
-define('lang_Actions','عملیات');
-define('lang_Rename_existing_file','فایل از قبل موجود است');
-define('lang_Rename_existing_folder','فولدر از قبل موجود است');
-define('lang_Empty_name','نام خالی است');
-define('lang_Text_filter','فیلتر نوشته');
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
-define('lang_Upload_base','آپلودر اصلی');
-define('lang_Upload_java','آپلودر جاوا (فایلهای حجیم)');
-define('lang_Upload_java_help',"If the Java Applet doesn't load, 1. make sure you have Java installed, otherwise <a href='http://java.com/en/download/'>[download link]</a>   2. make sure nothing is blocked by your firewall");
-define('lang_Upload_base_help',"فایلها را از سیستم خود بکشید و اینجا رها کنید یا اینجا کلیک کنید و فایل انتخاب کنید و هنگامی که آپلود تمام شد، روی کلید \"برگشت به لیست فایلها\" کلیک کنید.");
-define('lang_Type_dir','مسیر');
-define('lang_Type','نوع');
-define('lang_Dimension','بعد');
-define('lang_Size','اندازه');
-define('lang_Date','تاریخ');
-define('lang_Filename','نام فایل');
-define('lang_Operations','عملیات');
-define('lang_Date_type','y-m-d');
-define('lang_OK','باشه');
-define('lang_Cancel','لغو');
-define('lang_Sorting','مرتب سازی');
-define('lang_Show_url','نمایش آدرس');
-define('lang_Extract','استخراج در اینجا');
-define('lang_File_info','اطلاعات فایل');
-define('lang_Edit_image','ویرایش تصویر');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'انتخاب');
+define('lang_Erase', 'حذف');
+define('lang_Open', 'بازگشایی');
+define('lang_Confirm_del', 'میخواهید این فایل را حذف کنید؟');
+define('lang_All', 'همه');
+define('lang_Files', 'فایلها');
+define('lang_Images', 'تصاویر');
+define('lang_Archives', 'آرشیو');
+define('lang_Error_Upload', 'فایل آپلود شده بیش از حداکثر اندازه مجاز است.');
+define('lang_Error_extension', 'نوع فایل مجاز نیست.');
+define('lang_Upload_file', 'آپلود');
+define('lang_Filters', 'فیلترها');
+define('lang_Videos', 'ویدئوها');
+define('lang_Music', 'موزیک');
+define('lang_New_Folder', 'فولدر جدید');
+define('lang_Folder_Created', 'پوشه به درستی ایجاد شد');
+define('lang_Existing_Folder', 'پوشه های موجود');
+define('lang_Confirm_Folder_del', 'آیا میخواهید این فولدر را با تمام محتوایش حذف کنید؟');
+define('lang_Return_Files_List', 'برگشت به لیست فایلها');
+define('lang_Preview', 'پیش نمایش');
+define('lang_Download', 'دانلود');
+define('lang_Insert_Folder_Name', 'نام فولدر:');
+define('lang_Root', 'شاخه اصلی');
+define('lang_Rename', 'تغییر نام');
+define('lang_Back', 'برگشت');
+define('lang_View', 'نمایش');
+define('lang_View_list', 'نمایش لیست');
+define('lang_View_columns_list', 'نمایش لیست ستونی');
+define('lang_View_boxes', 'نمایش باکسها');
+define('lang_Toolbar', 'نوار ابزار');
+define('lang_Actions', 'عملیات');
+define('lang_Rename_existing_file', 'فایل از قبل موجود است');
+define('lang_Rename_existing_folder', 'فولدر از قبل موجود است');
+define('lang_Empty_name', 'نام خالی است');
+define('lang_Text_filter', 'فیلتر نوشته');
+define('lang_Swipe_help', 'Swipe the name of file/folder to show options');
+define('lang_Upload_base', 'آپلودر اصلی');
+define('lang_Upload_java', 'آپلودر جاوا (فایلهای حجیم)');
+define('lang_Upload_java_help', "If the Java Applet doesn't load, 1. make sure you have Java installed, otherwise <a href='http://java.com/en/download/'>[download link]</a>   2. make sure nothing is blocked by your firewall");
+define('lang_Upload_base_help', "فایلها را از سیستم خود بکشید و اینجا رها کنید یا اینجا کلیک کنید و فایل انتخاب کنید و هنگامی که آپلود تمام شد، روی کلید \"برگشت به لیست فایلها\" کلیک کنید.");
+define('lang_Type_dir', 'مسیر');
+define('lang_Type', 'نوع');
+define('lang_Dimension', 'بعد');
+define('lang_Size', 'اندازه');
+define('lang_Date', 'تاریخ');
+define('lang_Filename', 'نام فایل');
+define('lang_Operations', 'عملیات');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'باشه');
+define('lang_Cancel', 'لغو');
+define('lang_Sorting', 'مرتب سازی');
+define('lang_Show_url', 'نمایش آدرس');
+define('lang_Extract', 'استخراج در اینجا');
+define('lang_File_info', 'اطلاعات فایل');
+define('lang_Edit_image', 'ویرایش تصویر');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/fr.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Sélectionner');
-define('lang_Erase','Effacer');
-define('lang_Open','Ouvrir');
-define('lang_Confirm_del','Êtes-vous sûr de vouloir effacer ce fichier ?');
-define('lang_All','Tous');
-define('lang_Files','Fichiers');
-define('lang_Images','Images');
-define('lang_Archives','Archives');
+define('lang_Select', 'Sélectionner');
+define('lang_Erase', 'Effacer');
+define('lang_Open', 'Ouvrir');
+define('lang_Confirm_del', 'Êtes-vous sûr de vouloir effacer ce fichier ?');
+define('lang_All', 'Tous');
+define('lang_Files', 'Fichiers');
+define('lang_Images', 'Images');
+define('lang_Archives', 'Archives');
 define('lang_Error_Upload', 'Votre fichier dépasse la taille maximum autorisée.');
-define('lang_Error_extension','Extension de fichier non autorisée');
-define('lang_Upload_file','Envoyer un fichier');
-define('lang_Filters','Filtrer');
-define('lang_Videos','Vidéos');
-define('lang_Music','Musique');
-define('lang_New_Folder','Nouveau dossier');
-define('lang_Folder_Created','Dossier correctement créé');
-define('lang_Existing_Folder','Dossier existant');
-define('lang_Confirm_Folder_del','Êtes-vous sûr de vouloir supprimer le dossier ainsi que tous ses éléments ?');
-define('lang_Return_Files_List','Revenir à la liste des fichiers');
-define('lang_Preview','Aperçu');
-define('lang_Download','Télécharger');
-define('lang_Insert_Folder_Name','Insérer le nom du dossier:');
-define('lang_Root','Racine');
-define('lang_Rename','Renommer');
-define('lang_Back','Retour');
-define('lang_View','Vue');
-define('lang_View_list','Vue par liste');
-define('lang_View_columns_list','Vue par listes de colonne');
-define('lang_View_boxes','Vue par icônes');
-define('lang_Toolbar','Barre d\'outils');
-define('lang_Actions','Actions');
-define('lang_Rename_existing_file','Ce fichier existe déjà');
-define('lang_Rename_existing_folder','Ce dossier existe déjà');
-define('lang_Empty_name','Le nom est vide');
-define('lang_Text_filter','texte de filtrage');
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
-define('lang_Upload_base','Base upload');
-define('lang_Upload_java','JAVA upload (big size files)');
-define('lang_Upload_java_help',"If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
-define('lang_Upload_base_help',"Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
-define('lang_Type_dir','dir');
-define('lang_Type','Type');
-define('lang_Dimension','Dimension');
-define('lang_Size','Taille');
-define('lang_Date','Date');
-define('lang_Filename','Nom');
-define('lang_Operations','Opérations');
-define('lang_Date_type','d/m/Y');
-define('lang_OK','OK');
-define('lang_Cancel','Annuler');
-define('lang_Sorting','Trier');
-define('lang_Show_url','Afficher l\'URL');
-define('lang_Extract','Extraire ici');
-define('lang_File_info','Information');
-define('lang_Edit_image','Editer l\'image');
-define('lang_Duplicate','Dupliquer');
-?>
+define('lang_Error_extension', 'Extension de fichier non autorisée');
+define('lang_Upload_file', 'Envoyer un fichier');
+define('lang_Filters', 'Filtrer');
+define('lang_Videos', 'Vidéos');
+define('lang_Music', 'Musique');
+define('lang_New_Folder', 'Nouveau dossier');
+define('lang_Folder_Created', 'Dossier correctement créé');
+define('lang_Existing_Folder', 'Dossier existant');
+define('lang_Confirm_Folder_del', 'Êtes-vous sûr de vouloir supprimer le dossier ainsi que tous ses éléments ?');
+define('lang_Return_Files_List', 'Revenir à la liste des fichiers');
+define('lang_Preview', 'Aperçu');
+define('lang_Download', 'Télécharger');
+define('lang_Insert_Folder_Name', 'Insérer le nom du dossier:');
+define('lang_Root', 'Racine');
+define('lang_Rename', 'Renommer');
+define('lang_Back', 'Retour');
+define('lang_View', 'Vue');
+define('lang_View_list', 'Vue par liste');
+define('lang_View_columns_list', 'Vue par listes de colonne');
+define('lang_View_boxes', 'Vue par icônes');
+define('lang_Toolbar', 'Barre d\'outils');
+define('lang_Actions', 'Actions');
+define('lang_Rename_existing_file', 'Ce fichier existe déjà');
+define('lang_Rename_existing_folder', 'Ce dossier existe déjà');
+define('lang_Empty_name', 'Le nom est vide');
+define('lang_Text_filter', 'texte de filtrage');
+define('lang_Swipe_help', 'Glissez le nom du fichier/dossier pour afficher les options');
+define('lang_Upload_base', 'Upload classique');
+define('lang_Upload_java', 'JAVA upload (fichiers de grandes tailles)');
+define('lang_Upload_java_help', "Si l'applet Java Applet ne charge pas 1. Assurez-vous que vous avez bien installé Java <a href='http://java.com/en/download/'>[download link]</a> 2. Assurez-vous que votre pare-feu ne bloque pas la connexion.");
+define('lang_Upload_base_help', "Glisser & Déposer le(s) fichier(s) à l'intérieur de la zone ou cliquez dessus (pour les derniers navigateurs), sinon sélectionnez le fichier. Lorsque l'upload est terminé, cliquez sur le bouton revenir.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Dimension');
+define('lang_Size', 'Taille');
+define('lang_Date', 'Date');
+define('lang_Filename', 'Nom');
+define('lang_Operations', 'Opérations');
+define('lang_Date_type', 'd/m/Y');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Annuler');
+define('lang_Sorting', 'Trier');
+define('lang_Show_url', 'Afficher l\'URL');
+define('lang_Extract', 'Extraire ici');
+define('lang_File_info', 'Information');
+define('lang_Edit_image', 'Editer l\'image');
+define('lang_Duplicate', 'Dupliquer');

adm/filemanager/lang/hr.php

@@ -1,59 +1,57 @@
 <?php
-define('lang_Select','Odaberi');
-define('lang_Erase','Obriši');
-define('lang_Open','Otvori');
-define('lang_Confirm_del','Jeste li sigurni da želite obrisati ovu datoteku?');
-define('lang_All','Sve');
-define('lang_Files','Datoteke');
-define('lang_Images','Slike');
-define('lang_Archives','Kompresirane arhive');
-define('lang_Error_Upload','Datoteka koju želite prenesti prelazi maximalnu dopuštenu veličinu.');
-define('lang_Error_extension','Datoteka s tom ekstenzijom nije dopuštena.');
-define('lang_Upload_file','Prenesi');
-define('lang_Filters','Filteri');
-define('lang_Videos','Video zapisi');
-define('lang_Music','Glazba');
-define('lang_New_Folder','Nova mapa');
-define('lang_Folder_Created','Mapa je uspješno kreirana');
-define('lang_Existing_Folder','Postojeća mapa');
-define('lang_Confirm_Folder_del','Jeste li sigurni da želite obrisati ovu mapu i sve datoteke u njoj?');
-define('lang_Return_Files_List','Vrati se na pregled datoteka');
-define('lang_Preview','Pogledaj');
-define('lang_Download','Preuzmi');
-define('lang_Insert_Folder_Name','Naziv nove mape:');
-define('lang_Root','polazno');
-define('lang_Rename','Preimenuj');
-define('lang_Back','natrag');
-define('lang_View','Prikaz');
-define('lang_View_list','Prikaz liste');
-define('lang_View_columns_list','Prikaz stupac-liste');
-define('lang_View_boxes','Prikaz grid');
-define('lang_Toolbar','Alatna traka');
-define('lang_Actions','Radnja');
-define('lang_Rename_existing_file','Datoteka već postoji');
-define('lang_Rename_existing_folder','Mapa već postoji');
-define('lang_Empty_name','Naziv nije upisan');
-define('lang_Text_filter','filtriraj po nazivu');
-define('lang_Swipe_help','Povucite prstom ime datoteke / mape za prikaz mogućnosti');
-define('lang_Upload_base','Putanja do mape za prenesene datoteke');
-define('lang_Upload_java','JAVA prijenos (odlično za prijenos velikih datoteka)');
-define('lang_Upload_java_help',"Ako se Java dodatak ne učita 1. provjerite imate li instaliran Java dodatak <a href='http://java.com/en/download/'>[link za preuzimanje]</a>   2. provjerite da firewall nije aktiviran i blokira dodatak");
-define('lang_Upload_base_help',"Povucite i ispustite datoteke ili samo kliknite (moderni preglednici) te odaberite datoteku(s). Kad prijenos završi, kliknite 'Natrag na pregled datoteka' gumb.");
-define('lang_Type_dir','mapa');
-define('lang_Type','Tip');
-define('lang_Dimension','Dimenzije');
-define('lang_Size','Veličina');
-define('lang_Date','Datum');
-define('lang_Filename','Naziv datoteke');
-define('lang_Operations','Radnje');
-define('lang_Date_type','y-m-d');
-define('lang_OK','U redu');
-define('lang_Cancel','Odustani');
-define('lang_Sorting','sortiranje');
-define('lang_Show_url','prikaži URL');
-define('lang_Extract','raspakiraj ovdje');
-define('lang_File_info','informacije');
-define('lang_Edit_image','uredi sliku');
-define('lang_Duplicate','kopiraj');
-
-?>
+define('lang_Select', 'Odaberi');
+define('lang_Erase', 'Obriši');
+define('lang_Open', 'Otvori');
+define('lang_Confirm_del', 'Jeste li sigurni da želite obrisati ovu datoteku?');
+define('lang_All', 'Sve');
+define('lang_Files', 'Datoteke');
+define('lang_Images', 'Slike');
+define('lang_Archives', 'Kompresirane arhive');
+define('lang_Error_Upload', 'Datoteka koju želite prenesti prelazi maximalnu dopuštenu veličinu.');
+define('lang_Error_extension', 'Datoteka s tom ekstenzijom nije dopuštena.');
+define('lang_Upload_file', 'Prenesi');
+define('lang_Filters', 'Filteri');
+define('lang_Videos', 'Video zapisi');
+define('lang_Music', 'Glazba');
+define('lang_New_Folder', 'Nova mapa');
+define('lang_Folder_Created', 'Mapa je uspješno kreirana');
+define('lang_Existing_Folder', 'Postojeća mapa');
+define('lang_Confirm_Folder_del', 'Jeste li sigurni da želite obrisati ovu mapu i sve datoteke u njoj?');
+define('lang_Return_Files_List', 'Vrati se na pregled datoteka');
+define('lang_Preview', 'Pogledaj');
+define('lang_Download', 'Preuzmi');
+define('lang_Insert_Folder_Name', 'Naziv nove mape:');
+define('lang_Root', 'polazno');
+define('lang_Rename', 'Preimenuj');
+define('lang_Back', 'natrag');
+define('lang_View', 'Prikaz');
+define('lang_View_list', 'Prikaz liste');
+define('lang_View_columns_list', 'Prikaz stupac-liste');
+define('lang_View_boxes', 'Prikaz grid');
+define('lang_Toolbar', 'Alatna traka');
+define('lang_Actions', 'Radnja');
+define('lang_Rename_existing_file', 'Datoteka već postoji');
+define('lang_Rename_existing_folder', 'Mapa već postoji');
+define('lang_Empty_name', 'Naziv nije upisan');
+define('lang_Text_filter', 'filtriraj po nazivu');
+define('lang_Swipe_help', 'Povucite prstom ime datoteke / mape za prikaz mogućnosti');
+define('lang_Upload_base', 'Putanja do mape za prenesene datoteke');
+define('lang_Upload_java', 'JAVA prijenos (odlično za prijenos velikih datoteka)');
+define('lang_Upload_java_help', "Ako se Java dodatak ne učita 1. provjerite imate li instaliran Java dodatak <a href='http://java.com/en/download/'>[link za preuzimanje]</a>   2. provjerite da firewall nije aktiviran i blokira dodatak");
+define('lang_Upload_base_help', "Povucite i ispustite datoteke ili samo kliknite (moderni preglednici) te odaberite datoteku(s). Kad prijenos završi, kliknite 'Natrag na pregled datoteka' gumb.");
+define('lang_Type_dir', 'mapa');
+define('lang_Type', 'Tip');
+define('lang_Dimension', 'Dimenzije');
+define('lang_Size', 'Veličina');
+define('lang_Date', 'Datum');
+define('lang_Filename', 'Naziv datoteke');
+define('lang_Operations', 'Radnje');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'U redu');
+define('lang_Cancel', 'Odustani');
+define('lang_Sorting', 'sortiranje');
+define('lang_Show_url', 'prikaži URL');
+define('lang_Extract', 'raspakiraj ovdje');
+define('lang_File_info', 'informacije');
+define('lang_Edit_image', 'uredi sliku');
+define('lang_Duplicate', 'kopiraj');

adm/filemanager/lang/hu.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Tallózás');
-define('lang_Erase','Törlés');
-define('lang_Open','Megnyitás');
-define('lang_Confirm_del','Biztos vagy benne, hogy törlöd ezt a fájlt?');
-define('lang_All','Összes');
-define('lang_Files','Fájlok');
-define('lang_Images','Képek');
-define('lang_Archives','Tömörített');
-define('lang_Error_Upload','A kiválasztott fájl mérete túl nagy!');
-define('lang_Error_extension','A megadott kiterjesztésű fájl nem engedélyezett.');
-define('lang_Upload_file','Fájl feltöltése');
-define('lang_Filters','Szűrő');
-define('lang_Videos','Videó');
-define('lang_Music','Zene');
-define('lang_New_Folder','Új mappa');
-define('lang_Folder_Created','Mappa létrehozva');
-define('lang_Existing_Folder','Mappa már létezik');
-define('lang_Confirm_Folder_del','Biztos, hogy törlöd a könyvtárat és annak tartalmát?');
-define('lang_Return_Files_List','Vissza a fájllistához');
-define('lang_Preview','Előnézet');
-define('lang_Download','Letöltés');
-define('lang_Insert_Folder_Name','Mappa neve:');
-define('lang_Root','root');
-define('lang_Rename','Átnevezés');
-define('lang_Back','vissza');
-define('lang_View','Nézet');
-define('lang_View_list','Lista');
-define('lang_View_columns_list','Oszlopok');
-define('lang_View_boxes','Miniatűrök');
-define('lang_Toolbar','Eszközök');
-define('lang_Actions','Műveletek');
-define('lang_Rename_existing_file','A fájl már létezik');
-define('lang_Rename_existing_folder','A mappa már létezik');
-define('lang_Empty_name','A név nincs megadva');
-define('lang_Text_filter','szűrés');
-define('lang_Swipe_help','Húzd az egered a fájl/mappa nevére, hogy lásd az opciókat.');
-define('lang_Upload_base','Alapértelmezett feltöltő');
-define('lang_Upload_java','JAVA feltöltő (nagyméretű fájlokhoz)');
-define('lang_Upload_java_help',"Ha a Java Applet nem töltődik be: 1. ellenőrizze, hogy a JAVA telepítve van-e, ha nincs: <a href='http://java.com/en/download/'>[letöltés]</a> 2. ellenőrizze, hogy a tűzfal nem blokkolja-e");
-define('lang_Upload_base_help',"Fogd meg és húzd az ablakba a fájlt vagy kattints bele és válaszd ki majd nyomd meg a megnyitás gombot (modern böngészők). Amikor a feltöltés befejeződött kattints a fenti gombra a visszatéréshez.");
-define('lang_Type_dir','Mappa');
-define('lang_Type','Típus');
-define('lang_Dimension','Felbontás');
-define('lang_Size','Méret');
-define('lang_Date','Dátum');
-define('lang_Filename','Név');
-define('lang_Operations','Műveletek');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Mégse');
-define('lang_Sorting','rendezés');
-define('lang_Show_url','URL mutatása');
-define('lang_Extract','kibontás ide');
-define('lang_File_info','fájl info');
-define('lang_Edit_image','kép szerkesztése');
-define('lang_Duplicate','Klónozás');
-?>
+define('lang_Select', 'Tallózás');
+define('lang_Erase', 'Törlés');
+define('lang_Open', 'Megnyitás');
+define('lang_Confirm_del', 'Biztos vagy benne, hogy törlöd ezt a fájlt?');
+define('lang_All', 'Összes');
+define('lang_Files', 'Fájlok');
+define('lang_Images', 'Képek');
+define('lang_Archives', 'Tömörített');
+define('lang_Error_Upload', 'A kiválasztott fájl mérete túl nagy!');
+define('lang_Error_extension', 'A megadott kiterjesztésű fájl nem engedélyezett.');
+define('lang_Upload_file', 'Fájl feltöltése');
+define('lang_Filters', 'Szűrő');
+define('lang_Videos', 'Videó');
+define('lang_Music', 'Zene');
+define('lang_New_Folder', 'Új mappa');
+define('lang_Folder_Created', 'Mappa létrehozva');
+define('lang_Existing_Folder', 'Mappa már létezik');
+define('lang_Confirm_Folder_del', 'Biztos, hogy törlöd a könyvtárat és annak tartalmát?');
+define('lang_Return_Files_List', 'Vissza a fájllistához');
+define('lang_Preview', 'Előnézet');
+define('lang_Download', 'Letöltés');
+define('lang_Insert_Folder_Name', 'Mappa neve:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Átnevezés');
+define('lang_Back', 'vissza');
+define('lang_View', 'Nézet');
+define('lang_View_list', 'Lista');
+define('lang_View_columns_list', 'Oszlopok');
+define('lang_View_boxes', 'Miniatűrök');
+define('lang_Toolbar', 'Eszközök');
+define('lang_Actions', 'Műveletek');
+define('lang_Rename_existing_file', 'A fájl már létezik');
+define('lang_Rename_existing_folder', 'A mappa már létezik');
+define('lang_Empty_name', 'A név nincs megadva');
+define('lang_Text_filter', 'szűrés');
+define('lang_Swipe_help', 'Húzd az egered a fájl/mappa nevére, hogy lásd az opciókat.');
+define('lang_Upload_base', 'Alapértelmezett feltöltő');
+define('lang_Upload_java', 'JAVA feltöltő (nagyméretű fájlokhoz)');
+define('lang_Upload_java_help', "Ha a Java Applet nem töltődik be: 1. ellenőrizze, hogy a JAVA telepítve van-e, ha nincs: <a href='http://java.com/en/download/'>[letöltés]</a> 2. ellenőrizze, hogy a tűzfal nem blokkolja-e");
+define('lang_Upload_base_help', "Fogd meg és húzd az ablakba a fájlt vagy kattints bele és válaszd ki majd nyomd meg a megnyitás gombot (modern böngészők). Amikor a feltöltés befejeződött kattints a fenti gombra a visszatéréshez.");
+define('lang_Type_dir', 'Mappa');
+define('lang_Type', 'Típus');
+define('lang_Dimension', 'Felbontás');
+define('lang_Size', 'Méret');
+define('lang_Date', 'Dátum');
+define('lang_Filename', 'Név');
+define('lang_Operations', 'Műveletek');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Mégse');
+define('lang_Sorting', 'rendezés');
+define('lang_Show_url', 'URL mutatása');
+define('lang_Extract', 'kibontás ide');
+define('lang_File_info', 'fájl info');
+define('lang_Edit_image', 'kép szerkesztése');
+define('lang_Duplicate', 'Klónozás');

adm/filemanager/lang/id.php

@@ -1,59 +1,57 @@
 <?php
-define('lang_Select','Pilih');
-define('lang_Erase','Hapus');
-define('lang_Open','Buka');
-define('lang_Confirm_del','Apakah anda yakin menghapus berkas ini?');
-define('lang_All','Semua');
-define('lang_Files','Berkas');
-define('lang_Images','Gambar');
-define('lang_Archives','Arsip');
-define('lang_Error_Upload','Berkas yang diubah melebihi batas ukuran yang diperbolehkan.');
-define('lang_Error_extension','Ekstensi berkas tidak diperbolehkan.');
-define('lang_Upload_file','Unggah');
-define('lang_Filters','Saring');
-define('lang_Videos','Video');
-define('lang_Music','Musik');
-define('lang_New_Folder','Folder Baru');
-define('lang_Folder_Created','Folder Telah Dibuat');
-define('lang_Existing_Folder','Folder yang ada');
-define('lang_Confirm_Folder_del','Apakah anda yakin menghapus folder dan semua isi didalamnya?');
-define('lang_Return_Files_List','Kembali ke daftar');
-define('lang_Preview','Pratampil');
-define('lang_Download','Unduh');
-define('lang_Insert_Folder_Name','Masukkan nama folder:');
-define('lang_Root','root');
-define('lang_Rename','Ubah nama');
-define('lang_Back','kembali');
-define('lang_View','lihat');
-define('lang_View_list','Tampilan Daftar');
-define('lang_View_columns_list','Tampilan Daftar kolom');
-define('lang_View_boxes','Tampilan Kotak');
-define('lang_Toolbar','Toolbar');
-define('lang_Actions','Aksi');
-define('lang_Rename_existing_file','Berkas Sudah ada');
-define('lang_Rename_existing_folder','Folder sudah ada');
-define('lang_Empty_name','Nama Kosong');
-define('lang_Text_filter','saring teks');
-define('lang_Swipe_help','Arahkan pada nama berkas/folder untuk melihat pilihan');
-define('lang_Upload_base','Basis Unggah');
-define('lang_Upload_java','Unggahan dengan JAVA (Berkas Ukuran Besar)');
-define('lang_Upload_java_help',"Jika JAVA applet tidak muncul maka, 1. Pastikan JAVA sudah terinstal, jika tidak <a href='http://java.com/en/download/'>[download link]</a>   2. Pastikan firewall anda tidak memblok aksi tersebut");
-define('lang_Upload_base_help',"Seret & letakkan berkas atau klik area di atas (browser terbaru) dan pilih berkasnya. ketika proses unggah selesai, Klik tombol 'Kembali ke daftar'.");
-define('lang_Type_dir','direktori');
-define('lang_Type','Tipe');
-define('lang_Dimension','Dimensi');
-define('lang_Size','Ukuran');
-define('lang_Date','Tanggal');
-define('lang_Filename','Nama_berkas');
-define('lang_Operations','Operasi');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Cancel');
-define('lang_Sorting','Sortir');
-define('lang_Show_url','lihat URL');
-define('lang_Extract','extract disini');
-define('lang_File_info','info berkas');
-define('lang_Edit_image','edit gambar');
-define('lang_Duplicate','Duplikat');
-
-?>
+define('lang_Select', 'Pilih');
+define('lang_Erase', 'Hapus');
+define('lang_Open', 'Buka');
+define('lang_Confirm_del', 'Apakah anda yakin menghapus berkas ini?');
+define('lang_All', 'Semua');
+define('lang_Files', 'Berkas');
+define('lang_Images', 'Gambar');
+define('lang_Archives', 'Arsip');
+define('lang_Error_Upload', 'Berkas yang diubah melebihi batas ukuran yang diperbolehkan.');
+define('lang_Error_extension', 'Ekstensi berkas tidak diperbolehkan.');
+define('lang_Upload_file', 'Unggah');
+define('lang_Filters', 'Saring');
+define('lang_Videos', 'Video');
+define('lang_Music', 'Musik');
+define('lang_New_Folder', 'Folder Baru');
+define('lang_Folder_Created', 'Folder Telah Dibuat');
+define('lang_Existing_Folder', 'Folder yang ada');
+define('lang_Confirm_Folder_del', 'Apakah anda yakin menghapus folder dan semua isi didalamnya?');
+define('lang_Return_Files_List', 'Kembali ke daftar');
+define('lang_Preview', 'Pratampil');
+define('lang_Download', 'Unduh');
+define('lang_Insert_Folder_Name', 'Masukkan nama folder:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Ubah nama');
+define('lang_Back', 'kembali');
+define('lang_View', 'lihat');
+define('lang_View_list', 'Tampilan Daftar');
+define('lang_View_columns_list', 'Tampilan Daftar kolom');
+define('lang_View_boxes', 'Tampilan Kotak');
+define('lang_Toolbar', 'Toolbar');
+define('lang_Actions', 'Aksi');
+define('lang_Rename_existing_file', 'Berkas Sudah ada');
+define('lang_Rename_existing_folder', 'Folder sudah ada');
+define('lang_Empty_name', 'Nama Kosong');
+define('lang_Text_filter', 'saring teks');
+define('lang_Swipe_help', 'Arahkan pada nama berkas/folder untuk melihat pilihan');
+define('lang_Upload_base', 'Basis Unggah');
+define('lang_Upload_java', 'Unggahan dengan JAVA (Berkas Ukuran Besar)');
+define('lang_Upload_java_help', "Jika JAVA applet tidak muncul maka, 1. Pastikan JAVA sudah terinstal, jika tidak <a href='http://java.com/en/download/'>[download link]</a>   2. Pastikan firewall anda tidak memblok aksi tersebut");
+define('lang_Upload_base_help', "Seret & letakkan berkas atau klik area di atas (browser terbaru) dan pilih berkasnya. ketika proses unggah selesai, Klik tombol 'Kembali ke daftar'.");
+define('lang_Type_dir', 'direktori');
+define('lang_Type', 'Tipe');
+define('lang_Dimension', 'Dimensi');
+define('lang_Size', 'Ukuran');
+define('lang_Date', 'Tanggal');
+define('lang_Filename', 'Nama_berkas');
+define('lang_Operations', 'Operasi');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Cancel');
+define('lang_Sorting', 'Sortir');
+define('lang_Show_url', 'lihat URL');
+define('lang_Extract', 'extract disini');
+define('lang_File_info', 'info berkas');
+define('lang_Edit_image', 'edit gambar');
+define('lang_Duplicate', 'Duplikat');

adm/filemanager/lang/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/filemanager/lang/it.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Seleziona');
-define('lang_Erase','Cancella');
-define('lang_Open','Apri');
-define('lang_Confirm_del','Sei sicuro di volere cancellare questo file?');
-define('lang_All','Tutti');
-define('lang_Files','Files');
-define('lang_Images','Immagini');
-define('lang_Archives','Archivi');
-define('lang_Error_Upload','Il file caricato supera i limiti imposti.');
-define('lang_Error_extension','Il tipo del file caricato non è permesso.');
-define('lang_Upload_file','Carica');
-define('lang_Filters','Filtri');
-define('lang_Videos','Video');
-define('lang_Music','Musica');
-define('lang_New_Folder','Nuova Cartella');
-define('lang_Folder_Created','Cartella creata correttamente');
-define('lang_Existing_Folder','Cartella già esistente');
-define('lang_Confirm_Folder_del','Sei sicuro di voler cancellare la cartella e tutti i file in essa contenuti?');
-define('lang_Return_Files_List','Ritorna alla lista dei file');
-define('lang_Preview','Anteprima');
-define('lang_Download','Download');
-define('lang_Insert_Folder_Name','Inserisci il nome della cartella:');
-define('lang_Root','base');
-define('lang_Rename','Rinomina');
-define('lang_Back','indietro');
-define('lang_View','Vista');
-define('lang_View_list','Vista a lista');
-define('lang_View_columns_list','Vista a colonne');
-define('lang_View_boxes','Vista a box');
-define('lang_Toolbar','Toolbar');
-define('lang_Actions','Azioni');
-define('lang_Rename_existing_file','Il file esiste già');
-define('lang_Rename_existing_folder','La cartella esiste già');
-define('lang_Empty_name','Il nome è vuoto');
-define('lang_Text_filter','filtro di testo');
-define('lang_Swipe_help','Esegui uno Swipe sul nome del file/cartella per mostrare le opzioni');
-define('lang_Upload_base','Upload Base');
-define('lang_Upload_java','JAVA upload (file di grosse dimensioni)');
-define('lang_Upload_java_help',"Se non si carica l'applet java 1. assicurati di aver installato java nel computer altrimenti <a href='http://java.com/en/download/'>[download link]</a> 2. asscurati di non essere bloccato da un firewall");
-define('lang_Upload_base_help',"Trascina i file nell'area superiore o clicca in essa (per i moderni browser) altrimenti seleziona il file e clicca sul bottone. Quando il caricamento dei file è terminato clicca sul bottone di ritorno in alto.");
-define('lang_Type_dir','dir');
-define('lang_Type','Tipo');
-define('lang_Dimension','Dimensione');
-define('lang_Size','Peso');
-define('lang_Date','Data');
-define('lang_Filename','Nome');
-define('lang_Operations','Operazioni');
-define('lang_Date_type','d/m/y');
-define('lang_OK','OK');
-define('lang_Cancel','Annulla');
-define('lang_Sorting','ordina');
-define('lang_Show_url','mostra URL');
-define('lang_Extract','estrai qui');
-define('lang_File_info','informazioni file');
-define('lang_Edit_image','modifica immagine');
-define('lang_Duplicate','Duplica');
-?>
+define('lang_Select', 'Seleziona');
+define('lang_Erase', 'Cancella');
+define('lang_Open', 'Apri');
+define('lang_Confirm_del', 'Sei sicuro di volere cancellare questo file?');
+define('lang_All', 'Tutti');
+define('lang_Files', 'Files');
+define('lang_Images', 'Immagini');
+define('lang_Archives', 'Archivi');
+define('lang_Error_Upload', 'Il file caricato supera i limiti imposti.');
+define('lang_Error_extension', 'Il tipo del file caricato non è permesso.');
+define('lang_Upload_file', 'Carica');
+define('lang_Filters', 'Filtri');
+define('lang_Videos', 'Video');
+define('lang_Music', 'Musica');
+define('lang_New_Folder', 'Nuova Cartella');
+define('lang_Folder_Created', 'Cartella creata correttamente');
+define('lang_Existing_Folder', 'Cartella già esistente');
+define('lang_Confirm_Folder_del', 'Sei sicuro di voler cancellare la cartella e tutti i file in essa contenuti?');
+define('lang_Return_Files_List', 'Ritorna alla lista dei file');
+define('lang_Preview', 'Anteprima');
+define('lang_Download', 'Download');
+define('lang_Insert_Folder_Name', 'Inserisci il nome della cartella:');
+define('lang_Root', 'base');
+define('lang_Rename', 'Rinomina');
+define('lang_Back', 'indietro');
+define('lang_View', 'Vista');
+define('lang_View_list', 'Vista a lista');
+define('lang_View_columns_list', 'Vista a colonne');
+define('lang_View_boxes', 'Vista a box');
+define('lang_Toolbar', 'Toolbar');
+define('lang_Actions', 'Azioni');
+define('lang_Rename_existing_file', 'Il file esiste già');
+define('lang_Rename_existing_folder', 'La cartella esiste già');
+define('lang_Empty_name', 'Il nome è vuoto');
+define('lang_Text_filter', 'filtro di testo');
+define('lang_Swipe_help', 'Esegui uno Swipe sul nome del file/cartella per mostrare le opzioni');
+define('lang_Upload_base', 'Upload Base');
+define('lang_Upload_java', 'JAVA upload (file di grosse dimensioni)');
+define('lang_Upload_java_help', "Se non si carica l'applet java 1. assicurati di aver installato java nel computer altrimenti <a href='http://java.com/en/download/'>[download link]</a> 2. asscurati di non essere bloccato da un firewall");
+define('lang_Upload_base_help', "Trascina i file nell'area superiore o clicca in essa (per i moderni browser) altrimenti seleziona il file e clicca sul bottone. Quando il caricamento dei file è terminato clicca sul bottone di ritorno in alto.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Tipo');
+define('lang_Dimension', 'Dimensione');
+define('lang_Size', 'Peso');
+define('lang_Date', 'Data');
+define('lang_Filename', 'Nome');
+define('lang_Operations', 'Operazioni');
+define('lang_Date_type', 'd/m/y');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Annulla');
+define('lang_Sorting', 'ordina');
+define('lang_Show_url', 'mostra URL');
+define('lang_Extract', 'estrai qui');
+define('lang_File_info', 'informazioni file');
+define('lang_Edit_image', 'modifica immagine');
+define('lang_Duplicate', 'Duplica');

adm/filemanager/lang/mn.php

@@ -1,59 +1,57 @@
 <?php
-define('lang_Select','Сонгох');
-define('lang_Erase','Устгах');
-define('lang_Open','Нээх');
-define('lang_Confirm_del','Та энэ файлыг устгахдаа итгэлтэй байна уу?');
-define('lang_All','Бүгд');
-define('lang_Files','Файлууд');
-define('lang_Images','Зурагнууд');
-define('lang_Archives','Архивлагдсан файлууд');
-define('lang_Error_Upload','Хуулсан файл зөвшөөрөгдөх хэмжээнээс их байна.');
-define('lang_Error_extension','Файлын өргөтгөх зөвшөөрөгдөөгүй.');
-define('lang_Upload_file','Хуулах');
-define('lang_Filters','Шүүлтүүрүүд');
-define('lang_Videos','Бичлэгнүүд');
-define('lang_Music','Дуунууд');
-define('lang_New_Folder','Шинэ хавтас');
-define('lang_Folder_Created','Хавтас амжилттай үүслээ');
-define('lang_Existing_Folder','Давхардсан хавтас');
-define('lang_Confirm_Folder_del','Хавтас болон доторх бүх файлуудыг устгахдаа итгэлтэй байна уу?');
-define('lang_Return_Files_List','Файлын жагсаалт руу буцах');
-define('lang_Preview','Урьдчилан харах');
-define('lang_Download','Татаж авах');
-define('lang_Insert_Folder_Name','Хавтасны нэрийг оруулна уу:');
-define('lang_Root','root');
-define('lang_Rename','Нэрлэх');
-define('lang_Back','буцах');
-define('lang_View','Үзэх');
-define('lang_View_list','Жагсаалтаар харах');
-define('lang_View_columns_list','Баганаар харах');
-define('lang_View_boxes','Хайрцгаар харах');
-define('lang_Toolbar','Товчилсон товчнууд');
-define('lang_Actions','Үйлдэл');
-define('lang_Rename_existing_file','Файл аль хэдийнэ үүссэн байна');
-define('lang_Rename_existing_folder','Хавтас аль хэдийнэ үүсэн байна');
-define('lang_Empty_name','Нэр хоосон байна');
-define('lang_Text_filter','текстэн шүүлтүүр');
-define('lang_Swipe_help','Файл/Хавтасны нэрийг товшоод тохиргоог харна уу');
-define('lang_Upload_base','Энгийнээр хуулах');
-define('lang_Upload_java','JAVA-гаар хуулах (их хэмжээтэй файл)');
-define('lang_Upload_java_help',"Хэрэв Java Applet уншихгүй бол 1. Java суусан эсэхийг шалгана уу, үгүй бол <a href='http://java.com/en/download/'>[эндээс татаж авна уу]</a>   2. Галт хана дээр хаалт хийсэн эсэхийг шалгана уу");
-define('lang_Upload_base_help',"Хуулах хэсэг дээр файлыг зөөж тавих болон дээр нь дарж хуулж болно (орчин үеийн хөтөч дээр). Хуулж дууссан бол 'Файлын жагсаалт руу буцах' товчин дээр дарна уу.");
-define('lang_Type_dir','dir');
-define('lang_Type','Төрөл');
-define('lang_Dimension','Харьцаа');
-define('lang_Size','Хэмжээ');
-define('lang_Date','Огноо');
-define('lang_Filename','Файлын нэр');
-define('lang_Operations','Үйлдэлүүд');
-define('lang_Date_type','y-m-d');
-define('lang_OK','ОК');
-define('lang_Cancel','Буцах');
-define('lang_Sorting','эрэмбэлэх');
-define('lang_Show_url','URL-г харах');
-define('lang_Extract','энд задла');
-define('lang_File_info','файлын мэдээлэл');
-define('lang_Edit_image','зураг засварлах');
-define('lang_Duplicate','Давхардуулах');
-
-?>
+define('lang_Select', 'Сонгох');
+define('lang_Erase', 'Устгах');
+define('lang_Open', 'Нээх');
+define('lang_Confirm_del', 'Та энэ файлыг устгахдаа итгэлтэй байна уу?');
+define('lang_All', 'Бүгд');
+define('lang_Files', 'Файлууд');
+define('lang_Images', 'Зурагнууд');
+define('lang_Archives', 'Архивлагдсан файлууд');
+define('lang_Error_Upload', 'Хуулсан файл зөвшөөрөгдөх хэмжээнээс их байна.');
+define('lang_Error_extension', 'Файлын өргөтгөх зөвшөөрөгдөөгүй.');
+define('lang_Upload_file', 'Хуулах');
+define('lang_Filters', 'Шүүлтүүрүүд');
+define('lang_Videos', 'Бичлэгнүүд');
+define('lang_Music', 'Дуунууд');
+define('lang_New_Folder', 'Шинэ хавтас');
+define('lang_Folder_Created', 'Хавтас амжилттай үүслээ');
+define('lang_Existing_Folder', 'Давхардсан хавтас');
+define('lang_Confirm_Folder_del', 'Хавтас болон доторх бүх файлуудыг устгахдаа итгэлтэй байна уу?');
+define('lang_Return_Files_List', 'Файлын жагсаалт руу буцах');
+define('lang_Preview', 'Урьдчилан харах');
+define('lang_Download', 'Татаж авах');
+define('lang_Insert_Folder_Name', 'Хавтасны нэрийг оруулна уу:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Нэрлэх');
+define('lang_Back', 'буцах');
+define('lang_View', 'Үзэх');
+define('lang_View_list', 'Жагсаалтаар харах');
+define('lang_View_columns_list', 'Баганаар харах');
+define('lang_View_boxes', 'Хайрцгаар харах');
+define('lang_Toolbar', 'Товчилсон товчнууд');
+define('lang_Actions', 'Үйлдэл');
+define('lang_Rename_existing_file', 'Файл аль хэдийнэ үүссэн байна');
+define('lang_Rename_existing_folder', 'Хавтас аль хэдийнэ үүсэн байна');
+define('lang_Empty_name', 'Нэр хоосон байна');
+define('lang_Text_filter', 'текстэн шүүлтүүр');
+define('lang_Swipe_help', 'Файл/Хавтасны нэрийг товшоод тохиргоог харна уу');
+define('lang_Upload_base', 'Энгийнээр хуулах');
+define('lang_Upload_java', 'JAVA-гаар хуулах (их хэмжээтэй файл)');
+define('lang_Upload_java_help', "Хэрэв Java Applet уншихгүй бол 1. Java суусан эсэхийг шалгана уу, үгүй бол <a href='http://java.com/en/download/'>[эндээс татаж авна уу]</a>   2. Галт хана дээр хаалт хийсэн эсэхийг шалгана уу");
+define('lang_Upload_base_help', "Хуулах хэсэг дээр файлыг зөөж тавих болон дээр нь дарж хуулж болно (орчин үеийн хөтөч дээр). Хуулж дууссан бол 'Файлын жагсаалт руу буцах' товчин дээр дарна уу.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Төрөл');
+define('lang_Dimension', 'Харьцаа');
+define('lang_Size', 'Хэмжээ');
+define('lang_Date', 'Огноо');
+define('lang_Filename', 'Файлын нэр');
+define('lang_Operations', 'Үйлдэлүүд');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'ОК');
+define('lang_Cancel', 'Буцах');
+define('lang_Sorting', 'эрэмбэлэх');
+define('lang_Show_url', 'URL-г харах');
+define('lang_Extract', 'энд задла');
+define('lang_File_info', 'файлын мэдээлэл');
+define('lang_Edit_image', 'зураг засварлах');
+define('lang_Duplicate', 'Давхардуулах');

adm/filemanager/lang/nb.php

@@ -1,59 +1,57 @@
 <?php
-define('lang_Select','Velg');
-define('lang_Erase','Slett');
-define('lang_Open','Åpne');
-define('lang_Confirm_del','Er du sikker på at du vil slette denne filen?');
-define('lang_All','Alle');
-define('lang_Files','Filer');
-define('lang_Images','Bilder');
-define('lang_Archives','Arkiv');
-define('lang_Error_Upload','Den opplastede filen overskrider maksimal tillatt størrelse.');
-define('lang_Error_extension','Filtypen er ikke tillatt.');
-define('lang_Upload_file','Last opp fil');
-define('lang_Filters','Filter');
-define('lang_Videos','Videoer');
-define('lang_Music','Musikk');
-define('lang_New_Folder','Ny mappe');
-define('lang_Folder_Created','Mappe opprettet');
-define('lang_Existing_Folder','Eksisterende mappe');
-define('lang_Confirm_Folder_del','Er du sikker på at du vil slette mappen og alt innholdet?');
-define('lang_Return_Files_List','Tilbake til filoversikten');
-define('lang_Preview','Forhåndsvisning');
-define('lang_Download','Last ned');
-define('lang_Insert_Folder_Name','Gi mappen et navn:');
-define('lang_Root','Rot');
-define('lang_Rename','Gi nytt navn');
-define('lang_Back','Tilbake');
-define('lang_View','Visning');
-define('lang_View_list','Listevisning');
-define('lang_View_columns_list','Side ved side');
-define('lang_View_boxes','Boksvisning');
-define('lang_Toolbar','Verktøylinje');
-define('lang_Actions','Gjøremål');
-define('lang_Rename_existing_file','Filen er allerede opprettet');
-define('lang_Rename_existing_folder','Mappen er allerede opprettet');
-define('lang_Empty_name','Tomt navn');
-define('lang_Text_filter','Tekst-filter');
-define('lang_Swipe_help','Sveip filnavnet/mappenavnet for å vise alternativer');
-define('lang_Upload_base','Vanlig opplasting');
-define('lang_Upload_java','Java-opplasting (store filer)');
-define('lang_Upload_java_help',"Hvis java-appleten ikke lastes: 1. Sjekk om Java er installert, hvis ikke <a href='http://java.com/en/download/'>last ned Java</a> 2. Sjekk brannmur-innstillingene.");
-define('lang_Upload_base_help',"Dra og slipp filen(e) i området over eller klikk (virker for moderne nettlesere). Ved bruk av gammel nettleser: Velg filen og klikk på knappen. Når opplastingen er ferdig, klikk på tilbake-knappen øverst.");
-define('lang_Type_dir','Mappe');
-define('lang_Type','Type');
-define('lang_Dimension','Dimensjoner');
-define('lang_Size','Størrelse');
-define('lang_Date','Dato');
-define('lang_Filename','Filnavn');
-define('lang_Operations','Handlinger');
-define('lang_Date_type','d.m.y');
-define('lang_OK','OK');
-define('lang_Cancel','Avbryt');
-define('lang_Sorting','Sortering');
-define('lang_Show_url','Vis URL');
-define('lang_Extract','extract here');
-define('lang_File_info','Fil-info');
-define('lang_Edit_image','Rediger bilde');
-define('lang_Duplicate','Duplicate');
-
-?>
+define('lang_Select', 'Velg');
+define('lang_Erase', 'Slett');
+define('lang_Open', 'Åpne');
+define('lang_Confirm_del', 'Er du sikker på at du vil slette denne filen?');
+define('lang_All', 'Alle');
+define('lang_Files', 'Filer');
+define('lang_Images', 'Bilder');
+define('lang_Archives', 'Arkiv');
+define('lang_Error_Upload', 'Den opplastede filen overskrider maksimal tillatt størrelse.');
+define('lang_Error_extension', 'Filtypen er ikke tillatt.');
+define('lang_Upload_file', 'Last opp fil');
+define('lang_Filters', 'Filter');
+define('lang_Videos', 'Videoer');
+define('lang_Music', 'Musikk');
+define('lang_New_Folder', 'Ny mappe');
+define('lang_Folder_Created', 'Mappe opprettet');
+define('lang_Existing_Folder', 'Eksisterende mappe');
+define('lang_Confirm_Folder_del', 'Er du sikker på at du vil slette mappen og alt innholdet?');
+define('lang_Return_Files_List', 'Tilbake til filoversikten');
+define('lang_Preview', 'Forhåndsvisning');
+define('lang_Download', 'Last ned');
+define('lang_Insert_Folder_Name', 'Gi mappen et navn:');
+define('lang_Root', 'Rot');
+define('lang_Rename', 'Gi nytt navn');
+define('lang_Back', 'Tilbake');
+define('lang_View', 'Visning');
+define('lang_View_list', 'Listevisning');
+define('lang_View_columns_list', 'Side ved side');
+define('lang_View_boxes', 'Boksvisning');
+define('lang_Toolbar', 'Verktøylinje');
+define('lang_Actions', 'Gjøremål');
+define('lang_Rename_existing_file', 'Filen er allerede opprettet');
+define('lang_Rename_existing_folder', 'Mappen er allerede opprettet');
+define('lang_Empty_name', 'Tomt navn');
+define('lang_Text_filter', 'Tekst-filter');
+define('lang_Swipe_help', 'Sveip filnavnet/mappenavnet for å vise alternativer');
+define('lang_Upload_base', 'Vanlig opplasting');
+define('lang_Upload_java', 'Java-opplasting (store filer)');
+define('lang_Upload_java_help', "Hvis java-appleten ikke lastes: 1. Sjekk om Java er installert, hvis ikke <a href='http://java.com/en/download/'>last ned Java</a> 2. Sjekk brannmur-innstillingene.");
+define('lang_Upload_base_help', "Dra og slipp filen(e) i området over eller klikk (virker for moderne nettlesere). Ved bruk av gammel nettleser: Velg filen og klikk på knappen. Når opplastingen er ferdig, klikk på tilbake-knappen øverst.");
+define('lang_Type_dir', 'Mappe');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Dimensjoner');
+define('lang_Size', 'Størrelse');
+define('lang_Date', 'Dato');
+define('lang_Filename', 'Filnavn');
+define('lang_Operations', 'Handlinger');
+define('lang_Date_type', 'd.m.y');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Avbryt');
+define('lang_Sorting', 'Sortering');
+define('lang_Show_url', 'Vis URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'Fil-info');
+define('lang_Edit_image', 'Rediger bilde');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/nl.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Selecteren');
-define('lang_Erase','Verwijderen');
-define('lang_Open','Openen');
-define('lang_Confirm_del','Weet u zeker dat u dit bestand wilt verwijderen?');
-define('lang_All','Alles Weergeven');
-define('lang_Files','Bestanden');
-define('lang_Images','Afbeeldingen');
-define('lang_Archives','Archieven');
-define('lang_Error_Upload','Het bestand overschrijdt de maximum toegestane grootte.');
-define('lang_Error_extension','Bestand extensie is niet toegestaan');
-define('lang_Upload_file','Bestand uploaden');
-define('lang_Filters','Filter');
-define('lang_Videos','Videos');
-define('lang_Music','Muziek');
-define('lang_New_Folder','Nieuwe map');
-define('lang_Folder_Created','Map aangemaakt');
-define('lang_Existing_Folder','Bestaande map');
-define('lang_Confirm_Folder_del','Weet u zeker dat u deze map en alle bestanden hierin wilt verwijderen?');
-define('lang_Return_Files_List','Terug naar bestanden');
-define('lang_Preview','Voorbeeld');
-define('lang_Download','Download');
-define('lang_Insert_Folder_Name','Map naam:');
-define('lang_Root','root');
-define('lang_Rename','Hernoemen');
-define('lang_Back','terug');
-define('lang_View','Weergave');
-define('lang_View_list','Lijst weergave');
-define('lang_View_columns_list','Kolom-lijst weergave');
-define('lang_View_boxes','Tegel weergave');
-define('lang_Toolbar','Werkbalk');
-define('lang_Actions','Acties');
-define('lang_Rename_existing_file','Het bestand bestaat al');
-define('lang_Rename_existing_folder','De map bestaat al');
-define('lang_Empty_name','De bestandsnaam is leeg');
-define('lang_Text_filter','Zoeken...');
-define('lang_Swipe_help','Swipe over de naam van een bestand of map om opties te zien');
-define('lang_Upload_base','Standaard uploader');
-define('lang_Upload_java','JAVA upload (voor grote bestanden)');
-define('lang_Upload_java_help',"Als de Java Applet niet laadt: 1. Heeft u JAVA geinstalleerd? Zo niet, download het hier: <a href='http://java.com/en/download/'>java.com/en/download/</a> 2. Wees er zeker van dat de firewall deze actie accepteert");
-define('lang_Upload_base_help',"Klik en sleep (meerdere) bestanden vanaf uw computer naar het \"Drop files\" vlak hierboven om bestanden toe te voegen.<br/> Ook is het mogelijk om in een dialoogvenster (meerdere) bestanden te selecteren, klik hiervoor op \"Drop files\"<br/><br/><i>Als alle uploads voltooid zijn kunt u terugkeren met de knop \"Terug naar bestanden\"</i>");
-define('lang_Type_dir','map');
-define('lang_Type','Type');
-define('lang_Dimension','Afmetingen');
-define('lang_Size','Grootte');
-define('lang_Date','Datum');
-define('lang_Filename','Naam');
-define('lang_Operations','Bewerkingen');
-define('lang_Date_type','j-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Annuleren');
-define('lang_Sorting','Sorteren op');
-define('lang_Show_url','toon URL');
-define('lang_Extract','hier uitpakken');
-define('lang_File_info','bestands-info');
-define('lang_Edit_image','afbeelding bewerken');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Selecteren');
+define('lang_Erase', 'Verwijderen');
+define('lang_Open', 'Openen');
+define('lang_Confirm_del', 'Weet u zeker dat u dit bestand wilt verwijderen?');
+define('lang_All', 'Alles Weergeven');
+define('lang_Files', 'Bestanden');
+define('lang_Images', 'Afbeeldingen');
+define('lang_Archives', 'Archieven');
+define('lang_Error_Upload', 'Het bestand overschrijdt de maximum toegestane grootte.');
+define('lang_Error_extension', 'Bestand extensie is niet toegestaan');
+define('lang_Upload_file', 'Bestand uploaden');
+define('lang_Filters', 'Filter');
+define('lang_Videos', 'Videos');
+define('lang_Music', 'Muziek');
+define('lang_New_Folder', 'Nieuwe map');
+define('lang_Folder_Created', 'Map aangemaakt');
+define('lang_Existing_Folder', 'Bestaande map');
+define('lang_Confirm_Folder_del', 'Weet u zeker dat u deze map en alle bestanden hierin wilt verwijderen?');
+define('lang_Return_Files_List', 'Terug naar bestanden');
+define('lang_Preview', 'Voorbeeld');
+define('lang_Download', 'Download');
+define('lang_Insert_Folder_Name', 'Map naam:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Hernoemen');
+define('lang_Back', 'terug');
+define('lang_View', 'Weergave');
+define('lang_View_list', 'Lijst weergave');
+define('lang_View_columns_list', 'Kolom-lijst weergave');
+define('lang_View_boxes', 'Tegel weergave');
+define('lang_Toolbar', 'Werkbalk');
+define('lang_Actions', 'Acties');
+define('lang_Rename_existing_file', 'Het bestand bestaat al');
+define('lang_Rename_existing_folder', 'De map bestaat al');
+define('lang_Empty_name', 'De bestandsnaam is leeg');
+define('lang_Text_filter', 'Zoeken...');
+define('lang_Swipe_help', 'Swipe over de naam van een bestand of map om opties te zien');
+define('lang_Upload_base', 'Standaard uploader');
+define('lang_Upload_java', 'JAVA upload (voor grote bestanden)');
+define('lang_Upload_java_help', "Als de Java Applet niet laadt: 1. Heeft u JAVA geinstalleerd? Zo niet, download het hier: <a href='http://java.com/en/download/'>java.com/en/download/</a> 2. Wees er zeker van dat de firewall deze actie accepteert");
+define('lang_Upload_base_help', "Klik en sleep (meerdere) bestanden vanaf uw computer naar het \"Drop files\" vlak hierboven om bestanden toe te voegen.<br/> Ook is het mogelijk om in een dialoogvenster (meerdere) bestanden te selecteren, klik hiervoor op \"Drop files\"<br/><br/><i>Als alle uploads voltooid zijn kunt u terugkeren met de knop \"Terug naar bestanden\"</i>");
+define('lang_Type_dir', 'map');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Afmetingen');
+define('lang_Size', 'Grootte');
+define('lang_Date', 'Datum');
+define('lang_Filename', 'Naam');
+define('lang_Operations', 'Bewerkingen');
+define('lang_Date_type', 'j-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Annuleren');
+define('lang_Sorting', 'Sorteren op');
+define('lang_Show_url', 'toon URL');
+define('lang_Extract', 'hier uitpakken');
+define('lang_File_info', 'bestands-info');
+define('lang_Edit_image', 'afbeelding bewerken');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/pl.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Wybierz');
-define('lang_Erase','Wyczyść');
-define('lang_Open','Otwórz');
-define('lang_Confirm_del','Czy jesteś pewien, że chcesz usunąć ten plik?');
-define('lang_All','Wszystkie');
-define('lang_Files','Pliki');
-define('lang_Images','Zdjęcia');
-define('lang_Archives','Archiwa');
-define('lang_Error_Upload','Plik przekracza maksymalny dozwolony rozmiar.');
-define('lang_Error_extension','Niedozwolone rozszerzenie pliku.');
-define('lang_Upload_file','Wgraj plik');
-define('lang_Filters','Filtr widoku');
-define('lang_Videos','Filmy');
-define('lang_Music','Muzyka');
-define('lang_New_Folder','Dodaj nowy folder');
-define('lang_Folder_Created','Folder został utworzony poprawnie');
-define('lang_Existing_Folder','Istniejący folder');
-define('lang_Confirm_Folder_del','Czy jesteś pewien, że chcesz usunąć folder i wszystko co znajduje się w nim?');
-define('lang_Return_Files_List','Powrót do listy plików');
-define('lang_Preview','Podgląd');
-define('lang_Download','Pobierz');
-define('lang_Insert_Folder_Name','Podaj nazwę folderu:');
-define('lang_Root','root');
-define('lang_Rename','Zmień nazwę');
-define('lang_Back','[..]');
-define('lang_View','Widok');
-define('lang_View_list','Lista');
-define('lang_View_columns_list','Kolumny');
-define('lang_View_boxes','Bloki');
-define('lang_Toolbar','Pasek');
-define('lang_Actions','Opcje');
-define('lang_Rename_existing_file','Ten plik już tutaj umieszczono');
-define('lang_Rename_existing_folder','Ten folder już tutaj utworzono');
-define('lang_Empty_name','Nie podano wymaganej nazwy');
-define('lang_Text_filter','wpisz txt');
-define('lang_Swipe_help','Kliknij w nazwę pliku/folderu by wyświetlić dostępne opcje');
-define('lang_Upload_base','Wgrywanie standardowe');
-define('lang_Upload_java','Wgrywanie przez skrypty JS (dla dużych plików)');
-define('lang_Upload_java_help',"Jeżeli ten aplet JS nie powoduje wgrywania 1. Sprawdź czy masz pobraną i uruchomioną obsługę skryptów w JAVA na stronie JAVA <a href='http://java.com/en/download/'>[pobierz]</a> 2. Upewnij się, że nie jest to blokada wynikająca z ustawień zapory firewall");
-define('lang_Upload_base_help',"Metoda zwana Przeciągnij & Upuść pliki w poniższy obszar, lub kliknij weń (dotyczy tylko najnowszych przeglądarek), lub wybierz plik i kliknij w przycisk. Kiedy zakończy się proces wgrywania, kliknij wyżej na przycisk by zakończyć.");
-define('lang_Type_dir','FLD');
-define('lang_Type','wg. typu');
-define('lang_Dimension','Wymiary');
-define('lang_Size','wg. wagi');
-define('lang_Date','wg. daty');
-define('lang_Filename','wg. nazwy');
-define('lang_Operations','Opcje');
-define('lang_Date_type','d-m-y');
-define('lang_OK','OK');
-define('lang_Cancel','Anuluj');
-define('lang_Sorting','SORTOWANIE');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Wybierz');
+define('lang_Erase', 'Wyczyść');
+define('lang_Open', 'Otwórz');
+define('lang_Confirm_del', 'Czy jesteś pewien, że chcesz usunąć ten plik?');
+define('lang_All', 'Wszystkie');
+define('lang_Files', 'Pliki');
+define('lang_Images', 'Zdjęcia');
+define('lang_Archives', 'Archiwa');
+define('lang_Error_Upload', 'Plik przekracza maksymalny dozwolony rozmiar.');
+define('lang_Error_extension', 'Niedozwolone rozszerzenie pliku.');
+define('lang_Upload_file', 'Wgraj plik');
+define('lang_Filters', 'Filtr widoku');
+define('lang_Videos', 'Filmy');
+define('lang_Music', 'Muzyka');
+define('lang_New_Folder', 'Dodaj nowy folder');
+define('lang_Folder_Created', 'Folder został utworzony poprawnie');
+define('lang_Existing_Folder', 'Istniejący folder');
+define('lang_Confirm_Folder_del', 'Czy jesteś pewien, że chcesz usunąć folder i wszystko co znajduje się w nim?');
+define('lang_Return_Files_List', 'Powrót do listy plików');
+define('lang_Preview', 'Podgląd');
+define('lang_Download', 'Pobierz');
+define('lang_Insert_Folder_Name', 'Podaj nazwę folderu:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Zmień nazwę');
+define('lang_Back', '[..]');
+define('lang_View', 'Widok');
+define('lang_View_list', 'Lista');
+define('lang_View_columns_list', 'Kolumny');
+define('lang_View_boxes', 'Bloki');
+define('lang_Toolbar', 'Pasek');
+define('lang_Actions', 'Opcje');
+define('lang_Rename_existing_file', 'Ten plik już tutaj umieszczono');
+define('lang_Rename_existing_folder', 'Ten folder już tutaj utworzono');
+define('lang_Empty_name', 'Nie podano wymaganej nazwy');
+define('lang_Text_filter', 'wpisz txt');
+define('lang_Swipe_help', 'Kliknij w nazwę pliku/folderu by wyświetlić dostępne opcje');
+define('lang_Upload_base', 'Wgrywanie standardowe');
+define('lang_Upload_java', 'Wgrywanie przez skrypty JS (dla dużych plików)');
+define('lang_Upload_java_help', "Jeżeli ten aplet JS nie powoduje wgrywania 1. Sprawdź czy masz pobraną i uruchomioną obsługę skryptów w JAVA na stronie JAVA <a href='http://java.com/en/download/'>[pobierz]</a> 2. Upewnij się, że nie jest to blokada wynikająca z ustawień zapory firewall");
+define('lang_Upload_base_help', "Metoda zwana Przeciągnij & Upuść pliki w poniższy obszar, lub kliknij weń (dotyczy tylko najnowszych przeglądarek), lub wybierz plik i kliknij w przycisk. Kiedy zakończy się proces wgrywania, kliknij wyżej na przycisk by zakończyć.");
+define('lang_Type_dir', 'FLD');
+define('lang_Type', 'wg. typu');
+define('lang_Dimension', 'Wymiary');
+define('lang_Size', 'wg. wagi');
+define('lang_Date', 'wg. daty');
+define('lang_Filename', 'wg. nazwy');
+define('lang_Operations', 'Opcje');
+define('lang_Date_type', 'd-m-y');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Anuluj');
+define('lang_Sorting', 'SORTOWANIE');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/pt.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Seleccionar');
-define('lang_Erase','Eliminar');
-define('lang_Open','Abrir');
-define('lang_Confirm_del','Tem certeza que pretende eliminar este arquivo?');
-define('lang_All','Todos');
-define('lang_Files','Ficheiros');
-define('lang_Images','Imagens');
-define('lang_Archives','Compactados');
-define('lang_Error_Upload','O ficheiro enviado é maior que o limite permitido.');
-define('lang_Error_extension','Extensão não permitida.');
-define('lang_Upload_file','Carregar ficheiro');
-define('lang_Filters','Filtro');
-define('lang_Videos','Vídeos');
-define('lang_Music','Música');
-define('lang_New_Folder','Nova pasta');
-define('lang_Folder_Created','Pasta criada com sucesso');
-define('lang_Existing_Folder','Pasta existente');
-define('lang_Confirm_Folder_del','Tem certeza que pretende eliminar a pasta e todo o seu conteúdo?');
-define('lang_Return_Files_List','Voltar à lista de ficheiros');
-define('lang_Preview','Pré-visualizar');
-define('lang_Download','Descarregar');
-define('lang_Insert_Folder_Name','Insira o nome da pasta:');
-define('lang_Root','root');
-define('lang_Rename','Mudar o nome');
-define('lang_Back','de volta');
-define('lang_View','View');
-define('lang_View_list','List view');
-define('lang_View_columns_list','Columns list view');
-define('lang_View_boxes','Box view');
-define('lang_Toolbar','Toolbar');
-define('lang_Actions','Actions');
-define('lang_Rename_existing_file','The file is already existing');
-define('lang_Rename_existing_folder','The folder is already existing');
-define('lang_Empty_name','The name is empty');
-define('lang_Text_filter','text filter');
-define('lang_Swipe_help','Swipe the name of file/folder to show options');
-define('lang_Upload_base','Base upload');
-define('lang_Upload_java','JAVA upload (big size files)');
-define('lang_Upload_java_help',"If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
-define('lang_Upload_base_help',"Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
-define('lang_Type_dir','dir');
-define('lang_Type','Type');
-define('lang_Dimension','Dimension');
-define('lang_Size','Size');
-define('lang_Date','Date');
-define('lang_Filename','Name');
-define('lang_Operations','Operations');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Cancel');
-define('lang_Sorting','sorting');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Seleccionar');
+define('lang_Erase', 'Eliminar');
+define('lang_Open', 'Abrir');
+define('lang_Confirm_del', 'Tem certeza que pretende eliminar este arquivo?');
+define('lang_All', 'Todos');
+define('lang_Files', 'Ficheiros');
+define('lang_Images', 'Imagens');
+define('lang_Archives', 'Compactados');
+define('lang_Error_Upload', 'O ficheiro enviado é maior que o limite permitido.');
+define('lang_Error_extension', 'Extensão não permitida.');
+define('lang_Upload_file', 'Carregar ficheiro');
+define('lang_Filters', 'Filtro');
+define('lang_Videos', 'Vídeos');
+define('lang_Music', 'Música');
+define('lang_New_Folder', 'Nova pasta');
+define('lang_Folder_Created', 'Pasta criada com sucesso');
+define('lang_Existing_Folder', 'Pasta existente');
+define('lang_Confirm_Folder_del', 'Tem certeza que pretende eliminar a pasta e todo o seu conteúdo?');
+define('lang_Return_Files_List', 'Voltar à lista de ficheiros');
+define('lang_Preview', 'Pré-visualizar');
+define('lang_Download', 'Descarregar');
+define('lang_Insert_Folder_Name', 'Insira o nome da pasta:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Mudar o nome');
+define('lang_Back', 'de volta');
+define('lang_View', 'View');
+define('lang_View_list', 'List view');
+define('lang_View_columns_list', 'Columns list view');
+define('lang_View_boxes', 'Box view');
+define('lang_Toolbar', 'Toolbar');
+define('lang_Actions', 'Actions');
+define('lang_Rename_existing_file', 'The file is already existing');
+define('lang_Rename_existing_folder', 'The folder is already existing');
+define('lang_Empty_name', 'The name is empty');
+define('lang_Text_filter', 'text filter');
+define('lang_Swipe_help', 'Swipe the name of file/folder to show options');
+define('lang_Upload_base', 'Base upload');
+define('lang_Upload_java', 'JAVA upload (big size files)');
+define('lang_Upload_java_help', "If the Java Applet don't load 1. make sure you have Java installed otherwise <a href='http://java.com/en/download/'>[download link]</a> 2. make sure nothing is blocked from firewall");
+define('lang_Upload_base_help', "Drag & Drop file/s inside above area or click in it (for modern browsers) otherwise select the file and click on button. When the upload end, click on upper return button.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Type');
+define('lang_Dimension', 'Dimension');
+define('lang_Size', 'Size');
+define('lang_Date', 'Date');
+define('lang_Filename', 'Name');
+define('lang_Operations', 'Operations');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Cancel');
+define('lang_Sorting', 'sorting');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/ru.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Выбрать');
-define('lang_Erase','Удалить');
-define('lang_Open','Открыть');
-define('lang_Confirm_del','Уверены, что хотите удалить этот файл?');
-define('lang_All','Все');
-define('lang_Files','Файлы');
-define('lang_Images','Изображения');
-define('lang_Archives','Архивы');
-define('lang_Error_Upload','Загружаемый файл превышает допустимый размер.');
-define('lang_Error_extension','Недопустимый формат файла.');
-define('lang_Upload_file','Загрузить файл');
-define('lang_Filters','Фильтр');
-define('lang_Videos','Видео');
-define('lang_Music','Музыка');
-define('lang_New_Folder','New folder');
-define('lang_Folder_Created','Папка успешно создана');
-define('lang_Existing_Folder','Существующая папка');
-define('lang_Confirm_Folder_del','Уверены, что хотите удалить эту папку и все файлы в ней?');
-define('lang_Return_Files_List','Вернуться к списку файлов');
-define('lang_Preview','Просмотр');
-define('lang_Download','Загрузить');
-define('lang_Insert_Folder_Name','Введите имя папки:');
-define('lang_Root','Корневая папка');
-define('lang_Rename','Переименовать');
-define('lang_Back','назад');
-define('lang_View','Вид');
-define('lang_View_list','Список');
-define('lang_View_columns_list','Столбцы');
-define('lang_View_boxes','Плитка');
-define('lang_Toolbar','Панель');
-define('lang_Actions','Действия');
-define('lang_Rename_existing_file','Файл уже существует');
-define('lang_Rename_existing_folder','Папка уже существует');
-define('lang_Empty_name','Не заполнено имя');
-define('lang_Text_filter','фильтр');
-define('lang_Swipe_help','Наведите на имя файла/папки, чтобы увидеть опции');
-define('lang_Upload_base','Основная загрузка');
-define('lang_Upload_java','JAVA загрузка (для файлов больших размеров)');
-define('lang_Upload_java_help',"Если Java-апплет не загружается: 1. Убедитесь, что установлена Java, в противном случае <a href='http://java.com/en/download/'>[скачайте]</a> 2. Убедитесь, что фаервол ничего не блокирует");
-define('lang_Upload_base_help',"Перетащите файлы в область выше или щелкните по ней мышкой (для современных браузеров) и выберите файл(ы). После завершения загрузки нажмите кнопку &laquo;Вернуться к списку файлов&raquo;.");
-define('lang_Type_dir','папка');
-define('lang_Type','Тип');
-define('lang_Dimension','Разрешение');
-define('lang_Size','Размер');
-define('lang_Date','Дата');
-define('lang_Filename','Имя&nbsp;файла');
-define('lang_Operations','Действие');
-define('lang_Date_type','y-m-d');
-define('lang_OK','OK');
-define('lang_Cancel','Отмена');
-define('lang_Sorting','Сортировка');
-define('lang_Show_url','Показать URL');
-define('lang_Extract','Распаковать здесь');
-define('lang_File_info','Свойства файла');
-define('lang_Edit_image','Редактировать');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Выбрать');
+define('lang_Erase', 'Удалить');
+define('lang_Open', 'Открыть');
+define('lang_Confirm_del', 'Уверены, что хотите удалить этот файл?');
+define('lang_All', 'Все');
+define('lang_Files', 'Файлы');
+define('lang_Images', 'Изображения');
+define('lang_Archives', 'Архивы');
+define('lang_Error_Upload', 'Загружаемый файл превышает допустимый размер.');
+define('lang_Error_extension', 'Недопустимый формат файла.');
+define('lang_Upload_file', 'Загрузить файл');
+define('lang_Filters', 'Фильтр');
+define('lang_Videos', 'Видео');
+define('lang_Music', 'Музыка');
+define('lang_New_Folder', 'New folder');
+define('lang_Folder_Created', 'Папка успешно создана');
+define('lang_Existing_Folder', 'Существующая папка');
+define('lang_Confirm_Folder_del', 'Уверены, что хотите удалить эту папку и все файлы в ней?');
+define('lang_Return_Files_List', 'Вернуться к списку файлов');
+define('lang_Preview', 'Просмотр');
+define('lang_Download', 'Загрузить');
+define('lang_Insert_Folder_Name', 'Введите имя папки:');
+define('lang_Root', 'Корневая папка');
+define('lang_Rename', 'Переименовать');
+define('lang_Back', 'назад');
+define('lang_View', 'Вид');
+define('lang_View_list', 'Список');
+define('lang_View_columns_list', 'Столбцы');
+define('lang_View_boxes', 'Плитка');
+define('lang_Toolbar', 'Панель');
+define('lang_Actions', 'Действия');
+define('lang_Rename_existing_file', 'Файл уже существует');
+define('lang_Rename_existing_folder', 'Папка уже существует');
+define('lang_Empty_name', 'Не заполнено имя');
+define('lang_Text_filter', 'фильтр');
+define('lang_Swipe_help', 'Наведите на имя файла/папки, чтобы увидеть опции');
+define('lang_Upload_base', 'Основная загрузка');
+define('lang_Upload_java', 'JAVA загрузка (для файлов больших размеров)');
+define('lang_Upload_java_help', "Если Java-апплет не загружается: 1. Убедитесь, что установлена Java, в противном случае <a href='http://java.com/en/download/'>[скачайте]</a> 2. Убедитесь, что фаервол ничего не блокирует");
+define('lang_Upload_base_help', "Перетащите файлы в область выше или щелкните по ней мышкой (для современных браузеров) и выберите файл(ы). После завершения загрузки нажмите кнопку &laquo;Вернуться к списку файлов&raquo;.");
+define('lang_Type_dir', 'папка');
+define('lang_Type', 'Тип');
+define('lang_Dimension', 'Разрешение');
+define('lang_Size', 'Размер');
+define('lang_Date', 'Дата');
+define('lang_Filename', 'Имя&nbsp;файла');
+define('lang_Operations', 'Действие');
+define('lang_Date_type', 'y-m-d');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Отмена');
+define('lang_Sorting', 'Сортировка');
+define('lang_Show_url', 'Показать URL');
+define('lang_Extract', 'Распаковать здесь');
+define('lang_File_info', 'Свойства файла');
+define('lang_Edit_image', 'Редактировать');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/lang/se.php

@@ -1,59 +1,57 @@
 <?php
-define('lang_Select','Välj'); // Select
-define('lang_Erase','Radera'); // Erase
-define('lang_Open','Öppna'); // Open
-define('lang_Confirm_del','Är du säker på att du vill radera denna fil?'); //Are you sure you want to delete this file?
-define('lang_All','Alla'); // All
-define('lang_Files','Filer'); // Files
-define('lang_Images','Bilder'); // Images
-define('lang_Archives','Arkiv'); // Archives
-define('lang_Error_Upload','Den uppladdade filen överskrider max storleken.'); // The uploaded file exceeds the max size allowed.
-define('lang_Error_extension','Filtypen är ej tillåten.'); // File extension is not allowed.
-define('lang_Upload_file','Ladda upp'); // Upload
-define('lang_Filters','Filter'); // Filters
-define('lang_Videos','Videor'); // Videos
-define('lang_Music','Musik'); // Music
-define('lang_New_Folder','Ny katalog'); // New Folder
-define('lang_Folder_Created','Katalogen har skapats'); // Folder correctly created
-define('lang_Existing_Folder','Befintlig katalog'); // Existing folder
-define('lang_Confirm_Folder_del','Är du säker på att du vill radera denna katalog samt dess innehåll?'); // Are you sure to delete the folder and all the elements in it?
-define('lang_Return_Files_List','Tillbaka till filvisaren'); // Return to files list
-define('lang_Preview','Förhandsgranska'); // Preview
-define('lang_Download','Ladda hem'); // Download
-define('lang_Insert_Folder_Name','Ange katalog namn:'); // Insert folder name:
-define('lang_Root','root'); // root
-define('lang_Rename','Byt namn'); // Rename
-define('lang_Back','tillbaka'); // back
-define('lang_View','Visa'); // View
-define('lang_View_list','Listvy'); // List view
-define('lang_View_columns_list','Columnvy'); // Columns list view
-define('lang_View_boxes','Boxvy'); // Box view
-define('lang_Toolbar','Verktygsfält'); // Toolbar
-define('lang_Actions','Åtgärder'); // Actions
-define('lang_Rename_existing_file','Det finns redan en fil med det namnet'); // The file is already existing
-define('lang_Rename_existing_folder','Det finns redan en katalog med det namnet'); // The folder is already existing
-define('lang_Empty_name','Du har ej angivet något namn'); // The name is empty
-define('lang_Text_filter','text filter'); // text filter
-define('lang_Swipe_help','Svep över filnamnet/katalognamnet för att visa åtgärder'); // Swipe the name of file/folder to show options
-define('lang_Upload_base','Basal uppladdning'); // Base upload
-define('lang_Upload_java','JAVA uppladdning (för stora filer)'); // JAVA upload (big size files)
-define('lang_Upload_java_help',"Om Java Appleten inte laddar, 1. säkerställ att Java är installerat, <a href='http://java.com/en/download/'>ladda hem</a> och installera om det saknas  2. säkerställ att programmet inte blokeras av din brandvägg"); // If the Java Applet doesn't load, 1. make sure you have Java installed, otherwise <a href='http://java.com/en/download/'>[download link]</a>   2. make sure nothing is blocked by your firewall
-define('lang_Upload_base_help',"Dra och släpa filer eller klicka ovan och välj en eller flera filer. När uppladningen är klar, klicka på 'Tillbaka till filvisaren' knappen."); // Drag & Drop files or click in the area above (modern browsers) and select the file(s). When the upload is complete, click the 'Return to files list' button.
-define('lang_Type_dir','katalog'); // dir
-define('lang_Type','Typ'); // Type
-define('lang_Dimension','Dimension'); // Dimension
-define('lang_Size','Storlek'); // Size
-define('lang_Date','Datum'); // Date
-define('lang_Filename','Filname'); // Filename
-define('lang_Operations','Handlingar'); // Operations
-define('lang_Date_type','y-m-d'); // y-m-d
-define('lang_OK','OK'); // OK
-define('lang_Cancel','Avbryt'); // Cancel
-define('lang_Sorting','sortering'); // sorting
-define('lang_Show_url','visa sökväg'); // show URL
-define('lang_Extract','packa upp här'); // extract here
-define('lang_File_info','fil information'); // file info
-define('lang_Edit_image','editera bild'); // edit image
-define('lang_Duplicate','Duplicera'); // Duplicate
-
-?>
+define('lang_Select', 'Välj'); // Select
+define('lang_Erase', 'Radera'); // Erase
+define('lang_Open', 'Öppna'); // Open
+define('lang_Confirm_del', 'Är du säker på att du vill radera denna fil?'); //Are you sure you want to delete this file?
+define('lang_All', 'Alla'); // All
+define('lang_Files', 'Filer'); // Files
+define('lang_Images', 'Bilder'); // Images
+define('lang_Archives', 'Arkiv'); // Archives
+define('lang_Error_Upload', 'Den uppladdade filen överskrider max storleken.'); // The uploaded file exceeds the max size allowed.
+define('lang_Error_extension', 'Filtypen är ej tillåten.'); // File extension is not allowed.
+define('lang_Upload_file', 'Ladda upp'); // Upload
+define('lang_Filters', 'Filter'); // Filters
+define('lang_Videos', 'Videor'); // Videos
+define('lang_Music', 'Musik'); // Music
+define('lang_New_Folder', 'Ny katalog'); // New Folder
+define('lang_Folder_Created', 'Katalogen har skapats'); // Folder correctly created
+define('lang_Existing_Folder', 'Befintlig katalog'); // Existing folder
+define('lang_Confirm_Folder_del', 'Är du säker på att du vill radera denna katalog samt dess innehåll?'); // Are you sure to delete the folder and all the elements in it?
+define('lang_Return_Files_List', 'Tillbaka till filvisaren'); // Return to files list
+define('lang_Preview', 'Förhandsgranska'); // Preview
+define('lang_Download', 'Ladda hem'); // Download
+define('lang_Insert_Folder_Name', 'Ange katalog namn:'); // Insert folder name:
+define('lang_Root', 'root'); // root
+define('lang_Rename', 'Byt namn'); // Rename
+define('lang_Back', 'tillbaka'); // back
+define('lang_View', 'Visa'); // View
+define('lang_View_list', 'Listvy'); // List view
+define('lang_View_columns_list', 'Columnvy'); // Columns list view
+define('lang_View_boxes', 'Boxvy'); // Box view
+define('lang_Toolbar', 'Verktygsfält'); // Toolbar
+define('lang_Actions', 'Åtgärder'); // Actions
+define('lang_Rename_existing_file', 'Det finns redan en fil med det namnet'); // The file is already existing
+define('lang_Rename_existing_folder', 'Det finns redan en katalog med det namnet'); // The folder is already existing
+define('lang_Empty_name', 'Du har ej angivet något namn'); // The name is empty
+define('lang_Text_filter', 'text filter'); // text filter
+define('lang_Swipe_help', 'Svep över filnamnet/katalognamnet för att visa åtgärder'); // Swipe the name of file/folder to show options
+define('lang_Upload_base', 'Basal uppladdning'); // Base upload
+define('lang_Upload_java', 'JAVA uppladdning (för stora filer)'); // JAVA upload (big size files)
+define('lang_Upload_java_help', "Om Java Appleten inte laddar, 1. säkerställ att Java är installerat, <a href='http://java.com/en/download/'>ladda hem</a> och installera om det saknas  2. säkerställ att programmet inte blokeras av din brandvägg"); // If the Java Applet doesn't load, 1. make sure you have Java installed, otherwise <a href='http://java.com/en/download/'>[download link]</a>   2. make sure nothing is blocked by your firewall
+define('lang_Upload_base_help', "Dra och släpa filer eller klicka ovan och välj en eller flera filer. När uppladningen är klar, klicka på 'Tillbaka till filvisaren' knappen."); // Drag & Drop files or click in the area above (modern browsers) and select the file(s). When the upload is complete, click the 'Return to files list' button.
+define('lang_Type_dir', 'katalog'); // dir
+define('lang_Type', 'Typ'); // Type
+define('lang_Dimension', 'Dimension'); // Dimension
+define('lang_Size', 'Storlek'); // Size
+define('lang_Date', 'Datum'); // Date
+define('lang_Filename', 'Filname'); // Filename
+define('lang_Operations', 'Handlingar'); // Operations
+define('lang_Date_type', 'y-m-d'); // y-m-d
+define('lang_OK', 'OK'); // OK
+define('lang_Cancel', 'Avbryt'); // Cancel
+define('lang_Sorting', 'sortering'); // sorting
+define('lang_Show_url', 'visa sökväg'); // show URL
+define('lang_Extract', 'packa upp här'); // extract here
+define('lang_File_info', 'fil information'); // file info
+define('lang_Edit_image', 'editera bild'); // edit image
+define('lang_Duplicate', 'Duplicera'); // Duplicate

adm/filemanager/lang/sk.php

@@ -1,59 +1,57 @@
 <?php
-define('lang_Select','Vybrať');
-define('lang_Erase','Odstrániť');
-define('lang_Open','Otvoriť');
-define('lang_Confirm_del','Naozaj chcete vymazať tento súbor?');
-define('lang_All','Všetky');
-define('lang_Files','Súbory');
-define('lang_Images','Obrázky');
-define('lang_Archives','Archívy');
-define('lang_Error_Upload','Súbor presahuje maximálnu veľkosť.');
-define('lang_Error_extension','Typ súboru nie je podporovaný.');
-define('lang_Upload_file','Súbor');
-define('lang_Filters','Filtrovať');
-define('lang_Videos','Videá');
-define('lang_Music','Hudba');
-define('lang_New_Folder','Adresár');
-define('lang_Folder_Created','Adresár bol vytvorený');
-define('lang_Existing_Folder','Adresár už existuje');
-define('lang_Confirm_Folder_del','Naozaj chcete vymazať adresár a odstrániť tak všetky súbory v ňom?');
-define('lang_Return_Files_List','Späť na zoznam súborov');
-define('lang_Preview','Náhľad');
-define('lang_Download','Stiahnuť');
-define('lang_Insert_Folder_Name','Názov adresára:');
-define('lang_Root','root');
-define('lang_Rename','Premenovať');
-define('lang_Back','späť');
-define('lang_View','Zobraziť');
-define('lang_View_list','Zoznam');
-define('lang_View_columns_list','Stĺpce');
-define('lang_View_boxes','Ikony');
-define('lang_Toolbar','Nástroje');
-define('lang_Actions','Pridať');
-define('lang_Rename_existing_file','Súbor už existuje');
-define('lang_Rename_existing_folder','Adresár už existuje');
-define('lang_Empty_name','Názov je prázdny');
-define('lang_Text_filter','Vyhľadať');
-define('lang_Swipe_help','Pre viac možností prejdite myšou na súboru/adresár');
-define('lang_Upload_base','Klasické nahratie súborov');
-define('lang_Upload_java','Nahrať súbory cez JAVA (veľké súbory)');
-define('lang_Upload_java_help',"Ak sa vám nezobrazí Java Applet, 1. uistite sa, že máte nainštalovanú Java, (<a href='http://java.com/en/download/'>[stiahnuť]</a>) 2. uistite sa, že nie je zablokovaná cez Firewall");
-define('lang_Upload_base_help',"Myšou presuňte súbory alebo kliknite na určenú plochu a vyberte súbory. Keď je nahrávanie dokončené, kliknite na tlačidlo 'Späť na zoznam súborov'.");
-define('lang_Type_dir','dir');
-define('lang_Type','Typ');
-define('lang_Dimension','Rozlíšenie');
-define('lang_Size','Veľkosť');
-define('lang_Date','Dátum');
-define('lang_Filename','Názov');
-define('lang_Operations','Operácie');
-define('lang_Date_type','d.m.Y');
-define('lang_OK','OK');
-define('lang_Cancel','Zrušiť');
-define('lang_Sorting','Zoradiť');
-define('lang_Show_url','Zobratiť URL');
-define('lang_Extract','Rozbaliť sem');
-define('lang_File_info','Informácie o súbore');
-define('lang_Edit_image','Upraviť obrázok');
-define('lang_Duplicate','Duplicate');
-
-?>
+define('lang_Select', 'Vybrať');
+define('lang_Erase', 'Odstrániť');
+define('lang_Open', 'Otvoriť');
+define('lang_Confirm_del', 'Naozaj chcete vymazať tento súbor?');
+define('lang_All', 'Všetky');
+define('lang_Files', 'Súbory');
+define('lang_Images', 'Obrázky');
+define('lang_Archives', 'Archívy');
+define('lang_Error_Upload', 'Súbor presahuje maximálnu veľkosť.');
+define('lang_Error_extension', 'Typ súboru nie je podporovaný.');
+define('lang_Upload_file', 'Súbor');
+define('lang_Filters', 'Filtrovať');
+define('lang_Videos', 'Videá');
+define('lang_Music', 'Hudba');
+define('lang_New_Folder', 'Priečinok');
+define('lang_Folder_Created', 'Priečinok bol vytvorený');
+define('lang_Existing_Folder', 'Priečinok už existuje');
+define('lang_Confirm_Folder_del', 'Naozaj chcete vymazať priečinok a odstrániť tak všetky súbory v ňom?');
+define('lang_Return_Files_List', 'Späť na zoznam súborov');
+define('lang_Preview', 'Náhľad');
+define('lang_Download', 'Prevziať');
+define('lang_Insert_Folder_Name', 'Názov priečinku:');
+define('lang_Root', 'root');
+define('lang_Rename', 'Premenovať');
+define('lang_Back', 'späť');
+define('lang_View', 'Zobraziť');
+define('lang_View_list', 'Zoznam');
+define('lang_View_columns_list', 'Stĺpce');
+define('lang_View_boxes', 'Ikony');
+define('lang_Toolbar', 'Nástroje');
+define('lang_Actions', 'Pridať');
+define('lang_Rename_existing_file', 'Súbor už existuje');
+define('lang_Rename_existing_folder', 'Priečinok už existuje');
+define('lang_Empty_name', 'Názov je prázdny');
+define('lang_Text_filter', 'Vyhľadať');
+define('lang_Swipe_help', 'Pre viac možností prejdite myšou na súboru/priečinok');
+define('lang_Upload_base', 'Klasické nahratie súborov');
+define('lang_Upload_java', 'Nahrať súbory cez JAVA (veľké súbory)');
+define('lang_Upload_java_help', "Ak sa vám nezobrazí Java Applet, 1. uistite sa, že máte nainštalovanú Javu, (<a href='http://java.com/en/download/'>[prevziať]</a>) 2. uistite sa, že nie je zablokovaná cez Firewall");
+define('lang_Upload_base_help', "Myšou presuňte súbory alebo kliknite na určenú plochu a vyberte súbory. Keď je nahrávanie dokončené, kliknite na tlačidlo 'Späť na zoznam súborov'.");
+define('lang_Type_dir', 'dir');
+define('lang_Type', 'Typ');
+define('lang_Dimension', 'Rozlíšenie');
+define('lang_Size', 'Veľkosť');
+define('lang_Date', 'Dátum');
+define('lang_Filename', 'Názov');
+define('lang_Operations', 'Operácie');
+define('lang_Date_type', 'd.m.Y');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Zrušiť');
+define('lang_Sorting', 'Zoradiť');
+define('lang_Show_url', 'Zobraziť URL');
+define('lang_Extract', 'Rozbaliť sem');
+define('lang_File_info', 'Informácie o súbore');
+define('lang_Edit_image', 'Upraviť obrázok');
+define('lang_Duplicate', 'Duplikovať');

adm/filemanager/lang/tr.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Seç');
-define('lang_Erase','Sil');
-define('lang_Open','Aç');
-define('lang_Confirm_del','Bu dosyayı silmek istediğinizden emin misiniz?');
-define('lang_All','Tümü');
-define('lang_Files','Dosyalar');
-define('lang_Images','Resimler');
-define('lang_Archives','Arşivler');
-define('lang_Error_Upload','Yüklemeye çalıştığınız dosya maximum yükleme limitini aştı.');
-define('lang_Error_extension','Dosya uzantısı izni yok.');
-define('lang_Upload_file','Dosya Yükle');
-define('lang_Filters','Filtreler');
-define('lang_Videos','Videolar');
-define('lang_Music','Müzikler');
-define('lang_New_Folder','Yeni Klasör');
-define('lang_Folder_Created','Klasör başarıyla oluşturuldu.');
-define('lang_Existing_Folder','Mevcut klasör');
-define('lang_Confirm_Folder_del','Bu klasörü ve içindekileri silmek istediğinizden emin misiniz?');
-define('lang_Return_Files_List','Dosya listesine geri dön');
-define('lang_Preview','Önizleme');
-define('lang_Download','İndir');
-define('lang_Insert_Folder_Name','Klasör adı ekle:');
-define('lang_Root','kök');
-define('lang_Rename','Yeniden Adlandır');
-define('lang_Back','geri');
-define('lang_View','Görünüm');
-define('lang_View_list','Liste görünümü');
-define('lang_View_columns_list','Kolonlu liste görünümü');
-define('lang_View_boxes','Kutu görünümü');
-define('lang_Toolbar','Araç Çubuğu');
-define('lang_Actions','Eylemler');
-define('lang_Rename_existing_file','Bu dosya zaten mevcut');
-define('lang_Rename_existing_folder','Bu klasör zaten mevcut');
-define('lang_Empty_name','İsim alanı boş.');
-define('lang_Text_filter','filtrele...');
-define('lang_Swipe_help','Seçenekleri görüntülemek için dosya/klasör ismine tıklayın');
-define('lang_Upload_base','Normal Yükleme');
-define('lang_Upload_java','JAVA Yükleme (Büyük dosyalar için)');
-define('lang_Upload_java_help',"Eğer Java uygulaması yüklenmediyse; 1- Bilgisayarınızda Java yüklü olduğundan emin olun yada <a href='http://java.com/en/download/'>[Java'yı Buradan İndirin]</a> 2- Güvenlik duvarının hiçbir şeye engel olmadığından emin olun.");
-define('lang_Upload_base_help',"Dosyaları aşağıdaki alana Taşı & Bırak veya tıklayarak açılan pencereden dosyalarınızı seçin. Yükleme bittiğinde 'Return to files list' butonuna tıklayın.");
-define('lang_Type_dir','dizin');
-define('lang_Type','Tür');
-define('lang_Dimension','Ebat');
-define('lang_Size','Boyut');
-define('lang_Date','Tarih');
-define('lang_Filename','Dosya adı');
-define('lang_Operations','İşlemler');
-define('lang_Date_type','d-m-Y');
-define('lang_OK','Tamam');
-define('lang_Cancel','İptal');
-define('lang_Sorting','sıralama');
-define('lang_Show_url','URL göster');
-define('lang_Extract','buraya çıkart');
-define('lang_File_info','dosya bilgisi');
-define('lang_Edit_image','resmi düzenle');
-define('lang_Duplicate','Çoğalt');
-?>
+define('lang_Select', 'Seç');
+define('lang_Erase', 'Sil');
+define('lang_Open', 'Aç');
+define('lang_Confirm_del', 'Bu dosyayı silmek istediğinizden emin misiniz?');
+define('lang_All', 'Tümü');
+define('lang_Files', 'Dosyalar');
+define('lang_Images', 'Resimler');
+define('lang_Archives', 'Arşivler');
+define('lang_Error_Upload', 'Yüklemeye çalıştığınız dosya maximum yükleme limitini aştı.');
+define('lang_Error_extension', 'Dosya uzantısı izni yok.');
+define('lang_Upload_file', 'Dosya Yükle');
+define('lang_Filters', 'Filtreler');
+define('lang_Videos', 'Videolar');
+define('lang_Music', 'Müzikler');
+define('lang_New_Folder', 'Yeni Klasör');
+define('lang_Folder_Created', 'Klasör başarıyla oluşturuldu.');
+define('lang_Existing_Folder', 'Mevcut klasör');
+define('lang_Confirm_Folder_del', 'Bu klasörü ve içindekileri silmek istediğinizden emin misiniz?');
+define('lang_Return_Files_List', 'Dosya listesine geri dön');
+define('lang_Preview', 'Önizleme');
+define('lang_Download', 'İndir');
+define('lang_Insert_Folder_Name', 'Klasör adı ekle:');
+define('lang_Root', 'kök');
+define('lang_Rename', 'Yeniden Adlandır');
+define('lang_Back', 'geri');
+define('lang_View', 'Görünüm');
+define('lang_View_list', 'Liste görünümü');
+define('lang_View_columns_list', 'Kolonlu liste görünümü');
+define('lang_View_boxes', 'Kutu görünümü');
+define('lang_Toolbar', 'Araç Çubuğu');
+define('lang_Actions', 'Eylemler');
+define('lang_Rename_existing_file', 'Bu dosya zaten mevcut');
+define('lang_Rename_existing_folder', 'Bu klasör zaten mevcut');
+define('lang_Empty_name', 'İsim alanı boş.');
+define('lang_Text_filter', 'filtrele...');
+define('lang_Swipe_help', 'Seçenekleri görüntülemek için dosya/klasör ismine tıklayın');
+define('lang_Upload_base', 'Normal Yükleme');
+define('lang_Upload_java', 'JAVA Yükleme (Büyük dosyalar için)');
+define('lang_Upload_java_help', "Eğer Java uygulaması yüklenmediyse; 1- Bilgisayarınızda Java yüklü olduğundan emin olun yada <a href='http://java.com/en/download/'>[Java'yı Buradan İndirin]</a> 2- Güvenlik duvarının hiçbir şeye engel olmadığından emin olun.");
+define('lang_Upload_base_help', "Dosyaları aşağıdaki alana Taşı & Bırak veya tıklayarak açılan pencereden dosyalarınızı seçin. Yükleme bittiğinde 'Return to files list' butonuna tıklayın.");
+define('lang_Type_dir', 'dizin');
+define('lang_Type', 'Tür');
+define('lang_Dimension', 'Ebat');
+define('lang_Size', 'Boyut');
+define('lang_Date', 'Tarih');
+define('lang_Filename', 'Dosya adı');
+define('lang_Operations', 'İşlemler');
+define('lang_Date_type', 'd-m-Y');
+define('lang_OK', 'Tamam');
+define('lang_Cancel', 'İptal');
+define('lang_Sorting', 'sıralama');
+define('lang_Show_url', 'URL göster');
+define('lang_Extract', 'buraya çıkart');
+define('lang_File_info', 'dosya bilgisi');
+define('lang_Edit_image', 'resmi düzenle');
+define('lang_Duplicate', 'Çoğalt');

adm/filemanager/lang/uk.php

@@ -1,58 +1,57 @@
 <?php
-define('lang_Select','Вибрати');
-define('lang_Erase','Видалити');
-define('lang_Open','Відкрити');
-define('lang_Confirm_del','Впевнені, що хочете видалити цей файл?');
-define('lang_All','Всі');
-define('lang_Files','Файли');
-define('lang_Images','Зображення');
-define('lang_Archives','Архіви');
-define('lang_Error_Upload','Файл, що завантажується перевищує дозволений розмір.');
-define('lang_Error_extension','Неприпустимий формат файлу.');
-define('lang_Upload_file','Завантажити файл');
-define('lang_Filters','Фільтр');
-define('lang_Videos','Відео');
-define('lang_Music','Музика');
-define('lang_New_Folder','Нова папка');
-define('lang_Folder_Created','Папку успішно створено');
-define('lang_Existing_Folder','Існуюча папка');
-define('lang_Confirm_Folder_del','Впевнені, що хочете видалити цю папку і всі файли в ній?');
-define('lang_Return_Files_List','Повернутися до списку файлів');
-define('lang_Preview','Перегляд');
-define('lang_Download','Завантажити');
-define('lang_Insert_Folder_Name','Введіть ім`я папки:');
-define('lang_Root','Коренева папка');
-define('lang_Rename','Переіменувати');
-define('lang_Back','назад');
-define('lang_View','Вигляд');
-define('lang_View_list','Список');
-define('lang_View_columns_list','Стовпчики');
-define('lang_View_boxes','Плиткою');
-define('lang_Toolbar','Панель');
-define('lang_Actions','Дії');
-define('lang_Rename_existing_file','Файл вже існує');
-define('lang_Rename_existing_folder','Папка вже існує');
-define('lang_Empty_name','Не заповнено ім`я');
-define('lang_Text_filter','фільтр');
-define('lang_Swipe_help','Наведіть на ім`я файлу/папки, щоб побачити опції');
-define('lang_Upload_base','Основне завантаження');
-define('lang_Upload_java','JAVA-завантаження (для файлів великих розмірів)');
-define('lang_Upload_java_help',"Якщо Java-апплет не завантажується: 1. переконайтесь, що Java встановлено на вашому комп`ютері, інакше <a href='http://java.com/en/download/'>[завантажте]</a> 2. переконайтесь, що фаєрвол нічого не блокує");
-define('lang_Upload_base_help',"Перетягніть файли в область, що вище або клікніть по ній мишкою (для сучасних браузерів), в іншому разі виберіть файл та натисніть кнопку. Коли завантаження закінчиться - натисніть кнопку повернення.");
-define('lang_Type_dir','папка');
-define('lang_Type','Тип');
-define('lang_Dimension','Розмір');
-define('lang_Size','Об`єм');
-define('lang_Date','Дата');
-define('lang_Filename','Ім`я файлу');
-define('lang_Operations','Дії');
-define('lang_Date_type','р-м-д');
-define('lang_OK','OK');
-define('lang_Cancel','Відміна');
-define('lang_Sorting','Сортування');
-define('lang_Show_url','show URL');
-define('lang_Extract','extract here');
-define('lang_File_info','file info');
-define('lang_Edit_image','edit image');
-define('lang_Duplicate','Duplicate');
-?>
+define('lang_Select', 'Вибрати');
+define('lang_Erase', 'Видалити');
+define('lang_Open', 'Відкрити');
+define('lang_Confirm_del', 'Впевнені, що хочете видалити цей файл?');
+define('lang_All', 'Всі');
+define('lang_Files', 'Файли');
+define('lang_Images', 'Зображення');
+define('lang_Archives', 'Архіви');
+define('lang_Error_Upload', 'Файл, що завантажується перевищує дозволений розмір.');
+define('lang_Error_extension', 'Неприпустимий формат файлу.');
+define('lang_Upload_file', 'Завантажити файл');
+define('lang_Filters', 'Фільтр');
+define('lang_Videos', 'Відео');
+define('lang_Music', 'Музика');
+define('lang_New_Folder', 'Нова папка');
+define('lang_Folder_Created', 'Папку успішно створено');
+define('lang_Existing_Folder', 'Існуюча папка');
+define('lang_Confirm_Folder_del', 'Впевнені, що хочете видалити цю папку і всі файли в ній?');
+define('lang_Return_Files_List', 'Повернутися до списку файлів');
+define('lang_Preview', 'Перегляд');
+define('lang_Download', 'Завантажити');
+define('lang_Insert_Folder_Name', 'Введіть ім`я папки:');
+define('lang_Root', 'Коренева папка');
+define('lang_Rename', 'Переіменувати');
+define('lang_Back', 'назад');
+define('lang_View', 'Вигляд');
+define('lang_View_list', 'Список');
+define('lang_View_columns_list', 'Стовпчики');
+define('lang_View_boxes', 'Плиткою');
+define('lang_Toolbar', 'Панель');
+define('lang_Actions', 'Дії');
+define('lang_Rename_existing_file', 'Файл вже існує');
+define('lang_Rename_existing_folder', 'Папка вже існує');
+define('lang_Empty_name', 'Не заповнено ім`я');
+define('lang_Text_filter', 'фільтр');
+define('lang_Swipe_help', 'Наведіть на ім`я файлу/папки, щоб побачити опції');
+define('lang_Upload_base', 'Основне завантаження');
+define('lang_Upload_java', 'JAVA-завантаження (для файлів великих розмірів)');
+define('lang_Upload_java_help', "Якщо Java-апплет не завантажується: 1. переконайтесь, що Java встановлено на вашому комп`ютері, інакше <a href='http://java.com/en/download/'>[завантажте]</a> 2. переконайтесь, що фаєрвол нічого не блокує");
+define('lang_Upload_base_help', "Перетягніть файли в область, що вище або клікніть по ній мишкою (для сучасних браузерів), в іншому разі виберіть файл та натисніть кнопку. Коли завантаження закінчиться - натисніть кнопку повернення.");
+define('lang_Type_dir', 'папка');
+define('lang_Type', 'Тип');
+define('lang_Dimension', 'Розмір');
+define('lang_Size', 'Об`єм');
+define('lang_Date', 'Дата');
+define('lang_Filename', 'Ім`я файлу');
+define('lang_Operations', 'Дії');
+define('lang_Date_type', 'р-м-д');
+define('lang_OK', 'OK');
+define('lang_Cancel', 'Відміна');
+define('lang_Sorting', 'Сортування');
+define('lang_Show_url', 'show URL');
+define('lang_Extract', 'extract here');
+define('lang_File_info', 'file info');
+define('lang_Edit_image', 'edit image');
+define('lang_Duplicate', 'Duplicate');

adm/filemanager/plugin.min.js

@@ -6,4 +6,4 @@
  *
  * Contributing: https://github.com/trippo/ResponsiveFilemanager
  */
-tinymce.PluginManager.add("filemanager",function(e){function t(t,n,r,i){urltype=2;if(r=="image"){urltype=1}if(r=="media"){urltype=3}var s="RESPONSIVE FileManager";if(typeof e.settings.filemanager_title!=="undefined"&&e.settings.filemanager_title)s=e.settings.filemanager_title;var o="";var u="false";if(typeof e.settings.filemanager_sort_by!=="undefined"&&e.settings.filemanager_sort_by)o=e.settings.filemanager_sort_by;if(typeof e.settings.filemanager_descending!=="undefined"&&e.settings.filemanager_descending)u=e.settings.filemanager_descending;tinymce.activeEditor.windowManager.open({title:s,file:e.settings.external_filemanager_path+"dialog.php?type="+urltype+"&descending="+u+"&sort_by="+o+"&lang="+e.settings.language,width:860,height:570,resizable:true,maximizable:true,inline:1},{setUrl:function(n){var r=i.document.getElementById(t);r.value=e.convertURL(n);if("fireEvent"in r){r.fireEvent("onchange")}else{var s=document.createEvent("HTMLEvents");s.initEvent("change",false,true);r.dispatchEvent(s)}}})}tinymce.activeEditor.settings.file_browser_callback=t;return false})
+tinymce.PluginManager.add("filemanager",function(e){function t(t,n,r,i){urltype=2;if(r=="image"){urltype=1}if(r=="media"){urltype=3}var s="RESPONSIVE FileManager";if(typeof e.settings.filemanager_title!=="undefined"&&e.settings.filemanager_title)s=e.settings.filemanager_title;var o="";var u="false";if(typeof e.settings.filemanager_sort_by!=="undefined"&&e.settings.filemanager_sort_by)o=e.settings.filemanager_sort_by;if(typeof e.settings.filemanager_descending!=="undefined"&&e.settings.filemanager_descending)u=e.settings.filemanager_descending;tinymce.activeEditor.windowManager.open({title:s,file:e.settings.external_filemanager_path.replace(/\/\/filemanager/, '\/filemanager')+"dialog.php?type="+urltype+"&descending="+u+"&sort_by="+o+"&lang="+e.settings.language,width:860,height:570,resizable:true,maximizable:true,inline:1},{setUrl:function(n){var r=i.document.getElementById(t);r.value=e.convertURL(n);if("fireEvent"in r){r.fireEvent("onchange")}else{var s=document.createEvent("HTMLEvents");s.initEvent("change",false,true);r.dispatchEvent(s)}}})}tinymce.activeEditor.settings.file_browser_callback=t;return false})

adm/filemanager/upload.php

@@ -1,10 +1,12 @@
 <?php
 include('config/config.php');
-if ($_SESSION['verify'] != 'RESPONSIVEfilemanager') die('forbiden');
+if ($_SESSION['verify'] != 'RESPONSIVEfilemanager') {
+    die('forbiden');
+}
 include('include/utils.php');
 
-$_POST['path'] = $current_path.$_POST['path'];
-$_POST['path_thumb'] = $thumbs_base_path.$_POST['path_thumb'];
+$_POST['path'] = $current_path.str_replace('\0', '', $_POST['path']);
+$_POST['path_thumb'] = $thumbs_base_path.str_replace("\0", '', $_POST['path_thumb']);
 
 $storeFolder = $_POST['path'];
 $storeFolderThumb = $_POST['path_thumb'];
@@ -13,156 +15,131 @@ $path_pos = strpos($storeFolder, $current_path);
 $thumb_pos = strpos($_POST['path_thumb'], $thumbs_base_path);
 
 if ($path_pos === false || $thumb_pos === false
-	|| preg_match('/\.{1,2}[\/|\\\]/', $_POST['path_thumb']) !== 0
-	|| preg_match('/\.{1,2}[\/|\\\]/', $_POST['path']) !== 0)
-	die('wrong path');
+    || preg_match('/\.{1,2}[\/|\\\]/', $_POST['path_thumb']) !== 0
+    || preg_match('/\.{1,2}[\/|\\\]/', $_POST['path']) !== 0) {
+    die('wrong path');
+}
 
 $path = $storeFolder;
 $cycle = true;
 $max_cycles = 50;
 $i = 0;
-while ($cycle && $i < $max_cycles)
-{
-	$i++;
-	if ($path == $current_path) $cycle = false;
-	if (file_exists($path.'config.php'))
-	{
-		require_once($path.'config.php');
-		$cycle = false;
-	}
-	$path = fix_dirname($path).'/';
+while ($cycle && $i < $max_cycles) {
+    $i++;
+    if ($path == $current_path) {
+        $cycle = false;
+    }
+    if (file_exists($path.'config.php')) {
+        require_once($path.'config.php');
+        $cycle = false;
+    }
+    $path = fix_dirname($path).'/';
 }
 
-if (!empty($_FILES))
-{
-	$info = pathinfo($_FILES['file']['name']);
-	if (isset($info['extension']) && in_array(fix_strtolower($info['extension']), $ext))
-	{
-		$tempFile = $_FILES['file']['tmp_name'];
+if (!empty($_FILES)) {
+    $info = pathinfo($_FILES['file']['name']);
+    if (isset($info['extension']) && in_array(fix_strtolower($info['extension']), $ext)) {
+        $tempFile = $_FILES['file']['tmp_name'];
 
-		$targetPath = $storeFolder;
-		$targetPathThumb = $storeFolderThumb;
-		$_FILES['file']['name'] = fix_filename($_FILES['file']['name'], $transliteration);
+        $targetPath = $storeFolder;
+        $targetPathThumb = $storeFolderThumb;
+        $_FILES['file']['name'] = fix_filename($_FILES['file']['name'], $transliteration);
 
-		$file_name_splitted = explode('.', $_FILES['file']['name']);
-		array_pop($file_name_splitted);
-		$_FILES['file']['name'] = implode('-', $file_name_splitted).'.'.$info['extension'];
+        $file_name_splitted = explode('.', $_FILES['file']['name']);
+        array_pop($file_name_splitted);
+        $_FILES['file']['name'] = implode('-', $file_name_splitted).'.'.$info['extension'];
 
-		if (file_exists($targetPath.$_FILES['file']['name']))
-		{
-			$i = 1;
-			$info = pathinfo($_FILES['file']['name']);
-			while (file_exists($targetPath.$info['filename'].'_'.$i.'.'.$info['extension']))
-			{
-				$i++;
-			}
-			$_FILES['file']['name'] = $info['filename'].'_'.$i.'.'.$info['extension'];
-		}
-		$targetFile = $targetPath.$_FILES['file']['name'];
-		$targetFileThumb = $targetPathThumb.$_FILES['file']['name'];
-
-        /************ FIX UPLOAD NO-IMAGE FILES **************/
-		if (in_array(fix_strtolower($info['extension']), $ext_img) && @getimagesize($tempFile) != false)
-			$is_img = true;
-        elseif (in_array(fix_strtolower($info['extension']), $ext_file))
-            {
-                $is_img = false;
-                $is_file = true;
-            }
-		else
-            {
-			    $is_img = false;
-                $is_file = false;
+        if (file_exists($targetPath.$_FILES['file']['name'])) {
+            $i = 1;
+            $info = pathinfo($_FILES['file']['name']);
+            while (file_exists($targetPath.$info['filename'].'_'.$i.'.'.$info['extension'])) {
+                $i++;
             }
+            $_FILES['file']['name'] = $info['filename'].'_'.$i.'.'.$info['extension'];
+        }
+        $targetFile = $targetPath.$_FILES['file']['name'];
+        $targetFileThumb = $targetPathThumb.$_FILES['file']['name'];
 
-        if ($is_file) {
+        if (in_array(fix_strtolower($info['extension']), $ext_img) && @getimagesize($tempFile) != false) {
+            $is_img = true;
+        } else {
+            $is_img = false;
+        }
+
+        if ($is_img) {
             move_uploaded_file($tempFile, $targetFile);
             chmod($targetFile, 0755);
+
             $memory_error = false;
+            if (!create_img_gd($targetFile, $targetFileThumb, 122, 91)) {
+                $memory_error = false;
+            } else {
+                if (!new_thumbnails_creation($targetPath, $targetFile, $_FILES['file']['name'], $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height)) {
+                    $memory_error = false;
+                } else {
+                    $imginfo = getimagesize($targetFile);
+                    $srcWidth = $imginfo[0];
+                    $srcHeight = $imginfo[1];
+
+                    if ($image_resizing) {
+                        if ($image_resizing_width == 0) {
+                            if ($image_resizing_height == 0) {
+                                $image_resizing_width = $srcWidth;
+                                $image_resizing_height = $srcHeight;
+                            } else {
+                                $image_resizing_width = $image_resizing_height * $srcWidth / $srcHeight;
+                            }
+                        } elseif ($image_resizing_height == 0) {
+                            $image_resizing_height = $image_resizing_width * $srcHeight / $srcWidth;
+                        }
+                        $srcWidth = $image_resizing_width;
+                        $srcHeight = $image_resizing_height;
+                        create_img_gd($targetFile, $targetFile, $image_resizing_width, $image_resizing_height);
+                    }
+                    //max resizing limit control
+                    $resize = false;
+                    if ($image_max_width != 0 && $srcWidth > $image_max_width) {
+                        $resize = true;
+                        $srcHeight = $image_max_width * $srcHeight / $srcWidth;
+                        $srcWidth = $image_max_width;
+                    }
+                    if ($image_max_height != 0 && $srcHeight > $image_max_height) {
+                        $resize = true;
+                        $srcWidth = $image_max_height * $srcWidth / $srcHeight;
+                        $srcHeight = $image_max_height;
+                    }
+                    if ($resize) {
+                        create_img_gd($targetFile, $targetFile, $srcWidth, $srcHeight);
+                    }
+                }
+            }
+            if ($memory_error) {
+                //error
+                unlink($targetFile);
+                header('HTTP/1.1 406 Not enought Memory', true, 406);
+                exit();
+            }
+        } else {
+            move_uploaded_file($tempFile, $targetFile);
+            chmod($targetFile, 0755);
         }
-		elseif ($is_img)
-        /******************* END FIX **********************/
-		{
-			move_uploaded_file($tempFile, $targetFile);
-			chmod($targetFile, 0755);
-
-			$memory_error = false;
-			if (!create_img_gd($targetFile, $targetFileThumb, 122, 91))
-				$memory_error = false;
-			else
-			{
-				if (!new_thumbnails_creation($targetPath, $targetFile, $_FILES['file']['name'], $current_path, $relative_image_creation, $relative_path_from_current_pos, $relative_image_creation_name_to_prepend, $relative_image_creation_name_to_append, $relative_image_creation_width, $relative_image_creation_height, $fixed_image_creation, $fixed_path_from_filemanager, $fixed_image_creation_name_to_prepend, $fixed_image_creation_to_append, $fixed_image_creation_width, $fixed_image_creation_height))
-					$memory_error = false;
-				else
-				{
-					$imginfo = getimagesize($targetFile);
-					$srcWidth = $imginfo[0];
-					$srcHeight = $imginfo[1];
-
-					if ($image_resizing)
-					{
-						if ($image_resizing_width == 0)
-						{
-							if ($image_resizing_height == 0)
-							{
-								$image_resizing_width = $srcWidth;
-								$image_resizing_height = $srcHeight;
-							} else
-								$image_resizing_width = $image_resizing_height * $srcWidth / $srcHeight;
-						} elseif ($image_resizing_height == 0)
-							$image_resizing_height = $image_resizing_width * $srcHeight / $srcWidth;
-						$srcWidth = $image_resizing_width;
-						$srcHeight = $image_resizing_height;
-						create_img_gd($targetFile, $targetFile, $image_resizing_width, $image_resizing_height);
-					}
-					//max resizing limit control
-					$resize = false;
-					if ($image_max_width != 0 && $srcWidth > $image_max_width)
-					{
-						$resize = true;
-						$srcHeight = $image_max_width * $srcHeight / $srcWidth;
-						$srcWidth = $image_max_width;
-					}
-					if ($image_max_height != 0 && $srcHeight > $image_max_height)
-					{
-						$resize = true;
-						$srcWidth = $image_max_height * $srcWidth / $srcHeight;
-						$srcHeight = $image_max_height;
-					}
-					if ($resize)
-						create_img_gd($targetFile, $targetFile, $srcWidth, $srcHeight);
-				}
-			}
-			if ($memory_error)
-			{
-				//error
-				unlink($targetFile);
-				header('HTTP/1.1 406 Not enought Memory', true, 406);
-				exit();
-			}
-		}
-	} else
-	{
-		header('HTTP/1.1 406 file not permitted', true, 406);
-		exit();
-	}
-} else
-{
-	header('HTTP/1.1 405 Bad Request', true, 405);
-	exit();
+    } else {
+        header('HTTP/1.1 406 file not permitted', true, 406);
+        exit();
+    }
+} else {
+    header('HTTP/1.1 405 Bad Request', true, 405);
+    exit();
 }
-if (isset($_POST['submit']))
-{
-	$query = http_build_query(
-		array(
-			'type' => $_POST['type'],
-			'lang' => $_POST['lang'],
-			'popup' => $_POST['popup'],
-			'field_id' => $_POST['field_id'],
-			'fldr' => $_POST['fldr'],
-		)
-	);
-	header('location: dialog.php?'.$query);
+if (isset($_POST['submit'])) {
+    $query = http_build_query(
+        array(
+            'type' => $_POST['type'],
+            'lang' => $_POST['lang'],
+            'popup' => $_POST['popup'],
+            'field_id' => $_POST['field_id'],
+            'fldr' => $_POST['fldr'],
+        )
+    );
+    header('location: dialog.php?'.$query);
 }
-
-?>      

adm/filemanager/uploader/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2016 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;

adm/themes/default/template/controllers/cart_rules/actions.tpl

@@ -79,25 +79,25 @@
 	<div class="col-lg-7">
 		<p class="radio">
 			<label for="apply_discount_to_order">
-				<input type="radio" name="apply_discount_to" id="apply_discount_to_order" value="order"{if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == 0} checked="checked"{/if} />
+				<input type="radio" name="apply_discount_to" id="apply_discount_to_order" value="order" {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == 0} checked="checked"{/if} />
 				 {l s='Order (without shipping)'}
 			</label>
 		</p>
 		<p class="radio">
 			<label for="apply_discount_to_product">
-				<input type="radio" name="apply_discount_to" id="apply_discount_to_product" value="specific"{if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval > 0} checked="checked"{/if} />
+				<input type="radio" name="apply_discount_to" id="apply_discount_to_product" value="specific" {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval > 0} checked="checked"{/if} />
 				{l s='Specific product'}
 			</label>
 		</p>
 		<p class="radio">
 			<label for="apply_discount_to_cheapest">
-				<input type="radio" name="apply_discount_to" id="apply_discount_to_cheapest" value="cheapest"{if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -1} checked="checked"{/if} />
+				<input type="radio" name="apply_discount_to" id="apply_discount_to_cheapest" value="cheapest" {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -1} checked="checked"{/if} />
 				 {l s='Cheapest product'}
 			</label>
 		</p>
 		<p class="radio">
 			<label for="apply_discount_to_selection">
-				<input type="radio" name="apply_discount_to" id="apply_discount_to_selection" value="selection"{if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -2} checked="checked"{/if}{if $product_rule_groups|@count == 0}disabled="disabled"{/if} />
+				<input type="radio" name="apply_discount_to" id="apply_discount_to_selection" value="selection" {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -2} checked="checked"{/if}{if $product_rule_groups|@count == 0}disabled="disabled"{/if} />
 				{l s='Selected product(s)'}{if $product_rule_groups|@count == 0}&nbsp;<span id="apply_discount_to_selection_warning" class="text-muted clearfix"><i class="icon-warning-sign"></i> <a href="#" id="apply_discount_to_selection_shortcut">{l s='You must select some products before'}</a></span>{/if}
 			</label>
 		</p>

adm/themes/default/template/controllers/customer_threads/helpers/view/message.tpl

@@ -54,6 +54,24 @@
 		{/if}
 		<span class="message-date">&nbsp;<i class="icon-calendar"></i> - {dateFormat date=$message.date_add full=0} - <i class="icon-time"></i> {$message.date_add|substr:11:5}</span>
 		{if isset($message.file_name)} <span class="message-attachment">&nbsp;<i class="icon-link"></i> <a href="{$message.file_name|escape:'html':'UTF-8'}" target="_blank">{l s="Attachment"}</a></span>{/if}
+		
+		{if $type == 'customer'}
+			{if $message.id_product!=0}
+				<br />
+				<br />
+				<p class="message-item-product message-date">
+				{l s='Related product #'}<a href="index.php?tab=AdminProducts&amp;id_product={$message.id_product}&amp;updateproduct&amp;token={getAdminToken tab='AdminProducts'}" title="{l s='View product'}" target='_blank'>{$message.id_product} - {$message.product_name|escape:'html':'UTF-8'} <img src="../img/admin/search.gif" alt="{l s='View'}" /></a>
+				</p>
+			{else}
+				<br />
+				<br />
+				<p class="message-item-product message-date">
+				- {l s='no product selected by this customer'} -
+				</p>
+
+			{/if}
+			<br />
+		{/if}
 		<p class="message-item-text">{$message.message|escape:'html':'UTF-8'}</p>
 	</div>
 </div>

classes/CartRule.php

@@ -299,7 +299,7 @@ class CartRuleCore extends ObjectModel
 						continue 2;
 				unset($result[$key]);
 			}
-	
+
 		if (isset($cart) && isset($cart->id))
 			foreach ($result as $key => $cart_rule)
 				if ($cart_rule['product_restriction'])
@@ -599,13 +599,16 @@ class CartRuleCore extends ObjectModel
 				if ($otherCartRule['gift_product'])
 					--$nb_products;
 
-				if ($this->cart_rule_restriction && $otherCartRule['cart_rule_restriction'] && $otherCartRule['id_cart_rule'] != $this->id)
+				// ANTADIS FIX : if any restriction from one cart rule or the other, check it !!!
+				//if ($this->cart_rule_restriction && $otherCartRule['cart_rule_restriction'] && $otherCartRule['id_cart_rule'] != $this->id)
+				if (($this->cart_rule_restriction || $otherCartRule['cart_rule_restriction']) && $otherCartRule['id_cart_rule'] != $this->id)
 				{
 					$combinable = Db::getInstance()->getValue('
 					SELECT id_cart_rule_1
 					FROM '._DB_PREFIX_.'cart_rule_combination
 					WHERE (id_cart_rule_1 = '.(int)$this->id.' AND id_cart_rule_2 = '.(int)$otherCartRule['id_cart_rule'].')
 					OR (id_cart_rule_2 = '.(int)$this->id.' AND id_cart_rule_1 = '.(int)$otherCartRule['id_cart_rule'].')');
+					// ANTADIS COMMENT : (no change but clarification)
 					if (!$combinable)
 					{
 						$cart_rule = new CartRule((int)$otherCartRule['id_cart_rule'], $context->cart->id_lang);

classes/controller/AdminController.php

@@ -3317,20 +3317,24 @@ class AdminControllerCore extends Controller
 							$delete_ok = false;
 						}
 					}
-					else
+					else {
 						if (!$to_delete->delete())
 						{
 							$result = false;
 							$delete_ok = false;
 						}
+					}
 					
-					if ($delete_ok)
+					if ($delete_ok) {
 						PrestaShopLogger::addLog(sprintf($this->l('%s deletion', 'AdminTab', false, false), $this->className), 1, null, $this->className, (int)$to_delete->id, true, (int)$this->context->employee->id);
-					else
+					}
+					else {
 						$this->errors[] = sprintf(Tools::displayError('Can\'t delete #%d'), $id);
+					}
 				}
-				if ($result)
+				if ($result) {
 					$this->redirect_after = self::$currentIndex.'&conf=2&token='.$this->token;
+				}
 				$this->errors[] = Tools::displayError('An error occurred while deleting this selection.');
 			}
 		}

config/config.inc.php

@@ -233,3 +233,6 @@ define('_PS_OS_WS_PAYMENT_', Configuration::get('PS_OS_WS_PAYMENT'));
 /* Get smarty */
 require_once(dirname(__FILE__).'/smarty.config.inc.php');
 $context->smarty = $smarty;
+
+define("CARTSGURU_IMAGE_SIZE",  "small_default");
+

config/defines.inc.php

@@ -28,14 +28,15 @@
 if (!defined('_PS_MODE_DEV_'))
 {
 	$authorized_ip = array(
-		'88.120.248.124',
-		'80.13.158.176',
-		'90.63.178.63',
-		'88.163.22.99'
+		 '88.120.248.124',
+		 '80.13.158.176',
+	//	 '90.63.178.63',
+		 '88.163.22.99',
+		 '127.0.0.1'
 	);
 	if(in_array($_SERVER['REMOTE_ADDR'], $authorized_ip))
 	{
-		define('_PS_MODE_DEV_', true);
+		define('_PS_MODE_DEV_', false);
 	}
 	else
 	{
@@ -50,14 +51,20 @@ if (_PS_MODE_DEV_)
 	@ini_set('display_errors', 'on');
 	@error_reporting(E_ALL | E_STRICT);
 	define('_PS_DEBUG_SQL_', true);
+	if (isset($_GET['profiling'])) {
+		define('_PS_DEBUG_PROFILING_', true);
+	}
+	else {
+		define('_PS_DEBUG_PROFILING_', false);
+	}
 }
 else
 {
 	@ini_set('display_errors', 'off');
 	define('_PS_DEBUG_SQL_', false);
+	define('_PS_DEBUG_PROFILING_', false);
 }
 
-define('_PS_DEBUG_PROFILING_', false);
 define('_PS_MODE_DEMO_', false);
 
 $currentDir = dirname(__FILE__);
@@ -80,7 +87,7 @@ if (!defined('_PS_ROOT_DIR_') && (getenv('_PS_ROOT_DIR_') || getenv('REDIRECT__P
 /* Directories */
 if (!defined('_PS_ROOT_DIR_'))
 {
-	define('_PS_ROOT_DIR_', realpath($currentDir.'/..'));
+	define('_PS_ROOT_DIR_', realpath($currentDir.'/..') . '/');
 
 	if (!defined('_PS_CORE_DIR_'))
 		define('_PS_CORE_DIR_', _PS_ROOT_DIR_);

controllers/admin/AdminInvoicesController.php

@@ -110,7 +110,8 @@ class AdminInvoicesControllerCore extends AdminController
 					'name' => 'date_to',
 					'maxlength' => 10,
 					'required' => true,
-					'hint' => $this->l('Format: 2012-12-31 (inclusive).')
+					'hint' => $this->l('Format: 2012-12-31 (inclusive).'),
+					'desc' => $this->l('Intervalle de 31 jours maximum entre les 2 dates.')
 				)
 			),
 			'submit' => array(
@@ -223,6 +224,17 @@ class AdminInvoicesControllerCore extends AdminController
 			if (!Validate::isDate(Tools::getValue('date_to')))
 				$this->errors[] = $this->l('Invalid "To" date');
 
+			// antadis 12268 - impose a limit to 1 months max to generate invoices (32 days in case users selected for example "01/01" and "01/02")
+			$date_from = Tools::getValue('date_from');
+			$date_to = Tools::getValue('date_to');
+			
+			$d_from = new DateTime($date_from);
+			$d_to = new DateTime($date_to);
+			$interval = $d_from->diff($d_to);
+			if ($interval->days>31) {
+				$this->errors[] = $this->l('Les factures ne peuvent être générées que pour une période de 31 jours maximum.');	
+			}
+
 			if (!count($this->errors))
 			{
 				if (count(OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'))))

controllers/admin/AdminPdfController.php

@@ -36,6 +36,9 @@ class AdminPdfControllerCore extends AdminController
 
 	public function initProcess()
 	{
+		set_time_limit(360);
+		ini_set('memory_limit', '512M');
+
 		parent::initProcess();
 		$this->checkCacheFolder();
 		$access = Profile::getProfileAccess($this->context->employee->id_profile, (int)Tab::getIdFromClassName('AdminOrders'));

modules/advsendtoafriend/sendtoafriend-extra.tpl

@@ -16,7 +16,7 @@ $('document').ready(function(){
 				{/literal}url: "{$module_dir}sendtoafriend_ajax.php",{literal}
 				type: "POST",
 				headers: {"cache-control": "no-cache"},
-				data: {action: 'sendToMyFriend', secure_key: '{/literal}{$astf_secure_key}{literal}', name: name, email: email, id_product: id_product},{/literal}{literal}
+				data: {action: 'sendToMyFriend', secure_key: '{/literal}{if isset($astf_secure_key)}{$astf_secure_key}{/if}{literal}', name: name, email: email, id_product: id_product},{/literal}{literal}
 				dataType: "json",
 				success: function(result) {
 					$.fancybox.close();

modules/advslider/advslider.php

@@ -0,0 +1,177 @@
+<?php
+
+if (!defined('_CAN_LOAD_FILES_'))
+    exit;
+
+include_once(dirname(__FILE__) . '/classes/AdvSlide.php');
+
+class AdvSlider extends Module
+{
+    public function __construct()
+    {
+        $this->name = 'advslider';
+        $this->tab = 'front_office_features';
+        $this->version = '1.0';
+        $this->author = 'Antadis';
+        $this->need_instance = 0;
+
+        $this->bootstrap = true;
+        parent::__construct();
+
+        $this->displayName = $this->l('Slider avancé');
+        $this->description = $this->l('Gestion du slider avec spécificités PrivilegeDeMarque');
+    }
+
+    public function install()
+    {
+        $sql = array();
+
+        $sql[] =
+            'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'advslider` (
+              `id_slide` int(10) unsigned NOT NULL auto_increment,
+              `position` INT(11) UNSIGNED NOT NULL default 0,
+              `active` INT(11) UNSIGNED NOT NULL default 1,
+              `light` INT(11) UNSIGNED NOT NULL default 1,
+              PRIMARY KEY  (`id_slide`)
+            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8';
+            
+        $sql[] =
+            'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'advslider_lang` (
+              `id_slide` int(10) unsigned NOT NULL,
+              `id_lang` int(10) unsigned NOT NULL,
+              `title` varchar(255) NOT NULL,
+              `subtitle` varchar(255) NOT NULL,
+              `label` varchar(255) NOT NULL,
+              `url` varchar(255),
+              `description` TEXT,
+              PRIMARY KEY (`id_slide`,`id_lang`)
+            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8';
+
+        $sql[] =
+            'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'advslider_shop` (
+              `id_slide` int(10) unsigned NOT NULL auto_increment,
+              `id_shop` int(10) unsigned NOT NULL,
+              PRIMARY KEY (`id_slide`, `id_shop`)
+            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8';
+            
+        $sql[] = 'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'advslider_group` (
+                `id_slide` int(11) NOT NULL,
+                `id_group` int(11) NOT NULL
+            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8';
+    
+        $sql[] = "ALTER TABLE `ps_advslider` ADD `start_at` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `light`,
+            ADD `end_at` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `start_at`;";
+        
+        foreach ($sql as $_sql) {
+            Db::getInstance()->Execute($_sql);
+        }
+
+        $tab = new Tab();
+        $tab->class_name = 'AdminAdvSlider';
+        $tab->id_parent = Tab::getCurrentParentId();
+        $tab->module = $this->name;
+        $languages = Language::getLanguages();
+        foreach ($languages as $language) {
+            $tab->name[$language['id_lang']] = 'Slider';
+        }
+
+        $img_dir = _PS_IMG_DIR_ . 'slider';
+        $folder = is_dir($img_dir);
+        if (!$folder) {
+            $folder = mkdir($img_dir, 0755, true);
+        }
+
+        return parent::install()
+            && $tab->add()
+            && $this->registerHook('displaySlider')
+            && $this->registerHook('displayHeader')
+            && $this->registerHook('actionRefreshSlider')
+            && $folder;
+    }
+
+    public function uninstall()
+    {
+        $sql = 'DROP TABLE IF EXISTS
+            `' . _DB_PREFIX_ . 'advslider_lang`,
+            `' . _DB_PREFIX_ . 'advslider_shop`,
+            `' . _DB_PREFIX_ . 'advslider`,
+            `' . _DB_PREFIX_ . 'advslider_group`
+        ';
+        
+        Db::getInstance()->Execute($sql);
+
+        $idTab = Tab::getIdFromClassName('AdminAdvSlider');
+        if ($idTab) {
+            $tab = new Tab($idTab);
+            $tab->delete();
+        }
+        
+        return parent::uninstall();
+    }
+
+    public function getHookController($hook_name)
+    {
+        // Include the controller file
+        require_once(dirname(__FILE__).'/controllers/hook/'. $hook_name.'.php');
+        
+        // Build dynamically the controller name
+        $controller_name = $this->name.$hook_name.'Controller';
+        
+        // Instantiate controller
+        $controller = new $controller_name($this, __FILE__, $this->_path);
+        
+        // Return the controller
+        return $controller;
+    }
+    
+    public function getContent()
+    {
+        $ajax_hook = Tools::getValue('ajax_hook');
+        if ($ajax_hook != '') {
+            $ajax_method = 'hook'.ucfirst($ajax_hook);
+            if (method_exists($this, $ajax_method)) {
+                die($this->{$ajax_method}(array()));
+            }
+        }
+        
+        $controller = $this->getHookController('getContent');
+        return $controller->run();
+    }
+    
+    public function hookDisplaySlider($params)
+    {
+        $cacheEnabled = false;
+        
+        if (!$cacheEnabled || !$this->isCached('advslider.tpl', $this->getCacheId())) {
+            $slides = AdvSlide::getSlides();
+
+            if (!$slides) {
+                return false;
+            }
+
+            $this->smarty->assign('slides', $slides);
+            
+            return $this->display(__FILE__, 'advslider.tpl');
+        }
+        
+        return $this->display(__FILE__, 'advslider.tpl', $this->getCacheId());
+    }
+
+    public function hookHeader($params)
+    {
+        $jsFiles =  $this->context->controller->js_files;
+        foreach($jsFiles as $jsFile) {
+            if(strpos($jsFile, 'flexslider') !== false) {
+                return false;
+            }
+        }
+
+        $this->context->controller->addJS($this->_path.'js/flexslider.js');
+    }
+
+    public function hookActionRefreshSlider()
+    {
+        $this->_clearCache('advslider');
+    }
+
+}

modules/advslider/classes/AdvSlide.php

@@ -0,0 +1,253 @@
+<?php
+
+class AdvSlide extends ObjectModel
+{
+    public $id_slide;
+    public $position;
+    public $active;
+
+    public $title;
+    public $subtitle;
+    public $label;
+    public $url;
+    public $description;
+    public $light;
+    public $start_at;
+    public $end_at;
+    
+    public static $definition = array(
+        'table' => 'advslider',
+        'primary' => 'id_slide',
+        'multilang' => TRUE,
+        'fields' => array(
+            'id_slide'      => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
+            'position'      => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
+            'active'        => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
+            'light'         => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
+            'start_at'      => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+            'end_at'        => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
+
+            // Lang fields
+            'title'         => array('type' => self::TYPE_STRING, 'lang' => TRUE, 'validate' => 'isGenericName', 'size' => 255),
+            'subtitle'      => array('type' => self::TYPE_HTML, 'lang' => TRUE, 'validate' => 'isCleanHtml', 'size' => 255),
+            'label'         => array('type' => self::TYPE_STRING, 'lang' => TRUE, 'validate' => 'isGenericName', 'size' => 255),
+            'url'           => array('type' => self::TYPE_STRING, 'lang' => TRUE, 'validate' => 'isUrl', 'size' => 255),
+            'description'   => array('type' => self::TYPE_STRING, 'lang' => TRUE, 'validate' => 'isCleanHtml')
+        ),
+        'associations' => array(
+            'groups'        => array('type' => self::HAS_MANY, 'field' => 'id_group', 'object' => 'Group', 'association' => 'advslider_group'),
+        ),
+    );
+
+    public function __construct($id = NULL, $id_lang = NULL, $id_shop = NULL)
+    {
+        parent::__construct($id, $id_lang, $id_shop);
+
+        $this->image_dir = _PS_IMG_DIR_ . 'slider/';
+        
+        if (!file_exists(_PS_TMP_IMG_DIR_)) {
+            mkdir(_PS_TMP_IMG_DIR_, 755);
+        }
+    }
+
+    public function add($null_values = false, $autodate = true)
+    {
+        $result = parent::add($null_values, $autodate);
+        Hook::exec('actionRefreshSlider');
+
+        return $result;
+    }
+
+    public function update($null_values = FALSE)
+    {
+        $result = parent::update($null_values);
+        Hook::exec('actionRefreshSlider');
+
+        return $result;
+    }
+    
+    public function updateGroups($data)
+    {
+        $dataToInsert = array();
+        if (count($data) > 0) {
+            // Reset
+            Db::getInstance()->delete('advslider_group', 'id_slide='.(int)$this->id);
+            // Prepare update
+            foreach($data as $k => $v) {
+                $dataToInsert[] = array(
+                    'id_slide' => $this->id,
+                    'id_group' => $v,
+                );
+            }
+        }
+
+        if (count($dataToInsert) > 0) {
+            Db::getInstance()->insert('advslider_group', $dataToInsert);
+        }
+    }
+
+    public function delete($null_values = FALSE)
+    {
+        $result = parent::delete($null_values);
+        Hook::exec('actionRefreshSlider');
+
+        return $result;
+    }
+
+    public static function getSlides()
+    {
+        $context = Context::getContext();
+        
+        $sql = 'SELECT * FROM `'._DB_PREFIX_.'advslider` adv
+            JOIN `'._DB_PREFIX_.'advslider_lang` advl ON (adv.`id_slide` = advl.`id_slide` AND id_lang='. (int)$context->language->id .')
+            WHERE adv.`active` = 1';
+
+        // Check user group
+        if (Configuration::get('ADVSLIDER_RESTRICT_GROUP')) {
+            $groups = Customer::getGroupsStatic($context->customer->id);
+            if ($context->customer->logged == 0) {
+                $groups = array(Configuration::get('ADVSLIDER_DEFAULT_GROUP'));
+            }
+            
+            $sql.= ' AND adv.`id_slide` IN (SELECT `id_slide` FROM `'._DB_PREFIX_.'advslider_group` ag WHERE ag.id_group IN('.join(',', $groups).'))';
+        }
+        
+        // Check date
+        if (Configuration::get('ADVSLIDER_RESTRICT_DATE')) {
+            $sql.= ' AND adv.`start_at` < NOW() AND adv.`end_at` > NOW() ';
+        }
+        
+        $sql.= ' ORDER BY `position` ASC';
+
+        $slides = Db::getInstance()->executeS($sql);
+
+        // Remove slider without image
+        if (count($slides) > 0) {
+            foreach($slides as $key => $slide) {
+                if(!file_exists(_PS_IMG_DIR_ . 'slider/' . $slide['id_slide'] . '.jpg')) {
+                    unset($slides[$key]);
+                }
+            }
+        }
+        
+        return $slides;
+    }
+    
+    public static function getGroupsFormatted($id_slide)
+    {
+        $groups = array();
+        $result = Db::getInstance()->executeS('SELECT `id_group` FROM `'._DB_PREFIX_.'advslider_group` WHERE `id_slide`=');
+        if (count($result) > 0) {
+            foreach($result as $r) {
+                $groups[] = $r['id_group'];
+            }
+        }
+        
+        return $groups;
+    }
+    
+    public function getGroups()
+    {
+        $groups = Db::getInstance()->executeS('SELECT `id_group` FROM `'._DB_PREFIX_.'advslider_group` WHERE `id_slide`='.(int)$this->id);
+        
+        return $groups;
+    }
+
+    public function deleteImage($force_delete = false)
+    {
+        if (!$this->id) {
+            return false;
+        }
+
+        $imgToDelete = Tools::getValue('imgName', false);
+  
+        if ($imgToDelete === false) {
+            return parent::deleteImage($force_delete = false);
+        }
+
+        if ($force_delete || !$this->hasMultishopEntries()) {
+            /* Deleting object images and thumbnails (cache) */
+            
+            if ($this->image_dir) {
+                if (file_exists($this->image_dir.$this->id.'-'.$imgToDelete.'.'.$this->image_format)
+                    && !unlink($this->image_dir.$this->id.'-'.$imgToDelete.'.'.$this->image_format)) {
+                    return false;
+                }
+            }
+            if (file_exists(_PS_TMP_IMG_DIR_.$this->def['table'].'_'.$this->id.'-'.$imgToDelete.'.'.$this->image_format)
+                && !unlink(_PS_TMP_IMG_DIR_.$this->def['table'].'_'.$this->id.'-'.$imgToDelete.'.'.$this->image_format)) {
+                return false;
+            }
+            if (file_exists(_PS_TMP_IMG_DIR_.$this->def['table'].'_mini_'.$this->id.'-'.$imgToDelete.'.'.$this->image_format)
+                && !unlink(_PS_TMP_IMG_DIR_.$this->def['table'].'_mini_'.$this->id.'-'.$imgToDelete.'.'.$this->image_format)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public function cleanPositions()
+    {
+        return Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'advslider`
+            SET `position`= `position` - 1
+            WHERE `id_slide` = '.(int)$this->id_slide.'
+            AND `position` > '.(int)$this->position);
+    }
+
+    public function updatePosition($way, $position)
+    {
+        $sql = 'SELECT `position`, `id_slide`
+                FROM `'._DB_PREFIX_.'advslider`
+                ORDER BY `position` ASC';
+        if (!$res = Db::getInstance()->executeS($sql))
+            return false;
+
+        foreach ($res as $row)
+            if ((int)$row['id_slide'] == (int)$this->id_slide)
+                $moved_row = $row;
+
+        if (!isset($moved_row) || !isset($position))
+            return false;
+
+        // < and > statements rather than BETWEEN operator
+        // since BETWEEN is treated differently according to databases
+        $res = Db::getInstance()->execute('
+            UPDATE `'._DB_PREFIX_.'advslider`
+            SET `position`= `position` '.($way ? '- 1' : '+ 1').'
+            WHERE `position`
+            '.($way
+                ? '> '.(int)$moved_row['position'].' AND `position` <= '.(int)$position
+                : '< '.(int)$moved_row['position'].' AND `position` >= '.(int)$position)
+        )
+         && Db::getInstance()->execute('
+            UPDATE `'._DB_PREFIX_.'advslider`
+            SET `position` = '.(int)$position.'
+            WHERE `id_slide`='.(int)$moved_row['id_slide']
+        );
+        $this->refreshPositions();
+
+        Hook::exec('actionRefreshSlider');
+
+        return $res;
+    }
+
+    public function refreshPositions()
+    {
+        $sql = 'SELECT `id_slide`
+                FROM `'._DB_PREFIX_.'advslider`
+                ORDER BY `position` ASC';
+        if (!$blocks = Db::getInstance()->executeS($sql))
+            return false;
+
+        $pos=0;
+        foreach ($blocks as $block) {
+            Db::getInstance()->execute('
+                UPDATE `'._DB_PREFIX_.'advslider`
+                SET `position` = '.(int)$pos.'
+                WHERE `id_slide`='.(int)$block['id_slide']);
+            $pos++;
+        }
+    }
+
+}

modules/advslider/controllers/admin/AdminAdvSlider.php

@@ -0,0 +1,395 @@
+<?php
+include_once dirname(__FILE__).'/../../classes/AdvSlide.php';
+
+class AdminAdvSliderController extends ModuleAdminController
+{
+	public function __construct()
+	{
+		$this->table        = 'advslider';
+		$this->className    = 'AdvSlide';
+		$this->identifier   = 'id_slide';
+		$this->lang         = true;
+		$this->deleted      = false;
+		$this->bootstrap	= true;
+		$this->fieldImageSettings = array(
+			'name' => 'image',
+			'dir' => 'slider'
+		);
+		$this->position_identifier = 'id_slide';
+		$this->_defaultOrderBy = 'position';
+
+		parent::__construct();
+
+		$this->actions = array('edit', 'delete');
+
+		$this->fields_list = array(
+			'id_slide' => array(
+				'title' => 'ID',
+				'width' => 25
+			),
+			'image_desktop' => array(
+				'title'  => $this->module->l('Image'),
+				'image' => $this->fieldImageSettings['dir'],
+				'width' => 75
+			),
+			'title' => array(
+				'title'  => $this->module->l('Titre'),
+			),
+		    'active' => array(
+                'title' => $this->module->l('Actif'),
+                'type' => 'bool',
+		    ),
+		    'start_at' => array(
+		        'title'  => $this->module->l('Début'),
+		    ),
+		    'end_at' => array(
+		        'title'  => $this->module->l('Fin'),
+		    ),
+			'url' => array(
+				'title'  => $this->module->l('Url'),
+				'width' => 45,
+			),
+			'position' => array(
+				'title'     => $this->l('Position'),
+				'align'     => 'center',
+				'position'  => 'position',
+				'filter_key' => 'a!position'
+			),
+		);
+
+		if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL){
+			$this->_join .= 'JOIN `'._DB_PREFIX_.'advslider_shop` as ashop ON a.`id_slide` = ashop.`id_slide` AND ashop.`id_shop` IN ('.implode(', ', Shop::getContextListShopID()).') ';
+			$this->_group .= 'GROUP BY ashop.`id_slide`';
+		}
+
+	}
+
+	public function initPageHeaderToolbar()
+	{
+		parent::initPageHeaderToolbar();
+
+		if ($this->display != 'edit' && $this->display != 'add') {
+			$this->page_header_toolbar_btn['new_link'] = array(
+				'href' => self::$currentIndex.'&id_parent='.(int)Tools::getValue('id_slide').'&addadvslider&token='.$this->token,
+				'desc' => $this->l('Ajouter une nouvelle slide', NULL, NULL, FALSE),
+				'icon' => 'process-icon-new'
+			);
+		}
+	}
+
+	public function renderView()
+	{
+		return $this->renderList();
+	}
+
+	public function renderForm()
+	{
+		$this->fields_form = array(
+			'tinymce' => TRUE,
+			'legend' => array(
+				'title' => $this->className,
+			),
+			'submit' => array(
+				'name' => 'submitAdvSlider',
+				'title' => $this->l('Save'),
+			),
+			'input' => array(
+				array(
+					'type' => 'text',
+					'label' => $this->l('Titre'),
+					'name' => 'title',
+					'lang' => TRUE,
+				),
+				array(
+					'type' => 'text',
+					'label' => $this->l('Sous-titre'),
+					'name' => 'subtitle',
+					'lang' => TRUE,
+				),
+			    array(
+			        'type' => 'switch',
+			        'label' => $this->l('Activé'),
+			        'name' => 'active',
+			        'required' => FALSE,
+			        'is_bool' => TRUE,
+			        'default' => 1,
+			        'values' => array(
+			            array(
+			                'id' => 'active_on',
+			                'value' => 1,
+			                'label' => $this->l('Enabled')
+			            ),
+			            array(
+			                'id' => 'active_off',
+			                'value' => 0,
+			                'label' => $this->l('Disabled')
+			            )
+			        ),
+			    ),
+			    array(
+			        'type' => 'datetime',
+			        'label' => $this->l('Date de début'),
+			        'name' => 'start_at',
+			        'lang' => false,
+			    ),
+			    array(
+			        'type' => 'datetime',
+			        'label' => $this->l('Date de fin'),
+			        'name' => 'end_at',
+			        'lang' => false,
+			    ),
+			    array(
+			        'type' => 'checkbox',
+			        'label' => $this->l('Groupe(s) d\'utilisateur'),
+			        'name' => 'groups',
+			        'values' => array(
+                        'query' => array(
+                            array('id_group' => 3, 'name' => 'Particulier'),
+                            array('id_group' => 4, 'name' => 'Pro'),
+                        ),
+			            'id' => 'id_group',
+			            'name' => 'name',
+			        ),
+			        'expand' => array(
+			            'default' => 'show',
+			            'show' => array('text' => $this->l('show'), 'icon' => 'plus-sign-alt'),
+			            'hide' => array('text' => $this->l('hide'), 'icon' => 'minus-sign-alt')
+			        ),
+			    ),
+				array(
+					'type' => 'switch',
+					'label' => $this->l('Texte foncé ?'),
+					'name' => 'light',
+					'required' => FALSE,
+					'is_bool' => TRUE,
+					'default' => 1,
+					'values' => array(
+						array(
+							'id' => 'light_on',
+							'value' => 1,
+							'label' => $this->l('Enabled')
+						),
+						array(
+							'id' => 'light_off',
+							'value' => 0,
+							'label' => $this->l('Disabled')
+						)
+					),
+				),
+				array(
+					'type' => 'text',
+					'label' => $this->l('Label lien'),
+					'name' => 'label',
+					'lang' => TRUE
+				),
+				array(
+					'type' => 'text',
+					'label' => $this->l('Lien'),
+					'name' => 'url',
+					'lang' => TRUE
+				),
+				array(
+					'type' => 'textarea',
+					'label' => $this->l('Description'),
+					'name' => 'description',
+					'autoload_rte' => TRUE,
+					'lang' => TRUE
+				),
+				array(
+					'type' => 'shop',
+					'label' => $this->l('Shop'),
+					'form_group_class' => 'fieldhide input_association',
+					'name' => 'checkBoxShopAsso_advslider'
+				)
+			)
+		);
+   
+		$obj = $this->loadObject(true);
+
+		$selectedGroups = array();
+		
+		$image = false;
+		$image_url = '';
+		$image_size = '';
+
+		$image_mobile = false;
+		$image_url_mobile = '';
+		$image_size_mobile = '';
+		
+		if($obj) {
+		    // Groupes
+		    $selectedGroups = $obj->getGroups();
+		    if (count($selectedGroups) > 0) {
+		        foreach ($selectedGroups as $id) {
+		            $this->fields_value['groups_'.$id['id_group']] = 'on';
+		        }
+		    }
+		    
+		    // Images
+			$image = _PS_IMG_DIR_ . 'slider/' . $obj->id.'.jpg';
+			$image_url = ImageManager::thumbnail($image, $this->table.'_'.(int)$obj->id.'.'.$this->imageType, 350, $this->imageType, true, true);
+			$image_size = file_exists($image) ? filesize($image) / 1000 : false;
+
+			$image_mobile = _PS_IMG_DIR_ . 'slider/' . $obj->id.'-mobile.jpg';
+			$image_url_mobile = ImageManager::thumbnail($image_mobile, $this->table.'_'.(int)$obj->id.'-image_mobile.'.$this->imageType, 350, $this->imageType, true, true);
+			$image_size_mobile = file_exists($image_mobile) ? filesize($image_mobile) / 1000 : false;
+		}
+
+		$this->fields_form['input'][] = array(
+			'type' => 'file',
+			'label' => $this->l('Image'),
+		    'desc' => $this->l('Image - type: jpg,png - size: 940 x 300 px'),
+			'name' => 'image',
+			'display_image' => true,
+			'lang' => true,
+			'required' => true,
+			'image' => $image_url,
+			'size' => $image_size,
+			'delete_url' => self::$currentIndex.'&'.$this->identifier.'='.$this->object->id.'&token='.$this->token.'&deleteImage=1'
+		);
+
+		$this->fields_form['input'][] = array(
+			'type' => 'file',
+			'label' => $this->l('Image Mobile'),
+		    'desc' => $this->l('Image - type: jpg,png - size: 300 x 200 px'),
+			'name' => 'image_mobile',
+			'display_image' => true,
+			'lang' => true,
+			'required' => true,
+			'image' => $image_url_mobile,
+			'size' => $image_size_mobile,
+			'delete_url' => self::$currentIndex.'&'.$this->identifier.'='.$this->object->id.'&token='.$this->token.'&deleteImage=1&imgName=image_mobile'
+		);
+		
+		return parent::renderForm();
+	}
+
+	protected function copyFromPost(&$object, $table)
+	{
+		parent::copyFromPost($object, $table);
+		
+		if(Shop::isFeatureActive()) {
+			$object->id_shop_list = array();
+			foreach (Tools::getValue('checkBoxShopAsso_advslider') as $id_shop => $value) {
+				$object->id_shop_list[] = $id_shop;
+			}
+		}
+	}
+
+	public function postProcess()
+	{
+        if (Tools::getValue('deleteImage')) {
+            $this->processForceDeleteImage();
+            $this->refreshPreview();
+        }
+        
+        parent::postProcess();
+        
+        $obj = $this->loadObject(TRUE);
+        
+        // Groupes
+        $groupsData = array();
+        foreach ($_POST as $pKey => $pValue) {
+            $groupKey = 'groups_';
+            if (substr($pKey, 0, strlen($groupKey)) == $groupKey && $pValue == 'on') {
+                 $groupsData[] = substr($pKey, strlen($groupKey));
+            }
+        }
+        if (count($groupsData) > 0) {
+            $obj->updateGroups($groupsData);
+        }
+
+        // Images
+        $images = array(
+            'image_mobile' => 'mobile',
+        );
+        foreach($images as $imageName => $suffix) {
+            if(isset($_FILES[$imageName]) && !empty($_FILES[$imageName]['tmp_name'])) {
+                $fileTemp = $_FILES[$imageName]['tmp_name'];
+                $fileParts = pathinfo($_FILES[$imageName]['name']);
+                $extension = $fileParts['extension'];
+                
+                if(file_exists(_PS_IMG_DIR_.'slider/'.$obj->id.'-'.$suffix.'.'.$extension)) {
+                    unlink(_PS_IMG_DIR_.'slider/'.$obj->id.'-'.$suffix.'.'.$extension);
+                }
+
+                if(in_array($extension, array('jpg', 'png'))) {
+                    $res = move_uploaded_file($fileTemp, _PS_IMG_DIR_.'slider/'.$obj->id.'-'.$suffix.'.'.$extension);
+                    if(!$res) {
+                        $this->errors[] = sprintf(Tools::displayError('An error occured during upload of file %s'), $obj->id.'.'.$extension);
+                    }
+                    else {
+                        if($extension == 'png') {
+                            ImageManager::resize(_PS_IMG_DIR_.'slider/'.$obj->id.'-'.$suffix.'.'.$extension, _PS_IMG_DIR_.'slider/'.$obj->id.'-'.$suffix.'.jpg');
+                        }
+                        $this->confirmations[] = sprintf($this->l('File %s has been uploaded'), $obj->id.'.'.$extension);
+                    }
+                }
+                else {
+                    $this->errors[] = sprintf(Tools::displayError('File %s have not good extension, only .jpg or .png'), $obj->id.'.'.$extension);
+                }
+            }
+        }
+    }
+
+	public function processForceDeleteImage()
+	{
+		$link = $this->loadObject(true);
+		
+		if (Validate::isLoadedObject($link)) {
+			$link->deleteImage(true);
+		}
+	}
+
+	protected function postImage($id)
+	{
+		$ret = parent::postImage($id);
+		$this->refreshPreview();
+
+		if (isset($_FILES) && count($_FILES) && $_FILES['image']['name'] != NULL && !empty($this->object->id) ) {
+			return TRUE;
+		}
+		return TRUE;
+	}
+
+	public function refreshPreview()
+	{
+		$current_preview = _PS_TMP_IMG_DIR_.'advslider_mini_'.$this->object->id_slide.'_'.$this->context->shop->id.'.jpg';
+		
+		if (file_exists($current_preview)) {
+			unlink($current_preview);
+		}
+	}
+
+	public function ajaxProcessUpdatePositions()
+	{
+		$way = (int)(Tools::getValue('way'));
+		$id = (int)(Tools::getValue('id'));
+		$positions = Tools::getValue('slide');
+		$obj = 'advslider';
+
+		if (is_array($positions)) {
+			foreach ($positions as $position => $value) {
+				$pos = explode('_', $value);
+
+				if (isset($pos[2]) && (int)$pos[2] === $id) {
+					$menu_obj = new AdvSlide((int)$pos[2]);
+
+					if (Validate::isLoadedObject($menu_obj)) {
+						if (isset($position) && $menu_obj->updatePosition($way, $position)) {
+							echo 'ok position '.(int)$position.' for '.$obj.' '.(int)$pos[2]."\r\n";
+						}
+						else {
+							echo '{"hasError" : true, "errors" : "Can not update '.$obj.' '.(int)$id.' to position '.(int)$position.' "}';
+						}
+					}
+					else {
+						echo '{"hasError" : true, "errors" : "This '.$obj.' ('.(int)$id.') cannot be loaded"}';
+					}
+					break;
+				}
+			}
+		}
+	}
+
+}

modules/advslider/controllers/hook/getContent.php

@@ -0,0 +1,126 @@
+<?php
+class AdvSliderGetContentController
+{
+    public function __construct($module, $file, $path)
+    {
+        $this->file = $file;
+        $this->module = $module;
+        $this->context = Context::getContext();
+        $this->_path = $path;
+    }
+    
+    public function processConfiguration()
+    {
+        if (Tools::isSubmit('submitAdvsliderconfig')) {
+            $enable_date = Tools::getValue('enable_date');
+            $enable_groups = Tools::getValue('enable_groups');
+            $default_group = Tools::getValue('default_group');
+            Configuration::updateValue('ADVSLIDER_RESTRICT_DATE', $enable_date);
+            Configuration::updateValue('ADVSLIDER_RESTRICT_GROUP', $enable_groups);
+            Configuration::updateValue('ADVSLIDER_DEFAULT_GROUP', $default_group);
+            $this->context->smarty->assign('confirmation', 'ok');
+        }
+    }
+    
+    public function renderForm()
+    {
+        $groups = Group::getGroups($this->context->language->id);
+        $optionGroups = array();
+        if (count($groups) > 0) {
+            foreach ($groups as $group) {
+                if (in_array($group['id_group'], array(1,2))) {
+                    continue;
+                }
+                $optionGroups[] = array(
+                    'id_group' => $group['id_group'],
+                    'name' => $group['name'],
+                );
+            }
+        }
+        
+        $fields_form = array(
+            'form' => array(
+                'legend' => array(
+                    'title' => $this->module->l('AdvSlider configuration'),
+                    'icon' => 'icon-envelope'
+                ),
+                'input' => array(
+                    array(
+                        'type' => 'switch',
+                        'label' => $this->module->l('Enable Date restriction:'),
+                        'name' => 'enable_date',
+                        'desc' => $this->module->l('Enable restriction by date.'),
+                        'values' => array(
+                            array('id' => 'enable_date_1', 'value' => 1, 'label' => $this->module->l('Enabled')),
+                            array('id' => 'enable_date_0', 'value' => 0, 'label' => $this->module->l('Disabled'))
+                        ),
+                    ),
+                    array(
+                        'type' => 'switch',
+                        'label' => $this->module->l('Enable Groups Restriction:'),
+                        'name' => 'enable_groups',
+                        'desc' => $this->module->l('Enable restriction by user groups.'),
+                        'values' => array(
+                            array('id' => 'enable_groups_1', 'value' => 1, 'label' => $this->module->l('Enabled')),
+                            array('id' => 'enable_groups_0', 'value' => 0, 'label' => $this->module->l('Disabled'))
+                        ),
+                        
+                    ),
+                    array(
+                        'type' => 'checkbox',
+                        'label' => $this->module->l('User group to display for restriction'),
+                        'name' => 'groups',
+                        'values' => array(
+                            'query' => $optionGroups,
+                            'id' => 'id_group',
+                            'name' => 'name',
+                        ),
+                        'expand' => array(
+                            'default' => 'show',
+                            'show' => array('text' => $this->module->l('show'), 'icon' => 'plus-sign-alt'),
+                            'hide' => array('text' => $this->module->l('hide'), 'icon' => 'minus-sign-alt')
+                        ),
+                    ),
+                    array(
+                        'type' => 'select',
+                        'label' => $this->module->l('Default group to display:'),
+                        'name' => 'default_group',
+                        'desc' => $this->module->l('Set a Default group to display slider with unauthenticated user.'),
+                        'options' =>  array(
+                            'query' => $optionGroups,
+                            'id' => 'id_group',
+                            'name' => 'name',
+                        ),
+                    ),
+                ),
+                'submit' => array('title' => $this->module->l('Save')),
+            )
+        );
+        
+        $helper = new HelperForm();
+        $helper->table = 'advslider';
+        $helper->default_form_language = (int)Configuration::get('PS_LANG_DEFAULT');
+        $helper->allow_employee_form_lang = (int)Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG');
+        $helper->submit_action = 'submitAdvsliderconfig';
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->module->name.'&tab_module='.$this->module->tab.'&module_name='.$this->module->name;
+        $helper->token = Tools::getAdminTokenLite('AdminModules');
+        $helper->tpl_vars = array(
+            'fields_value' => array(
+                'enable_date' => Tools::getValue('enable_date', Configuration::get('ADVSLIDER_RESTRICT_DATE')),
+                'enable_groups' => Tools::getValue('enable_groups', Configuration::get('ADVSLIDER_RESTRICT_GROUP')),
+                'default_group' => Tools::getValue('default_group', Configuration::get('ADVSLIDER_DEFAULT_GROUP')),
+            ),
+            'languages' => $this->context->controller->getLanguages()
+        );
+        
+        return $helper->generateForm(array($fields_form));
+    }
+    
+    public function run()
+    {
+        $this->processConfiguration();
+        $html_confirmation_message = $this->module->display($this->file, 'getContent.tpl');
+        $html_form = $this->renderForm();
+        return $html_confirmation_message.$html_form;
+    }
+}

modules/advslider/index.php

@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2014 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2014 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

modules/advslider/override/controllers/admin/templates/helpers/uploader/simple.tpl

@@ -0,0 +1,69 @@
+{if strpos($name, 'multilang') === false}
+    {include file='helpers/uploader/simple.tpl'}
+{else}
+    {assign var=languages value=Language::getLanguages(false)}
+    {if !isset($defaultFormLanguage)}
+        {assign var=defaultFormLanguage value=$languages[0].id_lang}
+    {/if}
+    <div class="row">
+        {foreach from=$languages item=language}
+            {if $languages|count > 1}
+                <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
+            {/if}
+                <div class="col-lg-6">
+               
+                    {foreach $files as $file}
+                        {if isset($file.image) && $file.type == 'image'}
+                        <div>
+                            {if !empty($file.image[$language['id_lang']])}
+                            {if Validate::isUrl($file.image[$language['id_lang']])}<img src="{$file.image[$language['id_lang']]}" class="img-thumbnail" />{else}{$file.image[$language['id_lang']]}{/if}
+                                {if isset($file.delete_url[$language['id_lang']])}<a href="{$file.delete_url[$language['id_lang']]}">{l s='Supprimer'}</a>{/if}
+                            
+                            {/if}
+                        </div>
+                        {/if}
+                    {/foreach}
+
+                    <input id="{$name}_{$language.id_lang}" type="file" name="{$name}_{$language.id_lang}" class="hide" />
+                    <div class="dummyfile input-group">
+                        <span class="input-group-addon"><i class="icon-file"></i></span>
+                        <input id="{$name}_{$language.id_lang}-name" type="text" class="disabled" name="filename" readonly />
+                        <span class="input-group-btn">
+                            <button id="{$name}_{$language.id_lang}-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
+                                <i class="icon-folder-open"></i> {l s='Choose a file'}
+                            </button>
+                        </span>
+                    </div>
+                </div>
+            {if $languages|count > 1}
+                <div class="col-lg-2">
+                    <button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
+                        {$language.iso_code}
+                        <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu">
+                        {foreach from=$languages item=lang}
+                        <li><a href="javascript:hideOtherLanguage({$lang.id_lang});" tabindex="-1">{$lang.name}</a></li>
+                        {/foreach}
+                    </ul>
+                </div>
+            {/if}
+            {if $languages|count > 1}
+                </div>
+            {/if}
+            <script>
+            $(document).ready(function(){
+                $('#{$name}_{$language.id_lang}-selectbutton').click(function(e){
+                    $('#{$name}_{$language.id_lang}').trigger('click');
+                });
+                $('#{$name}_{$language.id_lang}').change(function(e){
+                    var val = $(this).val();
+                    var file = val.split(/[\\/]/);
+                    $('#{$name}_{$language.id_lang}-name').val(file[file.length-1]);
+                });
+            });
+        </script>
+        {/foreach}
+    </div>
+
+{/if}

modules/advslider/views/templates/hook/advslider.tpl

@@ -0,0 +1 @@
+{$slides|p}

modules/advslider/views/templates/hook/getContent.tpl

@@ -0,0 +1,3 @@
+{if isset($confirmation)}
+    <div class="alert alert-success">{l s='Settings updated' mod='advslider'}</div>
+{/if}

modules/affilnet/order-confirmation.tpl

@@ -37,7 +37,7 @@
 	// End editable part
 </script>
 <noscript>
-	<img src="https://clic.reussissonsensemble.fr/TrackOrder.aspx?site=15580&event=sale&net_price={$total_paid_wt_ws}&order_id={$id_order}&rate_number=1&program_subid1={$status}&program_subid2={$payment}&voucher_code={$ids_discount}" />
+	<img src="https://clic.reussissonsensemble.fr/TrackOrder.aspx?site=15580&event=sale&net_price={$order->total_paid_tax_excl - $order->total_shipping_tax_excl}&order_id={$order->id}&rate_number=1&program_subid1={$customer_status}&program_subid2={$order->payment}&voucher_code={$ids_discount}" />
 </noscript>
 
 	{assign var=total_quantity value=0}
@@ -70,10 +70,10 @@
 	shipping_type: '',
 	payment_type: '{$order->payment}',
 	products: [
-		{foreach from=$order->products item=product}
+		{foreach from=$order->getProducts() item=product}
 		{
 			product_id: '{$product.id_product}',
-			product_name: '{$product.name}',
+			product_name: '',
 			product_price: {$product.price},
 			product_quantity: {$product.quantity}
 		}, 

modules/ant_export_privatesales_newsletter/controllers/admin/AdminExportPrivatesalesNewsletterController.php

@@ -23,6 +23,7 @@
         public $trackingSuffix;
         public $version = 1;
         public $subVersion = false;
+        public $enableV4header = false;
 
         public function __construct()
         {
@@ -37,12 +38,15 @@
             parent::__construct();
         }
 
-        public function postProcess(){
+        public function postProcess()
+        {
             parent::postProcess();
             if (Tools::isSubmit('submitNewsletterExportPart')
                 || Tools::isSubmit('submitNewsletterExportPartV2')
                 || Tools::isSubmit('submitNewsletterExportPartV3')
                 || Tools::isSubmit('submitNewsletterExportPartV4')
+                || Tools::isSubmit('submitNewsletterExportPartV5')
+                || Tools::isSubmit('submitNewsletterExportPartV6')
             ) {
                 $_GET['id_group'] = 3;
                 $this->trackingSuffix = 'PART';
@@ -63,19 +67,38 @@
                         $this->trackingSuffix = 'PART';
                         break;
                 }
+                // Disable
                 if (Tools::isSubmit('submitNewsletterExportPartV2')) {
                     $this->version = 2;
                 }
+                // Enable : Export Part - 1 vente en cours /ligne
                 if (Tools::isSubmit('submitNewsletterExportPartV3')) {
                     $this->version = 3;
+                    $this->enableV4header = true;
                 }
+                // Disable
                 if (Tools::isSubmit('submitNewsletterExportPartV4')) {
                     $this->version = 3;
                     $this->subVersion = true;
                 }
+                // Enable : Export Part - 2 ventes en cours /ligne
+                if (Tools::isSubmit('submitNewsletterExportPartV5')) {
+                    $this->version = 5;
+                    $this->subVersion = true;
+                }
+                // Enable : Export Pro - 2 ventes en cours /ligne
+                if (Tools::isSubmit('submitNewsletterExportPartV6')) {
+                    $this->version = 5;
+                    $_GET['id_group'] = 4;
+                    $this->subVersion = true;
+                    $this->trackingSuffix = 'PRO';
+                }
                 $this->exportNewsletter();
             }
-            elseif (Tools::isSubmit('submitNewsletterExportPro')){
+            // Enable : Export Pro - 1 vente en cours /ligne
+            elseif (Tools::isSubmit('submitNewsletterExportPro')) {
+                $this->version = 3;
+                $this->enableV4header = true;
                 $_GET['id_group'] = 4;
                 // reactiver la generation du tracking dans le cron si on veut utiliser le tracking PRO
                 $this->trackingSuffix = 'PRO';
@@ -93,8 +116,8 @@
             }
         }
 
-        public function renderForm(){
-
+        public function renderForm()
+        {
             $options = array(
                 array(
                     'id_option' => 0,
@@ -301,7 +324,7 @@
                 )
             );
 
-            $formExportPart = array(
+            /*$formExportPart = array(
                 'form' => array(
                     'legend' => array(
                         'title' => $this->l('Export PART - 2 ventes par ligne'),
@@ -313,9 +336,9 @@
                         'title' => $this->l('Export PART'),
                     ),
                 )
-            );
+            );*/
 
-            $formExportPartV2 = array(
+            /*$formExportPartV2 = array(
                 'form' => array(
                     'legend' => array(
                         'title' => $this->l('Export PART Version 2 - une vente/ligne'),
@@ -327,23 +350,23 @@
                         'title' => $this->l('Export PART V2'),
                     ),
                 )
-            );
+            );*/
 
             $formExportPartV3 = array(
                 'form' => array(
                     'legend' => array(
-                        'title' => $this->l('Export PART Version 3 - une vente/ligne - Newsletter light'),
+                        'title' => $this->l('Export PART - 1 vente en cours /ligne'),
                     ),
                     'input' => array(
                     ),
                     'submit' => array(
                         'name' => 'submitNewsletterExportPartV3',
-                        'title' => $this->l('Export PART LIGHT'),
+                        'title' => $this->l('Export'),
                     ),
                 )
             );
 
-            $formExportPartV4 = array(
+            /*$formExportPartV4 = array(
                 'form' => array(
                     'legend' => array(
                         'title' => $this->l('Export PART VERSION 4 - 2 VENTES/LIGNE - Newsletter LIGHT')
@@ -351,33 +374,63 @@
                     'input' => array(
                     ),
                     'submit' => array(
-                        'title' => $this->l('Export PART V4'),
+                        'title' => $this->l('Export'),
                         'name' => 'submitNewsletterExportPartV4'
                     ),
                 ),
-            );
+            );*/
 
             $formExportPro = array(
                 'form' => array(
                     'legend' => array(
-                        'title' => $this->l('Export PRO'),
+                        'title' => $this->l('Export PRO - 1 vente en cours /ligne'),
                     ),
                     'input' => array(
                     ),
                     'submit' => array(
-                        'name' => 'submitNewsletterExportPartV4',
-                        'title' => $this->l('Export PRO'),
+                        'name' => 'submitNewsletterExportPro',
+                        'title' => $this->l('Export'),
                     ),
                 )
             );
+            
+            $formExportPartV5 = array(
+                'form' => array(
+                    'legend' => array(
+                        'title' => $this->l('Export PART - 2 ventes en cours /ligne')
+                    ),
+                    'input' => array(
+                    ),
+                    'submit' => array(
+                        'title' => $this->l('Export'),
+                        'name' => 'submitNewsletterExportPartV5'
+                    ),
+                ),
+            );
+            
+            $formExportPartV6 = array(
+                'form' => array(
+                    'legend' => array(
+                        'title' => $this->l('Export PRO - 2 ventes en cours /ligne')
+                    ),
+                    'input' => array(
+                    ),
+                    'submit' => array(
+                        'title' => $this->l('Export'),
+                        'name' => 'submitNewsletterExportPartV6'
+                    ),
+                ),
+            );
 
             $this->fields_form = array(
                 $formSettings,
-                $formExportPart,
-                $formExportPartV2,
+                //$formExportPart,
+                //$formExportPartV2,
                 $formExportPartV3,
-                $formExportPartV4,
-                $formExportPro
+                //$formExportPartV4,
+                $formExportPartV5,
+                $formExportPro,
+                $formExportPartV6,
             );
 
             $this->display = 'add';
@@ -570,7 +623,6 @@
 
         public function _getPrivateSales($collection, $limit=0, $id_privatesalesExcludeList=Null, $type=self::TYPE_CURRENT)
         {
-            // var_dump($collection);
             $nolimit = !$limit;
             $copyProperty = array
             (
@@ -634,7 +686,7 @@
                                 $line['image'] = $object->getFileImage('logo', Null, false);
                             if($object->percent)
                                 $line['percent'] = $this->l('to').' -'.$object->percent;
-                        } elseif ($this->version == 3) {
+                        } elseif ($this->version == 3 || $this->version == 5) {
                             if($object->imagenewsletter)
                                 $line['image'] = $object->getFileImage('newsletter', Null, false);
                             elseif($object->image)
@@ -671,7 +723,7 @@
                             $line['logo'] = $object->getFileImage('logo', Null, false);
                         break;
                     case self::TYPE_STARTING:
-                        if ($this->version == 3) {
+                        if ($this->version == 3 || $this->version == 5) {
                             if($object->imagenewsletter)
                                 $line['image'] = $object->getFileImage('newsletter', Null, false);
                             elseif($object->image)
@@ -709,7 +761,7 @@
                                 $line['image'] = $object->getFileImage('logo', Null, false);
                             if($object->percent)
                                 $line['percent'] = $this->l('to').' -'.$object->percent;
-                        } elseif ($this->version == 3) {
+                        } elseif ($this->version == 3 || $this->version == 5) {
                             if($object->imagenewsletter)
                                 $line['image'] = $object->getFileImage('newsletter', Null, false);
                             elseif($object->image)
@@ -743,7 +795,6 @@
 
                 $data[] = $line;
             }
-
             return $data;
         }
 
@@ -757,8 +808,8 @@
             return $id_privatesalesList;
         }
 
-        public function exportNewsletter(){
-
+        public function exportNewsletter()
+        {
             $this->_params = array(
                 'date' => Tools::getValue('ANT_EXPORT_NEWSLETTER_DATE', Configuration::get('ANT_EXPORT_NEWSLETTER_DATE')),
                 'blog' => Tools::getValue('ANT_EXPORT_NEWSLETTER_BLOG', Configuration::get('ANT_EXPORT_NEWSLETTER_BLOG')),
@@ -781,13 +832,11 @@
             }*/
 
             $date = $this->_params['date'];
-
             $newPrivateSales = $this->_getPrivateSales($this->_getNewPrivateSalesQuery(), 0, NULL, self::TYPE_STARTING);
             $id_privatesalesExcludeList = $this->_getIdPrivateSalesList($newPrivateSales);
             $nearEndPrivateSales = $this->_getPrivateSales($this->_getNearEndPrivateSalesQuery(), 0, $id_privatesalesExcludeList, self::TYPE_CURRENT);
             $id_privatesalesExcludeList = array_merge($id_privatesalesExcludeList, $this->_getIdPrivateSalesList($nearEndPrivateSales));
             $currentPrivateSales = $this->_getPrivateSales($this->_getCurrentPrivateSalesQuery(), 0, $id_privatesalesExcludeList, self::TYPE_ENDING);
-
             foreach ($newPrivateSales as $key => &$sale) {
                 $sale['link'] = urlencode($sale['link'].'?tr=NL'.date('dmy', strtotime($this->_params['date'])).'_'.$this->trackingSuffix);
             }
@@ -831,6 +880,8 @@
                 }
 
                 $namePost = 'image'.$name;
+                //$random_name_top = '';
+                //$random_name_footer = '';
                 if($this->_params['display_'.strtolower($name)] == 1){
                     if(isset($_FILES[$namePost]) && !empty($_FILES[$namePost]['tmp_name']) ){
                         //die('>>>> test en cours');
@@ -890,6 +941,7 @@
             (
                 'params'                 => $this->_params,
                 'version'                => $this->version,
+                'enableV4header'         => $this->enableV4header,
                 'subversion'             => $this->subVersion,
                 'random_name'            => $random_name_top,
                 'random_name_footer'     => $random_name_footer,
@@ -899,7 +951,8 @@
                 'urlPath'                => $this->context->shop->getBaseURL(),
                 'urlPathEncode'          => urlencode($this->context->shop->getBaseURL().'?tr=NL'.date('dmy', strtotime($this->_params['date'])).'_'.$this->trackingSuffix),
                 'urlPathFooterEncode'    => $urlPathFooterEncode,
-                'urlPathFrequenceEncode' => urlencode($this->context->shop->getBaseURL().'/mes-newsletters?tr=NL'.date('dmy', strtotime($this->_params['date'])).'_'.$this->trackingSuffix),
+                'urlPathFrequenceEncode' => urlencode($this->context->shop->getBaseURL().'mes-newsletters?tr=NL'.date('dmy', strtotime($this->_params['date'])).'_'.$this->trackingSuffix),
+//                'urlPathFrequenceEncode' => urlencode($this->context->shop->getBaseURL().'mes-newsletters'),
                 'urlImgPath'             => $imgFolder,
                 'trackingSuffix'         => $this->trackingSuffix,
                 'newPrivateSales'        => $newPrivateSales,
@@ -909,6 +962,8 @@
                 'tracking'               => '?tr=NL'.date('dmy', strtotime($this->_params['date'])).'_'.$this->trackingSuffix,
                 'tracking_for_token'     => '&tr=NL'.date('dmy', strtotime($this->_params['date'])).'_'.$this->trackingSuffix,
                 'cms'                    => $cms,
+                /*
+                // 03/02/2017 - 'CMSlinks' is never used.
                 'CMSlinks'               => array(
                                             $this->context->link->getCMSLink(6).$tracking,
                                             $this->context->link->getCMSLink('contact').$tracking,
@@ -916,6 +971,7 @@
                                             $this->context->link->getCMSLink(17).$tracking,
                                             $this->context->link->getCMSLink(23).$tracking,
                                         )
+                */
             ));
 
             header('Content-Type: text/html; charset=utf-8');
@@ -933,7 +989,8 @@
             die();
         }
 
-        public function renderView(){
+        public function renderView()
+        {
             return $this->exportNewsletter();
         }
-    }
+    }

modules/ant_export_privatesales_newsletter/mails/block-blog.tpl

@@ -1,45 +1,36 @@
 {if !empty($blog_post)}
-	<!-- blog block -->
+	
+	{* ### blog block *}
+
 	<table style="{$container}" border="0" cellspacing="0" cellpadding="0">
-		<tbody>
-			<tr>
-				<td width="10px">&nbsp;</td>
-				<td style="{$mainColumn}" width="{$mainColumnWidth}">
-					<table style="{$subContainer} padding: 10px 0 0 0;" border="0" cellspacing="0" cellpadding="0" width="100%">
-						<tbody>
-							<tr>
-								{* <td style="vertical-align: top; padding: 5px 5px 0; text-align: center;"><a style="display: block; border: none;" href="{$blog_post.link|escape:'html':'UTF-8'}{$tracking}">
-									<img style="border: none;" src="{$urlPath}modules/psblog/uploads/list/{$blog_post.default_img_name}" alt="{$blog_post.title|escape:'html':'UTF-8'}" width="568" height="379" />
-								</a></td> *}
-								{if $params['display_token'] == 1}
-								<td style="vertical-align: top; padding: 5px 5px 0; text-align: center;"><a title="{$blog_post.title|escape:'html':'UTF-8'}" style="display: block; border: none;" href="{$blog_post.link|escape:'html':'UTF-8'}{$tracking}">
-								{else}
-								<td style="vertical-align: top; padding: 5px 5px 0; text-align: center;"><a title="{$blog_post.title|escape:'html':'UTF-8'}" style="display: block; border: none;" href="http://www.privilegedemarque.com/{$tracking}">
-								{/if}
-									<img style="border: none;" src="{$urlPath}modules/psblog/uploads/list/{$blog_post.default_img_name}" alt="{$blog_post.title|escape:'html':'UTF-8'}" width="568" height="auto" />
-								</a>
-								</td>
-							</tr>
-							<tr>
-								<td style="vertical-align: top; padding: 5px 5px 5px;">
-									<div style="line-height: 15.6000003814697px;">
-										<span style="color: #f05349; font-size: 18px;">{$blog_post.title|escape:'html':'UTF-8'}</span>
-										<br />
-										<span style="color: #696969; font-size: 14px; line-height: 1.3em;">{$blog_post.excerpt|escape:'UTF-8'}</span>
-										{*<br />*}
-									</div>
-									{*<div style="line-height: 15.6000003814697px;"><br /></div>*}
-									<div style="line-height: 15.6000003814697px; text-align: right;">
-										<a style="color: #f05249; border: none; font-size: 14px; color: #f05349; line-height: 1.3em;" title="{$blog_post.title|escape:'html':'UTF-8'}" href="{$blog_post.link|escape:'html':'UTF-8'}{$tracking}">Lire la suite &gt;&gt;</a> 
-										{* <a style="color: #f05249; border: none; font-size: 18px; color: #f05349; line-height: 1.3em;" href="http://www.privilegedemarque.com/{$tracking}">Je d&eacute;couvre&gt;&gt;</a>*}
-										{*<br />*}
-									</div>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</td>
-			</tr>
-		</tbody>
+		<tr>
+			<td width="10px">&nbsp;</td>
+			<td style="{$mainColumn}" width="{$mainColumnWidth}">
+				<table style="{$subContainer} padding: 10px 0 0 0;" border="0" cellspacing="0" cellpadding="0" width="100%">
+					<tr>
+						{if $params['display_token'] == 1}
+						<td style="vertical-align: top; padding: 5px 5px 0; text-align: center;"><a title="{$blog_post.title|escape:'html':'UTF-8'}" style="display: block; border: none;" href="{$blog_post.link|escape:'html':'UTF-8'}{$tracking}">
+						{else}
+						<td style="vertical-align: top; padding: 5px 5px 0; text-align: center;"><a title="{$blog_post.title|escape:'html':'UTF-8'}" style="display: block; border: none;" href="http://www.privilegedemarque.com/{$tracking}">
+						{/if}
+							<img style="border: none;" src="{$urlPath}modules/psblog/uploads/list/{$blog_post.default_img_name}" alt="{$blog_post.title|escape:'html':'UTF-8'}" width="568" height="auto" />
+						</a>
+						</td>
+					</tr>
+					<tr>
+						<td style="vertical-align: top; padding: 5px 5px 5px;">
+							<div style="line-height: 15.6000003814697px;">
+								<span style="color: #f05349; font-size: 18px;">{$blog_post.title|escape:'html':'UTF-8'}</span>
+								<br />
+								<span style="color: #696969; font-size: 14px; line-height: 1.3em;">{$blog_post.excerpt|escape:'UTF-8'}</span>
+							</div>
+							<div style="line-height: 15.6000003814697px; text-align: right;">
+								<a style="color: #f05249; border: none; font-size: 14px; color: #f05349; line-height: 1.3em;" title="{$blog_post.title|escape:'html':'UTF-8'}" href="{$blog_post.link|escape:'html':'UTF-8'}{$tracking}">Lire la suite &gt;&gt;</a> 
+							</div>
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
 	</table>
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-current.tpl

@@ -1,20 +1,20 @@
 
 {if !empty($currentPrivateSales)}
-	<!-- current sale header -->
+	
+	{* ### current sale header *}
+	
 	<table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-		<tbody>
-			<tr>
-				{* <td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-current.jpg" alt="Nos Ventes en Cours" width="100%" height="45" /></a></td> *}
-				{if $params['display_token'] == 1}
-				<td><a style="border: none;" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}header-current{if $version==2}-v2{/if}.jpg" alt="Nos Ventes en Cours" width="100%" height="45" /></a></td>
-				{else}
-				<td><a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}header-current{if $version==2}-v2{/if}.jpg" alt="Nos Ventes en Cours" width="100%" height="45" /></a></td>
-				{/if}
-			</tr>
-		</tbody>
+		<tr>
+			{if $params['display_token'] == 1}
+			<td><a style="border: none;" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}header-current{if $version==2}-v2{/if}.jpg" alt="Nos Ventes en Cours" width="100%" height="45" /></a></td>
+			{else}
+			<td><a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}header-current{if $version==2}-v2{/if}.jpg" alt="Nos Ventes en Cours" width="100%" height="45" /></a></td>
+			{/if}
+		</tr>
 	</table>
 	
-	<!-- current sale -->
+	{* ### current sale *}
+
 	{if $version == 2}
 	{include file="{$tplFolder}block-sales-one-column.tpl" saleList=$currentPrivateSales shipping=$shippingforcurrent}
 	{else}

modules/ant_export_privatesales_newsletter/mails/block-current2.tpl

@@ -1,19 +1,19 @@
 
 {if !empty($currentPrivateSales)}
-    <!-- current sale header -->
+
+    {* ### current sale header *}
+    
     <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-        <tbody>
-            <tr>
-                {* <td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-current.jpg" alt="Nos Ventes en Cours" width="100%" height="45" /></a></td> *}
-                {if $params['display_token'] == 1}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&back={$urlPathEncode}">NOS VENTES EN COURS</a></td>
-                {else}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">NOS VENTES EN COURS</a></td>
-                {/if}
-            </tr>
-        </tbody>
+        <tr>
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">APER&Ccedil;U DE NOS VENTES EN COURS</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">APER&Ccedil;U DE NOS VENTES EN COURS</a></td>
+            {/if}
+        </tr>
     </table>
 
-    <!-- current sale -->
+    {* ### current sale *}
+
     {include file="{$tplFolder}block-sales-one-column2.tpl" saleList=$currentPrivateSales shipping=$shippingforcurrent}
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-current3.tpl

@@ -1,19 +1,20 @@
 
 {if !empty($currentPrivateSales)}
-    <!-- current sale header -->
+
+    {* ### current sale header *}
+    
     <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-        <tbody>
-            <tr>
-                {* <td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-current.jpg" alt="Nos Ventes en Cours" width="100%" height="45" /></a></td> *}
-                {if $params['display_token'] == 1}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&back={$urlPathEncode}">NOS VENTES EN COURS</a></td>
-                {else}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">NOS VENTES EN COURS</a></td>
-                {/if}
-            </tr>
-        </tbody>
+        <tr>
+            {* <td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-current.jpg" alt="Nos Ventes en Cours" width="100%" height="45" /></a></td> *}
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">NOS VENTES EN COURS</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">NOS VENTES EN COURS</a></td>
+            {/if}
+        </tr>
     </table>
 
-    <!-- current sale -->
+    {* ### current sale *}
+
     {include file="{$tplFolder}block-sales-two-column2.tpl" saleList=$currentPrivateSales shipping=$shippingforcurrent}
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-current5.tpl

@@ -0,0 +1,19 @@
+
+{if !empty($currentPrivateSales)}
+
+    {* ### current sale header *}
+    
+    <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
+        <tr>
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">NOS VENTES EN COURS</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">NOS VENTES EN COURS</a></td>
+            {/if}
+        </tr>
+    </table>
+
+    {* ### current sale *}
+
+    {include file="{$tplFolder}block-sales-two-column5.tpl" saleList=$currentPrivateSales shipping=$shippingforcurrent}
+{/if}

modules/ant_export_privatesales_newsletter/mails/block-message.tpl

@@ -1,46 +1,40 @@
 {if isset($params.display_messages) && $params.display_messages}
 	{if $trackingSuffix == 'PART' && !empty($part_message)}
-		<!-- blog block -->
+
+	    {* ### blog block *}
+
 		<table style="{$container}" border="0" cellspacing="0" cellpadding="0">
-			<tbody>
-				<tr>
-					<td width="10px">&nbsp;</td>
-					<td style="{$mainColumn}" width="{$mainColumnWidth}">
-						<table style="{$subContainer}" border="0" cellspacing="0" cellpadding="0" width="100%">
-							<tbody>
-								<tr>
-									<td style="vertical-align: top; padding: 5px 5px 5px;">
-										<p style="color: #696969; font-size: 14px; line-height: 1.3em;">{$blog_post.excerpt|escape:'UTF-8'}
-											{$part_message}
-										</p>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-			</tbody>
+			<tr>
+				<td width="10px">&nbsp;</td>
+				<td style="{$mainColumn}" width="{$mainColumnWidth}">
+					<table style="{$subContainer}" border="0" cellspacing="0" cellpadding="0" width="100%">
+						<tr>
+							<td style="vertical-align: top; padding: 5px 5px 5px;">
+								<p style="color: #696969; font-size: 14px; line-height: 1.3em;">{$blog_post.excerpt|escape:'UTF-8'}
+									{$part_message}
+								</p>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 		</table>
 	{elseif $trackingSuffix == 'PRO' && !empty($pro_message)}
 		<table style="{$container}" border="0" cellspacing="0" cellpadding="0">
-			<tbody>
-				<tr>
-					<td width="10px">&nbsp;</td>
-					<td style="{$mainColumn}" width="{$mainColumnWidth}">
-						<table style="{$subContainer}" border="0" cellspacing="0" cellpadding="0" width="100%">
-							<tbody>
-								<tr>
-									<td style="vertical-align: top; padding: 5px 5px 5px;">
-										<p style="color: #696969; font-size: 14px; line-height: 1.3em;">{$blog_post.excerpt|escape:'UTF-8'}
-											{$pro_message}
-										</p>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-			</tbody>
+			<tr>
+				<td width="10px">&nbsp;</td>
+				<td style="{$mainColumn}" width="{$mainColumnWidth}">
+					<table style="{$subContainer}" border="0" cellspacing="0" cellpadding="0" width="100%">
+						<tr>
+							<td style="vertical-align: top; padding: 5px 5px 5px;">
+								<p style="color: #696969; font-size: 14px; line-height: 1.3em;">{$blog_post.excerpt|escape:'UTF-8'}
+									{$pro_message}
+								</p>
+							</td>
+						</tr>
+					</table>
+				</td>
+			</tr>
 		</table>
 	{/if}
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-near-end.tpl

@@ -1,19 +1,20 @@
 
 {if !empty($nearEndPrivateSales)}
-	<!-- near end sale header -->
+
+    {* ### near end sale header *}
+
 	<table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-		<tbody>
-			<tr>
-				{if $params['display_token'] == 1}
-				<td><a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}header-near-end{if $version==2}-v2{/if}.jpg" alt="Ventes bient&ocirc;t termin&eacute;es" width="100%" height="45" /></a></td>
-				{else}
-				<td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-near-end{if $version==2}-v2{/if}.jpg" alt="Ventes bient&ocirc;t termin&eacute;es" width="100%" height="45" /></a></td>
-				{/if}
-			</tr>
-		</tbody>
+		<tr>
+			{if $params['display_token'] == 1}
+			<td><a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}header-near-end{if $version==2}-v2{/if}.jpg" alt="Ventes bient&ocirc;t termin&eacute;es" width="100%" height="45" /></a></td>
+			{else}
+			<td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-near-end{if $version==2}-v2{/if}.jpg" alt="Ventes bient&ocirc;t termin&eacute;es" width="100%" height="45" /></a></td>
+			{/if}
+		</tr>
 	</table>
 	
-	<!-- near end sale -->
+    {* ### near end sale *}
+
 	{if $version == 2}
 	{include file="{$tplFolder}block-sales-one-column.tpl" saleList=$nearEndPrivateSales shipping=$shippingforending endSale="true"}
 	{else}

modules/ant_export_privatesales_newsletter/mails/block-near-end2.tpl

@@ -1,18 +1,19 @@
 
 {if !empty($nearEndPrivateSales)}
-    <!-- near end sale header -->
+
+    {* ### near end sale header *}
+
     <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-        <tbody>
-            <tr>
-                {if $params['display_token'] == 1}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&back={$urlPathEncode}">Ventes bient&ocirc;t termin&eacute;es</a></td>
-                {else}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">Ventes bient&ocirc;t termin&eacute;es</a></td>
-                {/if}
-            </tr>
-        </tbody>
+        <tr>
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">Ventes bient&ocirc;t termin&eacute;es</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">Ventes bient&ocirc;t termin&eacute;es</a></td>
+            {/if}
+        </tr>
     </table>
 
-    <!-- near end sale -->
+    {* ### near end sale *}
+
     {include file="{$tplFolder}block-sales-one-column2.tpl" saleList=$nearEndPrivateSales shipping=$shippingforending endSale="true"}
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-near-end3.tpl

@@ -1,18 +1,19 @@
 
 {if !empty($nearEndPrivateSales)}
-    <!-- near end sale header -->
+
+    {* ### near end sale header *}
+
     <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-        <tbody>
-            <tr>
-                {if $params['display_token'] == 1}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&back={$urlPathEncode}">Ventes bient&ocirc;t termin&eacute;es</a></td>
-                {else}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">Ventes bient&ocirc;t termin&eacute;es</a></td>
-                {/if}
-            </tr>
-        </tbody>
+        <tr>
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">Ventes bient&ocirc;t termin&eacute;es</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">Ventes bient&ocirc;t termin&eacute;es</a></td>
+            {/if}
+        </tr>
     </table>
 
-    <!-- near end sale -->
+    {* ### near end sale *}
+
     {include file="{$tplFolder}block-sales-one-column2.tpl" saleList=$nearEndPrivateSales shipping=$shippingforending endSale="true"}
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-near-end5.tpl

@@ -0,0 +1,19 @@
+
+{if !empty($nearEndPrivateSales)}
+
+    {* ### near end sale header *}
+
+    <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
+        <tr>
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">Ventes bient&ocirc;t termin&eacute;es</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">Ventes bient&ocirc;t termin&eacute;es</a></td>
+            {/if}
+        </tr>
+    </table>
+
+    {* ### near end sale *}
+
+    {include file="{$tplFolder}block-sales-one-column5.tpl" saleList=$nearEndPrivateSales shipping=$shippingforending endSale="true"}
+{/if}

modules/ant_export_privatesales_newsletter/mails/block-new.tpl

@@ -1,19 +1,19 @@
 
 {if !empty($newPrivateSales)}
-	<!-- new sale header -->
+
+    {* ### new sale header *}
+
 	<table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-		<tbody>
-			<tr>
-				{* <td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-new{if $version==2}-v2{/if}.jpg" alt="D&egrave;s aujourd'hui" width="100%" height="45" /></a></td> *}
-				{if $params['display_token'] == 1}
-				<td><a style="border: none;" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}header-new{if $version==2}-v2{/if}.jpg" alt="D&egrave;s aujourd'hui" width="100%" height="45" /></a></td>
-				{else}
-				<td><a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}header-new{if $version==2}-v2{/if}.jpg" alt="D&egrave;s aujourd'hui" width="100%" height="45" /></a></td>
-				{/if}
-			</tr>
-		</tbody>
+		<tr>
+			{if $params['display_token'] == 1}
+			<td><a style="border: none;" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}header-new{if $version==2}-v2{/if}.jpg" alt="D&egrave;s aujourd'hui" width="100%" height="45" /></a></td>
+			{else}
+			<td><a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}header-new{if $version==2}-v2{/if}.jpg" alt="D&egrave;s aujourd'hui" width="100%" height="45" /></a></td>
+			{/if}
+		</tr>
 	</table>
 	
-	<!-- new sale -->
+    {* ### new sale *}
+
 	{include file="{$tplFolder}block-sales-one-column.tpl" saleList=$newPrivateSales}
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-new2.tpl

@@ -1,19 +1,19 @@
 
 {if !empty($newPrivateSales)}
-    <!-- new sale header -->
+
+    {* ### new sale header *}
+
     <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-        <tbody>
-            <tr>
-                {* <td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-new{if $version==2}-v2{/if}.jpg" alt="D&egrave;s aujourd'hui" width="100%" height="45" /></a></td> *}
-                {if $params['display_token'] == 1}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&back={$urlPathEncode}">À PARTIR D'AUJOURD'HUI</a></td>
-                {else}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">À PARTIR D'AUJOURD'HUI</a></td>
-                {/if}
-            </tr>
-        </tbody>
+        <tr>
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">À PARTIR D'AUJOURD'HUI</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:25px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">À PARTIR D'AUJOURD'HUI</a></td>
+            {/if}
+        </tr>
     </table>
 
-    <!-- new sale -->
+    {* ### new sale *}
+
     {include file="{$tplFolder}block-sales-one-column2.tpl" saleList=$newPrivateSales}
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-new3.tpl

@@ -1,19 +1,19 @@
 
 {if !empty($newPrivateSales)}
-    <!-- new sale header -->
+
+    {* ### new sale header *}
+
     <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-        <tbody>
-            <tr>
-                {* <td><a style="border: none;" href="{$urlPath}{$tracking}"><img style="border: none;" src="{$urlImgPath}header-new{if $version==2}-v2{/if}.jpg" alt="D&egrave;s aujourd'hui" width="100%" height="45" /></a></td> *}
-                {if $params['display_token'] == 1}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&back={$urlPathEncode}">À PARTIR D'AUJOURD'HUI</a></td>
-                {else}
-                <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">À PARTIR D'AUJOURD'HUI</a></td>
-                {/if}
-            </tr>
-        </tbody>
+        <tr>
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">À PARTIR D'AUJOURD'HUI</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">À PARTIR D'AUJOURD'HUI</a></td>
+            {/if}
+        </tr>
     </table>
 
-    <!-- new sale -->
+    {* ### new sale *}
+
     {include file="{$tplFolder}block-sales-one-column3.tpl" saleList=$newPrivateSales}
 {/if}

modules/ant_export_privatesales_newsletter/mails/block-new5.tpl

@@ -0,0 +1,19 @@
+
+{if !empty($newPrivateSales)}
+
+    {* ### new sale header *}
+
+    <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
+        <tr>
+            {if $params['display_token'] == 1}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="[[data:token]]&amp;back={$urlPathEncode}">À PARTIR D'AUJOURD'HUI</a></td>
+            {else}
+            <td><a style="border: none; display:block; padding:7px; font-family: Arial, sans-serif;  font-size:13px; text-decoration:none; color:#fff; background-color: #F05249; text-transform: uppercase;" href="http://www.privilegedemarque.com/{$tracking}">À PARTIR D'AUJOURD'HUI</a></td>
+            {/if}
+        </tr>
+    </table>
+
+    {* ### new sale *}
+
+    {include file="{$tplFolder}block-sales-one-column5.tpl" saleList=$newPrivateSales}
+{/if}

modules/ant_export_privatesales_newsletter/mails/block-sales-one-column.tpl

@@ -1,49 +1,43 @@
 
 {foreach $saleList as $sale}
 	<table style="{$subContainer} {if $version ==2}padding: 5px 10px{else}padding: 5px 0px{/if}; " border="0" cellspacing="0" cellpadding="0" class="sale col-xs-12 col-md-6">
-		<tbody>
-			<tr>
-				{* <td><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="{$sale.link|escape:'html':'UTF-8'}{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="568" height="189" /></a></td> *}
-				{if $params['display_token'] == 1}
-				<td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&back={$urlPathEncode}"><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" height="" /></a></td>
-				{else}
-				<td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" height="" /></a></td>
-				{/if}
-				<td style="background-color:#f3f5f5;">
-					<table style="{$subContainer} padding:0 0 0 0; background-color: #f3f5f5; height:222px" border="0" cellspacing="0" cellpadding="0" width="100%" >
-						<tbody>
-							{if $endSale == 'true'}
-							<tr style="text-align:center">
-								<td>
-									<img style="border: none;" src="{$urlImgPath}bandeau_end.png" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" />
-								</td>
-							</tr>
+		<tr>
+			{if $params['display_token'] == 1}
+			<td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" height="" /></a></td>
+			{else}
+			<td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" height="" /></a></td>
+			{/if}
+			<td style="background-color:#f3f5f5;">
+				<table style="{$subContainer} padding:0 0 0 0; background-color: #f3f5f5; height:222px" border="0" cellspacing="0" cellpadding="0" width="100%" >
+					{if $endSale == 'true'}
+					<tr style="text-align:center">
+						<td>
+							<img style="border: none;" src="{$urlImgPath}bandeau_end.png" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" />
+						</td>
+					</tr>
+					{/if}
+					<tr style="text-align:center">
+						<td>
+							<img style="border: none;" src="{$sale.logo|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="50%" />
+							{if $sale.percent && $version !=2}
+							<span style="margin-right: 15px; padding-top: 17px; float: right; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase; font-weight:600;">{$sale.percent}%</span>
 							{/if}
-							<tr style="text-align:center">
-								<td>
-									<img style="border: none;" src="{$sale.logo|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="50%" />
-									{if $sale.percent && $version !=2}
-									<span style="margin-right: 15px; padding-top: 17px; float: right; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase; font-weight:600;">{$sale.percent}%</span>
-									{/if}
-								</td>
-							</tr>
-							<tr {if $endSale == 'true'}{else}style="height:90px"{/if}>
-								<td style="vertical-align: top; padding: 5px 5px 0 5px;">
-									<p style="margin: 0 0 0; {if $version==2}line-height: 2em;{else}line-height: 1.3em;{/if} text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase;"><span style="font-size:15px;">{$sale.subtitle|escape:'html':'UTF-8'}</span></span><br style="line-height: 15.6000003814697px;" />{if $version==2}{if $sale.percent}<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">{$sale.percent}%</span>{/if}{else}<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'}</span>{/if}</p>
-								</td>
-							</tr>
-							<tr>
-								{if $params['display_token'] == 1}
-								<td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}see-more.png" alt="J'en profite !" width="123" height="48" /></a></td>
-								{else}
-								<td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}see-more.png" alt="J'en profite !" width="123" height="48" /></a></td>
-								{/if}
-							</tr>
-						</tbody>
-					</table>
-				</td>
-			</tr>
-
-		</tbody>
+						</td>
+					</tr>
+					<tr {if $endSale == 'true'}{else}style="height:90px"{/if}>
+						<td style="vertical-align: top; padding: 5px 5px 0 5px;">
+							<p style="margin: 0 0 0; {if $version==2}line-height: 2em;{else}line-height: 1.3em;{/if} text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase;"><span style="font-size:15px;">{$sale.subtitle|escape:'html':'UTF-8'}</span></span><br style="line-height: 15.6000003814697px;" />{if $version==2}{if $sale.percent}<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">{$sale.percent}%</span>{/if}{else}<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'}</span>{/if}</p>
+						</td>
+					</tr>
+					<tr>
+						{if $params['display_token'] == 1}
+						<td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}see-more.png" alt="J'en profite !" width="123" height="48" /></a></td>
+						{else}
+						<td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}see-more.png" alt="J'en profite !" width="123" height="48" /></a></td>
+						{/if}
+					</tr>
+				</table>
+			</td>
+		</tr>
 	</table>
 {/foreach}

modules/ant_export_privatesales_newsletter/mails/block-sales-one-column2.tpl

@@ -1,46 +1,40 @@
 
 {foreach $saleList as $sale}
      <table style="{$subContainer} {if $version!=1}padding: 5px 10px{else}padding: 5px 0px{/if}; " border="0" cellspacing="0" cellpadding="0" class="sale col-xs-12 col-md-6">
-         <tbody>
-             <tr>
-                 {* <td><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="{$sale.link|escape:'html':'UTF-8'}{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="568" height="189" /></a></td> *}
-                 {if $params['display_token'] == 1}
-                 <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&back={$sale.link}"{else}href="[[data:token]]&back={$urlPathEncode}"{/if}><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
-                 {else}
-                 <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
-                 {/if}
-                 <td style="background-color:#f3f5f5;">
-                     <table style="{$subContainer} padding:0 0 0 0; background-color: #f3f5f5; height:195px" border="0" cellspacing="0" cellpadding="0" width="100%" >
-                         <tbody>
-                             {if $endSale == 'true'}
-                             <tr style="text-align:center">
-                                 <td>
-                                     <img style="border: none;" src="{$urlImgPath}bandeau_end.png" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" />
-                                 </td>
-                             </tr>
-                             {/if}
-                             <tr style="text-align:center">
-                                 <td>
-                                     <p style="margin: 0 0 0; line-height: 2em; text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase; font-size:20px;">{$sale.title|escape:'html':'UTF-8'}</span></p>
-                                 </td>
-                             </tr>
-                             <tr {if $endSale == 'true'}{else}style="height:80px"{/if}>
-                                 <td style="vertical-align: top; padding: 5px 5px 0 5px;">
-                                     <p style="margin: 0 0 0; line-height: 2em; text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;"><span style="font-size:15px;">{$sale.subtitle|escape:'html':'UTF-8'}</span></span><br style="line-height: 15.6000003814697px;" />{if $version!=1}{if $sale.percent}<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">{$sale.percent}%</span>{/if}{else}<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'}</span>{/if}</p>
-                                 </td>
-                             </tr>
-                             <tr>
-                                 {if $params['display_token'] == 1}
-                                 <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}"{if $params['sale_link'] == 1}href="[[data:token]]&back={$sale.link}"{else}href="[[data:token]]&back={$urlPathEncode}"{/if}>J'EN PROFITE !</a></td>
-                                 {else}
-                                 <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}">J'EN PROFITE !</a></td>
-                                 {/if}
-                             </tr>
-                         </tbody>
-                     </table>
-                 </td>
-             </tr>
- 
-         </tbody>
+         <tr>
+             {if $params['display_token'] == 1}
+             <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&amp;back={$sale.link}"{else}href="[[data:token]]&amp;back={$urlPathEncode}"{/if}><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
+             {else}
+             <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
+             {/if}
+             <td style="background-color:#f3f5f5;">
+                 <table style="{$subContainer} padding:0 0 0 0; background-color: #f3f5f5; height:195px" border="0" cellspacing="0" cellpadding="0" width="100%" >
+                     {if $endSale == 'true'}
+                     <tr style="text-align:center">
+                         <td>
+                             <img style="border: none;" src="{$urlImgPath}bandeau_end.png" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" />
+                         </td>
+                     </tr>
+                     {/if}
+                     <tr style="text-align:center">
+                         <td>
+                             <p style="margin: 0 0 0; line-height: 2em; text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase; font-size:20px;">{$sale.title|escape:'html':'UTF-8'}</span></p>
+                         </td>
+                     </tr>
+                     <tr {if $endSale == 'true'}{else}style="height:80px"{/if}>
+                         <td style="vertical-align: top; padding: 5px 5px 0 5px;">
+                             <p style="margin: 0 0 0; line-height: 2em; text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;"><span style="font-size:15px;">{$sale.subtitle|escape:'html':'UTF-8'}</span></span><br style="line-height: 15.6000003814697px;" />{if $version!=1}{if $sale.percent}<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">{$sale.percent}%</span>{/if}{else}<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'}</span>{/if}</p>
+                         </td>
+                     </tr>
+                     <tr>
+                         {if $params['display_token'] == 1}
+                         <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&amp;back={$sale.link}"{else}href="[[data:token]]&amp;back={$urlPathEncode}"{/if}>J'EN PROFITE !</a></td>
+                         {else}
+                         <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}">J'EN PROFITE !</a></td>
+                         {/if}
+                     </tr>
+                 </table>
+             </td>
+         </tr>
      </table>
  {/foreach}

modules/ant_export_privatesales_newsletter/mails/block-sales-one-column3.tpl

@@ -1,46 +1,40 @@
 
 {foreach $saleList as $sale}
-    <table style="{$subContainer} {if $version!=1}padding: 5px 10px{else}padding: 5px 0px{/if}; " border="0" cellspacing="0" cellpadding="0" class="sale col-xs-12 col-md-6">
-        <tbody>
-            <tr>
-                {* <td><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="{$sale.link|escape:'html':'UTF-8'}{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="568" height="189" /></a></td> *}
-                {if $params['display_token'] == 1}
-                <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&back={$sale.link}"{else}href="[[data:token]]&back={$urlPathEncode}"{/if}><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
-                {else}
-                <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
-                {/if}
-                <td style="background-color:#f3f5f5;">
-                    <table style="{$subContainer} padding:0 0 0 0; background-color: #f3f5f5; height:195px" border="0" cellspacing="0" cellpadding="0" width="100%" >
-                        <tbody>
-                            {if $endSale == 'true'}
-                            <tr style="height: 24px;">
-                                <td style="vertical-align: top;">
-                                    <img style="border: none;" src="{$urlImgPath}bandeau_end.png" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" />
-                                </td>
-                            </tr>
-                            {/if}
-                            <tr style="text-align:center; display: block;">
-                                <td style="display: block;">
-                                    <p style="margin: 0 0 0; text-align:center; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-box-orient: vertical;  -webkit-line-clamp: 2; line-height: 29px; max-height: 30px"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase; font-size:20px;">{$sale.title|escape:'html':'UTF-8'}</span></p>
-                                </td>
-                            </tr>
-                            <tr {if $endSale == 'true'}style="display: block;"{else}style="height:80px; display: block"{/if}>
-                                <td style="vertical-align: top; padding: 5px 5px 0 5px; display: block">
-                                    <p style="margin: 0 0 0; line-height: 2em; text-align:center; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-box-orient: vertical;  -webkit-line-clamp: 3; line-height: 15px; max-height: 50px"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;"><span style="font-size:15px;">{$sale.subtitle|escape:'html':'UTF-8'}</span></span><br style="line-height: 15.6000003814697px;" />{if $version!=1}{if $sale.percent}<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">{$sale.percent}%</span>{/if}{else}<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'}</span>{/if}</p>
-                                </td>
-                            </tr>
-                            <tr>
-                                {if $params['display_token'] == 1}
-                                <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}"{if $params['sale_link'] == 1}href="[[data:token]]&back={$sale.link}"{else}href="[[data:token]]&back={$urlPathEncode}"{/if}>J'EN PROFITE !</a></td>
-                                {else}
-                                <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}">J'EN PROFITE !</a></td>
-                                {/if}
-                            </tr>
-                        </tbody>
-                    </table>
-                </td>
-            </tr>
-
-        </tbody>
-    </table>
-{/foreach}
+     <table style="{$subContainer} {if $version!=1}padding: 5px 10px{else}padding: 5px 0px{/if}; " border="0" cellspacing="0" cellpadding="0" class="sale col-xs-12 col-md-6">
+         <tr>
+             {if $params['display_token'] == 1}
+             <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&amp;back={$sale.link}"{else}href="[[data:token]]&amp;back={$urlPathEncode}"{/if}><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
+             {else}
+             <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="margin-bottom: -3px; border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
+             {/if}
+             <td style="background-color:#f3f5f5;">
+                 <table style="{$subContainer} padding:0 0 0 0; background-color: #f3f5f5; height:195px" border="0" cellspacing="0" cellpadding="0" width="100%" >
+                     {if $endSale == 'true'}
+                     <tr style="text-align:center">
+                         <td>
+                             <img style="border: none;" src="{$urlImgPath}bandeau_end.png" alt="{$sale.title|escape:'html':'UTF-8'}" width="100%" />
+                         </td>
+                     </tr>
+                     {/if}
+                     <tr style="text-align:center">
+                         <td>
+                             <p style="margin: 0 0 0; line-height: 2em; text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase; font-size:20px;">{$sale.title|escape:'html':'UTF-8'}</span></p>
+                         </td>
+                     </tr>
+                     <tr {if $endSale == 'true'}{else}style="height:80px"{/if}>
+                         <td style="vertical-align: top; padding: 5px 5px 0 5px;">
+                             <p style="margin: 0 0 0; line-height: 2em; text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;"><span style="font-size:15px;">{$sale.subtitle|escape:'html':'UTF-8'}</span></span><br style="line-height: 15.6000003814697px;" />{if $version!=1}{if $sale.percent}<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">{$sale.percent}%</span>{/if}{else}<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'}</span>{/if}</p>
+                         </td>
+                     </tr>
+                     <tr>
+                         {if $params['display_token'] == 1}
+                         <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&amp;back={$sale.link}"{else}href="[[data:token]]&amp;back={$urlPathEncode}"{/if}>J'EN PROFITE !</a></td>
+                         {else}
+                         <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}">J'EN PROFITE !</a></td>
+                         {/if}
+                     </tr>
+                 </table>
+             </td>
+         </tr>
+     </table>
+ {/foreach}

modules/ant_export_privatesales_newsletter/mails/block-sales-one-column5.tpl

@@ -0,0 +1,40 @@
+
+{foreach $saleList as $sale}
+     <table style="{$subContainer} {if $version!=1}padding: 5px 10px{else}padding: 5px 0px{/if}; " border="0" cellspacing="0" cellpadding="0" class="sale col-xs-12 col-md-6">
+         <tr>
+             {if $params['display_token'] == 1}
+             <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&amp;back={$sale.link}"{else}href="[[data:token]]&amp;back={$urlPathEncode}"{/if}><img style="margin-bottom: -3px; border: none;" src="{if isset($sale.image)}{$sale.image|escape:'html':'UTF-8'}{/if}" alt="{$sale.title|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
+             {else}
+             <td style="width:60%;"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="margin-bottom: -3px; border: none;" src="{if isset($sale.image)}{$sale.image|escape:'html':'UTF-8'}{/if}" alt="{$sale.title|lower|escape:'html':'UTF-8'}" width="348px" height="195px" /></a></td>
+             {/if}
+             <td style="background-color:#f3f5f5;">
+                 <table style="{$subContainer} padding:0 0 0 0; background-color: #f3f5f5; height:195px" border="0" cellspacing="0" cellpadding="0" width="100%" >
+                     {if $endSale == 'true'}
+                     <tr style="text-align:center">
+                         <td>
+                             <img style="border: none;" src="{$urlImgPath}bandeau_end.png" alt="{$sale.title|lower|escape:'html':'UTF-8'}" width="100%" />
+                         </td>
+                     </tr>
+                     {/if}
+                     <tr style="text-align:center">
+                         <td>
+                             <p style="margin: 0 0 0; line-height: 2em; text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; font-size:20px;">{$sale.title|escape:'html':'UTF-8'}</span></p>
+                         </td>
+                     </tr>
+                     <tr {if $endSale == 'true'}{else}style="height:80px"{/if}>
+                         <td style="vertical-align: top; padding: 5px 5px 0 5px;">
+                             <p style="margin: 0 0 0; line-height: 2em; text-align:center"><span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;"><span style="font-size:15px;">{$sale.subtitle|escape:'html':'UTF-8'}</span></span><br style="line-height: 15.6000003814697px;" />{if $version!=1}{if $sale.percent && $version!=5}<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">{$sale.percent}%</span>{/if}{else}<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'}</span>{/if}</p>
+                         </td>
+                     </tr>
+                     <tr>
+                         {if $params['display_token'] == 1}
+                         <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&amp;back={$sale.link}"{else}href="[[data:token]]&amp;back={$urlPathEncode}"{/if}>En savoir +</a></td>
+                         {else}
+                         <td style="vertical-align: top; padding: 0; text-align: center;" width="135"><a style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}">En savoir +</a></td>
+                         {/if}
+                     </tr>
+                 </table>
+             </td>
+         </tr>
+     </table>
+ {/foreach}

modules/ant_export_privatesales_newsletter/mails/block-sales-two-column.tpl

@@ -1,73 +1,63 @@
 
 <table style="{$subContainer}" border="0" cellspacing="0" cellpadding="0" width="100%">
-	<tbody>
-		<tr>
-			<td>
-				{foreach $saleList as $sale name=twoColumnForeach}
-					{if $smarty.foreach.twoColumnForeach.iteration % 2 == 1}
-							</td>
+	<tr>
+		<td>
+			{foreach $saleList as $sale name=twoColumnForeach}
+				{if $smarty.foreach.twoColumnForeach.iteration % 2 == 1}
+						</td>
+					</tr>
+					<tr>
+						<td style='padding-bottom:10px'>
+				{/if}
+					<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" width="{$twoColumnWidth}" class="sale col-xs-12 col-sm-6">
+						<tr>
+							{if $params['display_token'] == 1}
+							<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="{$twoColumnWidth - $padding}" height="182" /></a></td>
+							{else}
+							<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="{$twoColumnWidth - $padding}" height="182" /></a></td>
+							{/if}
 						</tr>
 						<tr>
 							<td>
-					{/if}
-						<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" width="{$twoColumnWidth}" class="sale col-xs-12 col-sm-6">
-							<tbody>
-								<tr>
-									{* <td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="{$sale.link|escape:'html':'UTF-8'}{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="{$twoColumnWidth - $padding}" height="182" /></a></td> *}
-									{if $params['display_token'] == 1}
-									<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="{$twoColumnWidth - $padding}" height="182" /></a></td>
-									{else}
-									<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="{$twoColumnWidth - $padding}" height="182" /></a></td>
-									{/if}
-								</tr>
-								<tr>
-									<td>
-										<table border="0" cellspacing="0" cellpadding="0">
-											<tbody>
-												<tr>
-													<td style="vertical-align: top;" width="{$twoColumnWidth - 33}">
-														<p style="margin: 0 0 10px; padding: 5px 0px 5px {$padding}px; line-height: 1.3em;">
-															<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">
-																<span style="font-size: 15px; text-transform: uppercase;">{$sale.subtitle|escape:'html':'UTF-8'}
-																</span>
-															</span>
-															<br style="line-height: 15.6000003814697px;" />
-															<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'|truncate:140:' ...'}
-															</span>
-														</p>
-													</td>
-													{* <td style="vertical-align: top; padding: {$padding / 2}px {$padding / 2}px {$padding / 2}px {$padding}px; text-align: right;" width="28"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="{$sale.link|escape:'html':'UTF-8'}{$tracking}"><img style="border: none;" src="{$urlImgPath}see-more2.png" alt="J'en profite !" width="26" height="72" /></a></td> *}
-													{if $params['display_token'] == 1}
-													<td style="vertical-align: top; padding: {$padding / 2}px {$padding / 2}px {$padding / 2}px {$padding}px; text-align: right;" width="28"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}see-more2.png" alt="J'en profite !" width="26" height="72" /></a></td>
-													{else}
-													<td style="vertical-align: top; padding: {$padding / 2}px {$padding / 2}px {$padding / 2}px {$padding}px; text-align: right;" width="28"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}see-more2.png" alt="J'en profite !" width="26" height="72" /></a></td>
-													{/if}
-												</tr>
-											</tbody>
-										</table>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-				{/foreach}
-				{if isset($shipping) && $shipping}
-					<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" width="{$twoColumnWidth}" class="sale col-xs-12 col-sm-6">
-						<tbody>
-							<tr class="rowspan">
-								<td align="center">
-									{if $params['display_token'] == 1}
-									<a style="border: none;" href="[[data:token]]&back={$urlPathEncode}">
-									{else}
-									<a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}">
-									{/if}
-										<img style="border: none;" src="{$urlImgPath|cat:'livraison-gratuite-news-bloc.jpg'|escape:'html':'UTF-8'}" alt="{l s='Livraison gratuite' mod='ant_export_privatesales_newsletter'}" width="{$twoColumnWidth - $padding}" height="auto" />
-									</a>
-								</td>
-							</tr>
-						</tbody>
+								<table border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td style="vertical-align: top;" width="{$twoColumnWidth - 33}">
+											<p style="margin: 0 0 10px; padding: 5px 0px 5px {$padding}px; line-height: 1.3em;">
+												<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">
+													<span style="font-size: 15px; text-transform: uppercase;">{$sale.subtitle|escape:'html':'UTF-8'}
+													</span>
+												</span>
+												<br style="line-height: 15.6000003814697px;" />
+												<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">{$sale.description|escape:'html':'UTF-8'|truncate:140:' ...'}
+												</span>
+											</p>
+										</td>
+										{if $params['display_token'] == 1}
+										<td style="vertical-align: top; padding: {$padding / 2}px {$padding / 2}px {$padding / 2}px {$padding}px; text-align: right;" width="28"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}see-more2.png" alt="J'en profite !" width="26" height="72" /></a></td>
+										{else}
+										<td style="vertical-align: top; padding: {$padding / 2}px {$padding / 2}px {$padding / 2}px {$padding}px; text-align: right;" width="28"><a style="display: block; border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}see-more2.png" alt="J'en profite !" width="26" height="72" /></a></td>
+										{/if}
+									</tr>
+								</table>
+							</td>
+						</tr>
 					</table>
-				{/if}
-			</td>
-		</tr>
-	</tbody>
+			{/foreach}
+			{if isset($shipping) && $shipping}
+				<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" width="{$twoColumnWidth}" class="sale col-xs-12 col-sm-6">
+					<tr class="rowspan">
+						<td align="center">
+							{if $params['display_token'] == 1}
+							<a style="border: none;" href="[[data:token]]&amp;back={$urlPathEncode}">
+							{else}
+							<a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}">
+							{/if}
+								<img style="border: none;" src="{$urlImgPath|cat:'livraison-gratuite-news-bloc3.jpg'|escape:'html':'UTF-8'}" alt="{l s='Livraison gratuite' mod='ant_export_privatesales_newsletter'}" width="{$twoColumnWidth - $padding}" height="auto" />
+							</a>
+						</td>
+					</tr>
+				</table>
+			{/if}
+		</td>
+	</tr>
 </table>

modules/ant_export_privatesales_newsletter/mails/block-sales-two-column2.tpl

@@ -1,104 +1,93 @@
 
 <table style="{$subContainer}; overflow: hidden; position: relative; width: 100%;" border="0" cellspacing="0" cellpadding="0" width="100%">
-	<tbody>
-		<tr>
-			<td>
-				{foreach $saleList as $sale name=twoColumnForeach}
-					{if $smarty.foreach.twoColumnForeach.iteration % 2 == 1}
-							</td>
+	<tr>
+		<td>
+			{foreach $saleList as $sale name=twoColumnForeach}
+				{if $smarty.foreach.twoColumnForeach.iteration % 2 == 1}
+						</td>
+					</tr>
+					<tr>
+						<td>
+				{/if}
+					<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" style="color: rgb(169, 174, 178); font-family: arial; font-size: 12px; padding: 5px 0px 5px 0px; background-color: rgb(243, 245, 245); border: 5px white solid; width: 50%;">
+						<tr>
+							{if $params['display_token'] == 1}
+							<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="{$twoColumnWidth - $padding}" height="150" /></a></td>
+							{else}
+							<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="280" height="150" /></a></td>
+							{/if}
 						</tr>
 						<tr>
 							<td>
-					{/if}
-						<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" style="color: rgb(169, 174, 178); font-family: arial; font-size: 12px; padding: 5px 0px 5px 0px; background-color: rgb(243, 245, 245); border: 5px white solid; width: 50%;">
-							<tbody>
-								<tr>
-									{* <td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="{$sale.link|escape:'html':'UTF-8'}{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="280" height="150" /></a></td> *}
-									{if $params['display_token'] == 1}
-									<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="{$twoColumnWidth - $padding}" width="280" height="150" /></a></td>
-									{else}
-									<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$sale.image|escape:'html':'UTF-8'}" alt="{$sale.title|escape:'html':'UTF-8'}" width="280" height="150" /></a></td>
-									{/if}
-								</tr>
-								<tr>
-									<td>
-										<table border="0" cellspacing="0" cellpadding="0" width="100%">
-											<tbody>
-												<tr style="text-align: left;">
-													<td style="vertical-align: top;" width="{$twoColumnWidth}">
-														<p style="margin: 0px; padding-left: 5px; line-height: 1.3em;">
-															<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase; font-size:20px;">
-																{$sale.title|escape:'html':'UTF-8'}															
-															</span>
-														</p>
-													</td>
+								<table border="0" cellspacing="0" cellpadding="0" width="100%">
+									<tr style="text-align: left;">
+										<td style="vertical-align: top;" width="{$twoColumnWidth}">
+											<p style="margin: 0px; padding-left: 5px; line-height: 1.3em;">
+												<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; text-transform: uppercase; font-size:20px;">
+													{$sale.title|escape:'html':'UTF-8'}															
+												</span>
+											</p>
+										</td>
+									</tr>
+									<tr style="text-align: left; margin-bottom: 5px">
+										<td style="vertical-align: top;" width="{$twoColumnWidth}">
+											<p style="margin: 0; padding-left: 5px; line-height: 1.3em;">
+												<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">
+														{$sale.subtitle|escape:'html':'UTF-8'|truncate:140:' ...'}
+												</span>
+											</p>
+										</td>
+									</tr>
+									<tr>
+										<td>
+											<table border="0" cellspacing="0" cellpadding="0" width="100%" style="margin-top: 5px">
+												<tr style="text-align: left">
+                                					<td style="vertical-align: top;" width="145">
+                                    					<p style="text-align:left; display: inline-block; height: 38px; line-height: 38px; padding-left: 5px;">
+                                    						<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">
+																{$sale.percent|ucfirst}%
+                                    						</span>
+                                    					</p>
+                                					</td>
+												    {if $params['display_token'] == 1}
+												    <td style="vertical-align: center; padding: 0; text-align: center; padding-left: 5px;" width="200">
+												    	<a 	style="display: inline-block; float: right; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;"
+												    		title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&amp;back={$sale.link}"{else}
+												    		href="[[data:token]]&amp;back={$urlPathEncode}"{/if}>J'EN PROFITE
+												    	</a>
+												    </td>
+												    {else}
+												    <td style="vertical-align: center; padding: 0; text-align: center; padding-left: 5px;" width="200">
+												    	<a 	style="display: inline-block; float: right; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" 
+												    		title="{$sale.title|escape:'html':'UTF-8'}" 
+												    		href="http://www.privilegedemarque.com/{$tracking}">J'EN PROFITE
+												    	</a>
+												    </td>
+												    {/if}
 												</tr>
-												<tr style="text-align: left; margin-bottom: 5px">
-													<td style="vertical-align: top;" width="{$twoColumnWidth}">
-														<p style="margin: 0; padding-left: 5px; line-height: 1.3em;">
-															<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">
-																	{$sale.subtitle|escape:'html':'UTF-8'|truncate:140:' ...'}
-															</span>
-														</p>
-													</td>
-												</tr>
-												<tr>
-													<td>
-														<table border="0" cellspacing="0" cellpadding="0" width="100%" style="margin-top: 5px">
-															<tbody>
-																<tr style="text-align: left">
-				                                					<td style="vertical-align: top;" width="145">
-				                                    					<p style="text-align:left; display: inline-block; height: 38px; line-height: 38px; padding-left: 5px;">
-				                                    						<span style="font-size:13px;font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #F35243;">
-																				{$sale.percent|ucfirst}%
-				                                    						</span>
-				                                    					</p>
-				                                					</td>
-																    {if $params['display_token'] == 1}
-																    <td style="vertical-align: center; padding: 0; text-align: center; padding-left: 5px;" width="200">
-																    	<a 	style="display: inline-block; float: right; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;"
-																    		title="{$sale.title|escape:'html':'UTF-8'}"{if $params['sale_link'] == 1}href="[[data:token]]&back={$sale.link}"{else}
-																    		href="[[data:token]]&back={$urlPathEncode}"{/if}>J'EN PROFITE
-																    	</a>
-																    </td>
-																    {else}
-																    <td style="vertical-align: center; padding: 0; text-align: center; padding-left: 5px;" width="200">
-																    	<a 	style="display: inline-block; float: right; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" 
-																    		title="{$sale.title|escape:'html':'UTF-8'}" 
-																    		href="http://www.privilegedemarque.com/{$tracking}">J'EN PROFITE
-																    	</a>
-																    </td>
-																    {/if}
-																</tr>
-															</tbody>
-														</table>
-													</td>
-                            					</tr>
-											</tbody>
-										</table>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-				{/foreach}
-				{if isset($shipping) && $shipping}
-					<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" width="{$twoColumnWidth}" class="sale col-xs-12 col-sm-6">
-						<tbody>
-							<tr class="rowspan">
-								<td align="center">
-									{if $params['display_token'] == 1}
-									<a style="border: none;" href="[[data:token]]&back={$urlPathEncode}">
-									{else}
-									<a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}">
-									{/if}
-										<img style="border: none; padding-left: 5px;" src="{$urlImgPath|cat:'livraison-gratuite-news-bloc2.jpg'|escape:'html':'UTF-8'}" alt="{l s='Livraison gratuite' mod='ant_export_privatesales_newsletter'}" width="290" height="251" />
-									</a>
-								</td>
-							</tr>
-						</tbody>
+											</table>
+										</td>
+                					</tr>
+								</table>
+							</td>
+						</tr>
 					</table>
-				{/if}
-			</td>
-		</tr>
-	</tbody>
+			{/foreach}
+			{if isset($shipping) && $shipping}
+				<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" width="{$twoColumnWidth}" class="sale col-xs-12 col-sm-6">
+					<tr class="rowspan">
+						<td align="center">
+							{if $params['display_token'] == 1}
+							<a style="border: none;" href="[[data:token]]&amp;back={$urlPathEncode}">
+							{else}
+							<a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}">
+							{/if}
+								<img style="border: none; padding-left: 5px;" src="{$urlImgPath|cat:'livraison-gratuite-news-bloc3.jpg'|escape:'html':'UTF-8'}" alt="{l s='Livraison gratuite' mod='ant_export_privatesales_newsletter'}" width="290" height="251" />
+							</a>
+						</td>
+					</tr>
+				</table>
+			{/if}
+		</td>
+	</tr>
 </table>

modules/ant_export_privatesales_newsletter/mails/block-sales-two-column5.tpl

@@ -0,0 +1,90 @@
+
+<table style="{$subContainer}; overflow: hidden; position: relative; width: 100%;" border="0" cellspacing="0" cellpadding="0" width="100%">
+	<tr>
+		<td>
+			{foreach $saleList as $sale name=twoColumnForeach}
+				{if $smarty.foreach.twoColumnForeach.iteration % 2 == 1}
+						</td>
+					</tr>
+					<tr>
+						<td>
+				{/if}
+					<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" style="color: rgb(169, 174, 178); font-family: arial; font-size: 12px; padding: 5px 0px 5px 0px; background-color: rgb(243, 245, 245); border: 5px white solid; width: 50%;">
+						<tr>
+							{if $params['display_token'] == 1}
+							<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="border: none;" src="{if isset($sale.image)}{$sale.image|escape:'html':'UTF-8'}{/if}" alt="{$sale.title|lower|escape:'html':'UTF-8'}" width="{$twoColumnWidth - $padding}" height="150" /></a></td>
+							{else}
+							<td align="center"><a style="border: none;" title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{if isset($sale.image)}{$sale.image|escape:'html':'UTF-8'}{/if}" alt="{$sale.title|lower|escape:'html':'UTF-8'}" width="280" height="150" /></a></td>
+							{/if}
+						</tr>
+						<tr>
+							<td>
+								<table border="0" cellspacing="0" cellpadding="0" width="100%">
+									<tr style="text-align: left;">
+										<td style="vertical-align: top;" width="{$twoColumnWidth}">
+											<p style="margin: 0px; padding-left: 5px; line-height: 1.3em;">
+												<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969; font-size:20px;">
+													{$sale.title|escape:'html':'UTF-8'}															
+												</span>
+											</p>
+										</td>
+									</tr>
+									<tr style="text-align: left; margin-bottom: 5px">
+										<td style="vertical-align: top;" width="{$twoColumnWidth}">
+											<p style="margin: 0; padding-left: 5px; line-height: 1.3em;">
+												<span style="font-family: 'lucida sans unicode', 'lucida grande', sans-serif; color: #696969;">
+														{$sale.subtitle|escape:'html':'UTF-8'|truncate:140:' ...'}
+												</span>
+											</p>
+										</td>
+									</tr>
+									<tr>
+										<td>
+											<table border="0" cellspacing="0" cellpadding="0" width="100%" style="margin-top: 5px">
+												<tr style="text-align: left">
+                                					<td style="vertical-align: top;" width="145">
+                                    					<p style="text-align:left; display: inline-block; height: 38px; line-height: 38px; padding-left: 5px;">
+                                    					</p>
+                                					</td>
+												    {if $params['display_token'] == 1}
+												    <td style="vertical-align: center; padding: 0; text-align: center; padding-left: 5px;" width="200">
+												    	<a 	style="display: inline-block; float: right; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;"
+												    		title="{$sale.title|escape:'html':'UTF-8'}" {if $params['sale_link'] == 1}href="[[data:token]]&amp;back={$sale.link}"{else}
+												    		href="[[data:token]]&amp;back={$urlPathEncode}"{/if}>En savoir +
+												    	</a>
+												    </td>
+												    {else}
+												    <td style="vertical-align: center; padding: 0; text-align: center; padding-left: 5px;" width="200">
+												    	<a 	style="display: inline-block; float: right; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" 
+												    		title="{$sale.title|escape:'html':'UTF-8'}" 
+												    		href="http://www.privilegedemarque.com/{$tracking}">En savoir +
+												    	</a>
+												    </td>
+												    {/if}
+												</tr>
+											</table>
+										</td>
+                					</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+			{/foreach}
+			{if isset($shipping) && $shipping}
+				<table align="{if $smarty.foreach.twoColumnForeach.iteration % 2 == 0}right{else}left{/if}" border="0" cellspacing="0" cellpadding="0" width="{$twoColumnWidth}" class="sale col-xs-12 col-sm-6">
+					<tr class="rowspan">
+						<td align="center">
+							{if $params['display_token'] == 1}
+							<a style="border: none;" href="[[data:token]]&amp;back={$urlPathEncode}">
+							{else}
+							<a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}">
+							{/if}
+								<img style="border: none; padding-left: 5px;" src="{$urlImgPath|cat:'livraison-gratuite-news-bloc3.jpg'|escape:'html':'UTF-8'}" alt="{l s='Livraison gratuite' mod='ant_export_privatesales_newsletter'}" width="290" height="251" />
+							</a>
+						</td>
+					</tr>
+				</table>
+			{/if}
+		</td>
+	</tr>
+</table>

modules/ant_export_privatesales_newsletter/mails/template.tpl

@@ -1,252 +1,240 @@
-<!doctype html>
-<html style="display: block; margin: 0; padding: 0;">
-	<head>
-		<meta charset="UTF-8" />
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<style type="text/css">
-		{literal}
-		a { border: none; }
-		img { border: none; }
-		p { margin: 0; line-height: 1.3em; }
-		#footer-msg a { color: #F3A836; }
-		h1,h2,h3,h4,h5,h6 {font-size:100%;margin:0;}
-		{/literal}
-		{$mainColumn="vertical-align: top;"}
-		{$mainColumnWidth=600}
-		{$padding=10}
-		{assign var=isPart3 value=Tools::isSubmit('submitNewsletterExportPartV3')}
-		{$rowColumnWidth=($mainColumnWidth - $padding * 2)}
-		{$twoColumnWidth=($mainColumnWidth / 2) - $padding}
-		{$subContainer="color: #a9aeb2; font-family: arial; font-size: 12px; background-color: #ffffff; padding: {$padding}px 0px;"}
-		{$container="border-collapse: collapse; {$subContainer}"}
-		</style>
-	</head>
-	<body style="display: block; margin: 0; padding: 0;">
-		<table border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="email-background">
-			<tr>
-				<td style="padding: 15px 0; background-color: #f4f5f5; /*background:url('http://www.privilegedemarque.com/themes/site/img/home/background_home_nw.png') repeat center bottom #FFF*/" align="center" bgcolor="#f4f5f5" valign="top">
-					<table border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-container">
-						{if $version==3 || $version==4}
-						<tr>
-							<td align="center"><a style="border: none; display:block; padding:0px; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; font-size:12px; text-decoration:none; color: #616b75;">Ventes privées dans l'univers de la cuisine et l'art de recevoir</a></td>
-						</tr>
-						{/if}
-						<tr>
-							<td align="center" valign="top">
-								<div style="padding: 0 0 10px;"><a style="line-height: 1; vertical-align: bottom; color: #616b75; font-family: arial; font-size: 11px; border: none;" href="[[PERMALINK]]">Voir la version en ligne</a></div>
-								<table border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-body">
-									<tr>
-										<td style="border: #D2D6D9 solid 1px;" border="1" align="center" valign="top">
-											<table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-content-header">
-												<tr>
-													<td align="center" valign="top">
-													{if $params['display_token'] == 1}
-														<a style="border: none; display: block; border: none;" href="[[data:token]]&back={$urlPathEncode}"><img style="display: block; border: none;" src="{$urlImgPath}header{if $tracking_for_tokenSuffix == 'PRO'}-pro{elseif $version==3 && $subversion === true}_V4{/if}.jpg" alt="" width="100%" /></a>
-													{else}
-														<a style="border: none; display: block; border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="display: block; border: none;" src="{$urlImgPath}header{if $tracking_for_tokenSuffix == 'PRO'}-pro{elseif $version==3 && $subversion === true}_V4{/if}.jpg" alt="" width="100%" /></a>
-													{/if}
-													</td>
-												</tr>
-											</table>
-											{if $params['display_banner'] == 1}
-											<table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-content-banner">
-												<tr>
-													<td width="16">&nbsp;</td>
-													<td width="">&nbsp;</td>
-													<td width="16">&nbsp;</td>
-												</tr>
-												<tr>
-													<td width="16">&nbsp;</td>
-													<td align="center" valign="top">
-													{if $params['display_token'] == 1}
-														<a style="border: none; display: block; border: none;" href="{if $params['banner_url'] != ''}[[data:token]]&back={$params['banner_url']}{else}[[data:token]]&back={$urlPathEncode}{/if}"><img style="display: block; border: none;" src="{$urlImgPath}banner/{$random_name}.jpg" alt="" width="100%" /></a>
-													{else}
-														<a style="border: none; display: block; border: none;" href="{if $params['banner_url'] != ''}{$params['banner_url']}{$tracking}{else}http://www.privilegedemarque.com/{$tracking}{/if}"><img style="display: block; border: none;" src="{$urlImgPath}banner/{$random_name}.jpg" alt="" width="100%" /></a>
-													{/if}
-													</td>
-													<td width="16">&nbsp;</td>
-												</tr>
-											</table>
-											{/if}
-											<table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-content-body">
-												<tr>
-												{if $version!=2 && $version!=3 && $version!=4}
-													<td width="{$padding}">&nbsp;</td>
-												{/if}
-													<td align="center" valign="top" width="100%">
-														<table border="0" cellpadding="0" cellspacing="0" width="{if $version!=2 && $version!=3 && $version != 4}{$rowColumnWidth}{else}600px{/if}">
-															<tr>
-																<td style="{$container}" align="center" valign="top">
-																	{include file="{$tplFolder}block-blog.tpl"}
-																	{if $version==3 && $subversion === false}
-																		{include file="{$tplFolder}block-new2.tpl"}
-																		{include file="{$tplFolder}block-near-end2.tpl"}
-																		{include file="{$tplFolder}block-current2.tpl"}
-																	{elseif $version==3 && $subversion === true}
-																		{include file="{$tplFolder}block-new3.tpl"}
-																		{include file="{$tplFolder}block-near-end3.tpl"}
-																		{include file="{$tplFolder}block-current3.tpl"}																	
-																	{else}
-																		{include file="{$tplFolder}block-new.tpl"}
-																		{include file="{$tplFolder}block-near-end.tpl"}
-																		{include file="{$tplFolder}block-current.tpl"}
-																	{* {include file="{$tplFolder}block-message.tpl"} *}
-																	{/if}
-																</td>
-															</tr>
-														</table>
-													</td>
-												{if $version!=2 && $version!=3 && version!=4}
-													<td width="{$padding}">&nbsp;</td>
-												{/if}
-												</tr>
-											</table>
-											<table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-content-footer">
-												<tr>
-													<td width="{$padding}">&nbsp;</td>
-													<td align="center" valign="top">
-														<table border="0" cellpadding="0" cellspacing="0" width="{$rowColumnWidth}">
-															<tr>
-																<td>
-																	<table style="border-collapse: collapse; text-align: center; width: 100%; margin-bottom: 10px;" border="0" cellspacing="0" cellpadding="0">
-																		<tbody>
-																			<tr>
-																			{if $params['display_token'] == 1}
-																				<td>
-																					<a 	style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" 
-																			    		title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}">
-																			    			VOIR TOUTES LES VENTES
-																			    	</a>
-																			    </td>
-																				<!-- <td><a style="border: none;" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}see-all2.png" alt="Voir toutes les ventes" width="350" height="70" /></a></td> -->
-																			{else}
-																			<td>
-																					<a 	style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" 
-																			    		title="{$sale.title|escape:'html':'UTF-8'}" href="http://www.privilegedemarque.com/{$tracking}">
-																			    			VOIR TOUTES LES VENTES
-																			    	</a>
-																			    </td>
-																				<!-- <td><a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}see-all2.png" alt="Voir toutes les ventes" width="350" height="70" /></a></td> -->
-																			{/if}
-																			</tr>
-																		</tbody>
-																	</table>
-																</td>
-															</tr>
-															<!-- <tr>
-																<td>
-																	<table>
-																		<tbody>
-																			<tr>
-																			{if $params['display_token'] == 1}
-																				<td><a style="border: none;" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}see-all2.png" alt="Voir toutes les ventes" width="350" height="70" /></a></td>
-																			{else}
-																				<td><a style="border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}see-all2.png" alt="Voir toutes les ventes" width="350" height="70" /></a></td>
-																			{/if}
-																			</tr>
-																		</tbody>
-																	</table>
-																</td>
-															</tr> -->
-															{if $params['display_bannerfooter'] == 1}
-															<tr>
-																<td>
-																	<table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-																		<tbody>
-																			<tr>
-																			{if $params['display_token'] == 1}
-																				<td>
-																					<a style="border: none;" href="[[data:token]]&back={$urlPathFooterEncode}"><img style="border: none;" src="{$urlImgPath}bannerfooter/{$random_name_footer}.jpg" alt="" width="600" height="130" /></a>
-																				</td>
-																			{else}
-																				<td><a style="border: none;" href="{if $params['bannerfooter_url'] != ''}{$params['bannerfooter_url']}{$tracking}{else}http://www.privilegedemarque.com/{$tracking}{/if}"><img style="border: none;" src="{$urlImgPath}bannerfooter/{$random_name_footer}.jpg" alt="" width="600" height="130" /></a></td>
-																			{/if}
-																			</tr>
-																		</tbody>
-																	</table>
-																</td>
-															</tr>
-															{/if}
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <title>L'art de bien recevoir en ventes priv&eacute;es</title>
+        <style type="text/css">
+        {literal}
+        a { border: none; }
+        img { border: none; }
+        p { margin: 0; line-height: 1.3em; }
+        #footer-msg a { color: #F3A836; }
+        h1,h2,h3,h4,h5,h6 {font-size:100%;margin:0;}
+        {/literal}
+        {$mainColumn="vertical-align: top;"}
+        {$mainColumnWidth=600}
+        {$padding=10}
+        {assign var=isPart3 value=Tools::isSubmit('submitNewsletterExportPartV3')}
+        {$rowColumnWidth=($mainColumnWidth - $padding * 2)}
+        {$twoColumnWidth=($mainColumnWidth / 2) - $padding}
+        {$subContainer="color: #a9aeb2; font-family: arial; font-size: 12px; background-color: #ffffff; padding: {$padding}px 0px;"}
+        {$container="border-collapse: collapse; {$subContainer}"}
+        </style>
+    </head>
+    <body style="display: block; margin: 0; padding: 0;">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%" id="email-background">
+            <tr>
+                <td style="padding: 15px 0; background-color: #f4f5f5;" align="center" bgcolor="#f4f5f5" valign="top">
+                    <table border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-container">
+                        {if $version==3 || $version==4 || $version==5}
+                        <tr>
+                            <td align="center"><a style="border: none; display:block; padding:0px; font-family: 'lucida sans unicode', 'lucida grande', sans-serif; font-size:12px; text-decoration:none; color: #616b75;">Ventes priv&eacute;es dans l'univers de la cuisine et l'art de recevoir</a></td>
+                        </tr>
+                        {/if}
+                        <tr>
+                            <td align="center" valign="top">
+                                <div style="padding: 0 0 10px;"><a style="line-height: 1; vertical-align: bottom; color: #616b75; font-family: arial; font-size: 11px; border: none;" href="[[PERMALINK]]">Voir la version en ligne</a></div>
+                                <table border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-body">
+                                    <tr>
+                                        <td style="border: #D2D6D9 solid 1px;" align="center" valign="top">
+                                            <table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-content-header">
+                                                <tr>
+                                                    <td align="center" valign="top">
+                                                    {if $params['display_token'] == 1}
+                                                        <a style="border: none; display: block; border: none;" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="display: block; border: none;" src="{$urlImgPath}header{if $trackingSuffix == 'PRO'}-pro{elseif (($version==3 || $version==5) && $subversion === true) || ($enableV4header === true)}_V4{/if}.jpg" alt="" width="100%" /></a>
+                                                    {else}
+                                                        <a style="border: none; display: block; border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="display: block; border: none;" src="{$urlImgPath}header{if $trackingSuffix == 'PRO'}-pro{elseif (($version==3 || $version==5) && $subversion === true) || ($enableV4header === true)}_V4{/if}.jpg" alt="" width="100%" /></a>
+                                                    {/if}
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                            {if $params['display_banner'] == 1}
+                                            <table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-content-banner">
+                                                <tr>
+                                                    <td width="16">&nbsp;</td>
+                                                    <td width="">&nbsp;</td>
+                                                    <td width="16">&nbsp;</td>
+                                                </tr>
+                                                <tr>
+                                                    <td width="16">&nbsp;</td>
+                                                    <td align="center" valign="top">
+                                                    {if $params['display_token'] == 1}
+                                                        <a style="border: none; display: block; border: none;" href="{if $params['banner_url'] != ''}[[data:token]]&amp;back={$params['banner_url']}{else}[[data:token]]&amp;back={$urlPathEncode}{/if}"><img style="display: block; border: none;" src="{$urlImgPath}banner/{$random_name}.jpg" alt="" width="100%" /></a>
+                                                    {else}
+                                                        <a style="border: none; display: block; border: none;" href="{if $params['banner_url'] != ''}{$params['banner_url']}{$tracking}{else}http://www.privilegedemarque.com/{$tracking}{/if}"><img style="display: block; border: none;" src="{$urlImgPath}banner/{$random_name}.jpg" alt="" width="100%" /></a>
+                                                    {/if}
+                                                    </td>
+                                                    <td width="16">&nbsp;</td>
+                                                </tr>
+                                            </table>
+                                            {/if}
+                                            <table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-content-body">
+                                                <tr>
+                                                {if $version!=2 && $version!=3 && $version!=4 && $version!=5}
+                                                    <td width="{$padding}">&nbsp;</td>
+                                                {/if}
+                                                    <td align="center" valign="top" width="100%">
+                                                        <table border="0" cellpadding="0" cellspacing="0" width="{if $version!=2 && $version!=3 && $version!=4 && $version!=5}{$rowColumnWidth}{else}600px{/if}">
+                                                            <tr>
+                                                                <td style="{$container}" align="center" valign="top">
+                                                                    {include file="{$tplFolder}block-blog.tpl"}
+                                                                    {if $version==3 && $subversion === false}
+                                                                        {include file="{$tplFolder}block-new2.tpl"}
+                                                                        {include file="{$tplFolder}block-near-end2.tpl"}
+                                                                        {include file="{$tplFolder}block-current2.tpl"}
+                                                                    {elseif $version==3 && $subversion === true}
+                                                                        {include file="{$tplFolder}block-new3.tpl"}
+                                                                        {include file="{$tplFolder}block-near-end3.tpl"}
+                                                                        {include file="{$tplFolder}block-current3.tpl"}
+                                                                    {elseif $version==5 && $subversion === true}
+                                                                        {include file="{$tplFolder}block-new5.tpl"}
+                                                                        {include file="{$tplFolder}block-near-end5.tpl"}
+                                                                        {include file="{$tplFolder}block-current5.tpl"}
+                                                                    {else}
+                                                                        {include file="{$tplFolder}block-new.tpl"}
+                                                                        {include file="{$tplFolder}block-near-end.tpl"}
+                                                                        {include file="{$tplFolder}block-current.tpl"}
+                                                                    {/if}
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                    </td>
+                                                {if $version!=2 && $version!=3 && $version!=4 && $version!=5}
+                                                    <td width="{$padding}">&nbsp;</td>
+                                                {/if}
+                                                </tr>
+                                            </table>
+                                            <table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-content-footer">
+                                                <tr>
+                                                    <td width="{$padding}">&nbsp;</td>
+                                                    <td align="center" valign="top">
+                                                        <table border="0" cellpadding="0" cellspacing="0" width="{$rowColumnWidth}">
+                                                            <tr>
+                                                                <td>
+                                                                    <table style="border-collapse: collapse; text-align: center; width: 100%; margin-bottom: 10px;" border="0" cellspacing="0" cellpadding="0">
+                                                                        <tr>
+                                                                        {if $params['display_token'] == 1}
+                                                                            <td>
+                                                                                <a  style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" 
+                                                                                    title="voir toutes les ventes" href="http://www.privilegedemarque.com/{$tracking}">
+                                                                                    {if $version==5}
+                                                                                        voir toutes les ventes
+                                                                                    {else}
+                                                                                        VOIR TOUTES LES VENTES
+                                                                                    {/if}
+                                                                                </a>
+                                                                            </td>
+                                                                        {else}
+                                                                            <td>
+                                                                                <a  style="display: inline-block; border: none; padding:10px 7px; font-family: Arial, sans-serif;  font-size:15px; text-decoration:none; color:#fff; background-color: #F05249;" 
+                                                                                    title="voir toutes les ventes" href="http://www.privilegedemarque.com/{$tracking}">
+                                                                                    {if $version==5}
+                                                                                        voir toutes les ventes
+                                                                                    {else}
+                                                                                        VOIR TOUTES LES VENTES
+                                                                                    {/if}
+                                                                                </a>
+                                                                            </td>
+                                                                        {/if}
+                                                                        </tr>
+                                                                    </table>
+                                                                </td>
+                                                            </tr>
+                                                            {if $params['display_bannerfooter'] == 1}
+                                                            <tr>
+                                                                <td>
+                                                                    <table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
+                                                                        <tr>
+                                                                        {if $params['display_token'] == 1}
+                                                                            <td>
+                                                                                <a style="border: none;" href="[[data:token]]&amp;back={$urlPathFooterEncode}"><img style="border: none;" src="{$urlImgPath}bannerfooter/{$random_name_footer}.jpg" alt="" width="600" height="130" /></a>
+                                                                            </td>
+                                                                        {else}
+                                                                            <td><a style="border: none;" href="{if $params['bannerfooter_url'] != ''}{$params['bannerfooter_url']}{$tracking}{else}http://www.privilegedemarque.com/{$tracking}{/if}"><img style="border: none;" src="{$urlImgPath}bannerfooter/{$random_name_footer}.jpg" alt="" width="600" height="130" /></a></td>
+                                                                        {/if}
+                                                                        </tr>
+                                                                    </table>
+                                                                </td>
+                                                            </tr>
+                                                            {/if}
 
-															<tr>
-																<td>
-																	<table style="{$subContainer}" border="0" cellspacing="0" cellpadding="0" width="100%">
-																		<tbody>
-																			<tr>
-																				{if $params['display_token'] == 1}
-																				<td style="vertical-align: top; padding: 5px; text-align: center;" width="135"><a style="display: block; border: none;" href="[[data:token]]&back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}contact.jpg" alt="Service client" width="123" height="123" /></a></td>
-																				{else}
-																				<td style="vertical-align: top; padding: 5px; text-align: center;" width="135"><a style="display: block; border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}contact.jpg" alt="Service client" width="123" height="123" /></a></td>
-																				{/if}
-																				<td width="{$padding}">&nbsp;</td>
-																				<td style="vertical-align: top; padding: 5px;">
-																					<p style="text-align: center; margin: 0 0 10px; line-height: 1.3em;"><br /><br /><span style="font-size: 16px;"><span style="color: #f05349;">Besoin d'aide ou de conseils ?</span></span><br /><br /><span style="font-size: 14px;">Le service client est joignable au <strong>01 73 79 09 09</strong><br />de 9h &agrave; 12h et de 14h &agrave; 18h du lundi au vendredi.</span></p>
-																					<p style="margin: 0 0 10px; line-height: 1.3em;"><br /></p>
-																				</td>
-																			</tr>
-																		</tbody>
-																	</table>
-																</td>
-															</tr>
-															<tr>
-																<td>
-																	<hr style="margin: 5px 10px; display: block; height: 1px; line-height: 0; border: none; background-color: #b0a9a9;" />
-																</td>
-															</tr>
-															<tr>
-																<td>
-																	<p style="margin: 5px 10px; line-height: 1.3em;"><span style="color: #808080; font-size: 11px; line-height: 15.6000003814697px;">Privil&egrave;ge de Marque est un site de ventes priv&eacute;es de marques reconnues par les professionnels de l&rsquo;h&ocirc;tellerie restauration. Vous pouvez retrouver : des ustensiles de cuisine, des arts de la table, de l&rsquo;&eacute;lectrom&eacute;nager et de la d&eacute;coration.</span><br style="color: #808080; font-size: 11px; line-height: 15.6000003814697px;" /><span style="color: #808080; font-size: 11px; line-height: 15.6000003814697px;">De nombreuses marques reconnues par les professionnels de l&rsquo;h&ocirc;tellerie restauration nous font confiance. Les services de Privil&egrave;ge de marque permettent de mutualiser les frais de port, un paiement s&eacute;curis&eacute;, de pouvoir changer d&rsquo;avis sous 14 jours et d&rsquo;&ecirc;tre accueilli par t&eacute;l&eacute;phone par une &eacute;quipe &agrave; l&rsquo;&eacute;coute.</span><br style="color: #808080; font-size: 11px; line-height: 15.6000003814697px;" /><span style="color: #808080; font-size: 11px; line-height: 15.6000003814697px;">Privil&egrave;ge de marque est d&eacute;di&eacute; aux amateurs de cuisine et d&rsquo;art de recevoir mais aussi aux professionnels !</span><br style="color: #808080; font-size: 11px; line-height: 15.6000003814697px;" /><span style="color: #808080; font-size: 11px; line-height: 15.6000003814697px;">B&eacute;n&eacute;ficiez de remises allant jusqu'&agrave; -70% sur les plus grandes marques du secteur de l'h&ocirc;tellerie restauration.</span></p>
-																</td>
-															</tr>
-															<tr>
-																<td>
-																	<div style="margin: {$padding}px; text-align: center;">
-																		<a style="color: #f05249; border: none;" href="{$cms[0]['link']}{$tracking}">Qui sommes nous ?</a><span style="line-height: 15.6000003814697px; text-align: center;"> - </span>
-																		<a style="color: #f05249; border: none;" href="{$cms[1]['link']}{$tracking}">Contact</a> <span style="line-height: 15.6000003814697px; text-align: center;">- </span>
-																		<a style="color: #f05249; border: none;" href="{$cms[2]['link']}{$tracking}">FAQ</a> <span style="line-height: 15.6000003814697px; text-align: center;">- </span>
-																		<a style="color: #f05249; border: none;" href="{$cms[3]['link']}{$tracking}">Mentions l&eacute;gales</a> <span style="line-height: 15.6000003814697px; text-align: center;">- </span>
-																		<a style="color: #f05249; border: none;" href="{$cms[4]['link']}{$tracking}">Protection des donn&eacute;es personnelles</a>
-																	</div>
-																</td>
-															</tr>
-														</table>
-													</td>
-													<td width="{$padding}">&nbsp;</td>
-												</tr>
-											</table>
-											<table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-footer">
-												<tbody>
-													<tr>
-														<td style="color: #9ba5ad; background-color: #fcedec; border-color: #fcedec; align: center; font-family: arial; font-size: 11px;">
-															<div id="nl_footer" style="display: block; text-align: center; margin: {$padding}px;">Cet email a &eacute;t&eacute; envoy&eacute; &agrave; <a style="color: #; border: none;" href="mailto:[[EMAIL_TO]]">[[EMAIL_TO]]</a>, <a style="color: #616b75; border: none;" href="[[UNSUB_LINK_FR]]">cliquez ici pour vous d&eacute;sabonner</a>.</div>
-															<div id="footer_address" style="display: block; text-align: center; margin: {$padding}px;">Privilegedemarque<br /> 2 place Jules Gévelot<br /> 92130 Issy-les-Moulineaux<br /></div>
-														</td>
-													</tr>
-												</tbody>
-											</table>
-										</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html><!--Changer la frequence NL-->
-		{*<tr>
-			<td>
-				<table style="border-collapse: collapse; text-align: center; width: 100%;" border="0" cellspacing="0" cellpadding="0">
-					<tbody>
-						<tr>
-						{if $params['display_token'] == 1}
-							<td><a style="border: none; text-decoration:none; color: #f05249;" href="[[data:token]]&back={$urlPathFrequenceEncode}">Modifier la <span style="text-decoration: underline;">fréquence</span> des newsletters</a></td>
-						{else}
-							<td><a style="border: none; text-decoration:none; color: #f05249;" href="http://www.privilegedemarque.com/{$tracking}">Modifier la <span style="text-decoration: underline;">fréquence</span> des newsletters</a></td>
-						{/if}
-						</tr>
-					</tbody>
-				</table>
-			</td>
-		</tr>*}
+                                                            <tr>
+                                                                <td>
+                                                                    <table style="{$subContainer}" border="0" cellspacing="0" cellpadding="0" width="100%">
+                                                                        <tr>
+                                                                            {if $params['display_token'] == 1}
+                                                                            <td style="vertical-align: top; padding: 5px; text-align: center;" width="135"><a style="display: block; border: none;" href="[[data:token]]&amp;back={$urlPathEncode}"><img style="border: none;" src="{$urlImgPath}contact.jpg" alt="Service client" width="123" height="123" /></a></td>
+                                                                            {else}
+                                                                            <td style="vertical-align: top; padding: 5px; text-align: center;" width="135"><a style="display: block; border: none;" href="http://www.privilegedemarque.com/{$tracking}"><img style="border: none;" src="{$urlImgPath}contact.jpg" alt="Service client" width="123" height="123" /></a></td>
+                                                                            {/if}
+                                                                            <td width="{$padding}">&nbsp;</td>
+                                                                            <td style="vertical-align: top; padding: 5px;">
+                                                                                <p style="text-align: center; margin: 0 0 10px; line-height: 1.3em;"><br /><br /><span style="font-size: 16px;"><span style="color: #f05349;">Besoin d'aide ou de conseils ?</span></span><br /><br /><span style="font-size: 14px;">Le service client est joignable au <strong>01 73 79 09 09</strong><br />de 9h30 &agrave; 12h et de 14h &agrave; 17h du lundi au vendredi.</span></p>
+                                                                                <p style="margin: 0 0 10px; line-height: 1.3em;"><br /></p>
+                                                                            </td>
+                                                                        </tr>
+                                                                    </table>
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <hr style="margin: 5px 10px; display: block; height: 1px; line-height: 0; border: none; background-color: #b0a9a9;" />
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <p style="margin: 5px 10px; line-height: 16px; color: #808080; font-size: 11px; ">
+                                                                    Privil&egrave;ge de Marque c&rsquo;est l&rsquo;Art de bien recevoir en ventes priv&eacute;es !
+                                                                    <br />
+                                                                    Privilegedemarque.com est le premier site de ventes priv&eacute;es sp&eacute;cialis&eacute; dans les arts de la table, les ustensiles de cuisine et le petit &eacute;quipement. Villeroy&amp;Boch, Tefal, Pyrex, Bragard, Staub, De Buyer, Guy Degrenne…des ventes priv&eacute;es de grandes marques avec des remises allant jusqu&rsquo;&agrave; -80% !
+                                                                    <br />
+                                                                    Tous les jours, 3 &agrave; 5 nouvelles ventes &eacute;v&egrave;nementielles sont propos&eacute;s aux membres. Le site est destin&eacute; aux amateurs passionn&eacute;s de cuisine et d&rsquo;art de recevoir mais aussi aux professionnels (restaurant, h&ocirc;telier, gites, Air Bnb…) L&rsquo;acc&egrave;s aux ventes est r&eacute;serv&eacute; aux membres inscrits, l&rsquo;inscription est libre et gratuite.
+                                                                    <br />
+                                                                    Pour que votre exp&eacute;rience chez Privil&egrave;ge de Marque soit pleinement satisfaisante, nous vous garantissons : une livraison en Points-Relais ou &agrave; domicile / un paiement 100% s&eacute;curis&eacute; / un Service Clients &agrave; votre disposition &agrave; la rubrique contact ou par t&eacute;l&eacute;phone du Lundi au Vendredi de 9h30 &agrave; 12h et de 14h &agrave; 17h / un service apr&egrave;s-vente de qualit&eacute; qui s&rsquo;engage, dans la mesure du possible, &agrave; prendre en charge vos retours de marchandises.
+                                                                    <br />
+                                                                    Chaque ami que vous parrainez gagne 10 euros de bons d&rsquo;achat. D&egrave;s sa premi&egrave;re commande, vous gagnez vous aussi 10 euros de bons d&rsquo;achat !
+                                                                    <br />
+                                                                    Commandez chez Privil&egrave;ge de Marque et b&eacute;n&eacute;ficiez de bons d&rsquo;achat sur vos prochaines commandes gr&acirc;ce aux cr&eacute;dits fid&eacute;lit&eacute;.
+                                                                    </p>
+
+                                                                </td>
+                                                            </tr>
+                                                            <tr>
+                                                                <td>
+                                                                    <div style="margin: {$padding}px; text-align: center;">
+                                                                        <a style="color: #f05249; border: none;" href="{$cms[0]['link']}{$tracking}">Qui sommes nous ?</a><span style="line-height: 15.6000003814697px; text-align: center;"> - </span>
+                                                                        <a style="color: #f05249; border: none;" href="{$cms[1]['link']}{$tracking}">Contact</a> <span style="line-height: 15.6000003814697px; text-align: center;">- </span>
+                                                                        <a style="color: #f05249; border: none;" href="{$cms[2]['link']}{$tracking}">FAQ</a> <span style="line-height: 15.6000003814697px; text-align: center;">- </span>
+                                                                        <a style="color: #f05249; border: none;" href="{$cms[3]['link']}{$tracking}">Mentions l&eacute;gales</a> <span style="line-height: 15.6000003814697px; text-align: center;">- </span>
+                                                                        <a style="color: #f05249; border: none;" href="{$cms[4]['link']}{$tracking}">Protection des donn&eacute;es personnelles</a>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                    </td>
+                                                    <td width="{$padding}">&nbsp;</td>
+                                                </tr>
+                                            </table>
+                                            <table style="{$container}" border="0" cellpadding="0" cellspacing="0" width="{$mainColumnWidth}" id="email-footer">
+                                                <tr>
+                                                    <td style="color: #9ba5ad; background-color: #fcedec; border-color: #fcedec; align: center; font-family: arial; font-size: 11px;">
+                                                        <div id="nl_footer" style="display: block; text-align: center; margin: {$padding}px;">Cet email a &eacute;t&eacute; envoy&eacute; &agrave; <a style="color: #; border: none;" href="mailto:[[EMAIL_TO]]">[[EMAIL_TO]]</a>
+                                                        <br /><br /><a style="color: #616b75; border: none;" href="[[data:token]]&amp;back={$urlPathFrequenceEncode}">Pour modifier votre fr&eacute;quence de newsletter ou vous désabonner suivez ce lien</a>.
+                                                        <!-- [[UNSUB_LINK_FR]] -->
+                                                        </div>
+                                                        <div id="footer_address" style="display: block; text-align: center; margin: {$padding}px;">Privilegedemarque<br /> 2 place Jules G&eacute;velot<br /> 92130 Issy-les-Moulineaux<br /></div>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+    </body>
+</html>

modules/ant_nw_frequences/ant_nw_frequences.php

@@ -78,5 +78,4 @@ class ant_nw_frequences extends Module
         );
         return $tab_routes;
     }
-
 }

modules/ant_nw_frequences/controllers/front/frequence.php

@@ -2,15 +2,16 @@
 /**
  * @company Antadis
  */
- 
-class ant_nw_frequencesfrequenceModuleFrontController extends ModuleFrontController {
 
+class ant_nw_frequencesfrequenceModuleFrontController extends ModuleFrontController 
+{
     public function init()
     {
-        if (!$this->context->customer->isLogged())
-            Tools::redirect('index.php?controller=authentication&back=modules/ant_nw_frequences/ant_nw_frequences-frequence.php');
-
         parent::init();
+        
+        if (!$this->context->customer->isLogged()){
+            Tools::redirect('index.php?controller=authentication&back=modules/ant_nw_frequences/ant_nw_frequences-frequence.php');
+        }
         $this->customer = $this->context->customer;
     }
 
@@ -20,45 +21,49 @@ class ant_nw_frequencesfrequenceModuleFrontController extends ModuleFrontControl
         if (Module::isInstalled('blocknewsletter')) {
             $this->context->smarty->assign('newsletter', (int)Module::getInstanceByName('blocknewsletter')->active);
         }
-        $this->context->smarty->assign('optin', $this->customer->optin);
-        $this->context->smarty->assign('frequence_nw', $this->customer->frequence_nw);
-        $this->context->smarty->assign('isnewsletter', $this->customer->newsletter);
+        
+        if ((int)$this->customer->newsletter == 1) {
+            $this->context->smarty->assign('frequence_nw', $this->customer->frequence_nw);
+        }
+        else {
+            $this->context->smarty->assign('frequence_nw', 'unsub');
+        }
         $this->setTemplate('frequence.tpl');
     }
 
-    public function postProcess(){
-        $freq_h = 1;
-        $freq_3x = 2;
-
+    public function postProcess()
+    {
         $origin_newsletter = (bool)$this->customer->newsletter;
 
         if (Tools::isSubmit('submitFrequence')){
 
-            if (!Tools::getIsset('newsletter')) {
+            $freq = Tools::getValue('frequence_nw', '0');
+
+            if ($freq == 'unsub') {
                 $this->customer->newsletter = 0;
-            } elseif (!$origin_newsletter && Tools::getIsset('newsletter')) {
-                $this->customer->newsletter = 1;
-                if ($module_newsletter = Module::getInstanceByName('blocknewsletter')) {
-                    if ($module_newsletter->active) {
-                        $module_newsletter->confirmSubscription($this->customer->email);
+            } 
+            else {
+
+                if (!$origin_newsletter) {
+                    $this->customer->newsletter = 1;
+
+                    if ($module_newsletter = Module::getInstanceByName('blocknewsletter')) {
+                        if ($module_newsletter->active) {
+                            $module_newsletter->confirmSubscription($this->customer->email);
+                        }
                     }
                 }
-            }
 
-            if (Tools::getValue('frequence_nw')) {
-                $this->customer->frequence_nw = (int)Tools::getValue('frequence_nw');
-            } else {
-                $this->customer->frequence_nw = 0;
-            }
-
-            if (!Tools::getIsset('optin')) {
-                $this->customer->optin = 0;
-            } else {
-                $this->customer->optin = 1;
+                $this->customer->frequence_nw = (int)$freq;
             }
 
             if ($this->customer->update()) {
-                $this->context->smarty->assign('confirmation', 1);
+                if ($freq == 'unsub') {
+                    $this->context->smarty->assign('confirmation_unsub', 1);
+                }
+                else {
+                    $this->context->smarty->assign('confirmation', 1);
+                }
             }
 
         }

modules/ant_nw_frequences/views/templates/front/frequence.tpl

@@ -37,6 +37,7 @@
 <div class="row">
     <div class='snotmobile col-xs-3 left-account'>
         <div class="block-left-account">
+
             <h2 class="account">{l s='Votre compte' mod='ant_nw_frequences'}</h2>
             <ul>
                 <li>
@@ -94,6 +95,10 @@
             <p class="alert alert-success">
                 {l s='Your personal information has been successfully updated.' mod='ant_nw_frequences'}
             </p>
+        {elseif isset($confirmation_unsub) && $confirmation_unsub}
+            <p class="alert alert-success">
+                {l s='Votre demande de désabonnement à nos newsletters a bien été enregistrée. Celle-ci sera prise en compte dans les plus brefs délais.' mod='ant_nw_frequences'}
+            </p>
         {else}
             <form action="{$link->getModuleLink('ant_nw_frequences','frequence')|escape:'html':'UTF-8'}" method="post" class="std">
                 <fieldset>
@@ -101,7 +106,6 @@
                         <div class="col-xs-12 form-group">
                             <div class="checkbox">
                                 <label for="newsletter">
-                                    <input type="checkbox" id="newsletter" name="newsletter" value="1" {if (isset($smarty.post.newsletter) && $smarty.post.newsletter == 1) || $isnewsletter == 1} checked="checked"{/if}/>
                                     {l s='Sign up for our newsletter!' mod='ant_nw_frequences'}
                                 </label>
                             </div>
@@ -111,7 +115,7 @@
                                 <div class="form-group col-xs-12 col-md-12 clearfix">
                                     <div class="radio">
                                         <label for="frequence_q">
-                                            <input class="frequence_nw" type="radio" name="frequence_nw" id="frequence_q" value="0" {if (isset($smarty.post.frequence_nw) && $smarty.post.frequence_nw == 0) || $frequence_nw == 0} checked="checked"{/if}/>
+                                            <input class="frequence_nw" type="radio" name="frequence_nw" id="frequence_q" value="0" {if (isset($smarty.post.frequence_nw) && $smarty.post.frequence_nw == 0) || $frequence_nw == '0'} checked="checked"{/if}/>
                                             {l s='Newsletter quotidienne' mod='ant_nw_frequences'}
                                         </label>
                                     </div>
@@ -120,7 +124,7 @@
                                 <div class="form-group col-xs-12 col-md-12 clearfix">
                                     <div class="radio">
                                         <label for="frequence_3">
-                                            <input class="frequence_nw" type="radio" name="frequence_nw" id="frequence_3" value="2" {if (isset($smarty.post.frequence_nw) && $smarty.post.frequence_nw == 2) || $frequence_nw == 2} checked="checked"{/if}/>
+                                            <input class="frequence_nw" type="radio" name="frequence_nw" id="frequence_3" value="2" {if (isset($smarty.post.frequence_nw) && $smarty.post.frequence_nw == 2) || $frequence_nw == '2'} checked="checked"{/if}/>
                                             {l s='3 fois par semaine' mod='ant_nw_frequences'}
                                         </label>
                                     </div>
@@ -129,20 +133,22 @@
                                 <div class="form-group col-xs-12 col-md-12 clearfix">
                                     <div class="radio">
                                         <label for="frequence_h">
-                                            <input class="frequence_nw" type="radio" name="frequence_nw" id="frequence_h" value="1" {if (isset($smarty.post.frequence_nw) && $smarty.post.frequence_nw == 1) || $frequence_nw == 1} checked="checked"{/if}/>
+                                            <input class="frequence_nw" type="radio" name="frequence_nw" id="frequence_h" value="1" {if (isset($smarty.post.frequence_nw) && $smarty.post.frequence_nw == 1) || $frequence_nw == '1'} checked="checked"{/if}/>
                                             {l s='Newsletter hebdomadaire' mod='ant_nw_frequences'}
                                         </label>
                                     </div>
                                     <div class="">{l s='Recevez un aperçu des ventes en cours' mod='ant_nw_frequences'}</div>
                                 </div>
-                            </div>
-                        </div>
-                        <div class="col-xs-12 form-group">
-                            <div class="checkbox">
-                                <label for="optin">
-                                    <input type="checkbox" name="optin" id="optin" value="1" {if (isset($smarty.post.optin) && $smarty.post.optin == 1) || $optin == 1} checked="checked"{/if}/>
-                                    {l s='Receive special offers from our partners!' mod='ant_nw_frequences'}
-                                </label>
+                               
+                                <div class="form-group col-xs-12 col-md-12 clearfix">
+                                    <div class="radio">
+                                        <label for="frequence_unsub">
+                                            <input class="frequence_nw" type="radio" name="frequence_nw" id="frequence_unsub" value="unsub" {if (isset($smarty.post.frequence_nw) && $smarty.post.frequence_nw == 'unsub') || $frequence_nw == 'unsub'} checked="checked"{/if}/>
+                                            {l s='Se désabonner' mod='ant_nw_frequences'}
+                                        </label>
+                                    </div>
+                                </div>
+                                
                             </div>
                         </div>
                     {/if}

modules/ant_popover/js/ant_popover.min.js

@@ -0,0 +1,7 @@
+$(document).ready(function(){AntPopover._init();});var AntPopover={conf:{'enable_delay':0,'disable_delay':10000,'cookie_lifetime':30*24*60*60,'cart':{'display':20000,'cookie_lifetime':30*24*60*60},'customer':{'display':0,'cookie_lifetime':30*24*60*60},'product':{'display':45000,'cookie_lifetime':30*24*60*60,'countdownLayout':'<span class="ap_timer_item ap_timer_d">'+'<span class="ap_timer_label">{dl}</span>'+'<span class="ap_timer_value ap_timer_value_dozen">{d10}<i class="inner_sep"></i></span>'+'<span class="ap_timer_value ap_timer_value_units">{d1}<i class="inner_sep"></i></span>'+'</span>'+'<span class="ap_timer_sep">:</span>'+'<span class="ap_timer_item ap_timer_h">'+'<span class="ap_timer_label">{hl}</span>'+'<span class="ap_timer_value ap_timer_value_dozen">{h10}<i class="inner_sep"></i></span>'+'<span class="ap_timer_value ap_timer_value_units">{h1}<i class="inner_sep"></i></span>'+'</span>'+'<span class="ap_timer_sep">:</span>'+'<span class="ap_timer_item ap_timer_i">'+'<span class="ap_timer_label">{ml}</span>'+'<span class="ap_timer_value ap_timer_value_dozen">{m10}<i class="inner_sep"></i></span>'+'<span class="ap_timer_value ap_timer_value_units">{m1}<i class="inner_sep"></i></span>'+'</span>'},'concours':{'display':0,'cookie_lifetime':12*60*60},'promo':{'display':3000,'cookie_lifetime':24*60*60}},overlay:$('.ap_overlay'),popups:[$('#ANT_POPOVER_CART_YIELD'),$('#ANT_POPOVER_CUSTOMER_YIELD'),$('#ANT_POPOVER_PRODUCT_YIELD'),$('#ANT_POPOVER_CONCOURS_YIELD'),$('#ANT_POPOVER_PROMO_YIELD')],triggered:false,_init:function(){var ap_intiTimer=new YTimer(function(){AntPopover._cartYieldInit();AntPopover._customerYieldInit();AntPopover._productYieldInit();AntPopover._concoursYieldInit();AntPopover._promoYieldInit();},AntPopover.conf.enable_delay);$('.ant_popover_container .close, .ant_popover_container .ap_btn').click(function(){var container=$(this).closest('.ant_popover_container');AntPopover.closePopup(container);});$('.ap_overlay').click(function(){AntPopover.closePopups();});$('.ap_add_to_cart').click(function(e){e.preventDefault();AntPopover.addToCart();});$('.ap_text_link').click(function(e){e.preventDefault();var container=$(this).closest('.ant_popover_container');var ap_event=container.data('event');var link=$(this).attr('href');AntPopover._ajaxCall(ap_event,1,0,function(resp){$('.ap_overlay').removeClass('shown');container.removeClass('shown').addClass('closed');window.location.href=link;});});},_cartYieldInit:function(){console.log($('#ANT_POPOVER_CART_YIELD'));console.log(AntPopover.conf.cart.cookie_lifetime);if($('#ANT_POPOVER_CART_YIELD').length){AntPopover.displayOnLeave('cart',$('#ANT_POPOVER_CART_YIELD'),AntPopover.conf.cart.cookie_lifetime);}},_customerYieldInit:function(){if($('#ANT_POPOVER_CUSTOMER_YIELD').length){AntPopover.displayOnStay('customer',$('#ANT_POPOVER_CUSTOMER_YIELD'),AntPopover.conf.customer.cookie_lifetime,AntPopover.conf.customer.display);}},_productYieldInit:function(){if($('#ANT_POPOVER_PRODUCT_YIELD').length){AntPopover.displayOnLeave('product',$('#ANT_POPOVER_PRODUCT_YIELD'),AntPopover.conf.product.cookie_lifetime);var now=new Date();if(endofsale-now<31536000000)$('#ANT_POPOVER_PRODUCT_YIELD .ap_timer').countdown({serverSync:function(){return new Date();},padZeroes:true,until:endofsale,layout:AntPopover.countdownLayout});else
+$('#ANT_POPOVER_PRODUCT_YIELD .ap_countdown_field').remove();}},_concoursYieldInit:function(){if($('#ANT_POPOVER_CONCOURS_YIELD').length){AntPopover.displayOnStay('concours',$('#ANT_POPOVER_CONCOURS_YIELD'),AntPopover.conf.concours.cookie_lifetime,AntPopover.conf.concours.display);}},_promoYieldInit:function(){if($('#ANT_POPOVER_PROMO_YIELD').length&&$(window).width()>767){AntPopover.displayOnStay('promo',$('#ANT_POPOVER_PROMO_YIELD'),AntPopover.conf.promo.cookie_lifetime,AntPopover.conf.promo.display);}},displayOnStay:function(event,element,cookie_lifetime,delay){var _ydost=new YTimer(function(){AntPopover.displayPopup(event,element,cookie_lifetime,delay);},delay);},displayOnLeave:function(event,element,cookie_lifetime){$('body').mouseleave(function(){AntPopover.displayPopup(event,element,cookie_lifetime,AntPopover.conf.disable_delay);});},displayPopup:function(ap_event,element,cookie_lifetime,delay){if(typeof(element)==='undefined')return;if(element.hasClass('closed')||element.hasClass('tmp_closed'))return;AntPopover._ajaxCall(ap_event,0,cookie_lifetime,function(resp){if(resp===true){if(!$('input:focus').length&&!$('.ant_popover_container.shown').length){element.addClass('shown');$('header').addClass('ap_overlay_header');$('.ap_overlay').addClass('shown');}else if(typeof(delay!=='undefined')&&delay){_pdtid=new YTimer(function(){AntPopover.displayPopup(ap_event,element,delay,cookie_lifetime);},delay);}}});},closePopups:function(){AntPopover.closePopup($('.ant_popover_container.shown'));},closePopup:function(element){$('.ap_overlay').removeClass('shown');$('header').removeClass('ap_overlay_header');var ap_event=element.data('event');AntPopover._ajaxCall(ap_event,1,0,function(resp){});element.removeClass('shown').addClass('closed');},addToCart:function(){var add_button=$('#buy_block #add_to_cart .btn');add_button.click();AntPopover.closePopups();},_ajaxCall:function(ap_event,update,lifetime,callback){if(typeof(update)==='undefined')update=0;if(typeof(lifetime)==='undefined')lifetime=AntPopover.conf.cookie_lifetime;$.ajax({type:"POST",url:ap_ajax_path,cache:false,dataType:"json",data:{ajax:true,ap_event:ap_event,update:update,lifetime:lifetime,},success:function(data){callback(data);}});},__shutdown:function(){$('.ap_overlay').removeClass('shown');if(typeof(_pctid)!=='undefined')clearTimeout(_pctid)
+if(typeof(_pytid)!=='undefined')clearTimeout(_pytid)
+if(typeof(_pdtid)!=='undefined')clearTimeout(_pdtid)
+$('.ant_popover_container').removeClass('shown').addClass('closed');},__restart:function(){$('.ant_popover_container').removeClass('shown closed tmp_closed');$('.ap_overlay').removeClass('shown');this._init();}}
+function YTimer(callback,time){this.setTimeout(callback,time);}YTimer.prototype.setTimeout=function(callback,time){var self=this;if(this.timer){clearTimeout(this.timer);}this.finished=false;this.callback=callback;this.time=time;this.timer=setTimeout(function(){self.finished=true;callback();},time);this.start=Date.now();}
+YTimer.prototype.add=function(time){if(!this.finished){time=this.time-(Date.now()-this.start)+time;this.setTimeout(this.callback,time);}}

modules/antadismarketing/classes/AntStats.php

@@ -5,110 +5,228 @@ class AntStats extends ObjectModel
 
     public static function getOrdersTotalByDate($date_from = null, $date_to = null)
     {
-        $req = 'SELECT 
-            a.id_tracking, 
-            a.date, 
-            SUM(a.total_products) AS total_products,
-            SUM(a.total_order) AS total_order,
-            SUM(a.total_products_price) AS total_products_price,
-            SUM(a.total_products_price_tax_excl) AS total_products_price_tax_excl,
-            SUM(a.total_wholesale_price) AS total_wholesale_price,
-            SUM(a.subscribe) AS subscribe, 
-            SUM(a.visits) AS visits,
-            (total_order/cout) as cout_order,
-            (subscribe/cout) as cout_subscribe,
-            (visits/cout) as cout_visits
-        FROM 
-            '._DB_PREFIX_.'ant_marketing_tracking at
-        LEFT OUTER JOIN
-        ( 
-            (
-                SELECT 
-                    atu.id_tracking AS id_tracking,
-                    DATE_FORMAT(o.`date_add`, "%Y-%m-%d") AS date,
-                    SUM(d.`product_quantity`) AS `total_products`, 
-                    COUNT(DISTINCT(d.id_order)) AS total_order,
-                    SUM( 
-                        ROUND( 
-                            d.unit_price_tax_incl  * d.`product_quantity`, 6
-                        ) 
-                    ) AS `total_products_price`,
-                    SUM( 
-                        ROUND( 
-                            d.unit_price_tax_excl  * d.`product_quantity`, 6
-                        ) 
-                    ) AS `total_products_price_tax_excl`,
-                    CASE 
-                        WHEN pas.wholesale_price IS NULL AND d.product_attribute_id != 0 
-                            THEN SUM(pas.wholesale_price * d.`product_quantity`) 
-                        ELSE SUM(ps.wholesale_price * d.`product_quantity`) 
-                    END AS total_wholesale_price,
-                    NULL AS subscribe,
-                    NULL AS visits
-                FROM  `'._DB_PREFIX_.'orders` o
-                LEFT JOIN `'._DB_PREFIX_.'ant_marketing_tracking_users` atu
-                    ON o.id_customer = atu.id_customer
-                RIGHT JOIN `'._DB_PREFIX_.'order_detail` d 
-                    ON o.id_order = d.id_order 
-                LEFT OUTER JOIN `'._DB_PREFIX_.'product_shop` ps
-                    ON ps.id_shop = o.id_shop AND ps.id_product = d.product_id
-                LEFT OUTER JOIN `'._DB_PREFIX_.'product_attribute_shop` pas
-                    ON (d.product_attribute_id != 0 AND pas.id_product_attribute = d.product_attribute_id)
-                WHERE EXISTS (
-                    SELECT 
-                        id_order_state 
-                    FROM 
-                        '._DB_PREFIX_.'order_history oh
-                    WHERE 
-                        o.id_order = oh.id_order
-                    ORDER BY 
-                        id_order_history 
-                        DESC 
-                    LIMIT 1
-                )
-                NOT IN ("'.implode('","', self::getStateNull()).'")
-                GROUP BY atu.id_tracking, date
-            ) 
-            UNION 
-            (  
-                SELECT 
-                    atc.id_tracking, 
-                    DATE_FORMAT(atc.`date`, "%Y-%m-%d") AS date, 
-                    NULL AS total_products,
-                    NULL AS total_order,
-                    NULL AS total_products_price,
-                    NULL AS total_products_price_tax_excl,
-                    NULL AS total_wholesale_price,
-                    COUNT(id_customer) AS subscribe, 
-                    NULL AS visits
-                FROM 
-                    `'._DB_PREFIX_.'ant_marketing_tracking_users` atc 
-                GROUP BY id_tracking
-            )  
-            UNION 
-            (  
-                SELECT 
-                    atv.id_tracking, 
-                    DATE_FORMAT(atv.`date`, "%Y-%m-%d") AS date, 
-                    NULL AS total_products,
-                    NULL AS total_order,
-                    NULL AS total_products_price,
-                    NULL AS total_products_price_tax_excl, 
-                    NULL AS total_wholesale_price,
-                    NULL AS subscribe, 
-                    atv.nb_visits AS visits
-                FROM 
-                    `'._DB_PREFIX_.'ant_marketing_tracking_visits` atv 
-            )     
-        ) a 
-        ON a.id_tracking = at.id_tracking  
-        GROUP BY a.id_tracking, a.date
-        ';
-            
-        $total = Db::getInstance()->executeS($req);
+        $id_shop = 1;
+        $default_array = array(
+                        'total_products' => 0,
+                        'total_order' => 0,
+                        'total_products_price' => 0,
+                        'total_products_price_tax_excl' => 0,
+                        'total_wholesale_price' => 0,
+                        'subscribe' => 0,
+                        'visits' => 0,
+                        'cout_order' => 0,
+                        'cout_subscribe' => 0,
+                        'cout_visits' => 0,
+                    );
 
-        Db::getInstance()->delete('ant_marketing_stats');
-        Db::getInstance()->insert('ant_marketing_stats', $total);
+        foreach(Db::getInstance()->executeS('SELECT * FROM '._DB_PREFIX_.'ant_marketing_tracking') as $tracking) {
+            $totals = array();
+            //VISITS
+            $visits = Db::getInstance()->executeS('SELECT DATE_FORMAT(atv.`date`, "%Y-%m-%d") AS date, SUM(nb_visits) as visits
+                FROM  `'._DB_PREFIX_.'ant_marketing_tracking_visits` atv
+                WHERE atv.id_tracking = '.(int)$tracking['id_tracking'].'
+                GROUP BY DATE_FORMAT(atv.`date`, "%Y-%m-%d")');
+            foreach($visits as $visit) {
+
+                if(!isset($totals[$visit['date']])) {
+                    $totals[$visit['date']] = $default_array;
+                }
+
+                $totals[$visit['date']]['visits'] = $visit['visits'];
+            }
+
+            //SUBSCRIBE
+            $subscribes = Db::getInstance()->executeS('SELECT COUNT(*) as count_subscribe, DATE_FORMAT(atu.`date`, "%Y-%m-%d") AS date
+                FROM  `'._DB_PREFIX_.'ant_marketing_tracking_users` atu
+                WHERE atu.id_tracking = '.(int)$tracking['id_tracking'].'
+                GROUP BY DATE_FORMAT(atu.`date`, "%Y-%m-%d")');
+            foreach($subscribes as $subscribe) {
+
+                if(!isset($totals[$subscribe['date']])) {
+                    $totals[$subscribe['date']] = $default_array;
+                }
+
+                $totals[$subscribe['date']]['subscribe'] = $subscribe['count_subscribe'];
+            }
+
+
+            //ORDER
+            $orders = Db::getInstance()->executeS('SELECT id_order, DATE_FORMAT(o.`date_add`, "%Y-%m-%d") AS date
+                FROM  `'._DB_PREFIX_.'ant_marketing_tracking_users` atu
+                LEFT JOIN `'._DB_PREFIX_.'orders` o
+                    ON o.id_customer = atu.id_customer
+                WHERE o.current_state NOT IN ("'.implode('","', self::getStateNull()).'")
+                AND atu.id_tracking = '.(int)$tracking['id_tracking']);
+
+            if($orders) {
+
+                $orders_infos = array();
+                foreach($orders as $order) {
+                    $orders_infos[(int)$order['id_order']] = $order;
+
+                    if(!isset($totals[$order['date']])) {
+                        $totals[$order['date']] = $default_array;
+                    }
+                }
+
+                foreach(Db::getInstance()->executeS('SELECT 
+                        id_order,
+                        SUM(d.`product_quantity`) AS `total_products`, 
+                        SUM( 
+                            ROUND( 
+                                d.unit_price_tax_incl  * d.`product_quantity`, 6
+                            ) 
+                        ) AS `total_products_price`,
+                        SUM( 
+                            ROUND( 
+                                d.unit_price_tax_excl  * d.`product_quantity`, 6
+                            ) 
+                        ) AS `total_products_price_tax_excl`,
+                        CASE 
+                            WHEN pas.wholesale_price IS NULL AND d.product_attribute_id != 0 
+                                THEN SUM(pas.wholesale_price * d.`product_quantity`) 
+                            ELSE SUM(ps.wholesale_price * d.`product_quantity`) 
+                        END AS total_wholesale_price,
+                        NULL AS subscribe,
+                        NULL AS visits
+                    FROM  `'._DB_PREFIX_.'order_detail` d 
+                    LEFT OUTER JOIN `'._DB_PREFIX_.'product_shop` ps
+                        ON ps.id_shop = '.(int)$id_shop.' AND ps.id_product = d.product_id
+                    LEFT OUTER JOIN `'._DB_PREFIX_.'product_attribute_shop` pas
+                        ON (d.product_attribute_id != 0 AND pas.id_product_attribute = d.product_attribute_id)
+                    WHERE id_order IN ('.implode(',', array_keys($orders_infos)).')
+                    GROUP BY id_order') as $order_detail) {
+                    $current_order = $orders_infos[$order_detail['id_order']];
+
+                    $totals[$current_order['date']]['total_products'] += $order_detail['total_products'];
+                    $totals[$current_order['date']]['total_order'] += 1;
+                    $totals[$current_order['date']]['total_products_price'] += $order_detail['total_products_price'];
+                    $totals[$current_order['date']]['total_products_price_tax_excl'] += $order_detail['total_products_price_tax_excl'];
+                    $totals[$current_order['date']]['total_wholesale_price'] += $order_detail['total_wholesale_price'];
+                }
+            }
+
+            $query = array();
+            foreach($totals as $date => $total) {
+                $total['id_tracking'] = $tracking['id_tracking'];
+                $total['date'] = $date;
+                if(!empty($tracking['cout'])
+                    && $tracking['cout'] > 0) {
+                    $total['cout_order'] = $total['total_order']/$tracking['cout'];
+                    $total['cout_subscribe'] = $total['subscribe']/$tracking['cout'];
+                    $total['cout_visits'] = $total['visits']/$tracking['cout'];
+                }
+                $query[] = $total;                
+            }
+
+            Db::getInstance()->delete('ant_marketing_stats', 'id_tracking = '.$tracking['id_tracking']);
+            Db::getInstance()->insert('ant_marketing_stats', $query);
+        }
+        
+        // $req = 'SELECT 
+        //     a.id_tracking, 
+        //     a.date, 
+        //     SUM(a.total_products) AS total_products,
+        //     SUM(a.total_order) AS total_order,
+        //     SUM(a.total_products_price) AS total_products_price,
+        //     SUM(a.total_products_price_tax_excl) AS total_products_price_tax_excl,
+        //     SUM(a.total_wholesale_price) AS total_wholesale_price,
+        //     SUM(a.subscribe) AS subscribe, 
+        //     SUM(a.visits) AS visits,
+        //     (total_order/cout) as cout_order,
+        //     (subscribe/cout) as cout_subscribe,
+        //     (visits/cout) as cout_visits
+        // FROM 
+        //     '._DB_PREFIX_.'ant_marketing_tracking at
+        // LEFT OUTER JOIN
+        // ( 
+        //     (
+        //         SELECT 
+        //             atu.id_tracking AS id_tracking,
+        //             DATE_FORMAT(o.`date_add`, "%Y-%m-%d") AS date,
+        //             SUM(d.`product_quantity`) AS `total_products`, 
+        //             COUNT(DISTINCT(d.id_order)) AS total_order,
+        //             SUM( 
+        //                 ROUND( 
+        //                     d.unit_price_tax_incl  * d.`product_quantity`, 6
+        //                 ) 
+        //             ) AS `total_products_price`,
+        //             SUM( 
+        //                 ROUND( 
+        //                     d.unit_price_tax_excl  * d.`product_quantity`, 6
+        //                 ) 
+        //             ) AS `total_products_price_tax_excl`,
+        //             CASE 
+        //                 WHEN pas.wholesale_price IS NULL AND d.product_attribute_id != 0 
+        //                     THEN SUM(pas.wholesale_price * d.`product_quantity`) 
+        //                 ELSE SUM(ps.wholesale_price * d.`product_quantity`) 
+        //             END AS total_wholesale_price,
+        //             NULL AS subscribe,
+        //             NULL AS visits
+        //         FROM  `'._DB_PREFIX_.'orders` o
+        //         LEFT JOIN `'._DB_PREFIX_.'ant_marketing_tracking_users` atu
+        //             ON o.id_customer = atu.id_customer
+        //         RIGHT JOIN `'._DB_PREFIX_.'order_detail` d 
+        //             ON o.id_order = d.id_order 
+        //         LEFT OUTER JOIN `'._DB_PREFIX_.'product_shop` ps
+        //             ON ps.id_shop = o.id_shop AND ps.id_product = d.product_id
+        //         LEFT OUTER JOIN `'._DB_PREFIX_.'product_attribute_shop` pas
+        //             ON (d.product_attribute_id != 0 AND pas.id_product_attribute = d.product_attribute_id)
+        //         WHERE EXISTS (
+        //             SELECT 
+        //                 id_order_state 
+        //             FROM 
+        //                 '._DB_PREFIX_.'order_history oh
+        //             WHERE 
+        //                 o.id_order = oh.id_order
+        //             ORDER BY 
+        //                 id_order_history 
+        //                 DESC 
+        //             LIMIT 1
+        //         )
+        //         NOT IN ("'.implode('","', self::getStateNull()).'")
+        //         GROUP BY atu.id_tracking, date
+        //     ) 
+        //     UNION 
+        //     (  
+        //         SELECT 
+        //             atc.id_tracking, 
+        //             DATE_FORMAT(atc.`date`, "%Y-%m-%d") AS date, 
+        //             NULL AS total_products,
+        //             NULL AS total_order,
+        //             NULL AS total_products_price,
+        //             NULL AS total_products_price_tax_excl,
+        //             NULL AS total_wholesale_price,
+        //             COUNT(id_customer) AS subscribe, 
+        //             NULL AS visits
+        //         FROM 
+        //             `'._DB_PREFIX_.'ant_marketing_tracking_users` atc 
+        //         GROUP BY id_tracking, DATE_FORMAT(atc.`date`, "%Y-%m-%d")
+        //     )  
+        //     UNION 
+        //     (  
+        //         SELECT 
+        //             atv.id_tracking, 
+        //             DATE_FORMAT(atv.`date`, "%Y-%m-%d") AS date, 
+        //             NULL AS total_products,
+        //             NULL AS total_order,
+        //             NULL AS total_products_price,
+        //             NULL AS total_products_price_tax_excl, 
+        //             NULL AS total_wholesale_price,
+        //             NULL AS subscribe, 
+        //             atv.nb_visits AS visits
+        //         FROM 
+        //             `'._DB_PREFIX_.'ant_marketing_tracking_visits` atv 
+        //     )     
+        // ) a 
+        // ON a.id_tracking = at.id_tracking  
+        // GROUP BY a.id_tracking, a.date
+        // ';
+            
+        // $total = Db::getInstance()->executeS($req);
+
+        // Db::getInstance()->delete('ant_marketing_stats');
+        // Db::getInstance()->insert('ant_marketing_stats', $total);
         
         return true;
     }

modules/antadismarketing/classes/AntTracking.php

@@ -137,14 +137,23 @@ class AntTracking extends ObjectModel
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
 	}
 
-	public static function getAllCustomersByTrackings($ids) {
+	public static function getAllCustomersByTrackings($ids, $date_from = null, $date_to = null) {
 		$result = array();
+
+		if($date_from !== null && $date_to !== null)
+		{
+			$date_from = date('Y-m-d', strtotime($date_from));
+			$date_to = date('Y-m-d', strtotime($date_to));
+		}
+
 		foreach ($ids as $id) {
 			$sql = 'SELECT t.`name`, c.`id_customer`, `email`, c.`date_add`, `newsletter` 
 				FROM `'._DB_PREFIX_.'customer` c
 				LEFT JOIN `'._DB_PREFIX_.'ant_marketing_tracking_users` u ON(u.id_customer=c.id_customer)
 				LEFT JOIN `'._DB_PREFIX_.'ant_marketing_tracking` t ON(t.id_tracking=u.id_tracking)
-				WHERE t.id_tracking_categories = ' . (int)$id . ' AND c.`id_customer` IS NOT NULL
+				WHERE t.id_tracking_categories = ' . (int)$id . ' 
+				AND c.`id_customer` IS NOT NULL
+				'.($date_from !== null && $date_to !== null ? ' AND u.date >= "'.$date_from.'" AND u.date <= "'.$date_to.'"' : '').'
 				ORDER BY u.`id_tracking` ASC';
 	
 			 $r = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);