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

Doxygen

Browse Source
This commit is contained in:
Laurent Destailleur
2011-09-05 11:24:50 +00:00
parent 206ae43a04
commit daddfe63a6
2 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/security_other.php
View File

@@ -293,7 +293,7 @@ print '<td colspan="2">'.$langs->trans("AntiVirusCommand").'<br>';
print $langs->trans("AntiVirusCommandExample");
// Check command in inside safe_mode
print '</td>';
print '<td align="center">';
print '<td>';
if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
{
$langs->load("errors");
@@ -321,7 +321,7 @@ print "<tr ".$bc[$var].">";
print '<td colspan="2">'.$langs->trans("AntiVirusParam").'<br>';
print $langs->trans("AntiVirusParamExample");
print '</td>';
print '<td align="center">';
print '<td>';
print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" size="72" value="'.htmlentities($conf->global->MAIN_ANTIVIRUS_PARAM).'">';
print "</td>";
print '<td align="right">';

57
htdocs/lib/xcal.lib.php
View File

@@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -24,11 +24,12 @@
/**
* Build a file from an array of events
* All input params and data must be encoded in $conf->charset_output
* @param format 'vcal' or 'ical'
* @param title Title of export
* @param desc Description of export
* @param events_array Array of events ('eid','startdate','duration','enddate','title','summary','category','email','url','desc','author')
* @param outputfile Output file
*
* @param string $format 'vcal' or 'ical'
* @param string $title Title of export
* @param string $desc Description of export
* @param array $events_array Array of events ('eid','startdate','duration','enddate','title','summary','category','email','url','desc','author')
* @param string $outputfile Output file
* @return int <0 if ko, Nb of events in file if ok
*/
function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile)
@@ -279,15 +280,16 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile)
}
/**
* \brief Build a file from an array of events
* Build a file from an array of events.
* All input data must be encoded in $conf->charset_output
* \param format 'rss'
* \param title Title of export
* \param desc Description of export
* \param events_array Array of events ('uid','startdate','summary','url','desc','author','category')
* \param outputfile Output file
* \param filter Filter
* \return int <0 if ko, Nb of events in file if ok
*
* @param string $format 'rss'
* @param string $title Title of export
* @param string $desc Description of export
* @param array $events_array Array of events ('uid','startdate','summary','url','desc','author','category')
* @param string $outputfile Output file
* @param string $filter Filter
* @return int <0 if ko, Nb of events in file if ok
*/
function build_rssfile($format='rss',$title,$desc,$events_array,$outputfile,$filter='')
{
@@ -394,11 +396,12 @@ function build_rssfile($format='rss',$title,$desc,$events_array,$outputfile,$fil
/**
* \brief Encode for cal export
* \param format vcal or ical
* \param string string to encode
* \return string string encoded
* \remarks string must be encoded in conf->file->character_set_client
* Encode for cal export
* string must be encoded in conf->file->character_set_client
*
* @param string $format vcal or ical
* @param string $string string to encode
* @return string string encoded
*/
function format_cal($format,$string)
{
@@ -428,7 +431,8 @@ function format_cal($format,$string)
/**
* Cut string after 75 chars. Add CRLF+Space.
* line must be encoded in UTF-8
* @param line String to convert
*
* @param string $line String to convert
* @return string String converted
*/
function CalEncode($line)
@@ -473,6 +477,13 @@ function CalEncode($line)
}
/**
* Encode into vcal format
*
* @param string $str String to convert
* @param int forcal 1=For cal
* @return string String converted
*/
function QPEncode($str,$forcal=0)
{
$lines = preg_split("/\r\n/", $str);
@@ -503,6 +514,12 @@ function QPEncode($str,$forcal=0)
return trim ( $out );
}
/**
* Decode vcal format
*
* @param string $str String to convert
* @return string String converted
*/
function QPDecode($str)
{
$out = preg_replace('/=\r?\n/', '', $str);