jens-maus / carddav2fb

lib/CardDAV-PHP/carddav.php

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_ring_phone.php

Braces +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 // init the output message
 $message = date('Y-m-d H:i') . ' ';
 try
-{ 
+{
   // load the fritzbox_api class
   require_once(__DIR__ . '/fritzbox_api.class.php');
   $fritz = new fritzbox_api();

lib/fritzbox_api_php/fritzbox_api.class.php

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/vCard-parser/vCard.php

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];
 					}
 				}

carddav2fb.php

Braces +222 added lines, -98 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;
@@ -91,9 +96,12 @@ 
 // upload the XML-file to the FRITZ!Box (CAUTION: this will overwrite all current entries in the phone book!!)
 print 'Upload data to FRITZ!Box @ ' . $config['fritzbox_ip'] . PHP_EOL;
 if($client->upload_to_fb())
+{
   print 'Done.' . PHP_EOL;
-else
+}
+else {
   exit(1);
+}
 
 flush(); // in case this script runs by php-cgi
 
@@ -124,7 +132,9 @@ 
   public function mktemp($dir, $prefix = '', $mode = 0700)
   {
     if(substr($dir, -1) != '/')
-      $dir .= '/';
+    {
+          $dir .= '/';
+    }
 
     do
     {
@@ -145,7 +155,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);
@@ -159,18 +174,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)
     {
@@ -211,7 +233,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();
@@ -220,7 +244,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();
@@ -242,10 +268,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 = '';
@@ -254,19 +284,29 @@ 
 
           // 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']);
+          }
 
           if (isset($vcard_obj->fn[0]))
-            $formattedname = $vcard_obj->fn[0];
+          {
+                      $formattedname = $vcard_obj->fn[0];
+          }
 
           $firstname = trim($name_arr['firstname']);
           $lastname = trim($name_arr['lastname']);
@@ -286,78 +326,106 @@ 
 
           // 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));
 
           // perform a fallback to formatted name, if we don't have any name and formatted name is available
           if(empty($name) and !empty($formattedname))
-            $name = $formattedname;
+          {
+                      $name = $formattedname;
+          }
 
           if(empty($name))
           {
@@ -371,15 +439,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]))
@@ -414,9 +486,10 @@ 
                 break;
               }
             }
-          } 
-          else
-            $add_entry = 1;
+          }
+          else {
+                      $add_entry = 1;
+          }
 
           if($add_entry == 1)
           {
@@ -441,9 +514,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;
                   }
@@ -453,23 +530,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));
             }
@@ -489,13 +581,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
@@ -523,7 +622,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>');
@@ -562,7 +663,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");
@@ -612,8 +715,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')
         {
@@ -622,8 +726,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");
@@ -632,7 +737,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;
@@ -649,19 +756,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()
@@ -683,15 +798,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.
@@ -761,12 +878,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)
@@ -778,20 +899,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;
+    }
     
     // lets post the phonebook xml to the FRITZ!Box
     print " Uploading Phonebook XML to " . $this->config['fritzbox_ip'] . PHP_EOL;