Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity
1,332 Commits 11 Branches 32 Tags 9.3 MiB
46338cc078
Commit Graph

256 Commits

Author SHA1 Message Date
Antonin
cddbf3cb43 Safe way to hash password. 2015-10-29 11:52:13 +01:00
Antonin
f888a643e0 Added column password in poll table. 2015-10-29 11:52:13 +01:00
Olivier Perez
1ba245258a Merge branch 'master' into develop 2015-10-29 09:42:30 +01:00
Olivier PEREZ
15640a6788 Fix stupid break in adminstuds 2015-10-28 22:11:00 +01:00
Olivier Perez
2cfeb385bb Admin: Search in polls by author's mail address 2015-10-28 13:06:02 +01:00
Olivier Perez
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
Antonin
974148550b Refactoring for better reading 2015-10-26 16:28:59 +01:00
Imre Jonk
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
Olivier Perez
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
Olivier PEREZ
882203fad8 Fix #87 Use PHPMailer to add non-HTML body to mails 2015-10-22 21:34:15 +02:00
Antonin
2b38a7ddd6 Refactoring NotificationService 2015-10-13 01:03:41 +02:00
Olivier PEREZ
fe8f779217 Merge branch 'master' into develop 2015-10-12 23:58:57 +02:00
Olivier Perez
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
Olivier PEREZ
4fa4ee0acc Merge branch 'master' into develop 
Conflicts:
	admin/migration.php
 2015-10-12 23:46:02 +02:00
Olivier PEREZ
49a5350f90 Fix #83 Stop sorting moments at new slot insertion 2015-10-12 23:25:51 +02:00
Olivier PEREZ
c6c9546669 Fix #83 Stop sorting moments at poll creation 2015-10-12 23:25:49 +02:00
Antonin
ba9a444f33 Adding a date column in the comment table 2015-10-12 22:26:22 +02:00
Antonin
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
Antonin
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
Olivier PEREZ
d17ba242d3 Add log when adding a slot manually 2015-10-05 23:54:50 +02:00
Olivier PEREZ
4b6f7b685e getUrlSondage: Cannot define links for EDIT and ACTION at the same time 2015-10-05 23:50:51 +02:00
Olivier PEREZ
b61f60155e Fix the check for deleting the last slot 2015-10-05 23:50:00 +02:00
Olivier PEREZ
46afefb696 Fix RPad migration 2015-09-19 16:08:50 +02:00
Olivier Perez
09e1da3529 Add migration script to rpad some votes from 0.8 2015-09-18 11:20:04 +02:00
Olivier PEREZ
24a7fb7df2 Optimize selection of polls in admin page 2015-09-13 00:53:03 +02:00
Olivier PEREZ
7babf3f3a3 Optimize migration from 0.8 to 0.9 2015-09-13 00:06:23 +02:00
Olivier PEREZ
76d680b6dd Install: Remove useless 2015-09-07 16:46:21 +02:00
Olivier PEREZ
cbc5727ce4 Install: Display previous selections when installation failed 2015-09-07 16:37:03 +02:00
Olivier PEREZ
fd27c135c8 Install: Prefill the fields with values from InstallService 2015-09-07 16:36:57 +02:00
Olivier PEREZ
254512c55a Install: Redirections between Install and Index 2015-09-07 16:36:42 +02:00
Olivier PEREZ
a7727d8523 Install: Create installation page 2015-09-07 16:36:25 +02:00
Olivier PEREZ
a6d8342e77 Add migration script to generate vote's uniqid for legacy votes 2015-06-24 22:37:46 +02:00
Olivier PEREZ
a6788d81c2 Host can now force URL, used behind a reverse-proxy 2015-06-23 22:03:56 +02:00
Olivier PEREZ
44928b0572 Dont sort classic polls 2015-05-30 23:36:04 +02:00
Antonin
4ced550942 Merge remote-tracking branch 'upstream/release/0.9' into release/0.9 2015-05-29 18:59:09 +02:00
Antonin
fa111ab04e Prevent from deleting the last slot 
- Also fix the corresponding translation when a problem arise.
 2015-05-29 18:53:09 +02:00
