@@ -61,13 +61,13 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | // values separated by semikolon |
| 64 | - $strValue = ';'; // post office address (not supported) |
|
| 65 | - $strValue .= ';'; // extended address (not supported) |
|
| 66 | - $strValue .= $this->maskString($this->strStr) . ';'; // street (including house number) |
|
| 67 | - $strValue .= $this->maskString($this->strCity) . ';'; // city |
|
| 68 | - $strValue .= $this->maskString($this->strRegion) . ';'; // region |
|
| 69 | - $strValue .= $this->maskString($this->strPostcode) . ';'; // postal code |
|
| 70 | - $strValue .= $this->maskString($this->strCountry); // country |
|
| 64 | + $strValue = ';'; // post office address (not supported) |
|
| 65 | + $strValue .= ';'; // extended address (not supported) |
|
| 66 | + $strValue .= $this->maskString($this->strStr) . ';'; // street (including house number) |
|
| 67 | + $strValue .= $this->maskString($this->strCity) . ';'; // city |
|
| 68 | + $strValue .= $this->maskString($this->strRegion) . ';'; // region |
|
| 69 | + $strValue .= $this->maskString($this->strPostcode) . ';'; // postal code |
|
| 70 | + $strValue .= $this->maskString($this->strCountry); // country |
|
| 71 | 71 | |
| 72 | 72 | return $this->buildProperty($strField, $strValue, false); |
| 73 | 73 | } |
@@ -87,8 +87,8 @@ discard block |
||
| 87 | 87 | // values separated by semikolon |
| 88 | 88 | $strValue = $this->strStr . PHP_EOL; |
| 89 | 89 | $strValue .= $this->strPostcode . ' ' . $this->strCity . PHP_EOL; |
| 90 | - if (strlen($this->strRegion) > 0 || strlen($this->strCountry) > 0 ) { |
|
| 91 | - $strSep = (strlen($this->strRegion) > 0 && strlen($this->strCountry) > 0 ) ? ' - ' : ''; |
|
| 90 | + if (strlen($this->strRegion) > 0 || strlen($this->strCountry) > 0) { |
|
| 91 | + $strSep = (strlen($this->strRegion) > 0 && strlen($this->strCountry) > 0) ? ' - ' : ''; |
|
| 92 | 92 | $strValue .= $this->strRegion . $strSep . $this->strCountry . PHP_EOL; |
| 93 | 93 | } |
| 94 | 94 | |
@@ -113,19 +113,19 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | $aSplit = $this->explodeMaskedString(';', $strValue); |
| 115 | 115 | if (isset($aSplit[2])) { |
| 116 | - $this->strStr = $this->unmaskString($aSplit[2]); // street (including house number) |
|
| 116 | + $this->strStr = $this->unmaskString($aSplit[2]); // street (including house number) |
|
| 117 | 117 | } |
| 118 | 118 | if (isset($aSplit[3])) { |
| 119 | - $this->strCity = $this->unmaskString($aSplit[3]); // city |
|
| 119 | + $this->strCity = $this->unmaskString($aSplit[3]); // city |
|
| 120 | 120 | } |
| 121 | 121 | if (isset($aSplit[4])) { |
| 122 | - $this->strRegion = $this->unmaskString($aSplit[4]); // region |
|
| 122 | + $this->strRegion = $this->unmaskString($aSplit[4]); // region |
|
| 123 | 123 | } |
| 124 | 124 | if (isset($aSplit[5])) { |
| 125 | - $this->strPostcode = $this->unmaskString($aSplit[5]); // postal code |
|
| 125 | + $this->strPostcode = $this->unmaskString($aSplit[5]); // postal code |
|
| 126 | 126 | } |
| 127 | 127 | if (isset($aSplit[6])) { |
| 128 | - $this->strCountry = $this->unmaskString($aSplit[6]); // country |
|
| 128 | + $this->strCountry = $this->unmaskString($aSplit[6]); // country |
|
| 129 | 129 | } |
| 130 | 130 | if (isset($aParams['TYPE'])) { |
| 131 | 131 | $this->strType = $aParams['TYPE']; |
@@ -436,7 +436,7 @@ discard block |
||
| 436 | 436 | { |
| 437 | 437 | if (filter_var($strFilename, FILTER_VALIDATE_URL)) { |
| 438 | 438 | // get type from extension |
| 439 | - $strType = strtolower((string)pathinfo($strFilename, PATHINFO_EXTENSION)); |
|
| 439 | + $strType = strtolower((string) pathinfo($strFilename, PATHINFO_EXTENSION)); |
|
| 440 | 440 | $this->blobPortrait = 'data:image/' . $strType . ';base64,'; |
| 441 | 441 | |
| 442 | 442 | // use curl to be independet of [allow_url_fopen] enabled on system |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | $img = $this->imageFromString($strImage, $strType); |
| 582 | 582 | imagealphablending($img, true); |
| 583 | 583 | imagesavealpha($img, true); |
| 584 | - $strExt = strtolower((string)pathinfo($strFilename, PATHINFO_EXTENSION)); |
|
| 584 | + $strExt = strtolower((string) pathinfo($strFilename, PATHINFO_EXTENSION)); |
|
| 585 | 585 | if (strlen($strExt) == 0) { |
| 586 | 586 | $strExt = strtolower($strType); |
| 587 | 587 | $strFilename .= '.' . $strExt; |
@@ -631,7 +631,7 @@ discard block |
||
| 631 | 631 | $oAddr = $this->aAddress[$i]; |
| 632 | 632 | } |
| 633 | 633 | } else { |
| 634 | - foreach ($this->aAddress as $oAddr) { |
|
| 634 | + foreach ($this->aAddress as $oAddr) { |
|
| 635 | 635 | if (strpos($oAddr->getType(), $i) !== false) { |
| 636 | 636 | return $oAddr; |
| 637 | 637 | } |
@@ -102,10 +102,10 @@ |
||
| 102 | 102 | } |
| 103 | 103 | // vcf-file generation doesn't make sense if some errormessage generated before... |
| 104 | 104 | if (!$bTest && ob_get_contents() == '') { |
| 105 | - header( 'Content-Type: text/x-vCard; name=' . $strFilename); |
|
| 106 | - header( 'Content-Length: ' . strlen($buffer)); |
|
| 107 | - header( 'Connection: close'); |
|
| 108 | - header( 'Content-Disposition: attachment; filename=' . $strFilename); |
|
| 105 | + header('Content-Type: text/x-vCard; name=' . $strFilename); |
|
| 106 | + header('Content-Length: ' . strlen($buffer)); |
|
| 107 | + header('Connection: close'); |
|
| 108 | + header('Content-Disposition: attachment; filename=' . $strFilename); |
|
| 109 | 109 | } else { |
| 110 | 110 | // output for test or in case of errors |
| 111 | 111 | $buffer = str_replace(PHP_EOL, '<br>', $buffer); |