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

Fix: Bad alignement

Browse Source
This commit is contained in:
Laurent Destailleur 2011-09-05 11:16:01 +00:00
parent 50db3549e9
commit 7f2ece3791
1 changed files with 24 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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