R36819 - in /trunk: addressbook/inc/class.addressbook_vcal.inc.php infolog/inc/class.infolog_ical.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 36819

URL: http://svn.stylite.de/viewvc/egroupware?rev=36819&view=rev
Log:
added EGroupware PRODID and DURATION for VTODO

Modified:
trunk/addressbook/inc/class.addressbook_vcal.inc.php
trunk/infolog/inc/class.infolog_ical.inc.php

Modified: trunk/addressbook/inc/class.addressbook_vcal.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/addressbook/inc/class.addressbook_vcal.inc.php?rev=36819&r1=36818&r2=36819&view=diff

— trunk/addressbook/inc/class.addressbook_vcal.inc.php (original)
+++ trunk/addressbook/inc/class.addressbook_vcal.inc.php Wed Oct 5 11:24:08 2011
@@ -72,7 +72,7 @@
‘X-ASSISTANT’ => array(‘assistent’),
‘X-ASSISTANT-TEL’ => array(‘tel_assistent’),
‘UID’ => array(‘uid’),

  •   ); 

  •   );

    /**

    • VCard version
      @@ -203,6 +203,8 @@
      #Horde::logMessage(“vCalAddressbook clientProperties:\n” . print_r($this->clientProperties, true), FILE, LINE, PEAR_LOG_DEBUG);

      $vCard = new Horde_iCalendar_vcard($this->version);

  •   $vCard->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware Addressbook '.$GLOBALS['egw_info']['apps']['addressbook']['version'].'//'.

  •   	strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));

  $sysCharSet = $GLOBALS['egw']->translation->charset();

@@ -795,7 +797,7 @@
{
$finalRowNames[‘TEL;OTHER’] = $vcardKey;
}

  •   			break;	

  •   			break;
  		case 'TEL;PAGER;WORK':
  		case 'TEL;PAGER;HOME':
  			if (!in_array('TEL;PAGER', $rowNames)

@@ -803,7 +805,7 @@
{
$finalRowNames[‘TEL;PAGER’] = $vcardKey;
}

  •   			break;	

  •   			break;
  		case 'TEL;CAR;VOICE':
  		case 'TEL;CAR;CELL':
  		case 'TEL;CAR;CELL;VOICE':

@@ -966,7 +968,7 @@
}

	$this->fixup_contact($contact);

  •   if ($this->log)
  {
  	error_log(__FILE__.'['.__LINE__.'] '.__METHOD__	.

Modified: trunk/infolog/inc/class.infolog_ical.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/infolog/inc/class.infolog_ical.inc.php?rev=36819&r1=36818&r2=36819&view=diff

— trunk/infolog/inc/class.infolog_ical.inc.php (original)
+++ trunk/infolog/inc/class.infolog_ical.inc.php Wed Oct 5 11:24:08 2011
@@ -167,6 +167,8 @@
}

	$vcal = new Horde_iCalendar;

  •   $vcal->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.

  •   	strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));
  $vcal->setAttribute('VERSION',$_version);
  if ($_method) $vcal->setAttribute('METHOD',$_method);

@@ -573,7 +575,7 @@
{
$taskData[‘info_id’] = $_taskID;
}

  •   	foreach ($component->_attributes as $attribute)

  •   	foreach ($component->getAllAttributes() as $attribute)
  	{
  		//$attribute['value'] = trim($attribute['value']);
  		if (!strlen($attribute['value'])) continue;

@@ -611,6 +613,13 @@
$taskData[‘info_location’] = str_replace("\r\n", “\n”, $attribute[‘value’]);
break;

  •   			case 'DURATION':

  •   				if (!isset($taskData['info_startdate']))

  •   				{

  •   					$taskData['info_startdate']	= $component->getAttribute('DTSTART');

  •   				}

  •   				$attribute['value'] += $taskData['info_startdate'];

  •   				// fall throught
  			case 'DUE':
  				// eGroupWare uses date only
  				$parts = @getdate($attribute['value']);

@@ -724,7 +733,9 @@
translation::charset(), $charset);
}
$vnote = new Horde_iCalendar_vnote();

  •   		$vNote->setAttribute('VERSION', '1.1');

  •   		$vnote->setAttribute('PRODID','-//EGroupware//NONSGML EGroupware InfoLog '.$GLOBALS['egw_info']['apps']['infolog']['version'].'//'.

  •   			strtoupper($GLOBALS['egw_info']['user']['preferences']['common']['lang']));

  •   		$vnote->setAttribute('VERSION', '1.1');
  		foreach (array(	'SUMMARY'		=> $note['info_subject'],
  						'BODY'			=> $note['info_des'],
  						'CATEGORIES'	=> $note['info_cat'],

All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs