lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix method "file" for external URLs is forbidden.

Browse Source
This commit is contained in:
Laurent Destailleur 2022-04-30 20:06:08 +02:00
parent c96e3bdddf
commit 2e1dfc9a43
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/comm/action/class/ical.class.php
View File

@ -25,6 +25,7 @@
* \brief File of class to parse ical calendars * \brief File of class to parse ical calendars
*/ */
require_once DOL_DOCUMENT_ROOT.'/core/lib/xcal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/xcal.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
/** /**
@ -39,6 +40,7 @@ class ICal
public $todo_count; // Number of Todos public $todo_count; // Number of Todos
public $freebusy_count; // Number of Freebusy public $freebusy_count; // Number of Freebusy
public $last_key; //Help variable save last key (multiline string) public $last_key; //Help variable save last key (multiline string)
public $error;
/** /**
@ -61,11 +63,15 @@ class ICal
$this->file = $file; $this->file = $file;
$file_text = ''; $file_text = '';
$tmparray = file($file); $tmpresult = getURLContent($file, 'GET');
if (is_array($tmparray)) { if ($tmpresult['http_code'] != 200) {
$file_text = join("", $tmparray); //load file $file_text = '';
$file_text = preg_replace("/[\r\n]{1,} /", "", $file_text); $this->error = 'Error: '.$tmpresult['http_code'].' '.$tmpresult['content'];
} else {
$file_text = preg_replace("/[\r\n]{1,} /", "", $tmpresult['content']);
} }
//var_dump($tmpresult);
return $file_text; // return all text return $file_text; // return all text
} }