jens-maus / carddav2fb

lib/CardDAV-PHP/carddav.php

Doc Comments +2 added lines, -2 removed lines

@@ -532,7 +532,7 @@ 
      *
      * @param   string  $vcard      vCard
      * @param   string  $vcard_id   vCard id on the CardDAV server
-     * @return  boolean
+     * @return  string
      */
     public function update($vcard, $vcard_id)
     {
@@ -672,7 +672,7 @@ 
      * @param   string  $method             HTTP method like (OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE)
      * @param   string  $content            Content for CardDAV queries
      * @param   string  $content_type       Set content type
-     * @return  array                       Raw CardDAV Response and http status code
+     * @return  boolean                       Raw CardDAV Response and http status code
      */
     private function query($url, $method, $content = null, $content_type = null)
     {

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');

Spacing +40 added lines, -40 removed lines

@@ -208,7 +208,7 @@ 
     const EXCEPTION_WRONG_HTTP_STATUS_CODE_ADD              = 1004;
     const EXCEPTION_WRONG_HTTP_STATUS_CODE_UPDATE           = 1005;
     const EXCEPTION_MALFORMED_XML_RESPONSE                  = 1006;
-    const EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID             = 1007;
+    const EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID = 1007;
 
 
     /**
@@ -219,7 +219,7 @@ 
      */
     public function __construct($url = null)
     {
-        if ($url !== null) {
+        if($url !== null) {
             $this->setUrl($url);
         }
     }
@@ -245,14 +245,14 @@ 
     {
         $this->url = $url;
 
-        if (substr($this->url, -1, 1) !== '/') {
+        if(substr($this->url, -1, 1) !== '/') {
             $this->url = $this->url . '/';
         }
 
         $this->url_parts = parse_url($this->url);
 
         // workaround for providers that don't use the default .vcf extension
-        if (strpos($this->url, "google.com"))
+        if(strpos($this->url, "google.com"))
         {
           $this->setVcardExtension("");
         }
@@ -335,11 +335,11 @@ 
         // DEBUG: print the response of the carddav-server
         //print_r($result);
 
-        switch ($result['http_code'])
+        switch($result['http_code'])
         {
             case 200:
             case 207:
-                if ($raw === true) {
+                if($raw === true) {
                     return $result['response'];
                 } else {
                     return $this->simplify($result['response'], $include_vcards);
@@ -367,17 +367,17 @@ 
         // 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');
+			$altResult = $this->query($this->url . $vcard_id, 'GET');
 		        // DEBUG: print the response of the carddav-server
 		        // print_r($altResult);
-	                switch ($altResult['http_code'])
+	                switch($altResult['http_code'])
         	        {
                 	        case 200:
 	                        case 207:
-					print "Ignoring given Vcard Extension (".$this->url_vcard_extension.")" . PHP_EOL. ".";
+					print "Ignoring given Vcard Extension (" . $this->url_vcard_extension . ")" . PHP_EOL . ".";
 					$this->setVcardExtension("");
         	                        return $altResult['response'];
 	                }
@@ -425,7 +425,7 @@ 
 
         $result = $this->query($this->url, 'REPORT', $xml->outputMemory(), 'text/xml');
 
-        switch ($result['http_code'])
+        switch($result['http_code'])
         {
             case 200:
             case 207:
@@ -458,7 +458,7 @@ 
     {
         $result = $this->query($this->url, 'OPTIONS');
 
-        if ($result['http_code'] === 200) {
+        if($result['http_code'] === 200) {
             return true;
         } else {
             return false;
@@ -488,7 +488,7 @@ 
     {
         $result = $this->query($this->url . $vcard_id . $this->url_vcard_extension, 'DELETE');
 
-        switch ($result['http_code'])
+        switch($result['http_code'])
         {
             case 204:
                 return true;
@@ -509,8 +509,8 @@ 
      */
     public function add($vcard, $vcard_id = null)
     {
-        if ($vcard_id === null) {
-            $vcard_id   = $this->generateVcardId();
+        if($vcard_id === null) {
+            $vcard_id = $this->generateVcardId();
         }
         $vcard  = $this->cleanVcard($vcard);
         $result = $this->query($this->url . $vcard_id . $this->url_vcard_extension, 'PUT', $vcard, 'text/vcard');
@@ -538,7 +538,7 @@ 
     {
         try {
             return $this->add($vcard, $vcard_id);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             throw new \Exception($e->getMessage(), self::EXCEPTION_WRONG_HTTP_STATUS_CODE_UPDATE);
         }
     }
@@ -556,7 +556,7 @@ 
 
         try {
             $xml = new \SimpleXMLElement($response);
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             throw new \Exception(
                 "The XML response seems to be malformed and can't be simplified!",
                 self::EXCEPTION_MALFORMED_XML_RESPONSE,
@@ -571,33 +571,33 @@ 
         $simplified_xml->startDocument('1.0', 'utf-8');
             $simplified_xml->startElement('response');
 
-        if (!empty($xml->response)) {
-            foreach ($xml->response as $response) {
-              if ((preg_match('/vcard/', $response->propstat->prop->getcontenttype) || preg_match('/vcf/', $response->href)) &&
+        if(!empty($xml->response)) {
+            foreach($xml->response as $response) {
+              if((preg_match('/vcard/', $response->propstat->prop->getcontenttype) || preg_match('/vcf/', $response->href)) &&
                   !$response->propstat->prop->resourcetype->collection) {
                     $id = basename($response->href);
                     $id = str_replace($this->url_vcard_extension, null, $id);
 
                     try {
                         $vcardData = $this->getVcard($id);
-                        if (!empty($id)) {
+                        if(!empty($id)) {
                             $simplified_xml->startElement('element');
                                 $simplified_xml->writeElement('id', $id);
                                 $simplified_xml->writeElement('etag', str_replace('"', null, $response->propstat->prop->getetag));
                                 $simplified_xml->writeElement('last_modified', $response->propstat->prop->getlastmodified);
 
-                            if ($include_vcards === true) {
+                            if($include_vcards === true) {
                                 $simplified_xml->writeElement('vcard', $vcardData);
                             }
                             $simplified_xml->endElement();
                         }
-                    } catch (\Exception $e) {
+                    } catch(\Exception $e) {
                         print("Error fetching vCard: {$id}: {$e->getMessage()}\n");
                     }
-                } elseif (preg_match('/unix-directory/', $response->propstat->prop->getcontenttype)) {
-                    if (isset($response->propstat->prop->href)) {
+                } elseif(preg_match('/unix-directory/', $response->propstat->prop->getcontenttype)) {
+                    if(isset($response->propstat->prop->href)) {
                         $href = $response->propstat->prop->href;
-                    } elseif (isset($response->href)) {
+                    } elseif(isset($response->href)) {
                         $href = $response->href;
                     } else {
                         $href = null;
@@ -643,22 +643,22 @@ 
      */
     public function curlInit()
     {
-        if (empty($this->curl)) {
+        if(empty($this->curl)) {
             $this->curl = curl_init();
             curl_setopt($this->curl, CURLOPT_HEADER, true);
             curl_setopt($this->curl, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($this->curl, CURLOPT_SSL_VERIFYPEER, false);
             curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($this->curl, CURLOPT_USERAGENT, self::USERAGENT.self::VERSION);
+            curl_setopt($this->curl, CURLOPT_USERAGENT, self::USERAGENT . self::VERSION);
 
-            if ($this->auth !== null) {
+            if($this->auth !== null) {
                 curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
                 curl_setopt($this->curl, CURLOPT_USERPWD, $this->auth);
             }
 
             /* allow to follow redirects if activated */
             curl_setopt($this->curl, CURLOPT_FOLLOWLOCATION, $this->follow_redirects);
-            if ($this->follow_redirects)
+            if($this->follow_redirects)
             {
               curl_setopt($this->curl, CURLOPT_MAXREDIRS, $this->follow_redirects_count);
             }
@@ -681,7 +681,7 @@ 
         curl_setopt($this->curl, CURLOPT_URL, $url);
         curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $method);
 
-        if ($content !== null) {
+        if($content !== null) {
             curl_setopt($this->curl, CURLOPT_POST, true);
             curl_setopt($this->curl, CURLOPT_POSTFIELDS, $content);
         } else {
@@ -689,8 +689,8 @@ 
             curl_setopt($this->curl, CURLOPT_POSTFIELDS, null);
         }
 
-        if ($content_type !== null) {
-            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: '.$content_type, 'Depth: 1'));
+        if($content_type !== null) {
+            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: ' . $content_type, 'Depth: 1'));
         } else {
             curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Depth: 1'));
         }
@@ -698,7 +698,7 @@ 
         $complete_response  = curl_exec($this->curl);
         $header_size        = curl_getinfo($this->curl, CURLINFO_HEADER_SIZE);
         $http_code          = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
-        $header                 = trim(substr($complete_response, 0, $header_size));
+        $header = trim(substr($complete_response, 0, $header_size));
         $response           = substr($complete_response, $header_size);
 
         $return = array(
@@ -706,7 +706,7 @@ 
             'http_code'         => $http_code
         );
 
-        if ($this->debug === true) {
+        if($this->debug === true) {
             $debug = $return;
             $debug['url']           = $url;
             $debug['method']        = $method;
@@ -728,8 +728,8 @@ 
     {
         $vcard_id = null;
 
-        for ($number = 0; $number <= 25; $number ++) {
-            if ($number == 8 || $number == 17) {
+        for($number = 0; $number <= 25; $number++) {
+            if($number == 8 || $number == 17) {
                 $vcard_id .= '-';
             } else {
                 $vcard_id .= $this->vcard_id_chars[mt_rand(0, (count($this->vcard_id_chars) - 1))];
@@ -742,12 +742,12 @@ 
 
             $result = $carddav->query($this->url . $vcard_id . $this->url_vcard_extension, 'GET');
 
-            if ($result['http_code'] !== 404) {
+            if($result['http_code'] !== 404) {
                 $vcard_id = $this->generateVcardId();
             }
 
             return $vcard_id;
-        } catch (Exception $e) {
+        } catch(Exception $e) {
             throw new \Exception($e->getMessage(), self::EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID);
         }
     }
@@ -760,7 +760,7 @@ 
      */
     public function __destruct()
     {
-        if (!empty($this->curl)) {
+        if(!empty($this->curl)) {
             curl_close($this->curl);
         }
     }

Braces +86 added lines, -38 removed lines

@@ -219,7 +219,8 @@ 
      */
     public function __construct($url = null)
     {
-        if ($url !== null) {
+        if ($url !== null)
+        {
             $this->setUrl($url);
         }
     }
@@ -245,7 +246,8 @@ 
     {
         $this->url = $url;
 
-        if (substr($this->url, -1, 1) !== '/') {
+        if (substr($this->url, -1, 1) !== '/')
+        {
             $this->url = $this->url . '/';
         }
 
@@ -339,9 +341,12 @@ 
         {
             case 200:
             case 207:
-                if ($raw === true) {
+                if ($raw === true)
+                {
                     return $result['response'];
-                } else {
+                }
+                else
+                {
                     return $this->simplify($result['response'], $include_vcards);
                 }
         }
@@ -368,13 +373,13 @@ 
         // print_r($result);
 
 	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. ".";
@@ -458,9 +463,12 @@ 
     {
         $result = $this->query($this->url, 'OPTIONS');
 
-        if ($result['http_code'] === 200) {
+        if ($result['http_code'] === 200)
+        {
             return true;
-        } else {
+        }
+        else
+        {
             return false;
         }
     }
@@ -509,7 +517,8 @@ 
      */
     public function add($vcard, $vcard_id = null)
     {
-        if ($vcard_id === null) {
+        if ($vcard_id === null)
+        {
             $vcard_id   = $this->generateVcardId();
         }
         $vcard  = $this->cleanVcard($vcard);
@@ -536,9 +545,12 @@ 
      */
     public function update($vcard, $vcard_id)
     {
-        try {
+        try
+        {
             return $this->add($vcard, $vcard_id);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e)
+        {
             throw new \Exception($e->getMessage(), self::EXCEPTION_WRONG_HTTP_STATUS_CODE_UPDATE);
         }
     }
@@ -554,9 +566,12 @@ 
     {
         $response = $this->cleanResponse($response);
 
-        try {
+        try
+        {
             $xml = new \SimpleXMLElement($response);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e)
+        {
             throw new \Exception(
                 "The XML response seems to be malformed and can't be simplified!",
                 self::EXCEPTION_MALFORMED_XML_RESPONSE,
@@ -571,35 +586,50 @@ 
         $simplified_xml->startDocument('1.0', 'utf-8');
             $simplified_xml->startElement('response');
 
-        if (!empty($xml->response)) {
-            foreach ($xml->response as $response) {
+        if (!empty($xml->response))
+        {
+            foreach ($xml->response as $response)
+            {
               if ((preg_match('/vcard/', $response->propstat->prop->getcontenttype) || preg_match('/vcf/', $response->href)) &&
-                  !$response->propstat->prop->resourcetype->collection) {
+                  !$response->propstat->prop->resourcetype->collection)
+              {
                     $id = basename($response->href);
                     $id = str_replace($this->url_vcard_extension, null, $id);
 
-                    try {
+                    try
+                    {
                         $vcardData = $this->getVcard($id);
-                        if (!empty($id)) {
+                        if (!empty($id))
+                        {
                             $simplified_xml->startElement('element');
                                 $simplified_xml->writeElement('id', $id);
                                 $simplified_xml->writeElement('etag', str_replace('"', null, $response->propstat->prop->getetag));
                                 $simplified_xml->writeElement('last_modified', $response->propstat->prop->getlastmodified);
 
-                            if ($include_vcards === true) {
+                            if ($include_vcards === true)
+                            {
                                 $simplified_xml->writeElement('vcard', $vcardData);
                             }
                             $simplified_xml->endElement();
                         }
-                    } catch (\Exception $e) {
+                    }
+                    catch (\Exception $e)
+                    {
                         print("Error fetching vCard: {$id}: {$e->getMessage()}\n");
                     }
-                } elseif (preg_match('/unix-directory/', $response->propstat->prop->getcontenttype)) {
-                    if (isset($response->propstat->prop->href)) {
+                }
+                elseif (preg_match('/unix-directory/', $response->propstat->prop->getcontenttype))
+                {
+                    if (isset($response->propstat->prop->href))
+                    {
                         $href = $response->propstat->prop->href;
-                    } elseif (isset($response->href)) {
+                    }
+                    elseif (isset($response->href))
+                    {
                         $href = $response->href;
-                    } else {
+                    }
+                    else
+                    {
                         $href = null;
                     }
 
@@ -643,7 +673,8 @@ 
      */
     public function curlInit()
     {
-        if (empty($this->curl)) {
+        if (empty($this->curl))
+        {
             $this->curl = curl_init();
             curl_setopt($this->curl, CURLOPT_HEADER, true);
             curl_setopt($this->curl, CURLOPT_SSL_VERIFYHOST, false);
@@ -651,7 +682,8 @@ 
             curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
             curl_setopt($this->curl, CURLOPT_USERAGENT, self::USERAGENT.self::VERSION);
 
-            if ($this->auth !== null) {
+            if ($this->auth !== null)
+            {
                 curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
                 curl_setopt($this->curl, CURLOPT_USERPWD, $this->auth);
             }
@@ -681,17 +713,23 @@ 
         curl_setopt($this->curl, CURLOPT_URL, $url);
         curl_setopt($this->curl, CURLOPT_CUSTOMREQUEST, $method);
 
-        if ($content !== null) {
+        if ($content !== null)
+        {
             curl_setopt($this->curl, CURLOPT_POST, true);
             curl_setopt($this->curl, CURLOPT_POSTFIELDS, $content);
-        } else {
+        }
+        else
+        {
             curl_setopt($this->curl, CURLOPT_POST, false);
             curl_setopt($this->curl, CURLOPT_POSTFIELDS, null);
         }
 
-        if ($content_type !== null) {
+        if ($content_type !== null)
+        {
             curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: '.$content_type, 'Depth: 1'));
-        } else {
+        }
+        else
+        {
             curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Depth: 1'));
         }
 
@@ -706,7 +744,8 @@ 
             'http_code'         => $http_code
         );
 
-        if ($this->debug === true) {
+        if ($this->debug === true)
+        {
             $debug = $return;
             $debug['url']           = $url;
             $debug['method']        = $method;
@@ -728,26 +767,34 @@ 
     {
         $vcard_id = null;
 
-        for ($number = 0; $number <= 25; $number ++) {
-            if ($number == 8 || $number == 17) {
+        for ($number = 0; $number <= 25; $number ++)
+        {
+            if ($number == 8 || $number == 17)
+            {
                 $vcard_id .= '-';
-            } else {
+            }
+            else
+            {
                 $vcard_id .= $this->vcard_id_chars[mt_rand(0, (count($this->vcard_id_chars) - 1))];
             }
         }
 
-        try {
+        try
+        {
             $carddav = new CardDavBackend($this->url);
             $carddav->setAuth($this->username, $this->password);
 
             $result = $carddav->query($this->url . $vcard_id . $this->url_vcard_extension, 'GET');
 
-            if ($result['http_code'] !== 404) {
+            if ($result['http_code'] !== 404)
+            {
                 $vcard_id = $this->generateVcardId();
             }
 
             return $vcard_id;
-        } catch (Exception $e) {
+        }
+        catch (Exception $e)
+        {
             throw new \Exception($e->getMessage(), self::EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID);
         }
     }
@@ -760,7 +807,8 @@ 
      */
     public function __destruct()
     {
-        if (!empty($this->curl)) {
+        if (!empty($this->curl))
+        {
             curl_close($this->curl);
         }
     }

lib/fritzbox_api_php/fritzbox_api.class.php

Doc Comments +4 added lines

@@ -533,6 +533,10 @@
    * @param  $item   string  the item to set
    * @param  $value  mixed   the value to store into the item
    */
+
+  /**
+   * @param string $item
+   */
   public function setItem($item, $value)
   {
     $this->config[$item] = $value;

Indentation +145 added lines, -145 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,24 +147,24 @@ 
     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_CAINFO, '/etc/ssl/certs/'.$ssl_cert_fritzbox.'.pem');
-		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_CAINFO, '/etc/ssl/certs/'.$ssl_cert_fritzbox.'.pem');
+    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);
@@ -179,10 +179,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);
@@ -193,30 +193,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);
@@ -224,10 +224,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(
@@ -242,44 +242,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
@@ -319,12 +319,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
@@ -404,9 +404,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 )
@@ -425,10 +425,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);
@@ -436,20 +436,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 )

Spacing +47 added lines, -47 removed lines

@@ -63,39 +63,39 @@ 
     * 
     * @access public
     */
-  public function __construct($password = false,$user_name = false,$fritzbox_ip = 'fritz.box',$force_local_login = false)
+  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();
     
 	// try autoloading the config
-	if (file_exists(__DIR__ . '/fritzbox_user.conf.php') && is_readable(__DIR__ . '/fritzbox_user.conf.php') ) {
+	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);
+	$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'));
+	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);
+		$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);
+		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') ){
+	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');
 		}
 	}
@@ -129,7 +129,7 @@ 
   {
     $ch = curl_init();
 
-    if ( isset($formfields['getpage']) && strpos($formfields['getpage'], '.lua') > 0 )
+    if(isset($formfields['getpage']) && strpos($formfields['getpage'], '.lua') > 0)
     {
       curl_setopt($ch, CURLOPT_URL, $this->config->getItem('fritzbox_url') . $formfields['getpage'] . '?sid=' . $this->sid);
       unset($formfields['getpage']);
@@ -137,7 +137,7 @@ 
     else
     {
       // add the sid, if it is already set
-      if ($this->sid != '0000000000000000')
+      if($this->sid != '0000000000000000')
       {
         $formfields['sid'] = $this->sid;
       }   
@@ -145,10 +145,10 @@ 
     }
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_POST, 1);
-    if ( $this->config->getItem('enable_remote_config') == true )
+    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'),":")){
+		if(strpos($this->config->getItem('fritzbox_ip'), ":")) {
 			$ssl_cert_fritzbox = explode(":", $this->config->getItem('fritzbox_ip'));
 			$ssl_cert_fritzbox = $ssl_cert_fritzbox[0];
 		} else {
@@ -158,11 +158,11 @@ 
 		// 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_CAINFO, '/etc/ssl/certs/'.$ssl_cert_fritzbox.'.pem');
+		curl_setopt($ch, CURLOPT_CAINFO, '/etc/ssl/certs/' . $ssl_cert_fritzbox . '.pem');
 		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')){
+		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'));
 		}
     }
@@ -177,7 +177,7 @@ 
     $ch = curl_init();
    
     // add the sid, if it is already set
-    if ($this->sid != '0000000000000000')
+    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
@@ -192,13 +192,13 @@ 
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     
     // if filefileds not specified ('@/path/to/file.xml;type=text/xml' works fine)
-    if(empty( $filefileds )) {
+    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(
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
 			'Content-Type: multipart/form-data; boundary=' . $header['delimiter'], 'Content-Length: ' . strlen($header['data']) )
 			);
 			
@@ -209,12 +209,12 @@ 
 
 	// curl error
 	if(curl_errno($ch)) {
-		$this->error(curl_error($ch)." (".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]))
+    if(isset($matches[1]))
     {
 		$this->error(str_replace('&nbsp;', ' ', $matches[1]));
     }
@@ -245,7 +245,7 @@ 
 		$data = '';
 
 		// populate normal fields first (simpler)
-		foreach ($postFields as $name => $content) {
+		foreach($postFields as $name => $content) {
 		   $data .= "--" . $delimiter . "\r\n";
 			$data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '"';
 			$data .= "\r\n\r\n";
@@ -253,7 +253,7 @@ 
 			$data .= "\r\n";
 		}
 		// populate file fields
-		foreach ($fileFields as $name => $file) {
+		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) . '";' .
@@ -283,13 +283,13 @@ 
   public function doGetRequest($params = array())
   {
     // add the sid, if it is already set
-    if ($this->sid != '0000000000000000')
+    if($this->sid != '0000000000000000')
     {
       $params['sid'] = $this->sid;
     }    
   
     $ch = curl_init();
-    if ( strpos($params['getpage'], '.lua') > 0 )
+    if(strpos($params['getpage'], '.lua') > 0)
     {
       $getpage = $params['getpage'] . '?';
       unset($params['getpage']);
@@ -301,13 +301,13 @@ 
     curl_setopt($ch, CURLOPT_URL, $this->config->getItem('fritzbox_url') . $getpage . http_build_query($params));
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_HTTPGET, 1);
-    if ( $this->config->getItem('enable_remote_config') )
+    if($this->config->getItem('enable_remote_config'))
     {
       curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
       curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
       // support for pre FRITZ!OS 5.50 remote config
-      if ( !$this->config->getItem('use_lua_login_method') )
+      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'));
       }
@@ -328,7 +328,7 @@ 
   protected function initSID()
   {
     // determine, wich login type we have to use
-    if ( $this->config->getItem('use_lua_login_method') == true )
+    if($this->config->getItem('use_lua_login_method') == true)
     {
       $loginpage = '/login_sid.lua';
     }
@@ -340,13 +340,13 @@ 
     // read the current status
     $session_status_simplexml = simplexml_load_string($this->doGetRequest(array('getpage' => $loginpage)));
     
-    if ( !is_object($session_status_simplexml) || get_class($session_status_simplexml) != 'SimpleXMLElement' )
+    if(!is_object($session_status_simplexml) || get_class($session_status_simplexml) != 'SimpleXMLElement')
     {
       $this->error('Response of initialization call ' . $loginpage . ' in ' . __FUNCTION__ . ' was not xml-formatted.');
     }
     
     // perhaps we already have a SID (i.e. when no password is set)
-    if ( $session_status_simplexml->SID != '0000000000000000' )
+    if($session_status_simplexml->SID != '0000000000000000')
     {
       return $session_status_simplexml->SID;
     }
@@ -360,16 +360,16 @@ 
       $formfields = array(
         'getpage' => $loginpage,
       );
-      if ( $this->config->getItem('use_lua_login_method') )
+      if($this->config->getItem('use_lua_login_method'))
       {
-        if ( $this->config->getItem('enable_remote_config') )
+        if($this->config->getItem('enable_remote_config'))
         {
           $formfields['username'] = $this->config->getItem('remote_config_user');
           $response = $challenge . '-' . md5(mb_convert_encoding($challenge . '-' . $this->config->getItem('remote_config_password'), "UCS-2LE", "UTF-8"));
         }
         else
         {
-          if ( $this->config->getItem('username') )
+          if($this->config->getItem('username'))
           {
             $formfields['username'] = $this->config->getItem('username');
           }
@@ -386,12 +386,12 @@ 
       
       // finger out the SID from the response
       $session_status_simplexml = simplexml_load_string($output);
-      if ( !is_object($session_status_simplexml) || get_class($session_status_simplexml) != 'SimpleXMLElement' )
+      if(!is_object($session_status_simplexml) || get_class($session_status_simplexml) != 'SimpleXMLElement')
       {
         $this->error('Response of login call to ' . $loginpage . ' in ' . __FUNCTION__ . ' was not xml-formatted.');
       }
       
-      if ( $session_status_simplexml->SID != '0000000000000000' )
+      if($session_status_simplexml->SID != '0000000000000000')
       {
         return (string)$session_status_simplexml->SID;
       }
@@ -409,7 +409,7 @@ 
     */
   protected function logout()
   {
-    if ( $this->config->getItem('use_lua_login_method') == true )
+    if($this->config->getItem('use_lua_login_method') == true)
     {
       $this->doGetRequest(array('getpage' => '/home/home.lua', 'logout' => '1'));
     }
@@ -452,22 +452,22 @@ 
     */
   public function logMessage($message)
   {
-    if ( $this->config->getItem('newline') == false )
+    if($this->config->getItem('newline') == false)
     {
       $this->config->setItem('newline', (PHP_OS == 'WINNT') ? "\r\n" : "\n");
     }
   
-    if ( $this->config->getItem('logging') == 'console' )
+    if($this->config->getItem('logging') == 'console')
     {
       echo $message;
     }
-    else if ( $this->config->getItem('logging') == 'silent' || $this->config->getItem('logging') == false )
+    else if($this->config->getItem('logging') == 'silent' || $this->config->getItem('logging') == false)
     {
       // do nothing
     }
     else
     {
-      if ( is_writable($this->config->getItem('logging')) || is_writable(dirname($this->config->getItem('logging'))) )
+      if(is_writable($this->config->getItem('logging')) || is_writable(dirname($this->config->getItem('logging'))))
       {
         file_put_contents($this->config->getItem('logging'), $message . $this->config->getItem('newline'), FILE_APPEND);
       }
@@ -517,11 +517,11 @@ 
    */
   public function getItem($item = 'all')
   {
-    if ( $item == 'all' )
+    if($item == 'all')
     {
       return $this->config;
     }
-    elseif ( isset($this->config[$item]) )
+    elseif(isset($this->config[$item]))
     {
       return $this->config[$item];
     }

Braces +41 added lines, -20 removed lines

@@ -46,7 +46,8 @@ 
  * the main Fritz!Box API class
  *
  */
-class fritzbox_api {
+class fritzbox_api
+{
   /**
     * @var  object  config object
     */
@@ -69,7 +70,8 @@ 
 	$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') ) {
+	if (file_exists(__DIR__ . '/fritzbox_user.conf.php') && is_readable(__DIR__ . '/fritzbox_user.conf.php') )
+	{
 		require_once(__DIR__ . '/fritzbox_user.conf.php');
 	}
 
@@ -77,29 +79,37 @@ 
 	$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) {
+	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 {
+	}
+	else
+	{
 		$this->config->setItem('enable_remote_config',false);
-		if($user_name != false){
+		if($user_name != false)
+		{
 			$this->config->setItem('username',$user_name);
 		}
-		if($password != false){
+		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') ){
+	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 {
+	else
+	{
 		$this->config->setItem('old_remote_config_user', null);
 		$this->config->setItem('old_remote_config_password', null);
 	}
@@ -148,10 +158,13 @@ 
     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'),":")){
+		if (strpos($this->config->getItem('fritzbox_ip'),":"))
+		{
 			$ssl_cert_fritzbox = explode(":", $this->config->getItem('fritzbox_ip'));
 			$ssl_cert_fritzbox = $ssl_cert_fritzbox[0];
-		} else {
+		}
+		else
+		{
 			$ssl_cert_fritzbox = $this->config->getItem('fritzbox_ip');
 		}
 
@@ -162,7 +175,8 @@ 
 		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')){
+		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'));
 		}
     }
@@ -173,7 +187,7 @@ 
   }
 
   public function doPostFile($formfields = array(), $filefileds = array())
-  {  
+  {
     $ch = curl_init();
    
     // add the sid, if it is already set
@@ -192,11 +206,13 @@ 
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     
     // if filefileds not specified ('@/path/to/file.xml;type=text/xml' works fine)
-    if(empty( $filefileds )) {
+    if(empty( $filefileds ))
+    {
 		curl_setopt($ch, CURLOPT_POSTFIELDS, $formfields); // http_build_query
 	} 
 	// post calculated raw data
-	else {
+	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']) )
@@ -208,7 +224,8 @@ 
     $output = curl_exec($ch);
 
 	// curl error
-	if(curl_errno($ch)) {
+	if(curl_errno($ch))
+	{
 		$this->error(curl_error($ch)." (".curl_errno($ch).")");
 	}
 
@@ -223,7 +240,8 @@ 
     return $output;
   }
 
-  private function _create_custom_file_post_header($postFields, $fileFields) {
+  private function _create_custom_file_post_header($postFields, $fileFields)
+  {
 		// form field separator
 		$delimiter = '-------------' . uniqid();
 		
@@ -245,7 +263,8 @@ 
 		$data = '';
 
 		// populate normal fields first (simpler)
-		foreach ($postFields as $name => $content) {
+		foreach ($postFields as $name => $content)
+		{
 		   $data .= "--" . $delimiter . "\r\n";
 			$data .= 'Content-Disposition: form-data; name="' . urlencode($name) . '"';
 			$data .= "\r\n\r\n";
@@ -253,7 +272,8 @@ 
 			$data .= "\r\n";
 		}
 		// populate file fields
-		foreach ($fileFields as $name => $file) {
+		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) . '";' .
@@ -479,7 +499,8 @@ 
   }
 }
 
-class fritzbox_api_config {
+class fritzbox_api_config
+{
   protected $config = array();
 
   public function __construct()

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 )
   {

Spacing +12 added lines, -12 removed lines

@@ -23,13 +23,13 @@ 
   $message = date('Y-m-d H:i') . ' ';
 
   // handle the CLI arguments or give a help message
-  if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
+  if(isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1))
   {
     $mode = (bool)$argv[1];
   }
   else
   {
-    if ( $fritz->config->getItem('logging') == 'console' )
+    if($fritz->config->getItem('logging') == 'console')
     {
       echo '
   Enables or disables the LAN4 guest access of a Fritz!Box
@@ -61,7 +61,7 @@ 
   
   // read time_server_activ setting
   preg_match('@name="time_server_activ"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['time_server_activ'] = 'on';
   }
@@ -70,19 +70,19 @@ 
   $formfields['time_server'] = isset($matches[1]) ? $matches[1] : '0.europe.pool.ntp.org';
   // read other_prefix_allowed setting
   preg_match('@name="other_prefix_allowed"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['other_prefix_allowed'] = 'on';
   }
   // read dnsv6_server_activ setting
   preg_match('@name="dnsv6_server_activ"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['dnsv6_server_activ'] = 'on';
   }
   
   // set new given setting
-  if ( $mode == true )
+  if($mode == true)
   {
     $formfields['guest_enabled'] = 'on';
   }
@@ -92,30 +92,30 @@ 
   $output = $fritz->doPostForm($formfields);
 
   preg_match('@name="guest_enabled"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) && $mode == true )
+  if(isset($matches[1]) && $mode == true)
   {
 		$message .= 'LAN4 guest access is now active.';
   }
-  else if ( !isset($matches[1]) && $mode == false )
+  else if(!isset($matches[1]) && $mode == false)
   {
     $message .= 'LAN4 guest access is now inactive.';
   }
-  else if ( isset($matches[1]) && $mode == false )
+  else if(isset($matches[1]) && $mode == false)
   {
     $message .= 'ERROR: LAN4 guest access status change failed, should be inactive, but is still active.';
   }
-  else if ( !isset($matches[1]) && $mode == true )
+  else if(!isset($matches[1]) && $mode == true)
   {
     $message .= 'ERROR: LAN4 guest access status change failed, should be active, but is still inactive.';
   }
 }
-catch (Exception $e)
+catch(Exception $e)
 {
   $message .= $e->getMessage();
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if(isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }

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);

Spacing +2 added lines, -2 removed lines

@@ -38,13 +38,13 @@
   // this is based on 1 => 1, 2 => 10, 3 => 11, 4 => 100, 5 => 101, 6 => 110, 7 => 111
   $fritz->doPostForm($formfields);
 }
-catch (Exception $e)
+catch(Exception $e)
 {
   $message .= $e->getMessage();
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if(isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }

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 )
   {

Spacing +13 added lines, -13 removed lines

@@ -22,13 +22,13 @@ 
   $message = date('Y-m-d H:i') . ' ';
 
   // handle the CLI arguments or give a help message
-  if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
+  if(isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1))
   {
     $mode = (bool)$argv[1];
   }
   else
   {
-    if ( $fritz->config->getItem('logging') == 'console' )
+    if($fritz->config->getItem('logging') == 'console')
     {
       echo '
   Enables or disables the WLAN guest access of a Fritz!Box
@@ -63,7 +63,7 @@ 
   
   // read down_time_activ setting
   preg_match('@name="down_time_activ"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['down_time_activ'] = 'on';
   }
@@ -72,7 +72,7 @@ 
   $formfields['down_time_value'] = isset($matches[1]) ? $matches[1] : '15';
   // read disconnect_guest_access setting
   preg_match('@name="disconnect_guest_access"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) )
+  if(isset($matches[1]))
   {
     $formfields['disconnect_guest_access'] = 'on';
   }
@@ -90,10 +90,10 @@ 
   $formfields['wpa_modus'] = isset($matches[1]) ? $matches[1] : 'x';
   
   // set new given setting
-  if ( $mode == true )
+  if($mode == true)
   {
     $formfields['activate_guest_access'] = 'on';
-    if ( $wpa_key !== false )
+    if($wpa_key !== false)
     {
       $formfields['wpa_key'] = $wpa_key;
     }
@@ -104,34 +104,34 @@ 
   $output = $fritz->doPostForm($formfields);
 
   preg_match('@name="activate_guest_access"[^>]+(checked)[^>]*@', $output, $matches);
-  if ( isset($matches[1]) && $mode == true )
+  if(isset($matches[1]) && $mode == true)
   {
 		preg_match('@name="wpa_key"[^>]+value="([^"]*)"[^>]*@', $output, $matches);
-		if ( isset($matches[1]) )
+		if(isset($matches[1]))
 		{
 			$message .= 'WLAN guest access is now active. WPA-Key is "' . $matches[1] . '"';
 		}
   }
-  else if ( !isset($matches[1]) && $mode == false )
+  else if(!isset($matches[1]) && $mode == false)
   {
     $message .= 'WLAN guest access is now inactive.';
   }
-  else if ( isset($matches[1]) && $mode == false )
+  else if(isset($matches[1]) && $mode == false)
   {
     $message .= 'ERROR: WLAN guest access status change failed, should be inactive, but is still active.';
   }
-  else if ( !isset($matches[1]) && $mode == true )
+  else if(!isset($matches[1]) && $mode == true)
   {
     $message .= 'ERROR: WLAN guest access status change failed, should be active, but is still inactive.';
   }
 }
-catch (Exception $e)
+catch(Exception $e)
 {
   $message .= $e->getMessage();
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if(isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }

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);
+    }
+  }
 ?>

Spacing +77 added lines, -77 removed lines

@@ -18,7 +18,7 @@ 
 		/**
 		 * @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 $Mode; //single, multiple, error
 
 		private $Path = '';
 		private $RawData = '';
@@ -75,17 +75,17 @@ 
 			// 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($Path)
 			{
-				if (!is_readable($Path))
+				if(!is_readable($Path))
 				{
-					throw new Exception('vCard: Path not accessible ('.$Path.')');
+					throw new Exception('vCard: Path not accessible (' . $Path . ')');
 				}
 
 				$this -> Path = $Path;
 				$this -> RawData = file_get_contents($this -> Path);
 			}
-			elseif ($RawData)
+			elseif($RawData)
 			{
 				$this -> RawData = $RawData;
 			}
@@ -95,12 +95,12 @@ 
 				// Not necessary anymore as possibility to create vCards is added
 			}
 
-			if (!$this -> Path && !$this -> RawData)
+			if(!$this -> Path && !$this -> RawData)
 			{
 				return true;
 			}
 
-			if ($Options)
+			if($Options)
 			{
 				$this -> Options = array_merge($this -> Options, $Options);
 			}
@@ -111,7 +111,7 @@ 
 			$vCardBeginCount = preg_match_all('{^BEGIN\:VCARD}miS', $this -> RawData, $Matches);
 			$vCardEndCount = preg_match_all('{^END\:VCARD}miS', $this -> RawData, $Matches);
 
-			if (($vCardBeginCount != $vCardEndCount) || !$vCardBeginCount)
+			if(($vCardBeginCount != $vCardEndCount) || !$vCardBeginCount)
 			{
 				$this -> Mode = vCard::MODE_ERROR;
 				throw new Exception('vCard: invalid vCard');
@@ -125,16 +125,16 @@ 
 
 			// 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)
+			if($this -> Mode == self::MODE_MULTIPLE)
 			{
 				$this -> RawData = explode('BEGIN:VCARD', $this -> RawData);
 				$this -> RawData = array_filter($this -> RawData);
 
-				foreach ($this -> RawData as $SinglevCardRawData)
+				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;
+					$SinglevCardRawData = 'BEGIN:VCARD' . "\n" . $SinglevCardRawData;
 
 					$ClassName = get_class($this);
 					$this -> Data[] = new $ClassName(false, $SinglevCardRawData);
@@ -157,10 +157,10 @@ 
 
 				$Lines = explode("\n", $this -> RawData);
 
-				foreach ($Lines as $Line)
+				foreach($Lines as $Line)
 				{
 					// Lines without colons are skipped because, most likely, they contain no data.
-					if (strpos($Line, ':') === false)
+					if(strpos($Line, ':') === false)
 					{
 						continue;
 					}
@@ -175,16 +175,16 @@ 
 					$Key = strtolower(trim(self::Unescape($Key)));
 
 					// These two lines can be skipped as they aren't necessary at all.
-					if ($Key == 'begin' || $Key == 'end')
+					if($Key == 'begin' || $Key == 'end')
 					{
 						continue;
 					}
 
-					if ((strpos($Key, 'agent') === 0) && (stripos($Value, 'begin:vcard') !== false))
+					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]))
+						if(!isset($this -> Data[$Key]))
 						{
 							$this -> Data[$Key] = array();
 						}
@@ -204,34 +204,34 @@ 
 					$Key = $KeyParts[0];
 					$Encoding = false;
 
-					if (strpos($Key, 'item') === 0)
+					if(strpos($Key, 'item') === 0)
 					{
 						$TmpKey = explode('.', $Key, 2);
 						$Key = $TmpKey[1];
 						$ItemIndex = (int)str_ireplace('item', '', $TmpKey[0]);
 					}
 
-					if (count($KeyParts) > 1)
+					if(count($KeyParts) > 1)
 					{
 						$Parameters = self::ParseParameters($Key, array_slice($KeyParts, 1));
 
-						foreach ($Parameters as $ParamKey => $ParamValue)
+						foreach($Parameters as $ParamKey => $ParamValue)
 						{
-							switch ($ParamKey)
+							switch($ParamKey)
 							{
 								case 'encoding':
 									$Encoding = $ParamValue;
-									if (in_array($ParamValue, array('b', 'base64')))
+									if(in_array($ParamValue, array('b', 'base64')))
 									{
 										//$Value = base64_decode($Value);
 									}
-									elseif ($ParamValue == 'quoted-printable') // v2.1
+									elseif($ParamValue == 'quoted-printable') // v2.1
 									{
 										$Value = quoted_printable_decode($Value);
 									}
 									break;
 								case 'charset': // v2.1
-									if ($ParamValue != 'utf-8' && $ParamValue != 'utf8')
+									if($ParamValue != 'utf-8' && $ParamValue != 'utf8')
 									{
 										$Value = mb_convert_encoding($Value, 'UTF-8', $ParamValue);
 									}
@@ -244,11 +244,11 @@ 
 					}
 
 					// 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(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)
+						if(strpos($Value, ':') !== false)
 						{
 							$Value = explode(':', $Value);
 							$Value = array_pop($Value);
@@ -256,22 +256,22 @@ 
 					}
 
 					// Values are parsed according to their type
-					if (isset(self::$Spec_StructuredElements[$Key]))
+					if(isset(self::$Spec_StructuredElements[$Key]))
 					{
 						$Value = self::ParseStructuredValue($Value, $Key);
-						if ($Type)
+						if($Type)
 						{
 							$Value['type'] = $Type;
 						}
 					}
 					else
 					{
-						if (in_array($Key, self::$Spec_MultipleValueElements))
+						if(in_array($Key, self::$Spec_MultipleValueElements))
 						{
 							$Value = self::ParseMultipleTextValue($Value, $Key);
 						}
 
-						if ($Type)
+						if($Type)
 						{
 							$Value = array(
 								'value' => $Value,
@@ -280,12 +280,12 @@ 
 						}
 					}
 
-					if (is_array($Value) && $Encoding)
+					if(is_array($Value) && $Encoding)
 					{
 						$Value['encoding'] = $Encoding;
 					}
 
-					if (!isset($this -> Data[$Key]))
+					if(!isset($this -> Data[$Key]))
 					{
 						$this -> Data[$Key] = array();
 					}
@@ -306,18 +306,18 @@ 
 		public function __get($Key)
 		{
 			$Key = strtolower($Key);
-			if (isset($this -> Data[$Key]))
+			if(isset($this -> Data[$Key]))
 			{
-				if ($Key == 'agent')
+				if($Key == 'agent')
 				{
 					return $this -> Data[$Key];
 				}
-				elseif (in_array($Key, self::$Spec_FileElements))
+				elseif(in_array($Key, self::$Spec_FileElements))
 				{
 					$Value = $this -> Data[$Key];
-					foreach ($Value as $K => $V)
+					foreach($Value as $K => $V)
 					{
-						if (stripos($V['value'], 'uri:') === 0)
+						if(stripos($V['value'], 'uri:') === 0)
 						{
 							$Value[$K]['value'] = substr($V, 4);
 							$Value[$K]['encoding'] = 'uri';
@@ -326,13 +326,13 @@ 
 					return $Value;
 				}
 
-				if ($this -> Options['Collapse'] && is_array($this -> Data[$Key]) && (count($this -> Data[$Key]) == 1))
+				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')
+			elseif($Key == 'Mode')
 			{
 				return $this -> Mode;
 			}
@@ -350,25 +350,25 @@ 
 		 */
 		public function SaveFile($Key, $Index = 0, $TargetPath = '')
 		{
-			if (!isset($this -> Data[$Key]))
+			if(!isset($this -> Data[$Key]))
 			{
 				return false;
 			}
-			if (!isset($this -> Data[$Key][$Index]))
+			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)
+			if(stripos($this -> Data[$Key][$Index]['value'], 'uri:') === 0)
 			{
 				return false;
 			}
 
-			if (is_writable($TargetPath) || (!file_exists($TargetPath) && is_writable(dirname($TargetPath))))
+			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')
+				if(isset($this -> Data[$Key][$Index]['encoding']) && $this -> Data[$Key][$Index]['encoding'] == 'b')
 				{
 					$RawContent = base64_decode($RawContent);
 				}
@@ -377,7 +377,7 @@ 
 			}
 			else
 			{
-				throw new Exception('vCard: Cannot save file ('.$Key.'), target path not writable ('.$TargetPath.')');
+				throw new Exception('vCard: Cannot save file (' . $Key . '), target path not writable (' . $TargetPath . ')');
 			}
 			return false;
 		}
@@ -394,31 +394,31 @@ 
 		{
 			$Key = strtolower($Key);
 
-			if (!isset($this -> Data[$Key]))
+			if(!isset($this -> Data[$Key]))
 			{
 				$this -> Data[$Key] = array();
 			}
 
 			$Value = isset($Arguments[0]) ? $Arguments[0] : false;
 
-			if (count($Arguments) > 1)
+			if(count($Arguments) > 1)
 			{
 				$Types = array_map('strtolower', array_values(array_slice($Arguments, 1)));
 
-				if (isset(self::$Spec_StructuredElements[$Key]) &&
+				if(isset(self::$Spec_StructuredElements[$Key]) &&
 					in_array(strtolower($Arguments[1]), self::$Spec_StructuredElements[$Key])
 				)
 				{
 					$LastElementIndex = 0;
 
-					if (count($this -> Data[$Key]))
+					if(count($this -> Data[$Key]))
 					{
 						$LastElementIndex = count($this -> Data[$Key]) - 1;
 					}
 
-					if (isset($this -> Data[$Key][$LastElementIndex]))
+					if(isset($this -> Data[$Key][$LastElementIndex]))
 					{
-						if (empty($this -> Data[$Key][$LastElementIndex][$Types[0]]))
+						if(empty($this -> Data[$Key][$LastElementIndex][$Types[0]]))
 						{
 							$this -> Data[$Key][$LastElementIndex][$Types[0]] = $Value;
 						}
@@ -428,14 +428,14 @@ 
 						}
 					}
 
-					if (!isset($this -> Data[$Key][$LastElementIndex]))
+					if(!isset($this -> Data[$Key][$LastElementIndex]))
 					{
 						$this -> Data[$Key][$LastElementIndex] = array(
 							$Types[0] => $Value
 						);
 					}
 				}
-				elseif (isset(self::$Spec_ElementTypes[$Key]))
+				elseif(isset(self::$Spec_ElementTypes[$Key]))
 				{
 					$this -> Data[$Key][] = array(
 						'value' => $Value,
@@ -443,7 +443,7 @@ 
 					);
 				}
 			}
-			elseif ($Value)
+			elseif($Value)
 			{
 				$this -> Data[$Key][] = $Value;
 			}
@@ -458,38 +458,38 @@ 
 		 */
 		public function __toString()
 		{
-			$Text = 'BEGIN:VCARD'.self::endl;
-			$Text .= 'VERSION:3.0'.self::endl;
+			$Text = 'BEGIN:VCARD' . self::endl;
+			$Text .= 'VERSION:3.0' . self::endl;
 
-			foreach ($this -> Data as $Key => $Values)
+			foreach($this -> Data as $Key => $Values)
 			{
 				$KeyUC = strtoupper($Key);
 				$Key = strtolower($Key);
 
-				if (in_array($KeyUC, array('PHOTO', 'VERSION')))
+				if(in_array($KeyUC, array('PHOTO', 'VERSION')))
 				{
 					continue;
 				}
 
-				foreach ($Values as $Index => $Value)
+				foreach($Values as $Index => $Value)
 				{
 					$Text .= $KeyUC;
-					if (is_array($Value) && isset($Value['type']))
+					if(is_array($Value) && isset($Value['type']))
 					{
-						$Text .= ';TYPE='.self::PrepareTypeStrForOutput($Value['type']);
+						$Text .= ';TYPE=' . self::PrepareTypeStrForOutput($Value['type']);
 					}
 					$Text .= ':';
 
-					if (isset(self::$Spec_StructuredElements[$Key]))
+					if(isset(self::$Spec_StructuredElements[$Key]))
 					{
 						$PartArray = array();
-						foreach (self::$Spec_StructuredElements[$Key] as $Part)
+						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]))
+					elseif(is_array($Value) && isset(self::$Spec_ElementTypes[$Key]))
 					{
 						$Text .= $Value['value'];
 					}
@@ -502,7 +502,7 @@ 
 				}
 			}
 
-			$Text .= 'END:VCARD'.self::endl;
+			$Text .= 'END:VCARD' . self::endl;
 			return $Text;
 		}
 
@@ -544,7 +544,7 @@ 
 			$Result = array();
 			$Ctr = 0;
 
-			foreach (self::$Spec_StructuredElements[$Key] as $Index => $StructurePart)
+			foreach(self::$Spec_StructuredElements[$Key] as $Index => $StructurePart)
 			{
 				$Result[$StructurePart] = isset($Text[$Index]) ? $Text[$Index] : null;
 			}
@@ -564,14 +564,14 @@ 
 		 */
 		private static function ParseParameters($Key, array $RawParams = null)
 		{
-			if (!$RawParams)
+			if(!$RawParams)
 			{
 				return array();
 			}
 
 			// Parameters are split into (key, value) pairs
 			$Parameters = array();
-			foreach ($RawParams as $Item)
+			foreach($RawParams as $Item)
 			{
 				$Parameters[] = explode('=', strtolower($Item));
 			}
@@ -580,20 +580,20 @@ 
 			$Result = array();
 
 			// And each parameter is checked whether anything can/should be done because of it
-			foreach ($Parameters as $Index => $Parameter)
+			foreach($Parameters as $Index => $Parameter)
 			{
 				// Skipping empty elements
-				if (!$Parameter)
+				if(!$Parameter)
 				{
 					continue;
 				}
 
 				// Handling type parameters without the explicit TYPE parameter name (2.1 valid)
-				if (count($Parameter) == 1)
+				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 (
+					if(
 						(isset(self::$Spec_ElementTypes[$Key]) && in_array($Parameter[0], self::$Spec_ElementTypes[$Key])) ||
 						($Key == 'email' && is_scalar($Parameter[0]))
 					)
@@ -601,12 +601,12 @@ 
 						$Type[] = $Parameter[0];
 					}
 				}
-				elseif (count($Parameter) > 2)
+				elseif(count($Parameter) > 2)
 				{
 					if(count(explode(',', $RawParams[$Index], -1)) > 0)
 					{
 						$TempTypeParams = self::ParseParameters($Key, explode(',', $RawParams[$Index]));
-						if ($TempTypeParams['type'])
+						if($TempTypeParams['type'])
 						{
 							$Type = array_merge($Type, $TempTypeParams['type']);
 						}
@@ -614,10 +614,10 @@ 
 				}
 				else
 				{
-					switch ($Parameter[0])
+					switch($Parameter[0])
 					{
 						case 'encoding':
-							if (in_array($Parameter[1], array('quoted-printable', 'b', 'base64')))
+							if(in_array($Parameter[1], array('quoted-printable', 'b', 'base64')))
 							{
 								$Result['encoding'] = $Parameter[1] == 'base64' ? 'b' : $Parameter[1];
 							}
@@ -629,7 +629,7 @@ 
 							$Type = array_merge($Type, explode(',', $Parameter[1]));
 							break;
 						case 'value':
-							if (strtolower($Parameter[1]) == 'url')
+							if(strtolower($Parameter[1]) == 'url')
 							{
 								$Result['encoding'] = 'uri';
 							}
@@ -648,7 +648,7 @@ 
 		// Countable interface
 		public function count()
 		{
-			switch ($this -> Mode)
+			switch($this -> Mode)
 			{
 				case self::MODE_ERROR:
 					return 0;

Braces +6 added lines, -5 removed lines

@@ -225,10 +225,13 @@ 
 									{
 										//$Value = base64_decode($Value);
 									}
-									elseif ($ParamValue == 'quoted-printable') // v2.1
+									elseif ($ParamValue == 'quoted-printable')
+									{
+									  // v2.1
 									{
 										$Value = quoted_printable_decode($Value);
 									}
+									}
 									break;
 								case 'charset': // v2.1
 									if ($ParamValue != 'utf-8' && $ParamValue != 'utf8')
@@ -407,8 +410,7 @@ 
 
 				if (isset(self::$Spec_StructuredElements[$Key]) &&
 					in_array(strtolower($Arguments[1]), self::$Spec_StructuredElements[$Key])
-				)
-				{
+				) {
 					$LastElementIndex = 0;
 
 					if (count($this -> Data[$Key]))
@@ -596,8 +598,7 @@ 
 					if (
 						(isset(self::$Spec_ElementTypes[$Key]) && in_array($Parameter[0], self::$Spec_ElementTypes[$Key])) ||
 						($Key == 'email' && is_scalar($Parameter[0]))
-					)
-					{
+					) {
 						$Type[] = $Parameter[0];
 					}
 				}

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

Spacing +1 added lines, -1 removed lines

@@ -16,5 +16,5 @@
 
 	//$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>

Spacing +49 added lines, -50 removed lines

@@ -34,19 +34,19 @@ 
 	 */
 	function OutputvCard(vCard $vCard)
 	{
-		echo '<h2>'.$vCard -> FN[0].'</h2>';
+		echo '<h2>' . $vCard -> FN[0] . '</h2>';
 
-		if ($vCard -> PHOTO)
+		if($vCard -> PHOTO)
 		{
-			foreach ($vCard -> PHOTO as $Photo)
+			foreach($vCard -> PHOTO as $Photo)
 			{
-				if ($Photo['encoding'] == 'b')
+				if($Photo['encoding'] == 'b')
 				{
-					echo '<img src="data:image/'.$Photo['type'][0].';base64,'.$Photo['value'].'" /><br />';
+					echo '<img src="data:image/' . $Photo['type'][0] . ';base64,' . $Photo['value'] . '" /><br />';
 				}
 				else
 				{
-					echo '<img src="'.$Photo['value'].'" /><br />';
+					echo '<img src="' . $Photo['value'] . '" /><br />';
 				}
 
 				/*
@@ -67,114 +67,113 @@ 
 			}
 		}
 
-		foreach ($vCard -> N as $Name)
+		foreach($vCard -> N as $Name)
 		{
-			echo '<h3>Name: '.$Name['firstname'].' '.$Name['lastname'].'</h3>';
+			echo '<h3>Name: ' . $Name['firstname'] . ' ' . $Name['lastname'] . '</h3>';
 		}
 
-		foreach ($vCard -> ORG as $Organization)
+		foreach($vCard -> ORG as $Organization)
 		{
-			echo '<h3>Organization: '.$Organization['name'].
+			echo '<h3>Organization: ' . $Organization['name'] .
 				($Organization['unit1'] || $Organization['unit2'] ?
-					' ('.implode(', ', array($Organization['unit1'], $Organization['unit2'])).')' :
-					''
-				).'</h3>';
+					' (' . implode(', ', array($Organization['unit1'], $Organization['unit2'])) . ')' : ''
+				) . '</h3>';
 		}
 
-		if ($vCard -> TEL)
+		if($vCard -> TEL)
 		{
 			echo '<p><h4>Phone</h4>';
-			foreach ($vCard -> TEL as $Tel)
+			foreach($vCard -> TEL as $Tel)
 			{
-				if (is_scalar($Tel))
+				if(is_scalar($Tel))
 				{
-					echo $Tel.'<br />';
+					echo $Tel . '<br />';
 				}
 				else
 				{
-					echo $Tel['value'].' ('.implode(', ', $Tel['type']).')<br />';
+					echo $Tel['value'] . ' (' . implode(', ', $Tel['type']) . ')<br />';
 				}
 			}
 			echo '</p>';
 		}
 
-		if ($vCard -> EMAIL)
+		if($vCard -> EMAIL)
 		{
 			echo '<p><h4>Email</h4>';
-			foreach ($vCard -> EMAIL as $Email)
+			foreach($vCard -> EMAIL as $Email)
 			{
-				if (is_scalar($Email))
+				if(is_scalar($Email))
 				{
 					echo $Email;
 				}
 				else
 				{
-					echo $Email['value'].' ('.implode(', ', $Email['type']).')<br />';
+					echo $Email['value'] . ' (' . implode(', ', $Email['type']) . ')<br />';
 				}
 			}
 			echo '</p>';
 		}
 
-		if ($vCard -> URL)
+		if($vCard -> URL)
 		{
 			echo '<p><h4>URL</h4>';
-			foreach ($vCard -> URL as $URL)
+			foreach($vCard -> URL as $URL)
 			{
-				if (is_scalar($URL))
+				if(is_scalar($URL))
 				{
-					echo $URL.'<br />';
+					echo $URL . '<br />';
 				}
 				else
 				{
-					echo $URL['value'].'<br />';
+					echo $URL['value'] . '<br />';
 				}
 			}
 			echo '</p>';
 		}
 
-		if ($vCard -> IMPP)
+		if($vCard -> IMPP)
 		{
 			echo '<p><h4>Instant messaging</h4>';
-			foreach ($vCard -> IMPP as $IMPP)
+			foreach($vCard -> IMPP as $IMPP)
 			{
-				if (is_scalar($IMPP))
+				if(is_scalar($IMPP))
 				{
-					echo $IMPP.'<br />';
+					echo $IMPP . '<br />';
 				}
 				else
 				{
-					echo $IMPP['value'].'<br/ >';
+					echo $IMPP['value'] . '<br/ >';
 				}
 			}
 			echo '</p>';
 		}
 
-		if ($vCard -> ADR)
+		if($vCard -> ADR)
 		{
-			foreach ($vCard -> ADR as $Address)
+			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><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)
+		if($vCard -> AGENT)
 		{
 			echo '<h4>Agents</h4>';
-			foreach ($vCard -> AGENT as $Agent)
+			foreach($vCard -> AGENT as $Agent)
 			{
-				if (is_scalar($Agent))
+				if(is_scalar($Agent))
 				{
-					echo '<div class="Agent">'.$Agent.'</div>';
+					echo '<div class="Agent">' . $Agent . '</div>';
 				}
-				elseif (is_a($Agent, 'vCard'))
+				elseif(is_a($Agent, 'vCard'))
 				{
 					echo '<div class="Agent">';
 					OutputvCard($Agent);
@@ -194,19 +193,19 @@ 
 		)
 	);
 
-	if (count($vCard) == 0)
+	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)
+	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)
+		foreach($vCard as $Index => $vCardPart)
 		{
 			OutputvCard($vCardPart);
 		}

carddav2fb.php

Doc Comments +7 added lines

@@ -133,6 +133,9 @@ 
     return $path;
   }
 
+  /**
+   * @param string $dir
+   */
   public function rmtemp($dir)
   {
     if(is_dir($dir))
@@ -177,6 +180,10 @@ 
     }
   }
 
+  /**
+   * @param string $inputfile
+   * @param string $outputfile
+   */
   public function base64_to_jpeg($inputfile, $outputfile)
   {
     // read data (binary)

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

Spacing +4 added lines, -4 removed lines

@@ -660,7 +660,7 @@ 
     if(array_key_exists('output_file', $this->config))
     {
       // build md5 hash of previous stored xml without <mod_time> Elements
-      $oldphonebhash = md5(preg_replace("/<mod_time>(\\d{10})/","",file_get_contents($this->config['output_file'],'r'),-1,$debugoldtsreplace));
+      $oldphonebhash = md5(preg_replace("/<mod_time>(\\d{10})/", "", file_get_contents($this->config['output_file'], 'r'), -1, $debugoldtsreplace));
       $output = fopen($this->config['output_file'], 'w');
       if($output)
       {
@@ -668,13 +668,13 @@ 
         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'])
+	  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));
+	  	$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;
+      	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

Braces +215 added lines, -96 removed lines

@@ -38,9 +38,12 @@ 
 require_once('lib/fritzbox_api_php/fritzbox_api.class.php');
 
 if($argc == 2)
+{
   $config_file_name = $argv[1];
-else
+}
+else {
   $config_file_name = __DIR__ . '/config.php';
+}
 
 // default/fallback config options
 $config['tmp_dir'] = sys_get_temp_dir();
@@ -60,7 +63,9 @@ 
 $config['quickdial_keyword'] = 'Quickdial:';
 
 if(is_file($config_file_name))
+{
   require($config_file_name);
+}
 else
 {
   print 'ERROR: No ' . $config_file_name . ' found, please take a look at config.example.php and create a ' . $config_file_name . ' file!' . PHP_EOL;
@@ -122,7 +127,9 @@ 
   public function mktemp($dir, $prefix = '', $mode = 0700)
   {
     if(substr($dir, -1) != '/')
-      $dir .= '/';
+    {
+          $dir .= '/';
+    }
 
     do
     {
@@ -143,7 +150,12 @@ 
         if($object != "." && $object != "..")
         {
           if(filetype($dir . "/" . $object) == "dir")
-            rrmdir($dir . "/" . $object); else unlink($dir . "/" . $object);
+          {
+                      rrmdir($dir . "/" . $object);
+          }
+          else {
+              unlink($dir . "/" . $object);
+            }
         }
       }
       reset($objects);
@@ -157,18 +169,25 @@ 
     {
       // Check if there are valid base64 characters
       if(!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str))
-        return false;
+      {
+              return false;
+      }
 
       // Decode the string in strict mode and check the results
       $decoded = base64_decode($str, true);
       if($decoded === false)
-        return false;
+      {
+              return false;
+      }
 
       // Encode the string again
       if(base64_encode($decoded) === $str)
-        return true;
-      else
-        return false;
+      {
+              return true;
+      }
+      else {
+              return false;
+      }
     }
     catch(Exception $e)
     {
@@ -209,7 +228,9 @@ 
         // set the vcard extension in case the user
         // defined it in the config
         if(isset($conf['extension']))
-          $carddav->setVcardExtension($conf['extension']);
+        {
+                  $carddav->setVcardExtension($conf['extension']);
+        }
 
         // retrieve data from the CardDAV server now
         $xmldata = $carddav->get();
@@ -218,7 +239,9 @@ 
         // CardDAV server and if not reencode it since the FRITZ!Box
         // requires UTF-8 encoded data
         if(iconv('utf-8', 'utf-8//IGNORE', $xmldata) != $xmldata)
-          $xmldata = utf8_encode($xmldata);
+        {
+                  $xmldata = utf8_encode($xmldata);
+        }
 
         // read raw_vcard data from xml response
         $raw_vcards = array();
@@ -240,10 +263,14 @@ 
           $vcard_obj = new vCard(false, $v);
           $name_arr = null;
           if(isset($vcard_obj->n[0]))
-            $name_arr = $vcard_obj->n[0];
+          {
+                      $name_arr = $vcard_obj->n[0];
+          }
           $org_arr = null;
           if(isset($vcard_obj->org[0]))
-            $org_arr = $vcard_obj->org[0];
+          {
+                      $org_arr = $vcard_obj->org[0];
+          }
           $addnames = '';
           $prefix = '';
           $suffix = '';
@@ -251,16 +278,24 @@ 
 
           // Build name Parts if existing ans switch to true in config
           if(isset($name_arr['prefixes']) and $this->config['prefix'])
-            $prefix = trim($name_arr['prefixes']);
+          {
+                      $prefix = trim($name_arr['prefixes']);
+          }
 
           if(isset($name_arr['suffixes']) and $this->config['suffix'])
-            $suffix = trim($name_arr['suffixes']);
+          {
+                      $suffix = trim($name_arr['suffixes']);
+          }
 
           if(isset($name_arr['additionalnames']) and $this->config['addnames'])
-            $addnames = trim($name_arr['additionalnames']);
+          {
+                      $addnames = trim($name_arr['additionalnames']);
+          }
 
           if(isset($org_arr['name']) and $this->config['orgname'])
-            $orgname = trim($org_arr['name']);
+          {
+                      $orgname = trim($org_arr['name']);
+          }
 
           $firstname = trim($name_arr['firstname']);
           $lastname = trim($name_arr['lastname']);
@@ -280,71 +315,97 @@ 
 
           // Prefix
           if(!empty($prefix))
-            $name .= $prefix;
+          {
+                      $name .= $prefix;
+          }
 
           if($format == 0)
           {
             // Lastname
             if(!empty($name) and !empty($lastname))
-              $name .= ' ' . $lastname;
-            else
-              $name .= $lastname;
+            {
+                          $name .= ' ' . $lastname;
+            }
+            else {
+                          $name .= $lastname;
+            }
           }
           else
           {
             // Firstname
             if(!empty($name) and !empty($firstname))
-              $name .= ' ' . $firstname;
-            else
-              $name .= $firstname;
+            {
+                          $name .= ' ' . $firstname;
+            }
+            else {
+                          $name .= $firstname;
+            }
           }
 
           if($format == 2)
           {
             // AdditionalNames
             if(!empty($name) and !empty($addnames))
-              $name .= ' ' . $addnames;
-            else
-              $name .= $addnames;
+            {
+                          $name .= ' ' . $addnames;
+            }
+            else {
+                          $name .= $addnames;
+            }
           }
 
           if($format == 0)
           {
             // Firstname
             if(!empty($name) and !empty($firstname))
-              $name .= ', ' . $firstname;
-            else
-              $name .= $firstname;
+            {
+                          $name .= ', ' . $firstname;
+            }
+            else {
+                          $name .= $firstname;
+            }
           }
           else
           {
             // Lastname
             if(!empty($name) and !empty($lastname))
-              $name .= ' ' . $lastname;
-            else
-              $name .= $lastname;
+            {
+                          $name .= ' ' . $lastname;
+            }
+            else {
+                          $name .= $lastname;
+            }
           }
 
           if($format != 2)
           {
             // AdditionalNames
             if(!empty($name) and !empty($addnames))
-              $name .= ' ' . $addnames;
-            else
-              $name .= $addnames;
+            {
+                          $name .= ' ' . $addnames;
+            }
+            else {
+                          $name .= $addnames;
+            }
           }
 
           // Suffix
           if(!empty($name) and !empty($suffix))
-            $name .= ' ' . $suffix;
-          else
-            $name .= $suffix;
+          {
+                      $name .= ' ' . $suffix;
+          }
+          else {
+                      $name .= $suffix;
+          }
 
           // OrgName
           if(!empty($name) and !empty($orgname))
-            $name .= ' (' . $orgname . ')';
-          else
-            $name .= $orgname;
+          {
+                      $name .= ' (' . $orgname . ')';
+          }
+          else {
+                      $name .= $orgname;
+          }
 
           // make sure to trim whitespaces and double spaces
           $name = trim(str_replace('  ', ' ', $name));
@@ -361,15 +422,19 @@ 
             $photo = str_replace(array(',', '&', ' ', '/', 'ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü', 'ß', 'á', 'à', 'ó', 'ò', 'ú', 'ù', 'í', 'ø'),
             array('', '_', '_', '_', 'ae', 'oe', 'ue', 'Ae', 'Oe', 'Ue', 'ss', 'a', 'a', 'o', 'o', 'u', 'u', 'i', 'oe'), $name);
           }
-          else
-            $photo = '';
+          else {
+                      $photo = '';
+          }
 
           // phone
           $phone_no = array();
           if($vcard_obj->categories)
-            $categories = $vcard_obj->categories[0];
-          else
-            $categories = array();
+          {
+                      $categories = $vcard_obj->categories[0];
+          }
+          else {
+                      $categories = array();
+          }
 
           // check for quickdial entry
           if(isset($vcard_obj->note[0]))
@@ -404,9 +469,10 @@ 
                 break;
               }
             }
-          } 
-          else
-            $add_entry = 1;
+          }
+          else {
+                      $add_entry = 1;
+          }
 
           if($add_entry == 1)
           {
@@ -431,9 +497,13 @@ 
                   {
                     //Set quickdial
                     if($value == 1)
-                      print "\nWARNING: Quickdial value 1 (**701) is not possible but used! \n";
+                    {
+                                          print "\nWARNING: Quickdial value 1 (**701) is not possible but used! \n";
+                    }
                     elseif($value >= 100)
-                      print "\nWARNING: Quickdial value bigger than 99 (**799) is not possible but used! \n";
+                    {
+                                          print "\nWARNING: Quickdial value bigger than 99 (**799) is not possible but used! \n";
+                    }
 
                     $quickdial = $value;
                   }
@@ -443,23 +513,38 @@ 
 
                 // find out priority
                 if(in_array("pref", $typearr_lower))
-                  $prio = 1;
+                {
+                                  $prio = 1;
+                }
 
                 // set the proper type
                 if(in_array("cell", $typearr_lower))
-                  $type = "mobile";
+                {
+                                  $type = "mobile";
+                }
                 elseif(in_array("home", $typearr_lower))
-                  $type = "home";
+                {
+                                  $type = "home";
+                }
                 elseif(in_array("fax", $typearr_lower))
-                  $type = "fax_work";
+                {
+                                  $type = "fax_work";
+                }
                 elseif(in_array("work", $typearr_lower))
-                  $type = "work";
+                {
+                                  $type = "work";
+                }
                 elseif(in_array("other", $typearr_lower))
-                  $type = "other";
+                {
+                                  $type = "other";
+                }
                 elseif(in_array("dom", $typearr_lower))
-                  $type = "other";
-                else
-                  continue;
+                {
+                                  $type = "other";
+                }
+                else {
+                                  continue;
+                }
               }
               $phone_no[] = array("type"=>$type, "prio"=>$prio, "quickdial"=>$quickdial, "value" => $this->_clear_phone_number($phone_number));
             }
@@ -479,13 +564,20 @@ 
                   $email = $e['value'];
                   $typearr_lower = unserialize(strtolower(serialize($e['type'])));
                   if(in_array("work", $typearr_lower))
-                    $type_email = "work";
+                  {
+                                      $type_email = "work";
+                  }
                   elseif(in_array("home", $typearr_lower))
-                    $type_email = "home";
+                  {
+                                      $type_email = "home";
+                  }
                   elseif(in_array("other", $typearr_lower))
-                    $type_email = "other";
-                  else
-                    continue;
+                  {
+                                      $type_email = "other";
+                  }
+                  else {
+                                      continue;
+                  }
                 }
 
                 // DEBUG: print out the email address on the console
@@ -513,7 +605,9 @@ 
   public function build_fb_xml()
   {
     if(empty($this->entries))
-      throw new Exception('No entries available! Call get_carddav_entries or set $this->entries manually!');
+    {
+          throw new Exception('No entries available! Call get_carddav_entries or set $this->entries manually!');
+    }
 
     // create FB XML in utf-8 format
     $root = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><phonebooks><phonebook></phonebook></phonebooks>');
@@ -552,7 +646,9 @@ 
 
       // output a warning if no telephone number was found
       if($id == 0)
-        print "  WARNING: no phone entry found. VCard will be ignored." . PHP_EOL;
+      {
+              print "  WARNING: no phone entry found. VCard will be ignored." . PHP_EOL;
+      }
 
       // email: put the email addresses into the fritzbox xml file
       $email = $contact->addChild("services");
@@ -602,8 +698,9 @@ 
 
             print "  Added photo: " . basename($photo_file) . PHP_EOL;
           }
-          else
-           print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
+          else {
+                     print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
+          }
         }
         elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
         {
@@ -612,8 +709,9 @@ 
 
           print "  Added photo: " . $entry['photo_data'][0] . PHP_EOL;
         }
-        else
-          print "  WARNING: Only VCard embedded photo data or a reference URL is currently supported." . PHP_EOL;
+        else {
+                  print "  WARNING: Only VCard embedded photo data or a reference URL is currently supported." . PHP_EOL;
+        }
       }
 
       $contact->addChild("services");
@@ -622,7 +720,9 @@ 
     }
 
     if($root->asXML() !== false)
-      $this->fbxml = $root->asXML();
+    {
+          $this->fbxml = $root->asXML();
+    }
     else
     {
       print "  ERROR: created XML data isn't well-formed." . PHP_EOL;
@@ -639,19 +739,27 @@ 
   public function _concat($text1, $text2)
   {
     if($text1 == '')
-      return $text2;
+    {
+          return $text2;
+    }
     elseif($text2 == '')
-      return $text1;
-    else
-      return $text1 . ", " . $text2;
+    {
+          return $text1;
+    }
+    else {
+          return $text1 . ", " . $text2;
+    }
   }
 
   public function _parse_fb_result($text)
   {
     if(preg_match("/\<h2\>([^\<]+)\<\/h2\>/", $text, $matches) == 1 && !empty($matches))
-      return $matches[1];
-    else
-      return "Error while uploading xml to fritzbox";
+    {
+          return $matches[1];
+    }
+    else {
+          return "Error while uploading xml to fritzbox";
+    }
   }
 
   public function upload_to_fb()
@@ -673,15 +781,17 @@ 
 	  	$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 {
+      	      	print " INFO: Different versions ==> Changes in phonebook." . PHP_EOL . " INFO: Changes dedected! Continue with upload." . PHP_EOL;
+      	}
       }
-	  else
-      return 0;  
+      else {
+	        return 0;
+	  }
     }
     // now we upload the photo jpgs first being stored in the
     // temp directory.
@@ -751,12 +861,16 @@ 
 
                   ftp_pasv($conn_id, true);
                   if(!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
-                    print " ERROR: while uploading file " . $fileinfo->getFilename() . PHP_EOL;
-                  else
-                    print " ok." . PHP_EOL;
+                  {
+                                      print " ERROR: while uploading file " . $fileinfo->getFilename() . PHP_EOL;
+                  }
+                  else {
+                                      print " ok." . PHP_EOL;
+                  }
+                }
+                else {
+                                  print " ok." . PHP_EOL;
                 }
-                else
-                  print " ok." . PHP_EOL;
 
                 // cleanup old files
                 foreach($all_existing_files as $existing_file)
@@ -768,20 +882,23 @@ 
                   }
                 }
               }
-              else
-                print " already exists." . PHP_EOL;
+              else {
+                              print " already exists." . PHP_EOL;
+              }
             }
           }
         }
       }
-      else
-        print " ERROR: couldn't login to FTP-server '" . $ftp_server . "' with provided username/password settings." . PHP_EOL;
+      else {
+              print " ERROR: couldn't login to FTP-server '" . $ftp_server . "' with provided username/password settings." . PHP_EOL;
+      }
 
       // close ftp connection
       ftp_close($conn_id);
     }
-    else
-      print " ERROR: couldn't connect to FTP server '" . $ftp_server . "'." . PHP_EOL;
+    else {
+          print " ERROR: couldn't connect to FTP server '" . $ftp_server . "'." . PHP_EOL;
+    }
 
     // in case numeric IP is given, try to resolve to hostname. Otherwise Fritzbox may decline login, because it is determine to be (prohibited) remote access
     $hostname = $this->config['fritzbox_ip'];
@@ -789,7 +906,9 @@ 
     {
       $hostname = gethostbyaddr($hostname);
       if($hostname == $this->config['fritzbox_ip'])
-        print " WARNING: Unable to get hostname for IP address (" . $this->config['fritzbox_ip'] . ") <" . $hostname . "<" . PHP_EOL;
+      {
+              print " WARNING: Unable to get hostname for IP address (" . $this->config['fritzbox_ip'] . ") <" . $hostname . "<" . PHP_EOL;
+      }
       else
       {
         print " INFO: Given IP address (" . $this->config['fritzbox_ip'] . ") has hostname " . $hostname . "." . PHP_EOL;