Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
don
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
25
Issues
25
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
LQDN Adminsys
don
Commits
c8a8aba2
Commit
c8a8aba2
authored
Nov 08, 2018
by
Okhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ajout des error et message, il faut peut-être que
@Marne
fasse un peu de design dessus
parent
eea113a9
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
14 deletions
+21
-14
app/controller/perso.php
app/controller/perso.php
+6
-2
app/view/campaign/donation.html
app/view/campaign/donation.html
+0
-3
app/view/toolbar.html
app/view/toolbar.html
+15
-0
app/view/user/infos.html
app/view/user/infos.html
+0
-3
app/view/user/login.html
app/view/user/login.html
+0
-6
No files found.
app/controller/perso.php
View file @
c8a8aba2
...
...
@@ -116,6 +116,7 @@ class Perso extends Controller
public
function
login
(
$f3
,
$args
)
{
$f3
->
clear
(
'SESSION.error'
);
$f3
->
clear
(
'SESSION.message'
);
$f3
->
set
(
'form_visible'
,
'login'
);
if
(
$f3
->
get
(
'action'
)
==
'renew_password'
)
{
...
...
@@ -268,7 +269,7 @@ class Perso extends Controller
if
(
$f3
->
exists
(
'SESSION.id'
))
{
// Let's firts check that both the password match
if
(
$f3
->
get
(
'password'
)
!=
$f3
->
get
(
'password_confirmation'
))
{
$f3
->
set
(
'SESSION.error'
,
'Passwords mismatch'
);
$f3
->
set
(
'SESSION.error'
,
_
(
"Les mots de passe ne correspondent pas"
)
);
}
else
{
$sql
=
"UPDATE users SET email='"
.
\
Utils
::
asl
(
$f3
->
get
(
'email'
))
.
"',
pseudo='"
.
\
Utils
::
asl
(
$f3
->
get
(
'pseudo'
))
.
"'"
;
...
...
@@ -311,6 +312,7 @@ class Perso extends Controller
$f3
->
set
(
"error"
,
_
(
"Cette adresse existe déjà."
));
$f3
->
error
(
'403'
);
}
$f3
->
set
(
'SESSION.message'
,
_
(
"Adresse ajoutée à votre profil"
));
break
;
case
'DELETE'
:
try
{
...
...
@@ -324,6 +326,7 @@ class Perso extends Controller
$f3
->
set
(
"error"
,
_
(
"Cette adresse est utilisée pour une de vos contreparties"
));
$f3
->
error
(
'403'
);
};
$f3
->
set
(
'SESSION.message'
,
_
(
"Adresse supprimée de votre profil"
));
break
;
}
$f3
->
reroute
(
'/perso'
);
...
...
@@ -382,7 +385,7 @@ class Perso extends Controller
}
// Puis diminution du cumul de la valeur des contreparties
$db
->
query
(
"UPDATE users SET cumul = cumul - "
.
$valeur
.
" WHERE id='"
.
$f3
->
get
(
'SESSION.id'
)
.
"'"
);
$f3
->
set
(
'
msg'
,
_
(
"Merci, vos contreparties seront envoyées dès que possible
!"
));
$f3
->
set
(
'
SESSION.message'
,
_
(
"Merci, vos contreparties seront envoyées dès que possible
!"
));
$f3
->
reroute
(
'/perso'
);
}
...
...
@@ -532,6 +535,7 @@ class Perso extends Controller
user_id = '"
.
$user_id
.
"',
identifier = '"
.
$identifier
.
"',
cumul = 0;"
);
$f3
->
set
(
'SESSION.message'
,
_
(
"Don récurrent supprimé."
));
$f3
->
reroute
(
'/perso'
);
}
...
...
app/view/campaign/donation.html
View file @
c8a8aba2
...
...
@@ -19,9 +19,6 @@
</form>
<p>
Erreur:
</p>
<repeat
group=
"{{ @SESSION.errors }}"
value=
"{{ @error }}"
>
<p>
{{@error}}
</p>
</repeat>
<section
id=
"gift_holder"
>
<!-- Différents affichages possibles -->
<div
id=
"no_cado"
class=
"cadeaux"
style=
"display:none"
>
...
...
app/view/toolbar.html
View file @
c8a8aba2
...
...
@@ -8,6 +8,12 @@
<input
type=
"hidden"
name=
"csrf"
id=
"csrf"
value=
"{{ @CSRF }}"
/>
<fieldset
class=
"form-group modal-form-only"
>
<h3>
{{ _("Le site de dons a changé. À présent, utilisez votre adresse e-mail comme identifiant.") }}
</h3>
<check
if=
"{{ @@SESSION.message }}"
>
<p
class=
"modal-row alert alert-info"
>
{{ @SESSION.message }}
</p>
</check>
<check
if=
"{{ @@SESSION.error }}"
>
<p
class=
"modal-row alert alert-danger"
>
{{ @SESSION.error }}
</p>
</check>
<div
class=
"modal-row form-group"
>
<label
for=
"email"
>
{{ _("Adresse mail") }}
</label>
<input
class=
"form-control"
type=
"email"
name=
"email"
id=
"email"
required
>
...
...
@@ -149,3 +155,12 @@
</div>
</nav>
</div>
<section
id=
"messages"
>
<check
if=
"{{ @@SESSION.message }}"
>
<p
class=
"alert alert-info"
>
{{ @SESSION.message }}
</p>
</check>
<check
if=
"{{ @@SESSION.error }}"
>
<p
class=
"alert alert-danger"
>
{{ @SESSION.error }}
</p>
</check>
</section>
app/view/user/infos.html
View file @
c8a8aba2
...
...
@@ -149,9 +149,6 @@
</select></p>
<input
type=
"submit"
class=
"big_button"
value=
"Valider"
<
check
if=
"{{ @adresse }}"
><false>
disabled
</false>
/
</check>
/>
</div>
<check
if=
"{{ @error!='' }}"
>
<p
class=
"error"
>
{{ @error }}
</p>
</check>
</form>
</check>
</section>
app/view/user/login.html
View file @
c8a8aba2
...
...
@@ -32,12 +32,6 @@
<p><input
type=
"button"
onclick=
"document.forms['f1']['create_user'].value=1;document.forms['f1'].submit()"
class=
"btn_password"
value=
"{{ _('Créer un compte') }}"
/></p>
</form>
<check
if=
"{{ @error!='' }}"
>
<p
class=
"error"
>
{{ @error }}
</p>
</check>
<check
if=
"{{ @information!='' }}"
>
<p
class=
"information"
>
{{ @information }}
</p>
</check>
</false>
</check>
</section>
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