jens-maus / carddav2fb

lib/fritzbox_api_php/fritzbox_guestlan_on_off.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
   preg_match('@name="guest_enabled"[^>]+(checked)[^>]*@', $output, $matches);
   if ( isset($matches[1]) && $mode == true )
   {
-		$message .= 'LAN4 guest access is now active.';
+    $message .= 'LAN4 guest access is now active.';
   }
   else if ( !isset($matches[1]) && $mode == false )
   {

lib/fritzbox_api_php/fritzbox_delete_foncallslist.php

Indentation +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@
   
   // delete calllist form fields
   $formfields = array(
-	'getpage'	=> '/fon_num/foncalls_list.lua',
-	'usejournal' 	=> '1',
-	'callstab' 	=> 'all',
-	'submit'	=> 'clear',
-	'clear'	=> '1',
+  'getpage'	=> '/fon_num/foncalls_list.lua',
+  'usejournal' 	=> '1',
+  'callstab' 	=> 'all',
+  'submit'	=> 'clear',
+  'clear'	=> '1',
   );
   
   $fritz->doPostForm($formfields);

lib/fritzbox_api_php/fritzbox_guestwlan_on_off.php

Indentation +5 added lines, -5 removed lines

@@ -106,11 +106,11 @@
   preg_match('@name="activate_guest_access"[^>]+(checked)[^>]*@', $output, $matches);
   if ( isset($matches[1]) && $mode == true )
   {
-		preg_match('@name="wpa_key"[^>]+value="([^"]*)"[^>]*@', $output, $matches);
-		if ( isset($matches[1]) )
-		{
-			$message .= 'WLAN guest access is now active. WPA-Key is "' . $matches[1] . '"';
-		}
+    preg_match('@name="wpa_key"[^>]+value="([^"]*)"[^>]*@', $output, $matches);
+    if ( isset($matches[1]) )
+    {
+      $message .= 'WLAN guest access is now active. WPA-Key is "' . $matches[1] . '"';
+    }
   }
   else if ( !isset($matches[1]) && $mode == false )
   {

lib/vCard-parser/vCard.php

Indentation +682 added lines, -682 removed lines

@@ -7,686 +7,686 @@
  * @see RFC 2426, RFC 2425
  * @version 0.4.8
 */
-	class vCard implements Countable, Iterator
-	{
-		const MODE_ERROR = 'error';
-		const MODE_SINGLE = 'single';
-		const MODE_MULTIPLE = 'multiple';
-
-		const endl = "\n";
-
-		/**
-		 * @var string Current object mode - error, single or multiple (for a single vCard within a file and multiple combined vCards)
-		 */
-		private $Mode;  //single, multiple, error
-
-		private $Path = '';
-		private $RawData = '';
-
-		/**
-		 * @var array Internal options container. Options:
-		 *	bool Collapse: If true, elements that can have multiple values but have only a single value are returned as that value instead of an array
-		 *		If false, an array is returned even if it has only one value.
-		 */
-		private $Options = array(
-			'Collapse' => false
-		);
-
-		/**
-		 * @var array Internal data container. Contains vCard objects for multiple vCards and just the data for single vCards.
-		 */
-		private $Data = array();
-
-		/**
-		 * @static Parts of structured elements according to the spec.
-		 */
-		private static $Spec_StructuredElements = array(
-			'n' => array('lastname', 'firstname', 'additionalnames', 'prefixes', 'suffixes'),
-			'adr' => array('pobox', 'extendedaddress', 'streetaddress', 'locality', 'region', 'postalcode', 'country'),
-			'geo' => array('latitude', 'longitude'),
-			'org' => array('name', 'unit1', 'unit2')
-		);
-		private static $Spec_MultipleValueElements = array('nickname', 'categories');
-
-		private static $Spec_ElementTypes = array(
-			'email' => array('internet', 'x400', 'pref', 'home', 'work'),
-			'adr' => array('dom', 'intl', 'postal', 'parcel', 'home', 'work', 'pref'),
-			'label' => array('dom', 'intl', 'postal', 'parcel', 'home', 'work', 'pref'),
-			'tel' => array('home', 'msg', 'work', 'pref', 'voice', 'fax', 'cell', 'video', 'pager', 'bbs', 'modem', 'car', 'isdn', 'pcs'),
-			'impp' => array('personal', 'business', 'home', 'work', 'mobile', 'pref')
-		);
-
-		private static $Spec_FileElements = array('photo', 'logo', 'sound');
-
-		/**
-		 * vCard constructor
-		 *
-		 * @param string Path to file, optional.
-		 * @param string Raw data, optional.
-		 * @param array Additional options, optional. Currently supported options:
-		 *	bool Collapse: If true, elements that can have multiple values but have only a single value are returned as that value instead of an array
-		 *		If false, an array is returned even if it has only one value.
-		 *
-		 * One of these parameters must be provided, otherwise an exception is thrown.
-		 */
-		public function __construct($Path = false, $RawData = false, array $Options = null)
-		{
-			// Checking preconditions for the parser.
-			// If path is given, the file should be accessible.
-			// If raw data is given, it is taken as it is.
-			// In both cases the real content is put in $this -> RawData
-			if ($Path)
-			{
-				if (!is_readable($Path))
-				{
-					throw new Exception('vCard: Path not accessible ('.$Path.')');
-				}
-
-				$this -> Path = $Path;
-				$this -> RawData = file_get_contents($this -> Path);
-			}
-			elseif ($RawData)
-			{
-				$this -> RawData = $RawData;
-			}
-			else
-			{
-				//throw new Exception('vCard: No content provided');
-				// Not necessary anymore as possibility to create vCards is added
-			}
-
-			if (!$this -> Path && !$this -> RawData)
-			{
-				return true;
-			}
-
-			if ($Options)
-			{
-				$this -> Options = array_merge($this -> Options, $Options);
-			}
-
-			// Counting the begin/end separators. If there aren't any or the count doesn't match, there is a problem with the file.
-			// If there is only one, this is a single vCard, if more, multiple vCards are combined.
-			$Matches = array();
-			$vCardBeginCount = preg_match_all('{^BEGIN\:VCARD}miS', $this -> RawData, $Matches);
-			$vCardEndCount = preg_match_all('{^END\:VCARD}miS', $this -> RawData, $Matches);
-
-			if (($vCardBeginCount != $vCardEndCount) || !$vCardBeginCount)
-			{
-				$this -> Mode = vCard::MODE_ERROR;
-				throw new Exception('vCard: invalid vCard');
-			}
-
-			$this -> Mode = $vCardBeginCount == 1 ? vCard::MODE_SINGLE : vCard::MODE_MULTIPLE;
-
-			// Removing/changing inappropriate newlines, i.e., all CRs or multiple newlines are changed to a single newline
-			$this -> RawData = str_replace("\r", "\n", $this -> RawData);
-			$this -> RawData = preg_replace('{(\n+)}', "\n", $this -> RawData);
-
-			// In multiple card mode the raw text is split at card beginning markers and each
-			//	fragment is parsed in a separate vCard object.
-			if ($this -> Mode == self::MODE_MULTIPLE)
-			{
-				$this -> RawData = explode('BEGIN:VCARD', $this -> RawData);
-				$this -> RawData = array_filter($this -> RawData);
-
-				foreach ($this -> RawData as $SinglevCardRawData)
-				{
-					// Prepending "BEGIN:VCARD" to the raw string because we exploded on that one.
-					// If there won't be the BEGIN marker in the new object, it will fail.
-					$SinglevCardRawData = 'BEGIN:VCARD'."\n".$SinglevCardRawData;
-
-					$ClassName = get_class($this);
-					$this -> Data[] = new $ClassName(false, $SinglevCardRawData);
-				}
-			}
-			else
-			{
-				// Protect the BASE64 final = sign (detected by the line beginning with whitespace), otherwise the next replace will get rid of it
-				$this -> RawData = preg_replace('{(\n\s.+)=(\n)}', '$1-base64=-$2', $this -> RawData);
-
-				// Joining multiple lines that are split with a hard wrap and indicated by an equals sign at the end of line
-				// (quoted-printable-encoded values in v2.1 vCards)
-				$this -> RawData = str_replace("=\n", '', $this -> RawData);
-
-				// Joining multiple lines that are split with a soft wrap (space or tab on the beginning of the next line
-				$this -> RawData = str_replace(array("\n ", "\n\t"), '-wrap-', $this -> RawData);
-
-				// Restoring the BASE64 final equals sign (see a few lines above)
-				$this -> RawData = str_replace("-base64=-\n", "=\n", $this -> RawData);
-
-				$Lines = explode("\n", $this -> RawData);
-
-				foreach ($Lines as $Line)
-				{
-					// Lines without colons are skipped because, most likely, they contain no data.
-					if (strpos($Line, ':') === false)
-					{
-						continue;
-					}
-
-					// Each line is split into two parts. The key contains the element name and additional parameters, if present,
-					//	value is just the value
-					list($Key, $Value) = explode(':', $Line, 2);
-
-					// Key is transformed to lowercase because, even though the element and parameter names are written in uppercase,
-					//	it is quite possible that they will be in lower- or mixed case.
-					// The key is trimmed to allow for non-significant WSP characters as allowed by v2.1
-					$Key = strtolower(trim(self::Unescape($Key)));
-
-					// These two lines can be skipped as they aren't necessary at all.
-					if ($Key == 'begin' || $Key == 'end')
-					{
-						continue;
-					}
-
-					if ((strpos($Key, 'agent') === 0) && (stripos($Value, 'begin:vcard') !== false))
-					{
-						$ClassName = get_class($this);
-						$Value = new $ClassName(false, str_replace('-wrap-', "\n", $Value));
-						if (!isset($this -> Data[$Key]))
-						{
-							$this -> Data[$Key] = array();
-						}
-						$this -> Data[$Key][] = $Value;
-						continue;
-					}
-					else
-					{
-						$Value = str_replace('-wrap-', '', $Value);
-					}
-
-					$Value = trim(self::Unescape($Value));
-					$Type = array();
-
-					// Here additional parameters are parsed
-					$KeyParts = explode(';', $Key);
-					$Key = $KeyParts[0];
-					$Encoding = false;
-
-					if (strpos($Key, 'item') === 0)
-					{
-						$TmpKey = explode('.', $Key, 2);
-						$Key = $TmpKey[1];
-						$ItemIndex = (int)str_ireplace('item', '', $TmpKey[0]);
-					}
-
-					if (count($KeyParts) > 1)
-					{
-						$Parameters = self::ParseParameters($Key, array_slice($KeyParts, 1));
-
-						foreach ($Parameters as $ParamKey => $ParamValue)
-						{
-							switch ($ParamKey)
-							{
-								case 'encoding':
-									$Encoding = $ParamValue;
-									if (in_array($ParamValue, array('b', 'base64')))
-									{
-										//$Value = base64_decode($Value);
-									}
-									elseif ($ParamValue == 'quoted-printable') // v2.1
-									{
-										$Value = quoted_printable_decode($Value);
-									}
-									break;
-								case 'charset': // v2.1
-									if ($ParamValue != 'utf-8' && $ParamValue != 'utf8')
-									{
-										$Value = mb_convert_encoding($Value, 'UTF-8', $ParamValue);
-									}
-									break;
-								case 'type':
-									$Type = $ParamValue;
-									break;
-							}
-						}
-					}
-
-					// Checking files for colon-separated additional parameters (Apple's Address Book does this), for example, "X-ABCROP-RECTANGLE" for photos
-					if (in_array($Key, self::$Spec_FileElements) && isset($Parameters['encoding']) && in_array($Parameters['encoding'], array('b', 'base64')))
-					{
-						// If colon is present in the value, it must contain Address Book parameters
-						//	(colon is an invalid character for base64 so it shouldn't appear in valid files)
-						if (strpos($Value, ':') !== false)
-						{
-							$Value = explode(':', $Value);
-							$Value = array_pop($Value);
-						}
-					}
-
-					// Values are parsed according to their type
-					if (isset(self::$Spec_StructuredElements[$Key]))
-					{
-						$Value = self::ParseStructuredValue($Value, $Key);
-						if ($Type)
-						{
-							$Value['type'] = $Type;
-						}
-					}
-					else
-					{
-						if (in_array($Key, self::$Spec_MultipleValueElements))
-						{
-							$Value = self::ParseMultipleTextValue($Value, $Key);
-						}
-
-						if ($Type)
-						{
-							$Value = array(
-								'value' => $Value,
-								'type' => $Type
-							);
-						}
-					}
-
-					if (is_array($Value) && $Encoding)
-					{
-						$Value['encoding'] = $Encoding;
-					}
-
-					if (!isset($this -> Data[$Key]))
-					{
-						$this -> Data[$Key] = array();
-					}
-
-					$this -> Data[$Key][] = $Value;
-				}
-			}
-		}
-
-		/**
-		 * Magic method to get the various vCard values as object members, e.g.
-		 *	a call to $vCard -> N gets the "N" value
-		 *
-		 * @param string Key
-		 *
-		 * @return mixed Value
-		 */
-		public function __get($Key)
-		{
-			$Key = strtolower($Key);
-			if (isset($this -> Data[$Key]))
-			{
-				if ($Key == 'agent')
-				{
-					return $this -> Data[$Key];
-				}
-				elseif (in_array($Key, self::$Spec_FileElements))
-				{
-					$Value = $this -> Data[$Key];
-					foreach ($Value as $K => $V)
-					{
-						if (stripos($V['value'], 'uri:') === 0)
-						{
-							$Value[$K]['value'] = substr($V, 4);
-							$Value[$K]['encoding'] = 'uri';
-						}
-					}
-					return $Value;
-				}
-
-				if ($this -> Options['Collapse'] && is_array($this -> Data[$Key]) && (count($this -> Data[$Key]) == 1))
-				{
-					return $this -> Data[$Key][0];
-				}
-				return $this -> Data[$Key];
-			}
-			elseif ($Key == 'Mode')
-			{
-				return $this -> Mode;
-			}
-			return array();
-		}
-
-		/**
-		 * Saves an embedded file
-		 *
-		 * @param string Key
-		 * @param int Index of the file, defaults to 0
-		 * @param string Target path where the file should be saved, including the filename
-		 *
-		 * @return bool Operation status
-		 */
-		public function SaveFile($Key, $Index = 0, $TargetPath = '')
-		{
-			if (!isset($this -> Data[$Key]))
-			{
-				return false;
-			}
-			if (!isset($this -> Data[$Key][$Index]))
-			{
-				return false;
-			}
-
-			// Returing false if it is an image URL
-			if (stripos($this -> Data[$Key][$Index]['value'], 'uri:') === 0)
-			{
-				return false;
-			}
-
-			if (is_writable($TargetPath) || (!file_exists($TargetPath) && is_writable(dirname($TargetPath))))
-			{
-				$RawContent = $this -> Data[$Key][$Index]['value'];
-				if (isset($this -> Data[$Key][$Index]['encoding']) && $this -> Data[$Key][$Index]['encoding'] == 'b')
-				{
-					$RawContent = base64_decode($RawContent);
-				}
-				$Status = file_put_contents($TargetPath, $RawContent);
-				return (bool)$Status;
-			}
-			else
-			{
-				throw new Exception('vCard: Cannot save file ('.$Key.'), target path not writable ('.$TargetPath.')');
-			}
-			return false;
-		}
-
-		/**
-		 * Magic method for adding data to the vCard
-		 *
-		 * @param string Key
-		 * @param string Method call arguments. First element is value.
-		 *
-		 * @return vCard Current object for method chaining
-		 */
-		public function __call($Key, $Arguments)
-		{
-			$Key = strtolower($Key);
-
-			if (!isset($this -> Data[$Key]))
-			{
-				$this -> Data[$Key] = array();
-			}
-
-			$Value = isset($Arguments[0]) ? $Arguments[0] : false;
-
-			if (count($Arguments) > 1)
-			{
-				$Types = array_map('strtolower', array_values(array_slice($Arguments, 1)));
-
-				if (isset(self::$Spec_StructuredElements[$Key]) &&
-					in_array(strtolower($Arguments[1]), self::$Spec_StructuredElements[$Key])
-				)
-				{
-					$LastElementIndex = 0;
-
-					if (count($this -> Data[$Key]))
-					{
-						$LastElementIndex = count($this -> Data[$Key]) - 1;
-					}
-
-					if (isset($this -> Data[$Key][$LastElementIndex]))
-					{
-						if (empty($this -> Data[$Key][$LastElementIndex][$Types[0]]))
-						{
-							$this -> Data[$Key][$LastElementIndex][$Types[0]] = $Value;
-						}
-						else
-						{
-							$LastElementIndex++;
-						}
-					}
-
-					if (!isset($this -> Data[$Key][$LastElementIndex]))
-					{
-						$this -> Data[$Key][$LastElementIndex] = array(
-							$Types[0] => $Value
-						);
-					}
-				}
-				elseif (isset(self::$Spec_ElementTypes[$Key]))
-				{
-					$this -> Data[$Key][] = array(
-						'value' => $Value,
-						'type' => $Types
-					);
-				}
-			}
-			elseif ($Value)
-			{
-				$this -> Data[$Key][] = $Value;
-			}
-
-			return $this;
-		}
-
-		/**
-		 * Magic method for getting vCard content out
-		 *
-		 * @return string Raw vCard content
-		 */
-		public function __toString()
-		{
-			$Text = 'BEGIN:VCARD'.self::endl;
-			$Text .= 'VERSION:3.0'.self::endl;
-
-			foreach ($this -> Data as $Key => $Values)
-			{
-				$KeyUC = strtoupper($Key);
-				$Key = strtolower($Key);
-
-				if (in_array($KeyUC, array('PHOTO', 'VERSION')))
-				{
-					continue;
-				}
-
-				foreach ($Values as $Index => $Value)
-				{
-					$Text .= $KeyUC;
-					if (is_array($Value) && isset($Value['type']))
-					{
-						$Text .= ';TYPE='.self::PrepareTypeStrForOutput($Value['type']);
-					}
-					$Text .= ':';
-
-					if (isset(self::$Spec_StructuredElements[$Key]))
-					{
-						$PartArray = array();
-						foreach (self::$Spec_StructuredElements[$Key] as $Part)
-						{
-							$PartArray[] = isset($Value[$Part]) ? $Value[$Part] : '';
-						}
-						$Text .= implode(';', $PartArray);
-					}
-					elseif (is_array($Value) && isset(self::$Spec_ElementTypes[$Key]))
-					{
-						$Text .= $Value['value'];
-					}
-					else
-					{
-						$Text .= $Value;
-					}
-
-					$Text .= self::endl;
-				}
-			}
-
-			$Text .= 'END:VCARD'.self::endl;
-			return $Text;
-		}
-
-		// !Helper methods
-
-		private static function PrepareTypeStrForOutput($Type)
-		{
-			return implode(',', array_map('strtoupper', $Type));
-		}
-
-	 	/**
-		 * Removes the escaping slashes from the text.
-		 *
-		 * @access private
-		 *
-		 * @param string Text to prepare.
-		 *
-		 * @return string Resulting text.
-		 */
-		private static function Unescape($Text)
-		{
-			return str_replace(array('\:', '\;', '\,', "\n"), array(':', ';', ',', ''), $Text);
-		}
-
-		/**
-		 * Separates the various parts of a structured value according to the spec.
-		 *
-		 * @access private
-		 *
-		 * @param string Raw text string
-		 * @param string Key (e.g., N, ADR, ORG, etc.)
-		 *
-		 * @return array Parts in an associative array.
-		 */
-		private static function ParseStructuredValue($Text, $Key)
-		{
-			$Text = array_map('trim', explode(';', $Text));
-
-			$Result = array();
-			$Ctr = 0;
-
-			foreach (self::$Spec_StructuredElements[$Key] as $Index => $StructurePart)
-			{
-				$Result[$StructurePart] = isset($Text[$Index]) ? $Text[$Index] : null;
-			}
-			return $Result;
-		}
-
-		/**
-		 * @access private
-		 */
-		private static function ParseMultipleTextValue($Text)
-		{
-			return explode(',', $Text);
-		}
-
-		/**
-		 * @access private
-		 */
-		private static function ParseParameters($Key, array $RawParams = null)
-		{
-			if (!$RawParams)
-			{
-				return array();
-			}
-
-			// Parameters are split into (key, value) pairs
-			$Parameters = array();
-			foreach ($RawParams as $Item)
-			{
-				$Parameters[] = explode('=', strtolower($Item));
-			}
-
-			$Type = array();
-			$Result = array();
-
-			// And each parameter is checked whether anything can/should be done because of it
-			foreach ($Parameters as $Index => $Parameter)
-			{
-				// Skipping empty elements
-				if (!$Parameter)
-				{
-					continue;
-				}
-
-				// Handling type parameters without the explicit TYPE parameter name (2.1 valid)
-				if (count($Parameter) == 1)
-				{
-					// Checks if the type value is allowed for the specific element
-					// The second part of the "if" statement means that email elements can have non-standard types (see the spec)
-					if (
-						(isset(self::$Spec_ElementTypes[$Key]) && in_array($Parameter[0], self::$Spec_ElementTypes[$Key])) ||
-						($Key == 'email' && is_scalar($Parameter[0]))
-					)
-					{
-						$Type[] = $Parameter[0];
-					}
-				}
-				elseif (count($Parameter) > 2)
-				{
-					if(count(explode(',', $RawParams[$Index], -1)) > 0)
-					{
-						$TempTypeParams = self::ParseParameters($Key, explode(',', $RawParams[$Index]));
-						if ($TempTypeParams['type'])
-						{
-							$Type = array_merge($Type, $TempTypeParams['type']);
-						}
-					}
-				}
-				else
-				{
-					switch ($Parameter[0])
-					{
-						case 'encoding':
-							if (in_array($Parameter[1], array('quoted-printable', 'b', 'base64')))
-							{
-								$Result['encoding'] = $Parameter[1] == 'base64' ? 'b' : $Parameter[1];
-							}
-							break;
-						case 'charset':
-							$Result['charset'] = $Parameter[1];
-							break;
-						case 'type':
-							$Type = array_merge($Type, explode(',', $Parameter[1]));
-							break;
-						case 'value':
-							if (strtolower($Parameter[1]) == 'url')
-							{
-								$Result['encoding'] = 'uri';
-							}
-							break;
-					}
-				}
-			}
-
-			$Result['type'] = $Type;
-
-			return $Result;
-		}
-
-		// !Interface methods
-
-		// Countable interface
-		public function count()
-		{
-			switch ($this -> Mode)
-			{
-				case self::MODE_ERROR:
-					return 0;
-					break;
-				case self::MODE_SINGLE:
-					return 1;
-					break;
-				case self::MODE_MULTIPLE:
-					return count($this -> Data);
-					break;
-			}
-			return 0;
-		}
-
-		// Iterator interface
-		public function rewind()
-		{
-			reset($this -> Data);
-		}
-
-		public function current()
-		{
-			return current($this -> Data);
-		}
-
-		public function next()
-		{
-			return next($this -> Data);
-		}
-
-		public function valid()
-		{
-			return ($this -> current() !== false);
-		}
-
-		public function key()
-		{
-			return key($this -> Data);
-		}
-	}
+  class vCard implements Countable, Iterator
+  {
+    const MODE_ERROR = 'error';
+    const MODE_SINGLE = 'single';
+    const MODE_MULTIPLE = 'multiple';
+
+    const endl = "\n";
+
+    /**
+     * @var string Current object mode - error, single or multiple (for a single vCard within a file and multiple combined vCards)
+     */
+    private $Mode;  //single, multiple, error
+
+    private $Path = '';
+    private $RawData = '';
+
+    /**
+     * @var array Internal options container. Options:
+     *	bool Collapse: If true, elements that can have multiple values but have only a single value are returned as that value instead of an array
+     *		If false, an array is returned even if it has only one value.
+     */
+    private $Options = array(
+      'Collapse' => false
+    );
+
+    /**
+     * @var array Internal data container. Contains vCard objects for multiple vCards and just the data for single vCards.
+     */
+    private $Data = array();
+
+    /**
+     * @static Parts of structured elements according to the spec.
+     */
+    private static $Spec_StructuredElements = array(
+      'n' => array('lastname', 'firstname', 'additionalnames', 'prefixes', 'suffixes'),
+      'adr' => array('pobox', 'extendedaddress', 'streetaddress', 'locality', 'region', 'postalcode', 'country'),
+      'geo' => array('latitude', 'longitude'),
+      'org' => array('name', 'unit1', 'unit2')
+    );
+    private static $Spec_MultipleValueElements = array('nickname', 'categories');
+
+    private static $Spec_ElementTypes = array(
+      'email' => array('internet', 'x400', 'pref', 'home', 'work'),
+      'adr' => array('dom', 'intl', 'postal', 'parcel', 'home', 'work', 'pref'),
+      'label' => array('dom', 'intl', 'postal', 'parcel', 'home', 'work', 'pref'),
+      'tel' => array('home', 'msg', 'work', 'pref', 'voice', 'fax', 'cell', 'video', 'pager', 'bbs', 'modem', 'car', 'isdn', 'pcs'),
+      'impp' => array('personal', 'business', 'home', 'work', 'mobile', 'pref')
+    );
+
+    private static $Spec_FileElements = array('photo', 'logo', 'sound');
+
+    /**
+     * vCard constructor
+     *
+     * @param string Path to file, optional.
+     * @param string Raw data, optional.
+     * @param array Additional options, optional. Currently supported options:
+     *	bool Collapse: If true, elements that can have multiple values but have only a single value are returned as that value instead of an array
+     *		If false, an array is returned even if it has only one value.
+     *
+     * One of these parameters must be provided, otherwise an exception is thrown.
+     */
+    public function __construct($Path = false, $RawData = false, array $Options = null)
+    {
+      // Checking preconditions for the parser.
+      // If path is given, the file should be accessible.
+      // If raw data is given, it is taken as it is.
+      // In both cases the real content is put in $this -> RawData
+      if ($Path)
+      {
+        if (!is_readable($Path))
+        {
+          throw new Exception('vCard: Path not accessible ('.$Path.')');
+        }
+
+        $this -> Path = $Path;
+        $this -> RawData = file_get_contents($this -> Path);
+      }
+      elseif ($RawData)
+      {
+        $this -> RawData = $RawData;
+      }
+      else
+      {
+        //throw new Exception('vCard: No content provided');
+        // Not necessary anymore as possibility to create vCards is added
+      }
+
+      if (!$this -> Path && !$this -> RawData)
+      {
+        return true;
+      }
+
+      if ($Options)
+      {
+        $this -> Options = array_merge($this -> Options, $Options);
+      }
+
+      // Counting the begin/end separators. If there aren't any or the count doesn't match, there is a problem with the file.
+      // If there is only one, this is a single vCard, if more, multiple vCards are combined.
+      $Matches = array();
+      $vCardBeginCount = preg_match_all('{^BEGIN\:VCARD}miS', $this -> RawData, $Matches);
+      $vCardEndCount = preg_match_all('{^END\:VCARD}miS', $this -> RawData, $Matches);
+
+      if (($vCardBeginCount != $vCardEndCount) || !$vCardBeginCount)
+      {
+        $this -> Mode = vCard::MODE_ERROR;
+        throw new Exception('vCard: invalid vCard');
+      }
+
+      $this -> Mode = $vCardBeginCount == 1 ? vCard::MODE_SINGLE : vCard::MODE_MULTIPLE;
+
+      // Removing/changing inappropriate newlines, i.e., all CRs or multiple newlines are changed to a single newline
+      $this -> RawData = str_replace("\r", "\n", $this -> RawData);
+      $this -> RawData = preg_replace('{(\n+)}', "\n", $this -> RawData);
+
+      // In multiple card mode the raw text is split at card beginning markers and each
+      //	fragment is parsed in a separate vCard object.
+      if ($this -> Mode == self::MODE_MULTIPLE)
+      {
+        $this -> RawData = explode('BEGIN:VCARD', $this -> RawData);
+        $this -> RawData = array_filter($this -> RawData);
+
+        foreach ($this -> RawData as $SinglevCardRawData)
+        {
+          // Prepending "BEGIN:VCARD" to the raw string because we exploded on that one.
+          // If there won't be the BEGIN marker in the new object, it will fail.
+          $SinglevCardRawData = 'BEGIN:VCARD'."\n".$SinglevCardRawData;
+
+          $ClassName = get_class($this);
+          $this -> Data[] = new $ClassName(false, $SinglevCardRawData);
+        }
+      }
+      else
+      {
+        // Protect the BASE64 final = sign (detected by the line beginning with whitespace), otherwise the next replace will get rid of it
+        $this -> RawData = preg_replace('{(\n\s.+)=(\n)}', '$1-base64=-$2', $this -> RawData);
+
+        // Joining multiple lines that are split with a hard wrap and indicated by an equals sign at the end of line
+        // (quoted-printable-encoded values in v2.1 vCards)
+        $this -> RawData = str_replace("=\n", '', $this -> RawData);
+
+        // Joining multiple lines that are split with a soft wrap (space or tab on the beginning of the next line
+        $this -> RawData = str_replace(array("\n ", "\n\t"), '-wrap-', $this -> RawData);
+
+        // Restoring the BASE64 final equals sign (see a few lines above)
+        $this -> RawData = str_replace("-base64=-\n", "=\n", $this -> RawData);
+
+        $Lines = explode("\n", $this -> RawData);
+
+        foreach ($Lines as $Line)
+        {
+          // Lines without colons are skipped because, most likely, they contain no data.
+          if (strpos($Line, ':') === false)
+          {
+            continue;
+          }
+
+          // Each line is split into two parts. The key contains the element name and additional parameters, if present,
+          //	value is just the value
+          list($Key, $Value) = explode(':', $Line, 2);
+
+          // Key is transformed to lowercase because, even though the element and parameter names are written in uppercase,
+          //	it is quite possible that they will be in lower- or mixed case.
+          // The key is trimmed to allow for non-significant WSP characters as allowed by v2.1
+          $Key = strtolower(trim(self::Unescape($Key)));
+
+          // These two lines can be skipped as they aren't necessary at all.
+          if ($Key == 'begin' || $Key == 'end')
+          {
+            continue;
+          }
+
+          if ((strpos($Key, 'agent') === 0) && (stripos($Value, 'begin:vcard') !== false))
+          {
+            $ClassName = get_class($this);
+            $Value = new $ClassName(false, str_replace('-wrap-', "\n", $Value));
+            if (!isset($this -> Data[$Key]))
+            {
+              $this -> Data[$Key] = array();
+            }
+            $this -> Data[$Key][] = $Value;
+            continue;
+          }
+          else
+          {
+            $Value = str_replace('-wrap-', '', $Value);
+          }
+
+          $Value = trim(self::Unescape($Value));
+          $Type = array();
+
+          // Here additional parameters are parsed
+          $KeyParts = explode(';', $Key);
+          $Key = $KeyParts[0];
+          $Encoding = false;
+
+          if (strpos($Key, 'item') === 0)
+          {
+            $TmpKey = explode('.', $Key, 2);
+            $Key = $TmpKey[1];
+            $ItemIndex = (int)str_ireplace('item', '', $TmpKey[0]);
+          }
+
+          if (count($KeyParts) > 1)
+          {
+            $Parameters = self::ParseParameters($Key, array_slice($KeyParts, 1));
+
+            foreach ($Parameters as $ParamKey => $ParamValue)
+            {
+              switch ($ParamKey)
+              {
+                case 'encoding':
+                  $Encoding = $ParamValue;
+                  if (in_array($ParamValue, array('b', 'base64')))
+                  {
+                    //$Value = base64_decode($Value);
+                  }
+                  elseif ($ParamValue == 'quoted-printable') // v2.1
+                  {
+                    $Value = quoted_printable_decode($Value);
+                  }
+                  break;
+                case 'charset': // v2.1
+                  if ($ParamValue != 'utf-8' && $ParamValue != 'utf8')
+                  {
+                    $Value = mb_convert_encoding($Value, 'UTF-8', $ParamValue);
+                  }
+                  break;
+                case 'type':
+                  $Type = $ParamValue;
+                  break;
+              }
+            }
+          }
+
+          // Checking files for colon-separated additional parameters (Apple's Address Book does this), for example, "X-ABCROP-RECTANGLE" for photos
+          if (in_array($Key, self::$Spec_FileElements) && isset($Parameters['encoding']) && in_array($Parameters['encoding'], array('b', 'base64')))
+          {
+            // If colon is present in the value, it must contain Address Book parameters
+            //	(colon is an invalid character for base64 so it shouldn't appear in valid files)
+            if (strpos($Value, ':') !== false)
+            {
+              $Value = explode(':', $Value);
+              $Value = array_pop($Value);
+            }
+          }
+
+          // Values are parsed according to their type
+          if (isset(self::$Spec_StructuredElements[$Key]))
+          {
+            $Value = self::ParseStructuredValue($Value, $Key);
+            if ($Type)
+            {
+              $Value['type'] = $Type;
+            }
+          }
+          else
+          {
+            if (in_array($Key, self::$Spec_MultipleValueElements))
+            {
+              $Value = self::ParseMultipleTextValue($Value, $Key);
+            }
+
+            if ($Type)
+            {
+              $Value = array(
+                'value' => $Value,
+                'type' => $Type
+              );
+            }
+          }
+
+          if (is_array($Value) && $Encoding)
+          {
+            $Value['encoding'] = $Encoding;
+          }
+
+          if (!isset($this -> Data[$Key]))
+          {
+            $this -> Data[$Key] = array();
+          }
+
+          $this -> Data[$Key][] = $Value;
+        }
+      }
+    }
+
+    /**
+     * Magic method to get the various vCard values as object members, e.g.
+     *	a call to $vCard -> N gets the "N" value
+     *
+     * @param string Key
+     *
+     * @return mixed Value
+     */
+    public function __get($Key)
+    {
+      $Key = strtolower($Key);
+      if (isset($this -> Data[$Key]))
+      {
+        if ($Key == 'agent')
+        {
+          return $this -> Data[$Key];
+        }
+        elseif (in_array($Key, self::$Spec_FileElements))
+        {
+          $Value = $this -> Data[$Key];
+          foreach ($Value as $K => $V)
+          {
+            if (stripos($V['value'], 'uri:') === 0)
+            {
+              $Value[$K]['value'] = substr($V, 4);
+              $Value[$K]['encoding'] = 'uri';
+            }
+          }
+          return $Value;
+        }
+
+        if ($this -> Options['Collapse'] && is_array($this -> Data[$Key]) && (count($this -> Data[$Key]) == 1))
+        {
+          return $this -> Data[$Key][0];
+        }
+        return $this -> Data[$Key];
+      }
+      elseif ($Key == 'Mode')
+      {
+        return $this -> Mode;
+      }
+      return array();
+    }
+
+    /**
+     * Saves an embedded file
+     *
+     * @param string Key
+     * @param int Index of the file, defaults to 0
+     * @param string Target path where the file should be saved, including the filename
+     *
+     * @return bool Operation status
+     */
+    public function SaveFile($Key, $Index = 0, $TargetPath = '')
+    {
+      if (!isset($this -> Data[$Key]))
+      {
+        return false;
+      }
+      if (!isset($this -> Data[$Key][$Index]))
+      {
+        return false;
+      }
+
+      // Returing false if it is an image URL
+      if (stripos($this -> Data[$Key][$Index]['value'], 'uri:') === 0)
+      {
+        return false;
+      }
+
+      if (is_writable($TargetPath) || (!file_exists($TargetPath) && is_writable(dirname($TargetPath))))
+      {
+        $RawContent = $this -> Data[$Key][$Index]['value'];
+        if (isset($this -> Data[$Key][$Index]['encoding']) && $this -> Data[$Key][$Index]['encoding'] == 'b')
+        {
+          $RawContent = base64_decode($RawContent);
+        }
+        $Status = file_put_contents($TargetPath, $RawContent);
+        return (bool)$Status;
+      }
+      else
+      {
+        throw new Exception('vCard: Cannot save file ('.$Key.'), target path not writable ('.$TargetPath.')');
+      }
+      return false;
+    }
+
+    /**
+     * Magic method for adding data to the vCard
+     *
+     * @param string Key
+     * @param string Method call arguments. First element is value.
+     *
+     * @return vCard Current object for method chaining
+     */
+    public function __call($Key, $Arguments)
+    {
+      $Key = strtolower($Key);
+
+      if (!isset($this -> Data[$Key]))
+      {
+        $this -> Data[$Key] = array();
+      }
+
+      $Value = isset($Arguments[0]) ? $Arguments[0] : false;
+
+      if (count($Arguments) > 1)
+      {
+        $Types = array_map('strtolower', array_values(array_slice($Arguments, 1)));
+
+        if (isset(self::$Spec_StructuredElements[$Key]) &&
+          in_array(strtolower($Arguments[1]), self::$Spec_StructuredElements[$Key])
+        )
+        {
+          $LastElementIndex = 0;
+
+          if (count($this -> Data[$Key]))
+          {
+            $LastElementIndex = count($this -> Data[$Key]) - 1;
+          }
+
+          if (isset($this -> Data[$Key][$LastElementIndex]))
+          {
+            if (empty($this -> Data[$Key][$LastElementIndex][$Types[0]]))
+            {
+              $this -> Data[$Key][$LastElementIndex][$Types[0]] = $Value;
+            }
+            else
+            {
+              $LastElementIndex++;
+            }
+          }
+
+          if (!isset($this -> Data[$Key][$LastElementIndex]))
+          {
+            $this -> Data[$Key][$LastElementIndex] = array(
+              $Types[0] => $Value
+            );
+          }
+        }
+        elseif (isset(self::$Spec_ElementTypes[$Key]))
+        {
+          $this -> Data[$Key][] = array(
+            'value' => $Value,
+            'type' => $Types
+          );
+        }
+      }
+      elseif ($Value)
+      {
+        $this -> Data[$Key][] = $Value;
+      }
+
+      return $this;
+    }
+
+    /**
+     * Magic method for getting vCard content out
+     *
+     * @return string Raw vCard content
+     */
+    public function __toString()
+    {
+      $Text = 'BEGIN:VCARD'.self::endl;
+      $Text .= 'VERSION:3.0'.self::endl;
+
+      foreach ($this -> Data as $Key => $Values)
+      {
+        $KeyUC = strtoupper($Key);
+        $Key = strtolower($Key);
+
+        if (in_array($KeyUC, array('PHOTO', 'VERSION')))
+        {
+          continue;
+        }
+
+        foreach ($Values as $Index => $Value)
+        {
+          $Text .= $KeyUC;
+          if (is_array($Value) && isset($Value['type']))
+          {
+            $Text .= ';TYPE='.self::PrepareTypeStrForOutput($Value['type']);
+          }
+          $Text .= ':';
+
+          if (isset(self::$Spec_StructuredElements[$Key]))
+          {
+            $PartArray = array();
+            foreach (self::$Spec_StructuredElements[$Key] as $Part)
+            {
+              $PartArray[] = isset($Value[$Part]) ? $Value[$Part] : '';
+            }
+            $Text .= implode(';', $PartArray);
+          }
+          elseif (is_array($Value) && isset(self::$Spec_ElementTypes[$Key]))
+          {
+            $Text .= $Value['value'];
+          }
+          else
+          {
+            $Text .= $Value;
+          }
+
+          $Text .= self::endl;
+        }
+      }
+
+      $Text .= 'END:VCARD'.self::endl;
+      return $Text;
+    }
+
+    // !Helper methods
+
+    private static function PrepareTypeStrForOutput($Type)
+    {
+      return implode(',', array_map('strtoupper', $Type));
+    }
+
+      /**
+       * Removes the escaping slashes from the text.
+       *
+       * @access private
+       *
+       * @param string Text to prepare.
+       *
+       * @return string Resulting text.
+       */
+    private static function Unescape($Text)
+    {
+      return str_replace(array('\:', '\;', '\,', "\n"), array(':', ';', ',', ''), $Text);
+    }
+
+    /**
+     * Separates the various parts of a structured value according to the spec.
+     *
+     * @access private
+     *
+     * @param string Raw text string
+     * @param string Key (e.g., N, ADR, ORG, etc.)
+     *
+     * @return array Parts in an associative array.
+     */
+    private static function ParseStructuredValue($Text, $Key)
+    {
+      $Text = array_map('trim', explode(';', $Text));
+
+      $Result = array();
+      $Ctr = 0;
+
+      foreach (self::$Spec_StructuredElements[$Key] as $Index => $StructurePart)
+      {
+        $Result[$StructurePart] = isset($Text[$Index]) ? $Text[$Index] : null;
+      }
+      return $Result;
+    }
+
+    /**
+     * @access private
+     */
+    private static function ParseMultipleTextValue($Text)
+    {
+      return explode(',', $Text);
+    }
+
+    /**
+     * @access private
+     */
+    private static function ParseParameters($Key, array $RawParams = null)
+    {
+      if (!$RawParams)
+      {
+        return array();
+      }
+
+      // Parameters are split into (key, value) pairs
+      $Parameters = array();
+      foreach ($RawParams as $Item)
+      {
+        $Parameters[] = explode('=', strtolower($Item));
+      }
+
+      $Type = array();
+      $Result = array();
+
+      // And each parameter is checked whether anything can/should be done because of it
+      foreach ($Parameters as $Index => $Parameter)
+      {
+        // Skipping empty elements
+        if (!$Parameter)
+        {
+          continue;
+        }
+
+        // Handling type parameters without the explicit TYPE parameter name (2.1 valid)
+        if (count($Parameter) == 1)
+        {
+          // Checks if the type value is allowed for the specific element
+          // The second part of the "if" statement means that email elements can have non-standard types (see the spec)
+          if (
+            (isset(self::$Spec_ElementTypes[$Key]) && in_array($Parameter[0], self::$Spec_ElementTypes[$Key])) ||
+            ($Key == 'email' && is_scalar($Parameter[0]))
+          )
+          {
+            $Type[] = $Parameter[0];
+          }
+        }
+        elseif (count($Parameter) > 2)
+        {
+          if(count(explode(',', $RawParams[$Index], -1)) > 0)
+          {
+            $TempTypeParams = self::ParseParameters($Key, explode(',', $RawParams[$Index]));
+            if ($TempTypeParams['type'])
+            {
+              $Type = array_merge($Type, $TempTypeParams['type']);
+            }
+          }
+        }
+        else
+        {
+          switch ($Parameter[0])
+          {
+            case 'encoding':
+              if (in_array($Parameter[1], array('quoted-printable', 'b', 'base64')))
+              {
+                $Result['encoding'] = $Parameter[1] == 'base64' ? 'b' : $Parameter[1];
+              }
+              break;
+            case 'charset':
+              $Result['charset'] = $Parameter[1];
+              break;
+            case 'type':
+              $Type = array_merge($Type, explode(',', $Parameter[1]));
+              break;
+            case 'value':
+              if (strtolower($Parameter[1]) == 'url')
+              {
+                $Result['encoding'] = 'uri';
+              }
+              break;
+          }
+        }
+      }
+
+      $Result['type'] = $Type;
+
+      return $Result;
+    }
+
+    // !Interface methods
+
+    // Countable interface
+    public function count()
+    {
+      switch ($this -> Mode)
+      {
+        case self::MODE_ERROR:
+          return 0;
+          break;
+        case self::MODE_SINGLE:
+          return 1;
+          break;
+        case self::MODE_MULTIPLE:
+          return count($this -> Data);
+          break;
+      }
+      return 0;
+    }
+
+    // Iterator interface
+    public function rewind()
+    {
+      reset($this -> Data);
+    }
+
+    public function current()
+    {
+      return current($this -> Data);
+    }
+
+    public function next()
+    {
+      return next($this -> Data);
+    }
+
+    public function valid()
+    {
+      return ($this -> current() !== false);
+    }
+
+    public function key()
+    {
+      return key($this -> Data);
+    }
+  }
 ?>

lib/vCard-parser/write-test.php

Indentation +15 added lines, -15 removed lines

@@ -1,20 +1,20 @@
 <?php
-	require_once('vCard.php');
+  require_once('vCard.php');
 
-	$vCard = new vCard;
-	$vCard -> n('John', 'FirstName');
-	$vCard -> n('Doe', 'LastName');
-	$vCard -> tel('555-1111');
-	$vCard -> tel('555-1234', 'Work');
-	$vCard -> adr('', 'POBox');
-	$vCard -> adr('', 'ExtendedAddress');
-	$vCard -> adr('42 Plantation St.', 'StreetAddress');
-	$vCard -> adr('Baytown', 'Locality');
-	$vCard -> adr('LA', 'Region');
-	$vCard -> adr('30314', 'PostalCode');
-	$vCard -> adr('USA', 'Country');
+  $vCard = new vCard;
+  $vCard -> n('John', 'FirstName');
+  $vCard -> n('Doe', 'LastName');
+  $vCard -> tel('555-1111');
+  $vCard -> tel('555-1234', 'Work');
+  $vCard -> adr('', 'POBox');
+  $vCard -> adr('', 'ExtendedAddress');
+  $vCard -> adr('42 Plantation St.', 'StreetAddress');
+  $vCard -> adr('Baytown', 'Locality');
+  $vCard -> adr('LA', 'Region');
+  $vCard -> adr('30314', 'PostalCode');
+  $vCard -> adr('USA', 'Country');
 
-	//$vCard = new vCard('Example3.0.vcf');
+  //$vCard = new vCard('Example3.0.vcf');
 
-	echo '<pre>'.$vCard.'</pre>';
+  echo '<pre>'.$vCard.'</pre>';
 ?>
\ No newline at end of file

lib/vCard-parser/test.php

Indentation +158 added lines, -158 removed lines

@@ -26,30 +26,30 @@ 
 <body>
 
 <?php
-	require_once('vCard.php');
+  require_once('vCard.php');
 
-	/**
-	 * Test function for vCard content output
-	 * @param vCard vCard object
-	 */
-	function OutputvCard(vCard $vCard)
-	{
-		echo '<h2>'.$vCard -> FN[0].'</h2>';
+  /**
+   * Test function for vCard content output
+   * @param vCard vCard object
+   */
+  function OutputvCard(vCard $vCard)
+  {
+    echo '<h2>'.$vCard -> FN[0].'</h2>';
 
-		if ($vCard -> PHOTO)
-		{
-			foreach ($vCard -> PHOTO as $Photo)
-			{
-				if ($Photo['encoding'] == 'b')
-				{
-					echo '<img src="data:image/'.$Photo['type'][0].';base64,'.$Photo['value'].'" /><br />';
-				}
-				else
-				{
-					echo '<img src="'.$Photo['value'].'" /><br />';
-				}
+    if ($vCard -> PHOTO)
+    {
+      foreach ($vCard -> PHOTO as $Photo)
+      {
+        if ($Photo['encoding'] == 'b')
+        {
+          echo '<img src="data:image/'.$Photo['type'][0].';base64,'.$Photo['value'].'" /><br />';
+        }
+        else
+        {
+          echo '<img src="'.$Photo['value'].'" /><br />';
+        }
 
-				/*
+        /*
 				// It can also be saved to a file
 				try
 				{
@@ -64,153 +64,153 @@ 
 					// Target path not writable
 				}
 				*/
-			}
-		}
+      }
+    }
 
-		foreach ($vCard -> N as $Name)
-		{
-			echo '<h3>Name: '.$Name['firstname'].' '.$Name['lastname'].'</h3>';
-		}
+    foreach ($vCard -> N as $Name)
+    {
+      echo '<h3>Name: '.$Name['firstname'].' '.$Name['lastname'].'</h3>';
+    }
 
-		foreach ($vCard -> ORG as $Organization)
-		{
-			echo '<h3>Organization: '.$Organization['name'].
-				($Organization['unit1'] || $Organization['unit2'] ?
-					' ('.implode(', ', array($Organization['unit1'], $Organization['unit2'])).')' :
-					''
-				).'</h3>';
-		}
+    foreach ($vCard -> ORG as $Organization)
+    {
+      echo '<h3>Organization: '.$Organization['name'].
+        ($Organization['unit1'] || $Organization['unit2'] ?
+          ' ('.implode(', ', array($Organization['unit1'], $Organization['unit2'])).')' :
+          ''
+        ).'</h3>';
+    }
 
-		if ($vCard -> TEL)
-		{
-			echo '<p><h4>Phone</h4>';
-			foreach ($vCard -> TEL as $Tel)
-			{
-				if (is_scalar($Tel))
-				{
-					echo $Tel.'<br />';
-				}
-				else
-				{
-					echo $Tel['value'].' ('.implode(', ', $Tel['type']).')<br />';
-				}
-			}
-			echo '</p>';
-		}
+    if ($vCard -> TEL)
+    {
+      echo '<p><h4>Phone</h4>';
+      foreach ($vCard -> TEL as $Tel)
+      {
+        if (is_scalar($Tel))
+        {
+          echo $Tel.'<br />';
+        }
+        else
+        {
+          echo $Tel['value'].' ('.implode(', ', $Tel['type']).')<br />';
+        }
+      }
+      echo '</p>';
+    }
 
-		if ($vCard -> EMAIL)
-		{
-			echo '<p><h4>Email</h4>';
-			foreach ($vCard -> EMAIL as $Email)
-			{
-				if (is_scalar($Email))
-				{
-					echo $Email;
-				}
-				else
-				{
-					echo $Email['value'].' ('.implode(', ', $Email['type']).')<br />';
-				}
-			}
-			echo '</p>';
-		}
+    if ($vCard -> EMAIL)
+    {
+      echo '<p><h4>Email</h4>';
+      foreach ($vCard -> EMAIL as $Email)
+      {
+        if (is_scalar($Email))
+        {
+          echo $Email;
+        }
+        else
+        {
+          echo $Email['value'].' ('.implode(', ', $Email['type']).')<br />';
+        }
+      }
+      echo '</p>';
+    }
 
-		if ($vCard -> URL)
-		{
-			echo '<p><h4>URL</h4>';
-			foreach ($vCard -> URL as $URL)
-			{
-				if (is_scalar($URL))
-				{
-					echo $URL.'<br />';
-				}
-				else
-				{
-					echo $URL['value'].'<br />';
-				}
-			}
-			echo '</p>';
-		}
+    if ($vCard -> URL)
+    {
+      echo '<p><h4>URL</h4>';
+      foreach ($vCard -> URL as $URL)
+      {
+        if (is_scalar($URL))
+        {
+          echo $URL.'<br />';
+        }
+        else
+        {
+          echo $URL['value'].'<br />';
+        }
+      }
+      echo '</p>';
+    }
 
-		if ($vCard -> IMPP)
-		{
-			echo '<p><h4>Instant messaging</h4>';
-			foreach ($vCard -> IMPP as $IMPP)
-			{
-				if (is_scalar($IMPP))
-				{
-					echo $IMPP.'<br />';
-				}
-				else
-				{
-					echo $IMPP['value'].'<br/ >';
-				}
-			}
-			echo '</p>';
-		}
+    if ($vCard -> IMPP)
+    {
+      echo '<p><h4>Instant messaging</h4>';
+      foreach ($vCard -> IMPP as $IMPP)
+      {
+        if (is_scalar($IMPP))
+        {
+          echo $IMPP.'<br />';
+        }
+        else
+        {
+          echo $IMPP['value'].'<br/ >';
+        }
+      }
+      echo '</p>';
+    }
 
-		if ($vCard -> ADR)
-		{
-			foreach ($vCard -> ADR as $Address)
-			{
-				echo '<p><h4>Address ('.implode(', ', $Address['type']).')</h4>';
-				echo 'Street address: <strong>'.($Address['streetaddress'] ? $Address['streetaddress'] : '-').'</strong><br />'.
-					'PO Box: <strong>'.($Address['pobox'] ? $Address['pobox'] : '-').'</strong><br />'.
-					'Extended address: <strong>'.($Address['extendedaddress'] ? $Address['extendedaddress'] : '-').'</strong><br />'.
-					'Locality: <strong>'.($Address['locality'] ? $Address['locality'] : '-').'</strong><br />'.
-					'Region: <strong>'.($Address['region'] ? $Address['region'] : '-').'</strong><br />'.
-					'ZIP/Post code: <strong>'.($Address['postalcode'] ? $Address['postalcode'] : '-').'</strong><br />'.
-					'Country: <strong>'.($Address['country'] ? $Address['country'] : '-').'</strong>';
-			}
-			echo '</p>';
-		}
+    if ($vCard -> ADR)
+    {
+      foreach ($vCard -> ADR as $Address)
+      {
+        echo '<p><h4>Address ('.implode(', ', $Address['type']).')</h4>';
+        echo 'Street address: <strong>'.($Address['streetaddress'] ? $Address['streetaddress'] : '-').'</strong><br />'.
+          'PO Box: <strong>'.($Address['pobox'] ? $Address['pobox'] : '-').'</strong><br />'.
+          'Extended address: <strong>'.($Address['extendedaddress'] ? $Address['extendedaddress'] : '-').'</strong><br />'.
+          'Locality: <strong>'.($Address['locality'] ? $Address['locality'] : '-').'</strong><br />'.
+          'Region: <strong>'.($Address['region'] ? $Address['region'] : '-').'</strong><br />'.
+          'ZIP/Post code: <strong>'.($Address['postalcode'] ? $Address['postalcode'] : '-').'</strong><br />'.
+          'Country: <strong>'.($Address['country'] ? $Address['country'] : '-').'</strong>';
+      }
+      echo '</p>';
+    }
 
-		if ($vCard -> AGENT)
-		{
-			echo '<h4>Agents</h4>';
-			foreach ($vCard -> AGENT as $Agent)
-			{
-				if (is_scalar($Agent))
-				{
-					echo '<div class="Agent">'.$Agent.'</div>';
-				}
-				elseif (is_a($Agent, 'vCard'))
-				{
-					echo '<div class="Agent">';
-					OutputvCard($Agent);
-					echo '</div>';
-				}
-			}
-		}
-	}
+    if ($vCard -> AGENT)
+    {
+      echo '<h4>Agents</h4>';
+      foreach ($vCard -> AGENT as $Agent)
+      {
+        if (is_scalar($Agent))
+        {
+          echo '<div class="Agent">'.$Agent.'</div>';
+        }
+        elseif (is_a($Agent, 'vCard'))
+        {
+          echo '<div class="Agent">';
+          OutputvCard($Agent);
+          echo '</div>';
+        }
+      }
+    }
+  }
 
-	$vCard = new vCard(
-		'Example3.0.vcf', // Path to vCard file
-		false, // Raw vCard text, can be used instead of a file
-		array( // Option array
-			// This lets you get single values for elements that could contain multiple values but have only one value.
-			//	This defaults to false so every value that could have multiple values is returned as array.
-			'Collapse' => false
-		)
-	);
+  $vCard = new vCard(
+    'Example3.0.vcf', // Path to vCard file
+    false, // Raw vCard text, can be used instead of a file
+    array( // Option array
+      // This lets you get single values for elements that could contain multiple values but have only one value.
+      //	This defaults to false so every value that could have multiple values is returned as array.
+      'Collapse' => false
+    )
+  );
 
-	if (count($vCard) == 0)
-	{
-		throw new Exception('vCard test: empty vCard!');
-	}
-	// if the file contains a single vCard, it is accessible directly.
-	elseif (count($vCard) == 1)
-	{
-		OutputvCard($vCard);
-	}
-	// if the file contains multiple vCards, they are accessible as elements of an array
-	else
-	{
-		foreach ($vCard as $Index => $vCardPart)
-		{
-			OutputvCard($vCardPart);
-		}
-	}
+  if (count($vCard) == 0)
+  {
+    throw new Exception('vCard test: empty vCard!');
+  }
+  // if the file contains a single vCard, it is accessible directly.
+  elseif (count($vCard) == 1)
+  {
+    OutputvCard($vCard);
+  }
+  // if the file contains multiple vCards, they are accessible as elements of an array
+  else
+  {
+    foreach ($vCard as $Index => $vCardPart)
+    {
+      OutputvCard($vCardPart);
+    }
+  }
 ?>
 </body>
 </html>

lib/CardDAV-PHP/carddav.php

Indentation +44 added lines, -44 removed lines

@@ -143,17 +143,17 @@ 
     private $auth = null;
 
     /**
-    * Authentication: username
-    *
-    * @var  string
-    */
+     * Authentication: username
+     *
+     * @var  string
+     */
     private $username = null;
 
     /**
-    * Authentication: password
-    *
-    * @var  string
-    */
+     * Authentication: password
+     *
+     * @var  string
+     */
     private $password = null;
 
     /**
@@ -236,11 +236,11 @@ 
     }
 
     /**
-    * Sets the CardDAV server url
-    *
-    * @param    string  $url    CardDAV server url
-    * @return   void
-    */
+     * Sets the CardDAV server url
+     *
+     * @param    string  $url    CardDAV server url
+     * @return   void
+     */
     public function setUrl($url)
     {
         $this->url = $url;
@@ -354,11 +354,11 @@ 
     }
 
     /**
-    * Gets a clean vCard from the CardDAV server
-    *
-    * @param    string  $vcard_id   vCard id on the CardDAV server
-    * @return   string              vCard (text/vcard)
-    */
+     * Gets a clean vCard from the CardDAV server
+     *
+     * @param    string  $vcard_id   vCard id on the CardDAV server
+     * @return   string              vCard (text/vcard)
+     */
     public function getVcard($vcard_id)
     {
         $vcard_id   = str_replace($this->url_vcard_extension, null, $vcard_id);
@@ -367,29 +367,29 @@ 
         // DEBUG: print the response of the carddav-server
         // print_r($result);
 
-	switch ($result['http_code'])
+  switch ($result['http_code'])
         {
-		case 404:
-			$altResult  = $this->query($this->url . $vcard_id , 'GET');
-		        // DEBUG: print the response of the carddav-server
-		        // print_r($altResult);
-	                switch ($altResult['http_code'])
-        	        {
-                	        case 200:
-	                        case 207:
-					print "Ignoring given Vcard Extension (".$this->url_vcard_extension.")" . PHP_EOL. ".";
-					$this->setVcardExtension("");
-        	                        return $altResult['response'];
-	                }
-		        throw new \Exception(
-		            "Woops, something's gone wrong! The CardDAV server returned the http status code {$result['http_code']}:{$result['response']}:{$vcard_id}.",
-		            self::EXCEPTION_WRONG_HTTP_STATUS_CODE_GET_VCARD
-		        );
-
-		case 200:
-		case 207:
-			print ".";
-			return $result['response'];
+    case 404:
+      $altResult  = $this->query($this->url . $vcard_id , 'GET');
+            // DEBUG: print the response of the carddav-server
+            // print_r($altResult);
+                  switch ($altResult['http_code'])
+                  {
+                          case 200:
+                          case 207:
+          print "Ignoring given Vcard Extension (".$this->url_vcard_extension.")" . PHP_EOL. ".";
+          $this->setVcardExtension("");
+                                  return $altResult['response'];
+                  }
+            throw new \Exception(
+                "Woops, something's gone wrong! The CardDAV server returned the http status code {$result['http_code']}:{$result['response']}:{$vcard_id}.",
+                self::EXCEPTION_WRONG_HTTP_STATUS_CODE_GET_VCARD
+            );
+
+    case 200:
+    case 207:
+      print ".";
+      return $result['response'];
         }
 
         throw new \Exception(
@@ -450,10 +450,10 @@ 
     }
 
     /**
-    * Checks if the CardDAV server is reachable
-    *
-    * @return   boolean
-    */
+     * Checks if the CardDAV server is reachable
+     *
+     * @return   boolean
+     */
     public function checkConnection()
     {
         $result = $this->query($this->url, 'OPTIONS');

carddav2fb.php

Indentation +17 added lines, -17 removed lines

@@ -603,7 +603,7 @@ 
             print "  Added photo: " . basename($photo_file) . PHP_EOL;
           }
           else
-           print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
+            print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
         }
         elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
         {
@@ -668,19 +668,19 @@ 
         fclose($output);
         print " Saved to file " . $this->config['output_file'] . PHP_EOL;
       }
-	  if (array_key_exists('output_and_upload', $this->config) and $this->config['output_and_upload'])
-	  {
-	  	$newphonebhash = md5(preg_replace("/<mod_time>(\\d{10})/","",file_get_contents($this->config['output_file'],'r'),-1,$debugnewtsreplace));
-	  	print " INFO: Compare old and new phonebook file versions." . PHP_EOL . " INFO: old version: " . $oldphonebhash . PHP_EOL . " INFO: new version: " . $newphonebhash . PHP_EOL;
-	  	if($oldphonebhash === $newphonebhash)
-      	{
-      	print " INFO: Same versions ==> No changes in phonebook or images" . PHP_EOL . " EXIT: No need to upload phonebook to the FRITZ!Box.". PHP_EOL;
-      	return 0;
-      	}
-      	else
-      	print " INFO: Different versions ==> Changes in phonebook." . PHP_EOL . " INFO: Changes dedected! Continue with upload." . PHP_EOL;
+    if (array_key_exists('output_and_upload', $this->config) and $this->config['output_and_upload'])
+    {
+      $newphonebhash = md5(preg_replace("/<mod_time>(\\d{10})/","",file_get_contents($this->config['output_file'],'r'),-1,$debugnewtsreplace));
+      print " INFO: Compare old and new phonebook file versions." . PHP_EOL . " INFO: old version: " . $oldphonebhash . PHP_EOL . " INFO: new version: " . $newphonebhash . PHP_EOL;
+      if($oldphonebhash === $newphonebhash)
+        {
+        print " INFO: Same versions ==> No changes in phonebook or images" . PHP_EOL . " EXIT: No need to upload phonebook to the FRITZ!Box.". PHP_EOL;
+        return 0;
+        }
+        else
+        print " INFO: Different versions ==> Changes in phonebook." . PHP_EOL . " INFO: Changes dedected! Continue with upload." . PHP_EOL;
       }
-	  else
+    else
       return 0;  
     }
     // now we upload the photo jpgs first being stored in the
@@ -811,10 +811,10 @@ 
       );
 
       $filefileds = array('PhonebookImportFile' => array(
-       'type' => 'text/xml',
-       'filename' => 'updatepb.xml',
-       'content' => $this->fbxml,
-       )
+        'type' => 'text/xml',
+        'filename' => 'updatepb.xml',
+        'content' => $this->fbxml,
+        )
       );
 
       $raw_result = $fritz->doPostFile($formfields, $filefileds); // send the command

