jens-maus / carddav2fb

lib/fritzbox_api_php/fritzbox_tam_on_off.php

Spacing +3 added lines, -3 removed lines

@@ -25,13 +25,13 @@ 
   $message = date('Y-m-d H:i') . ' ';
 
   // handle the CLI arguments or give a help message
-  if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1) )
+  if (isset($argv[1]) && ($argv[1] == 0 || $argv[1] == 1))
   {
     $mode = (int)$argv[1];
   }
   else
   {
-    if ( $fritz->config->getItem('logging') == 'console' )
+    if ($fritz->config->getItem('logging') == 'console')
     {
       echo '
   Enables or disables an answering machine (TAM) of a Fritz!Box
@@ -97,7 +97,7 @@ 
 }
 
 // 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 +3 added lines, -3 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.');
   }
@@ -61,7 +61,7 @@ 
 }
 
 // log the result
-if ( isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api' )
+if (isset($fritz) && is_object($fritz) && get_class($fritz) == 'fritzbox_api')
 {
   $fritz->logMessage($message);
 }

lib/vCard-parser/vCard.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 		/**
 		 * @var string Current object mode - error, single or multiple (for a single vCard within a file and multiple combined vCards)
 		 */
-		private $Mode;  //single, multiple, error
+		private $Mode; //single, multiple, error
 
 		private $Path = '';
 		private $RawData = '';
@@ -79,7 +79,7 @@ 
 			{
 				if (!is_readable($Path))
 				{
-					throw new Exception('vCard: Path not accessible ('.$Path.')');
+					throw new Exception('vCard: Path not accessible (' . $Path . ')');
 				}
 
 				$this -> Path = $Path;
@@ -134,7 +134,7 @@ 
 				{
 					// Prepending "BEGIN:VCARD" to the raw string because we exploded on that one.
 					// If there won't be the BEGIN marker in the new object, it will fail.
-					$SinglevCardRawData = 'BEGIN:VCARD'."\n".$SinglevCardRawData;
+					$SinglevCardRawData = 'BEGIN:VCARD' . "\n" . $SinglevCardRawData;
 
 					$ClassName = get_class($this);
 					$this -> Data[] = new $ClassName(false, $SinglevCardRawData);
@@ -377,7 +377,7 @@ 
 			}
 			else
 			{
-				throw new Exception('vCard: Cannot save file ('.$Key.'), target path not writable ('.$TargetPath.')');
+				throw new Exception('vCard: Cannot save file (' . $Key . '), target path not writable (' . $TargetPath . ')');
 			}
 			return false;
 		}
@@ -458,8 +458,8 @@ 
 		 */
 		public function __toString()
 		{
-			$Text = 'BEGIN:VCARD'.self::endl;
-			$Text .= 'VERSION:3.0'.self::endl;
+			$Text = 'BEGIN:VCARD' . self::endl;
+			$Text .= 'VERSION:3.0' . self::endl;
 
 			foreach ($this -> Data as $Key => $Values)
 			{
@@ -476,7 +476,7 @@ 
 					$Text .= $KeyUC;
 					if (is_array($Value) && isset($Value['type']))
 					{
-						$Text .= ';TYPE='.self::PrepareTypeStrForOutput($Value['type']);
+						$Text .= ';TYPE=' . self::PrepareTypeStrForOutput($Value['type']);
 					}
 					$Text .= ':';
 
@@ -502,7 +502,7 @@ 
 				}
 			}
 
-			$Text .= 'END:VCARD'.self::endl;
+			$Text .= 'END:VCARD' . self::endl;
 			return $Text;
 		}
 
