<?php
/***************************************************************************
- * Copyright (C) 2003-2007 Polytechnique.org *
+ * Copyright (C) 2003-2008 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
public static function escape($text)
{
if (VCard::$windows) {
- return preg_replace('/;/', '\\\\$0', $text);
+ return str_replace(';', '\\\\;', $text);
} else {
- return preg_replace('/[,;]/', '\\\\$0', $text);
+ return str_replace(array(';', ','), array('\\\\;', '\\\\,'), $text);
}
}
$adr = trim("$adr\n$adr2");
$adr = trim("$adr\n$adr3");
return VCard::text_encode(';;'
- . VCard::escape($adr) . ';'
- . VCard::escape($city) . ';'
- . VCard::escape($region) . ';'
- . VCard::escape($postcode) . ';'
- . VCard::escape($country), false);
+ . (VCard::$windows ? VCard::escape($adr) : $adr) . ';'
+ . (VCard::$windows ? VCard::escape($city) : $city) . ';'
+ . (VCard::$windows ? VCard::escape($region) : $region) . ';'
+ . (VCard::$windows ? VCard::escape($postcode) : $postcode) . ';'
+ . (VCard::$windows ? VCard::escape($country) : $country), false);
}
public static function text_encode($text, $escape = true)
if (VCard::$windows) {
$text = utf8_decode($text);
}
- return preg_replace("/(\r\n|\n|\r)/", '\n', $text);
+ return str_replace(array("\r\n", "\n", "\r"), '\n', $text);
}
public function do_page(&$page)