lib/fritzbox_api_php/fritzbox_api.class.php

Indentation +144 added lines, -144 removed lines

@@ -48,70 +48,70 @@ 
  */
 class fritzbox_api {
   /**
-    * @var  object  config object
-    */
+   * @var  object  config object
+   */
   public $config = array();
   
   /**
-    * @var  string  the session ID, set by method initSID() after login
-    */
+   * @var  string  the session ID, set by method initSID() after login
+   */
   protected $sid = '0000000000000000';
   
   
   /**
-    * the constructor, initializes the object and calls the login method
-    * 
-    * @access public
-    */
+   * the constructor, initializes the object and calls the login method
+   * 
+   * @access public
+   */
   public function __construct($password = false,$user_name = false,$fritzbox_ip = 'fritz.box',$force_local_login = false)
   {
-	// init the config object
-	$this->config = new fritzbox_api_config();
+  // init the config object
+  $this->config = new fritzbox_api_config();
     
-	// try autoloading the config
-	if (file_exists(__DIR__ . '/fritzbox_user.conf.php') && is_readable(__DIR__ . '/fritzbox_user.conf.php') ) {
-		require_once(__DIR__ . '/fritzbox_user.conf.php');
-	}
+  // try autoloading the config
+  if (file_exists(__DIR__ . '/fritzbox_user.conf.php') && is_readable(__DIR__ . '/fritzbox_user.conf.php') ) {
+    require_once(__DIR__ . '/fritzbox_user.conf.php');
+  }
 
-	// set FRITZ!Box-IP and URL
-	$this->config->setItem('fritzbox_ip',$fritzbox_ip);
+  // set FRITZ!Box-IP and URL
+  $this->config->setItem('fritzbox_ip',$fritzbox_ip);
 
-	// check if login on local network (fritz.box) or via a dynamic DNS-host
-	if ($fritzbox_ip != 'fritz.box' && !$force_local_login) {
-		$this->config->setItem('enable_remote_config',true);
-		$this->config->setItem('remote_config_user',$user_name);
-		$this->config->setItem('remote_config_password',$password);
-		$this->config->setItem('fritzbox_url', 'https://'.$this->config->getItem('fritzbox_ip'));
-	} else {
-		$this->config->setItem('enable_remote_config',false);
-		if($user_name != false){
-			$this->config->setItem('username',$user_name);
-		}
-		if($password != false){
-			$this->config->setItem('password',$password);
-		}
-		$this->config->setItem('fritzbox_url', 'http://' . $this->config->getItem('fritzbox_ip'));
-	}
+  // check if login on local network (fritz.box) or via a dynamic DNS-host
+  if ($fritzbox_ip != 'fritz.box' && !$force_local_login) {
+    $this->config->setItem('enable_remote_config',true);
+    $this->config->setItem('remote_config_user',$user_name);
+    $this->config->setItem('remote_config_password',$password);
+    $this->config->setItem('fritzbox_url', 'https://'.$this->config->getItem('fritzbox_ip'));
+  } else {
+    $this->config->setItem('enable_remote_config',false);
+    if($user_name != false){
+      $this->config->setItem('username',$user_name);
+    }
+    if($password != false){
+      $this->config->setItem('password',$password);
+    }
+    $this->config->setItem('fritzbox_url', 'http://' . $this->config->getItem('fritzbox_ip'));
+  }
 
-	// make some config consistency checks
-	if ( $this->config->getItem('enable_remote_config') === true ){
-		if ( !$this->config->getItem('remote_config_user') || !$this->config->getItem('remote_config_password') ){
-		  $this->error('ERROR: Remote config mode enabled, but no username or no password provided');
-		}
-	}
-	else {
-		$this->config->setItem('old_remote_config_user', null);
-		$this->config->setItem('old_remote_config_password', null);
-	}
-	$this->sid = $this->initSID();
+  // make some config consistency checks
+  if ( $this->config->getItem('enable_remote_config') === true ){
+    if ( !$this->config->getItem('remote_config_user') || !$this->config->getItem('remote_config_password') ){
+      $this->error('ERROR: Remote config mode enabled, but no username or no password provided');
+    }
+  }
+  else {
+    $this->config->setItem('old_remote_config_user', null);
+    $this->config->setItem('old_remote_config_password', null);
+  }
+  $this->sid = $this->initSID();
   }
   
   
   /**
-    * the destructor just calls the logout method
-    * 
-    * @access public
-    */
+   * the destructor just calls the logout method
+   * 
+   * @access public
+   */
   public function __destruct()
   {
     $this->logout();
@@ -119,12 +119,12 @@ 
   
   
   /**
-    * do a POST request on the box
-    * the main cURL wrapper handles the command
-    * 
-    * @param  array  $formfields    an associative array with the POST fields to pass
-    * @return string                the raw HTML code returned by the Fritz!Box
-    */
+   * do a POST request on the box
+   * the main cURL wrapper handles the command
+   * 
+   * @param  array  $formfields    an associative array with the POST fields to pass
+   * @return string                the raw HTML code returned by the Fritz!Box
+   */
   public function doPostForm($formfields = array())
   {
     $ch = curl_init();
@@ -147,23 +147,23 @@ 
     curl_setopt($ch, CURLOPT_POST, 1);
     if ( $this->config->getItem('enable_remote_config') == true )
     {
-		// set name of SSL-certificate (must be same as remote-hostname (dynDNS) of FRITZ!Box) and remove port in address if alternate port is given
-		if (strpos($this->config->getItem('fritzbox_ip'),":")){
-			$ssl_cert_fritzbox = explode(":", $this->config->getItem('fritzbox_ip'));
-			$ssl_cert_fritzbox = $ssl_cert_fritzbox[0];
-		} else {
-			$ssl_cert_fritzbox = $this->config->getItem('fritzbox_ip');
-		}
+    // set name of SSL-certificate (must be same as remote-hostname (dynDNS) of FRITZ!Box) and remove port in address if alternate port is given
+    if (strpos($this->config->getItem('fritzbox_ip'),":")){
+      $ssl_cert_fritzbox = explode(":", $this->config->getItem('fritzbox_ip'));
+      $ssl_cert_fritzbox = $ssl_cert_fritzbox[0];
+    } else {
+      $ssl_cert_fritzbox = $this->config->getItem('fritzbox_ip');
+    }
 
-		// set SSL-options and path to certificate
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 2);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-		curl_setopt($ch, CURLOPT_CAPATH, '/etc/ssl/certs');
+    // set SSL-options and path to certificate
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 2);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+    curl_setopt($ch, CURLOPT_CAPATH, '/etc/ssl/certs');
 
-		// support for pre FRITZ!OS 5.50 remote config
-		if (!$this->config->getItem('use_lua_login_method')){
-		curl_setopt($ch, CURLOPT_USERPWD, $this->config->getItem('remote_config_user') . ':' . $this->config->getItem('remote_config_password'));
-		}
+    // support for pre FRITZ!OS 5.50 remote config
+    if (!$this->config->getItem('use_lua_login_method')){
+    curl_setopt($ch, CURLOPT_USERPWD, $this->config->getItem('remote_config_user') . ':' . $this->config->getItem('remote_config_password'));
+    }
     }
     curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($formfields));
     $output = curl_exec($ch);
