diff --git a/.github/contrib/install.php b/.github/contrib/install.php index 04c0cdc5a8e980113920679692cc84e65c0726ff..c8b8bfa6b940f89e6bf2cb9e379663895b3f39c5 100644 --- a/.github/contrib/install.php +++ b/.github/contrib/install.php @@ -1,4 +1,29 @@ + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ + if (file_exists('.git/hooks/pre-commit')) { copy('.git/hooks/pre-commit', '.git/hooks/pre-commit.back'); diff --git a/.github/contrib/uninstall.php b/.github/contrib/uninstall.php index a37d19a2ff049592761a9d4561fc57c25415e812..5e8d2aeacbc2552872a9f2eca09a36e16e50dd91 100644 --- a/.github/contrib/uninstall.php +++ b/.github/contrib/uninstall.php @@ -1,4 +1,29 @@ + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ + if (file_exists('.git/hooks/pre-commit')) { copy('.git/hooks/pre-commit', '.git/hooks/pre-commit.back'); diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 04700258e7a9274bd9aa1ba35aa5c2532773cae8..139fa02e3b114f349bf85bc0be7af0cb7c7a1dce 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -7,12 +7,17 @@ GitHub contributors: - Adrien - Adrien Astier - Agence CINS +- Alban DEFLANDRE - Aleksander Palyan - Alessandro Corbelli - Alex Even +- Alex Sampaio +- Alexander Galaydyuk - Alexander Grosul - Alexander Otchenashev - Alexandra Even +- Alexandre Segura +- alexdee2007 - AlexEven - Alexey Svistunov - alexey-svistunov @@ -21,15 +26,23 @@ GitHub contributors: - Alfonso Jimenez - Alphacom IT Solutions - Macedonia - amatosg +- Amazzing - anat - Anatole - Andrew +- Anthony Girard +- Antoine LA +- Antoine Mille +- antoin_m - Antonino Di Bella - antoniofr - AntonLejon +- Armando Salvador Perez - Arnaud Lemercier +- Atchworks - axi - Axome +- Aylab - Balestrino - bellini13 - Benjamin PONGY @@ -37,6 +50,8 @@ GitHub contributors: - Bersam Karbasion - BigZ - BluTiGeS +- BMS-fenaille +- brouillon - Bruno Desprez - Bruno Leveque - bumbu @@ -45,22 +60,30 @@ GitHub contributors: - cam.lafit - Captain FLAM - Captain-FLAM +- Casper Olsen +- cava89 - ccauw - cedricfontaine - cedricgeffroy +- cgordenne +- cgordenne_wepika - Chen.Zhidong - Chris - Chris Gurk +- christianverardi - ChristopheBoucaut - CINS - cippest - Claire Meuriot - cmouleyre +- cocoweb - codvir - Comkwatt +- Conner - Conner Burnett - Corentin Delcourt - Cosmin Hutanu +- Cyril Dussert - Cedric Mouleyre - damien - Damien Metzger @@ -73,22 +96,30 @@ GitHub contributors: - Daniele Giachino - danoosh - Danoosh Mir +- Dany Maillard +- David Eschmeyer - David Gasperoni - David Sivocha - David-Julian BUCH - Davy Rolink +- Denis Yurevich +- Denver Prophit Jr - Denver Prophit Jr. - Desbouche Christophe - DevNet - Dh42 +- Dheeraj - Dimitrios Karvounaris - Dinis Lage - djbuch - djfm +- dks295 - dlage - doekia - DOEO +- DogSports - Dragan Skrbic +- DRC - Dream me up - dreammeup - DrySs @@ -97,6 +128,8 @@ GitHub contributors: - Dustin - Dvir Julius - Dvir-Julius +- e-gaulue +- ecomm360 - edamart - Edouard Gaulue - el-tenkova @@ -110,34 +143,53 @@ GitHub contributors: - Eric Le Lay - Eric Rouvier - erickturcios +- Erwan - Etienne Samson +- Fabien Serny - Fabio Chelly +- Fatma BOUCHEKOI +- Fatma Bouchekoua +- fatma.bouchekoua +- fatmaBouchekoua - fchellypresta - Felipe Uribe - fetis - fird +- firstred - flashmaestro - Florian Kwakkenbos +- fojtcz - fram - Francois Gaillard -- François-Marie de Jouvencel -- François Gaillard +- Francois-Marie de Jouvencel +- Franois Gaillard - Frederic BENOIST - Gabriel Schwardy - Gaelle ITZKOVITZ +- Galaydyuk Alexandr - Gamesh +- Geoffray +- Gerdus van Zyl +- gfanton - ggedamed - Giant Leap Lab +- Ginkosama +- ginodev - Gordon Coubrough - gr4devel - Granger Kevin - Gregory Roussac +- grezlikowski - gRoussac +- Grzegorz Zawadzki - Gregoire Belorgey - gskema +- Guilhem Fanton - Guillaume DELOINCE - Guillaume Lafarge - Guillaume Leseur +- Guillaume Marsille +- Guisardo - Gytis - Gytis Skėma - Ha!*!*y @@ -146,25 +198,34 @@ GitHub contributors: - harelguy - hiousi - htrex +- hubiktomas +- Ian Fung +- idnovate - indesign47 - iNem0o +- Inetbiz - ironwo0d - ITBpro.com - Ivan +- Ivan Shcherbakov - ivancasasempere - J. Danse - janisVincent +- Jaume - Javsmile - JEAN - jeanbe - jeckyl - Jeroen Dewaele +- Jerome Herry - Jerome Nadaud - jeromenadaud - jessylenne +- Jérôme Nadaud - Joan - Joan Juvanteny - joce +- Jocelyn Fournier - Joe Siwiak - joemartin247 - Joep Hendrix @@ -174,6 +235,8 @@ GitHub contributors: - Jorge Vargas - joseantgv - jtogrul +- Juan G. Jordan +- Juha Remes - Julien - Julien Bouchez - Julien Bourdeau @@ -182,6 +245,8 @@ GitHub contributors: - julienbourdeau - julvernois - Jachym Tousek +- Jeremie Tabet +- Jonatan Nunez - Kamil Szymański - Kelly Karnetsky - kermes @@ -195,44 +260,61 @@ GitHub contributors: - ldecoker - Lesley Paone - LOIC ROSSET ltd -- luc +- lozal2244 +- Luc - Luc Vandesype - Luca T. - Lucas CERDAN - LucasC - Lyo Nick - LyoNick +- Lea Mendes Da Silva - Leo - M-Mommsen +- M03G +- MacRoy - Madef - Madman - Mainmich - makk1ntosh +- makoso - manuelbcd - marcinsz101 - Marco Cervellin - Marcos +- Marius +- Martin Fojtik +- martinfojtik - matiasiglesias - Mats Rynge - Matteo +- Matteo Spreafico - MatthieuB - MaX3315 - Maxence - Maxime - Maxime Biloe - Maxime Vasse +- Mbechezi Mlanawo - mchelh - mchojnacki - mdomenjoud -- Michel Courtade +- melvin - Michael Dekker -- Mickael Desgranges - Michael Hjulskov +- Michael SALIHI +- Michal Spaček +- Michel ANTOINE +- Michel Courtade +- Mickael ANDRIEU +- Mickael Desgranges +- Mickael Andrieu - Mikael Blotin - Mikko Hellsing - Milow - Mingsong Hu - minic studio +- Mirko Esposito - misthero - moncef102 - montes @@ -241,7 +323,9 @@ GitHub contributors: - natrim - neemzy - nezenmoins +- Nicolas Martin - Nicolas Sorosac +- Niels Wouda - Niklas Ekman - Niko Wicaksono - Nils-Helge Garli Hegvik @@ -250,7 +334,9 @@ GitHub contributors: - nodexpl - nturato - oleacorner +- Olivier Bonvalet - Otto Nascarella +- paeddl - Pan P - Pan P. - Pan Ploenes @@ -258,6 +344,7 @@ GitHub contributors: - panesarsandeep - Patanock - Patrick Mettraux +- Patrick Weinstein - Pavel Novitsky - pbirnzain - Pedro J. Parra @@ -267,13 +354,16 @@ GitHub contributors: - Petyuska - PhpMadman - Pierre +- Pierrick - Piotr Kaczor - Piotr Moćko +- Praneeth Nidarshan - Presta Module - PrestaEdit - PrestaLab - prestamodule - PrestanceDesign +- Prestanesia - prestarocket - Prestaspirit - Priyank Bolia @@ -288,8 +378,12 @@ GitHub contributors: - Quetzacoalt91 - Racochejl - Rafael Cunha +- raphael-homann +- Raphael Droz - Raphael Malie - raulgundin +- rav88 +- Remigiusz Jackowski - rGaillard - Rhys - Richard LT @@ -297,6 +391,7 @@ GitHub contributors: - robert - Roland Schütz - romainberger +- Roy - runningz - Remi Gaillard - s-duval @@ -308,12 +403,15 @@ GitHub contributors: - Samir Shah - Samy Rabih - Sarah Lorenzini +- Saycile - Seb - SebSept +- Sergio Quinonez - Seynaeve - sfroment42 - shaffe-fr - Shagshag +- ShepherdV8 - Shipow - Shudrum - sidhujag @@ -330,6 +428,7 @@ GitHub contributors: - Steven "SDF" Sulley - Steven Sulley - Studio Kiwik +- Sullivan SENECHAL - Sumh - svensson_david - Sylvain Gougouzian @@ -340,10 +439,15 @@ GitHub contributors: - Sebastien Monterisi - Tanguy JACQUET - tchauviere +- The Gitter Badger +- therampagerado - Thibaud Chauviere +- Thierry Marianne +- Thoma - thoma202 - Thomas - Thomas Blanc +- Thomas Ferney - Thomas N - Thomas Nabord - thomas-aw @@ -353,15 +457,24 @@ GitHub contributors: - TMMeilleur - Tom Panier - Tomasz Slominski +- tomek - Tomas Votruba +- Travis-CI - tucoinfo - Tung Dao +- Tuni-Soft +- Turtle +- Txmod Xoops - unlocomqx +- Valentin M - Valerii Savchenko - vAugagneur +- venditdevs - Vincent Augagneur +- vincent beudez - Vincent Schoener - Vincent Terenti +- vincentbz - vinvin27 - vinzter - vitekj @@ -380,6 +493,7 @@ GitHub contributors: - zimmi1 - ZiZuu.com - Zollner Robert +- zuzul SVN contributors: -------------------------------- diff --git a/INSTALL.txt b/INSTALL.txt index 4e6dd3cbf0e613760500feaf09cffea976a3c77d..a019e1111ce4842c1903baf1ca417e3a6eb1c5f5 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,45 +1,45 @@ - *#&&&&&&&&&&&&. - #&&&&&&&&&&&&&&&&&&&&&&&&&( - *&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&* - &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& - ,&&&&&&&&&&&&&&&&&&&%%#%%%&&&&&&&&&&&&&&&&&& - &&&&&&&&&&&&&*****************#&&&&&&&&&&&&&& - (&&&&&&&&&&&&*************************&&&&&&&&&&&&( - &&&&&&&&&&&%*****************************%&&&&&&&&&&& - &&&&&&&&&&%*********************************%&&&&&&&&&& - %&&&&&&&&&(********, *********, /&&&&&&&&&% - *&&&&&&&&&/*******. .*(((/. ****** /#* *&&&&&&&&&* - &&&&&&&&&(******* /%%%%%%%%%%%&&&&%,*** *&&&&&&%/&&&&&&&&& - *&&&&&&&&%*******/%%%%%%%%%%%%%((&&&&&%#*&&&&&&&&%%%&&&&&&&& - &&&&&&&&&/*****(%%%%%%%%%%%%%%#((%&&&&%%%*&&&&&&&(%%&&&&&&&&& - &&&&&&&&&*****%%%%%%%%%%%%%#/, @@ %&&%%%%#**&&&&/#%%&&&&&&&&& - &&&&&&&&&***&@@@@@@@@@@#///// @@%%%% ****@@ *@&&&&&&&&& - &&&&&&&&&**%@@@@@@@@@@@@@@@@@@# /@@@%%% *****/@@@@&&&&&&&&& - #&&&&&&&*@@@@@@@@@@@@@@@@@@@@@@@@@%%# *******@@&&&&&&&& - &&&&&&&&&@@@@@@@@@@@@@@@@@@@@@@@@@%% *********(&&&&&&&&& - &&&&&&&&&&@@@@@@@@@@@@@@@&@@@@@@@% ************%&&&&&&% - &&&&&&&&&&@@@@@@@@@@@@@@@@ (@@@. **************(&&&&& - &&&&&&&&&&@@@@@@@@@@@@@@@@@, ************,,%&&&&& - &&&&&&&&&&&@@@@@@@@@@@@@@@@@* ,,,,,,,,,,,/&&&&&&& - &&&&&&&&&&&&@@@@@@@@@@@@@@@@ ,,,,,,,,(&&&&&&&&& - &&&&&&&&&(***(@@@@@@@@@@@@@@@# .,****(&&&&&&&&& - &&&&%*****/(((**#@@@@@@@@@@@#**(((/*****%&&&& - %*******(((/ /(((*******% - *****/#############((((((((((((/***** - */#############((((((((((((/* - ###########(((((((((( - - - -....... ... .****, ** -.. ,.... ... *** ** ** -.. .. ...... ....... ....... ..... ......... **. **,*****. ******* **.*****, + *#&&&&&&&&&&&&. + #&&&&&&&&&&&&&&&&&&&&&&&&&( + *&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&* + &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& + ,&&&&&&&&&&&&&&&&&&&%%#%%%&&&&&&&&&&&&&&&&&& + &&&&&&&&&&&&&*****************#&&&&&&&&&&&&&& + (&&&&&&&&&&&&*************************&&&&&&&&&&&&( + &&&&&&&&&&&%*****************************%&&&&&&&&&&& + &&&&&&&&&&%*********************************%&&&&&&&&&& + %&&&&&&&&&(********, *********, /&&&&&&&&&% + *&&&&&&&&&/*******. .*(((/. ****** /#* *&&&&&&&&&* + &&&&&&&&&(******* /%%%%%%%%%%%&&&&%,*** *&&&&&&%/&&&&&&&&& + *&&&&&&&&%*******/%%%%%%%%%%%%%((&&&&&%#*&&&&&&&&%%%&&&&&&&& + &&&&&&&&&/*****(%%%%%%%%%%%%%%#((%&&&&%%%*&&&&&&&(%%&&&&&&&&& + &&&&&&&&&*****%%%%%%%%%%%%%#/, @@ %&&%%%%#**&&&&/#%%&&&&&&&&& + &&&&&&&&&***&@@@@@@@@@@#///// @@%%%% ****@@ *@&&&&&&&&& + &&&&&&&&&**%@@@@@@@@@@@@@@@@@@# /@@@%%% *****/@@@@&&&&&&&&& + #&&&&&&&*@@@@@@@@@@@@@@@@@@@@@@@@@%%# *******@@&&&&&&&& + &&&&&&&&&@@@@@@@@@@@@@@@@@@@@@@@@@%% *********(&&&&&&&&& + &&&&&&&&&&@@@@@@@@@@@@@@@&@@@@@@@% ************%&&&&&&% + &&&&&&&&&&@@@@@@@@@@@@@@@@ (@@@. **************(&&&&& + &&&&&&&&&&@@@@@@@@@@@@@@@@@, ************,,%&&&&& + &&&&&&&&&&&@@@@@@@@@@@@@@@@@* ,,,,,,,,,,,/&&&&&&& + &&&&&&&&&&&&@@@@@@@@@@@@@@@@ ,,,,,,,,(&&&&&&&&& + &&&&&&&&&(***(@@@@@@@@@@@@@@@# .,****(&&&&&&&&& + &&&&%*****/(((**#@@@@@@@@@@@#**(((/*****%&&&& + %*******(((/ /(((*******% + *****/#############((((((((((((/***** + */#############((((((((((((/* + ###########(((((((((( + + + +....... ... .****, ** +.. ,.... ... *** ** ** +.. .. ...... ....... ....... ..... ......... **. **,*****. ******* **.*****, .. ... ... .. .. ... ... ... ... ******. *** ** ,** **, *** *** ......... ... ........ ..... ... .. ... *** ** ** ** ** ** ** .. ... ... . .. ... ,.. ... *, ** ** ** *** *** *** ,** -.. ... ....... ,...... ..... ......... ******** ** ** ******* ** ****** - ** - +.. ... ....... ,...... ..... ......... ******** ** ** ******* ** ****** + ** + --- ===== Installation instructions for PrestaShop 1.7 ===== --- @@ -49,7 +49,7 @@ You will need: * PHP 5.4+, with: - * allow_url_fopen set to On, + * allow_url_fopen set to On, * register_globals set to Off, * upload_max_filesize set to "16M" (or more). * MySQL 5.0+, with: diff --git a/admin-dev/ajax-tab.php b/admin-dev/ajax-tab.php index 8fc238882c0c4de4d4278ca6d145703ea679b6bf..725428d49abbedd03fac1c64827734073cb67c9e 100755 --- a/admin-dev/ajax-tab.php +++ b/admin-dev/ajax-tab.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 18a469951bf9bdb01e4f1b662cfc0488d2f58941..5a345a336a86e71dfdc526aab6bcc1a96bed007d 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajax_products_list.php b/admin-dev/ajax_products_list.php index bb6086adeccba6cb11a23f5755f842e10425eba2..2000d2c193732a2d69eb9b0205fdd098d38b5f3f 100644 --- a/admin-dev/ajax_products_list.php +++ b/admin-dev/ajax_products_list.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/autoupgrade/backup/index.php b/admin-dev/autoupgrade/backup/index.php index 0abc42463dfc83dd51adaf6aeadbeb7954dc27a4..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/autoupgrade/backup/index.php +++ b/admin-dev/autoupgrade/backup/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/autoupgrade/index.php b/admin-dev/autoupgrade/index.php index 8ff0f4b1746ff91b17e010414460fad40413fcfb..e34dbf52d6e9a87b67a4a785bd1165858201b9f8 100644 --- a/admin-dev/autoupgrade/index.php +++ b/admin-dev/autoupgrade/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/backup.php b/admin-dev/backup.php index f219ea89737aacecfa43baf7373bb2841ffd5b58..e485b227e7e29317a25d2fc6b5ecef39d18f7a9f 100644 --- a/admin-dev/backup.php +++ b/admin-dev/backup.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/backups/index.php b/admin-dev/backups/index.php index 0abc42463dfc83dd51adaf6aeadbeb7954dc27a4..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/backups/index.php +++ b/admin-dev/backups/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/bootstrap.php b/admin-dev/bootstrap.php index 6771bedba956811aad79801f953aa4f558503833..9d5f7844b0bc8022ddd62c515a03e05524c3540c 100644 --- a/admin-dev/bootstrap.php +++ b/admin-dev/bootstrap.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/cron_currency_rates.php b/admin-dev/cron_currency_rates.php index 8e7bb70f4c767c7d6e7f4c6216ede1099bc79a15..fc4c0cf9f4010dfa8a2d5691fd11021fdd27ce75 100644 --- a/admin-dev/cron_currency_rates.php +++ b/admin-dev/cron_currency_rates.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/displayImage.php b/admin-dev/displayImage.php index 34307e9ae3f21658935396646b48af8f3fed1ec8..0c21838e6ef1aa7c52d2310d2b90d9acfb78603d 100644 --- a/admin-dev/displayImage.php +++ b/admin-dev/displayImage.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/drawer.php b/admin-dev/drawer.php index 902765855504dbb1e38fb5a74a141dcef44b4670..91ac313650a01348f04a7af97afce44b7d23d6d2 100644 --- a/admin-dev/drawer.php +++ b/admin-dev/drawer.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/export/index.php b/admin-dev/export/index.php index 0abc42463dfc83dd51adaf6aeadbeb7954dc27a4..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/export/index.php +++ b/admin-dev/export/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/footer.inc.php b/admin-dev/footer.inc.php index 088d4b2b59d9c12e654e9f55f3e7ee419029dca9..14047d4d79dc4995269f5e6d0afcd7217ca63001 100644 --- a/admin-dev/footer.inc.php +++ b/admin-dev/footer.inc.php @@ -1,28 +1,28 @@ -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ $dir = Context::getContext()->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.trim($con->override_folder, '\\/').DIRECTORY_SEPARATOR; $footer_tpl = file_exists($dir.'footer.tpl') ? $dir.'footer.tpl' : 'footer.tpl'; echo Context::getContext()->smarty->fetch($footer_tpl); diff --git a/admin-dev/functions.php b/admin-dev/functions.php new file mode 100644 index 0000000000000000000000000000000000000000..2fa795aae3df3cc2d6bd19c98769455ae72cb0eb --- /dev/null +++ b/admin-dev/functions.php @@ -0,0 +1,566 @@ + + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ + +if (!defined('_PS_ADMIN_DIR_')) { + define('_PS_ADMIN_DIR_', getcwd()); +} +require_once(_PS_ADMIN_DIR_.'/../images.inc.php'); +function bindDatepicker($id, $time) +{ + if ($time) { + echo ' + var dateObj = new Date(); + var hours = dateObj.getHours(); + var mins = dateObj.getMinutes(); + var secs = dateObj.getSeconds(); + if (hours < 10) { hours = "0" + hours; } + if (mins < 10) { mins = "0" + mins; } + if (secs < 10) { secs = "0" + secs; } + var time = " "+hours+":"+mins+":"+secs;'; + } + + echo ' + $(function() { + $("#'.Tools::htmlentitiesUTF8($id).'").datepicker({ + prevText:"", + nextText:"", + dateFormat:"yy-mm-dd"'.($time ? '+time' : '').'}); + });'; +} + +/** + * @deprecated 1.5.3.0 Use Controller::addJqueryUi('ui.datepicker') instead + * @param int|array $id ID can be a identifier or an array of identifiers + * @param bool $time + */ +function includeDatepicker($id, $time = false) +{ + Tools::displayAsDeprecated(); + echo ''; + echo ''; + echo ''; + $iso = Db::getInstance()->getValue('SELECT iso_code FROM '._DB_PREFIX_.'lang WHERE `id_lang` = '.(int)Context::getContext()->language->id); + if ($iso != 'en') { + echo ''; + } + echo ''; +} + +/** + * Generate a new settings file, only transmitted parameters are updated + * + * @param string $baseUri Base URI + * @param string $theme Theme name (eg. default) + * @param array $array_db Parameters in order to connect to database + */ +function rewriteSettingsFile($base_urls = null, $theme = null, $array_db = null) +{ + $defines = array(); + $defines['_PS_CACHING_SYSTEM_'] = _PS_CACHING_SYSTEM_; + $defines['_PS_CACHE_ENABLED_'] = _PS_CACHE_ENABLED_; + $defines['_DB_NAME_'] = (($array_db && isset($array_db['_DB_NAME_'])) ? $array_db['_DB_NAME_'] : _DB_NAME_); + $defines['_MYSQL_ENGINE_'] = (($array_db && isset($array_db['_MYSQL_ENGINE_'])) ? $array_db['_MYSQL_ENGINE_'] : _MYSQL_ENGINE_); + $defines['_DB_SERVER_'] = (($array_db && isset($array_db['_DB_SERVER_'])) ? $array_db['_DB_SERVER_'] : _DB_SERVER_); + $defines['_DB_USER_'] = (($array_db && isset($array_db['_DB_USER_'])) ? $array_db['_DB_USER_'] : _DB_USER_); + $defines['_DB_PREFIX_'] = (($array_db && isset($array_db['_DB_PREFIX_'])) ? $array_db['_DB_PREFIX_'] : _DB_PREFIX_); + $defines['_DB_PASSWD_'] = (($array_db && isset($array_db['_DB_PASSWD_'])) ? $array_db['_DB_PASSWD_'] : _DB_PASSWD_); + $defines['_COOKIE_KEY_'] = addslashes(_COOKIE_KEY_); + $defines['_COOKIE_IV_'] = addslashes(_COOKIE_IV_); + $defines['_PS_CREATION_DATE_'] = addslashes(_PS_CREATION_DATE_); + + if (defined('_RIJNDAEL_KEY_')) { + $defines['_RIJNDAEL_KEY_'] = addslashes(_RIJNDAEL_KEY_); + } + if (defined('_RIJNDAEL_IV_')) { + $defines['_RIJNDAEL_IV_'] = addslashes(_RIJNDAEL_IV_); + } + $defines['_PS_VERSION_'] = addslashes(_PS_VERSION_); + $content = " $value) { + if ($k == '_PS_VERSION_') { + $content .= 'if (!defined(\''.$k.'\'))'."\n\t"; + } + + $content .= 'define(\''.$k.'\', \''.addslashes($value).'\');'."\n"; + } + copy(_PS_ADMIN_DIR_.'/../config/settings.inc.php', _PS_ADMIN_DIR_.'/../config/settings.old.php'); + if ($fd = fopen(_PS_ADMIN_DIR_.'/../config/settings.inc.php', 'w')) { + fwrite($fd, $content); + fclose($fd); + return true; + } + return false; +} + +/** + * Display SQL date in friendly format + * + * @param string $sql_date Date in SQL format (YYYY-MM-DD HH:mm:ss) + * @param bool $with_time Display both date and time + * @todo Several formats (french : DD-MM-YYYY) + */ +function displayDate($sql_date, $with_time = false) +{ + return strftime('%Y-%m-%d'.($with_time ? ' %H:%M:%S' : ''), strtotime($sql_date)); +} + +/** + * Return path to a product category + * + * @param string $url_base Start URL + * @param int $id_category Start category + * @param string $path Current path + * @param string $highlight String to highlight (in XHTML/CSS) + * @param string $type Category type (products/cms) + */ +function getPath($url_base, $id_category, $path = '', $highlight = '', $category_type = 'catalog', $home = false) +{ + $context = Context::getContext(); + if ($category_type == 'catalog') { + $category = Db::getInstance()->getRow(' + SELECT id_category, level_depth, nleft, nright + FROM '._DB_PREFIX_.'category + WHERE id_category = '.(int)$id_category); + if (isset($category['id_category'])) { + $sql = 'SELECT c.id_category, cl.name, cl.link_rewrite + FROM '._DB_PREFIX_.'category c + LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category'.Shop::addSqlRestrictionOnLang('cl').') + WHERE c.nleft <= '.(int)$category['nleft'].' + AND c.nright >= '.(int)$category['nright'].' + AND cl.id_lang = '.(int)$context->language->id. + ($home ? ' AND c.id_category='.(int)$id_category : '').' + AND c.id_category != '.(int)Category::getTopCategory()->id.' + GROUP BY c.id_category + ORDER BY c.level_depth ASC + LIMIT '.(!$home ? (int)$category['level_depth'] + 1 : 1); + $categories = Db::getInstance()->executeS($sql); + $full_path = ''; + $n = 1; + $n_categories = (int)count($categories); + foreach ($categories as $category) { + $link = Context::getContext()->link->getAdminLink('AdminCategories'); + $edit = ' '; + $full_path .= $edit. + ($n < $n_categories ? '' : ''). + (!empty($highlight) ? str_ireplace($highlight, ''.htmlentities($highlight, ENT_NOQUOTES, 'UTF-8').'', $category['name']) : $category['name']). + ($n < $n_categories ? '' : ''). + (($n++ != $n_categories || !empty($path)) ? ' > ' : ''); + } + + return $full_path.$path; + } + } elseif ($category_type == 'cms') { + $category = new CMSCategory($id_category, $context->language->id); + if (!$category->id) { + return $path; + } + + $name = ($highlight != null) ? str_ireplace($highlight, ''.$highlight.'', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name); + $edit = ' + '; + if ($category->id == 1) { + $edit = '
  • +
    • '; + } + $path = $edit.'
  • + '.$name.'
    • > '.$path; + if ($category->id == 1) { + return substr($path, 0, strlen($path) - 3); + } + return getPath($url_base, $category->id_parent, $path, '', 'cms'); + } +} + +function getDirContent($path) +{ + $content = array(); + if (is_dir($path)) { + $d = dir($path); + while (false !== ($entry = $d->read())) { + if ($entry{0} != '.') { + $content[] = $entry; + } + } + $d->close(); + } + return $content; +} + +function createDir($path, $rights) +{ + if (file_exists($path)) { + return true; + } + return @mkdir($path, $rights); +} + +function checkPSVersion() +{ + $upgrader = new Upgrader(); + + return $upgrader->checkPSVersion(); +} + +/** + * @deprecated 1.5.4.1 Use Translate::getAdminTranslation($string) instead + * @param string $string + * @return string + */ +function translate($string) +{ + Tools::displayAsDeprecated(); + + global $_LANGADM; + if (!is_array($_LANGADM)) { + return str_replace('"', '"', $string); + } + $key = md5(str_replace('\'', '\\\'', $string)); + $str = (array_key_exists('index'.$key, $_LANGADM)) ? $_LANGADM['index'.$key] : ((array_key_exists('index'.$key, $_LANGADM)) ? $_LANGADM['index'.$key] : $string); + return str_replace('"', '"', stripslashes($str)); +} + +/** + * Returns a new Tab object + * + * @param string $tab class name + * @return mixed(AdminTab, bool) tab object or false if failed + */ +function checkingTab($tab) +{ + $tab_lowercase = Tools::strtolower(trim($tab)); + if (!Validate::isTabName($tab)) { + return false; + } + $row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('SELECT id_tab, module, class_name FROM `'._DB_PREFIX_.'tab` WHERE LOWER(class_name) = \''.pSQL($tab).'\''); + if (!$row['id_tab']) { + if (isset(AdminTab::$tabParenting[$tab])) { + Tools::redirectAdmin('?tab='.AdminTab::$tabParenting[$tab].'&token='.Tools::getAdminTokenLite(AdminTab::$tabParenting[$tab])); + } + echo sprintf(Tools::displayError('Page %s cannot be found.'), $tab); + return false; + } + + // Class file is included in Dispatcher::dispatch() function + if (!class_exists($tab, false) || !$row['id_tab']) { + echo sprintf(Tools::displayError('The class %s cannot be found.'), $tab); + return false; + } + $admin_obj = new $tab; + if (!$admin_obj->viewAccess() && ($admin_obj->table != 'employee' || Context::getContext()->employee->id != Tools::getValue('id_employee') || !Tools::isSubmit('updateemployee'))) { + $admin_obj->_errors = array(Tools::displayError('Access denied.')); + echo $admin_obj->displayErrors(); + return false; + } + return $admin_obj; +} + +/** + * @TODO deprecate for Tab::checkTabRights() + */ +function checkTabRights($id_tab) +{ + static $tab_accesses = null; + + if ($tab_accesses === null) { + $tab_accesses = Profile::getProfileAccesses(Context::getContext()->employee->id_profile); + } + + if (isset($tab_accesses[(int)$id_tab]['view'])) { + return ($tab_accesses[(int)$id_tab]['view'] === '1'); + } + return false; +} + + +/** + * Converts a simpleXML element into an array. Preserves attributes and everything. + * You can choose to get your elements either flattened, or stored in a custom index that + * you define. + * For example, for a given element + * + * if you choose to flatten attributes, you would get: + * $array['field']['name'] = 'someName'; + * $array['field']['type'] = 'someType'; + * If you choose not to flatten, you get: + * $array['field']['@attributes']['name'] = 'someName'; + * _____________________________________ + * Repeating fields are stored in indexed arrays. so for a markup such as: + * + * a + * b + * c + * + * you array would be: + * $array['parent']['child'][0] = 'a'; + * $array['parent']['child'][1] = 'b'; + * ...And so on. + * _____________________________________ + * @param simpleXMLElement $xml the XML to convert + * @param bool $flatten_values Choose wether to flatten values + * or to set them under a particular index. + * defaults to true; + * @param bool $flatten_attributes Choose wether to flatten attributes + * or to set them under a particular index. + * Defaults to true; + * @param bool $flatten_children Choose wether to flatten children + * or to set them under a particular index. + * Defaults to true; + * @param string $value_key index for values, in case $flatten_values was set to false. Defaults to "@value" + * @param string $attributes_key index for attributes, in case $flatten_attributes was set to false. Defaults to "@attributes" + * @param string $children_key index for children, in case $flatten_children was set to false. Defaults to "@children" + * @return array the resulting array. + */ +function simpleXMLToArray($xml, $flatten_values = true, $flatten_attributes = true, $flatten_children = true, $value_key = '@value', $attributes_key = '@attributes', $children_key = '@children') +{ + $return = array(); + if (!($xml instanceof SimpleXMLElement)) { + return $return; + } + + $name = $xml->getName(); + $value = trim((string)$xml); + if (strlen($value) == 0) { + $value = null; + } + + if ($value !== null) { + if (!$flatten_values) { + $return[$value_key] = $value; + } else { + $return = $value; + } + } + + $children = array(); + $first = true; + foreach ($xml->children() as $element_name => $child) { + $value = simpleXMLToArray($child, $flatten_values, $flatten_attributes, $flatten_children, $value_key, $attributes_key, $children_key); + if (isset($children[$element_name])) { + if ($first) { + $temp = $children[$element_name]; + unset($children[$element_name]); + $children[$element_name][] = $temp; + $first = false; + } + $children[$element_name][] = $value; + } else { + $children[$element_name] = $value; + } + } + + if (count($children) > 0) { + if (!$flatten_children) { + $return[$children_key] = $children; + } else { + $return = array_merge($return, $children); + } + } + + $attributes = array(); + foreach ($xml->attributes() as $name => $value) { + $attributes[$name] = trim($value); + } + + if (count($attributes) > 0) { + if (!$flatten_attributes) { + $return[$attributes_key] = $attributes; + } else { + $return = array_merge($return, $attributes); + } + } + + return $return; +} + +/** + * for retrocompatibility with old AdminTab, old index.php + * + * @return void + */ +function runAdminTab($tab, $ajax_mode = false) +{ + $ajax_mode = (bool)$ajax_mode; + + require_once(_PS_ADMIN_DIR_.'/init.php'); + $cookie = Context::getContext()->cookie; + if (empty($tab) && !count($_POST)) { + $tab = 'AdminDashboard'; + $_POST['tab'] = $tab; + $_POST['token'] = Tools::getAdminTokenLite($tab); + } + // $tab = $_REQUEST['tab']; + if ($admin_obj = checkingTab($tab)) { + Context::getContext()->controller = $admin_obj; + // init is different for new tabs (AdminController) and old tabs (AdminTab) + if ($admin_obj instanceof AdminController) { + if ($ajax_mode) { + $admin_obj->ajax = true; + } + $admin_obj->path = dirname($_SERVER['PHP_SELF']); + $admin_obj->run(); + } else { + if (!$ajax_mode) { + require_once(_PS_ADMIN_DIR_.'/header.inc.php'); + } + $iso_user = Context::getContext()->language->id; + $tabs = array(); + $tabs = Tab::recursiveTab($admin_obj->id, $tabs); + $tabs = array_reverse($tabs); + $bread = ''; + foreach ($tabs as $key => $item) { + $bread .= ' >'; + if (count($tabs) - 1 > $key) { + $bread .= ''; + } + + $bread .= $item['name']; + if (count($tabs) - 1 > $key) { + $bread .= ''; + } + } + + if (!$ajax_mode && Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_ALL && Context::getContext()->controller->multishop_context != Shop::CONTEXT_ALL) { + echo '
    '; + if (Shop::getContext() == Shop::CONTEXT_GROUP) { + $shop_group = new ShopGroup((int)Shop::getContextShopGroupID()); + printf(Translate::getAdminTranslation('You are configuring your store for group shop %s'), ''.$shop_group->name.''); + } elseif (Shop::getContext() == Shop::CONTEXT_SHOP) { + printf(Translate::getAdminTranslation('You are configuring your store for shop %s'), ''.Context::getContext()->shop->name.''); + } + echo '
    '; + } + if (Validate::isLoadedObject($admin_obj)) { + if ($admin_obj->checkToken()) { + if ($ajax_mode) { + // the differences with index.php is here + $admin_obj->ajaxPreProcess(); + $action = Tools::getValue('action'); + // no need to use displayConf() here + + if (!empty($action) && method_exists($admin_obj, 'ajaxProcess'.Tools::toCamelCase($action))) { + $admin_obj->{'ajaxProcess'.Tools::toCamelCase($action)}(); + } else { + $admin_obj->ajaxProcess(); + } + + // @TODO We should use a displayAjaxError + $admin_obj->displayErrors(); + if (!empty($action) && method_exists($admin_obj, 'displayAjax'.Tools::toCamelCase($action))) { + $admin_obj->{'displayAjax'.$action}(); + } else { + $admin_obj->displayAjax(); + } + } else { + /* Filter memorization */ + if (isset($_POST) && !empty($_POST) && isset($admin_obj->table)) { + foreach ($_POST as $key => $value) { + if (is_array($admin_obj->table)) { + foreach ($admin_obj->table as $table) { + if (strncmp($key, $table.'Filter_', 7) === 0 || strncmp($key, 'submitFilter', 12) === 0) { + $cookie->$key = !is_array($value) ? $value : serialize($value); + } + } + } elseif (strncmp($key, $admin_obj->table.'Filter_', 7) === 0 || strncmp($key, 'submitFilter', 12) === 0) { + $cookie->$key = !is_array($value) ? $value : serialize($value); + } + } + } + + if (isset($_GET) && !empty($_GET) && isset($admin_obj->table)) { + foreach ($_GET as $key => $value) { + if (is_array($admin_obj->table)) { + foreach ($admin_obj->table as $table) { + if (strncmp($key, $table.'OrderBy', 7) === 0 || strncmp($key, $table.'Orderway', 8) === 0) { + $cookie->$key = $value; + } + } + } elseif (strncmp($key, $admin_obj->table.'OrderBy', 7) === 0 || strncmp($key, $admin_obj->table.'Orderway', 12) === 0) { + $cookie->$key = $value; + } + } + } + $admin_obj->displayConf(); + $admin_obj->postProcess(); + $admin_obj->displayErrors(); + $admin_obj->display(); + include(_PS_ADMIN_DIR_.'/footer.inc.php'); + } + } else { + if ($ajax_mode) { + // If this is an XSS attempt, then we should only display a simple, secure page + if (ob_get_level() && ob_get_length() > 0) { + ob_clean(); + } + + // ${1} in the replacement string of the regexp is required, because the token may begin with a number and mix up with it (e.g. $17) + $url = preg_replace('/([&?]token=)[^&]*(&.*)?$/', '${1}'.$admin_obj->token.'$2', $_SERVER['REQUEST_URI']); + if (false === strpos($url, '?token=') && false === strpos($url, '&token=')) { + $url .= '&token='.$admin_obj->token; + } + + // we can display the correct url + // die(Tools::jsonEncode(array(Translate::getAdminTranslation('Invalid security token'),$url))); + die(Tools::jsonEncode(Translate::getAdminTranslation('Invalid security token'))); + } else { + // If this is an XSS attempt, then we should only display a simple, secure page + if (ob_get_level() && ob_get_length() > 0) { + ob_clean(); + } + + // ${1} in the replacement string of the regexp is required, because the token may begin with a number and mix up with it (e.g. $17) + $url = preg_replace('/([&?]token=)[^&]*(&.*)?$/', '${1}'.$admin_obj->token.'$2', $_SERVER['REQUEST_URI']); + if (false === strpos($url, '?token=') && false === strpos($url, '&token=')) { + $url .= '&token='.$admin_obj->token; + } + + $message = Translate::getAdminTranslation('Invalid security token'); + echo ''.$message.' +
    + + '.$message.' +
    '; + echo ' + + + + + + '; + die; + } + } + } + } + } +} diff --git a/admin-dev/get-file-admin.php b/admin-dev/get-file-admin.php index 7ad0822f750dfbc555cef8cdf077d8878d98cfa9..c990fa13f70a761f96d509ad649c4b75be2852d4 100644 --- a/admin-dev/get-file-admin.php +++ b/admin-dev/get-file-admin.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/grider.php b/admin-dev/grider.php index 1204c849aa2630e554b72056b8f16981be692d58..0f469b5f681e7209f0d8f012e23b13f01d0f3d7d 100644 --- a/admin-dev/grider.php +++ b/admin-dev/grider.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/import/index.php b/admin-dev/import/index.php index 0abc42463dfc83dd51adaf6aeadbeb7954dc27a4..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/import/index.php +++ b/admin-dev/import/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/index.php b/admin-dev/index.php index a22889278f09a48832bcf729a760a3207ede6143..91b0a8ade3675098d9c2dd8ad3f9fd7e029e9060 100644 --- a/admin-dev/index.php +++ b/admin-dev/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/init.php b/admin-dev/init.php index 8f7fa8eddd66ac763bfc4f6227a76185f267c259..d78eac9a705ae91960d20f4057d9899cc1f31bf4 100644 --- a/admin-dev/init.php +++ b/admin-dev/init.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/pdf.php b/admin-dev/pdf.php index 2bd2051b1abbe7ee3b03003539e58ae49e46a250..23cebc7bc67174bf5a59076c6ea7901153e46659 100644 --- a/admin-dev/pdf.php +++ b/admin-dev/pdf.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/searchcron.php b/admin-dev/searchcron.php index abfb53817891939f4909ed0b45dafa4f0feacc84..57e6cd5f9507e8be27bf34a74d89aa8f6c18cf01 100644 --- a/admin-dev/searchcron.php +++ b/admin-dev/searchcron.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/css/bundle/module/drop.css b/admin-dev/themes/default/css/bundle/module/drop.css index 933f447a0bdd98ba4009c3c5416a01d3aee6fb9d..a9bc7ddf6005cb27067570975bd3824aa41cdac8 100644 --- a/admin-dev/themes/default/css/bundle/module/drop.css +++ b/admin-dev/themes/default/css/bundle/module/drop.css @@ -1,3 +1,27 @@ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ .modal-content { padding: 1%; } diff --git a/admin-dev/themes/default/css/bundle/plugins/jquery.pstagger.css b/admin-dev/themes/default/css/bundle/plugins/jquery.pstagger.css index 8d2681779a7090f608b86470cabc134a7b88a825..ae7adc9596943dccfb098c2da2686519836d0832 100644 --- a/admin-dev/themes/default/css/bundle/plugins/jquery.pstagger.css +++ b/admin-dev/themes/default/css/bundle/plugins/jquery.pstagger.css @@ -1,3 +1,27 @@ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ .pstaggerAddTagInput:focus { outline: 0; } diff --git a/admin-dev/themes/default/css/font.css b/admin-dev/themes/default/css/font.css index d9b972926780c81a4cc591a71ade6c85b877e2d0..dd7af6df8b7d1b9894f38c70371900cdbeaba053 100644 --- a/admin-dev/themes/default/css/font.css +++ b/admin-dev/themes/default/css/font.css @@ -1 +1,25 @@ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ @font-face{font-family:'Material Icons';font-style:normal;font-weight:400;src:url(../node_modules/material-design-icons/iconfont/MaterialIcons-Regular.eot);src:local("Material Icons"),local("MaterialIcons-Regular"),url(../node_modules/material-design-icons/iconfont//MaterialIcons-Regular.woff2) format("woff2"),url(../node_modules/material-design-icons/iconfont//MaterialIcons-Regular.woff) format("woff"),url(../node_modules/material-design-icons/iconfont//MaterialIcons-Regular.ttf) format("truetype")}.material-icons{font-family:'Material Icons';font-weight:normal;font-style:normal;font-size:24px;display:inline-block;line-height:1;text-transform:none;letter-spacing:normal;word-wrap:normal;white-space:nowrap;direction:ltr;-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility;-moz-osx-font-smoothing:grayscale;font-feature-settings:'liga'} diff --git a/admin-dev/themes/default/css/index.php b/admin-dev/themes/default/css/index.php index 5580293e10f447a265752b71c0ee20452f0b948b..4f389532be0d7a34dfd0cfbd5c9f15f607ec6715 100755 --- a/admin-dev/themes/default/css/index.php +++ b/admin-dev/themes/default/css/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/css/schemes/index.php b/admin-dev/themes/default/css/schemes/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/css/schemes/index.php +++ b/admin-dev/themes/default/css/schemes/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/css/schemes_rtl/index.php b/admin-dev/themes/default/css/schemes_rtl/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/css/schemes_rtl/index.php +++ b/admin-dev/themes/default/css/schemes_rtl/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/fonts/index.php b/admin-dev/themes/default/fonts/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/fonts/index.php +++ b/admin-dev/themes/default/fonts/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/img/index.php b/admin-dev/themes/default/img/index.php index 5580293e10f447a265752b71c0ee20452f0b948b..4f389532be0d7a34dfd0cfbd5c9f15f607ec6715 100755 --- a/admin-dev/themes/default/img/index.php +++ b/admin-dev/themes/default/img/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/img/patterns/index.php b/admin-dev/themes/default/img/patterns/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/img/patterns/index.php +++ b/admin-dev/themes/default/img/patterns/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/index.php b/admin-dev/themes/default/index.php index 5580293e10f447a265752b71c0ee20452f0b948b..4f389532be0d7a34dfd0cfbd5c9f15f607ec6715 100644 --- a/admin-dev/themes/default/index.php +++ b/admin-dev/themes/default/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js index cb374f12c1d413839e92871b5ff52abd9e6756f6..63e56331fe8e7bbffc484790efa074a853ef1c97 100644 --- a/admin-dev/themes/default/js/admin-theme.js +++ b/admin-dev/themes/default/js/admin-theme.js @@ -1,5 +1,5 @@ /** - * 2007-2015 PrestaShop + * 2007-2016 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/category-tree.js b/admin-dev/themes/default/js/bundle/category-tree.js index 2512e7f105b3c7ba6ba9628398a7f60dfbe7abe7..7719e5e7ec38264ce515a6517bc0492c84369bed 100644 --- a/admin-dev/themes/default/js/bundle/category-tree.js +++ b/admin-dev/themes/default/js/bundle/category-tree.js @@ -1,5 +1,5 @@ /** - * 2007-2015 PrestaShop + * 2007-2016 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/module/loader.js b/admin-dev/themes/default/js/bundle/module/loader.js index 6af6be9a2115e78f8172b759c592fa489d821090..ebd9a47525d6e39f491a9dac7be3a16df4d11463 100644 --- a/admin-dev/themes/default/js/bundle/module/loader.js +++ b/admin-dev/themes/default/js/bundle/module/loader.js @@ -1,3 +1,27 @@ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ $(function() { var moduleImport = $("#module-import"); moduleImport.click(function() { diff --git a/admin-dev/themes/default/js/bundle/pagination.js b/admin-dev/themes/default/js/bundle/pagination.js index 0211f61be7d51f05b636a95ceb341a2f94c0b9bb..70e4d8490071d6668abed2b626a2cc88a8be3ffd 100644 --- a/admin-dev/themes/default/js/bundle/pagination.js +++ b/admin-dev/themes/default/js/bundle/pagination.js @@ -1,5 +1,5 @@ /** - * 2007-2015 PrestaShop + * 2007-2016 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/plugins/jquery.pstagger.js b/admin-dev/themes/default/js/bundle/plugins/jquery.pstagger.js index e9bd6cbec89b1abcfc45226038d854acea4c6ef5..54cdece025979666ac7b10658c1cd2c0a2428ae7 100644 --- a/admin-dev/themes/default/js/bundle/plugins/jquery.pstagger.js +++ b/admin-dev/themes/default/js/bundle/plugins/jquery.pstagger.js @@ -1,13 +1,27 @@ -/* -* jQuery pstagger plugin -* https://www.prestashop.com -* -* Copyright PrestaShop and other contributors -* Released under the MIT license -* https://tldrlegal.com/license/mit-license -* -* Date: 2016-01-13 -*/ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ (function ( $ ) { var config = null; diff --git a/admin-dev/themes/default/js/bundle/product/catalog.js b/admin-dev/themes/default/js/bundle/product/catalog.js index 6ee7b9aa45bfcd328d54a0b4b02e011bb5157dab..6df7008305da5382aca9d09fb1d5749110275317 100644 --- a/admin-dev/themes/default/js/bundle/product/catalog.js +++ b/admin-dev/themes/default/js/bundle/product/catalog.js @@ -1,5 +1,5 @@ /** - * 2007-2015 PrestaShop + * 2007-2016 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/bundle/product/form.js b/admin-dev/themes/default/js/bundle/product/form.js index d68abb94d1ba8ac515ea042e3442b3f16193ea37..527166422ea1d230025646f95d282bf0bf1443d0 100644 --- a/admin-dev/themes/default/js/bundle/product/form.js +++ b/admin-dev/themes/default/js/bundle/product/form.js @@ -1,5 +1,5 @@ /** - * 2007-2015 PrestaShop + * 2007-2016 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/calendar.js b/admin-dev/themes/default/js/calendar.js index eed8c7bbf4ce26bf95b5945b666fffc47237c9f2..8502fbcf09d7fcf917d9fcff19f0a269ed6ba582 100644 --- a/admin-dev/themes/default/js/calendar.js +++ b/admin-dev/themes/default/js/calendar.js @@ -1,3 +1,27 @@ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ Date.prototype.addDays = function(value) { this.setDate(this.getDate() + value); diff --git a/admin-dev/themes/default/js/help.js b/admin-dev/themes/default/js/help.js index 5b55a895ed600086ac0ba3324af34dc0fd92d043..41fc81838a59adf3ef0d0ec2a421b7c1902f40c2 100755 --- a/admin-dev/themes/default/js/help.js +++ b/admin-dev/themes/default/js/help.js @@ -1,5 +1,5 @@ /** - * 2007-2015 PrestaShop + * 2007-2016 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/index.php b/admin-dev/themes/default/js/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/js/index.php +++ b/admin-dev/themes/default/js/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/js/modernizr-loads.js b/admin-dev/themes/default/js/modernizr-loads.js index ced302e56e2d55677d20e55505ca4bb602b9fae8..3b71a520224bb0e0b413116d8ca046d039018e66 100644 --- a/admin-dev/themes/default/js/modernizr-loads.js +++ b/admin-dev/themes/default/js/modernizr-loads.js @@ -1,3 +1,27 @@ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ Modernizr.load([ { test: window.matchMedia, diff --git a/admin-dev/themes/default/js/theme.js b/admin-dev/themes/default/js/theme.js index 8d53d1245386c9fe6f887eb4f70d9ffc073bfb98..7784882d641651a287bc792b3cd82c855b222dd0 100644 --- a/admin-dev/themes/default/js/theme.js +++ b/admin-dev/themes/default/js/theme.js @@ -1 +1,25 @@ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ import '../sass/font.scss'; diff --git a/admin-dev/themes/default/js/tree.js b/admin-dev/themes/default/js/tree.js index d0203b62eb113425d0efe72b5da956b7505332a1..fe9018c72460d0721588db08ff140b4d74fe2813 100644 --- a/admin-dev/themes/default/js/tree.js +++ b/admin-dev/themes/default/js/tree.js @@ -1,3 +1,27 @@ +/** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + */ var Tree = function (element, options) { this.$element = $(element); diff --git a/admin-dev/themes/default/sass/controllers/index.php b/admin-dev/themes/default/sass/controllers/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/sass/controllers/index.php +++ b/admin-dev/themes/default/sass/controllers/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/index.php b/admin-dev/themes/default/sass/index.php index 5580293e10f447a265752b71c0ee20452f0b948b..4f389532be0d7a34dfd0cfbd5c9f15f607ec6715 100755 --- a/admin-dev/themes/default/sass/index.php +++ b/admin-dev/themes/default/sass/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/partials/index.php b/admin-dev/themes/default/sass/partials/index.php index 5580293e10f447a265752b71c0ee20452f0b948b..4f389532be0d7a34dfd0cfbd5c9f15f607ec6715 100755 --- a/admin-dev/themes/default/sass/partials/index.php +++ b/admin-dev/themes/default/sass/partials/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/schemes/index.php b/admin-dev/themes/default/sass/schemes/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/sass/schemes/index.php +++ b/admin-dev/themes/default/sass/schemes/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/sass/schemes_rtl/index.php b/admin-dev/themes/default/sass/schemes_rtl/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/sass/schemes_rtl/index.php +++ b/admin-dev/themes/default/sass/schemes_rtl/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/content.tpl b/admin-dev/themes/default/template/content.tpl index c956a09a59f657ff9e198054425e52249025561a..d546ad3578b390565b3374ba6f4a64a7f40e5496 100644 --- a/admin-dev/themes/default/template/content.tpl +++ b/admin-dev/themes/default/template/content.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *}
    {* ajaxBox allows*} diff --git a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl index 40e27459c3407f575d4ea3b483aa9181c9052bbe..c6c0ad415cfcf661392247c5246e982b0a631f7b 100644 --- a/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *}

    {l s='Ranges'}

    diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php index 2521f9576d0498f57b2efed4ba1f8e7373cc6bb8..c9181a4e2ddb23a1a90e420f5327f434a967c6e4 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php index 16ab83f396ae135c6e2c21de0092d642a2566428..936cccc17f8fd285d1b8a0cef83adfb2677857d2 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php index 2521f9576d0498f57b2efed4ba1f8e7373cc6bb8..c9181a4e2ddb23a1a90e420f5327f434a967c6e4 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl index 8c427b2bacbedce87eb20f55e4ec604c99dae7e5..2d66721fd4dd8cfcb62b5c1fd66b9cb6b4673694 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *} {extends file="helpers/view/view.tpl"} {block name="override_tpl"} diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/index.php b/admin-dev/themes/default/template/controllers/carrier_wizard/index.php index 816db9a4e61bce57f349389244180aacae26f2fc..e0c4a9c75bf4418d6c2a7c93f87c1bc14e9c26ab 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/index.php +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/index.php @@ -1,13 +1,13 @@ - * @copyright 2007-2015 PrestaShop SA - * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl index 365f49a0afbea6b5a9c998473163a13d39eb8a52..a72e0693585133cc896318b3e963a293a4ecdea7 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *}
    diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl index b73c32ddec4e49b51690ce67f398ff829b6c0f39..e87bf9588549699636776cef058ae06124490242 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *} {/block} diff --git a/admin-dev/themes/default/template/controllers/order_preferences/index.php b/admin-dev/themes/default/template/controllers/order_preferences/index.php index cc7da6d11cae0623bcd52f027332eced9ea53b55..393840ddf7d8663752dcce3e2588544218fb46ab 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/index.php @@ -1,6 +1,6 @@ - * @copyright 2007-2015 PrestaShop SA + * @copyright 2007-2016 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl index f3f2c0fa4f2931bba2445bda937359fd711f3765..72f16b803ebbf8729e901aa08d10f0268817d98f 100644 --- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *} {if $product['customizedDatas']} {* Assign product price *} {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl index 300f24ea8607754f51e0201744e9893c21f2db85..ebc317ee352f1709dbd6361f07f2ccfeffb8e1ab 100644 --- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *}
    diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl index 180045ca489592ea015a06213aea9b8c683cfe98..4639c80220f5086540d6ac1ee82a26c3d20de701 100644 --- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *}
    diff --git a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl index 2fe80c2f6ac1c9254a4b9e00115dfa61b218acfa..2cb2600ec62817fe5de8b6eb6250d3cbe2649bcf 100644 --- a/admin-dev/themes/default/template/controllers/orders/_new_product.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_new_product.tpl @@ -1,27 +1,27 @@ -{* -* 2007-2015 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 -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * 2007-2016 PrestaShop + * + * NOTICE OF LICENSE + * + * This source file is subject to the Open Software License (OSL 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/osl-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 + * @copyright 2007-2016 PrestaShop SA + * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) + * International Registered Trademark & Property of PrestaShop SA + *}