<?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 *
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-require_once('xorg.misc.inc.php');
require_once('user.func.inc.php');
class VCardIterator implements PlIterator
public function add_user($user)
{
- $this->user_list[] = get_user_forlife($user);
- $this->count++;
+ $forlife = get_user_forlife($user, '_silent_user_callback');
+ if ($forlife) {
+ $this->user_list[] = get_user_forlife($user);
+ $this->count++;
+ }
}
public function first()
INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' )
WHERE ( redirect={?} OR redirect={?} )
AND alias LIKE '%@{$globals->mail->alias_dom}'",
- S::v('uid'),
+ $user['user_id'],
$user['forlife'].'@'.$globals->mail->domain,
$user['forlife'].'@'.$globals->mail->domain2);
$user['virtualalias'] = $res->fetchOneCell();
- $user['gpxs_vcardjoin'] = join(',', array_map(array('VCard', 'text_encode'), $user['gpxs_name']));
- $user['binets_vcardjoin'] = join(',', array_map(array('VCard', 'text_encode'), $user['binets']));
+ $user['gpxs_vcardjoin'] = join(', ', array_map(array('VCard', 'text_encode'), $user['gpxs_name']));
+ $user['binets_vcardjoin'] = join(', ', array_map(array('VCard', 'text_encode'), $user['binets']));
// get photo
if ($this->photos) {
$res = XDB::query(
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)
header("Pragma: ");
header("Cache-Control: ");
header("Content-type: text/x-vcard; charset=UTF-8");
- header("Content-Transfer-Encoding: 8bit");
}
}