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

Update actioncomm.class.php after review

Browse Source
This commit is contained in:
Tobias Sekan 2020-01-27 08:27:13 +01:00 committed by GitHub
parent b47e2e8127
commit ce9d1a320f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/comm/action/class/actioncomm.class.php
View File

@ -1557,18 +1557,19 @@ class ActionComm extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/**
* Export events from database into a cal file.
* Export events from database into a cal file.
*
* @param string $format 'vcal', 'ical/ics', 'rss'
* @param string $type 'event' or 'journal'
* @param int $cachedelay Do not rebuild file if date older than cachedelay seconds
* @param string $filename Force filename
* @param array $filters Array of filters. Exemple array('notolderthan'=>99, 'year'=>..., 'idfrom'=>..., 'notactiontype'=>'systemauto', 'project'=>123, ...)
* @return int <0 if error, nb of events in new file if ok
* @param string $format The format of the export 'vcal', 'ical/ics' or 'rss'
* @param string $type The type of the export 'event' or 'journal'
* @param integer $cachedelay Do not rebuild file if date older than cachedelay seconds
* @param string $filename The name for the exported file.
* @param array $filters Array of filters. Example array('notolderthan'=>99, 'year'=>..., 'idfrom'=>..., 'notactiontype'=>'systemauto', 'project'=>123, ...)
* @param integer $exportholiday 0 = don't integrate holidays into the export, 1 = integrate holidays into the export
* @return integer -1 = error on build export file, 0 = export okay
*/
public function build_exportfile($format, $type, $cachedelay, $filename, $filters)
public function build_exportfile($format, $type, $cachedelay, $filename, $filters, $exportholiday = 0)
{
global $hookmanager;
global $hookmanager;
// phpcs:enable
global $conf, $langs, $dolibarr_main_url_root, $mysoc;
@ -1783,7 +1784,7 @@ class ActionComm extends CommonObject
return -1;
}
if($conf->global->AGENDA_SHOW_HOLIDAYS)
if($exportholiday == 1)
{
$langs->load("holidays");
$title = $langs->trans("Holidays");