jens-maus / carddav2fb

lib/vCard-parser/test.php

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

lib/fritzbox_api_php/fritzbox_ring_phone.php

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

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

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

Spacing +4 added lines, -4 removed lines

@@ -23,11 +23,11 @@ 
   // init the output message
   $message = date('Y-m-d H:i') . ' ';
   
-  if ( !$fritz->config->getItem('foncallslist_path') )
+  if(!$fritz->config->getItem('foncallslist_path'))
   {
     throw new Exception('Mandatory config Item foncallslist_path not set.');
   }
-  if ( ( file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable($fritz->config->getItem('foncallslist_path')) ) || ( !file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable(dirname($fritz->config->getItem('foncallslist_path'))) ) )
+  if((file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable($fritz->config->getItem('foncallslist_path'))) || (!file_exists($fritz->config->getItem('foncallslist_path')) && !is_writable(dirname($fritz->config->getItem('foncallslist_path')))))
   {
     throw new Exception('Config item foncallslist_path (' . $fritz->config->getItem('foncallslist_path') . ') is not writeable.');
   }
@@ -54,13 +54,13 @@ 
   // set a log message
   $message .= 'Call list sucessfully downloaded';
 }
-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);
 }

carddav2fb.php

Spacing +5 added lines, -5 removed lines

@@ -263,7 +263,7 @@ 
           if(isset($org_arr['name']) and $this->config['orgname'])
             $orgname = trim($org_arr['name']);
 
-          if (isset($vcard_obj->fn[0]))
+          if(isset($vcard_obj->fn[0]))
             $formattedname = $vcard_obj->fn[0];
 
           $firstname = trim($name_arr['firstname']);
@@ -668,7 +668,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)
       {
@@ -676,13 +676,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