Commit 56c6f0e5beb4c49d6f524c82fb1b9646099cc301
1 parent
7273dc2994
Exists in
master
snSanitizer dan msgSanitizer
Showing 1 changed file with 22 additions and 9 deletions Side-by-side Diff
xmlout.js
| ... | ... | @@ -168,6 +168,24 @@ function _topupRequest(task, pendingOnConnectError) { |
| 168 | 168 | }); |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | +function snSanitizer(sn) { | |
| 172 | + if (!sn && typeof sn === 'string') { | |
| 173 | + return; | |
| 174 | + } | |
| 175 | + | |
| 176 | + sn = sn.replace(/[^A-Z0-9\/]/g, '-'); | |
| 177 | + sn = sn.replace(/-+/g, '-'); | |
| 178 | + sn = sn.replace(/^-+/, ''); | |
| 179 | + sn = sn.replace(/-+$/, ''); | |
| 180 | + sn = sn.trim(); | |
| 181 | + | |
| 182 | + return sn; | |
| 183 | +} | |
| 184 | + | |
| 185 | +function msgSanitizer(msg) { | |
| 186 | + return msg.replace(/;\s*SN=.+?;/, '; ').trim(); | |
| 187 | +} | |
| 188 | + | |
| 171 | 189 | function prefixMessageWithSN(data) { |
| 172 | 190 | |
| 173 | 191 | if (data['RESPONSECODE'] != '00') { |
| ... | ... | @@ -188,16 +206,11 @@ function prefixMessageWithSN(data) { |
| 188 | 206 | } |
| 189 | 207 | } |
| 190 | 208 | |
| 209 | + sn = snSanitizer(sn); | |
| 210 | + | |
| 191 | 211 | if (sn) { |
| 192 | - //sn = sn.replace(/ /g, '-'); | |
| 193 | - //sn = sn.replace(/[\()]/g, '-'); | |
| 194 | - sn = sn.replace(/[^A-Z0-9\/]/g, '-'); | |
| 195 | - sn = sn.replace(/-+/g, '-'); | |
| 196 | - sn = sn.replace(/^-+/, ''); | |
| 197 | - sn = sn.replace(/-+$/, ''); | |
| 198 | - sn = sn.replace(/;\s*SN=.+?;/, '; '); | |
| 199 | - sn = sn.trim(); | |
| 200 | - return 'SN=' + sn + '; ' + data['MESSAGE']; | |
| 212 | + msg = 'SN=' + sn + '; ' + data['MESSAGE']; | |
| 213 | + return msgSanitizer(msg); | |
| 201 | 214 | } |
| 202 | 215 | |
| 203 | 216 | return data['MESSAGE']; |