Version 4.1.2
This commit is contained in:
1 parent
3ba79295ee
commit
28bd025b35
1131 files changed
+63658
-20579
No files matched your search
@@ -383,7 +383,7 @@ class _ICSParser
|
||||
{
|
||||
try
|
||||
{
|
||||
$eventId = \IPS\Db::i()->select( 'import_event_id', 'calendar_import_map', array( 'import_guid=?', $event['uid'] ) )->first();
|
||||
$eventId = \IPS\Db::i()->select( 'import_event_id', 'calendar_import_map', array( array( 'import_guid=? and import_feed_id=?', $event['uid'], $this->feed->id ) ) )->first();
|
||||
|
||||
try
|
||||
{
|
||||
@@ -696,8 +696,8 @@ class _ICSParser
|
||||
}
|
||||
else
|
||||
{
|
||||
$output .= "DTSTART;TZID=Europe/London:" . $event->_start_date->modifiedIso8601( TRUE, TRUE ) . "\r\n";
|
||||
$output .= "DTEND;TZID=Europe/London:" . $event->_end_date->modifiedIso8601( TRUE, TRUE ) . "\r\n";
|
||||
$output .= "DTSTART;" . $event->_start_date->modifiedIso8601( TRUE, TRUE ) . "\r\n";
|
||||
$output .= "DTEND;" . $event->_end_date->modifiedIso8601( TRUE, TRUE ) . "\r\n";
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -708,7 +708,7 @@ class _ICSParser
|
||||
}
|
||||
else
|
||||
{
|
||||
$output .= "DTSTART;TZID=Europe/London:" . $event->_start_date->modifiedIso8601( TRUE, TRUE ) . "\r\n";
|
||||
$output .= "DTSTART;" . $event->_start_date->modifiedIso8601( TRUE, TRUE ) . "\r\n";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1124,8 +1124,11 @@ class _ICSParser
|
||||
break;
|
||||
|
||||
case 'ORGANIZER':
|
||||
$line = explode( ':', $_data );
|
||||
$_event['organizer'] = array( 'name' => str_replace( 'CN=', '', $line[0] ), 'email' => $line[1] );
|
||||
if ( $_data )
|
||||
{
|
||||
$line = explode( ':', $_data );
|
||||
$_event['organizer'] = array( 'name' => str_replace( 'CN=', '', $line[0] ), 'email' => $line[1] );
|
||||
}
|
||||
break;
|
||||
|
||||
case 'ATTENDEE':
|
||||
|
||||
Reference in new issue
Block a user