jens-maus / carddav2fb

carddav2fb.php

Spacing +129 added lines, -129 removed lines

@@ -27,9 +27,9 @@ 
 
 // check for the minimum php version
 $php_min_version = '5.3.6';
-if(version_compare(PHP_VERSION, $php_min_version) < 0)
+if (version_compare(PHP_VERSION, $php_min_version) < 0)
 {
-  print 'ERROR: PHP version '.$php_min_version.' is required. Found version: ' . PHP_VERSION . PHP_EOL;
+  print 'ERROR: PHP version ' . $php_min_version . ' is required. Found version: ' . PHP_VERSION . PHP_EOL;
   exit(1);
 }
 
@@ -37,7 +37,7 @@ 
 require_once('lib/vCard-parser/vCard.php');
 require_once('lib/fritzbox_api_php/fritzbox_api.class.php');
 
-if($argc == 2)
+if ($argc == 2)
   $config_file_name = $argv[1];
 else
   $config_file_name = __DIR__ . '/config.php';
@@ -59,11 +59,11 @@ 
 $config['build_photos'] = true;
 $config['quickdial_keyword'] = 'Quickdial:';
 
-if(is_file($config_file_name))
+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;
+  print 'ERROR: No ' . $config_file_name . ' found, please take a look at config.example.php and create a ' . $config_file_name . ' file!' . PHP_EOL;
   exit(1);
 }
 
@@ -119,14 +119,14 @@ 
   }
 
   // Source: https://php.net/manual/de/function.tempnam.php#61436
