projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into fusionax
[platal.git]
/
modules
/
profile
/
page.inc.php
diff --git
a/modules/profile/page.inc.php
b/modules/profile/page.inc.php
index
7c60a6d
..
45fc082
100644
(file)
--- a/
modules/profile/page.inc.php
+++ b/
modules/profile/page.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
8
Polytechnique.org *
+ * Copyright (C) 2003-200
9
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-119,25
+119,34
@@
class ProfilePhones implements ProfileSetting
{
private $tel;
private $pub;
{
private $tel;
private $pub;
+ protected $id;
protected $link_type;
protected $link_id;
protected $link_type;
protected $link_id;
- public function __construct($type, $
id
)
+ public function __construct($type, $
link_id, $id = 0
)
{
{
+ if ($id != 0) {
+ $this->id = $id;
+ } else {
+ $this->id = S::i('uid');
+ }
$this->tel = new ProfileTel();
$this->pub = new ProfilePub();
$this->link_type = $type;
$this->tel = new ProfileTel();
$this->pub = new ProfilePub();
$this->link_type = $type;
- $this->link_id
= $
id;
+ $this->link_id
= $link_
id;
}
public function value(ProfilePage &$page, $field, $value, &$success)
{
$success = true;
}
public function value(ProfilePage &$page, $field, $value, &$success)
{
$success = true;
- if (is_null($value)) {
- $value = isset($page->values[$field]) ? $page->values[$field] : array();
- }
- if (!is_array($value)) {
+ if (is_null($value) || !is_array($value)) {
$value = array();
$value = array();
+ $res = XDB::iterator("SELECT t.display_tel AS tel, t.tel_type AS type, t.pub, t.comment
+ FROM profile_phones AS t
+ WHERE t.uid = {?} AND t.link_type = {?}
+ ORDER BY t.tel_id",
+ $this->id, $this->link_type);
+ $value = $res->fetchAllAssoc();
}
foreach ($value as $key=>&$phone) {
if (@$phone['removed']) {
}
foreach ($value as $key=>&$phone) {
if (@$phone['removed']) {
@@
-169,8
+178,8
@@
class ProfilePhones implements ProfileSetting
search_tel, display_tel, pub, comment)
VALUES ({?}, {?}, {?}, {?}, {?},
{?}, {?}, {?}, {?})",
search_tel, display_tel, pub, comment)
VALUES ({?}, {?}, {?}, {?}, {?},
{?}, {?}, {?}, {?})",
-
S::i('uid')
, $this->link_type, $this->link_id, $telid, $phone['type'],
- format_phone_number($phone['tel']), $phone['tel'], $phone['pub'], $phone['comment']);
+
$this->id
, $this->link_type, $this->link_id, $telid, $phone['type'],
+
format_phone_number($phone['tel']), $phone['tel'], $phone['pub'], $phone['comment']);
}
}
}
}
@@
-178,7
+187,7
@@
class ProfilePhones implements ProfileSetting
{
XDB::execute("DELETE FROM profile_phones
WHERE uid = {?} AND link_type = {?} AND link_id = {?}",
{
XDB::execute("DELETE FROM profile_phones
WHERE uid = {?} AND link_type = {?} AND link_id = {?}",
-
S::i('uid')
, $this->link_type, $this->link_id);
+
$this->id
, $this->link_type, $this->link_id);
$this->saveTels($field, $value);
}
$this->saveTels($field, $value);
}
@@
-352,7
+361,6
@@
abstract class ProfilePage implements PlWizardPage
register_watch_op(S::i('uid'), WATCH_FICHE);
}
global $platal;
register_watch_op(S::i('uid'), WATCH_FICHE);
}
global $platal;
- $log =& $_SESSION['log'];
S::logger()->log('profil', $platal->pl_self(1));
}
S::logger()->log('profil', $platal->pl_self(1));
}