Stefanius67 / VCard

SKien/VCard/VCardContact.php

Spacing +26 added lines, -26 removed lines

@@ -45,19 +45,19 @@ 
     /** @var string  role / profession  */
     protected string $strRole = '';
     /** @var array   array of VCardAddress objects  */
-    protected ?array $aAddress     = null;
+    protected ?array $aAddress = null;
     /** @var int     index of preferred address */
     protected int $iPrefAddress = 0;
     /** @var array   array of phone numbers */
-    protected ?array $aPhone       = null;
+    protected ?array $aPhone = null;
     /** @var int     index of preferred phone number    */
     protected int $iPrefPhone = 0;
     /** @var array   array of email addresses   */
-    protected ?array $aEMail       = null;
+    protected ?array $aEMail = null;
     /** @var int     index of preferred mail address    */
     protected int $iPrefEMail = 0;
     /** @var array   array of categories    */
-    protected ?array $aCategories  = null;
+    protected ?array $aCategories = null;
     /** @var string  homepage URL   */
     protected string $strHomepage = '';
     /** @var string  date of birth in format YYYY-DD-MM */
@@ -94,11 +94,11 @@ 
         $buffer .= 'VERSION:3.0' . PHP_EOL;
 
         // name properties
-        $strName  = $this->maskString($this->strLastName) . ';';    // family name
-        $strName .= $this->maskString($this->strFirstName) . ';';   // given name
-        $strName .= ';';                                            // additional name(s)
-        $strName .= $this->maskString($this->strPrefix) . ';';      // honorific prefixes
-        $strName .= $this->maskString($this->strSuffix);            // honorific suffixes
+        $strName  = $this->maskString($this->strLastName) . ';'; // family name
+        $strName .= $this->maskString($this->strFirstName) . ';'; // given name
+        $strName .= ';'; // additional name(s)
+        $strName .= $this->maskString($this->strPrefix) . ';'; // honorific prefixes
+        $strName .= $this->maskString($this->strSuffix); // honorific suffixes
 
         $buffer .= $this->buildProperty('N', $strName, false);
         $buffer .= $this->buildProperty('FN', $this->strFirstName . ' ' . $this->strLastName);
@@ -113,15 +113,15 @@ 
         $buffer .= $this->buildProperty('ROLE', $this->strRole);
 
         // addresses
