diff --git a/.gitignore b/.gitignore index 0f1acb5bd..035aaa4c5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,12 @@ themes/default/modules/*/*.php !themes/default/modules/*/index.php themes/default/lang/*.php !themes/default/lang/index.php +themes/default-bootstrap/cache/*.js +themes/default-bootstrap/cache/*.css +themes/default-bootstrap/modules/*/*.php +!themes/default-bootstrap/modules/*/index.php +themes/default-bootstrap/lang/*.php +!themes/default-bootstrap/lang/index.php modules/*/translations/*.php !modules/*/translations/index.php mails/* diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index a03e40fab..f5132249d 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,161 +1,186 @@ -- adonis karavokyros -- aFolletete -- Agence CINS -- aKorczak -- Alexander Otchenashev -- anat -- Andrew -- aNiassy -- antoniofr -- AntonLejon -- Arnaud Lemercier -- Axome -- Benjamin PONGY -- BigZ -- bLeveque -- bMancone -- bumbu -- Burhan -- Caleydon Media -- cam.lafit -- Captain FLAM -- Captain-FLAM -- ccauw -- Cédric Mouleyre -- ChristopheBoucaut -- CINS -- cippest -- cmouleyre -- Corentin Delcourt -- Cosmin Hutanu -- Damien Metzger -- DamienMetzger -- Damon Skelhorn -- Daniel -- David Gasperoni -- Davy Rolink -- djfm -- dlage -- dMetzger -- (d)oekia -- Dragan Skrbic -- dreammeup -- DrySs -- DrÿSs -- DrÿSs' -- dSevere -- Edouard Gaulué -- emily-d -- Fabio Chelly -- fBrignoli -- fram -- Francois Gaillard -- François Gaillard -- Fran?s Gaillard -- fSerny -- Gabriel Schwardy -- gBrunier -- gCharmes -- gPoulain -- gr4devel -- Grégoire Bélorgey -- Gregory Roussac -- gRoussac -- Guillaume DELOINCE -- ha99y -- hAitmansour -- Ha!*!*y -- indesign47 -- inem0o -- ivancasasempere -- jBreux -- jeckyl -- jeromenadaud -- Jerome Nadaud -- Jérôme Nadaud -- jessylenne -- jmCollin -- jObregon -- Jonathan Danse -- joseantgv -- Julien -- Kevin Granger -- kpodemski -- Krystian Podemski -- lBrieu -- lCherifi -- ldecoker -- lLefevre -- LOIC ROSSET ltd -- makk1ntosh -- marcinsz101 -- Marco Cervellin -- matiasiglesias -- 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 Mocko -- PrestaEdit -- prestarocket -- Prestaspirit -- pxls -- Raphaël Malié -- raulgundin -- Rémi Gaillard -- rGaillard -- Rimas Kudelis -- rMalie -- rMontagne -- romainberger -- root -- runningz -- sagaradonis -- Samy Rabih -- Sarah Lorenzini -- Seb -- Sébastien -- Sébastien Bocahu -- Seynaeve -- Shagshag -- sjousse -- sLorenzini -- smartdatasoft -- soufyan -- soware -- Staging -- sThiebaut -- Sylvain WITMEYER -- tDidierjean -- unknown -- vAugagneur -- vChabot -- Vincent Augagneur -- Vincent Schoener -- Vincent Terenti -- vinvin27 -- vKham -- vSchoener -- Xavier -- Xavier POITAU -- Yoozio -- zimmi1 + - adonis karavokyros + - aFolletete + - Agence CINS + - aKorczak + - Aleksander Palyan + - Alexander Otchenashev + - anat + - Andrew + - aNiassy + - antoniofr + - AntonLejon + - Arnaud Lemercier + - Axome + - Benjamin PONGY + - BigZ + - bLeveque + - bMancone + - bumbu + - Burhan + - Caleydon Media + - cam.lafit + - Captain FLAM + - Captain-FLAM + - ccauw + - cedricfontaine + - Cédric Mouleyre + - Chris + - ChristopheBoucaut + - CINS + - cippest + - cmouleyre + - Corentin Delcourt + - Cosmin Hutanu + - Damien Metzger + - DamienMetzger + - Damon Skelhorn + - Daniel + - Daniele Giachino + - David Gasperoni + - Davy Rolink + - Dinis Lage + - djfm + - dlage + - dMetzger + - (d)oekia + - Dragan Skrbic + - dreammeup + - DrySs + - DrÿSs + - DrÿSs' + - dSevere + - Edouard Gaulué + - emily-d + - Eric Le Lay + - Fabio Chelly + - fBrignoli + - fchellypresta + - fram + - Francois Gaillard + - François Gaillard + - Franois Gaillard + - fSerny + - Gabriel Schwardy + - Gaelle ITZKOVITZ + - gBrunier + - gCharmes + - gPoulain + - gr4devel + - Grégoire Bélorgey + - Gregory Roussac + - gRoussac + - Guillaume DELOINCE + - ha99y + - hAitmansour + - Ha!*!*y + - indesign47 + - inem0o + - ivancasasempere + - Jáchym Toušek + - Javsmile + - jBreux + - jeckyl + - jeromenadaud + - Jerome Nadaud + - Jérôme Nadaud + - jessylenne + - jmCollin + - jObregon + - Jonathan Danse + - joseantgv + - Julien + - Kevin Granger + - kiropowered + - kpodemski + - Krystian Podemski + - lBrieu + - lCherifi + - ldecoker + - lLefevre + - LOIC ROSSET ltd + - Madef + - Mainmich + - makk1ntosh + - marcinsz101 + - Marco Cervellin + - matiasiglesias + - Mats Rynge + - MatthieuB + - Maxence + - mBertholino + - mDeflotte + - Michel Courtade + - Mickael Desgranges + - Mikael Blotin + - Milow + - minic studio + - misthero + - mMarinetti + - montes + - MustangZhong + - nezenmoins + - Nicolas Sorosac + - Nils-Helge Garli Hegvik + - Nino Uzelac + - nPellicari + - nturato + - oleacorner + - Otto Nascarella + - Patanock + - PhpMadman + - Pierre + - Piotr Kaczor + - Piotr Moćko + - PrestaEdit + - PrestaLab + - PrestanceDesign + - prestarocket + - Prestaspirit + - pxls + - Raphaël Malié + - raulgundin + - Rémi Gaillard + - rGaillard + - Rimas Kudelis + - rMalie + - rMontagne + - romainberger + - root + - runningz + - sagaradonis + - Samy Rabih + - Sarah Lorenzini + - Seb + - Sébastien + - Sébastien Bocahu + - Seynaeve + - Shagshag + - sjousse + - sLorenzini + - smartdatasoft + - soufyan + - soware + - Staging + - sThiebaut + - Sylvain Gougouzian + - Sylvain WITMEYER + - tDidierjean + - thoma202 + - Tomasz Slominski + - Tom Panier + - tucoinfo + - unknown + - vAugagneur + - vChabot + - Vincent Augagneur + - Vincent Schoener + - Vincent Terenti + - vinvin27 + - vKham + - vSchoener + - Xavier + - Xavier POITAU + - Yoozio + - zimmi1 + - Zollner Robert diff --git a/admin-dev/ajaxfilemanager/ajax_file_upload.php b/admin-dev/ajaxfilemanager/ajax_file_upload.php index b21a39c13..c942991ed 100755 --- a/admin-dev/ajaxfilemanager/ajax_file_upload.php +++ b/admin-dev/ajaxfilemanager/ajax_file_upload.php @@ -22,26 +22,18 @@ $upload->setInvalidFileExt(explode(",", CONFIG_UPLOAD_INVALID_EXTS)); if(CONFIG_SYS_VIEW_ONLY || !CONFIG_OPTIONS_UPLOAD) - { $error = SYS_DISABLED; - } elseif(empty($_GET['folder']) || !isUnderRoot($_GET['folder'])) - { $error = ERR_FOLDER_PATH_NOT_ALLOWED; - }else if(!$upload->isFileUploaded('file')) - { + elseif (!$upload->isFileUploaded('file')) $error = ERR_FILE_NOT_UPLOADED; - }else if(!$upload->moveUploadedFile($_GET['folder'])) - { - $error = ERR_FILE_MOVE_FAILED; - } - elseif(!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS))) - { + elseif (!$upload->isPermittedFileExt(explode(",", CONFIG_UPLOAD_VALID_EXTS))) $error = ERR_FILE_TYPE_NOT_ALLOWED; - }elseif(defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE)) - { + elseif (defined('CONFIG_UPLOAD_MAXSIZE') && CONFIG_UPLOAD_MAXSIZE && $upload->isSizeTooBig(CONFIG_UPLOAD_MAXSIZE)) $error = sprintf(ERROR_FILE_TOO_BID, transformFileSize(CONFIG_UPLOAD_MAXSIZE)); - }else + elseif (!$upload->moveUploadedFile($_GET['folder'])) + $error = ERR_FILE_MOVE_FAILED; + else { include_once(CLASS_FILE); $path = $upload->getFilePath(); diff --git a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php index c72110344..bb85caada 100755 --- a/admin-dev/ajaxfilemanager/ajax_get_file_listing.php +++ b/admin-dev/ajaxfilemanager/ajax_get_file_listing.php @@ -24,7 +24,8 @@ if(!empty($_GET['search'])) { include_once(CLASS_SEARCH); - + if (!preg_match('/^'.Tools::pRegexp(realpath(dirname(__FILE__).'/'.$_GET['search_folder']), '/').'/i', _PS_ROOT_DIR_.'/img/cms')) + exit; $search = new Search($_GET['search_folder']); $search->addSearchKeyword('recursive', @$_GET['search_recursively']); $search->addSearchKeyword('mtime_from', @$_GET['search_mtime_from']); diff --git a/admin-dev/ajaxfilemanager/ajax_login.php b/admin-dev/ajaxfilemanager/ajax_login.php index 2f07dc7d1..cbf069ed1 100755 --- a/admin-dev/ajaxfilemanager/ajax_login.php +++ b/admin-dev/ajaxfilemanager/ajax_login.php @@ -32,7 +32,6 @@ if(!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] === false) { - <?php echo LOGIN_PAGE_TITLE; ?> diff --git a/admin-dev/ajaxfilemanager/inc/config.base.php b/admin-dev/ajaxfilemanager/inc/config.base.php index 28155f21e..5b57feed0 100755 --- a/admin-dev/ajaxfilemanager/inc/config.base.php +++ b/admin-dev/ajaxfilemanager/inc/config.base.php @@ -78,9 +78,9 @@ define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste - define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png');// // + define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png');// // //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');// - define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,png'); + define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,jpg,jpeg,jpeg,png'); //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // define('CONFIG_UPLOAD_INVALID_EXTS', ''); diff --git a/admin-dev/ajaxfilemanager/inc/config.php b/admin-dev/ajaxfilemanager/inc/config.php index 2f30ed245..09b4e4200 100755 --- a/admin-dev/ajaxfilemanager/inc/config.php +++ b/admin-dev/ajaxfilemanager/inc/config.php @@ -10,6 +10,9 @@ //FILESYSTEM CONFIG
require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "class.auth.php"); + if (_PS_MODE_DEMO_) + die('This functionality has been disabled.'); + define('CONFIG_QUERY_STRING_ENABLE', true); //Enable passed query string to setting the system configuration if(!isset($_SESSION)) { diff --git a/admin-dev/ajaxfilemanager/inc/config.tinymce.php b/admin-dev/ajaxfilemanager/inc/config.tinymce.php index c406f47e5..9070323a2 100755 --- a/admin-dev/ajaxfilemanager/inc/config.tinymce.php +++ b/admin-dev/ajaxfilemanager/inc/config.tinymce.php @@ -73,9 +73,9 @@ define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html,xml,js,css'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste - define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // + define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,txt'); // //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,bmp,tif,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,aif,aiff,wav,mp3,swf,ppt,rtf,doc,pdf,xls,txt,xml,xsl,dtd');// - define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf'); + define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,js,css,xml,xsl,dtd,mp3,wav,wmv,wma,rm,rmvb,mov,swf'); //define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,png,txt'); // define('CONFIG_UPLOAD_INVALID_EXTS', ''); diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php index 26110efc9..16e7a2354 100644 --- a/admin-dev/header.inc.php +++ b/admin-dev/header.inc.php @@ -37,7 +37,6 @@ echo ' - @@ -56,9 +55,6 @@ echo ' '.Hook::exec('displayBackOfficeHeader').' - ",d.insertBefore(c.lastChild,d.firstChild)}function l(){var a=r.elements;return typeof a=="string"?a.split(" "):a}function m(a){var b=i[a[g]];return b||(b={},h++,a[g]=h,i[h]=b),b}function n(a,c,f){c||(c=b);if(j)return c.createElement(a);f||(f=m(c));var g;return f.cache[a]?g=f.cache[a].cloneNode():e.test(a)?g=(f.cache[a]=f.createElem(a)).cloneNode():g=f.createElem(a),g.canHaveChildren&&!d.test(a)?f.frag.appendChild(g):g}function o(a,c){a||(a=b);if(j)return a.createDocumentFragment();c=c||m(a);var d=c.frag.cloneNode(),e=0,f=l(),g=f.length;for(;e",f="hidden"in a,j=a.childNodes.length==1||function(){b.createElement("a");var a=b.createDocumentFragment();return typeof a.cloneNode=="undefined"||typeof a.createDocumentFragment=="undefined"||typeof a.createElement=="undefined"}()}catch(c){f=!0,j=!0}})();var r={elements:c.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:c.shivCSS!==!1,supportsUnknownElements:j,shivMethods:c.shivMethods!==!1,type:"default",shivDocument:q,createElement:n,createDocumentFragment:o};a.html5=r,q(b)}(this,b),e._version=d,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+p.join(" "):""),e}(this,this.document),function(a,b,c){function d(a){return"[object Function]"==o.call(a)}function e(a){return"string"==typeof a}function f(){}function g(a){return!a||"loaded"==a||"complete"==a||"uninitialized"==a}function h(){var a=p.shift();q=1,a?a.t?m(function(){("c"==a.t?B.injectCss:B.injectJs)(a.s,0,a.a,a.x,a.e,1)},0):(a(),h()):q=0}function i(a,c,d,e,f,i,j){function k(b){if(!o&&g(l.readyState)&&(u.r=o=1,!q&&h(),l.onload=l.onreadystatechange=null,b)){"img"!=a&&m(function(){t.removeChild(l)},50);for(var d in y[c])y[c].hasOwnProperty(d)&&y[c][d].onload()}}var j=j||B.errorTimeout,l=b.createElement(a),o=0,r=0,u={t:d,s:c,e:f,a:i,x:j};1===y[c]&&(r=1,y[c]=[]),"object"==a?l.data=c:(l.src=c,l.type=a),l.width=l.height="0",l.onerror=l.onload=l.onreadystatechange=function(){k.call(this,r)},p.splice(e,0,u),"img"!=a&&(r||2===y[c]?(t.insertBefore(l,s?null:n),m(k,j)):y[c].push(l))}function j(a,b,c,d,f){return q=0,b=b||"j",e(a)?i("c"==b?v:u,a,b,this.i++,c,d,f):(p.splice(this.i++,0,a),1==p.length&&h()),this}function k(){var a=B;return a.loader={load:j,i:0},a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=s?l:n.parentNode,l=a.opera&&"[object Opera]"==o.call(a.opera),l=!!b.attachEvent&&!l,u=r?"object":l?"script":"img",v=l?"script":u,w=Array.isArray||function(a){return"[object Array]"==o.call(a)},x=[],y={},z={timeout:function(a,b){return b.length&&(a.timeout=b[0]),a}},A,B;B=function(a){function b(a){var a=a.split("!"),b=x.length,c=a.pop(),d=a.length,c={url:c,origUrl:c,prefixes:a},e,f,g;for(f=0;f