projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move paiement db in x4dat (tables payment*).
[platal.git]
/
include
/
name.func.inc.php
diff --git
a/include/name.func.inc.php
b/include/name.func.inc.php
index
968e251
..
aef47cd
100644
(file)
--- a/
include/name.func.inc.php
+++ b/
include/name.func.inc.php
@@
-60,16
+60,16
@@
function build_types($pub = null)
} else {
$sql_pub = "";
}
} else {
$sql_pub = "";
}
- $sql = "SELECT id, name
- FROM profile_name_
search_
enum
+ $sql = "SELECT id,
type,
name
+ FROM profile_name_enum
WHERE NOT FIND_IN_SET('not_displayed', flags)" . $sql_pub;
$sn_types = XDB::iterator($sql);
$types = array();
while ($sn_type = $sn_types->next()) {
if ($pub) {
WHERE NOT FIND_IN_SET('not_displayed', flags)" . $sql_pub;
$sn_types = XDB::iterator($sql);
$types = array();
while ($sn_type = $sn_types->next()) {
if ($pub) {
- $types[$sn_type['
nam
e']] = $sn_type['id'];
+ $types[$sn_type['
typ
e']] = $sn_type['id'];
} else {
} else {
- $types[$sn_type['id']] = $sn_type['name'];
+ $types[$sn_type['id']]
= $sn_type['name'];
}
}
return $types;
}
}
return $types;
@@
-78,29
+78,29
@@
function build_types($pub = null)
function build_full_name(&$search_names, &$sn_types)
{
$name = "";
function build_full_name(&$search_names, &$sn_types)
{
$name = "";
- if (isset($search_names[$sn_types['
Nom usuel
']])) {
- $name .= $search_names[$sn_types['
Nom usuel
']]['fullname'] . " ("
- . $search_names[$sn_types['
Nom patronymiqu
e']]['fullname'] . ")";
+ if (isset($search_names[$sn_types['
lastname_ordinary
']])) {
+ $name .= $search_names[$sn_types['
lastname_ordinary
']]['fullname'] . " ("
+ . $search_names[$sn_types['
lastnam
e']]['fullname'] . ")";
} else {
} else {
- $name .= $search_names[$sn_types['
Nom patronymiqu
e']]['fullname'];
+ $name .= $search_names[$sn_types['
lastnam
e']]['fullname'];
}
}
- if (isset($search_names[$sn_types['
Nom
marital']])
- || isset($search_names[$sn_types['
Pseudonyme (nom de plume)
']])) {
+ if (isset($search_names[$sn_types['
lastname_
marital']])
+ || isset($search_names[$sn_types['
pseudonym
']])) {
$name .= " (";
$name .= " (";
- if (isset($search_names[$sn_types['
Nom
marital']])) {
+ if (isset($search_names[$sn_types['
lastname_
marital']])) {
$user = S::user();
if ($user->isFemale()) {
$name .= "Mme ";
} else {
$name .= "M ";
}
$user = S::user();
if ($user->isFemale()) {
$name .= "Mme ";
} else {
$name .= "M ";
}
- $name .= $search_names[$sn_types['
Nom
marital']]['fullname'];
- if (isset($search_names[$sn_types['
Pseudonyme (nom de plume)
']])) {
+ $name .= $search_names[$sn_types['
lastname_
marital']]['fullname'];
+ if (isset($search_names[$sn_types['
pseudonym
']])) {
$name .= ", ";
}
}
$name .= ", ";
}
}
- if (isset($search_names[$sn_types['
Pseudonyme (nom de plume)
']])) {
- $name .= $search_names[$sn_types['
Pseudonyme (nom de plume)
']]['fullname'];
+ if (isset($search_names[$sn_types['
pseudonym
']])) {
+ $name .= $search_names[$sn_types['
pseudonym
']]['fullname'];
}
$name .= ")";
}
}
$name .= ")";
}
@@
-109,44
+109,44
@@
function build_full_name(&$search_names, &$sn_types)
function build_public_name(&$search_names, &$sn_types, $full_name)
{
function build_public_name(&$search_names, &$sn_types, $full_name)
{
- return $search_names[$sn_types['
Prénom
']]['fullname'] . " " . $full_name;
+ return $search_names[$sn_types['
firstname
']]['fullname'] . " " . $full_name;
}
function build_private_name(&$search_names, &$sn_types)
{
$name = "";
}
function build_private_name(&$search_names, &$sn_types)
{
$name = "";
- if (isset($search_names[$sn_types['
Surnom
']])
- || (isset($search_names[$sn_types['
Autre prénom
']])
- || isset($search_names[$sn_types['
Autre nom
']]))) {
+ if (isset($search_names[$sn_types['
nickname
']])
+ || (isset($search_names[$sn_types['
name_other
']])
+ || isset($search_names[$sn_types['
name_other
']]))) {
$name .= " (";
$name .= " (";
- if (isset($search_names[$sn_types['
Surnom
']])) {
- $name .= "alias " . $search_names[$sn_types['
Surnom
']]['fullname'];
+ if (isset($search_names[$sn_types['
nickname
']])) {
+ $name .= "alias " . $search_names[$sn_types['
nickname
']]['fullname'];
$i = 0;
$i = 0;
- while (isset($search_names[$sn_types['
Surnom
']][$i])) {
- $name .= ", " . $search_names[$sn_types['
Surnom
']][$i];
+ while (isset($search_names[$sn_types['
nickname
']][$i])) {
+ $name .= ", " . $search_names[$sn_types['
nickname
']][$i];
$i++;
}
$i++;
}
- if (isset($search_names[$sn_types['
Autre prénom
']])
- || isset($search_names[$sn_types['
Autre nom
']])) {
+ if (isset($search_names[$sn_types['
name_other
']])
+ || isset($search_names[$sn_types['
name_other
']])) {
$name .= ", ";
}
}
$name .= ", ";
}
}
- if (isset($search_names[$sn_types['
Autre prénom
']])) {
- $name .= "autres prénoms : " . $search_names[$sn_types['
Autre prénom
']]['fullname'];
+ if (isset($search_names[$sn_types['
firstname_other
']])) {
+ $name .= "autres prénoms : " . $search_names[$sn_types['
firstname_other
']]['fullname'];
$i = 0;
$i = 0;
- while (isset($search_names[$sn_types['
Autre prénom
']][$i])) {
- $name .= ", " . $search_names[$sn_types['
Autre prénom
']][$i];
+ while (isset($search_names[$sn_types['
firstname_other
']][$i])) {
+ $name .= ", " . $search_names[$sn_types['
firstname_other
']][$i];
$i++;
}
$i++;
}
- if (isset($search_names[$sn_types['
Autre nom
']])) {
+ if (isset($search_names[$sn_types['
name_other
']])) {
$name .= ", ";
}
}
$name .= ", ";
}
}
- if (isset($search_names[$sn_types['
Autre nom
']])) {
- $name .= "autres noms : " . $search_names[$sn_types['
Autre nom
']]['fullname'];
+ if (isset($search_names[$sn_types['
name_other
']])) {
+ $name .= "autres noms : " . $search_names[$sn_types['
name_other
']]['fullname'];
$i = 0;
$i = 0;
- while (isset($search_names[$sn_types['
Autre nom
']][$i])) {
- $name .= ", " . $search_names[$sn_types['
Autre nom
']][$i];
+ while (isset($search_names[$sn_types['
name_other
']][$i])) {
+ $name .= ", " . $search_names[$sn_types['
name_other
']][$i];
$i++;
}
}
$i++;
}
}
@@
-157,20
+157,20
@@
function build_private_name(&$search_names, &$sn_types)
function build_directory_name(&$search_names, &$sn_types, $full_name)
{
function build_directory_name(&$search_names, &$sn_types, $full_name)
{
- return $full_name . " " . $search_names[$sn_types['
Prénom
']]['fullname'];
+ return $full_name . " " . $search_names[$sn_types['
firstname
']]['fullname'];
}
function build_short_name(&$search_names, &$sn_types, &$alias = null)
{
}
function build_short_name(&$search_names, &$sn_types, &$alias = null)
{
- if (isset($search_names[$sn_types['
Nom usuel
']])) {
- $lastname = $search_names[$sn_types['
Nom usuel
']]['fullname'];
+ if (isset($search_names[$sn_types['
lastname_ordinary
']])) {
+ $lastname = $search_names[$sn_types['
lastname_ordinary
']]['fullname'];
} else {
} else {
- $lastname = $search_names[$sn_types['
Nom patronymiqu
e']]['fullname'];
+ $lastname = $search_names[$sn_types['
lastnam
e']]['fullname'];
}
}
- if (isset($search_names[$sn_types['
Prénom usuel
']])) {
- $firstname = $search_names[$sn_types['
Prénom usuel
']]['fullname'];
+ if (isset($search_names[$sn_types['
firstname_ordinary
']])) {
+ $firstname = $search_names[$sn_types['
firstname_ordinary
']]['fullname'];
} else {
} else {
- $firstname = $search_names[$sn_types['
Prénom
']]['fullname'];
+ $firstname = $search_names[$sn_types['
firstname
']]['fullname'];
}
if ($alias) {
$alias = make_username($firstname, $lastname);
}
if ($alias) {
$alias = make_username($firstname, $lastname);
@@
-181,12
+181,12
@@
function build_short_name(&$search_names, &$sn_types, &$alias = null)
function build_sort_name(&$search_names, &$sn_types)
{
$name = "";
function build_sort_name(&$search_names, &$sn_types)
{
$name = "";
- if (isset($search_names[$sn_types['
Nom usuel
']])) {
- $name .= $search_names[$sn_types['
Nom usuel
']]['name'];
+ if (isset($search_names[$sn_types['
lastname_ordinary
']])) {
+ $name .= $search_names[$sn_types['
lastname_ordinary
']]['name'];
} else {
} else {
- $name .= $search_names[$sn_types['
Nom patronymiqu
e']]['name'];
+ $name .= $search_names[$sn_types['
lastnam
e']]['name'];
}
}
- $name .= " " . $search_names[$sn_types['
Prénom
']]['fullname'];
+ $name .= " " . $search_names[$sn_types['
firstname
']]['fullname'];
return $name;
}
return $name;
}
@@
-205,8
+205,8
@@
function build_sn_pub()
{
$res = XDB::iterator("SELECT CONCAT(sn.particle, sn.name) AS fullname, sn.typeid,
sn.particle, sn.name, sn.id
{
$res = XDB::iterator("SELECT CONCAT(sn.particle, sn.name) AS fullname, sn.typeid,
sn.particle, sn.name, sn.id
- FROM profile_name
_search
AS sn
- INNER JOIN profile_name_
search_
enum AS e ON (e.id = sn.typeid)
+ FROM profile_name AS sn
+ INNER JOIN profile_name_enum AS e ON (e.id = sn.typeid)
WHERE sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)
AND FIND_IN_SET('public', e.flags)
ORDER BY NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name",
WHERE sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)
AND FIND_IN_SET('public', e.flags)
ORDER BY NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name",
@@
-227,14
+227,14
@@
function set_alias_names(&$sn_new, $sn_old, $update_new = false, $new_alias = nu
foreach ($sn_new as $typeid => $sn) {
if (isset($sn['pub'])) {
if (isset($sn_old[$typeid]) && ($sn_old[$typeid]['fullname'] == $sn['fullname'] && $update_new)) {
foreach ($sn_new as $typeid => $sn) {
if (isset($sn['pub'])) {
if (isset($sn_old[$typeid]) && ($sn_old[$typeid]['fullname'] == $sn['fullname'] && $update_new)) {
- XDB::execute("UPDATE profile_name
_search
+ XDB::execute("UPDATE profile_name
SET particle = {?}, name = {?}, typeid = {?}
WHERE id = {?} AND pid = {?}",
$sn['particle'], $sn['name'], $typeid, $sn_old[$typeid]['id'], S::i('uid'));
unset($sn_old[$typeid]);
} elseif ($update_new
|| (isset($sn_old[$typeid]) && $sn_old[$typeid]['fullname'] == $sn['fullname'])) {
SET particle = {?}, name = {?}, typeid = {?}
WHERE id = {?} AND pid = {?}",
$sn['particle'], $sn['name'], $typeid, $sn_old[$typeid]['id'], S::i('uid'));
unset($sn_old[$typeid]);
} elseif ($update_new
|| (isset($sn_old[$typeid]) && $sn_old[$typeid]['fullname'] == $sn['fullname'])) {
- XDB::execute("INSERT INTO profile_name
_search
(particle, name, typeid, pid)
+ XDB::execute("INSERT INTO profile_name (particle, name, typeid, pid)
VALUES ({?}, {?}, {?}, {?})",
$sn['particle'], $sn['name'], $typeid, S::i('uid'));
unset($sn_old[$typeid]);
VALUES ({?}, {?}, {?}, {?})",
$sn['particle'], $sn['name'], $typeid, S::i('uid'));
unset($sn_old[$typeid]);
@@
-243,23
+243,30
@@
function set_alias_names(&$sn_new, $sn_old, $update_new = false, $new_alias = nu
}
} else {
if ($sn['fullname'] != '') {
}
} else {
if ($sn['fullname'] != '') {
- XDB::execute("INSERT INTO profile_name
_search
(particle, name, typeid, pid)
+ XDB::execute("INSERT INTO profile_name (particle, name, typeid, pid)
VALUES ('', {?}, {?}, {?})",
$sn['fullname'], $typeid, S::i('uid'));
}
VALUES ('', {?}, {?}, {?})",
$sn['fullname'], $typeid, S::i('uid'));
}
+ $i = 0;
+ while (isset($sn[$i])) {
+ XDB::execute("INSERT INTO profile_name (particle, name, typeid, pid)
+ VALUES ('', {?}, {?}, {?})",
+ $sn[$i], $typeid, S::i('uid'));
+ $i++;
+ }
}
}
if (count($sn_old) > 0) {
if (!$update_new) {
$has_new = true;
foreach ($sn_old as $typeid => $sn) {
}
}
if (count($sn_old) > 0) {
if (!$update_new) {
$has_new = true;
foreach ($sn_old as $typeid => $sn) {
- XDB::execute("INSERT INTO profile_name
_search
(particle, name, typeid, pid)
+ XDB::execute("INSERT INTO profile_name (particle, name, typeid, pid)
VALUES ({?}, {?}, {?}, {?})",
$sn['particle'], $sn['name'], $typeid, S::i('uid'));
}
} else {
foreach ($sn_old as $typeid => $sn) {
VALUES ({?}, {?}, {?}, {?})",
$sn['particle'], $sn['name'], $typeid, S::i('uid'));
}
} else {
foreach ($sn_old as $typeid => $sn) {
- XDB::execute("DELETE FROM profile_name
_search
+ XDB::execute("DELETE FROM profile_name
WHERE pid = {?} AND id = {?}",
S::i('uid'), $sn['id']);
}
WHERE pid = {?} AND id = {?}",
S::i('uid'), $sn['id']);
}
@@
-275,8
+282,8
@@
function set_alias_names(&$sn_new, $sn_old, $update_new = false, $new_alias = nu
VALUES ({?}, 'alias', 'usage', {?})",
$new_alias, S::i('uid'));
}
VALUES ({?}, 'alias', 'usage', {?})",
$new_alias, S::i('uid'));
}
-
/*
require_once('user.func.inc.php');
- user_reindex(
$uid);*/
+ require_once('user.func.inc.php');
+ user_reindex(
S::i('uid'));
return $has_new;
}
return $has_new;
}