-        foreach ($this->aAddress as $i => $oAddress ) {
+        foreach ($this->aAddress as $i => $oAddress) {
             $buffer .= $oAddress->buildFullAddress($i == $this->iPrefAddress);
             $buffer .= $oAddress->buildLabel($i == $this->iPrefAddress);
         }
         // set preferred address also as default postal address for MS
-        $buffer .= $this->buildProperty('X-MS-OL-DEFAULT-POSTAL-ADDRESS', (string)($this->iPrefAddress + 1));
+        $buffer .= $this->buildProperty('X-MS-OL-DEFAULT-POSTAL-ADDRESS', (string) ($this->iPrefAddress + 1));
 
         // phone numbers
-        foreach ($this->aPhone as $i => $aPhone ) {
+        foreach ($this->aPhone as $i => $aPhone) {
             $strName = 'TEL;TYPE=' . $aPhone['strType'];
             if ($i == $this->iPrefPhone) {
                 $strName .= ',PREF';
@@ -130,7 +130,7 @@ 
         }
 
         // mailaddresses
-        foreach ($this->aEMail as $i => $strEMail ) {
+        foreach ($this->aEMail as $i => $strEMail) {
             $strName = 'EMAIL;TYPE=INTERNET';
             if ($i == $this->iPrefEMail) {
                 $strName .= ',PREF';
@@ -143,10 +143,10 @@ 
         // personal data
         $buffer .= $this->buildProperty('BDAY', $this->strDateOfBirth);
         if ($this->iGender > 0) {
-            $buffer .= $this->buildProperty('X-WAB-GENDER', (string)$this->iGender);
+            $buffer .= $this->buildProperty('X-WAB-GENDER', (string) $this->iGender);
         }
         // categories
-        if (count($this->aCategories) > 0 ) {
+        if (count($this->aCategories) > 0) {
             $strSep = '';
             $strValue = '';
             foreach ($this->aCategories as $strCategory) {
@@ -160,12 +160,12 @@ 
         $buffer .= $this->buildProperty('NOTE', $this->strNote);
 
         // photo
-        if ( strlen($this->blobPortrait) > 0) {
+        if (strlen($this->blobPortrait) > 0) {
             // extract image type from binary data
             $strType = '';
             $strImage = '';
             $this->parseImageData($this->blobPortrait, $strType, $strImage);
-            if (strlen($strType) > 0 && strlen($strImage) > 0 ) {
+            if (strlen($strType) > 0 && strlen($strImage) > 0) {
                 $strName = 'PHOTO;TYPE=' . $strType . ';ENCODING=B';
                 $buffer .= $this->buildProperty($strName, $strImage, false);
                 $buffer .= PHP_EOL; // even though in vcard 3.0 spec blank line after binary value no longer is requires, MS Outlook need it...
@@ -245,15 +245,15 @@ 
     protected function parseName(string $strValue, array $aParams) : void
     {
         $aSplit = $this->explodeMaskedString(';', $strValue);
-        $this->strLastName = $this->unmaskString($aSplit[0]);       // family name
+        $this->strLastName = $this->unmaskString($aSplit[0]); // family name
         if (isset($aSplit[1])) {
-            $this->strFirstName = $this->unmaskString($aSplit[1]);  // given name
+            $this->strFirstName = $this->unmaskString($aSplit[1]); // given name
         }
         if (isset($aSplit[3])) {
-            $this->strPrefix = $this->unmaskString($aSplit[3]);     // honorific prefixes
+            $this->strPrefix = $this->unmaskString($aSplit[3]); // honorific prefixes
         }
         if (isset($aSplit[4])) {
-            $this->strSuffix = $this->unmaskString($aSplit[4]);     // honorific suffixes
+            $this->strSuffix = $this->unmaskString($aSplit[4]); // honorific suffixes
         }
     }
 
@@ -452,7 +452,7 @@ 
 
             $this->blobPortrait .= base64_encode($img);
 
-        } elseif(file_exists($strFilename)) {
+        } elseif (file_exists($strFilename)) {
             switch (exif_imagetype($strFilename)) {
                 case IMAGETYPE_JPEG:
                     $this->blobPortrait = 'data:image/jpg;base64,';
@@ -575,11 +575,11 @@ 
      */
     public function savePortrait(string $strFilename) : void
     {
-        if (strlen($this->blobPortrait) > 0 ) {
+        if (strlen($this->blobPortrait) > 0) {
             $strType = '';
             $strImage = '';
             $this->parseImageData($this->blobPortrait, $strType, $strImage);
-            if (strlen($strType) > 0 && strlen($strImage) > 0 ) {
+            if (strlen($strType) > 0 && strlen($strImage) > 0) {
                 $img = $this->imageFromString($strImage, $strType);
                 imagealphablending($img, true);
                 imagesavealpha($img, true);
@@ -633,7 +633,7 @@ 
                 $oAddr = $this->aAddress[$i];
             }
         } else {
-            foreach ($this->aAddress as $oAddr )    {
+            foreach ($this->aAddress as $oAddr) {
                 if (strpos($oAddr->getType(), $i) !== false) {
                     return $oAddr;
                 }
@@ -673,7 +673,7 @@ 
                 $aPhone = $this->aPhone[$i];
             }
         } else {
-            foreach ($this->aPhone as $aPhone ) {
+            foreach ($this->aPhone as $aPhone) {
                 if (strpos($aPhone['strType'], $i) !== false) {
                     return $aPhone;
                 }

SKien/VCard/VCard.php

Spacing +8 added lines, -8 removed lines

@@ -45,10 +45,10 @@ 
     const PARCEL    = 'PARCEL';
 
     /** max. length of line in vcard - file    */
-    const MAX_LINE_LENGTH   = 75;
+    const MAX_LINE_LENGTH = 75;
 
     /** no error    */
-    const OK    = 0;
+    const OK = 0;
 
     /** @var string  encoding for values    */
     static protected string $strEncoding = 'UTF-8';
@@ -96,16 +96,16 @@ 
      */
     public function write(string $strFilename, bool $bTest = false) : void
     {
-        $buffer  = '';
+        $buffer = '';
         foreach ($this->aContacts as $oContact) {
             $buffer .= $oContact->buildData();
         }
         // vcf-file generation doesn't make sense if some errormessage generated before...
         if (!$bTest && ob_get_contents() == '') {
-            header( 'Content-Type: text/x-vCard; name=' . $strFilename );
-            header( 'Content-Length: ' . strlen($buffer) );
-            header( 'Connection: close' );
-            header( 'Content-Disposition: attachment; filename=' . $strFilename );
+            header('Content-Type: text/x-vCard; name=' . $strFilename);
+            header('Content-Length: ' . strlen($buffer));
+            header('Connection: close');
+            header('Content-Disposition: attachment; filename=' . $strFilename);
         } else {
             // output for test or in case of errors
             $buffer = str_replace(PHP_EOL, '<br>', $buffer);
@@ -132,7 +132,7 @@ 
             // if line ends with '=', go on next line (ignore ending '=' sign!)
             if (substr($strLine, -1) == '=') {
                 while ($iLn < count($aLines) && substr($strLine, -1) == '=') {
-                    $strLine = rtrim($strLine, '=');  // remove ending '='
+                    $strLine = rtrim($strLine, '='); // remove ending '='
                     if (strlen(trim($aLines[$iLn])) == 0) {
                         break;
                     }

SKien/VCard/VCardHelper.php

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
      * @param bool      $bMask      have value to be masked (default: true)
      * @return string
      */
-    public function buildProperty(string $strName, string $strValue, bool $bMask=true) : string
+    public function buildProperty(string $strName, string $strValue, bool $bMask = true) : string
     {
         $buffer = '';
         if (!empty($strValue)) {
@@ -142,8 +142,8 @@ 
     {
         $aParams = array();
         for ($i = 1; $i < count($aParamsIn); $i++) {
-            $aSplit = explode('=',$aParamsIn[$i]);
-            if (count($aSplit)< 2) {
+            $aSplit = explode('=', $aParamsIn[$i]);
+            if (count($aSplit) < 2) {
                 // version 2.1 allows paramvalues without paramname
                 $strName = $this->paramName($aSplit[0]);
                 $strValue = strtoupper($aSplit[0]);
@@ -169,7 +169,7 @@ 
      */
     protected function paramName(string $strValue) : string
     {
-        static $aNames = array (
+        static $aNames = array(
             'INLINE'            => 'VALUE',
             'URI'               => 'VALUE',
             'URL'               => 'VALUE',
@@ -261,19 +261,19 @@ 
             $y = 1;
             $img = imagecreatetruecolor($width, $height);
             $body = substr($hex, 108);
-            $body_size = (strlen($body) / 2);
-            $header_size = ($width * $height);
-            $usePadding = ($body_size > ($header_size * 3) + 4);
-            for ($i = 0; $i < $body_size; $i+=3) {
+            $body_size = (strlen($body)/2);
+            $header_size = ($width*$height);
+            $usePadding = ($body_size > ($header_size*3) + 4);
+            for ($i = 0; $i < $body_size; $i += 3) {
                 if ($x >= $width) {
                     if ($usePadding)
-                        $i += $width % 4;
+                        $i += $width%4;
                     $x = 0;
                     $y++;
                     if ($y > $height)
                         break;
                 }
-                $i_pos = $i * 2;
+                $i_pos = $i*2;
                 $r = hexdec($body[$i_pos + 4] . $body[$i_pos + 5]);
                 $g = hexdec($body[$i_pos + 2] . $body[$i_pos + 3]);
                 $b = hexdec($body[$i_pos] . $body[$i_pos + 1]);

SKien/VCard/VCardAddress.php

Spacing +14 added lines, -14 removed lines

@@ -61,13 +61,13 @@ 
         }
 
         // values separated by semikolon
-        $strValue  = ';';                                           // post office address (not supported)
-        $strValue .= ';';                                           // extended address (not supported)
-        $strValue .= $this->maskString($this->strStr) . ';';        // street (including house number)
-        $strValue .= $this->maskString($this->strCity) . ';';       // city
-        $strValue .= $this->maskString($this->strRegion) . ';';     // region
-        $strValue .= $this->maskString($this->strPostcode) . ';';   // postal code
-        $strValue .= $this->maskString($this->strCountry);          // country
+        $strValue  = ';'; // post office address (not supported)
+        $strValue .= ';'; // extended address (not supported)
+        $strValue .= $this->maskString($this->strStr) . ';'; // street (including house number)
+        $strValue .= $this->maskString($this->strCity) . ';'; // city
+        $strValue .= $this->maskString($this->strRegion) . ';'; // region
+        $strValue .= $this->maskString($this->strPostcode) . ';'; // postal code
+        $strValue .= $this->maskString($this->strCountry); // country
 
         return $this->buildProperty($strField, $strValue, false);
     }
@@ -87,8 +87,8 @@ 
         // values separated by semikolon
         $strValue  = $this->strStr . PHP_EOL;
         $strValue .= $this->strPostcode . ' ' . $this->strCity . PHP_EOL;
-        if (strlen($this->strRegion) > 0 || strlen($this->strCountry) > 0 ) {
-            $strSep = (strlen($this->strRegion) > 0 && strlen($this->strCountry) > 0 ) ? ' - ' : '';
+        if (strlen($this->strRegion) > 0 || strlen($this->strCountry) > 0) {
+            $strSep = (strlen($this->strRegion) > 0 && strlen($this->strCountry) > 0) ? ' - ' : '';
             $strValue .= $this->strRegion . $strSep . $this->strCountry . PHP_EOL;
         }
 
@@ -113,19 +113,19 @@ 
     {
         $aSplit = $this->explodeMaskedString(';', $strValue);
         if (isset($aSplit[2])) {
-            $this->strStr = $this->unmaskString($aSplit[2]);        // street (including house number)
+            $this->strStr = $this->unmaskString($aSplit[2]); // street (including house number)
         }
         if (isset($aSplit[3])) {
-            $this->strCity = $this->unmaskString($aSplit[3]);       // city
+            $this->strCity = $this->unmaskString($aSplit[3]); // city
         }
         if (isset($aSplit[4])) {
-            $this->strRegion = $this->unmaskString($aSplit[4]);     // region
+            $this->strRegion = $this->unmaskString($aSplit[4]); // region
         }
         if (isset($aSplit[5])) {
-            $this->strPostcode = $this->unmaskString($aSplit[5]);   // postal code
+            $this->strPostcode = $this->unmaskString($aSplit[5]); // postal code
         }
         if (isset($aSplit[6])) {
-            $this->strCountry = $this->unmaskString($aSplit[6]);    // country
+            $this->strCountry = $this->unmaskString($aSplit[6]); // country
         }
         if (isset($aParams['TYPE'])) {
             $this->strType = $aParams['TYPE'];

ExportTest.php

Spacing +3 added lines, -3 removed lines

@@ -48,19 +48,19 @@
 	$oContact->setNote($strNote);

 

 	// insert multiple contacts

-	$oContact->setPortraitBlob(getBlobPortrait());			// Wiki von Flake

+	$oContact->setPortraitBlob(getBlobPortrait()); // Wiki von Flake

 	$oVCard->addContact($oContact);

 

 	// change name and portrait ... all other properties remains valid!

 	$oContact->setName('von Flake', 'Ilvy');

-	$oContact->setPortraitFile('images/sample2.png');	// Ilvy	von Flake

+	$oContact->setPortraitFile('images/sample2.png'); // Ilvy	von Flake

 	$oVCard->addContact($oContact);

 

 	// change name again and add some additional info....

 	$oContact->setName('von Flake', 'Halvar');

 	$oContact->setPrefix('Mr.');

 	$oContact->setStrSuffix('Häuptling');

-	$oContact->setPortraitFile('images/sample3.bmp');	// Halvar von Flake

+	$oContact->setPortraitFile('images/sample3.bmp'); // Halvar von Flake

 	$oVCard->addContact($oContact);

 

 	// and write to file

ImportTest.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 		$oContact = $oVCard->getContact($i);

 		echo '<h1>' . $oContact->getName() . '</h1>' . PHP_EOL;

 		$strPortraitBlob = $oContact->getPortraitBlob();

-		if (strlen($strPortraitBlob) > 0 ) {

+		if (strlen($strPortraitBlob) > 0) {

 			echo '<img style="float: left; margin: 0px 20px;" src="' . $strPortraitBlob . '">' . PHP_EOL;

 			// just save image as blob in db table ...

 			// ... or may create file on server (it's on you to set appropriate path and filename)

@@ -91,12 +91,12 @@ 
 		echo '<b>e-Mailaddresses:</b><br/>' . PHP_EOL;

 		$iPC = $oContact->getEMailCount();

 		for ($j = 0; $j < $iPC; $j++) {

-			echo 'Mail' . ($j+1) . ': ' . $oContact->getEMail($j) . '<br>' . PHP_EOL;

+			echo 'Mail' . ($j + 1) . ': ' . $oContact->getEMail($j) . '<br>' . PHP_EOL;

 		}

 		echo '<br/>' . PHP_EOL;

 

 		$strNote = $oContact->getNote();

-		if (strlen($strNote) > 0 )

+		if (strlen($strNote) > 0)

 		{

 			echo '<b>Annotation (may contain multiline value)</b><br/>' . PHP_EOL;

 			echo '<textarea cols="80" rows="5">' . $strNote . '</textarea>' . PHP_EOL;