@@ -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']; |