projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add UFC_Mentor_*
[platal.git]
/
include
/
vcard.inc.php
diff --git
a/include/vcard.inc.php
b/include/vcard.inc.php
index
dfdadaa
..
619f954
100644
(file)
--- a/
include/vcard.inc.php
+++ b/
include/vcard.inc.php
@@
-37,7
+37,7
@@
class VCard extends PlVCard
public function addUser($user)
{
public function addUser($user)
{
- $user =
User::getSilen
t($user);
+ $user =
Profile::ge
t($user);
if ($user) {
$this->user_list[] = $user;
$this->count++;
if ($user) {
$this->user_list[] = $user;
$this->count++;
@@
-59,7
+59,7
@@
class VCard extends PlVCard
{
global $globals;
$login = $entry['value'];
{
global $globals;
$login = $entry['value'];
- $user = get_user_details($login->
login
());
+ $user = get_user_details($login->
hrid
());
if (empty($user['nom_usage'])) {
$entry = new PlVCardEntry($user['prenom'], $user['nom'], null, null, @$user['nickname']);
if (empty($user['nom_usage'])) {
$entry = new PlVCardEntry($user['prenom'], $user['nom'], null, null, @$user['nickname']);
@@
-113,7
+113,7
@@
class VCard extends PlVCard
// Pro
if (!empty($user['adr_pro'])) {
foreach ($user['adr_pro'] as $pro) {
// Pro
if (!empty($user['adr_pro'])) {
foreach ($user['adr_pro'] as $pro) {
- $street = array($
adr
['adr1']);
+ $street = array($
pro
['adr1']);
if (!empty($pro['adr2'])) {
$street[] = $pro['adr2'];
}
if (!empty($pro['adr2'])) {
$street[] = $pro['adr2'];
}
@@
-137,8
+137,8
@@
class VCard extends PlVCard
// Melix
$res = XDB::query(
"SELECT alias
// Melix
$res = XDB::query(
"SELECT alias
- FROM virtual
- INNER JOIN virtual_redirect
USING(
vid)
+ FROM virtual
AS v
+ INNER JOIN virtual_redirect
AS vr ON (v.vid = vr.
vid)
INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' )
WHERE ( redirect={?} OR redirect={?} )
AND alias LIKE '%@{$globals->mail->alias_dom}'",
INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' )
WHERE ( redirect={?} OR redirect={?} )
AND alias LIKE '%@{$globals->mail->alias_dom}'",