Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Antoine
ae2
Commits
60972815
Commit
60972815
authored
Aug 29, 2010
by
mbriand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fiche mmt publiques pour tous les utbm
parent
beb47020
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
18 deletions
+29
-18
activites.php
activites.php
+1
-1
galaxy.php
galaxy.php
+1
-1
include/cts/fsearch.inc.php
include/cts/fsearch.inc.php
+7
-2
include/entities/utilisateur.inc.php
include/entities/utilisateur.inc.php
+2
-2
matmatronch/index.php
matmatronch/index.php
+4
-2
matmatronch/mapfrance.php
matmatronch/mapfrance.php
+1
-1
temp/repair_users.php
temp/repair_users.php
+1
-1
trombi/index.php
trombi/index.php
+3
-4
user.php
user.php
+9
-4
No files found.
activites.php
View file @
60972815
...
@@ -95,7 +95,7 @@ else
...
@@ -95,7 +95,7 @@ else
"AND `asso_membre`.`role`='10' "
.
"AND `asso_membre`.`role`='10' "
.
"AND `asso`.`id_asso_parent` = '"
.
$rowpoles
[
'id_asso'
]
.
"'"
.
"AND `asso`.`id_asso_parent` = '"
.
$rowpoles
[
'id_asso'
]
.
"'"
.
"AND `asso`.`hidden` = '0' "
.
"AND `asso`.`hidden` = '0' "
.
(
$site
->
user
->
is_in_group
(
"gestion_ae"
)
?
""
:
"AND `utilisateurs`.`publique_utl` = '1'"
)
.
(
$site
->
user
->
is_in_group
(
"gestion_ae"
)
?
""
:
"AND `utilisateurs`.`publique_utl`
>
= '1'"
)
.
"GROUP BY `asso`.`id_asso` "
.
"GROUP BY `asso`.`id_asso` "
.
"ORDER BY `asso`.`nom_asso`"
);
"ORDER BY `asso`.`nom_asso`"
);
...
...
galaxy.php
View file @
60972815
...
@@ -222,7 +222,7 @@ elseif ( isset($_REQUEST["id_utilisateur"]) )
...
@@ -222,7 +222,7 @@ elseif ( isset($_REQUEST["id_utilisateur"]) )
$req
=
new
requete
(
$site
->
db
,
"SELECT rx_star,ry_star FROM galaxy_star WHERE id_star='"
.
mysql_real_escape_string
(
$user
->
id
)
.
"'"
);
$req
=
new
requete
(
$site
->
db
,
"SELECT rx_star,ry_star FROM galaxy_star WHERE id_star='"
.
mysql_real_escape_string
(
$user
->
id
)
.
"'"
);
if
(
!
$user
->
publique
)
if
(
$user
->
publique
<
1
)
{
{
$cts
->
add_paragraph
(
"C'est utilisateur n'est pas présent dans galaxy car son profil n'est pas publique."
);
$cts
->
add_paragraph
(
"C'est utilisateur n'est pas présent dans galaxy car son profil n'est pas publique."
);
if
(
$user
->
id
==
$site
->
user
->
id
)
if
(
$user
->
id
==
$site
->
user
->
id
)
...
...
include/cts/fsearch.inc.php
View file @
60972815
...
@@ -139,11 +139,16 @@ class fsearch extends stdcontents
...
@@ -139,11 +139,16 @@ class fsearch extends stdcontents
$sqlpattern
=
mysql_real_escape_string
(
$pattern
);
$sqlpattern
=
mysql_real_escape_string
(
$pattern
);
// Utilisateurs
// Utilisateurs
if
(
$site
->
user
->
is_valid
()
&&
$site
->
user
->
cotisant
)
if
(
$site
->
user
->
is_valid
()
&&
(
$site
->
user
->
cotisant
||
$site
->
user
->
utbm
)
)
{
{
if
(
!
$site
->
user
->
is_in_group
(
"gestion_ae"
)
&&
!
$site
->
user
->
is_asso_role
(
27
,
1
)
&&
!
$site
->
user
->
is_in_group
(
"visu_cotisants"
)
)
if
(
!
$site
->
user
->
is_in_group
(
"gestion_ae"
)
&&
!
$site
->
user
->
is_asso_role
(
27
,
1
)
&&
!
$site
->
user
->
is_in_group
(
"visu_cotisants"
)
)
$force_sql
=
"AND `publique_utl`='1'"
;
{
if
(
$site
->
user
->
cotisant
)
$force_sql
=
"AND `publique_utl`>='1'"
;
else
$force_sql
=
"AND `publique_utl`='2'"
;
}
else
else
$force_sql
=
""
;
$force_sql
=
""
;
...
...
include/entities/utilisateur.inc.php
View file @
60972815
...
@@ -1168,7 +1168,7 @@ class utilisateur extends stdentity
...
@@ -1168,7 +1168,7 @@ class utilisateur extends stdentity
$this
->
etudiant
=
$_etudiant
;
$this
->
etudiant
=
$_etudiant
;
$this
->
ancien_etudiant
=
false
;
$this
->
ancien_etudiant
=
false
;
$this
->
modere
=
false
;
$this
->
modere
=
false
;
$this
->
publique
=
true
;
$this
->
publique
=
2
;
$this
->
publique_mmtpapier
=
true
;
$this
->
publique_mmtpapier
=
true
;
$sql
=
new
insert
(
$this
->
dbrw
,
$sql
=
new
insert
(
$this
->
dbrw
,
...
@@ -1345,7 +1345,7 @@ class utilisateur extends stdentity
...
@@ -1345,7 +1345,7 @@ class utilisateur extends stdentity
if
(
$date_naissance
)
if
(
$date_naissance
)
$this
->
date_naissance
=
$date_naissance
;
$this
->
date_naissance
=
$date_naissance
;
$this
->
publique
=
true
;
$this
->
publique
=
2
;
$this
->
publique_mmtpapier
=
true
;
$this
->
publique_mmtpapier
=
true
;
$this
->
droit_image
=
$droit_image
;
$this
->
droit_image
=
$droit_image
;
...
...
matmatronch/index.php
View file @
60972815
...
@@ -167,8 +167,10 @@ if ( $_REQUEST["action"] == "search" || $_REQUEST["action"] == "simplesearch" )
...
@@ -167,8 +167,10 @@ if ( $_REQUEST["action"] == "search" || $_REQUEST["action"] == "simplesearch" )
else
else
$params
.
=
"&inclus_nutbm"
;
$params
.
=
"&inclus_nutbm"
;
if
(
!
$is_admin
&&
!
$site
->
user
->
is_in_group
(
"visu_cotisants"
))
if
(
!
$is_admin
&&
!
$site
->
user
->
is_in_group
(
"visu_cotisants"
)
&&
$site
->
user
->
cotisant
)
$elements
[]
=
"`publique_utl`='1'"
;
$elements
[]
=
"`publique_utl`>='1'"
;
elseif
(
!
$is_admin
&&
!
$site
->
user
->
is_in_group
(
"visu_cotisants"
))
$elements
[]
=
"`publique_utl`>='2'"
;
$req
=
new
requete
(
$site
->
db
,
"SELECT COUNT(`utilisateurs`.`id_utilisateur`) "
.
$req
=
new
requete
(
$site
->
db
,
"SELECT COUNT(`utilisateurs`.`id_utilisateur`) "
.
"FROM `utilisateurs` "
.
"FROM `utilisateurs` "
.
...
...
matmatronch/mapfrance.php
View file @
60972815
...
@@ -153,7 +153,7 @@ if (isset($_REQUEST['getinfodepts']))
...
@@ -153,7 +153,7 @@ if (isset($_REQUEST['getinfodepts']))
INNER JOIN `utl_etu_utbm` ON `utl_etu_utbm`.`id_utilisateur` = `utilisateurs`.`id_utilisateur`
INNER JOIN `utl_etu_utbm` ON `utl_etu_utbm`.`id_utilisateur` = `utilisateurs`.`id_utilisateur`
INNER JOIN `loc_ville` ON `loc_ville`.`id_ville` = `utl_etu`.`id_ville`
INNER JOIN `loc_ville` ON `loc_ville`.`id_ville` = `utl_etu`.`id_ville`
WHERE `loc_ville`.`cpostal_ville` LIKE '"
.
$cp
.
"'
WHERE `loc_ville`.`cpostal_ville` LIKE '"
.
$cp
.
"'
AND `publique_utl` = '
1
'
AND `publique_utl` = '
2
'
ORDER BY RAND()
ORDER BY RAND()
LIMIT 10"
);
LIMIT 10"
);
...
...
temp/repair_users.php
View file @
60972815
...
@@ -94,7 +94,7 @@ if(isset($_POST["action"]) && $_POST["action"]=="merge")
...
@@ -94,7 +94,7 @@ if(isset($_POST["action"]) && $_POST["action"]=="merge")
//droit_image(true or false)
//droit_image(true or false)
$user
->
droit_image
=
true
;
$user
->
droit_image
=
true
;
//publique
//publique
$user
->
publique
=
true
;
//nazi :P
$user
->
publique
=
1
;
//nazi :P
//publique_mmtpapier
//publique_mmtpapier
$user
->
publique_mmtpapier
=
true
;
//nazi aussi :P
$user
->
publique_mmtpapier
=
true
;
//nazi aussi :P
//signature_utl
//signature_utl
...
...
trombi/index.php
View file @
60972815
...
@@ -72,7 +72,7 @@ if (isset($_REQUEST['id_utilisateur']))
...
@@ -72,7 +72,7 @@ if (isset($_REQUEST['id_utilisateur']))
if
(
$user
->
id
!=
$site
->
user
->
id
&&
!
$site
->
user
->
utbm
&&
!
$site
->
user
->
ae
)
if
(
$user
->
id
!=
$site
->
user
->
id
&&
!
$site
->
user
->
utbm
&&
!
$site
->
user
->
ae
)
$site
->
error_forbidden
(
"matmatronch"
,
"group"
,
10001
);
$site
->
error_forbidden
(
"matmatronch"
,
"group"
,
10001
);
if
(
!
$user
->
publique
&&
!
$can_edit
)
if
(
((
$user
->
publique
==
0
)
||
(
$user
->
publique
==
1
&&
!
$site
->
user
->
cotisant
))
&&
!
$can_edit
)
$site
->
error_forbidden
(
"matmatronch"
,
"private"
);
$site
->
error_forbidden
(
"matmatronch"
,
"private"
);
if
(
$user
->
promo_utbm
!=
$site
->
user
->
promo_utbm
)
if
(
$user
->
promo_utbm
!=
$site
->
user
->
promo_utbm
)
...
@@ -400,7 +400,7 @@ if($_REQUEST["view"] == "listing")
...
@@ -400,7 +400,7 @@ if($_REQUEST["view"] == "listing")
WHERE
WHERE
`promo_utbm`='"
.
$site
->
user
->
promo_utbm
.
"'
`promo_utbm`='"
.
$site
->
user
->
promo_utbm
.
"'
AND
AND
`publique_utl`='
1
'
`publique_utl`
>
='
"
.
(
$site
->
user
->
cotisant
?
'1'
:
'2'
)
.
"
'
ORDER BY
ORDER BY
`nom_utl`
`nom_utl`
ASC"
);
ASC"
);
...
@@ -424,7 +424,7 @@ if($_REQUEST["view"] == "listing")
...
@@ -424,7 +424,7 @@ if($_REQUEST["view"] == "listing")
.
"LEFT JOIN `utilisateurs` USING (`id_utilisateur`) "
.
"LEFT JOIN `utilisateurs` USING (`id_utilisateur`) "
.
"LEFT JOIN `utl_etu` USING (`id_utilisateur`) "
.
"LEFT JOIN `utl_etu` USING (`id_utilisateur`) "
.
"WHERE `promo_utbm`='"
.
$site
->
user
->
promo_utbm
.
"' "
.
"WHERE `promo_utbm`='"
.
$site
->
user
->
promo_utbm
.
"' "
.
"AND `publique_utl`='
1
' "
.
"AND `publique_utl`
>
='
"
.
(
$site
->
user
->
cotisant
?
'1'
:
'2'
)
.
"
' "
.
"ORDER BY `nom_utl`, `prenom_utl` ASC "
.
"ORDER BY `nom_utl`, `prenom_utl` ASC "
.
"LIMIT "
.
$st
.
" , "
.
$npp
.
""
);
.
"LIMIT "
.
$st
.
" , "
.
$npp
.
""
);
if
(
$req
->
lines
==
0
)
if
(
$req
->
lines
==
0
)
...
@@ -727,4 +727,3 @@ $site->add_contents($cts);
...
@@ -727,4 +727,3 @@ $site->add_contents($cts);
$site
->
end_page
();
$site
->
end_page
();
?>
?>
user.php
View file @
60972815
...
@@ -67,8 +67,8 @@ if ( isset($_REQUEST['id_utilisateur']) )
...
@@ -67,8 +67,8 @@ if ( isset($_REQUEST['id_utilisateur']) )
// Si la fiche n'est pas public, et qu'on ne peut pas l'éditer,
// Si la fiche n'est pas public, et qu'on ne peut pas l'éditer,
// cela veut dire que l'on est i admin, ni l'utilisateur en question
// cela veut dire que l'on est i admin, ni l'utilisateur en question
// donc on a pas le droit de la consulter
// donc on a pas le droit de la consulter
if
(
!
$user
->
publique
&&
!
$can_edit
)
if
(
((
$user
->
publique
==
0
)
||
(
$user
->
publique
==
1
&&
!
$site
->
user
->
cotisant
))
&&
!
$can_edit
)
$site
->
error_forbidden
(
"mat
11
matronch"
,
"private"
);
$site
->
error_forbidden
(
"matmatronch"
,
"private"
);
}
}
else
else
...
@@ -164,7 +164,7 @@ elseif ( $_REQUEST["action"] == "saveinfos" && $can_edit )
...
@@ -164,7 +164,7 @@ elseif ( $_REQUEST["action"] == "saveinfos" && $can_edit )
$user
->
tel_portable
=
telephone_userinput
(
$_REQUEST
[
'tel_portable'
]);
$user
->
tel_portable
=
telephone_userinput
(
$_REQUEST
[
'tel_portable'
]);
$user
->
date_maj
=
time
();
$user
->
date_maj
=
time
();
$user
->
publique
=
isset
(
$_REQUEST
[
"publique"
]
)
;
$user
->
publique
=
$_REQUEST
[
"publique"
];
$user
->
publique_mmtpapier
=
isset
(
$_REQUEST
[
"publique_mmtpapier"
]);
$user
->
publique_mmtpapier
=
isset
(
$_REQUEST
[
"publique_mmtpapier"
]);
$user
->
signature
=
$_REQUEST
[
'signature'
];
$user
->
signature
=
$_REQUEST
[
'signature'
];
...
@@ -697,7 +697,12 @@ if ( $_REQUEST["page"] == "edit" && $can_edit )
...
@@ -697,7 +697,12 @@ if ( $_REQUEST["page"] == "edit" && $can_edit )
//signature
//signature
$frm
->
add_text_area
(
"signature"
,
"Signature (forum)"
,
$user
->
signature
);
$frm
->
add_text_area
(
"signature"
,
"Signature (forum)"
,
$user
->
signature
);
$frm
->
add_checkbox
(
"publique"
,
"Rendre mon profil public : Apparaitre dans le matmatronch en ligne."
,
$user
->
publique
);
$frm
->
add_radiobox_field
(
"publique"
,
"Publicité de mon profil"
,
array
(
2
=>
"Permettre à tous les membres de l'AE, de l'utbm ou anciens de l'utbm de voir mon profil"
,
1
=>
"Limiter l'accès à mon profil aux membres de l'AE"
,
0
=>
"Ne pas rendre mon profil publique"
),
$user
->
publique
);
$frm
->
add_checkbox
(
"publique_mmtpapier"
,
"Autoriser la publication de mon profil dans le matmatronch papier."
,
$user
->
publique_mmtpapier
);
$frm
->
add_checkbox
(
"publique_mmtpapier"
,
"Autoriser la publication de mon profil dans le matmatronch papier."
,
$user
->
publique_mmtpapier
);
$frm
->
add_submit
(
"save"
,
"Enregistrer"
);
$frm
->
add_submit
(
"save"
,
"Enregistrer"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment