jens-maus / carddav2fb

carddav2fb.php

Indentation +17 added lines, -17 removed lines

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

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