Antonin
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
Olivier PEREZ
cb0864f8fd Fix a lot of things 2015-05-29 18:11:12 +02:00
Olivier PEREZ
ad2b146c3c Remove parameter from MailService::send 2015-05-29 17:49:01 +02:00
Olivier PEREZ
278e478d1a Write log when send a mail 2015-05-29 17:41:50 +02:00
Olivier PEREZ
be155aa2a1 MailService now manage the anti-flood system 2015-05-29 17:06:03 +02:00
Olivier PEREZ
1ec8db4c30 Check if vote name is already used + Fix missing key 2015-04-24 00:29:10 +02:00
Olivier PEREZ
551b839292 Display the count of 'if need be' 2015-04-23 23:18:31 +02:00
Olivier PEREZ
45d14044f8 Factorize a little the mails 2015-04-14 22:32:41 +02:00
Olivier Perez
199e41ec93 Fix: description was required 2015-04-14 13:34:42 +02:00
Olivier PEREZ
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
Antonin
0505ab6bb2 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	app/classes/Framadate/Utils.php
 2015-04-13 16:16:02 +02:00
Antonin
fbd45960b7 Changing some actions from POST to GET. 2015-04-13 15:45:01 +02:00
Olivier PEREZ
3ef40417b2 Fix usage of markdown 2015-04-13 14:52:43 +02:00
Olivier PEREZ
7b4bc4ad7f Replace $html_lang by $locale 2015-04-13 12:10:07 +02:00
Olivier PEREZ
faca65b510 Fix problem with 'empty' function and some PHP versions 2015-04-11 17:23:37 +02:00
Olivier PEREZ
6d1f0ada0e Don't allow black title, name or comment 2015-04-11 17:13:16 +02:00
Olivier PEREZ
e4b61ff54b Don't redirect to studs when you edit a vote from adminstuds 2015-04-11 17:03:10 +02:00
Olivier PEREZ
201d5168fe Refactor the input filter system 2015-04-11 16:02:07 +02:00
Olivier PEREZ
77234edc82 Add page where the users can ask to receive their polls by mail 2015-04-08 22:11:19 +02:00
Olivier PEREZ
8b3eaac717 Fixes after merge 2015-04-07 23:17:26 +02:00
Olivier PEREZ
663f08f607 Merge branch 'feature/Work_on_Service_and_Repository' into develop 2015-04-07 22:26:13 +02:00
Olivier PEREZ
593d39c9cb Fix missing keys 2015-04-07 20:06:24 +02:00
Antonin
bd00cf1915 From double quote to simple quote 2015-04-07 17:40:20 +02:00
Antonin
16143d4ac8 Changed defaut edition option 2015-04-06 14:06:47 +02:00
Antonin
1e39eae056 Changed the file header to framadate license 2015-04-06 12:54:18 +02:00
Antonin
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
Antonin
0c2ba20bfa Added option of poll with hidden results. 2015-04-05 18:36:43 +02:00
Antonin
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
Antonin
1f55167e2c Added new editable possibility at poll creation 2015-04-05 15:41:19 +02:00
Olivier PEREZ
b47c153aae More Splitting between Services and Repositories 2015-04-03 00:11:36 +02:00
Olivier PEREZ
612e47ffa3 Create CommentRepository 2015-04-02 23:32:24 +02:00
Olivier PEREZ
7d84ec1e73 Create SlotRepository + AbstractRepository 2015-04-02 23:23:34 +02:00
Olivier PEREZ
7ad74ae03a Create PollRepository + Extract creation poll code from Service to Repository 2015-04-02 23:10:41 +02:00
Olivier PEREZ
8f4c5122c3 Add protection not to generate 2 identical IDs 2015-04-02 22:56:31 +02:00
Antonin
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
Antonin
86a89abf42 Added unique id to vote. 2015-04-02 12:03:38 +02:00
Antonin
c4cc36b076 Using more secure token 2015-04-02 12:03:28 +02:00
Olivier Perez
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
Olivier PEREZ
da2cdeda12 Smartysize infos_creation, and rename it to create_poll 2015-03-29 22:13:22 +02:00
Olivier PEREZ
591c4dd1af Move some code from FramaDB to Service 2015-03-29 12:59:47 +02:00
Olivier PEREZ
40d707c96d Issue #18 Add search engine on admin polls list 2015-03-27 13:10:46 +01:00
Olivier PEREZ
0efc3d4bcc Fix the update of poll infos 2015-03-18 00:46:19 +01:00
Olivier PEREZ
1d5a33b560 Remove the notion of 0.9.1, replace it with 0.9 2015-03-05 21:30:33 +01:00
Olivier PEREZ
778a03f802 Fix usage of preg_replace 2015-03-05 13:22:55 +01:00
Olivier PEREZ
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
Olivier PEREZ
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
Olivier PEREZ
6e442e02e3 Complete the fix of accent problem during migration 2015-02-26 23:03:49 +01:00
Olivier PEREZ
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
Olivier PEREZ
a4dd36d1bc Convert accent from html to utf8 when migrating 2015-02-26 21:29:30 +01:00
Olivier PEREZ
d30b6d6f7b Fix and improve performance for migration from 0.8 to 0.9 2015-02-26 10:44:49 +01:00
Olivier PEREZ
8a0c8bd8d3 Make language selection work better 2015-01-20 00:05:43 +01:00
Olivier PEREZ
cbad43614d Re-add count of votes in polls admin page 2015-01-18 16:30:02 +01:00
Olivier PEREZ
f6a7a1c7bb Issue #18 Install pagination on polls admin page 2015-01-18 16:14:45 +01:00
Olivier PEREZ
80be71d382 Improve management of errors in infos_sondage page 2015-01-17 16:25:12 +01:00
Olivier PEREZ
87150cc97e Add column receiveNewComments to poll table, to send notification when a user wrote a comment. 2015-01-17 01:28:12 +01:00
Olivier PEREZ
1df48988a6 Use CSRF tokens on admin page 2015-01-10 16:35:21 +01:00
Olivier PEREZ
e7ebd55299 WIP Start implmenting CSRF 2015-01-09 09:22:31 +01:00
Olivier PEREZ
6f7c911bae Issue #26 Admin can change the name of initiator of the poll 2015-01-08 22:18:28 +01:00
Olivier PEREZ
924bd1ed1a Issue #26 Poll admin can change expiration date 2015-01-08 22:18:27 +01:00
Olivier PEREZ
afd6079420 Issue #22 Enable vote name modification 2015-01-08 22:18:18 +01:00
Olivier PEREZ
2495a8002f Admin: The polls page now use Smarty template 2015-01-07 22:47:34 +01:00
Olivier PEREZ
073bc9048d Admin: Fix the admin page 2015-01-06 23:52:52 +01:00
Olivier PEREZ
1e2877e863 Don't encode to HTML value before storing it to database 2015-01-05 23:30:47 +01:00
Olivier PEREZ
98018de541 Fix some things after cherry-picking 2015-01-04 18:49:57 +01:00
FramaJosephK
f71326f496 Keep polls with bad expiration date in database 
(cherry picked from commit c15ce049ad)