@@ -178,10 +178,10 @@ 
     // add the sid, if it is already set
     if ($this->sid != '0000000000000000')
     {
-		// 'sid' MUST be the first POST variable!!! (otherwise it will not work!!)
-		// therfore we use array_merge to ensuere the foreach outputs 'sid' fist
-		$formfields = array_merge(array('sid' => $this->sid), $formfields);
-		//$formfields['sid'] = $this->sid;
+    // 'sid' MUST be the first POST variable!!! (otherwise it will not work!!)
+    // therfore we use array_merge to ensuere the foreach outputs 'sid' fist
+    $formfields = array_merge(array('sid' => $this->sid), $formfields);
+    //$formfields['sid'] = $this->sid;
     }   
     curl_setopt($ch, CURLOPT_URL, $this->config->getItem('fritzbox_url') . '/cgi-bin/firmwarecfg'); 
     curl_setopt($ch, CURLOPT_POST, 1);
@@ -192,30 +192,30 @@ 
     
     // if filefileds not specified ('@/path/to/file.xml;type=text/xml' works fine)
     if(empty( $filefileds )) {
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $formfields); // http_build_query
-	} 
-	// post calculated raw data
-	else {
-		$header = $this->_create_custom_file_post_header($formfields, $filefileds);
-		curl_setopt($ch, CURLOPT_HTTPHEADER , array(
-			'Content-Type: multipart/form-data; boundary=' . $header['delimiter'], 'Content-Length: ' . strlen($header['data']) )
-			);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $formfields); // http_build_query
+  } 
+  // post calculated raw data
+  else {
+    $header = $this->_create_custom_file_post_header($formfields, $filefileds);
+    curl_setopt($ch, CURLOPT_HTTPHEADER , array(
+      'Content-Type: multipart/form-data; boundary=' . $header['delimiter'], 'Content-Length: ' . strlen($header['data']) )
+      );
 			
-		curl_setopt($ch, CURLOPT_POSTFIELDS, $header['data']);		
-	}
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $header['data']);		
+  }
 	
     $output = curl_exec($ch);
 
