// Release branch merged

osos · Aug 29, 2013 · 6c0867f · 6c0867f
2 parents 4bf773a + ffdc7b5
commit 6c0867f
Show file tree

Hide file tree

Showing 1,014 changed files with 24,989 additions and 12,603 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,15 @@
 .DS_Store
 robots.txt
 sitemap.xml
+cache/cachefs/*
+!cache/cachefs/index.php
+download/*
+!download/index.php
+upload/*
+!upload/index.php
+admin-dev/autoupgrade/*
+admin-dev/backups/*
+!admin-dev/backups/index.php
 cache/smarty/cache/*
 !cache/smarty/cache/index.php
 cache/smarty/compile/*
@@ -16,6 +25,7 @@ cache/tcpdf/*
 !cache/tcpdf/index.php
 config/xml/*.xml
 config/settings.inc.php
+config/settings.old.php
 log/*.log
 img/*
 !img/index.php
@@ -27,6 +37,10 @@ tools/smarty*/compile/*.php
 override/classes/*.php
 themes/default/cache/*.js
 themes/default/cache/*.css
+themes/default/modules/*/*.php
+!themes/default/modules/*/index.php
+themes/default/lang/*.php
+!themes/default/lang/index.php
 modules/*/translations/*.php
 !modules/*/translations/index.php
 mails/*
@@ -35,4 +49,59 @@ modules/*/mails/*
 !modules/*/mails/en
 translations/*
 !translations/*.gzip
-
+modules/atos/*
+modules/addshoppers
+modules/alliedwallet
+modules/authorizeaim
+modules/autoupgrade
+modules/avalaratax
+modules/backwardcompatibility
+modules/canadapost
+modules/cloudcache
+modules/ebay
+modules/fedexcarrier
+modules/fianetfraud
+modules/fianetsceau
+modules/fidbag
+modules/firstdata
+modules/gadwords
+modules/gamification
+modules/ganalytics
+modules/gsitemap
+modules/hipay
+modules/iadvize
+modules/itembase
+modules/jirafe
+modules/kiala
+modules/kialasmall
+modules/klarnaprestashop
+modules/kwixo
+modules/livezilla
+modules/mailjet
+modules/merchantware
+modules/mobile_theme
+modules/mondialrelay
+modules/moneybookers
+modules/nqgatewayneteven
+modules/ogone
+modules/pagseguro
+modules/paypal
+modules/payulatam
+modules/prediggo
+modules/prestafraud
+modules/shipwire
+modules/shoppingfeedexport
+modules/shoppingfluxexport
+modules/socolissimo
+modules/stripejs
+modules/themeinstallator
+modules/tntcarrier
+modules/treepodia
+modules/trustedshops
+modules/trustly
+modules/twenga
+modules/upscarrier
+modules/uspscarrier
+modules/wexpay
+modules/yotpo
+modules/zingaya
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,5 +8,5 @@ All core files you commit in your pull request must have Open Software License (
 All modules files you commit in your pull request must have Academic Free License (AFL 3.0)  
 
 [1]: https://help.github.com/articles/using-pull-requests
-[2]: http://docs.prestashop.com/display/PS15/Coding+Standard
-[3]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message
+[2]: http://docs.prestashop.com/display/PS15/Coding+Standards
+[3]: http://docs.prestashop.com/display/PS15/How+to+write+a+commit+message
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,80 +1,140 @@
-	- (d)oekia
-	- Alexander Otchenashev
-	- Benjamin PONGY
-	- Burhan
-	- Caleydon Media
-	- Damien Metzger
-	- DamienMetzger
-	- Damon Skelhorn
-	- Daniel
-	- David Gasperoni
-	- DrySs
-	- DrÿSs'
-	- François Gaillard
-	- Gabriel Schwardy
-	- Gregory Roussac
-	- Ha!*!*y
-	- Jonathan Danse
-	- Krystian Podemski
-	- Marco Cervellin
-	- Michel Courtade
-	- Milow
-	- Patanock
-	- Pierre
-	- PrestaEdit
-	- Raphaël Malié
-	- Rémi Gaillard
-	- Samy Rabih
-	- Sarah Lorenzini
-	- Shagshag
-	- Vincent Augagneur
-	- Xavier POITAU
-	- aFolletete
-	- aKorczak
-	- aNiassy
-	- adonis karavokyros
-	- anat
-	- bLeveque
-	- bMancone
-	- bumbu
-	- cmouleyre
-	- dMetzger
-	- dSevere
-	- djfm
-	- fBrignoli
-	- fSerny
-	- fram
-	- gBrunier
-	- gCharmes
-	- gPoulain
-	- gRoussac
-	- hAitmansour
-	- ivancasasempere
-	- jBreux
-	- jObregon
-	- jessylenne
-	- jmCollin
-	- kpodemski
-	- lBrieu
-	- lCherifi
-	- lLefevre
-	- mBertholino
-	- mDeflotte
-	- mMarinetti
-	- marcinsz101
-	- montes
-	- nPellicari
-	- nezenmoins
-	- oleacorner
-	- rGaillard
-	- rMalie
-	- rMontagne
-	- root
-	- sLorenzini
-	- sThiebaut
-	- tDidierjean
-	- vAugagneur
-	- vChabot
-	- vKham
-	- vSchoener
-
+- adonis karavokyros
+- aFolletete
+- Agence CINS
+- aKorczak
+- Alexander Otchenashev
+- anat
+- Andrew
+- aNiassy
+- antoniofr
+- AntonLejon
+- Arnaud Lemercier
+- Axome
+- Benjamin PONGY
+- BigZ
+- bLeveque
+- bMancone
+- bumbu
+- Burhan
+- Cédric Mouleyre
+- Caleydon Media
+- cam.lafit
+- Captain FLAM
+- Captain-FLAM
+- ccauw
+- ChristopheBoucaut
+- cippest
+- cmouleyre
+- Corentin Delcourt
+- Cosmin Hutanu
+- Damien Metzger
+- DamienMetzger
+- Damon Skelhorn
+- Daniel
+- David Gasperoni
+- Davy Rolink
+- djfm
+- dMetzger
+- (d)oekia
+- Dragan Skrbic
+- DrÿSs'
+- dreammeup
+- DrySs
+- dSevere
+- Edouard Gaulué
+- emily-d
+- Fabio Chelly
+- fBrignoli
+- fram
+- François Gaillard
+- fSerny
+- Gabriel Schwardy
+- gBrunier
+- gCharmes
+- gPoulain
+- Grégoire Bélorgey
+- Gregory Roussac
+- gRoussac
+- Guillaume DELOINCE
+- hAitmansour
+- Ha!*!*y
+- indesign47
+- inem0o
+- ivancasasempere
+- Jérôme Nadaud
+- jBreux
+- jeromenadaud
+- Jerome Nadaud
+- jessylenne
+- jmCollin
+- jObregon
+- Jonathan Danse
+- joseantgv
+- Kevin Granger
+- kpodemski
+- Krystian Podemski
+- lBrieu
+- lCherifi
+- ldecoker
+- lLefevre
+- marcinsz101
+- Marco Cervellin
+- Mats Rynge
+- MatthieuB
+- Maxence
+- mBertholino
+- mDeflotte
+- Michel Courtade
+- Milow
+- minic studio
+- misthero
+- mMarinetti
+- montes
+- nezenmoins
+- Nicolas Sorosac
+- Nils-Helge Garli Hegvik
+- nPellicari
+- nturato
+- oleacorner
+- Otto Nascarella
+- Patanock
+- PhpMadman
+- Pierre
+- Piotr Kaczor
+- Piotr Moćko
+- PrestaEdit
+- prestarocket
+- pxls
+- Rémi Gaillard
+- Raphaël Malié
+- raulgundin
+- rGaillard
+- Rimas Kudelis
+- rMalie
+- rMontagne
+- root
+- runningz
+- Sébastien
+- Sébastien Bocahu
+- Samy Rabih
+- Sarah Lorenzini
+- Seb
+- Seynaeve
+- Shagshag
+- sLorenzini
+- soware
+- Staging
+- sThiebaut
+- Sylvain WITMEYER
+- tDidierjean
+- vAugagneur
+- vChabot
+- Vincent Augagneur
+- Vincent Schoener
+- Vincent Terenti
+- vinvin27
+- vKham
+- vSchoener
+- Xavier
+- Xavier POITAU
+- Yoozio
diff --git a/address.php b/address.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=address'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
diff --git a/addresses.php b/addresses.php
@@ -34,4 +34,4 @@
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
+Tools::redirect('index.php?controller=addresses'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');
diff --git a/admin-dev/ajaxfilemanager/ajax_file_upload.php b/admin-dev/ajaxfilemanager/ajax_file_upload.php
@@ -60,7 +60,7 @@
 									$tem[$k] = $v;
 								}
 
-								$tem['path'] = backslashToSlash($path);		
+								$tem['path'] = addslashes(backslashToSlash($path));
 								$tem['type'] = "file";
 								$tem['size'] = transformFileSize($tem['size']);
 								$tem['ctime'] = date(DATE_TIME_FORMAT, $tem['ctime']);
@@ -73,7 +73,7 @@
 										$info .= sprintf(", %s:'%s'", $k, $v);									
 								}
 
-								$info .= sprintf(", url:'%s'",  getFileUrl($path));
+								$info .= sprintf(", url:'%s'",  addslashes(getFileUrl($path)));
 								$info .= sprintf(", tipedit:'%s'",  TIP_DOC_RENAME);		
 
 

diff --git a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php
@@ -99,9 +99,9 @@
 				{
 					$v = transformFileSize($v);
 				}
-				echo (($j++ > 1)?",":'') . "'" . $k . "':'" . $v . "'";
+				echo (($j++ > 1)?",":'') . "'" . addslashes($k) . "':'" . addslashes($v) . "'";
 			}
-			echo (($j++ > 1)?",":'') . "'url':'" . getFileUrl($file['path']) . "'";
+			echo (($j++ > 1)?",":'') . "'url':'" . addslashes(getFileUrl($file['path'])) . "'";
 			echo "}\n";				
 		}
 		echo  "};</script>\n";

diff --git a/admin-dev/ajaxfilemanager/inc/class.file.php b/admin-dev/ajaxfilemanager/inc/class.file.php
@@ -33,15 +33,15 @@ function __construct($path = null)
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];
-					$this->fileInfo['path'] = $path;
-					$this->fileInfo['name'] = basename($path);	
+					$this->fileInfo['path'] = addslashes($path);
+					$this->fileInfo['name'] = addslashes(basename($path));
 					$this->fileInfo['is_writable'] = $this->isWritable();
 					$this->fileInfo['is_readable'] = $this->isReadable();
 				}elseif(is_dir($this->filePath))
 				{
 					$this->fileStat = @stat($path);
-					$this->fileInfo['name'] = basename($path);
-					$this->fileInfo['path'] = $path;
+					$this->fileInfo['name'] = addslashes(basename($path));
+					$this->fileInfo['path'] = addslashes($path);
 					$this->fileInfo['atime'] = $this->fileStat[8];
 					$this->fileInfo['ctime'] = $this->fileStat[10];	
 					$this->fileInfo['mtime'] = $this->fileStat[9];