@@ -603,7 +603,7 @@ 
 				}
 				elseif (count($Parameter) > 2)
 				{
-					if(count(explode(',', $RawParams[$Index], -1)) > 0)
+					if (count(explode(',', $RawParams[$Index], -1)) > 0)
 					{
 						$TempTypeParams = self::ParseParameters($Key, explode(',', $RawParams[$Index]));
 						if ($TempTypeParams['type'])

lib/vCard-parser/write-test.php

Spacing +1 added lines, -1 removed lines

@@ -16,5 +16,5 @@
 
 	//$vCard = new vCard('Example3.0.vcf');
 
-	echo '<pre>'.$vCard.'</pre>';
+	echo '<pre>' . $vCard . '</pre>';
 ?>
\ No newline at end of file

lib/vCard-parser/test.php

Spacing +23 added lines, -24 removed lines

@@ -34,7 +34,7 @@ 
 	 */
 	function OutputvCard(vCard $vCard)
 	{
-		echo '<h2>'.$vCard -> FN[0].'</h2>';
+		echo '<h2>' . $vCard -> FN[0] . '</h2>';
 
 		if ($vCard -> PHOTO)
 		{
@@ -42,11 +42,11 @@ 
 			{
 				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 />';
 				}
 
 				/*
@@ -69,16 +69,15 @@ 
 
 		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)
 		{
-			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)
@@ -88,11 +87,11 @@ 
 			{
 				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>';
@@ -109,7 +108,7 @@ 
 				}
 				else
 				{
-					echo $Email['value'].' ('.implode(', ', $Email['type']).')<br />';
+					echo $Email['value'] . ' (' . implode(', ', $Email['type']) . ')<br />';
 				}
 			}
 			echo '</p>';
@@ -122,11 +121,11 @@ 
 			{
 				if (is_scalar($URL))
 				{
-					echo $URL.'<br />';
+					echo $URL . '<br />';
 				}
 				else
 				{
-					echo $URL['value'].'<br />';
+					echo $URL['value'] . '<br />';
 				}
 			}
 			echo '</p>';
@@ -139,11 +138,11 @@ 
 			{
 				if (is_scalar($IMPP))
 				{
-					echo $IMPP.'<br />';
+					echo $IMPP . '<br />';
 				}
 				else
 				{
-					echo $IMPP['value'].'<br/ >';
+					echo $IMPP['value'] . '<br/ >';
 				}
 			}
 			echo '</p>';
@@ -153,14 +152,14 @@ 
 		{
 			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>';
 		}
@@ -172,7 +171,7 @@ 
 			{
 				if (is_scalar($Agent))
 				{
-					echo '<div class="Agent">'.$Agent.'</div>';
+					echo '<div class="Agent">' . $Agent . '</div>';
 				}
 				elseif (is_a($Agent, 'vCard'))
 				{

lib/CardDAV-PHP/carddav.php

Spacing +9 added lines, -9 removed lines

@@ -208,7 +208,7 @@ 
     const EXCEPTION_WRONG_HTTP_STATUS_CODE_ADD              = 1004;
     const EXCEPTION_WRONG_HTTP_STATUS_CODE_UPDATE           = 1005;
     const EXCEPTION_MALFORMED_XML_RESPONSE                  = 1006;
-    const EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID             = 1007;
+    const EXCEPTION_COULD_NOT_GENERATE_NEW_VCARD_ID = 1007;
 
 
     /**
@@ -370,14 +370,14 @@ 
 	switch ($result['http_code'])
         {
 		case 404:
-			$altResult  = $this->query($this->url . $vcard_id , 'GET');
+			$altResult = $this->query($this->url . $vcard_id, 'GET');
 		        // DEBUG: print the response of the carddav-server
 		        // print_r($altResult);
 	                switch ($altResult['http_code'])
         	        {
                 	        case 200:
 	                        case 207:
-					print "Ignoring given Vcard Extension (".$this->url_vcard_extension.")" . PHP_EOL. ".";
+					print "Ignoring given Vcard Extension (" . $this->url_vcard_extension . ")" . PHP_EOL . ".";
 					$this->setVcardExtension("");
         	                        return $altResult['response'];
 	                }
@@ -510,12 +510,12 @@ 
     public function add($vcard, $vcard_id = null)
     {
         if ($vcard_id === null) {
-            $vcard_id   = $this->generateVcardId();
+            $vcard_id = $this->generateVcardId();
         }
         $vcard  = $this->cleanVcard($vcard);
         $result = $this->query($this->url . $vcard_id . $this->url_vcard_extension, 'PUT', $vcard, 'text/vcard');
 
-        switch($result['http_code'])
+        switch ($result['http_code'])
         {
             case 201:
                 return $vcard_id;
@@ -649,7 +649,7 @@ 
             curl_setopt($this->curl, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($this->curl, CURLOPT_SSL_VERIFYPEER, false);
             curl_setopt($this->curl, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($this->curl, CURLOPT_USERAGENT, self::USERAGENT.self::VERSION);
+            curl_setopt($this->curl, CURLOPT_USERAGENT, self::USERAGENT . self::VERSION);
 
             if ($this->auth !== null) {
                 curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
@@ -690,7 +690,7 @@ 
         }
 
         if ($content_type !== null) {
-            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: '.$content_type, 'Depth: 1'));
+            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-type: ' . $content_type, 'Depth: 1'));
         } else {
             curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Depth: 1'));
         }
@@ -698,7 +698,7 @@ 
         $complete_response  = curl_exec($this->curl);
         $header_size        = curl_getinfo($this->curl, CURLINFO_HEADER_SIZE);
         $http_code          = curl_getinfo($this->curl, CURLINFO_HTTP_CODE);
-        $header                 = trim(substr($complete_response, 0, $header_size));
+        $header = trim(substr($complete_response, 0, $header_size));
         $response           = substr($complete_response, $header_size);
 
         $return = array(
@@ -728,7 +728,7 @@ 
     {
         $vcard_id = null;
 
-        for ($number = 0; $number <= 25; $number ++) {
+        for ($number = 0; $number <= 25; $number++) {
             if ($number == 8 || $number == 17) {
                 $vcard_id .= '-';
             } else {