-  public function mktemp($dir, $prefix='', $mode=0700)
+  public function mktemp($dir, $prefix = '', $mode = 0700)
   {
-    if(substr($dir, -1) != '/')
+    if (substr($dir, -1) != '/')
       $dir .= '/';
 
     do
     {
-      $path = $dir.$prefix.mt_rand(0, 9999999);
+      $path = $dir . $prefix . mt_rand(0, 9999999);
     }
     while (!mkdir($path, $mode));
 
@@ -135,15 +135,15 @@ 
 
   public function rmtemp($dir)
   {
-    if(is_dir($dir))
+    if (is_dir($dir))
     {
       $objects = scandir($dir);
-      foreach($objects as $object)
+      foreach ($objects as $object)
       {
-        if($object != "." && $object != "..")
+        if ($object != "." && $object != "..")
         {
-          if(filetype($dir."/".$object) == "dir")
-            rrmdir($dir."/".$object); else unlink($dir."/".$object);
+          if (filetype($dir . "/" . $object) == "dir")
+            rrmdir($dir . "/" . $object); else unlink($dir . "/" . $object);
         }
       }
       reset($objects);
@@ -156,21 +156,21 @@ 
     try
     {
       // Check if there are valid base64 characters
-      if(!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str))
+      if (!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str))
         return false;
 
       // Decode the string in strict mode and check the results
       $decoded = base64_decode($str, true);
-      if($decoded === false)
+      if ($decoded === false)
         return false;
 
       // Encode the string again
-      if(base64_encode($decoded) === $str)
+      if (base64_encode($decoded) === $str)
         return true;
       else
         return false;
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
       // If exception is caught, then it is not a base64 encoded string
       return false;
@@ -199,9 +199,9 @@ 
     $imgseqfname = 1;
     $snum = 0;
 
-    if(is_array($this->config['carddav']))
+    if (is_array($this->config['carddav']))
     {
-      foreach($this->config['carddav'] as $conf)
+      foreach ($this->config['carddav'] as $conf)
       {
         print " [" . $snum . "]: " . $conf['url'] . " ";
         $carddav = new CardDavPHP\CardDavBackend($conf['url']);
@@ -209,23 +209,23 @@ 
 
         // set the vcard extension in case the user
         // defined it in the config
-        if(isset($conf['extension']))
+        if (isset($conf['extension']))
           $carddav->setVcardExtension($conf['extension']);
 
         // retrieve data from the CardDAV server now
-        $xmldata =  $carddav->get();
+        $xmldata = $carddav->get();
 
         // identify if we received UTF-8 encoded data from the
         // 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)
+        if (iconv('utf-8', 'utf-8//IGNORE', $xmldata) != $xmldata)
           $xmldata = utf8_encode($xmldata);
 
         // read raw_vcard data from xml response
         $raw_vcards = array();
         $xmlvcard = new SimpleXMLElement($xmldata);
 
-        foreach($xmlvcard->element as $vcard_element)
+        foreach ($xmlvcard->element as $vcard_element)
         {
           $id = $vcard_element->id->__toString();
           $value = (string)$vcard_element->vcard->__toString();
@@ -236,14 +236,14 @@ 
 
         // parse raw_vcards
         $quick_dial_arr = array();
-        foreach($raw_vcards as $v)
+        foreach ($raw_vcards as $v)
         {
           $vcard_obj = new vCard(false, $v);
           $name_arr = null;
-          if(isset($vcard_obj->n[0]))
+          if (isset($vcard_obj->n[0]))
             $name_arr = $vcard_obj->n[0];
           $org_arr = null;
-          if(isset($vcard_obj->org[0]))
+          if (isset($vcard_obj->org[0]))
             $org_arr = $vcard_obj->org[0];
           $addnames = '';
           $prefix = '';
@@ -251,16 +251,16 @@ 
           $orgname = '';
 
           // Build name Parts if existing ans switch to true in config
-          if(isset($name_arr['prefixes']) AND $this->config['prefix'])
+          if (isset($name_arr['prefixes']) AND $this->config['prefix'])
             $prefix = trim($name_arr['prefixes']);
 
-          if(isset($name_arr['suffixes']) AND $this->config['suffix'])
+          if (isset($name_arr['suffixes']) AND $this->config['suffix'])
             $suffix = trim($name_arr['suffixes']);
 
-          if(isset($name_arr['additionalnames']) AND $this->config['addnames'])
+          if (isset($name_arr['additionalnames']) AND $this->config['addnames'])
             $addnames = trim($name_arr['additionalnames']);
 
-          if(isset($org_arr['name']) AND $this->config['orgname'])
+          if (isset($org_arr['name']) AND $this->config['orgname'])
             $orgname = trim($org_arr['name']);
 
           $firstname = trim($name_arr['firstname']);
@@ -280,13 +280,13 @@ 
           $format = $this->config['fullname_format'];
 
           // Prefix
-          if(!empty($prefix))
+          if (!empty($prefix))
             $name .= $prefix;
 
-          if($format == 0)
+          if ($format == 0)
           {
             // Lastname
-            if(!empty($name) AND !empty($lastname))
+            if (!empty($name) AND !empty($lastname))
               $name .= ' ' . $lastname;
             else
               $name .= $lastname;
@@ -294,25 +294,25 @@ 
           else
           {
             // Firstname
-            if(!empty($name) AND !empty($firstname))
+            if (!empty($name) AND !empty($firstname))
               $name .= ' ' . $firstname;
             else
               $name .= $firstname;
           }
 
-          if($format == 2)
+          if ($format == 2)
           {
             // AdditionalNames
-            if(!empty($name) AND !empty($addnames))
+            if (!empty($name) AND !empty($addnames))
               $name .= ' ' . $addnames;
             else
               $name .= $addnames;
           }
 
-          if($format == 0)
+          if ($format == 0)
           {
             // Firstname
-            if(!empty($name) AND !empty($firstname))
+            if (!empty($name) AND !empty($firstname))
               $name .= ', ' . $firstname;
             else
               $name .= $firstname;
@@ -320,29 +320,29 @@ 
           else
           {
             // Lastname
-            if(!empty($name) AND !empty($lastname))
+            if (!empty($name) AND !empty($lastname))
               $name .= ' ' . $lastname;
             else
               $name .= $lastname;
           }
 
-          if($format != 2)
+          if ($format != 2)
           {
             // AdditionalNames
-            if(!empty($name) AND !empty($addnames))
+            if (!empty($name) AND !empty($addnames))
               $name .= ' ' . $addnames;
             else
               $name .= $addnames;
           }
 
           // Suffix
-          if(!empty($name) AND !empty($suffix))
+          if (!empty($name) AND !empty($suffix))
             $name .= ' ' . $suffix;
           else
             $name .= $suffix;
 
           // OrgName
-          if(!empty($name) AND !empty($orgname))
+          if (!empty($name) AND !empty($orgname))
             $name .= ' (' . $orgname . ')';
           else
             $name .= $orgname;
@@ -350,24 +350,24 @@ 
           // make sure to trim whitespaces and double spaces
           $name = trim(str_replace('  ', ' ', $name));
 
-          if(empty($name))
+          if (empty($name))
           {
             print '  WARNING: No fullname, lastname or orgname found!';
             $name = 'UNKNOWN';
           }
 
           // format filename of contact photo; remove special letters, added config option for sequential filnames default is false
-          if($vcard_obj->photo)
+          if ($vcard_obj->photo)
           {
-            if(isset($this->config['seq_photo_name']) AND $this->config['seq_photo_name'] == true)
+            if (isset($this->config['seq_photo_name']) AND $this->config['seq_photo_name'] == true)
             {
               $photo = $imgseqfname;
               $imgseqfname++;
             }
             else
             {
-              $photo = str_replace(array(',','&',' ','/','ä','ö','ü','Ä','Ö','Ü','ß','á','à','ó','ò','ú','ù','í','ø'),
-              array('','_','_','_','ae','oe','ue','Ae','Oe','Ue','ss','a','a','o','o','u','u','i','oe'),$name);
+              $photo = str_replace(array(',', '&', ' ', '/', 'ä', 'ö', 'ü', 'Ä', 'Ö', 'Ü', 'ß', 'á', 'à', 'ó', 'ò', 'ú', 'ù', 'í', 'ø'),
+              array('', '_', '_', '_', 'ae', 'oe', 'ue', 'Ae', 'Oe', 'Ue', 'ss', 'a', 'a', 'o', 'o', 'u', 'u', 'i', 'oe'), $name);
             }
           }
           else
@@ -375,25 +375,25 @@ 
 
           // phone
           $phone_no = array();
-          if($vcard_obj->categories)
+          if ($vcard_obj->categories)
             $categories = $vcard_obj->categories[0];
           else
             $categories = array();
 
           // check for quickdial entry
-          if(isset($vcard_obj->note[0]))
+          if (isset($vcard_obj->note[0]))
           {
             $note = $vcard_obj->note[0];
             $notes = explode($this->config['quickdial_keyword'], $note);
-            foreach($notes as $linenr => $linecontent)
+            foreach ($notes as $linenr => $linecontent)
             {
-              $found = strrpos($linecontent , ":**7");
-              if($found > 0)
+              $found = strrpos($linecontent, ":**7");
+              if ($found > 0)
               {
-                $pos_qd_start = strrpos($linecontent , ":**7" );
-                $quick_dial_for_nr = preg_replace("/[^0-9+]/", "",substr($linecontent , 0, $pos_qd_start));
-                $quick_dial_nr = intval(substr($linecontent , $pos_qd_start+4, 3));
-                $quick_dial_arr[$quick_dial_for_nr]=$quick_dial_nr;
+                $pos_qd_start = strrpos($linecontent, ":**7");
+                $quick_dial_for_nr = preg_replace("/[^0-9+]/", "", substr($linecontent, 0, $pos_qd_start));
+                $quick_dial_nr = intval(substr($linecontent, $pos_qd_start + 4, 3));
+                $quick_dial_arr[$quick_dial_for_nr] = $quick_dial_nr;
               }
             }
           }
@@ -402,12 +402,12 @@ 
           $email_add = array();
           $vip = isset($this->config['group_vip']) && in_array((string)$this->config['group_vip'], $categories);
 
-          if(array_key_exists('group_filter',$this->config) && is_array($this->config['group_filter']))
+          if (array_key_exists('group_filter', $this->config) && is_array($this->config['group_filter']))
           {
             $add_entry = 0;
-            foreach($this->config['group_filter'] as $group_filter)
+            foreach ($this->config['group_filter'] as $group_filter)
             {
-              if(in_array($group_filter,$categories))
+              if (in_array($group_filter, $categories))
               {
                 $add_entry = 1;
                 break;
@@ -417,14 +417,14 @@ 
           else
             $add_entry = 1;
 
-          if($add_entry == 1)
+          if ($add_entry == 1)
           {
-            foreach($vcard_obj->tel as $t)
+            foreach ($vcard_obj->tel as $t)
             {
               $prio = 0;
-              $quickdial =null;
+              $quickdial = null;
               
-              if(!is_array($t) || empty($t['type']))
+              if (!is_array($t) || empty($t['type']))
               {
                 $type = "mobile";
                 $phone_number = $t;
@@ -433,15 +433,15 @@ 
               {
                 $phone_number = $t['value'];
                 
-                $phone_number_clean = preg_replace("/[^0-9+]/", "",$phone_number);
-                foreach($quick_dial_arr as $qd_phone_nr => $value)
+                $phone_number_clean = preg_replace("/[^0-9+]/", "", $phone_number);
+                foreach ($quick_dial_arr as $qd_phone_nr => $value)
                 {
-                  if($qd_phone_nr == $phone_number_clean)
+                  if ($qd_phone_nr == $phone_number_clean)
                   {
                     //Set quickdial
-                    if($value == 1)
+                    if ($value == 1)
                       print "\nWARNING: Quickdial value 1 (**701) is not possible but used! \n";
-                    elseif($value >= 100)
+                    elseif ($value >= 100)
                       print "\nWARNING: Quickdial value bigger than 99 (**799) is not possible but used! \n";
 
                     $quickdial = $value;
@@ -451,34 +451,34 @@ 
                 $typearr_lower = unserialize(strtolower(serialize($t['type'])));
 
                 // find out priority
-                if(in_array("pref", $typearr_lower))
+                if (in_array("pref", $typearr_lower))
                   $prio = 1;
 
                 // set the proper type
-                if(in_array("cell", $typearr_lower))
+                if (in_array("cell", $typearr_lower))
                   $type = "mobile";
-                elseif(in_array("home", $typearr_lower))
+                elseif (in_array("home", $typearr_lower))
                   $type = "home";
-                elseif(in_array("fax", $typearr_lower))
+                elseif (in_array("fax", $typearr_lower))
                   $type = "fax_work";
-                elseif(in_array("work", $typearr_lower))
+                elseif (in_array("work", $typearr_lower))
                   $type = "work";
-                elseif(in_array("other", $typearr_lower))
+                elseif (in_array("other", $typearr_lower))
                   $type = "other";
-                elseif(in_array("dom", $typearr_lower))
+                elseif (in_array("dom", $typearr_lower))
                   $type = "other";
                 else
                   continue;
               }
-              $phone_no[] =  array("type"=>$type, "prio"=>$prio, "quickdial"=>$quickdial, "value" => $this->_clear_phone_number($phone_number));
+              $phone_no[] = array("type"=>$type, "prio"=>$prio, "quickdial"=>$quickdial, "value" => $this->_clear_phone_number($phone_number));
             }
 
             // request email address and type
-            if($vcard_obj->email)
+            if ($vcard_obj->email)
             {
-              foreach($vcard_obj->email as $e)
+              foreach ($vcard_obj->email as $e)
               {
-                if(empty($e['type']))
+                if (empty($e['type']))
                 {
                   $type_email = "work";
                   $email = $e;
@@ -487,11 +487,11 @@ 
                 {
                   $email = $e['value'];
                   $typearr_lower = unserialize(strtolower(serialize($e['type'])));
-                  if(in_array("work", $typearr_lower))
+                  if (in_array("work", $typearr_lower))
                     $type_email = "work";
-                  elseif(in_array("home", $typearr_lower))
+                  elseif (in_array("home", $typearr_lower))
                     $type_email = "home";
-                  elseif(in_array("other", $typearr_lower))
+                  elseif (in_array("other", $typearr_lower))
                     $type_email = "other";
                   else
                     continue;
@@ -521,15 +521,15 @@ 
 
   public function build_fb_xml()
   {
-    if(empty($this->entries))
+    if (empty($this->entries))
       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>');
     $pb = $root->phonebook;
-    $pb->addAttribute("name",$this->config['phonebook_name']);
+    $pb->addAttribute("name", $this->config['phonebook_name']);
 
-    foreach($this->entries as $entry)
+    foreach ($this->entries as $entry)
     {
       $contact = $pb->addChild("contact");
       $contact->addChild("category", $entry['vip']);
@@ -541,17 +541,17 @@ 
       // telephone: put the phonenumbers into the fritzbox xml file
       $telephony = $contact->addChild("telephony");
       $id = 0;
-      foreach($entry['telephony'] as $tel)
+      foreach ($entry['telephony'] as $tel)
       {
         $num = $telephony->addChild("number", $tel['value']);
         $num->addAttribute("type", $tel['type']);
-        $num->addAttribute("vanity","");
+        $num->addAttribute("vanity", "");
         $num->addAttribute("prio", $tel['prio']);
         $num->addAttribute("id", $id);
 
-        if(isset($tel['quickdial']))
+        if (isset($tel['quickdial']))
         {
-          $num->addAttribute("quickdial",$tel['quickdial']);
+          $num->addAttribute("quickdial", $tel['quickdial']);
           print "  Added quickdial: " . $tel['quickdial'] . " for: " . $tel['value'] . " (" . $tel['type'] . ")" . PHP_EOL;
         }
 
@@ -560,13 +560,13 @@ 
       }
 
       // output a warning if no telephone number was found
-      if($id == 0)
+      if ($id == 0)
         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");
       $id = 0;
-      foreach($entry['email'] as $mail)
+      foreach ($entry['email'] as $mail)
       {
         $mail_adr = $email->addChild("email", $mail['value']);
         $mail_adr->addAttribute("classifier", $mail['type']);
@@ -577,14 +577,14 @@ 
       }
 
       // check for a photo being part of the VCard
-      if(($entry['photo']) and ($entry['photo_data']) and (is_array($entry['photo_data'])) and ($entry['photo_data'][0]))
+      if (($entry['photo']) and ($entry['photo_data']) and (is_array($entry['photo_data'])) and ($entry['photo_data'][0]))
       {
         // check if 'photo_data'[0] is an array as well because then
         // we have to extract ['value'] and friends.
-        if(is_array($entry['photo_data'][0]) and (array_key_exists('value', $entry['photo_data'][0])))
+        if (is_array($entry['photo_data'][0]) and (array_key_exists('value', $entry['photo_data'][0])))
         {
           // check if photo_data really contains JPEG data
-          if((array_key_exists('type', $entry['photo_data'][0])) and (is_array($entry['photo_data'][0]['type'])) and
+          if ((array_key_exists('type', $entry['photo_data'][0])) and (is_array($entry['photo_data'][0]['type'])) and
              ($entry['photo_data'][0]['type'][0] == 'jpeg' or $entry['photo_data'][0]['type'][0] == 'jpg'))
           {
             // get photo, rename, base64 convert and save as jpg
@@ -594,7 +594,7 @@ 
 
             // check for base64 encoding of the photo data and convert it
             // accordingly.
-            if(((array_key_exists('encoding', $entry['photo_data'][0])) and ($entry['photo_data'][0]['encoding'] == 'b')) or $this->is_base64($photo_data))
+            if (((array_key_exists('encoding', $entry['photo_data'][0])) and ($entry['photo_data'][0]['encoding'] == 'b')) or $this->is_base64($photo_data))
             {
               file_put_contents($photo_file . ".b64", $photo_data);
               $this->base64_to_jpeg($photo_file . ".b64", $photo_file);
@@ -607,14 +607,14 @@ 
             }
 
             // add contact photo to xml
-            $person->addChild("imageURL", $this->config['fritzbox_path'].$this->config['usb_disk']."FRITZ/fonpix/".basename($photo_file));
+            $person->addChild("imageURL", $this->config['fritzbox_path'] . $this->config['usb_disk'] . "FRITZ/fonpix/" . basename($photo_file));
 
             print "  Added photo: " . basename($photo_file) . PHP_EOL;
           }
           else
            print "  WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
         }
-        elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
+        elseif (substr($entry['photo_data'][0], 0, 4) == 'http')
         {
           // add contact photo to xml
           $person->addChild("imageURL", $entry['photo_data'][0]);
@@ -639,20 +639,20 @@ 
     return $text;
   }
 
-  public function _concat ($text1,$text2)
+  public function _concat($text1, $text2)
   {
-    if($text1 == '')
+    if ($text1 == '')
       return $text2;
-    elseif($text2 == '')
+    elseif ($text2 == '')
       return $text1;
     else
-      return $text1.", ".$text2;
+      return $text1 . ", " . $text2;
   }
 
   public function _parse_fb_result($text)
   {
     preg_match("/\<h2\>([^\<]+)\<\/h2\>/", $text, $matches);
-    if($matches)
+    if ($matches)
       return $matches[1];
     else
       return "Error while uploading xml to fritzbox";
@@ -661,10 +661,10 @@ 
   public function upload_to_fb()
   {
     // if the user wants to save the xml to a separate file, we do so now
-    if(array_key_exists('output_file',$this->config))
+    if (array_key_exists('output_file', $this->config))
     {
       $output = fopen($this->config['output_file'], 'w');
-      if($output)
+      if ($output)
       {
         fwrite($output, $this->fbxml);
         fclose($output);
@@ -679,24 +679,24 @@ 
     // perform an ftps-connection to copy over the photos to a specified directory
     $ftp_server = $this->config['fritzbox_ip_ftp'];
     $conn_id = ftp_ssl_connect($ftp_server);
-    if($conn_id == false)
+    if ($conn_id == false)
     {
       print " WARNING: Secure connection to FTP-server '" . $ftp_server . "' failed, retrying without SSL." . PHP_EOL;
       $conn_id = ftp_connect($ftp_server);
     }
 
-    if($conn_id != false)
+    if ($conn_id != false)
     {
       ftp_set_option($conn_id, FTP_TIMEOUT_SEC, 60);
       $login_result = ftp_login($conn_id, $this->config['fritzbox_user'], $this->config['fritzbox_pw']);
-      if($login_result === true)
+      if ($login_result === true)
       {
         ftp_pasv($conn_id, true);
 
         // create remote photo path on FRITZ!Box if it doesn't exist
-        $remote_path = $this->config['usb_disk']."/FRITZ/fonpix";
+        $remote_path = $this->config['usb_disk'] . "/FRITZ/fonpix";
         $all_existing_files = ftp_nlist($conn_id, $remote_path);
-        if($all_existing_files == false)
+        if ($all_existing_files == false)
         {
           ftp_mkdir($conn_id, $remote_path);
           $all_existing_files = array();
@@ -704,43 +704,43 @@ 
 
         // now iterate through all jpg files in tempdir and upload them if necessary
         $dir = new DirectoryIterator($this->tmpdir);
-        foreach($dir as $fileinfo)
+        foreach ($dir as $fileinfo)
         {
-          if(!$fileinfo->isDot())
+          if (!$fileinfo->isDot())
           {
-            if($fileinfo->getExtension() == "jpg")
+            if ($fileinfo->getExtension() == "jpg")
             {
               $file = $fileinfo->getFilename();
 
               print " FTP-Upload '" . $file . "'...";
-              if(!in_array($remote_path . "/" . $file, $all_existing_files))
+              if (!in_array($remote_path . "/" . $file, $all_existing_files))
               {
-                if(!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
+                if (!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
                 {
                   // retry when a fault occurs.
                   print " retrying... ";
                   $conn_id = ftp_ssl_connect($ftp_server);
-                  if($conn_id == false)
+                  if ($conn_id == false)
                   {
                     print " WARNING: Secure re-connection to FTP-server '" . $ftp_server . "' failed, retrying without SSL." . PHP_EOL;
                     $conn_id = ftp_connect($ftp_server);
                   }
 
-                  if($conn_id == false)
+                  if ($conn_id == false)
                   {
                     print " ERROR: couldn't re-connect to FTP server '" . $ftp_server . "', abortіng." . PHP_EOL;
                     break;
                   }
 
                   $login_result = ftp_login($conn_id, $this->config['fritzbox_user'], $this->config['fritzbox_pw']);
-                  if($login_result === false)
+                  if ($login_result === false)
                   {
                     print " ERROR: couldn't re-login to FTP-server '" . $ftp_server . "' with provided username/password settings." . PHP_EOL;
                     break;
                   }
 
                   ftp_pasv($conn_id, true);
-                  if(!ftp_put($conn_id, $remote_path . "/" . $file, $fileinfo->getPathname(), FTP_BINARY))
+                  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;
@@ -749,9 +749,9 @@ 
                   print " ok." . PHP_EOL;
 
                 // cleanup old files
-                foreach($all_existing_files as $existing_file)
+                foreach ($all_existing_files as $existing_file)
                 {
-                  if(strpos($existing_file, $remote_path."/".substr($file, 0, -10)) !== false)
+                  if (strpos($existing_file, $remote_path . "/" . substr($file, 0, -10)) !== false)
                   {
                     print " FTP-Delete: " . $existing_file . PHP_EOL;
                     ftp_delete($conn_id, $remote_path . "/" . basename($existing_file));
@@ -775,14 +775,14 @@ 
 
     // 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'];
-    if(filter_var($hostname, FILTER_VALIDATE_IP))
+    if (filter_var($hostname, FILTER_VALIDATE_IP))
     {
       $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;
+      if ($hostname == $this->config['fritzbox_ip'])
+        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;
+        print " INFO: Given IP address (" . $this->config['fritzbox_ip'] . ") has hostname " . $hostname . "." . PHP_EOL;
         $this->config['fritzbox_ip'] = $hostname;
       }
     }
@@ -807,15 +807,15 @@ 
        )
       );
 
-      $raw_result =  $fritz->doPostFile($formfields, $filefileds);   // send the command
+      $raw_result = $fritz->doPostFile($formfields, $filefileds); // send the command
       $msg = $this->_parse_fb_result($raw_result);
-      unset($fritz);  // destroy the object to log out
+      unset($fritz); // destroy the object to log out
 
       print "  FRITZ!Box returned message: '" . $msg . "'" . PHP_EOL;
     }
-    catch(Exception $e)
+    catch (Exception $e)
     {
-      print "  ERROR: " . $e->getMessage() . PHP_EOL;     // show the error message in anything failed
+      print "  ERROR: " . $e->getMessage() . PHP_EOL; // show the error message in anything failed
     }
   }
 }

Braces +180 added lines, -154 removed lines

@@ -37,10 +37,11 @@ 
 require_once('lib/vCard-parser/vCard.php');
 require_once('lib/fritzbox_api_php/fritzbox_api.class.php');
 
-if($argc == 2)
+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();
@@ -59,9 +60,9 @@ 
 $config['build_photos'] = true;
 $config['quickdial_keyword'] = 'Quickdial:';
 
-if(is_file($config_file_name))
+if(is_file($config_file_name)) {
   require($config_file_name);
-else
+} 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;
   exit(1);
@@ -121,8 +122,9 @@ 
   // Source: https://php.net/manual/de/function.tempnam.php#61436
   public function mktemp($dir, $prefix='', $mode=0700)
   {
-    if(substr($dir, -1) != '/')
-      $dir .= '/';
+    if(substr($dir, -1) != '/') {
+          $dir .= '/';
+    }
 
     do
     {
@@ -142,8 +144,11 @@ 
       {
         if($object != "." && $object != "..")
         {
-          if(filetype($dir."/".$object) == "dir")
-            rrmdir($dir."/".$object); else unlink($dir."/".$object);
+          if(filetype($dir."/".$object) == "dir") {
+                      rrmdir($dir."/".$object);
+          } else {
+              unlink($dir."/".$object);
+            }
         }
       }
       reset($objects);
@@ -156,21 +161,23 @@ 
     try
     {
       // Check if there are valid base64 characters
-      if(!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str))
-        return false;
+      if(!preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $str)) {
+              return false;
+      }
 
       // Decode the string in strict mode and check the results
       $decoded = base64_decode($str, true);
-      if($decoded === false)
-        return false;
+      if($decoded === false) {
+              return false;
+      }
 
       // Encode the string again
-      if(base64_encode($decoded) === $str)
-        return true;
-      else
-        return false;
-    }
-    catch(Exception $e)
+      if(base64_encode($decoded) === $str) {
+              return true;
+      } else {
+              return false;
+      }
+    } catch(Exception $e)
     {
       // If exception is caught, then it is not a base64 encoded string
       return false;
@@ -209,8 +216,9 @@ 
 
         // set the vcard extension in case the user
         // defined it in the config
-        if(isset($conf['extension']))
-          $carddav->setVcardExtension($conf['extension']);
+        if(isset($conf['extension'])) {
+                  $carddav->setVcardExtension($conf['extension']);
+        }
 
         // retrieve data from the CardDAV server now
         $xmldata =  $carddav->get();
@@ -218,8 +226,9 @@ 
         // identify if we received UTF-8 encoded data from the
         // 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);
+        if(iconv('utf-8', 'utf-8//IGNORE', $xmldata) != $xmldata) {
+                  $xmldata = utf8_encode($xmldata);
+        }
 
         // read raw_vcard data from xml response
         $raw_vcards = array();
@@ -240,28 +249,34 @@ 
         {
           $vcard_obj = new vCard(false, $v);
           $name_arr = null;
-          if(isset($vcard_obj->n[0]))
-            $name_arr = $vcard_obj->n[0];
+          if(isset($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];
+          if(isset($vcard_obj->org[0])) {
+                      $org_arr = $vcard_obj->org[0];
+          }
           $addnames = '';
           $prefix = '';
           $suffix = '';
           $orgname = '';
 
           // 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']);
+          if(isset($name_arr['prefixes']) AND $this->config['prefix']) {
+                      $prefix = trim($name_arr['prefixes']);
+          }
 
-          if(isset($name_arr['suffixes']) AND $this->config['suffix'])
-            $suffix = trim($name_arr['suffixes']);
+          if(isset($name_arr['suffixes']) AND $this->config['suffix']) {
+                      $suffix = trim($name_arr['suffixes']);
+          }
 
-          if(isset($name_arr['additionalnames']) AND $this->config['addnames'])
-            $addnames = trim($name_arr['additionalnames']);
+          if(isset($name_arr['additionalnames']) AND $this->config['addnames']) {
+                      $addnames = trim($name_arr['additionalnames']);
+          }
 
-          if(isset($org_arr['name']) AND $this->config['orgname'])
-            $orgname = trim($org_arr['name']);
+          if(isset($org_arr['name']) AND $this->config['orgname']) {
+                      $orgname = trim($org_arr['name']);
+          }
 
           $firstname = trim($name_arr['firstname']);
           $lastname = trim($name_arr['lastname']);
@@ -280,72 +295,79 @@ 
           $format = $this->config['fullname_format'];
 
           // Prefix
-          if(!empty($prefix))
-            $name .= $prefix;
+          if(!empty($prefix)) {
+                      $name .= $prefix;
+          }
 
           if($format == 0)
           {
             // Lastname
-            if(!empty($name) AND !empty($lastname))
-              $name .= ' ' . $lastname;
-            else
-              $name .= $lastname;
-          }
-          else
+            if(!empty($name) AND !empty($lastname)) {
+                          $name .= ' ' . $lastname;
+            } else {
+                          $name .= $lastname;
+            }
+          } else
           {
             // Firstname
-            if(!empty($name) AND !empty($firstname))
-              $name .= ' ' . $firstname;
-            else
-              $name .= $firstname;
+            if(!empty($name) AND !empty($firstname)) {
+                          $name .= ' ' . $firstname;
+            } else {
+                          $name .= $firstname;
+            }
           }
 
           if($format == 2)
           {
             // AdditionalNames
-            if(!empty($name) AND !empty($addnames))
-              $name .= ' ' . $addnames;
-            else
-              $name .= $addnames;
+            if(!empty($name) AND !empty($addnames)) {
+                          $name .= ' ' . $addnames;
+            } else {
+                          $name .= $addnames;
+            }
           }
 
           if($format == 0)
           {
             // Firstname
-            if(!empty($name) AND !empty($firstname))
-              $name .= ', ' . $firstname;
-            else
-              $name .= $firstname;
-          }
-          else
+            if(!empty($name) AND !empty($firstname)) {
+                          $name .= ', ' . $firstname;
+            } else {
+                          $name .= $firstname;
+            }
+          } else
           {
             // Lastname
-            if(!empty($name) AND !empty($lastname))
-              $name .= ' ' . $lastname;
-            else
-              $name .= $lastname;
+            if(!empty($name) AND !empty($lastname)) {
+                          $name .= ' ' . $lastname;
+            } else {
+                          $name .= $lastname;
+            }
           }
 
           if($format != 2)
           {
             // AdditionalNames
-            if(!empty($name) AND !empty($addnames))
-              $name .= ' ' . $addnames;
-            else
-              $name .= $addnames;
+            if(!empty($name) AND !empty($addnames)) {
+                          $name .= ' ' . $addnames;
+            } else {
+                          $name .= $addnames;
+            }
           }
 
           // Suffix
-          if(!empty($name) AND !empty($suffix))
-            $name .= ' ' . $suffix;
-          else
-            $name .= $suffix;
+          if(!empty($name) AND !empty($suffix)) {
+                      $name .= ' ' . $suffix;
+          } else {
+                      $name .= $suffix;
+          }
 
           // OrgName
-          if(!empty($name) AND !empty($orgname))
-            $name .= ' (' . $orgname . ')';
-          else
-            $name .= $orgname;
+          if(!empty($name) AND !empty($orgname)) {
+                      $name .= ' (' . $orgname . ')';
+          } else {
+                      $name .= $orgname;
+          }
 
           // make sure to trim whitespaces and double spaces
           $name = trim(str_replace('  ', ' ', $name));
@@ -363,22 +385,22 @@ 
             {
               $photo = $imgseqfname;
               $imgseqfname++;
-            }
-            else
+            } else
             {
               $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();
+          if($vcard_obj->categories) {
+                      $categories = $vcard_obj->categories[0];
+          } else {
+                      $categories = array();
+          }
 
           // check for quickdial entry
           if(isset($vcard_obj->note[0]))
@@ -413,9 +435,9 @@ 
                 break;
               }
             }
-          } 
-          else
-            $add_entry = 1;
+          } else {
+                      $add_entry = 1;
+          }
 
           if($add_entry == 1)
           {
@@ -428,8 +450,7 @@ 
               {
                 $type = "mobile";
                 $phone_number = $t;
-              }
-              else
+              } else
               {
                 $phone_number = $t['value'];
                 
@@ -439,10 +460,11 @@ 
                   if($qd_phone_nr == $phone_number_clean)
                   {
                     //Set quickdial
-                    if($value == 1)
-                      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";
+                    if($value == 1) {
+                                          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";
+                    }
 
                     $quickdial = $value;
                   }
@@ -451,24 +473,26 @@ 
                 $typearr_lower = unserialize(strtolower(serialize($t['type'])));
 
                 // find out priority
-                if(in_array("pref", $typearr_lower))
-                  $prio = 1;
+                if(in_array("pref", $typearr_lower)) {
+                                  $prio = 1;
+                }
 
                 // set the proper type
-                if(in_array("cell", $typearr_lower))
-                  $type = "mobile";
-                elseif(in_array("home", $typearr_lower))
-                  $type = "home";
-                elseif(in_array("fax", $typearr_lower))
-                  $type = "fax_work";
-                elseif(in_array("work", $typearr_lower))
-                  $type = "work";
-                elseif(in_array("other", $typearr_lower))
-                  $type = "other";
-                elseif(in_array("dom", $typearr_lower))
-                  $type = "other";
-                else
-                  continue;
+                if(in_array("cell", $typearr_lower)) {
+                                  $type = "mobile";
+                } elseif(in_array("home", $typearr_lower)) {
+                                  $type = "home";
+                } elseif(in_array("fax", $typearr_lower)) {
+                                  $type = "fax_work";
+                } elseif(in_array("work", $typearr_lower)) {
+                                  $type = "work";
+                } elseif(in_array("other", $typearr_lower)) {
+                                  $type = "other";
+                } elseif(in_array("dom", $typearr_lower)) {
+                                  $type = "other";
+                } else {
+                                  continue;
+                }
               }
               $phone_no[] =  array("type"=>$type, "prio"=>$prio, "quickdial"=>$quickdial, "value" => $this->_clear_phone_number($phone_number));
             }
@@ -482,19 +506,19 @@ 
                 {
                   $type_email = "work";
                   $email = $e;
-                }
-                else
+                } else
                 {
                   $email = $e['value'];
                   $typearr_lower = unserialize(strtolower(serialize($e['type'])));
-                  if(in_array("work", $typearr_lower))
-                    $type_email = "work";
-                  elseif(in_array("home", $typearr_lower))
-                    $type_email = "home";
-                  elseif(in_array("other", $typearr_lower))
-                    $type_email = "other";
-                  else
-                    continue;
+                  if(in_array("work", $typearr_lower)) {
+                                      $type_email = "work";
+                  } elseif(in_array("home", $typearr_lower)) {
+                                      $type_email = "home";
+                  } elseif(in_array("other", $typearr_lower)) {
+                                      $type_email = "other";
+                  } else {
+                                      continue;
+                  }
                 }
 
                 // DEBUG: print out the email address on the console
@@ -521,8 +545,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!');
+    if(empty($this->entries)) {
+          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>');
@@ -560,8 +585,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;
+      if($id == 0) {
+              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");
@@ -599,8 +625,7 @@ 
               file_put_contents($photo_file . ".b64", $photo_data);
               $this->base64_to_jpeg($photo_file . ".b64", $photo_file);
               unlink($photo_file . ".b64");
-            }
-            else
+            } else
             {
               print "  WARNING: non-base64 encoded photo data found and used." . PHP_EOL;
               file_put_contents($photo_file, $photo_data);
@@ -610,19 +635,18 @@ 
             $person->addChild("imageURL", $this->config['fritzbox_path'].$this->config['usb_disk']."FRITZ/fonpix/".basename($photo_file));
 
             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')
+        } elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
         {
           // add contact photo to xml
           $person->addChild("imageURL", $entry['photo_data'][0]);
 
           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");
@@ -641,21 +665,23 @@ 
 
   public function _concat ($text1,$text2)
   {
-    if($text1 == '')
-      return $text2;
-    elseif($text2 == '')
-      return $text1;
-    else
-      return $text1.", ".$text2;
+    if($text1 == '') {
+          return $text2;
+    } elseif($text2 == '') {
+          return $text1;
+    } else {
+          return $text1.", ".$text2;
+    }
   }
 
   public function _parse_fb_result($text)
   {
     preg_match("/\<h2\>([^\<]+)\<\/h2\>/", $text, $matches);
-    if($matches)
-      return $matches[1];
-    else
-      return "Error while uploading xml to fritzbox";
+    if($matches) {
+          return $matches[1];
+    } else {
+          return "Error while uploading xml to fritzbox";
+    }
   }
 
   public function upload_to_fb()
@@ -740,13 +766,14 @@ 
                   }
 
                   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;
+                  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;
+                  }
+                } else {
+                                  print " ok." . PHP_EOL;
                 }
-                else
-                  print " ok." . PHP_EOL;
 
                 // cleanup old files
                 foreach($all_existing_files as $existing_file)
@@ -757,30 +784,30 @@ 
                     ftp_delete($conn_id, $remote_path . "/" . basename($existing_file));
                   }
                 }
+              } 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'];
     if(filter_var($hostname, FILTER_VALIDATE_IP))
     {
       $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;
-      else
+      if($hostname ==  $this->config['fritzbox_ip']) {
+              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;
         $this->config['fritzbox_ip'] = $hostname;
@@ -812,8 +839,7 @@ 
       unset($fritz);  // destroy the object to log out
 
       print "  FRITZ!Box returned message: '" . $msg . "'" . PHP_EOL;
-    }
-    catch(Exception $e)
+    } catch(Exception $e)
     {
       print "  ERROR: " . $e->getMessage() . PHP_EOL;     // show the error message in anything failed
     }