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
B
belenios
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
belenios
belenios
Commits
35aac12e
Commit
35aac12e
authored
Feb 09, 2016
by
Stephane Glondu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not allow duplicates in voter list
parent
a1108783
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
6 deletions
+16
-6
src/web/web_site.ml
src/web/web_site.ml
+16
-6
No files found.
src/web/web_site.ml
View file @
35aac12e
...
...
@@ -634,6 +634,20 @@ let is_email x =
try
ignore
(
Pcre
.
pcre_exec
~
rex
:
email_rex
x
);
true
with
Not_found
->
false
module
SSet
=
Set
.
Make
(
PString
)
let
merge_voters
a
b
=
let
existing
=
List
.
fold_left
(
fun
accu
sv
->
SSet
.
add
sv
.
sv_id
accu
)
SSet
.
empty
a
in
let
_
,
res
=
List
.
fold_left
(
fun
(
existing
,
accu
)
sv_id
->
if
SSet
.
mem
sv_id
existing
then
(
existing
,
accu
)
else
(
SSet
.
add
sv_id
existing
,
{
sv_id
;
sv_password
=
None
}
::
accu
)
)
(
existing
,
List
.
rev
a
)
b
in
List
.
rev
res
let
()
=
Any
.
register
~
service
:
election_setup_voters_add
...
...
@@ -647,9 +661,7 @@ let () =
Printf
.
ksprintf
failwith
"%S is not a valid address"
bad
with
Not_found
->
()
in
se
.
se_voters
<-
se
.
se_voters
@
List
.
map
(
fun
sv_id
->
{
sv_id
;
sv_password
=
None
}
)
xs
;
se
.
se_voters
<-
merge_voters
se
.
se_voters
xs
;
return
(
redir_preapply
election_setup_voters
uuid
))))
let
()
=
...
...
@@ -1061,9 +1073,7 @@ let () =
match
voters
with
|
Some
voters
->
if
se
.
se_public_creds_received
then
forbidden
()
else
(
se
.
se_voters
<-
se
.
se_voters
@
List
.
map
(
fun
sv_id
->
{
sv_id
;
sv_password
=
None
}
)
voters
;
se
.
se_voters
<-
merge_voters
se
.
se_voters
voters
;
return
(
redir_preapply
election_setup_voters
uuid
))
|
None
->
return
(
fun
()
->
T
.
generic_page
~
title
:
"Error"
...
...
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