-	// curl error
-	if(curl_errno($ch)) {
-		$this->error(curl_error($ch)." (".curl_errno($ch).")");
-	}
+  // curl error
+  if(curl_errno($ch)) {
+    $this->error(curl_error($ch)." (".curl_errno($ch).")");
+  }
 
     // finger out an error message, if given
     preg_match('@<p class="ErrorMsg">(.*?)</p>@is', $output, $matches);
     if (isset($matches[1]))
     {
-		$this->error(str_replace('&nbsp;', ' ', $matches[1]));
+    $this->error(str_replace('&nbsp;', ' ', $matches[1]));
     }
 
     curl_close($ch);
@@ -223,10 +223,10 @@ 
   }
 
   private function _create_custom_file_post_header($postFields, $fileFields) {
-		// form field separator
-		$delimiter = '-------------' . uniqid();
+    // form field separator
+    $delimiter = '-------------' . uniqid();
 		
-		/*
+    /*
 		// file upload fields: name => array(type=>'mime/type',content=>'raw data')
 		$fileFields = array(
 			'file1' => array(
@@ -241,44 +241,44 @@ 
 		);
 		*/
 		
-		$data = '';
+    $data = '';
 
-		// populate normal fields first (simpler)
-		foreach ($postFields as $name => $content) {
-		   $data .= "--" . $delimiter . "\r\n";
-			$data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '"';
-			$data .= "\r\n\r\n";
-			$data .= $content;
-			$data .= "\r\n";
-		}
-		// populate file fields
-		foreach ($fileFields as $name => $file) {
-			$data .= "--" . $delimiter . "\r\n";
-			// "filename" attribute is not essential; server-side scripts may use it
-			$data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '";' .
-					 ' filename="' . $file['filename'] . '"' . "\r\n";
+    // populate normal fields first (simpler)
+    foreach ($postFields as $name => $content) {
+        $data .= "--" . $delimiter . "\r\n";
+      $data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '"';
+      $data .= "\r\n\r\n";
+      $data .= $content;
+      $data .= "\r\n";
+    }
+    // populate file fields
+    foreach ($fileFields as $name => $file) {
+      $data .= "--" . $delimiter . "\r\n";
+      // "filename" attribute is not essential; server-side scripts may use it
+      $data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '";' .
+            ' filename="' . $file['filename'] . '"' . "\r\n";
 					 
-			//$data .= 'Content-Transfer-Encoding: binary'."\r\n";
-			// this is, again, informative only; good practice to include though
-			$data .= 'Content-Type: ' . $file['type'] . "\r\n";
-			// this endline must be here to indicate end of headers
-			$data .= "\r\n";
-			// the file itself (note: there's no encoding of any kind)
-			$data .= $file['content'] . "\r\n";
-		}
-		// last delimiter
-		$data .= "--" . $delimiter . "--\r\n";
+      //$data .= 'Content-Transfer-Encoding: binary'."\r\n";
+      // this is, again, informative only; good practice to include though
+      $data .= 'Content-Type: ' . $file['type'] . "\r\n";
+      // this endline must be here to indicate end of headers
+      $data .= "\r\n";
+      // the file itself (note: there's no encoding of any kind)
+      $data .= $file['content'] . "\r\n";
+    }
+    // last delimiter
+    $data .= "--" . $delimiter . "--\r\n";
 	
-		return array('delimiter' => $delimiter, 'data' => $data);
-	}
+    return array('delimiter' => $delimiter, 'data' => $data);
+  }
   
   /**
-    * do a GET request on the box
-    * the main cURL wrapper handles the command
-    * 
-    * @param  array  $params    an associative array with the GET params to pass
-    * @return string            the raw HTML code returned by the Fritz!Box
-    */
+   * do a GET request on the box
+   * the main cURL wrapper handles the command
+   * 
+   * @param  array  $params    an associative array with the GET params to pass
+   * @return string            the raw HTML code returned by the Fritz!Box
+   */
   public function doGetRequest($params = array())
   {
     // add the sid, if it is already set
@@ -318,12 +318,12 @@ 
   
   
   /**
-    * the login method, handles the secured login-process
-    * newer firmwares (xx.04.74 and newer) need a challenge-response mechanism to prevent Cross-Site Request Forgery attacks
-    * see http://www.avm.de/de/Extern/Technical_Note_Session_ID.pdf for details
-    * 
-    * @return string                a valid SID, if the login was successful, otherwise throws an Exception with an error message
-    */
+   * the login method, handles the secured login-process
+   * newer firmwares (xx.04.74 and newer) need a challenge-response mechanism to prevent Cross-Site Request Forgery attacks
+   * see http://www.avm.de/de/Extern/Technical_Note_Session_ID.pdf for details
+   * 
+   * @return string                a valid SID, if the login was successful, otherwise throws an Exception with an error message
+   */
   protected function initSID()
   {
     // determine, wich login type we have to use
@@ -403,9 +403,9 @@ 
   
   
   /**
-    * the logout method just sends a logout command to the Fritz!Box
-    * 
-    */
+   * the logout method just sends a logout command to the Fritz!Box
+   * 
+   */
   protected function logout()
   {
     if ( $this->config->getItem('use_lua_login_method') == true )
@@ -424,10 +424,10 @@ 
   
   
   /**
-    * the error method just throws an Exception
-    * 
-    * @param  string   $message     an error message for the Exception
-    */
+   * the error method just throws an Exception
+   * 
+   * @param  string   $message     an error message for the Exception
+   */
   public function error($message = null)
   {
     throw new Exception($message);
@@ -435,20 +435,20 @@ 
   
   
   /**
-    * a getter for the session ID
-    * 
-    * @return string                $this->sid
-    */
+   * a getter for the session ID
+   * 
+   * @return string                $this->sid
+   */
   public function getSID()
   {
     return $this->sid;
   }
   
   /**
-    * log a message
-    * 
-    * @param  $message  string  the message to log
-    */
+   * log a message
+   * 
+   * @param  $message  string  the message to log
+   */
   public function logMessage($message)
   {
     if ( $this->config->getItem('newline') == false )