Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix arguments to dol_print_error

Browse Source
This commit is contained in:
MDW
2024-03-26 12:51:06 +01:00
parent 586de61d44
commit 4e4d56d8df
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/public/website/javascript.js.php
View File

@@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2016-2023 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2016-2023 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -139,7 +140,7 @@ if (!$accessallowed) {
if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file)) { if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file)) {
dol_syslog("Refused to deliver file ".$original_file); dol_syslog("Refused to deliver file ".$original_file);
$file = basename($original_file); // Do no show plain path of original_file in shown error message $file = basename($original_file); // Do no show plain path of original_file in shown error message
dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file)); dol_print_error(null, $langs->trans("ErrorFileNameInvalid", $file));
exit; exit;
} }
@@ -155,7 +156,7 @@ $original_file_osencoded = dol_osencode($original_file); // New file name encode
if (!file_exists($original_file_osencoded)) { if (!file_exists($original_file_osencoded)) {
$langs->load("website"); $langs->load("website");
print $langs->trans("RequestedPageHasNoContentYet", $pageid); print $langs->trans("RequestedPageHasNoContentYet", $pageid);
//dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file)); //dol_print_error(null,$langs->trans("ErrorFileDoesNotExists",$original_file));
exit; exit;
} }