Conflicts:
	app/classes/Framadate/Utils.php
 2015-01-04 18:33:31 +01:00
FramaJosephK
35ba152199 Retouches après série de merges 
(cherry picked from commit 6751a8a9cf)

Conflicts:
	adminstuds.php
	app/classes/Framadate/Utils.php
	creation_sondage.php
 2015-01-04 18:29:36 +01:00
Spanti Nicola (RyDroid)
381c4444e3 Minor modifications to Utils.php 
(cherry picked from commit e6d171a4b0)

Conflicts:
	app/classes/Framadate/Utils.php
 2015-01-04 18:18:59 +01:00
Spanti Nicola (RyDroid)
7483620880 Minor modifications to Utils.php 
Cherry-picked :
        e6d171a4

Conflicts:
	app/classes/Framadate/Utils.php
 2015-01-04 16:41:11 +01:00
Olivier PEREZ
985842edf3 CSV Export: Implements export for classical polls 2015-01-03 19:06:03 +01:00
Olivier Perez [a570709]
8f8956d70a Migration: Add precondition on every Migration sub-classes 2015-01-02 09:08:07 +01:00
Olivier PEREZ
a8345cf7f8 Parse markdown on classic votes 2015-01-01 23:24:17 +01:00
Olivier PEREZ
c533645d29 Make installation from scratch work with migration page 2015-01-01 01:18:49 +01:00
Olivier PEREZ
1578703de6 Fix line breaks on mails sent 2015-01-01 01:17:53 +01:00
Olivier PEREZ
1111b86e2a Define a prefix for database table names. 2014-12-31 15:19:15 +01:00
Olivier PEREZ
c9be94bc19 Migration: Finalize the migration of database from 0.8 to 0.9 2014-12-31 14:25:56 +01:00
Olivier PEREZ
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
Olivier PEREZ
f399b9e543 admin: fix deleteion a slot from a classical poll 2014-12-30 17:03:43 +01:00
Olivier PEREZ
1ca7502216 Translate database names (table+columns) to English + Reorganize some columns 2014-12-30 01:41:25 +01:00
Olivier PEREZ
dcb711dccc Implements purge methods 2014-12-29 21:54:07 +01:00
Olivier PEREZ
10c409e29e LogService: Change date format to "Ymd His" 2014-12-29 21:52:44 +01:00
Olivier PEREZ
23ec39adb2 Create PurgeService 2014-12-28 23:43:47 +01:00
Olivier PEREZ
53048e8488 Fix display of best choices on classic polls 2014-12-27 00:23:56 +01:00
Olivier PEREZ
98f14c487a Enable poll deletion + improve random generator 2014-12-25 01:11:14 +01:00
Olivier PEREZ
9ed0043569 Some cleaning in poll creation 2014-12-25 00:55:52 +01:00
Olivier PEREZ
31f62cd62d LogService: Add a line break at the en of lines 2014-12-24 23:38:44 +01:00
Olivier PEREZ
5d8e5362f9 admin: Add some logging on important actions (delete poll, clean votes, clean comments, drop column) 2014-12-24 22:42:50 +01:00
Olivier PEREZ
a5d1305535 LogService : WIP 2014-12-24 09:40:41 +01:00
Olivier PEREZ
b5fc415edc admin: Add availability to delete a poll 2014-12-23 09:48:58 +01:00
Olivier PEREZ
f50b244568 Return true when deleting a slot. 2014-12-23 01:01:09 +01:00
Olivier PEREZ
8109b11b70 Move mail sending to class \Framadate\Service\MailService 2014-12-23 00:58:00 +01:00
Olivier PEREZ
288ddd2efc admin: Add availability to add a slot to a poll 2014-12-23 00:30:05 +01:00
Olivier Perez [a570709]
94e87a3182 WIP> admin: Add availability to add a slot to a poll 2014-12-22 14:18:33 +01:00
Olivier PEREZ
dec9e24530 admin: Implement the removal of a slot. 2014-12-21 23:48:22 +01:00
Olivier PEREZ
1a062a2a69 admin: Add availability to delete a vote. 2014-12-21 00:25:00 +01:00
Olivier PEREZ
b8d0110263 Remove code from old_adminstuds that is already refactored. 2014-12-21 00:14:56 +01:00
Olivier PEREZ
8d46ec6c33 Move all admin method from PollService to AdminPollService 2014-12-20 23:59:44 +01:00
Olivier PEREZ
94a125ca2b Display confirmation page before to delete all comments of one poll. 2014-12-19 00:59:27 +01:00
Olivier PEREZ
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
Olivier PEREZ
14727bd94c admin: Add availability to delete all votes of a poll. 2014-12-19 00:30:33 +01:00
Olivier PEREZ
1b01bcc6b6 admin: Add availability to delete comments one by one. 2014-12-19 00:13:21 +01:00
Olivier PEREZ
8e15a008fe adminstuds.php: Realize the update of poll in database 2014-12-18 13:57:25 +01:00
Olivier PEREZ
ceb6ae3bca Remove old code + Add doc 2014-12-17 13:52:52 +01:00
Olivier PEREZ
9284a5d62b Add licence informations on classes 2014-12-17 13:48:03 +01:00
Olivier PEREZ
ab5f9e013a Implement comments functionnality 2014-12-17 13:47:14 +01:00
Olivier PEREZ
80b06d65cd Some work on vote saving 2014-12-17 13:17:08 +01:00
Olivier PEREZ
e941cf1822 Add availability to edit a vote 2014-12-16 00:45:16 +01:00
Olivier PEREZ
d54f2e4759 Improve usage of namespace + Create PollService in /Framadate/Service namespace 2014-12-16 00:02:01 +01:00
Olivier PEREZ
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
Olivier PEREZ
3743ad55f1 Make add vote working 2014-12-07 23:12:08 +01:00
Olivier PEREZ
3d0e167e77 Clean a lot of adminstuds.php 2014-12-07 16:47:35 +01:00
Olivier PEREZ
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
Olivier PEREZ
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
Olivier PEREZ
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
FramaJosephK
307f36ae64 fix a11y + reprise config.inc + bug date_format win 2014-11-14 17:35:22 +01:00