Skip to content

Commit 75a7fac

Browse files
committed
#193 [Mod] fix: fatal include for release
1 parent 07c8db5 commit 75a7fac

File tree

7 files changed

+31
-19
lines changed

7 files changed

+31
-19
lines changed

class/facturerecstats.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* \ingroup dolisirh
2121
* \brief Recurring invoice class to manage statistics reports
2222
*/
23-
include_once DOL_DOCUMENT_ROOT . '/custom/dolisirh/class/dolisirhstats.class.php';
23+
require_once __DIR__ . '/dolisirhstats.class.php';
2424
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
2525
//include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
2626
include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

dolisirhindex.php

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,18 @@
2222
*/
2323

2424
// Load Dolibarr environment
25-
if (file_exists('../../main.inc.php')) {
26-
require_once '../../main.inc.php';
27-
} else {
28-
die('Include of main fails');
29-
}
25+
$res = 0;
26+
// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
27+
if ( ! $res && ! empty($_SERVER['CONTEXT_DOCUMENT_ROOT'])) $res = @include $_SERVER['CONTEXT_DOCUMENT_ROOT'] . '/main.inc.php';
28+
// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
29+
$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
30+
while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
31+
if ( ! $res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1)) . '/main.inc.php')) $res = @include substr($tmp, 0, ($i + 1)) . '/main.inc.php';
32+
if ( ! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1))) . '/main.inc.php')) $res = @include dirname(substr($tmp, 0, ($i + 1))) . '/main.inc.php';
33+
// Try main.inc.php using relative path
34+
if ( ! $res && file_exists('../../main.inc.php')) $res = @include '../../main.inc.php';
35+
if ( ! $res && file_exists('../../../main.inc.php')) $res = @include '../../../main.inc.php';
36+
if ( ! $res) die('Include of main fails');
3037

3138
// Libraries
3239
require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';

view/dolisirhtools.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,17 @@
2323

2424
// Load Dolibarr environment
2525
$res = 0;
26-
if (file_exists('../../../main.inc.php')) {
27-
$res = include '../../../main.inc.php';
28-
}
29-
if (!$res) {
30-
die('Include of main fails');
31-
}
26+
// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
27+
if ( ! $res && ! empty($_SERVER['CONTEXT_DOCUMENT_ROOT'])) $res = @include $_SERVER['CONTEXT_DOCUMENT_ROOT'] . '/main.inc.php';
28+
// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
29+
$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
30+
while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
31+
if ( ! $res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1)) . '/main.inc.php')) $res = @include substr($tmp, 0, ($i + 1)) . '/main.inc.php';
32+
if ( ! $res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1))) . '/main.inc.php')) $res = @include dirname(substr($tmp, 0, ($i + 1))) . '/main.inc.php';
33+
// Try main.inc.php using relative path
34+
if ( ! $res && file_exists('../../main.inc.php')) $res = @include '../../main.inc.php';
35+
if ( ! $res && file_exists('../../../main.inc.php')) $res = @include '../../../main.inc.php';
36+
if ( ! $res) die('Include of main fails');
3237

3338
global $conf, $db, $langs, $user;
3439

view/recurringinvoicestatistics.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
4545
}
4646

47-
require_once DOL_DOCUMENT_ROOT.'/custom/dolisirh/class/facturerecstats.class.php';
47+
require_once __DIR__ . '/../class/facturerecstats.class.php';
4848

4949
// Global variables definitions
5050
global $db, $langs, $user;

view/timespent_day.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
5454
}
5555

56-
require_once DOL_DOCUMENT_ROOT.'/custom/dolisirh/lib/dolisirh_function.lib.php';
57-
require_once DOL_DOCUMENT_ROOT.'/custom/dolisirh/class/workinghours.class.php';
56+
require_once __DIR__ . '/../lib/dolisirh_function.lib.php';
57+
require_once __DIR__ . '/../class/workinghours.class.php';
5858

5959
global $conf, $user, $langs, $db;
6060

view/timespent_month.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
5151
}
5252

53-
require_once DOL_DOCUMENT_ROOT.'/custom/dolisirh/lib/dolisirh_function.lib.php';
54-
require_once DOL_DOCUMENT_ROOT.'/custom/dolisirh/class/workinghours.class.php';
53+
require_once __DIR__ . '/../lib/dolisirh_function.lib.php';
54+
require_once __DIR__ . '/../class/workinghours.class.php';
5555

5656
// Global variables definitions
5757
global $conf, $db, $hookmanager, $langs, $user;

view/timespent_week.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
5151
}
5252

53-
require_once DOL_DOCUMENT_ROOT.'/custom/dolisirh/lib/dolisirh_function.lib.php';
54-
require_once DOL_DOCUMENT_ROOT.'/custom/dolisirh/class/workinghours.class.php';
53+
require_once __DIR__ . '/../lib/dolisirh_function.lib.php';
54+
require_once __DIR__ . '/../class/workinghours.class.php';
5555

5656
// Global variables definitions
5757
global $conf, $db, $hookmanager, $langs, $user;

0 commit comments

Comments
 (0)