PLUGINRANGERS-2312 | Improved path traversing when there are symlinks…

… in the Prestashop CMS (#205) * fix: Improved path traversing when there are symlinks * fix: Removed echo used for debugging
doofinder · Apr 23, 2024 · 6f25c27 · 6f25c27
1 parent 79b7904
commit 6f25c27
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 13 deletions.
diff --git a/cache.php b/cache.php
@@ -12,7 +12,13 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once dirname(__FILE__) . '/../../config/config.inc.php';
+$root_path = dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])));
+$config_file_path = $root_path . '/config/config.inc.php';
+if (file_exists($config_file_path)) {
+    require_once $config_file_path;
+} else {
+    require_once dirname(__FILE__) . '/../../config/config.inc.php';
+}
 
 if (!defined('_PS_VERSION_')) {
     exit;

diff --git a/config.php b/config.php
@@ -12,8 +12,15 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once dirname(__FILE__) . '/../../config/config.inc.php';
-require_once dirname(__FILE__) . '/../../init.php';
+$root_path = dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])));
+$config_file_path = $root_path . '/config/config.inc.php';
+if (file_exists($config_file_path)) {
+    require_once $config_file_path;
+    require_once $root_path . '/init.php';
+} else {
+    require_once dirname(__FILE__) . '/../../config/config.inc.php';
+    require_once dirname(__FILE__) . '/../../init.php';
+}
 
 if (!defined('_PS_VERSION_')) {
     exit;

diff --git a/doofinder-ajax.php b/doofinder-ajax.php
@@ -12,8 +12,15 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once dirname(__FILE__) . '/../../config/config.inc.php';
-require_once dirname(__FILE__) . '/../../init.php';
+$root_path = dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])));
+$config_file_path = $root_path . '/config/config.inc.php';
+if (file_exists($config_file_path)) {
+    require_once $config_file_path;
+    require_once $root_path . '/init.php';
+} else {
+    require_once dirname(__FILE__) . '/../../config/config.inc.php';
+    require_once dirname(__FILE__) . '/../../init.php';
+}
 
 if (!defined('_PS_VERSION_')) {
     exit;

diff --git a/doofinder.php b/doofinder.php
@@ -32,15 +32,15 @@ class Doofinder extends Module
     const DOOMANAGER_URL = 'https://admin.doofinder.com';
     const GS_SHORT_DESCRIPTION = 1;
     const GS_LONG_DESCRIPTION = 2;
-    const VERSION = '4.7.28';
+    const VERSION = '4.7.29';
     const YES = 1;
     const NO = 0;
 
     public function __construct()
     {
         $this->name = 'doofinder';
         $this->tab = 'search_filter';
-        $this->version = '4.7.28';
+        $this->version = '4.7.29';
         $this->author = 'Doofinder (http://www.doofinder.com)';
         $this->ps_versions_compliancy = ['min' => '1.5', 'max' => _PS_VERSION_];
         $this->module_key = 'd1504fe6432199c7f56829be4bd16347';

diff --git a/feed.php b/feed.php
@@ -12,7 +12,13 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once dirname(__FILE__) . '/../../config/config.inc.php';
+$root_path = dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])));
+$config_file_path = $root_path . '/config/config.inc.php';
+if (file_exists($config_file_path)) {
+    require_once $config_file_path;
+} else {
+    require_once dirname(__FILE__) . '/../../config/config.inc.php';
+}
 
 if (!defined('_PS_VERSION_')) {
     exit;

diff --git a/feeds/category.php b/feeds/category.php
@@ -16,7 +16,14 @@
     @set_time_limit(3600 * 2);
 }
 
-require_once dirname(__FILE__) . '/../../../config/config.inc.php';
+$root_path = dirname(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME']))));
+$config_file_path = $root_path . '/config/config.inc.php';
+if (file_exists($config_file_path)) {
+    require_once $config_file_path;
+} else {
+    require_once dirname(__FILE__) . '/../../../config/config.inc.php';
+}
+
 require_once dirname(__FILE__) . '/../lib/dfCategory_build.php';
 
 if (!defined('_PS_VERSION_')) {

diff --git a/feeds/cms.php b/feeds/cms.php
@@ -16,7 +16,14 @@
     @set_time_limit(3600 * 2);
 }
 
-require_once dirname(__FILE__) . '/../../../config/config.inc.php';
+$root_path = dirname(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME']))));
+$config_file_path = $root_path . '/config/config.inc.php';
+if (file_exists($config_file_path)) {
+    require_once $config_file_path;
+} else {
+    require_once dirname(__FILE__) . '/../../../config/config.inc.php';
+}
+
 require_once dirname(__FILE__) . '/../lib/dfCms_build.php';
 
 if (!defined('_PS_VERSION_')) {

diff --git a/feeds/product.php b/feeds/product.php
@@ -30,8 +30,16 @@
     @set_time_limit(3600 * 2);
 }
 
-require_once dirname(__FILE__) . '/../../../config/config.inc.php';
-require_once dirname(__FILE__) . '/../../../init.php';
+$root_path = dirname(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME']))));
+$config_file_path = $root_path . '/config/config.inc.php';
+if (file_exists($config_file_path)) {
+    require_once $config_file_path;
+    require_once $root_path . '/init.php';
+} else {
+    require_once dirname(__FILE__) . '/../../../config/config.inc.php';
+    require_once dirname(__FILE__) . '/../../../init.php';
+}
+
 require_once dirname(__FILE__) . '/../doofinder.php';
 
 dfTools::validateSecurityToken(Tools::getValue('dfsec_hash'));

diff --git a/landing.php b/landing.php
@@ -12,7 +12,13 @@
  * @copyright Doofinder
  * @license   GPLv3
  */
-require_once dirname(__FILE__) . '/../../config/config.inc.php';
+$root_path = dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])));
+$config_file_path = $root_path . '/config/config.inc.php';
+if (file_exists($config_file_path)) {
+    require_once $config_file_path;
+} else {
+    require_once dirname(__FILE__) . '/../../config/config.inc.php';
+}
 
 if (!defined('_PS_VERSION_')) {
     exit;