Completed
Push — 17.1 ( dac2e8...6ec951 )
by Ralf
23:02 queued 11:05
created
calendar/inc/class.calendar_ical.inc.php 1 patch
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -487,15 +487,15 @@  discard block
 block discarded – undo
487 487
 									{
488 488
 										$user = $this->resource_info($this->user);
489 489
 										$attributes['ATTENDEE'][] = 'mailto:' . $user['email'];
490
-			    						$parameters['ATTENDEE'][] = array(
491
-			    							'CN'		=>	$user['name'],
492
-			    							'ROLE'		=> 'REQ-PARTICIPANT',
490
+										$parameters['ATTENDEE'][] = array(
491
+											'CN'		=>	$user['name'],
492
+											'ROLE'		=> 'REQ-PARTICIPANT',
493 493
 											'PARTSTAT'	=> 'NEEDS-ACTION',
494 494
 											'CUTYPE'	=> 'INDIVIDUAL',
495 495
 											'RSVP'		=> 'TRUE',
496 496
 											'X-EGROUPWARE-UID'	=> (string)$this->user,
497
-			    						);
498
-			    						$event['participants'][$this->user] = true;
497
+										);
498
+										$event['participants'][$this->user] = true;
499 499
 									}
500 500
 									break;
501 501
 								case 'r':
@@ -551,33 +551,33 @@  discard block
 block discarded – undo
551 551
 						}
552 552
 						break;
553 553
 
554
-    				case 'ORGANIZER':
555
-	    				if (!$organizerURL)
556
-	    				{
557
-	    					$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
558
-			    				. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
559
-			    			$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
560
-			    			if ($version == '1.0')
561
-			    			{
562
-		    					$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
563
-			    			}
564
-			    			else
565
-			    			{
566
-		    					$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
567
-			    			}
568
-			    			$organizerUID = $event['owner'];
569
-	    				}
570
-    					// do NOT use ORGANIZER for events without further participants or a different organizer
571
-	    				if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
572
-	    				{
573
-		    				$attributes['ORGANIZER'] = $organizerURL;
574
-		    				$parameters['ORGANIZER']['CN'] = $organizerCN;
575
-		    				if (!empty($organizerUID))
576
-		    				{
577
-			    				$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
578
-		    				}
579
-	    				}
580
-	    				break;
554
+					case 'ORGANIZER':
555
+						if (!$organizerURL)
556
+						{
557
+							$organizerCN = '"' . trim($GLOBALS['egw']->accounts->id2name($event['owner'],'account_firstname')
558
+								. ' ' . $GLOBALS['egw']->accounts->id2name($event['owner'],'account_lastname')) . '"';
559
+							$organizerEMail = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_email');
560
+							if ($version == '1.0')
561
+							{
562
+								$organizerURL = trim($organizerCN . (empty($organizerURL) ? '' : ' <' . $organizerURL .'>'));
563
+							}
564
+							else
565
+							{
566
+								$organizerURL = empty($organizerEMail) ? '' : 'mailto:' . $organizerEMail;
567
+							}
568
+							$organizerUID = $event['owner'];
569
+						}
570
+						// do NOT use ORGANIZER for events without further participants or a different organizer
571
+						if (count($event['participants']) > 1 || !isset($event['participants'][$event['owner']]))
572
+						{
573
+							$attributes['ORGANIZER'] = $organizerURL;
574
+							$parameters['ORGANIZER']['CN'] = $organizerCN;
575
+							if (!empty($organizerUID))
576
+							{
577
+								$parameters['ORGANIZER']['X-EGROUPWARE-UID'] = $organizerUID;
578
+							}
579
+						}
580
+						break;
581 581
 
582 582
 					case 'DTSTART':
583 583
 						if (empty($event['whole_day']))
@@ -1003,12 +1003,12 @@  discard block
 block discarded – undo
1003 1003
 				foreach (is_array($value) && $parameters[$key]['VALUE']!='DATE' ? $value : array($value) as $valueID => $valueData)
1004 1004
 				{
1005 1005
 					$valueData = Api\Translation::convert($valueData,Api\Translation::charset(),$charset);
1006
-                    $paramData = (array) Api\Translation::convert(is_array($value) ?
1007
-                    		$parameters[$key][$valueID] : $parameters[$key],
1008
-                            Api\Translation::charset(),$charset);
1009
-                    $valuesData = (array) Api\Translation::convert($values[$key],
1010
-                    		Api\Translation::charset(),$charset);
1011
-                    $content = $valueData . implode(';', $valuesData);
1006
+					$paramData = (array) Api\Translation::convert(is_array($value) ?
1007
+							$parameters[$key][$valueID] : $parameters[$key],
1008
+							Api\Translation::charset(),$charset);
1009
+					$valuesData = (array) Api\Translation::convert($values[$key],
1010
+							Api\Translation::charset(),$charset);
1011
+					$content = $valueData . implode(';', $valuesData);
1012 1012
 
1013 1013
 					if ($version == '1.0' && (preg_match('/[^\x20-\x7F]/', $content) ||
1014 1014
 						($paramData['CN'] && preg_match('/[^\x20-\x7F]/', $paramData['CN']))))
@@ -2298,7 +2298,7 @@  discard block
 block discarded – undo
2298 2298
 	 * @param string|resource $_vcalData
2299 2299
 	 * @param string $principalURL ='' Used for CalDAV imports
2300 2300
 	 * @param string $charset  The encoding charset for $text. Defaults to
2301
-     *                         utf-8 for new format, iso-8859-1 for old format.
2301
+	 *                         utf-8 for new format, iso-8859-1 for old format.
2302 2302
 	 * @return Iterator|array|boolean Iterator if resource given or array of events on success, false on failure
2303 2303
 	 */
2304 2304
 	function icaltoegw($_vcalData, $principalURL='', $charset=null)
@@ -2716,10 +2716,10 @@  discard block
 block discarded – undo
2716 2716
 					// work around Ligthning sending @ as %40
2717 2717
 					$attributes['value'] = str_replace('%40', '@', $attributes['value']);
2718 2718
 					if (isset($attributes['params']['PARTSTAT']))
2719
-				    {
2720
-				    	$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
2721
-				    }
2722
-				    if (isset($attributes['params']['STATUS']))
2719
+					{
2720
+						$attributes['params']['STATUS'] = $attributes['params']['PARTSTAT'];
2721
+					}
2722
+					if (isset($attributes['params']['STATUS']))
2723 2723
 					{
2724 2724
 						$status = $this->status_ical2egw[strtoupper($attributes['params']['STATUS'])];
2725 2725
 						if (empty($status)) $status = 'X';
@@ -3137,7 +3137,7 @@  discard block
 block discarded – undo
3137 3137
 				array2string($event)."\n",3,$this->logfile);
3138 3138
 		}
3139 3139
 		//Horde::logMessage("vevent2egw:\n" . print_r($event, true),
3140
-        //    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
3140
+		//    	__FILE__, __LINE__, PEAR_LOG_DEBUG);
3141 3141
 		return $event;
3142 3142
 	}
3143 3143
 
Please login to merge, or discard this patch.