c6d6ad2393
Applying the password restriction in studs.
2015-10-29 11:52:13 +01:00
b462a6bbdb
Hashing the password early
2015-10-29 11:52:13 +01:00
161b6b14c0
Password options are used with poll creation.
...
- Just found that the "hidden" parameter wasn't...
2015-10-29 11:52:13 +01:00
cddbf3cb43
Safe way to hash password.
2015-10-29 11:52:13 +01:00
f888a643e0
Added column password in poll table.
2015-10-29 11:52:13 +01:00
1ba245258a
Merge branch 'master' into develop
2015-10-29 09:42:30 +01:00
15640a6788
Fix stupid break in adminstuds
2015-10-28 22:11:00 +01:00
2cfeb385bb
Admin: Search in polls by author's mail address
2015-10-28 13:06:02 +01:00
3f1f957c5e
Merge branch 'feature/ajax_submission_for_comments' into 'develop'
...
Feature - ajax submission for comments
The sending of comments has been ajaxified, in order to prevent the lose of vote data while commenting.
The comment list is also refreshed while commenting.
See merge request !72
2015-10-26 17:00:40 +01:00
974148550b
Refactoring for better reading
2015-10-26 16:28:59 +01:00
7ba352f0e5
Set URLs to https if HTTP X-Forwarded-Proto=https
...
This line changes all URLs to https URLs if the Framadate installation
is behind a reverse proxy, and the reverse proxy adds the
X-Forwarded-Proto header with the 'https' value. Configuration for
nginx:
proxy_set_header X-Forwarded-Proto https;
This setup is currently used by the Framadate installation of
Bits of Freedom (https://kies.bof.nl ).
2015-10-26 15:02:02 +01:00
5ffc332b48
Merge branch 'Add_nonHTML_version_to_mails' into 'develop'
...
Fix #87 Use PHPMailer to add non-HTML body to mails
Utilisation de PHPMailer
See merge request !70
2015-10-22 21:58:46 +02:00
882203fad8
Fix #87 Use PHPMailer to add non-HTML body to mails
2015-10-22 21:34:15 +02:00
2b38a7ddd6
Refactoring NotificationService
2015-10-13 01:03:41 +02:00
fe8f779217
Merge branch 'master' into develop
2015-10-12 23:58:57 +02:00
67134126b6
Merge branch 'fix/dont_sort_moments' into 'master'
...
Stop sorting the moments
- Don't sort moments at poll creation
- Don't sort moments at slot insertion
See merge request !65
2015-10-12 23:52:00 +02:00
4fa4ee0acc
Merge branch 'master' into develop
...
Conflicts:
admin/migration.php
2015-10-12 23:46:02 +02:00
49a5350f90
Fix #83 Stop sorting moments at new slot insertion
2015-10-12 23:25:51 +02:00
c6c9546669
Fix #83 Stop sorting moments at poll creation
2015-10-12 23:25:49 +02:00
6196a53a45
Display the comment timestamp
2015-10-12 23:14:21 +02:00
ba9a444f33
Adding a date column in the comment table
2015-10-12 22:26:22 +02:00
82876c573e
Set a length to comment table's name column
...
The name column was of text type. Passed to VARCHAR(64), like the poll name column.
2015-10-12 21:59:45 +02:00
de18f826f0
The name can be any value.
...
There is no reason to limit the caracters that can be used in the name.
Thus, removing the regex.
Fix #97
2015-10-12 21:26:13 +02:00
d17ba242d3
Add log when adding a slot manually
2015-10-05 23:54:50 +02:00
4b6f7b685e
getUrlSondage: Cannot define links for EDIT and ACTION at the same time
2015-10-05 23:50:51 +02:00
b61f60155e
Fix the check for deleting the last slot
2015-10-05 23:50:00 +02:00
74d5d87dae
Oups… :-/
2015-09-21 13:06:47 +02:00
9a3590a9e1
Fix css header + Framanav
2015-09-21 10:03:18 +02:00
46afefb696
Fix RPad migration
2015-09-19 16:08:50 +02:00
09e1da3529
Add migration script to rpad some votes from 0.8
2015-09-18 11:20:04 +02:00
24a7fb7df2
Optimize selection of polls in admin page
2015-09-13 00:53:03 +02:00
7babf3f3a3
Optimize migration from 0.8 to 0.9
2015-09-13 00:06:23 +02:00
76d680b6dd
Install: Remove useless
2015-09-07 16:46:21 +02:00
cbc5727ce4
Install: Display previous selections when installation failed
2015-09-07 16:37:03 +02:00
fd27c135c8
Install: Prefill the fields with values from InstallService
2015-09-07 16:36:57 +02:00
254512c55a
Install: Redirections between Install and Index
2015-09-07 16:36:42 +02:00
a7727d8523
Install: Create installation page
2015-09-07 16:36:25 +02:00
a6d8342e77
Add migration script to generate vote's uniqid for legacy votes
2015-06-24 22:37:46 +02:00
a6788d81c2
Host can now force URL, used behind a reverse-proxy
2015-06-23 22:03:56 +02:00
44928b0572
Dont sort classic polls
2015-05-30 23:36:04 +02:00
4ced550942
Merge remote-tracking branch 'upstream/release/0.9' into release/0.9
2015-05-29 18:59:09 +02:00
fa111ab04e
Prevent from deleting the last slot
...
- Also fix the corresponding translation when a problem arise.
2015-05-29 18:53:09 +02:00
64b79965c6
Fixing the description newlines problem
...
- As it is now, description can't be in error state : we are waiting the markdown implementation to eventually change that.
- Comments are now normaly formated (newlines are taken into account)
- The title, description and comment regexes are now useless. Deleted.
2015-05-29 18:38:03 +02:00
cb0864f8fd
Fix a lot of things
2015-05-29 18:11:12 +02:00
ad2b146c3c
Remove parameter from MailService::send
2015-05-29 17:49:01 +02:00
278e478d1a
Write log when send a mail
2015-05-29 17:41:50 +02:00
8313b9345d
Fix after update o80-i18n
2015-05-29 17:13:35 +02:00
be155aa2a1
MailService now manage the anti-flood system
2015-05-29 17:06:03 +02:00
92d84f3193
Install PHPUnit for UnitTesting
2015-05-29 17:05:26 +02:00
1ec8db4c30
Check if vote name is already used + Fix missing key
2015-04-24 00:29:10 +02:00
551b839292
Display the count of 'if need be'
2015-04-23 23:18:31 +02:00
8882756c7f
Add IT language file
2015-04-17 13:46:06 +02:00
45d14044f8
Factorize a little the mails
2015-04-14 22:32:41 +02:00
199e41ec93
Fix: description was required
2015-04-14 13:34:42 +02:00
942e2cb8d2
Merge branch 'feature/FindMyPolls' into develop
...
* A new page is available on index, it allows user to send by mail all the polls created by a given mail address
2015-04-13 23:55:40 +02:00
715bee6d7b
Clean after merge request
2015-04-13 23:53:28 +02:00
0505ab6bb2
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
app/classes/Framadate/Utils.php
2015-04-13 16:16:02 +02:00
fbd45960b7
Changing some actions from POST to GET.
2015-04-13 15:45:01 +02:00
3ef40417b2
Fix usage of markdown
2015-04-13 14:52:43 +02:00
7b4bc4ad7f
Replace $html_lang by $locale
2015-04-13 12:10:07 +02:00
d73ca37f5c
Select the right lang in the Language select box
2015-04-11 23:12:01 +02:00
faca65b510
Fix problem with 'empty' function and some PHP versions
2015-04-11 17:23:37 +02:00
6d1f0ada0e
Don't allow black title, name or comment
2015-04-11 17:13:16 +02:00
e4b61ff54b
Don't redirect to studs when you edit a vote from adminstuds
2015-04-11 17:03:10 +02:00
e7da951c9b
Remove unused error codes
2015-04-11 16:03:56 +02:00
201d5168fe
Refactor the input filter system
2015-04-11 16:02:07 +02:00
77234edc82
Add page where the users can ask to receive their polls by mail
2015-04-08 22:11:19 +02:00
8b3eaac717
Fixes after merge
2015-04-07 23:17:26 +02:00
663f08f607
Merge branch 'feature/Work_on_Service_and_Repository' into develop
2015-04-07 22:26:13 +02:00
593d39c9cb
Fix missing keys
2015-04-07 20:06:24 +02:00
bd00cf1915
From double quote to simple quote
2015-04-07 17:40:20 +02:00
1058d3653b
Correcting 'Undefined index' notice on DevMode var
2015-04-07 17:40:20 +02:00
16143d4ac8
Changed defaut edition option
2015-04-06 14:06:47 +02:00
1e39eae056
Changed the file header to framadate license
2015-04-06 12:54:18 +02:00
a135f74383
Hidden results option is taken into account.
...
- Also added possibility for the poll's maker to edit this hidden results option.
2015-04-06 12:40:59 +02:00
0c2ba20bfa
Added option of poll with hidden results.
2015-04-05 18:36:43 +02:00
a3f5763edd
New edition possibility is taken into account
...
- Also added Framadate\Message à link attribute
- Added local anchor #edit with vote edition
- For now, when the poll owner check the new edit option (ie: "Votes are editable solely by their owner"), users get their update link on vote creation
2015-04-05 17:44:29 +02:00
1f55167e2c
Added new editable possibility at poll creation
2015-04-05 15:41:19 +02:00
b47c153aae
More Splitting between Services and Repositories
2015-04-03 00:11:36 +02:00
612e47ffa3
Create CommentRepository
2015-04-02 23:32:24 +02:00
7d84ec1e73
Create SlotRepository + AbstractRepository
2015-04-02 23:23:34 +02:00
7ad74ae03a
Create PollRepository + Extract creation poll code from Service to Repository
2015-04-02 23:10:41 +02:00
8f4c5122c3
Add protection not to generate 2 identical IDs
2015-04-02 22:56:31 +02:00
4c137748b4
Editing vote by link with unique id
...
- Changed the smarty modifier poll_url to a function and added the vote_id parameter
- Modified accordingly all poll_url occurence in templates
- Added htaccess.txt to be sure to keep poll's URL changes up to date
- Escaped some templates output in order to avoid to broke HTML
- Using vote's uniqId instead of vote's id when it's needed
2015-04-02 16:56:52 +02:00
86a89abf42
Added unique id to vote.
2015-04-02 12:03:38 +02:00
c4cc36b076
Using more secure token
2015-04-02 12:03:28 +02:00
09ca8b28a7
Added smarty developer configuration.
2015-04-02 11:57:12 +02:00
d8c70a5f77
Fix back links to create_poll.php + Use values in session if _post is not present
2015-03-31 00:02:37 +02:00
6d34631fbf
Replace calls to __('Section\Key') with __('Section', 'Key')
2015-03-30 15:19:56 +02:00
da2cdeda12
Smartysize infos_creation, and rename it to create_poll
2015-03-29 22:13:22 +02:00
591c4dd1af
Move some code from FramaDB to Service
2015-03-29 12:59:47 +02:00
40d707c96d
Issue #18 Add search engine on admin polls list
2015-03-27 13:10:46 +01:00
0aedb01933
Change i18n system around classical polls
2015-03-24 17:59:52 +01:00
119d0e01e1
Start changing the i18n system.
...
* Now works on windows servers
* Byebye .po/.mo, welcome .json
* Byebye old gettext library, welcome o80-i18n
2015-03-22 23:33:03 +01:00
0efc3d4bcc
Fix the update of poll infos
2015-03-18 00:46:19 +01:00
1d5a33b560
Remove the notion of 0.9.1, replace it with 0.9
2015-03-05 21:30:33 +01:00
778a03f802
Fix usage of preg_replace
2015-03-05 13:22:55 +01:00
b3bc68bbe6
Fix pb when host on domain name starting with 'admin'
...
* Do str_replace only on the $dirname variable
2015-03-05 00:02:45 +01:00
b051dd59f8
Implement purge in 2 steps
...
First: Block the poll (no more modification)
Second: Delete the poll 60 days after the expiration date (configurable)
2015-02-28 19:18:59 +01:00
6e442e02e3
Complete the fix of accent problem during migration
2015-02-26 23:03:49 +01:00
3aa3ee486c
Admin: Fix the number of polls + Set to 30 the number of polls displayed per page
2015-02-26 22:29:24 +01:00
a4dd36d1bc
Convert accent from html to utf8 when migrating
2015-02-26 21:29:30 +01:00
d30b6d6f7b
Fix and improve performance for migration from 0.8 to 0.9
2015-02-26 10:44:49 +01:00
be754a8628
Fix accessibility on classical polls
2015-02-02 23:32:45 +01:00
8a0c8bd8d3
Make language selection work better
2015-01-20 00:05:43 +01:00
cbad43614d
Re-add count of votes in polls admin page
2015-01-18 16:30:02 +01:00
f6a7a1c7bb
Issue #18 Install pagination on polls admin page
2015-01-18 16:14:45 +01:00
7e04bdff6d
Split constants.php in 2 files: constants.php + config.php
2015-01-17 16:47:10 +01:00
3cf47aa4e1
Issue #14 Use same cookie for / and /admin
2015-01-17 16:30:28 +01:00
80be71d382
Improve management of errors in infos_sondage page
2015-01-17 16:25:12 +01:00
87150cc97e
Add column receiveNewComments to poll table, to send notification when a user wrote a comment.
2015-01-17 01:28:12 +01:00
e9b456ad6e
(re) Allow accents in names
2015-01-13 08:10:50 +01:00
08a3fe1b69
Escape html for all bound variables from .tpl files
2015-01-11 14:59:25 +01:00
19175d12ce
Allow accents in names
2015-01-11 14:55:39 +01:00
1df48988a6
Use CSRF tokens on admin page
2015-01-10 16:35:21 +01:00
e7ebd55299
WIP Start implmenting CSRF
2015-01-09 09:22:31 +01:00
6f7c911bae
Issue #26 Admin can change the name of initiator of the poll
2015-01-08 22:18:28 +01:00
924bd1ed1a
Issue #26 Poll admin can change expiration date
2015-01-08 22:18:27 +01:00
afd6079420
Issue #22 Enable vote name modification
2015-01-08 22:18:18 +01:00
c67a4c7c14
Add some security with strip_tags + Don't encode quotes
2015-01-07 23:16:42 +01:00
2495a8002f
Admin: The polls page now use Smarty template
2015-01-07 22:47:34 +01:00
1f8fd2e3e2
Admin: Move migration page + add landing page
2015-01-07 14:01:08 +01:00
073bc9048d
Admin: Fix the admin page
2015-01-06 23:52:52 +01:00
7727ffde73
Workaround for LC_MESSAGES and some PHP versions
2015-01-05 23:31:12 +01:00
1e2877e863
Don't encode to HTML value before storing it to database
2015-01-05 23:30:47 +01:00
98018de541
Fix some things after cherry-picking
2015-01-04 18:49:57 +01:00
f71326f496
Keep polls with bad expiration date in database
...
(cherry picked from commit c15ce049ad
2015-01-04 18:33:31 +01:00
35ba152199
Retouches après série de merges
...
(cherry picked from commit 6751a8a9cf
2015-01-04 18:29:36 +01:00
381c4444e3
Minor modifications to Utils.php
...
(cherry picked from commit e6d171a4b0
2015-01-04 18:18:59 +01:00
b459eeb61e
First implementation of the installer
...
(cherry picked from commit 16da53707f
2015-01-04 16:58:43 +01:00
7483620880
Minor modifications to Utils.php
...
Cherry-picked :
e6d171a4
2015-01-04 16:41:11 +01:00
bb3d10583d
Vote result: Clear markdown tags
2015-01-03 19:06:07 +01:00
c9ea14362d
Fix promblem with Session loading
2015-01-03 19:06:05 +01:00
985842edf3
CSV Export: Implements export for classical polls
2015-01-03 19:06:03 +01:00
8f8956d70a
Migration: Add precondition on every Migration sub-classes
2015-01-02 09:08:07 +01:00
ca365ff348
Fix the selected item on langs selection
2015-01-02 00:19:56 +01:00
a8345cf7f8
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
c533645d29
Make installation from scratch work with migration page
2015-01-01 01:18:49 +01:00
1578703de6
Fix line breaks on mails sent
2015-01-01 01:17:53 +01:00
1111b86e2a
Define a prefix for database table names.
2014-12-31 15:19:15 +01:00
c9be94bc19
Migration: Finalize the migration of database from 0.8 to 0.9
2014-12-31 14:25:56 +01:00
88cae82e71
Create a migration system to migrate database.
...
+ Use this system to migrate from 0.8 to 0.9 (WIP)
2014-12-31 01:33:56 +01:00
d37200addd
Change version number to 0.9
2014-12-30 18:15:04 +01:00
f399b9e543
admin: fix deleteion a slot from a classical poll
2014-12-30 17:03:43 +01:00
1ca7502216
Translate database names (table+columns) to English + Reorganize some columns
2014-12-30 01:41:25 +01:00
dcb711dccc
Implements purge methods
2014-12-29 21:54:07 +01:00
10c409e29e
LogService: Change date format to "Ymd His"
2014-12-29 21:52:44 +01:00
23ec39adb2
Create PurgeService
2014-12-28 23:43:47 +01:00
53048e8488
Fix display of best choices on classic polls
2014-12-27 00:23:56 +01:00
98f14c487a
Enable poll deletion + improve random generator
2014-12-25 01:11:14 +01:00
9ed0043569
Some cleaning in poll creation
2014-12-25 00:55:52 +01:00
2f3831d997
Add const LOG_FILE to constants.php.template
2014-12-24 23:44:40 +01:00
31f62cd62d
LogService: Add a line break at the en of lines
2014-12-24 23:38:44 +01:00
5d8e5362f9
admin: Add some logging on important actions (delete poll, clean votes, clean comments, drop column)
2014-12-24 22:42:50 +01:00
a5d1305535
LogService : WIP
2014-12-24 09:40:41 +01:00
b5fc415edc
admin: Add availability to delete a poll
2014-12-23 09:48:58 +01:00
4818d7977a
Update constants.php.template
2014-12-23 09:33:00 +01:00
f50b244568
Return true when deleting a slot.
2014-12-23 01:01:09 +01:00
8109b11b70
Move mail sending to class \Framadate\Service\MailService
2014-12-23 00:58:00 +01:00
288ddd2efc
admin: Add availability to add a slot to a poll
2014-12-23 00:30:05 +01:00
94e87a3182
WIP> admin: Add availability to add a slot to a poll
2014-12-22 14:18:33 +01:00
dec9e24530
admin: Implement the removal of a slot.
2014-12-21 23:48:22 +01:00
1a062a2a69
admin: Add availability to delete a vote.
2014-12-21 00:25:00 +01:00
b8d0110263
Remove code from old_adminstuds that is already refactored.
2014-12-21 00:14:56 +01:00
8d46ec6c33
Move all admin method from PollService to AdminPollService
2014-12-20 23:59:44 +01:00
94a125ca2b
Display confirmation page before to delete all comments of one poll.
2014-12-19 00:59:27 +01:00
07d5a336fb
Add availability to delete all comments of one poll.
...
+ Simplify call to remove all votes of one poll
2014-12-19 00:36:09 +01:00
14727bd94c
admin: Add availability to delete all votes of a poll.
2014-12-19 00:30:33 +01:00
1b01bcc6b6
admin: Add availability to delete comments one by one.
2014-12-19 00:13:21 +01:00
8e15a008fe
adminstuds.php: Realize the update of poll in database
2014-12-18 13:57:25 +01:00
410d2127ce
admin: Add some work to poll information pane.
2014-12-17 23:43:06 +01:00
7c5ba2eb17
Split parts of studs.tpl into severals sub-templates.
2014-12-17 23:12:05 +01:00
ceb6ae3bca
Remove old code + Add doc
2014-12-17 13:52:52 +01:00
9284a5d62b
Add licence informations on classes
2014-12-17 13:48:03 +01:00
ab5f9e013a
Implement comments functionnality
2014-12-17 13:47:14 +01:00
80b06d65cd
Some work on vote saving
2014-12-17 13:17:08 +01:00
e941cf1822
Add availability to edit a vote
2014-12-16 00:45:16 +01:00
d54f2e4759
Improve usage of namespace + Create PollService in /Framadate/Service namespace
2014-12-16 00:02:01 +01:00
2480d441d4
Remove code in comment
2014-12-15 13:55:46 +01:00
ea105960b4
Add line to add vote + Add line to show best choices
2014-12-14 00:16:49 +01:00
fcaea63b84
A big part of refactoring
...
* Use Smarty to split View and Controller on studs page (work in progress)
* Add field "active" to Poll
* And some other stuff...
2014-12-12 13:46:55 +01:00
3743ad55f1
Make add vote working
2014-12-07 23:12:08 +01:00
3d0e167e77
Clean a lot of adminstuds.php
2014-12-07 16:47:35 +01:00
46ea697cb6
Refactor on choix_autre.php
...
* Utils::issetAndNoEmpty is now removed
* Use Form object to store value from page to page
2014-12-06 19:42:01 +01:00
de04d47434
Minor changes on "constants.php.template"
2014-12-05 01:09:14 +01:00
fae91f6f3e
Refactor poll creation
...
* Rename fields in Sondage table
* Add field "editable" which tells when users can edit their votes
* PDO : Configure 2 options (FETCH_OBJ + ERRMODE_EX)
* "formatsondage" does contains "+" (or not) anymore
2014-12-05 01:08:38 +01:00
1437eaf47e
Refactoring some code:
...
* Store all informations about forms into an object "Form" stored in $_SESSION['form']
* Replace connection to database by PDO object
* Check if database is ready in bandeaux.php file
2014-12-03 21:08:08 +01:00
0239dd0735
Add environment variable to be able to switch between languages using Windows
2014-11-15 00:46:55 +01:00
7cee54901f
Adaptation setlocale en fonction de l'environnement (Windows)
2014-11-14 22:35:19 +01:00
307f36ae64
fix a11y + reprise config.inc + bug date_format win
2014-11-14 17:35:22 +01:00
6cc5fa3a13
purge auto limitée à 20 pour 1 créé
2014-11-13 21:58:03 +01:00
e0ff6ec0e7
liens et images autorisés par défaut + purge auto limitée à 50 pour 1 créé
2014-11-13 21:33:20 +01:00
a716ef8c47
delete configuration option $show_language_bar_selection
...
condition is based on the number of languages configured
2014-11-12 21:28:27 +01:00
eb5677e451
new parameter '$use_smtp' to disable email notification if needed
...
bug correction on email notification (using '$dsondage->titre' in adminstuds.php)
2014-11-12 21:17:52 +01:00
52a783fba2
MAJ https://github.com/framasoft ==> https://git.framasoft.org/framasoft/framadate
2014-11-12 11:44:57 +01:00
e24c74c93b
deplace config.inc.php file from root to app/inc dir. Allow access from anywhere and not only from a file present in root dir.
2014-11-12 11:10:36 +01:00
4edf3b308f
Modification des appels de function.inc.php (ajout dans init) pour être accessible par toutes les pages
2014-11-11 12:33:17 +01:00
0db5daa371
ajout fonction pour récupérer des options dans un fichier de configuration
2014-11-10 19:27:18 +01:00
5993579238
Oublié les sauts de ligne
2014-11-06 15:37:03 +01:00
83b5848689
Compilation .po, fix a11y, issue #15
2014-11-06 15:20:03 +01:00
Antonin