Mise à jour lien vers Studs

- Remove the X-Mailer header in e-mails, as this causes some email servers to see emails sent by Framadate as spam
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEExMITpfxOHHCvHn8FoGG53eDKB3MFAmHElvwACgkQoGG53eDK
 B3PO3w/+LyyC4Y7fDtl4hm9ClIswp62ozhxlIzRDJbza2S2S37A0ssXJMYCf2VOR
 ak+vWFUs9xj3o6G3oGlhLF1KMpWJ/nFVhyhCGgV1mQmUHSX2gnn6S9PBFenOGc9w
 zD2onJhVhJ/tbCJbF0Yl6zPitkfiucJI3FFIauByhkZ8wI3MPIYo/2m+H7KeVwLp
 YgJU0VqUQNMYl1clC+9Vu6gpSk/f6RklEVzJfEgV4MWMfoM6hLFqo0F6IDyWmgKp
 eNi1KHmFBGKFIexQeI+AvDyJyYsZH7uJrB0F7bV4wJGS7MTPOJlOJG5MXlLDcJgK
 EKNFUqrb9pQT5TWkO5FbJjfHwbP5bhO7TAEEvdIzhFqziR6gqdr2uXi+HiwG7yHO
 21YzDMnRZPqiYTBJuP0XIhsJrgpIBQDuQ3u9XJTs4pfyxQDSR8m9sHdiPSEZySRN
 p7XJSsDyLhcjjAobdodLuZLSWqOvZfaHzXEEKZO3HdQmccbwRHvniXDEy0FHEt2A
 L7LVvd4Qpa4wi6T2b3UIK4ubuC4xYdtYBfpzOklcti5TwDT2jbSTJRbv5oGAPX1b
 HfMzMoi/os3ZDSnPPRUaBxxrbjFQ9bX4bdxfQZeC2XIBWMBOcF3SeSbC1vVlcu+3
 bgwo3mehLvBCY0uMCGrjdymcAQq2IwX5Df8dGS7jFWUS5rAUi7s=
 =OVGk
 -----END PGP SIGNATURE-----

Merge tag '1.1.19' into chapril-1.1.19

.gitignore

@@ -8,8 +8,9 @@ nav
 app/inc/config.php
 vendor
 cache/
-tpl_c/
-.php_cs.cache
+tpl_c/*
+!tpl_c/.gitkeep
+.php-cs-fixer.cache
 .zanata-cache/
 
 # Temp files
@@ -24,3 +25,6 @@ Thumbs.db
 .project
 .idea/
 *.iml
+
+#ics temp file
+out.ics

.gitlab-ci.yml

@@ -1,36 +1,27 @@
-image: framasoft/framadate-ci
+image: framasoft/framadate-ci:7.3-pdo_mysql
 stages:
   - test
   - deploy
-  - beta
-  - funky
 
 # Run php-cs-fixer and phpunit on all branches
 test:
   stage: test
   script:
     - composer install -o  --no-interaction --no-progress --prefer-dist
-    - mkdir tpl_c
     - php vendor/bin/php-cs-fixer fix --verbose --dry-run
     - vendor/bin/phpunit --bootstrap app/tests/bootstrap.php --debug app/tests
+  image: framasoft/framadate-ci:${PHP_VERSION}-pdo_mysql
+  parallel:
+      matrix:
+          - PHP_VERSION:
+                - "7.3"
+                - "7.4"
+                - "8.0"
+                - "8.1"
   cache:
     paths:
       - vendor/
 
-check-trad:
-  stage: test
-  allow_failure: true
-  script:
-    - if [ -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then echo "*** Unable to check if translations need to be pulled, exiting ***"; exit 1; fi
-    - export ORIG=$(git diff-files --shortstat)
-    - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then mkdir -p ${HOME}/.config; echo -e "${ZANATA_CONFIG_FRAMABOT}" > ${HOME}/.config/zanata.ini; fi
-    - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then make push-locales; fi
-    - git status > /dev/null 2>&1
-    - export CHANGES=$(git diff-files --shortstat)
-    - if [[ $CHANGES != $ORIG ]]; then echo "*** There is changes in locales ***"; echo "*** You need to do `make pull-locales` in your repo ***"; exit 1; fi
-  only:
-    - develop
-
 # Create artifacts on master
 pages:
   stage: deploy
@@ -39,14 +30,29 @@ pages:
   - git checkout ${latesttag}
   - composer install -o  --no-interaction --no-progress --prefer-dist --no-dev
   - composer dump-autoload --optimize --no-dev --classmap-authoritative
-  - mkdir tpl_c
   - mkdir framadate
   - mv `ls -A | grep -v framadate` ./framadate
-  - chmod -R 644 framadate/ && chmod -R 770 framadate/tpl_c/ && chmod -R 770 framadate/app/inc/
-  - zip -r latest.zip framadate
+  - echo $latesttag > framadate/VERSION
+  - find framadate/ -type d -exec chmod 750 {} \;
+  - find framadate/ -type f -exec chmod 640 {} \;
+  - rm -rf framadate/.git
+  - export RELEASE_ZIP="framadate-${CI_COMMIT_TAG}.zip"
+  - zip -r $RELEASE_ZIP framadate
   - mkdir .public
-  - cp latest.zip .public
+  - cp $RELEASE_ZIP .public/latest.zip
   - mv .public public
+  - if [[ -z $GITLAB_API_TOKEN ]]; then exit; fi
+  - export PROJECT_API_URL="https://framagit.org/api/v4/projects/${CI_PROJECT_ID}"
+  - export DESCRIPTION_URL="${PROJECT_API_URL}/repository/tags/${CI_COMMIT_TAG}"
+  - export RELEASE_URL="${DESCRIPTION_URL}/release"
+  - 'export HEADER="Private-Token: ${GITLAB_API_TOKEN}"'
+  - export artifactUrl=$(curl -s --request POST --header "${HEADER}" --form "file=@${RELEASE_ZIP}" "${PROJECT_API_URL}/uploads" | jq .url)
+  - export artifactAbsoluteUrl="${CI_PROJECT_URL}${artifactUrl}"
+  - export description=$(curl -s --header "${HEADER}" "${DESCRIPTION_URL}" | jq .release.description | sed -e 's@"@@g')
+  - if [[ $description == 'null' ]]; then export METHOD="POST"; echo -e 'You can download the release zip here:'" [${RELEASE_ZIP}](${artifactAbsoluteUrl})" > /tmp/text; fi
+  - if [[ $description != 'null' ]]; then export METHOD="PUT";  echo -e "${description}\n\n"'You can download the release zip here:'" [${RELEASE_ZIP}](${artifactAbsoluteUrl})" > /tmp/text; fi
+  - curl -s --request $METHOD --data-urlencode "description@/tmp/text" --header "${HEADER}" "${RELEASE_URL}"
+  - curl -s --request POST --header "${HEADER}" --data name="${RELEASE_ZIP}" --data url="${artifactAbsoluteUrl}" "${PROJECT_API_URL}/releases/${CI_COMMIT_TAG}/assets/links"
   artifacts:
     paths:
     - public
@@ -54,55 +60,3 @@ pages:
     - tags
   except:
     - (beta|alpha)
-
-# Deploy on develop
-beta:
-  stage: beta
-  script:
-  - git checkout develop
-  - composer install -o  --no-interaction --no-progress --prefer-dist --no-dev
-  - composer dump-autoload --optimize --no-dev --classmap-authoritative
-  - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then mkdir -p ${HOME}/.config; echo -e "${ZANATA_CONFIG_FRAMABOT}" > ${HOME}/.config/zanata.ini; fi
-  - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then make pull-locales; fi
-  - mkdir tpl_c
-  - mkdir .public
-  - cp -r * .public
-  - cp -r .git .public
-  - mv .public public
-  - mkdir "${HOME}/.ssh"
-  - chmod 700 "${HOME}/.ssh"
-  - if [ ! -z ${DEPLOYEMENT_KNOWN_HOSTS+x} ]; then echo -e "${DEPLOYEMENT_KNOWN_HOSTS}" > ${HOME}/.ssh/known_hosts; fi
-  - eval `ssh-agent -s`
-  - if [ ! -z ${BETA_KEY+x} ]; then ssh-add <(echo "${BETA_KEY}" | base64 --decode -i); fi
-  - if [ ! -z ${BETA_KEY+x} ]; then rsync -a --delete --exclude admin/.stdout.log --exclude admin/.htpasswd --exclude app/inc/config.php --exclude stats/ --exclude error/ public/ ${BETA_USER}@${DEPLOYEMENT_HOST}:../../web/; fi
-  only:
-    - develop
-
-# Deploy on funky
-funky:
-  stage: funky
-  script:
-  - git checkout funky
-  - composer install
-  - mkdir tpl_c
-  - mkdir .public
-  - cp -r * .public
-  - mv .public public
-  - mkdir "${HOME}/.ssh"
-  - chmod 700 "${HOME}/.ssh"
-  - if [ ! -z ${DEPLOYEMENT_KNOWN_HOSTS+x} ]; then echo -e "${DEPLOYEMENT_KNOWN_HOSTS}" > ${HOME}/.ssh/known_hosts; fi
-  - eval `ssh-agent -s`
-  - if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i); fi
-  - if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then rsync -a --delete --exclude admin/.stdout.log --exclude admin/.htpasswd --exclude app/inc/config.php --exclude stats/ --exclude error/ public/ ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:../../web/; fi
-  only:
-    - funky
-
-# Push new translations strings to https://trad.framasoft.org
-trads:
-  stage: deploy
-  image: framasoft/push-trad:latest
-  script:
-  - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then mkdir -p ${HOME}/.config; echo -e "${ZANATA_CONFIG_FRAMABOT}" > ${HOME}/.config/zanata.ini; fi
-  - if [ ! -z ${ZANATA_CONFIG_FRAMABOT+x} ]; then make push-locales; fi
-  only:
-    - develop

.php-cs-fixer.dist.php

@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         'array_syntax' => [
@@ -8,16 +8,18 @@ return PhpCsFixer\Config::create()
         ],
         'combine_consecutive_unsets' => true,
         'heredoc_to_nowdoc' => true,
-        'no_extra_consecutive_blank_lines' => [
-        'break',
-            'continue',
-            'extra',
-            'return',
-            'throw',
-            'use',
-            'parenthesis_brace_block',
-            'square_brace_block',
-            'curly_brace_block'
+        'no_extra_blank_lines' => [
+            'tokens' => [
+                'break',
+                'continue',
+                'extra',
+                'return',
+                'throw',
+                'use',
+                'parenthesis_brace_block',
+                'square_brace_block',
+                'curly_brace_block'
+            ]
         ],
         'no_unreachable_default_argument_value' => true,
         'no_useless_else' => true,
@@ -38,7 +40,8 @@ return PhpCsFixer\Config::create()
             ->exclude([
                 'vendor',
                 'var',
-                'web'
+                'web',
+                'tpl_c'
             ])
             ->in(__DIR__)
     )

CHANGELOG.md

@@ -1,5 +1,215 @@
 # Changelog de framadate
 
+## 1.1.19
+
+23-12-2021
+
+### Fixed
+
+- Remove the X-Mailer header in e-mails, as this causes some email servers to see emails sent by Framadate as spam
+
+## 1.1.18
+20-12-2021
+
+### Changed
+- Dependency updates
+- Replace abandonned SimpleMDE with EasyMDE fork
+
+### Fixed
+- Enforce the instance expiration limits when editing the poll expiration date once created, from poll admin
+- Fixed some HTML markup validity
+
+### Translations
+- Fixed a missing french language key
+- Enable Catalan language
+
+## 1.1.17
+18-10-2021
+### Added
+
+- Allow to export to ICS the best choices
+
+### Changed
+
+- Allow configuring AuthType for MailService
+
+### Security
+
+- Fix an XSS possibility in the result graph
+
+## 1.1.16
+22-03-2021
+### Changed
+
+- **Framadate now requires the `mbstring` PHP extension.** Make sure it's installed and activated before updating.
+
+### Fixed
+
+- Handle poll creator names being too long properly
+
+
+## 1.1.15
+22-03-2021
+### Security
+
+- Fixed cross-site scripting (XSS) attacks in poll description markdown preview. All administrators are encouraged to upgrade, especially if you have sensitive services and data on the same domain name.
+  This was reported by @martgil
+  https://framagit.org/framasoft/framadate/framadate/-/issues/546
+
+## 1.1.14
+08-03-2021
+### Fixed
+
+- Avoid error with a name too long https://framagit.org/framasoft/framadate/framadate/-/issues/530
+
+## 1.1.13
+08-03-2021
+### Fixed
+
+- Fixed error when closing a poll https://framagit.org/framasoft/framadate/framadate/-/issues/532
+
+## 1.1.12
+18-12-2020
+
+### Changed
+
+* Framadate now requires PHP 7.3
+
+## 1.1.11
+18-12-2020
+### Fixed
+
+- Fixed translations keys missing into emails https://framagit.org/framasoft/framadate/framadate/-/issues/463
+
+### Translations
+
+- Added Catalan translation
+
+## 1.1.10
+
+### Fixed
+* Remove .git folder inside releases.
+* Create releases through CI
+
+## 1.1.9
+
+### Fixed
+- Fixes session issue https://framagit.org/framasoft/framadate/framadate/issues/255
+- Fixes bug when editing column https://framagit.org/framasoft/framadate/framadate/issues/379
+- Fix mail subject escaping https://framagit.org/framasoft/framadate/framadate/issues/375
+
+## 1.1.8
+### Fixed
+- Stop creating `tpl_c` directory in releases and add a `.gitkeep`
+- Show database connection issue details on installation panel
+- Set the proper file rights on release packages
+- Added `session.cookie_httponly = 1` to local php.ini file
+
+## 1.1.7
+### Fixed
+
+- Fix issue with maximum number of participants https://framagit.org/framasoft/framadate/issues/353 (thanks to @lohmeyer for reporting it)
+
+## 1.1.6
+
+### Fixed
+
+- Bump dependencies, including PHPMailer to version 6.x
+- Fix an small issue with Smarty template
+
+## 1.1.5
+### Fixed
+
+- Restrict custom poll URLs against app urls (thanks @mosterdt)
+- Add a parameter to disable build-in font-awesome (thanks @mm)
+- Fix an XSS security issue with time slots (thanks https://bitsoffreedom.nl for responsibly disclosing it).
+
+## 1.1.4
+
+### Fixed
+* Add Fork-awesome, remove dependency to Font-Awesome Bootstrap CDN, add an option to disable it (https://framagit.org/framasoft/framadate/merge_requests/300 - @tcit)
+
+## 1.1.3
+
+### Fixed
+* Fixing issue when no choice is selected introducted in https://framagit.org/framasoft/framadate/merge_requests/284 (https://framagit.org/framasoft/framadate/merge_requests/298 - @mm)
+
+## 1.1.2
+
+### Fixed
+- Use Parsedown's Safe Mode
+
+## 1.1.1
+
+### Bug fixes
+
+- Send email with correct vote address (thanks to @lohmeyer for finding it)
+
+## 1.1.0
+
+### Warning
+
+**Framadate now requires PHP 5.6** to be used (it should still work under 5.4 but will not be supported anymore).
+
+### Features
+
+- Markdown editor for descriptions ! (@Antonin)
+- Adding a maximum participants number (@SuperNach0)
+- Allow setting SMTP config (Simon LEBLANC)
+- Allow admins to give the vote link back to the voters (@mm, @tcit)
+- Sending voters emails to remind themselves their voting url now works (@mm)
+
+### Enhancements
+
+- UI improvements for responsive design (@marjolaine-v)
+- Better coherence for visible results and passwords (@TDavid)
+- Added an edit button on the right when too many options (@SuperNach0)
+- Emails with international characters are now allowed (added an unit test) (@mm)
+
+### Translations
+
+**New strings are available, don't hesitate to head to <https://trad.framasoft.org/zanata/project/view/framadate> to translate them into your language !**
+
+### Fixed
+
+- Reschedule function (https://framagit.org/framasoft/framadate/issues/203) (@TDavid)
+- lang attribute must be a valid IETF language tag (@Rudloff)
+- Fix datepicker js locale file path
+- Fix everyone can always vote #267
+- Fix MySQL error with `NO_ZERO_DATE` #224
+- SimpleMDE Markdown Editor has been updated the latest version to remove console.log calls
+- Fix width of `if need be` vote option and missing parenthesis
+- Remove autocomplete on date fields
+- Various fixes for value max error handling
+- New error strings for bad formatted inputs (admin name, wrong value max option)
+- Email is now a email field (better for virtual keyboards) and is html required as well as title
+- Advanced settings for poll are now opened if there's error within them
+- css fixes for pictures inside columns, and little space between editor and description text area (@marjolaine-v)
+- released zip files now have proper chmod rights (@tcit)
+- Best choices now work properly when there's no votes (@mm)
+- Don't allow an existing name when updating a vote (@mm)
+- Keep vote selections when there's an error on the name (@mm)
+- Add a message « Your poll has been created » at the end of the poll form process (@mm)
+
+### Documentation
+
+- Move everything to wiki, translate everything to English
+
+### Technical
+
+- Continuous Integration handles the release process
+- Translations with Zanata : https://trad.framasoft.org/zanata/project/view/framadate (@luc)
+- Style fixes with PHP-CS
+- Libraries updated
+- Improved a few docs
+- Use own Framadate Docker Image for CI
+- https://beta.framadate.org now gets the latest translations for each deployment (@luc)
+- A CI job tells if translations strings are up-to-date (@luc)
+
+## 1.0.3
+
+- Corrections de wording (fr / en)
+
 ## Version 1.0 (Erik - Markus - Ecmu - Julien - Imre - Luc - Pierre - Antonin - Olivier)
     - Amélioration : Conserver les votes en cours lors que l'utilisateur envoie un commentaire
     - Amélioration : Les mails sont envoyés en multipart pour les lecteurs ne supportant pas HTML
@@ -105,7 +315,7 @@
     - Fix : Bug à la création d'un sondage sans Javascript ou sans Cookies
     - Fix : Erreur d'url avec les noms de domaine contenant "admin"
     - Fix : Mise à jour de la doc d'installation
-    
+
 ## Version 0.8 (juillet 2014 Pascal Chevrel - Armony Altinier - JosephK)
 	- Améliorations sur l'accessibilité
 	- Améliorations sur l'ergonomie
@@ -139,7 +349,7 @@
 
 ## Changelog des 22 et 23 juin (pyg@framasoft.net)
 	- très nombreuses modifications CSS
-	- ajout de buttons.css pour des boutons plus propres 
+	- ajout de buttons.css pour des boutons plus propres
 	- ajout de print.css pour une impression sans la classe "corps"
 	- refonte de la page d'accueil
 	- ajout de la framanav
@@ -205,7 +415,7 @@
 	- Traduction de STUdS en anglais, allemand et espagnol,
 	- Changement de la CSS avec ajout du logo de l'Université de Strasbourg,
 	- Possibilité d'ajouter un commentaire pour les sondés.
-	
+
 	Changelog version 0.4 (janvier 2009) :
 	- Possibilité de faire un export PDF pour envoyer la lettre de convocation à la date de réunion,
 	- Possibilité de rajouter des colonnes dans la partie administration de sondage,
@@ -216,7 +426,7 @@
 	- Mise en place d'un repository Subversion pour partager les nouvelles versions de STUdS,
 	- Amélioration de la CSS pour un meilleur affichage,
 	- Modification du code source pour le rendre portable vers une autre machine.
-	
+
 	Changelog version 0.2 (novembre 2008) :
 	- Lors de la création d'un sondage DATE, classement des dates par ordre croissant,
 	- Lors de la création d'un sondage DATE, accepter les horaires au format "8h" ou "8H",

README.md

@@ -4,26 +4,28 @@
 
 ![Français](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/Flag_of_France.svg/20px-Flag_of_France.svg.png) Framadate est un service en ligne permettant de planifier un rendez-vous ou prendre des décisions rapidement et simplement. Aucune inscription préalable n’est nécessaire.
 
+**Framadate is now in maintenance mode.** [Read more](https://framagit.org/framasoft/framadate/framadate/-/issues/545#note_920869)
+
 ---
 # Installation
 
-Follow the instructions on our Wiki : <https://framagit.org/framasoft/framadate/wikis/home>
+Follow the instructions on our Wiki : <https://framagit.org/framasoft/framadate/framadate/-/wikis/home>
 
 # Contribute
 
 ## Code 
-Follow the instructions on <https://framagit.org/framasoft/framadate/wikis/coding>
+Follow the instructions on <https://framagit.org/framasoft/framadate/framadate/-/wikis/coding>
 
 # Traductions
 
-Follow the instructions on <https://framagit.org/framasoft/framadate/wikis/translating>
+Follow the instructions on <https://framagit.org/framasoft/framadate/framadate/-/wikis/translating>
 
 # Used libraries
 
-* PHP [PHP 5.6](http://php.net)
+* PHP [PHP 7.3](http://php.net)
 * Templating [Smarty](http://www.smarty.net/),
-* I18N [o80-i18n](https://github.com/olivierperez/o80-i18n)
-* Database: PostgreSQL ou [MySQL 5.5](https://dev.mysql.com/downloads/mysql/5.5.html)
+* I18N [o80-i18n](https://framagit.org/framasoft/framadate/o80-i18nn)
+* Database: MySQL or MariaDB.
 
 ---
 

action/add_comment.php

@@ -40,7 +40,7 @@ $is_admin = false;
 /*----------*/
 
 $logService = new LogService();
-$pollService = new PollService($connect, $logService);
+$pollService = new PollService($logService);
 $inputService = new InputService();
 $mailService = new MailService($config['use_smtp'], $config['smtp_options']);
 $notificationService = new NotificationService($mailService);
@@ -63,7 +63,7 @@ if (!empty($_POST['poll_admin'])) {
 
 if (!$poll) {
     $message = new Message('error',  __('Error', 'This poll doesn\'t exist !'));
-} else if ($poll && !$securityService->canAccessPoll($poll) && !$is_admin) {
+} else if (!$is_admin && !$securityService->canAccessPoll($poll)) {
     $message = new Message('error',  __('Password', 'Wrong password'));
 } else {
     $name = $inputService->filterName($_POST['name']);
@@ -88,8 +88,10 @@ if (!$poll) {
 
 $smarty->error_reporting = E_ALL & ~E_NOTICE;
 $smarty->assign('comments', $comments);
+$smarty->assign('poll_id', $poll_id);
+$smarty->assign('admin_poll_id', $admin_poll_id);
 $comments_html = $smarty->fetch('part/comments_list.tpl');
 
 $response = ['result' => $result, 'message' => $message, 'comments' => $comments_html];
 
-echo json_encode($response);
+echo json_encode($response, JSON_THROW_ON_ERROR);

action/send_edit_link_by_email_action.php

@@ -29,7 +29,7 @@ include_once __DIR__ . '/../app/inc/init.php';
 $logService = new LogService();
 $sessionService = new SessionService();
 $mailService = new MailService($config['use_smtp'], $config['smtp_options']);
-$pollService = new PollService($connect, $logService);
+$pollService = new PollService($logService);
 
 $result = false;
 $message = null;
@@ -45,7 +45,7 @@ if (!empty($_POST['poll'])) {
 $token = $sessionService->get("Common", SESSION_EDIT_LINK_TOKEN);
 $token_form_value = empty($_POST['token']) ? null : $_POST['token'];
 $editedVoteUniqueId = filter_input(INPUT_POST, 'editedVoteUniqueId', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
-if (is_null($poll) || $config['use_smtp'] === false || is_null($token) || is_null($token_form_value)
+if ($config['use_smtp'] === false || is_null($poll) || is_null($token) || is_null($token_form_value)
     || !$token->check($token_form_value) || is_null($editedVoteUniqueId)) {
     $message = new Message('error', __('Error', 'Something is going wrong...'));
 }
@@ -91,4 +91,4 @@ $smarty->error_reporting = E_ALL & ~E_NOTICE;
 
 $response = ['result' => $result, 'message' => $message];
 
-echo json_encode($response);
+echo json_encode($response, JSON_THROW_ON_ERROR);

admin/check.php

@@ -20,7 +20,7 @@
 use Framadate\Message;
 use Framadate\Utils;
 
-define('ROOT_DIR', __DIR__ . '/../');
+const ROOT_DIR = __DIR__ . '/../';
 
 /**
  * Checking for missing vendors.
@@ -46,6 +46,7 @@ $ALLOWED_LANGUAGES = [
     'de' => 'Deutsch',
     'it' => 'Italiano',
     'br' => 'Brezhoneg',
+    'ca' => 'Català',
 ];
 const DEFAULT_LANGUAGE = 'en';
 require_once ROOT_DIR . 'app/inc/i18n.php';
@@ -57,7 +58,7 @@ require_once ROOT_DIR . 'app/inc/i18n.php';
  * @param Message $b
  * @return int
  */
-function compareCheckMessage(Message $a, Message $b)
+function compareCheckMessage(Message $a, Message $b): int
 {
     $values = [
         'danger' => 0,
@@ -89,7 +90,7 @@ $conf_filename = $inc_directory . 'config.php';
 if (version_compare(PHP_VERSION, PHP_NEEDED_VERSION) >= 0) {
     $messages[] = new Message('info', __f('Check','PHP version %s is enough (needed at least PHP %s).', PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION, PHP_NEEDED_VERSION));
 } else {
-    $messages[] = new Message('danger', __f('Check','Your PHP version (%s) is too old. This application needs at least PHP %s.', phpversion(), PHP_NEEDED_VERSION));
+    $messages[] = new Message('danger', __f('Check','Your PHP version (%s) is too old. This application needs at least PHP %s.', PHP_VERSION, PHP_NEEDED_VERSION));
 }
 
 // INTL extension
@@ -99,6 +100,13 @@ if (extension_loaded('intl')) {
     $messages[] = new Message('danger', __('Check','You need to enable the PHP Intl extension.'));
 }
 
+// mbstring extension
+if (extension_loaded('mbstring')) {
+    $messages[] = new Message('info', __('Check','PHP mbstring extension is enabled.'));
+} else {
+    $messages[] = new Message('danger', __('Check','You need to enable the PHP mbstring extension.'));
+}
+
 // Is template compile dir exists and writable ?
 if (!file_exists(ROOT_DIR . COMPILE_DIR)) {
     $messages[] = new Message('danger', __f('Check','The template compile directory (%s) doesn\'t exist in "%s". Retry the installation process.', COMPILE_DIR, realpath(ROOT_DIR)));
@@ -112,7 +120,7 @@ if (!file_exists(ROOT_DIR . COMPILE_DIR)) {
 if (file_exists($conf_filename)) {
     $messages[] = new Message('info', __('Check','The config file exists.'));
 } elseif (is_writable($inc_directory)) {
-    $messages[] = new Message('info', __('Check','The config file directory (%s) is writable.', $inc_directory));
+    $messages[] = new Message('info', __f('Check','The config file directory (%s) is writable.', $inc_directory));
 } else {
     $messages[] = new Message('danger', __f('Check','The config file directory (%s) is not writable and the config file (%s) does not exists.', $inc_directory, $conf_filename));
 }
@@ -175,11 +183,11 @@ usort($messages, 'compareCheckMessage');
 <body>
     <div class="container ombre">
         <div class="row">
-            <form method="get" action="" class="hidden-print">
+            <form method="get" class="hidden-print">
                 <div class="input-group input-group-sm pull-right col-xs-12 col-sm-2">
                     <select name="lang" class="form-control" title="<?=__('Language selector', 'Select the language')?>" >
                         <?php foreach ($ALLOWED_LANGUAGES as $lang_key => $language) { ?>
-                        <option lang="fr" <?php if (substr($lang_key, 0, 2)===$locale) { echo 'selected';} ?> value="<?=substr($lang_key, 0, 2)?>"><?=$language?></option>
+                        <option lang="fr" <?php if (strpos($lang_key, $locale) === 0) { echo 'selected';} ?> value="<?=substr($lang_key, 0, 2)?>"><?=$language?></option>
                         <?php } ?>
                     </select>
                 <span class="input-group-btn">

admin/cron_purge.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright 2018 Christian P. MOMON <cmomon@april.org>
+ *
+ * This software is governed by the CeCILL-B license. If a copy of this license
+ * is not distributed with this file, you can obtain one at
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
+ *
+ */
+
+use Framadate\Services\InputService;
+use Framadate\Services\LogService;
+use Framadate\Services\PurgeService;
+use Framadate\Services\SecurityService;
+
+// /////////////////////////////////////////////////
+// ////////// include_once __DIR__ . '/../app/inc/init.php';
+use Framadate\FramaDB;
+use Framadate\Repositories\RepositoryFactory;
+
+define('ROOT_DIR', __DIR__ . '/../');
+
+// Autoloading of dependencies with Composer
+require_once ROOT_DIR . '/vendor/autoload.php';
+require_once ROOT_DIR . '/vendor/o80/i18n/src/shortcuts.php';
+
+if (ini_get('date.timezone') === '') {
+    date_default_timezone_set('Europe/Paris');
+}
+
+require_once ROOT_DIR . '/app/inc/constants.php';
+
+define('CONF_FILENAME', ROOT_DIR . '/app/inc/config.php');
+if (is_file(CONF_FILENAME)) {
+    @include_once CONF_FILENAME;
+
+    // Connection to database
+    $connect = new FramaDB(DB_CONNECTION_STRING, DB_USER, DB_PASSWORD);
+    RepositoryFactory::init($connect);
+    $err = 0;
+} else {
+    define('NOMAPPLICATION', 'Framadate');
+    define('DEFAULT_LANGUAGE', 'fr');
+    define('IMAGE_TITRE', 'images/logo-framadate.png');
+    define('LOG_FILE', 'admin/stdout.log');
+}
+ 
+require_once ROOT_DIR . '/app/inc/i18n.php';
+
+// /////////////////////////////////////////////////
+
+/* Variables */
+/* --------- */
+
+/* Services */
+/*----------*/
+$logService = new LogService();
+$purgeService = new PurgeService($connect, $logService);
+$securityService = new SecurityService();
+$inputService = new InputService();
+
+/* Action */
+/* ------ */
+$logService->log('CRON PURGE', 'Cron purge starting…');
+
+$ended = false;
+$iterationCount = 0;
+$totalCount = 0;
+while (!$ended)
+{
+	$count = $purgeService->purgeOldPolls();
+	$logService->log('CRON PURGE', 'count='.$count);
+	if ($count == 0)
+	{
+		$ended = true;
+	}
+	else
+	{
+		$iterationCount += 1;
+		$totalCount += $count;
+	}
+}
+
+$logService->log('CRON PURGE', 'Purged '.$totalCount.' poll(s) in '.$iterationCount.' iterations.');
+$logService->log('CRON PURGE', 'Cron purge done.');
+
+/* PAGE */
+/* ---- */
+echo date("Y-m-d H:i:s").": cron purge done.\n"
+
+?>

admin/install.php

@@ -29,6 +29,7 @@ if (is_file(CONF_FILENAME)) {
 
 $error = null;
 $installService = new InstallService();
+$result['details'] = null;
 
 if (!empty($_POST)) {
     $installService->updateFields($_POST);
@@ -37,11 +38,13 @@ if (!empty($_POST)) {
     if ($result['status'] === 'OK') {
         header(('Location: ' . Utils::get_server_name() . 'admin/migration.php'));
         exit;
-    }  
-        $error = __('Error', $result['code']);
+    }
+
+    $error = __('Error', $result['code']);
 }
 
 $smarty->assign('error', $error);
+$smarty->assign('error_details', $result['details']);
 $smarty->assign('title', __('Admin', 'Installation'));
 $smarty->assign('fields', $installService->getFields());
-$smarty->display('admin/install.tpl');
+$smarty->display('admin/install.tpl');

admin/migration.php

@@ -17,6 +17,7 @@
  * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
  */
 
+use Framadate\FramaDB;
 use Framadate\Migration\AddColumn_hidden_In_poll_For_0_9;
 use Framadate\Migration\AddColumn_receiveNewComments_For_0_9;
 use Framadate\Migration\AddColumn_uniqId_In_vote_For_0_9;
@@ -57,7 +58,7 @@ $migrations = [
 // ---------------------------------------
 
 // Check if MIGRATION_TABLE already exists
-/** @var \Framadate\FramaDB $connect */
+/** @var FramaDB $connect */
 $tables = $connect->allTables();
 $pdo = $connect->getPDO();
 $prefixedMigrationTable = Utils::table(MIGRATION_TABLE);

admin/polls.php

@@ -50,7 +50,7 @@ $poll_to_delete = null;
 /*----------*/
 
 $logService = new LogService();
-$pollService = new PollService($connect, $logService);
+$pollService = new PollService($logService);
 $adminPollService = new AdminPollService($connect, $pollService, $logService);
 $superAdminService = new SuperAdminService();
 $securityService = new SecurityService();

admin/purge.php

@@ -34,14 +34,14 @@ $message = null;
 /*----------*/
 
 $logService = new LogService();
-$purgeService = new PurgeService($connect, $logService);
+$purgeService = new PurgeService($logService);
 $securityService = new SecurityService();
 $inputService = new InputService();
 
 /* POST */
 /*-----*/
 
-$action = $inputService->filterName(isset($_POST['action']) ? $_POST['action'] : null);
+$action = $inputService->filterName($_POST['action'] ?? null);
 
 /* PAGE */
 /* ---- */
@@ -57,4 +57,4 @@ $smarty->assign('crsf', $securityService->getToken('admin'));
 
 $smarty->assign('title', __('Admin', 'Purge'));
 
-$smarty->display('admin/purge.tpl');
+$smarty->display('admin/purge.tpl');

adminstuds.php

@@ -47,7 +47,7 @@ $editingVoteId = 0;
 /*----------*/
 
 $logService = new LogService();
-$pollService = new PollService($connect, $logService);
+$pollService = new PollService($logService);
 $adminPollService = new AdminPollService($connect, $pollService, $logService);
 $inputService = new InputService();
 $mailService = new MailService($config['use_smtp'], $config['smtp_options']);
@@ -80,7 +80,7 @@ $messagePollCreated = $sessionService->get("Framadate", "messagePollCreated", FA
 
 if ($messagePollCreated) {
 	$sessionService->remove("Framadate", "messagePollCreated");
-	
+
 	$message = new Message('success', __('adminstuds', 'The poll is created.'));
 }
 
@@ -113,7 +113,7 @@ if (isset($_POST['update_poll_info'])) {
             $updated = true;
         }
     } elseif ($field === 'rules') {
-        $rules = strip_tags($_POST['rules']);
+        $rules = (int) strip_tags($_POST['rules']);
         switch ($rules) {
             case 0:
                 $poll->active = false;
@@ -137,38 +137,41 @@ if (isset($_POST['update_poll_info'])) {
                 break;
         }
     } elseif ($field === 'expiration_date') {
-        $expiration_date = $inputService->filterDate($_POST['expiration_date']);
-        if ($expiration_date) {
-            $poll->end_date = $expiration_date;
+        $givenExpirationDate = $inputService->parseDate($_POST['expiration_date']);
+        $expiration_date = $inputService->validateDate($givenExpirationDate, $pollService->minExpiryDate(), $pollService->maxExpiryDate());
+        if ($poll->end_date !== $expiration_date->format('Y-m-d H:i:s')) {
+            $poll->end_date = $expiration_date->format('Y-m-d H:i:s');
             $updated = true;
         }
     } elseif ($field === 'name') {
-        $admin_name = $inputService->filterName($_POST['name']);
+        $admin_name = $_POST['name'];
+        $admin_name = mb_substr($admin_name, 0, 32);
+        $admin_name = $inputService->filterName($admin_name);
         if ($admin_name) {
             $poll->admin_name = $admin_name;
             $updated = true;
         }
     } elseif ($field === 'hidden') {
-        $hidden = isset($_POST['hidden']) ? $inputService->filterBoolean($_POST['hidden']) : false;
+        $hidden = isset($_POST['hidden']) && $inputService->filterBoolean($_POST['hidden']);
         if ($hidden !== $poll->hidden) {
             $poll->hidden = $hidden;
 	    $poll->results_publicly_visible = false;
             $updated = true;
         }
     } elseif ($field === 'removePassword') {
-        $removePassword = isset($_POST['removePassword']) ? $inputService->filterBoolean($_POST['removePassword']) : false;
+        $removePassword = isset($_POST['removePassword']) && $inputService->filterBoolean($_POST['removePassword']);
         if ($removePassword) {
             $poll->results_publicly_visible = false;
             $poll->password_hash = null;
             $updated = true;
         }
     } elseif ($field === 'password') {
-        $password = isset($_POST['password']) ? $_POST['password'] : null;
+        $password = $_POST['password'] ?? null;
 
         /**
          * Did the user choose results to be publicly visible ?
          */
-        $resultsPubliclyVisible = isset($_POST['resultsPubliclyVisible']) ? $inputService->filterBoolean($_POST['resultsPubliclyVisible']) : false;
+        $resultsPubliclyVisible = isset($_POST['resultsPubliclyVisible']) && $inputService->filterBoolean($_POST['resultsPubliclyVisible']);
         /**
          * If there's one, save the password
          */

app/classes/Framadate/Choice.php

@@ -24,34 +24,34 @@ class Choice
      * Name of the Choice
      */
     private $name;
-    
+
     /**
      * All availables slots for this Choice.
      */
     private $slots;
-    
+
     public function __construct($name='')
     {
         $this->name = $name;
         $this->slots = [];
     }
-    
-    public function addSlot($slot)
+
+    public function addSlot($slot): void
     {
         $this->slots[] = $slot;
     }
-    
-    public function getName()
+
+    public function getName(): string
     {
         return $this->name;
     }
-    
-    public function getSlots()
+
+    public function getSlots(): array
     {
         return $this->slots;
     }
-    
-    static function compare(Choice $a, Choice $b)
+
+    public static function compare(Choice $a, Choice $b): int
     {
         return strcmp($a->name, $b->name);
     }

app/classes/Framadate/Editable.php

@@ -23,14 +23,13 @@ namespace Framadate;
  * Class Editable
  *
  * Is used to specify the poll's edition permissions.
- * @TODO : wait to use the SplEnum
  *
  * @package Framadate
  */
 class Editable { // extends SplEnum
     const __default = self::EDITABLE_BY_ALL;
 
-    const NOT_EDITABLE = 0;
-    const EDITABLE_BY_ALL = 1;
-    const EDITABLE_BY_OWN = 2;
-}
+    public const NOT_EDITABLE = 0;
+    public const EDITABLE_BY_ALL = 1;
+    public const EDITABLE_BY_OWN = 2;
+}

app/classes/Framadate/Exception/AlreadyExistsException.php

@@ -2,6 +2,4 @@
 namespace Framadate\Exception;
 
 class AlreadyExistsException extends \Exception {
-    function __construct() {
-    }
 }

app/classes/Framadate/Exception/ConcurrentEditionException.php

@@ -2,6 +2,4 @@
 namespace Framadate\Exception;
 
 class ConcurrentEditionException extends \Exception {
-    function __construct() {
-    }
 }

app/classes/Framadate/Exception/ConcurrentVoteException.php

@@ -7,6 +7,4 @@ namespace Framadate\Exception;
  * Thrown when a poll has a maximum votes constraint for options, and a vote happened since the poll was rendered
  */
 class ConcurrentVoteException extends \Exception {
-    function __construct() {
-    }
 }

app/classes/Framadate/Exception/MomentAlreadyExistsException.php

@@ -2,6 +2,4 @@
 namespace Framadate\Exception;
 
 class MomentAlreadyExistsException extends \Exception {
-    function __construct() {
-    }
 }

app/classes/Framadate/Exception/PollNotFoundException.php

@@ -0,0 +1,10 @@
+<?php
+namespace Framadate\Exception;
+
+/**
+ * Class PollNotFoundException
+ *
+ * Thrown when a poll isn't found in a critical process
+ */
+class PollNotFoundException extends \Exception {
+}

app/classes/Framadate/Form.php

@@ -32,7 +32,7 @@ class Form
 
     /**
      * Tells if users can modify their choices.
-     * @var \Framadate\Editable
+     * @var int
      */
     public $editable;
 
@@ -92,11 +92,12 @@ class Form
         $this->clearChoices();
     }
 
-    public function clearChoices() {
+    public function clearChoices(): void
+    {
         $this->choices = [];
     }
 
-    public function addChoice(Choice $choice)
+    public function addChoice(Choice $choice): void
     {
         $this->choices[] = $choice;
     }
@@ -106,8 +107,8 @@ class Form
         return $this->choices;
     }
 
-    public function sortChoices()
+    public function sortChoices(): void
     {
-        usort($this->choices, ['Framadate\Choice', 'compare']);
+        usort($this->choices, [Choice::class, 'compare']);
     }
 }

app/classes/Framadate/FramaDB.php

@@ -23,19 +23,21 @@ use PDO;
 class FramaDB {
     /**
      * PDO Object, connection to database.
+     * @var PDO
      */
-    private $pdo = null;
+    private $pdo;
 
-    function __construct($connection_string, $user, $password) {
-        $this->pdo = new \PDO($connection_string, $user, $password);
-        $this->pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_OBJ);
-        $this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+    public function __construct(string $connection_string, string $user, string $password) {
+        $this->pdo = new PDO($connection_string, $user, $password);
+        $this->pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
+        $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     }
 
     /**
-     * @return \PDO Connection to database
+     * @return PDO Connection to database
      */
-    function getPDO() {
+    public function getPDO(): PDO
+    {
         return $this->pdo;
     }
 
@@ -44,42 +46,50 @@ class FramaDB {
      *
      * @return array The array of table names
      */
-    function allTables() {
-        $result = $this->pdo->query('SHOW TABLES');
-        $schemas = $result->fetchAll(\PDO::FETCH_COLUMN);
-
-        return $schemas;
+    public function allTables(): array
+    {
+        return $this->pdo->query('SHOW TABLES')->fetchAll(PDO::FETCH_COLUMN);
     }
 
-    function prepare($sql) {
+    /**
+     * @return \PDOStatement|false
+     */
+    public function prepare(string $sql) {
         return $this->pdo->prepare($sql);
     }
 
-    function beginTransaction() {
+    public function beginTransaction(): void
+    {
         $this->pdo->beginTransaction();
     }
 
-    function commit() {
+    public function commit(): void
+    {
         $this->pdo->commit();
     }
 
-    function rollback() {
+    public function rollback(): void
+    {
         $this->pdo->rollback();
     }
 
-    function errorCode() {
+    public function errorCode(): ?string {
         return $this->pdo->errorCode();
     }
 
-    function errorInfo() {
+    public function errorInfo(): array
+    {
         return $this->pdo->errorInfo();
     }
 
-    function query($sql) {
+    /**
+     * @return \PDOStatement|false
+     */
+    public function query($sql) {
         return $this->pdo->query($sql);
     }
 
-    public function lastInsertId() {
+    public function lastInsertId(): string {
         return $this->pdo->lastInsertId();
     }
 }

app/classes/Framadate/Message.php

@@ -1,38 +1,37 @@
-<?php
-/**
- * This software is governed by the CeCILL-B license. If a copy of this license
- * is not distributed with this file, you can obtain one at
- * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
- *
- * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
- * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft)
- *
- * =============================
- *
- * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
- * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
- * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
- *
- * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
- * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
- */
-namespace Framadate;
-
+<?php
+/**
+ * This software is governed by the CeCILL-B license. If a copy of this license
+ * is not distributed with this file, you can obtain one at
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
+ *
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft)
+ *
+ * =============================
+ *
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
+ *
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
+ */
+namespace Framadate;
+
 class Message {
-    var $type;
-    var $message;
-    var $link;
-    var $linkTitle;
-    var $linkIcon;
-    var $includeTemplate;
-
-    function __construct($type, $message, $link=null, $linkTitle=null, $linkIcon=null, $includeTemplate=null) {
-        $this->type = $type;
-        $this->message = $message;
-        $this->link = $link;
-        $this->linkTitle = $linkTitle;
-        $this->linkIcon = $linkIcon;
+    var $type;
+    var $message;
+    var $link;
+    var $linkTitle;
+    var $linkIcon;
+    var $includeTemplate;
+
+    public function __construct($type, $message, $link=null, $linkTitle=null, $linkIcon=null, $includeTemplate=null) {
+        $this->type = $type;
+        $this->message = $message;
+        $this->link = $link;
+        $this->linkTitle = $linkTitle;
+        $this->linkIcon = $linkIcon;
         $this->includeTemplate = $includeTemplate;
     }
-}
- 
+}

app/classes/Framadate/Migration/AddColumn_ValueMax_In_poll_For_1_1.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration adds the field Value_Max on the poll table.
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 0.9
  */
 class AddColumn_ValueMax_In_poll_For_1_1 implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,7 @@ class AddColumn_ValueMax_In_poll_For_1_1 implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description():string {
         return 'Add column "ValueMax" in table "vote" for version 0.9';
     }
 
@@ -43,26 +44,27 @@ class AddColumn_ValueMax_In_poll_For_1_1 implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         return true;
     }
 
     /**
      * This method is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $this->alterPollTable($pdo);
 
         return true;
     }
 
-    private function alterPollTable(\PDO $pdo) {
+    private function alterPollTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('poll') . '`
         ADD `ValueMax` TINYINT NULL;');

app/classes/Framadate/Migration/AddColumn_hidden_In_poll_For_0_9.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration adds the field hidden on the poll table.
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 0.9
  */
 class AddColumn_hidden_In_poll_For_0_9 implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,8 @@ class AddColumn_hidden_In_poll_For_0_9 implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description(): string
+    {
         return 'Add column "hidden" in table "vote" for version 0.9';
     }
 
@@ -43,12 +45,13 @@ class AddColumn_hidden_In_poll_For_0_9 implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool
+    {
         $stmt = $pdo->query('SHOW TABLES');
-        $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        $tables = $stmt->fetchAll(PDO::FETCH_COLUMN);
 
         // Check if tables of v0.9 are presents
         $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
@@ -58,16 +61,18 @@ class AddColumn_hidden_In_poll_For_0_9 implements Migration {
     /**
      * This method is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool
+    {
         $this->alterPollTable($pdo);
 
         return true;
     }
 
-    private function alterPollTable(\PDO $pdo) {
+    private function alterPollTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('poll') . '`
         ADD `hidden` TINYINT( 1 ) NOT NULL DEFAULT "0"');

app/classes/Framadate/Migration/AddColumn_receiveNewComments_For_0_9.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration adds the field receiveNewComments on the poll table.
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 0.9
  */
 class AddColumn_receiveNewComments_For_0_9 implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,8 @@ class AddColumn_receiveNewComments_For_0_9 implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description(): string
+    {
         return 'Add column "receiveNewComments" for version 0.9';
     }
 
@@ -43,12 +45,13 @@ class AddColumn_receiveNewComments_For_0_9 implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool
+    {
         $stmt = $pdo->query('SHOW TABLES');
-        $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        $tables = $stmt->fetchAll(PDO::FETCH_COLUMN);
 
         // Check if tables of v0.9 are presents
         $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
@@ -58,16 +61,18 @@ class AddColumn_receiveNewComments_For_0_9 implements Migration {
     /**
      * This method is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool
+    {
         $this->alterPollTable($pdo);
 
         return true;
     }
 
-    private function alterPollTable(\PDO $pdo) {
+    private function alterPollTable(PDO $pdo): void
+    {
         $pdo->exec('
 ALTER TABLE `' . Utils::table('poll') . '`
         ADD `receiveNewComments` TINYINT(1) DEFAULT \'0\'

app/classes/Framadate/Migration/AddColumn_uniqId_In_vote_For_0_9.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration adds the field uniqId on the vote table.
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 0.9
  */
 class AddColumn_uniqId_In_vote_For_0_9 implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,7 @@ class AddColumn_uniqId_In_vote_For_0_9 implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description(): string {
         return 'Add column "uniqId" in table "vote" for version 0.9';
     }
 
@@ -43,12 +44,12 @@ class AddColumn_uniqId_In_vote_For_0_9 implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         $stmt = $pdo->query('SHOW TABLES');
-        $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        $tables = $stmt->fetchAll(PDO::FETCH_COLUMN);
 
         // Check if tables of v0.9 are presents
         $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
@@ -58,16 +59,17 @@ class AddColumn_uniqId_In_vote_For_0_9 implements Migration {
     /**
      * This method is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $this->alterPollTable($pdo);
 
         return true;
     }
 
-    private function alterPollTable(\PDO $pdo) {
+    private function alterPollTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('vote') . '`
         ADD `uniqId` CHAR(16) NOT NULL

app/classes/Framadate/Migration/AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration adds the fields password_hash and results_publicly_visible on the poll table.
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 0.9
  */
 class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,7 @@ class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 impl
      *
      * @return string The description of the migration class
      */
-    function description() {
+    function description(): string {
         return 'Add columns "password_hash" and "results_publicly_visible" in table "vote" for version 0.9';
     }
 
@@ -43,12 +44,12 @@ class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 impl
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         $stmt = $pdo->query('SHOW TABLES');
-        $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        $tables = $stmt->fetchAll(PDO::FETCH_COLUMN);
 
         // Check if tables of v0.9 are presents
         $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
@@ -58,16 +59,17 @@ class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 impl
     /**
      * This method is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $this->alterPollTable($pdo);
 
         return true;
     }
 
-    private function alterPollTable(\PDO $pdo) {
+    private function alterPollTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('poll') . '`
         ADD `password_hash` VARCHAR(255) NULL DEFAULT NULL ,

app/classes/Framadate/Migration/Alter_Comment_table_adding_date.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration alter the comment table to add a date column.
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 1.0
  */
 class Alter_Comment_table_adding_date implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,7 @@ class Alter_Comment_table_adding_date implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description():string {
         return 'Alter the comment table to add a date column.';
     }
 
@@ -43,26 +44,27 @@ class Alter_Comment_table_adding_date implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         return true;
     }
 
     /**
      * This methode is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $this->alterCommentTable($pdo);
 
         return true;
     }
 
-    private function alterCommentTable(\PDO $pdo) {
+    private function alterCommentTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('comment') . '`
         ADD `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ;');

app/classes/Framadate/Migration/Alter_Comment_table_for_name_length.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration alter the comment table to set a length to the name column.
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 1.0
  */
 class Alter_Comment_table_for_name_length implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,7 @@ class Alter_Comment_table_for_name_length implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description(): string {
         return 'Alter the comment table to set a length to the name column.';
     }
 
@@ -43,26 +44,27 @@ class Alter_Comment_table_for_name_length implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         return true;
     }
 
     /**
      * This methode is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $this->alterCommentTable($pdo);
 
         return true;
     }
 
-    private function alterCommentTable(\PDO $pdo) {
+    private function alterCommentTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('comment') . '`
         CHANGE `name` `name` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ;');

app/classes/Framadate/Migration/Fix_MySQL_No_Zero_Date.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration sets Poll.end_date to NULL by default
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 1.1
  */
 class Fix_MySQL_No_Zero_Date implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,7 @@ class Fix_MySQL_No_Zero_Date implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description(): string {
         return 'Sets Poll end_date to NULL by default (work around MySQL NO_ZERO_DATE)';
     }
 
@@ -43,17 +44,17 @@ class Fix_MySQL_No_Zero_Date implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true if the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         $stmt = $pdo->prepare("SELECT Column_Default from Information_Schema.Columns where Table_Name = ? AND Column_Name = ?;");
         $stmt->bindValue(1, Utils::table('poll'));
         $stmt->bindValue(2, 'end_date');
         $stmt->execute();
-        $default = $stmt->fetch(\PDO::FETCH_COLUMN);
+        $default = $stmt->fetch(PDO::FETCH_COLUMN);
 
-        $driver_name = $pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
+        $driver_name = $pdo->getAttribute(PDO::ATTR_DRIVER_NAME);
 
         return $default !== null && $driver_name === 'mysql';
     }
@@ -61,10 +62,11 @@ class Fix_MySQL_No_Zero_Date implements Migration {
     /**
      * This method is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
-     * @return bool|void if the execution succeeded
+     * @param PDO $pdo The connection to database
+     * @return bool if the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $pdo->exec('ALTER TABLE ' . Utils::table('poll') . ' MODIFY end_date TIMESTAMP NULL DEFAULT NULL;');
+        return true;
     }
 }

app/classes/Framadate/Migration/From_0_0_to_0_8_Migration.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * Class From_0_0_to_0_8_Migration
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 0.8
  */
 class From_0_0_to_0_8_Migration implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,7 @@ class From_0_0_to_0_8_Migration implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description(): string {
         return 'First installation of the Framadate application (v0.8)';
     }
 
@@ -43,12 +44,12 @@ class From_0_0_to_0_8_Migration implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         $stmt = $pdo->query('SHOW TABLES like \'' . TABLENAME_PREFIX . '%\'');  //issue187 : pouvoir installer framadate dans une base contenant d'autres tables.
-        $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        $tables = $stmt->fetchAll(PDO::FETCH_COLUMN);
 
         // Check if there is no tables but the MIGRATION_TABLE one
         $diff = array_diff($tables, [Utils::table(MIGRATION_TABLE)]);
@@ -58,10 +59,10 @@ class From_0_0_to_0_8_Migration implements Migration {
     /**
      * This method is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $pdo->exec('
 CREATE TABLE IF NOT EXISTS `sondage` (
   `id_sondage` char(16) NOT NULL,
@@ -104,5 +105,6 @@ CREATE TABLE IF NOT EXISTS `user_studs` (
   PRIMARY KEY (`id_users`),
   KEY `id_sondage` (`id_sondage`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ;');
+        return true;
     }
 }

app/classes/Framadate/Migration/From_0_8_to_0_9_Migration.php

@@ -19,6 +19,7 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 /**
  * This class executes the aciton in database to migrate data from version 0.8 to 0.9.
@@ -27,7 +28,7 @@ use Framadate\Utils;
  * @version 0.9
  */
 class From_0_8_to_0_9_Migration implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -35,7 +36,7 @@ class From_0_8_to_0_9_Migration implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description(): string {
         return 'From 0.8 to 0.9';
     }
 
@@ -43,12 +44,12 @@ class From_0_8_to_0_9_Migration implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the Migration should be executed.
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         $stmt = $pdo->query('SHOW TABLES');
-        $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        $tables = $stmt->fetchAll(PDO::FETCH_COLUMN);
 
         // Check if tables of v0.8 are presents
         $diff = array_diff(['sondage', 'sujet_studs', 'comments', 'user_studs'], $tables);
@@ -58,10 +59,10 @@ class From_0_8_to_0_9_Migration implements Migration {
     /**
      * This method is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $this->createPollTable($pdo);
         $this->createCommentTable($pdo);
         $this->createSlotTable($pdo);
@@ -79,7 +80,8 @@ class From_0_8_to_0_9_Migration implements Migration {
         return true;
     }
 
-    private function createPollTable(\PDO $pdo) {
+    private function createPollTable(PDO $pdo): void
+    {
         $pdo->exec('
 CREATE TABLE IF NOT EXISTS `' . Utils::table('poll') . '` (
   `id`              CHAR(16)  NOT NULL,
@@ -100,7 +102,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('poll') . '` (
   DEFAULT CHARSET = utf8');
     }
 
-    private function migrateFromSondageToPoll(\PDO $pdo) {
+    private function migrateFromSondageToPoll(PDO $pdo): void
+    {
         $select = $pdo->query('
 SELECT
     `id_sondage`,
@@ -126,7 +129,7 @@ INSERT INTO `' . Utils::table('poll') . '`
 (`id`, `admin_id`, `title`, `description`, `admin_name`, `admin_mail`, `creation_date`, `end_date`, `format`, `editable`, `receiveNewVotes`, `active`)
 VALUE (?,?,?,?,?,?,?,?,?,?,?,?)');
 
-        while ($row = $select->fetch(\PDO::FETCH_OBJ)) {
+        while ($row = $select->fetch(PDO::FETCH_OBJ)) {
             $insert->execute([
                 $row->id_sondage,
                 $row->id_sondage_admin,
@@ -144,7 +147,8 @@ VALUE (?,?,?,?,?,?,?,?,?,?,?,?)');
         }
     }
 
-    private function createSlotTable(\PDO $pdo) {
+    private function createSlotTable(PDO $pdo): void
+    {
         $pdo->exec('
 CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` (
   `id`      INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -158,7 +162,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` (
   DEFAULT CHARSET = utf8');
     }
 
-    private function migrateFromSujetStudsToSlot(\PDO $pdo) {
+    private function migrateFromSujetStudsToSlot(PDO $pdo): void
+    {
         $stmt = $pdo->query('SELECT * FROM sujet_studs');
         $sujets = $stmt->fetchAll();
         $slots = [];
@@ -180,7 +185,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` (
         }
     }
 
-    private function createCommentTable(\PDO $pdo) {
+    private function createCommentTable(PDO $pdo): void
+    {
         $pdo->exec('
 CREATE TABLE IF NOT EXISTS `' . Utils::table('comment') . '` (
   `id`      INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -194,7 +200,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('comment') . '` (
   DEFAULT CHARSET = utf8');
     }
 
-    private function migrateFromCommentsToComment(\PDO $pdo) {
+    private function migrateFromCommentsToComment(PDO $pdo): void
+    {
         $select = $pdo->query('
 SELECT
     `id_sondage`,
@@ -206,7 +213,7 @@ SELECT
 INSERT INTO `' . Utils::table('comment') . '` (`poll_id`, `name`, `comment`)
 VALUE (?,?,?)');
 
-        while ($row = $select->fetch(\PDO::FETCH_OBJ)) {
+        while ($row = $select->fetch(PDO::FETCH_OBJ)) {
             $insert->execute([
                 $row->id_sondage,
                 $this->unescape($row->usercomment),
@@ -215,7 +222,8 @@ VALUE (?,?,?)');
         }
     }
 
-    private function createVoteTable(\PDO $pdo) {
+    private function createVoteTable(PDO $pdo): void
+    {
         $pdo->exec('
 CREATE TABLE IF NOT EXISTS `' . Utils::table('vote') . '` (
   `id`      INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -229,7 +237,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('vote') . '` (
   DEFAULT CHARSET = utf8');
     }
 
-    private function migrateFromUserStudsToVote(\PDO $pdo) {
+    private function migrateFromUserStudsToVote(PDO $pdo): void
+    {
         $select = $pdo->query('
 SELECT
     `id_sondage`,
@@ -241,7 +250,7 @@ SELECT
 INSERT INTO `' . Utils::table('vote') . '` (`poll_id`, `name`, `choices`)
 VALUE (?,?,?)');
 
-        while ($row = $select->fetch(\PDO::FETCH_OBJ)) {
+        while ($row = $select->fetch(PDO::FETCH_OBJ)) {
             $insert->execute([
                                  $row->id_sondage,
                                  $this->unescape($row->nom),
@@ -250,7 +259,8 @@ VALUE (?,?,?)');
         }
     }
 
-    private function transformSujetToSlot($sujet) {
+    private function transformSujetToSlot($sujet): array
+    {
         $slots = [];
         $ex = explode(',', $sujet->sujet);
         $isDatePoll = strpos($sujet->sujet, '@');
@@ -279,14 +289,16 @@ VALUE (?,?,?)');
         return $slots;
     }
 
-    private function dropOldTables(\PDO $pdo) {
+    private function dropOldTables(PDO $pdo): void
+    {
         $pdo->exec('DROP TABLE `comments`');
         $pdo->exec('DROP TABLE `sujet_studs`');
         $pdo->exec('DROP TABLE `user_studs`');
         $pdo->exec('DROP TABLE `sondage`');
     }
 
-    private function unescape($value) {
+    private function unescape(string $value): string
+    {
         return stripslashes(html_entity_decode($value, ENT_QUOTES));
     }
 }

app/classes/Framadate/Migration/Generate_uniqId_for_old_votes.php

@@ -20,6 +20,7 @@ namespace Framadate\Migration;
 
 use Framadate\Security\Token;
 use Framadate\Utils;
+use PDO;
 
 /**
  * This migration generate uniqId for all legacy votes.
@@ -28,16 +29,16 @@ use Framadate\Utils;
  * @version 0.9
  */
 class Generate_uniqId_for_old_votes implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
-    function description() {
+    public function description(): string {
         return 'Generate "uniqId" in "vote" table for all legacy votes';
     }
 
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         $stmt = $pdo->query('SHOW TABLES');
-        $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+        $tables = $stmt->fetchAll(PDO::FETCH_COLUMN);
 
         // Check if tables of v0.9 are presents
         $diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
@@ -47,10 +48,10 @@ class Generate_uniqId_for_old_votes implements Migration {
     /**
      * This methode is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true is the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $pdo->beginTransaction();
         $this->generateUniqIdsForEmptyOnes($pdo);
         $pdo->commit();
@@ -58,7 +59,8 @@ class Generate_uniqId_for_old_votes implements Migration {
         return true;
     }
 
-    private function generateUniqIdsForEmptyOnes($pdo) {
+    private function generateUniqIdsForEmptyOnes(PDO $pdo): void
+    {
         $select = $pdo->query('
 SELECT `id`
   FROM `' . Utils::table('vote') . '`
@@ -69,7 +71,7 @@ UPDATE `' . Utils::table('vote') . '`
    SET `uniqid` = :uniqid
  WHERE `id` = :id');
 
-        while ($row = $select->fetch(\PDO::FETCH_OBJ)) {
+        while ($row = $select->fetch(PDO::FETCH_OBJ)) {
             $token = Token::getToken(16);
             $update->execute([
                 'uniqid' => $token,

app/classes/Framadate/Migration/Increase_pollId_size.php

@@ -2,9 +2,10 @@
 namespace Framadate\Migration;
 
 use Framadate\Utils;
+use PDO;
 
 class Increase_pollId_size implements Migration {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -12,7 +13,7 @@ class Increase_pollId_size implements Migration {
      *
      * @return string The description of the migration class
      */
-    function description() {
+    public function description(): string {
         return 'Increase the size of id column in poll table';
     }
 
@@ -20,45 +21,50 @@ class Increase_pollId_size implements Migration {
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true if the Migration should be executed
      */
-    function preCondition(\PDO $pdo) {
+    public function preCondition(PDO $pdo): bool {
         return true;
     }
 
     /**
      * This methode is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true if the execution succeeded
      */
-    function execute(\PDO $pdo) {
+    public function execute(PDO $pdo): bool {
         $this->alterCommentTable($pdo);
         $this->alterPollTable($pdo);
         $this->alterSlotTable($pdo);
         $this->alterVoteTable($pdo);
+        return true;
     }
 
-    private function alterCommentTable(\PDO $pdo) {
+    private function alterCommentTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('comment') . '`
         CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
     }
 
-    private function alterPollTable(\PDO $pdo) {
+    private function alterPollTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('poll') . '`
         CHANGE `id` `id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
     }
 
-    private function alterSlotTable(\PDO $pdo) {
+    private function alterSlotTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('slot') . '`
         CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
     }
 
-    private function alterVoteTable(\PDO $pdo) {
+    private function alterVoteTable(PDO $pdo): void
+    {
         $pdo->exec('
         ALTER TABLE `' . Utils::table('vote') . '`
         CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');

app/classes/Framadate/Migration/Migration.php

@@ -18,29 +18,30 @@
  */
 namespace Framadate\Migration;
 
+use PDO;
+
 interface Migration {
     /**
      * This method should describe in english what is the purpose of the migration class.
      *
      * @return string The description of the migration class
      */
-    function description();
+    public function description(): string;
 
     /**
      * This method could check if the execute method should be called.
      * It is called before the execute method.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true if the Migration should be executed
      */
-    function preCondition(\PDO $pdo);
+    public function preCondition(PDO $pdo): bool;
 
     /**
      * This methode is called only one time in the migration page.
      *
-     * @param \PDO $pdo The connection to database
+     * @param PDO $pdo The connection to database
      * @return bool true if the execution succeeded
      */
-    function execute(\PDO $pdo);
+    public function execute(PDO $pdo): bool;
 }
- 

app/classes/Framadate/Migration/RPadVotes_from_0_8.php

@@ -4,16 +4,16 @@
  * is not distributed with this file, you can obtain one at
  * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
  *
- * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphael DROZ
  * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft)
  *
  * =============================
  *
- * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
  * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
  * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
  *
- * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphael DROZ
  * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
  */
 namespace Framadate\Migration;
@@ -28,11 +28,11 @@ use Framadate\Utils;
  * @version 0.9
  */
 class RPadVotes_from_0_8 implements Migration {
-    function description() {
+    public function description(): string {
         return 'RPad votes from version 0.8.';
     }
 
-    function preCondition(\PDO $pdo) {
+    public function preCondition(\PDO $pdo): bool {
         $stmt = $pdo->query('SHOW TABLES');
         $tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
 
@@ -41,7 +41,7 @@ class RPadVotes_from_0_8 implements Migration {
         return count($diff) === 0;
     }
 
-    function execute(\PDO $pdo) {
+    public function execute(\PDO $pdo): bool {
         $pdo->beginTransaction();
         $this->rpadVotes($pdo);
         $pdo->commit();
@@ -49,7 +49,8 @@ class RPadVotes_from_0_8 implements Migration {
         return true;
     }
 
-    private function rpadVotes($pdo) {
+    private function rpadVotes(\PDO $pdo): void
+    {
         $pdo->exec('UPDATE ' . Utils::table('vote') . ' fv
 INNER JOIN (
 	SELECT v.id, RPAD(v.choices, inn.slots_count, \'0\') new_choices
@@ -63,4 +64,4 @@ INNER JOIN (
 ) computed ON fv.id = computed.id
 SET fv.choices = computed.new_choices');
     }
-}
+}

app/classes/Framadate/Repositories/AbstractRepository.php

@@ -13,31 +13,40 @@ abstract class AbstractRepository {
      * PollRepository constructor.
      * @param FramaDB $connect
      */
-    function __construct(FramaDB $connect) {
+    public function __construct(FramaDB $connect) {
         $this->connect = $connect;
     }
 
-    public function beginTransaction() {
+    public function beginTransaction(): void
+    {
         $this->connect->beginTransaction();
     }
 
-    public function commit() {
+    public function commit(): void
+    {
         $this->connect->commit();
     }
 
-    function rollback() {
+    public function rollback(): void
+    {
         $this->connect->rollback();
     }
 
-    public function prepare($sql) {
+    /**
+     * @return \PDOStatement|false
+     */
+    public function prepare(string $sql) {
         return $this->connect->prepare($sql);
     }
 
-    function query($sql) {
+    /**
+     * @return \PDOStatement|false
+     */
+    public function query($sql) {
         return $this->connect->query($sql);
     }
 
-    function lastInsertId() {
+    public function lastInsertId(): string {
         return $this->connect->lastInsertId();
     }
 }

app/classes/Framadate/Repositories/CommentRepository.php

@@ -1,15 +1,13 @@
 <?php
 namespace Framadate\Repositories;
 
-use Framadate\FramaDB;
 use Framadate\Utils;
 
 class CommentRepository extends AbstractRepository {
-    function __construct(FramaDB $connect) {
-        parent::__construct($connect);
-    }
-
-    function findAllByPollId($poll_id) {
+    /**
+     * @return array|false
+     */
+    public function findAllByPollId(string $poll_id) {
         $prepared = $this->prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id');
         $prepared->execute([$poll_id]);
 
@@ -19,18 +17,20 @@ class CommentRepository extends AbstractRepository {
     /**
      * Insert a new comment.
      *
-     * @param $poll_id
-     * @param $name
-     * @param $comment
+     * @param string $poll_id
+     * @param string $name
+     * @param string $comment
      * @return bool
      */
-    function insert($poll_id, $name, $comment) {
+    public function insert(string $poll_id, string $name, string $comment): bool
+    {
         $prepared = $this->prepare('INSERT INTO `' . Utils::table('comment') . '` (poll_id, name, comment) VALUES (?,?,?)');
 
         return $prepared->execute([$poll_id, $name, $comment]);
     }
 
-    function deleteById($poll_id, $comment_id) {
+    public function deleteById(string $poll_id, int $comment_id): bool
+    {
         $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND id = ?');
 
         return $prepared->execute([$poll_id, $comment_id]);
@@ -39,16 +39,18 @@ class CommentRepository extends AbstractRepository {
     /**
      * Delete all comments of a given poll.
      *
-     * @param $poll_id int The ID of the given poll.
+     * @param string $poll_id The ID of the given poll.
      * @return bool|null true if action succeeded.
      */
-    function deleteByPollId($poll_id) {
+    public function deleteByPollId(string $poll_id): ?bool
+    {
         $prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ?');
 
         return $prepared->execute([$poll_id]);
     }
 
-    public function exists($poll_id, $name, $comment) {
+    public function exists(string $poll_id, string $name, string $comment): bool
+    {
         $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND name = ? AND comment = ?');
         $prepared->execute([$poll_id, $name, $comment]);
 

app/classes/Framadate/Repositories/PollRepository.php

@@ -6,11 +6,8 @@ use Framadate\Utils;
 use PDO;
 
 class PollRepository extends AbstractRepository {
-    function __construct(FramaDB $connect) {
-        parent::__construct($connect);
-    }
-
-    public function insertPoll($poll_id, $admin_poll_id, $form) {
+    public function insertPoll(string $poll_id, string $admin_poll_id, $form): void
+    {
         $sql = 'INSERT INTO `' . Utils::table('poll') . '`
           (id, admin_id, title, description, admin_name, admin_mail, end_date, format, editable, receiveNewVotes, receiveNewComments, hidden, password_hash, results_publicly_visible,ValueMax)
           VALUES (?,?,?,?,?,?,FROM_UNIXTIME(?),?,?,?,?,?,?,?,?)';
@@ -18,7 +15,7 @@ class PollRepository extends AbstractRepository {
         $prepared->execute([$poll_id, $admin_poll_id, $form->title, $form->description, $form->admin_name, $form->admin_mail, $form->end_date, $form->format, ($form->editable>=0 && $form->editable<=2) ? $form->editable : 0, $form->receiveNewVotes ? 1 : 0, $form->receiveNewComments ? 1 : 0, $form->hidden ? 1 : 0, $form->password_hash, $form->results_publicly_visible ? 1 : 0,$form->ValueMax]);
     }
 
-    function findById($poll_id) {
+    public function findById(string $poll_id) {
         $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE id = ?');
 
         $prepared->execute([$poll_id]);
@@ -28,7 +25,7 @@ class PollRepository extends AbstractRepository {
         return $poll;
     }
 
-    public function findByAdminId($admin_poll_id) {
+    public function findByAdminId(string $admin_poll_id) {
         $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE admin_id = ?');
 
         $prepared->execute([$admin_poll_id]);
@@ -38,7 +35,8 @@ class PollRepository extends AbstractRepository {
         return $poll;
     }
 
-    public function existsById($poll_id) {
+    public function existsById(string $poll_id): bool
+    {
         $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE id = ?');
 
         $prepared->execute([$poll_id]);
@@ -46,7 +44,8 @@ class PollRepository extends AbstractRepository {
         return $prepared->rowCount() > 0;
     }
 
-    public function existsByAdminId($admin_poll_id) {
+    public function existsByAdminId(string $admin_poll_id): bool
+    {
         $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE admin_id = ?');
 
         $prepared->execute([$admin_poll_id]);
@@ -54,13 +53,15 @@ class PollRepository extends AbstractRepository {
         return $prepared->rowCount() > 0;
     }
 
-    function update($poll) {
+    public function update($poll): bool
+    {
         $prepared = $this->prepare('UPDATE `' . Utils::table('poll') . '` SET title=?, admin_name=?, admin_mail=?, description=?, end_date=?, active=?, editable=?, hidden=?, password_hash=?, results_publicly_visible=? WHERE id = ?');
 
-        return $prepared->execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active, ($poll->editable>=0 && $poll->editable<=2) ? $poll->editable  : 0, $poll->hidden ? 1 : 0, $poll->password_hash, $poll->results_publicly_visible ? 1 : 0, $poll->id]);
+        return $prepared->execute([$poll->title, $poll->admin_name, $poll->admin_mail, $poll->description, $poll->end_date, $poll->active ? 1 : 0, ($poll->editable>=0 && $poll->editable<=2) ? $poll->editable  : 0, $poll->hidden ? 1 : 0, $poll->password_hash, $poll->results_publicly_visible ? 1 : 0, $poll->id]);
     }
 
-    function deleteById($poll_id) {
+    public function deleteById($poll_id): bool
+    {
         $prepared = $this->prepare('DELETE FROM `' . Utils::table('poll') . '` WHERE id = ?');
 
         return $prepared->execute([$poll_id]);
@@ -71,7 +72,8 @@ class PollRepository extends AbstractRepository {
      *
      * @return array Array of old polls
      */
-    public function findOldPolls() {
+    public function findOldPolls(): array
+    {
         $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE DATE_ADD(`end_date`, INTERVAL ' . PURGE_DELAY . ' DAY) < NOW() AND `end_date` != 0 LIMIT 20');
         $prepared->execute([]);
 
@@ -86,50 +88,50 @@ class PollRepository extends AbstractRepository {
      * @param int $limit The number of entries to find
      * @return array The found polls
      */
-    public function findAll($search, $start, $limit) {
+    public function findAll(array $search, int $start, int $limit): array
+    {
         // Polls
-        
-        $request  = "";
-        $request .= "SELECT p.*,";
+
+        $request = "SELECT p.*,";
         $request .= "    (SELECT count(1) FROM `" . Utils::table('vote') . "` v WHERE p.id=v.poll_id) votes";
         $request .= " FROM `" . Utils::table('poll') . "` p";
         $request .= " WHERE 1";
-        
+
         $values = [];
-        
+
         if (!empty($search["poll"])) {
             $request .= " AND p.id LIKE :poll";
             $values["poll"] = "{$search["poll"]}%";
         }
-        
+
         $fields = [
             // key of $search => column name
             "title" => "title",
             "name" => "admin_name",
             "mail" => "admin_mail",
         ];
-        
+
         foreach ($fields as $searchKey => $columnName) {
             if (empty($search[$searchKey])) {
                 continue;
             }
-            
+
             $request .= " AND p.$columnName LIKE :$searchKey";
-            $values[$searchKey] = "%{$search[$searchKey]}%";
+            $values[$searchKey] = "%$search[$searchKey]%";
         }
-        
+
         $request .= "  ORDER BY p.title ASC";
         $request .= "  LIMIT :start, :limit";
-        
+
         $prepared = $this->prepare($request);
-        
+
         foreach ($values as $searchKey => $value) {
             $prepared->bindParam(":$searchKey", $value, PDO::PARAM_STR);
         }
-        
+
         $prepared->bindParam(':start', $start, PDO::PARAM_INT);
         $prepared->bindParam(':limit', $limit, PDO::PARAM_INT);
-        
+
         $prepared->execute();
 
         return $prepared->fetchAll();
@@ -141,7 +143,8 @@ class PollRepository extends AbstractRepository {
      * @param string $mail Email address of the poll admin
      * @return array The list of matching polls
      */
-    public function findAllByAdminMail($mail) {
+    public function findAllByAdminMail(string $mail): array
+    {
         $prepared = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE admin_mail = :admin_mail');
         $prepared->execute(['admin_mail' => $mail]);
 
@@ -149,12 +152,13 @@ class PollRepository extends AbstractRepository {
     }
 
     /**
-     * Get the total number of polls in databse.
+     * Get the total number of polls in database.
      *
-     * @param array $search Array of search : ['id'=>..., 'title'=>..., 'name'=>...]
+     * @param array|null $search Array of search : ['id'=>..., 'title'=>..., 'name'=>...]
      * @return int The number of polls
      */
-    public function count($search = null) {
+    public function count(array $search = null): int
+    {
         // Total count
         $prepared = $this->prepare('
 SELECT count(1) nb
@@ -172,13 +176,7 @@ SELECT count(1) nb
         $prepared->bindParam(':name', $name, PDO::PARAM_STR);
 
         $prepared->execute();
-        $count = $prepared->fetch();
 
-        /*echo '---';
-        print_r($count);
-        echo '---';
-        exit;*/
-
-        return $count->nb;
+        return $prepared->fetch()->nb;
     }
 }

app/classes/Framadate/Repositories/RepositoryFactory.php

@@ -31,14 +31,15 @@ class RepositoryFactory {
     /**
      * @param FramaDB $connect
      */
-    static function init(FramaDB $connect) {
+    public static function init(FramaDB $connect): void {
         self::$connect = $connect;
     }
 
     /**
      * @return PollRepository The singleton of PollRepository
      */
-    static function pollRepository() {
+    public static function pollRepository(): PollRepository
+    {
         if (self::$pollRepository === null) {
             self::$pollRepository = new PollRepository(self::$connect);
         }
@@ -49,7 +50,8 @@ class RepositoryFactory {
     /**
      * @return SlotRepository The singleton of SlotRepository
      */
-    static function slotRepository() {
+    public static function slotRepository(): SlotRepository
+    {
         if (self::$slotRepository === null) {
             self::$slotRepository = new SlotRepository(self::$connect);
         }
@@ -60,7 +62,8 @@ class RepositoryFactory {
     /**
      * @return VoteRepository The singleton of VoteRepository
      */
-    static function voteRepository() {
+    public static function voteRepository(): VoteRepository
+    {
         if (self::$voteRepository === null) {
             self::$voteRepository = new VoteRepository(self::$connect);
         }
@@ -71,7 +74,8 @@ class RepositoryFactory {
     /**
      * @return CommentRepository The singleton of CommentRepository
      */
-    static function commentRepository() {
+    public static function commentRepository(): CommentRepository
+    {
         if (self::$commentRepository === null) {
             self::$commentRepository = new CommentRepository(self::$connect);
         }

app/classes/Framadate/Repositories/SlotRepository.php

@@ -4,16 +4,16 @@
  * is not distributed with this file, you can obtain one at
  * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
  *
- * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphael DROZ
  * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft)
  *
  * =============================
  *
- * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
  * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
  * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
  *
- * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphael DROZ
  * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
  */
 namespace Framadate\Repositories;
@@ -22,17 +22,14 @@ use Framadate\FramaDB;
 use Framadate\Utils;
 
 class SlotRepository extends AbstractRepository {
-    function __construct(FramaDB $connect) {
-        parent::__construct($connect);
-    }
-
     /**
      * Insert a bulk of slots.
      *
-     * @param int $poll_id
+     * @param string $poll_id
      * @param array $choices
      */
-    public function insertSlots($poll_id, $choices) {
+    public function insertSlots(string $poll_id, array $choices): void
+    {
         $prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?, ?, ?)');
 
         foreach ($choices as $choice) {
@@ -57,7 +54,10 @@ class SlotRepository extends AbstractRepository {
         }
     }
 
-    function listByPollId($poll_id) {
+    /**
+     * @return array|false
+     */
+    public function listByPollId(string $poll_id) {
         $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? ORDER BY id');
         $prepared->execute([$poll_id]);
 
@@ -67,11 +67,11 @@ class SlotRepository extends AbstractRepository {
     /**
      * Find the slot into poll for a given datetime.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @param $datetime int The datetime of the slot
      * @return mixed Object The slot found, or null
      */
-    function findByPollIdAndDatetime($poll_id, $datetime) {
+    public function findByPollIdAndDatetime(string $poll_id, $datetime) {
         $prepared = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND SUBSTRING_INDEX(title, \'@\', 1) = ?');
 
         $prepared->execute([$poll_id, $datetime]);
@@ -84,12 +84,13 @@ class SlotRepository extends AbstractRepository {
     /**
      * Insert a new slot into a given poll.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @param $title mixed The title of the slot
      * @param $moments mixed|null The moments joined with ","
      * @return bool true if action succeeded
      */
-    function insert($poll_id, $title, $moments) {
+    public function insert(string $poll_id, string $title, ?string $moments): bool
+    {
         $prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?,?,?)');
 
         return $prepared->execute([$poll_id, $title, $moments]);
@@ -98,12 +99,13 @@ class SlotRepository extends AbstractRepository {
     /**
      * Update a slot into a poll.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @param $datetime int The datetime of the slot to update
      * @param $newMoments mixed The new moments
      * @return bool|null true if action succeeded.
      */
-    function update($poll_id, $datetime, $newMoments) {
+    public function update(string $poll_id, $datetime, $newMoments): ?bool
+    {
         $prepared = $this->prepare('UPDATE `' . Utils::table('slot') . '` SET moments = ? WHERE poll_id = ? AND title = ?');
 
         return $prepared->execute([$newMoments, $poll_id, $datetime]);
@@ -112,15 +114,17 @@ class SlotRepository extends AbstractRepository {
     /**
      * Delete a entire slot from a poll.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id int The ID of the poll
      * @param $datetime mixed The datetime of the slot
      */
-    function deleteByDateTime($poll_id, $datetime) {
+    public function deleteByDateTime(string $poll_id, $datetime): void
+    {
         $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND title = ?');
         $prepared->execute([$poll_id, $datetime]);
     }
 
-    function deleteByPollId($poll_id) {
+    public function deleteByPollId(string $poll_id): bool
+    {
         $prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ?');
 
         return $prepared->execute([$poll_id]);

app/classes/Framadate/Repositories/VoteRepository.php

@@ -5,24 +5,24 @@ use Framadate\FramaDB;
 use Framadate\Utils;
 
 class VoteRepository extends AbstractRepository {
-    function __construct(FramaDB $connect) {
-        parent::__construct($connect);
-    }
-
-    function allUserVotesByPollId($poll_id) {
+    /**
+     * @return array|false
+     */
+    public function allUserVotesByPollId(string $poll_id) {
         $prepared = $this->prepare('SELECT * FROM `' . Utils::table('vote') . '` WHERE poll_id = ? ORDER BY id');
         $prepared->execute([$poll_id]);
 
         return $prepared->fetchAll();
     }
 
-    function insertDefault($poll_id, $insert_position) {
+    public function insertDefault(string $poll_id, int $insert_position): bool
+    {
         $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTRING(choices, 1, ?), " ", SUBSTRING(choices, ?)) WHERE poll_id = ?'); //#51 : default value for unselected vote
 
         return $prepared->execute([$insert_position, $insert_position + 1, $poll_id]);
     }
 
-    function insert($poll_id, $name, $choices, $token) {
+    public function insert(string $poll_id, string $name, string $choices, string $token): \stdClass {
         $prepared = $this->prepare('INSERT INTO `' . Utils::table('vote') . '` (poll_id, name, choices, uniqId) VALUES (?,?,?,?)');
         $prepared->execute([$poll_id, $name, $choices, $token]);
 
@@ -36,7 +36,8 @@ class VoteRepository extends AbstractRepository {
         return $newVote;
     }
 
-    function deleteById($poll_id, $vote_id) {
+    public function deleteById(string $poll_id, int $vote_id): bool
+    {
         $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND id = ?');
 
         return $prepared->execute([$poll_id, $vote_id]);
@@ -45,10 +46,11 @@ class VoteRepository extends AbstractRepository {
     /**
      * Delete all votes of a given poll.
      *
-     * @param $poll_id int The ID of the given poll.
+     * @param string $poll_id The ID of the given poll.
      * @return bool|null true if action succeeded.
      */
-    function deleteByPollId($poll_id) {
+    public function deleteByPollId(string $poll_id): ?bool
+    {
         $prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ?');
 
         return $prepared->execute([$poll_id]);
@@ -57,17 +59,19 @@ class VoteRepository extends AbstractRepository {
     /**
      * Delete all votes made on given moment index.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @param $index int The index of the vote into the poll
      * @return bool|null true if action succeeded.
      */
-    function deleteByIndex($poll_id, $index) {
+    public function deleteByIndex(string $poll_id, int $index): ?bool
+    {
         $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTR(choices, 1, ?), SUBSTR(choices, ?)) WHERE poll_id = ?');
 
         return $prepared->execute([$index, $index + 2, $poll_id]);
     }
 
-    function update($poll_id, $vote_id, $name, $choices) {
+    public function update(string $poll_id, string $vote_id, string $name, $choices): bool
+    {
         $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = ?, name = ? WHERE poll_id = ? AND id = ?');
 
         return $prepared->execute([$choices, $name, $poll_id, $vote_id]);
@@ -76,25 +80,27 @@ class VoteRepository extends AbstractRepository {
     /**
      * Check if name is already used for the given poll.
      *
-     * @param int $poll_id ID of the poll
+     * @param string $poll_id ID of the poll
      * @param string $name Name of the vote
      * @return bool true if vote already exists
      */
-    public function existsByPollIdAndName($poll_id, $name) {
+    public function existsByPollIdAndName(string $poll_id, string $name): bool
+    {
         $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND name = ?');
         $prepared->execute([$poll_id, $name]);
         return $prepared->rowCount() > 0;
     }
-    
+
     /**
      * Check if name is already used for the given poll and another vote.
      *
-     * @param int $poll_id ID of the poll
+     * @param string $poll_id ID of the poll
      * @param string $name Name of the vote
      * @param int $vote_id ID of the current vote
      * @return bool true if vote already exists
      */
-    public function existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id) {
+    public function existsByPollIdAndNameAndVoteId(string $poll_id, string $name, int $vote_id): bool
+    {
         $prepared = $this->prepare('SELECT 1 FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND name = ? AND id != ?');
         $prepared->execute([$poll_id, $name, $vote_id]);
         return $prepared->rowCount() > 0;

app/classes/Framadate/Security/PasswordHasher.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Framadate\Security;
 
 /**
@@ -17,7 +16,7 @@ class PasswordHasher {
      * @param string $password the password to hash.
      * @return false|string the hashed password, or false on failure. The used algorithm, cost and salt are returned as part of the hash.
      */
-    public static function hash($password) {
+    public static function hash(string $password) {
         return password_hash($password, PASSWORD_DEFAULT);
     }
 
@@ -28,7 +27,8 @@ class PasswordHasher {
      * @param string $hash the hash to compare.
      * @return bool
      */
-    public static function verify($password, $hash) {
+    public static function verify(string $password, string $hash): bool
+    {
         return password_verify($password, $hash);
     }
-} 
+}

app/classes/Framadate/Security/Token.php

@@ -2,31 +2,35 @@
 namespace Framadate\Security;
 
 class Token {
-    const DEFAULT_LENGTH = 64;
+    public const DEFAULT_LENGTH = 64;
     private $time;
     private $value;
     private $length;
     private static $codeAlphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789';
 
-    function __construct($length = self::DEFAULT_LENGTH) {
+    public function __construct($length = self::DEFAULT_LENGTH) {
         $this->length = $length;
         $this->time = time() + TOKEN_TIME;
         $this->value = $this->generate();
     }
 
-    public function getTime() {
+    public function getTime(): int
+    {
         return $this->time;
     }
 
-    public function getValue() {
+    public function getValue(): string
+    {
         return $this->value;
     }
 
-    public function isGone() {
+    public function isGone(): bool
+    {
         return $this->time < time();
     }
 
-    public function check($value) {
+    public function check($value): bool
+    {
         return $value === $this->value;
     }
 
@@ -37,7 +41,8 @@ class Token {
      * @param bool $crypto_strong If passed, tells if the token is "cryptographically strong" or not.
      * @return string
      */
-    public static function getToken($length = self::DEFAULT_LENGTH, &$crypto_strong = false) {
+    public static function getToken(int $length = self::DEFAULT_LENGTH, bool &$crypto_strong = false): string
+    {
         if (function_exists('openssl_random_pseudo_bytes')) {
             openssl_random_pseudo_bytes(1, $crypto_strong); // Fake use to see if the algorithm used was "cryptographically strong"
             return self::getSecureToken($length);
@@ -45,7 +50,8 @@ class Token {
         return self::getUnsecureToken($length);
     }
 
-    public static function getUnsecureToken($length) {
+    public static function getUnsecureToken(int $length): string
+    {
         $string = '';
         mt_srand();
         for ($i = 0; $i < $length; $i++) {
@@ -58,7 +64,8 @@ class Token {
     /**
      * @author http://stackoverflow.com/a/13733588
      */
-    public static function getSecureToken($length){
+    public static function getSecureToken(int $length): string
+    {
         $token = "";
         for($i=0;$i<$length;$i++){
             $token .= self::$codeAlphabet[self::crypto_rand_secure(0,strlen(self::$codeAlphabet))];
@@ -66,25 +73,33 @@ class Token {
         return $token;
     }
 
-    private function generate() {
+    private function generate(): string
+    {
         return self::getToken($this->length);
     }
 
     /**
      * @author http://us1.php.net/manual/en/function.openssl-random-pseudo-bytes.php#104322
+     *
+     * @param int $max
+     *
+     * @psalm-param 0 $min
+     * @psalm-param 0|positive-int $max
      */
-    private static function crypto_rand_secure($min, $max) {
+    private static function crypto_rand_secure(int $min, $max): int {
         $range = $max - $min;
-        if ($range < 0) return $min; // not so random...
+        // not so random...
+        if ($range < 0) {
+            return $min;
+        }
         $log = log($range, 2);
         $bytes = (int) ($log / 8) + 1; // length in bytes
         $bits = (int) $log + 1; // length in bits
         $filter = (int) (1 << $bits) - 1; // set all lower bits to 1
         do {
             $rnd = hexdec(bin2hex(openssl_random_pseudo_bytes($bytes)));
-            $rnd = $rnd & $filter; // discard irrelevant bits
+            $rnd &= $filter; // discard irrelevant bits
         } while ($rnd >= $range);
         return $min + $rnd;
     }
 }
- 

app/classes/Framadate/Services/AdminPollService.php

@@ -21,7 +21,7 @@ class AdminPollService {
     private $voteRepository;
     private $commentRepository;
 
-    function __construct(FramaDB $connect, PollService $pollService, LogService $logService) {
+    public function __construct(FramaDB $connect, PollService $pollService, LogService $logService) {
         $this->connect = $connect;
         $this->pollService = $pollService;
         $this->logService = $logService;
@@ -31,32 +31,38 @@ class AdminPollService {
         $this->commentRepository = RepositoryFactory::commentRepository();
     }
 
-    function updatePoll($poll) {
+    public function updatePoll($poll): bool
+    {
         global $config;
-        if ($poll->end_date > $poll->creation_date) {
-            return $this->pollRepository->update($poll);
-        }  
-            return false;
+
+        if ($poll->end_date < $poll->creation_date) {
+           $poll->end_date = $poll->creation_date;
+        } elseif ($poll->end_date > $this->pollService->maxExpiryDate()) {
+           $poll->end_date = $this->pollService->maxExpiryDate();
+        }
+
+        return $this->pollRepository->update($poll);
     }
 
     /**
      * Delete a comment from a poll.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @param $comment_id int The ID of the comment
      * @return mixed true is action succeeded
      */
-    function deleteComment($poll_id, $comment_id) {
+    public function deleteComment(string $poll_id, int $comment_id) {
         return $this->commentRepository->deleteById($poll_id, $comment_id);
     }
 
     /**
      * Remove all comments of a poll.
      *
-     * @param $poll_id int The ID a the poll
+     * @param string $poll_id The ID a the poll
      * @return bool|null true is action succeeded
      */
-    function cleanComments($poll_id) {
+    public function cleanComments(string $poll_id): ?bool
+    {
         $this->logService->log("CLEAN_COMMENTS", "id:$poll_id");
         return $this->commentRepository->deleteByPollId($poll_id);
     }
@@ -64,21 +70,23 @@ class AdminPollService {
     /**
      * Delete a vote from a poll.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @param $vote_id int The ID of the vote
-     * @return mixed true is action succeeded
+     * @return bool true is action succeeded
      */
-    function deleteVote($poll_id, $vote_id) {
+    public function deleteVote(string $poll_id, int $vote_id): bool
+    {
         return $this->voteRepository->deleteById($poll_id, $vote_id);
     }
 
     /**
      * Remove all votes of a poll.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @return bool|null true is action succeeded
      */
-    function cleanVotes($poll_id) {
+    public function cleanVotes(string $poll_id): ?bool
+    {
         $this->logService->log('CLEAN_VOTES', 'id:' . $poll_id);
         return $this->voteRepository->deleteByPollId($poll_id);
     }
@@ -86,10 +94,11 @@ class AdminPollService {
     /**
      * Delete the entire given poll.
      *
-     * @param $poll_id int The ID of the poll
+     * @param $poll_id string The ID of the poll
      * @return bool true is action succeeded
      */
-    function deleteEntirePoll($poll_id) {
+    public function deleteEntirePoll(string $poll_id): bool
+    {
         $poll = $this->pollRepository->findById($poll_id);
         $this->logService->log('DELETE_POLL', "id:$poll->id, format:$poll->format, admin:$poll->admin_name, mail:$poll->admin_mail");
 
@@ -109,7 +118,8 @@ class AdminPollService {
      * @param object $slot The slot informations (datetime + moment)
      * @return bool true if action succeeded
      */
-    public function deleteDateSlot($poll, $slot) {
+    public function deleteDateSlot(object $poll, object $slot): bool
+    {
         $this->logService->log('DELETE_SLOT', 'id:' . $poll->id . ', slot:' . json_encode($slot));
 
         $datetime = $slot->title;
@@ -120,7 +130,9 @@ class AdminPollService {
         // We can't delete the last slot
         if ($poll->format === 'D' && count($slots) === 1 && strpos($slots[0]->moments, ',') === false) {
             return false;
-        } elseif ($poll->format === 'A' && count($slots) === 1) {
+        }
+
+        if ($poll->format === 'A' && count($slots) === 1) {
             return false;
         }
 
@@ -157,7 +169,8 @@ class AdminPollService {
         return true;
     }
 
-    public function deleteClassicSlot($poll, $slot_title) {
+    public function deleteClassicSlot($poll, string $slot_title): bool
+    {
         $this->logService->log('DELETE_SLOT', 'id:' . $poll->id . ', slot:' . $slot_title);
 
         $slots = $this->pollService->allSlotsByPoll($poll);
@@ -193,12 +206,13 @@ class AdminPollService {
      *  <li>Create a new moment if a slot already exists for the given date</li>
      * </ul>
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @param $datetime int The datetime
      * @param $new_moment string The moment's name
      * @throws MomentAlreadyExistsException When the moment to add already exists in database
      */
-    public function addDateSlot($poll_id, $datetime, $new_moment) {
+    public function addDateSlot(string $poll_id, int $datetime, string $new_moment): void
+    {
         $this->logService->log('ADD_COLUMN', 'id:' . $poll_id . ', datetime:' . $datetime . ', moment:' . $new_moment);
 
         $slots = $this->slotRepository->listByPollId($poll_id);
@@ -235,17 +249,18 @@ class AdminPollService {
      *  <li>Create a new slot if no one exists for the given title</li>
      * </ul>
      *
-     * @param $poll_id int The ID of the poll
-     * @param $title int The title
+     * @param string $poll_id The ID of the poll
+     * @param string $title The title
      * @throws MomentAlreadyExistsException When the moment to add already exists in database
      */
-    public function addClassicSlot($poll_id, $title) {
+    public function addClassicSlot(string $poll_id, string $title): void
+    {
         $this->logService->log('ADD_COLUMN', 'id:' . $poll_id . ', title:' . $title);
 
         $slots = $this->slotRepository->listByPollId($poll_id);
 
         // Check if slot already exists
-        $titles = array_map(function ($slot) {
+        $titles = array_map(static function ($slot) {
             return $slot->title;
         }, $slots);
         if (in_array($title, $titles, true)) {
@@ -274,7 +289,7 @@ class AdminPollService {
      * @param $datetime int The datetime of the new slot
      * @return \stdClass An object like this one: {insert:X, slot:Y} where Y can be null.
      */
-    private function findInsertPosition($slots, $datetime) {
+    private function findInsertPosition(array $slots, int $datetime) {
         $result = new \stdClass();
         $result->slot = null;
         $result->insert = 0;
@@ -284,7 +299,7 @@ class AdminPollService {
 
         // Search where to insert new column
         foreach ($slots as $k=>$slot) {
-            $rowDatetime = $slot->title;
+            $rowDatetime = (int) $slot->title;
             $moments = explode(',', $slot->moments);
 
             if ($datetime === $rowDatetime) {
@@ -292,14 +307,15 @@ class AdminPollService {
                 $result->insert += count($moments);
                 $result->slot = $slot;
                 break;
-            } elseif ($datetime < $rowDatetime) {
+            }
+
+            if ($datetime < $rowDatetime) {
                 // We have to insert before this slot
                 break;
-            }  
-                $result->insert += count($moments);
+            }
+            $result->insert += count($moments);
         }
 
         return $result;
     }
 }
- 

app/classes/Framadate/Services/ICalService.php

@@ -0,0 +1,182 @@
+<?php
+/**
+ * This software is governed by the CeCILL-B license. If a copy of this license
+ * is not distributed with this file, you can obtain one at
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
+ *
+ * Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
+ * Authors of Framadate/OpenSondage: Framasoft (https://github.com/framasoft)
+ *
+ * =============================
+ *
+ * Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
+ * ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
+ * http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
+ *
+ * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
+ * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
+ */
+namespace Framadate\Services;
+
+use DateTime;
+use Framadate\Utils;
+use Sabre\VObject;
+
+class ICalService {
+    /**
+     * Creates an ical-File and initiates the download. If possible, the provided time is used, else an all day event is created.
+     */
+    public function getEvent($poll, string $start_day, string $start_time): void
+    {
+        if(!$this->dayIsReadable($start_day)) {
+            return;
+        }
+
+        $ical_text = "";
+        $elements = explode("-", $start_time);
+        $end_time = null;
+        if(count($elements) === 2) {
+            $start_time = trim($elements[0]);
+            $end_time = trim($elements[1]);
+        }
+        $start_time = $this->reviseTimeString($start_time);
+        if($end_time !== null) {
+            $end_time = $this->reviseTimeString($end_time);
+        }
+        if($start_time !== null) {
+            if($end_time !== null) {
+                $ical_text = $this->getTimedEvent($poll, $start_day . " " . $start_time, $start_day . " " . $end_time);
+            } else {
+                $ical_text = $this->getTimedEvent1Hour($poll, $start_day . " " . $start_time);
+            }
+        }
+        else {
+            $date = DateTime::createFromFormat('d-m-Y', $start_day);
+            $day = $date->format('Ymd');
+            $ical_text = $this->getAllDayEvent($poll, $day);
+        }
+        $this->provideFile($poll->title, $ical_text);
+    }
+
+    /**
+     * Calls getTimedEvent with one hour as a time slot, starting at $start_daytime
+     */
+    public function getTimedEvent1Hour($poll, string $start_daytime): string
+    {
+        $end_daytime = date(DATE_ATOM, strtotime('+1 hours', strtotime($start_daytime)));
+        return $this->getTimedEvent($poll, $start_daytime, $end_daytime);
+    }
+
+    /**
+     * Generates the text for an ical event including the time
+     */
+    public function getTimedEvent($poll, string $start_daytime, string $end_daytime): string
+    {
+        $vcalendar = new VObject\Component\VCalendar([
+            'VEVENT' => [
+                'SUMMARY' => $poll->title,
+                'DESCRIPTION' => $this->stripMD($poll->description),
+                'DTSTART' => new DateTime($start_daytime),
+                'DTEND'   => new DateTime($end_daytime)
+            ],
+            'PRODID' => ICAL_PRODID
+        ]);
+        return $vcalendar->serialize();
+    }
+
+    /**
+     * Generates the text for an ical event if the time is not known
+     */
+    public function getAllDayEvent($poll, string $day): string
+    {
+        $vcalendar = new VObject\Component\VCalendar();
+        $vevent = $vcalendar->add('VEVENT');
+        $vevent->add('SUMMARY', $poll->title);
+        $vevent->add('DESCRIPTION', $this->stripMD($poll->description));
+        $dtstart = $vevent->add('DTSTART', $day);
+        $dtstart['VALUE'] = 'DATE';
+        unset($vcalendar->PRODID);
+        $vcalendar->add('PRODID', ICAL_PRODID);
+        return $vcalendar->serialize();
+    }
+
+    /**
+     * Creates a file and initiates the download
+     * @param string $title
+     * @param string $ical_text
+     */
+    public function provideFile(string $title, string $ical_text): void
+    {
+        header('Content-Description: File Transfer');
+        header('Content-Disposition: attachment; filename=' . $this->stripTitle($title) . ICAL_ENDING);
+        header('Expires: 0');
+        header('Cache-Control: must-revalidate');
+        header('Pragma: public');
+        header("Content-Type: text/calendar");
+        echo $ical_text;
+        exit;
+    }
+
+    /**
+     * Reformats a string value into a time readable by DateTime
+     * @param string $time
+     * @return string the corrected value, null if the format is unknown
+     */
+    public function reviseTimeString(string $time): ?string
+    {
+        // 24-hour clock / international format
+        if (preg_match('/^\d\d(:)\d\d$/', $time)) {
+            return $time;
+        }
+        // 12-hour clock / using am and pm
+
+        if (preg_match('/^\d[0-2]?:?\d{0,2}\s?[aApP][mM]$/', $time)) {
+            return $this->formatTime($time);
+        }
+        // french format HHhMM or HHh
+
+        if (preg_match('/^\d\d?[hH]\d?\d?$/', $time)) {
+            return $this->formatTime(str_pad(str_ireplace("H", ":", $time),  5, "0"));
+        }
+        // Number only
+
+        if (preg_match('/^\d{1,4}$/', $time)) {
+            return $this->formatTime(str_pad(str_pad($time,  2, "0", STR_PAD_LEFT),  4, "0"));
+        }
+        return null;
+    }
+
+    /**
+     * @param string $day
+     * @return false|int 1 if the day string can be parsed, 0 if not and false if an error occured
+     */
+    public function dayIsReadable(string $day) {
+        return preg_match('/^\d{2}-\d{2}-\d{4}$/', $day);
+    }
+
+    /**
+     * @param string $time
+     * @return string date string in format H:i (e.g. 19:00)
+     */
+    public function formatTime(string $time): string
+    {
+        return date("H:i", strtotime($time));
+    }
+
+    /**
+     * Converts MD Code to HTML, then strips HTML away
+     */
+    public function stripMD(string $string): string
+    {
+        return strip_tags(Utils::markdown($string));
+    }
+
+    /**
+     * Strips a string so it's usable as a file name (only digits, letters and underline allowed)
+     *
+     * @return null|string
+     */
+    public function stripTitle(string $string): ?string {
+        return preg_replace('/[^a-z0-9_]+/', '-', strtolower($string));
+    }
+}

app/classes/Framadate/Services/InputService.php

@@ -17,25 +17,28 @@
  * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
  */
 namespace Framadate\Services;
+use function __;
 use DateTime;
 use Egulias\EmailValidator\EmailValidator;
 use Egulias\EmailValidator\Validation\RFCValidation;
+use o80\i18n\CantLoadDictionaryException;
 
 /**
  * This class helps to clean all inputs from the users or external services.
  */
 class InputService {
-    function __construct() {}
+    public function __construct() {}
 
     /**
      * This method filter an array calling "filter_var" on each items.
      * Only items validated are added at their own indexes, the others are not returned.
      * @param array $arr The array to filter
      * @param int $type The type of filter to apply
-     * @param array|null $options The associative array of options
+     * @param array|int $options The associative array of options
      * @return array The filtered array
      */
-    function filterArray(array $arr, $type, $options = null) {
+    public function filterArray(array $arr, int $type, $options = 0): array
+    {
         $newArr = [];
 
         foreach($arr as $id=>$item) {
@@ -48,24 +51,32 @@ class InputService {
         return $newArr;
     }
 
-    function filterAllowedValues($value, array $allowedValues) {
+    public function filterAllowedValues($value, array $allowedValues) {
         return in_array($value, $allowedValues, true) ? $value : null;
     }
 
-    public function filterTitle($title) {
+    public function filterTitle($title): ?string
+    {
         return $this->returnIfNotBlank($title);
     }
 
+    /**
+     * @return false|string
+     */
     public function filterId($id) {
         $filtered = filter_var($id, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
         return $filtered ? substr($filtered, 0, 64) : false;
     }
 
-    public function filterName($name) {
+    public function filterName($name): ?string
+    {
         $filtered = trim($name);
         return $this->returnIfNotBlank($filtered);
     }
 
+    /**
+     * @return false|string
+     */
     public function filterMail($mail) {
     	///////////////////////////////////////////////////////////////////////////////////////
         // formatting
@@ -89,40 +100,67 @@ class InputService {
         return $resultat;
     }
 
-    public function filterDescription($description) {
-        $description = str_replace("\r\n", "\n", $description);
-        return $description;
+    public function filterDescription($description): string {
+        return str_replace("\r\n", "\n", $description);
     }
 
+    /**
+     * @return false|string
+     */
     public function filterMD5($control) {
         return filter_var($control, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => MD5_REGEX]]);
     }
 
+    /**
+     * @return false|int
+     */
     public function filterInteger($int) {
         return filter_var($int, FILTER_VALIDATE_INT);
     }
 
+    /**
+     * @return false|int
+     */
     public function filterValueMax($int)
     {
         return $this->filterInteger($int) >= 1 ? $this->filterInteger($int) : false;
     }
 
-    public function filterBoolean($boolean) {
-        return !!filter_var($boolean, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_TRUE_REGEX]]);
+    public function filterBoolean($boolean): bool
+    {
+        return (bool)filter_var($boolean, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_TRUE_REGEX]]);
     }
 
+    /**
+     * @return false|string
+     */
     public function filterEditable($editable) {
         return filter_var($editable, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => EDITABLE_CHOICE_REGEX]]);
     }
 
-    public function filterComment($comment) {
+    public function filterComment($comment): ?string
+    {
         $comment = str_replace("\r\n", "\n", $comment);
         return $this->returnIfNotBlank($comment);
     }
 
-    public function filterDate($date) {
-        $dDate = DateTime::createFromFormat(__('Date', 'datetime_parseformat'), $date)->setTime(0, 0, 0);
-        return $dDate->format('Y-m-d H:i:s');
+    public function validateDate(DateTime $date, DateTime $minDate, DateTime $maxDate): DateTime {
+        if ($date < $minDate) {
+            return $minDate;
+        }
+
+        if ($maxDate < $date) {
+            return $maxDate;
+        }
+        return $date;
+    }
+
+    /**
+     * @throws CantLoadDictionaryException
+     * @return DateTime|false
+     */
+    public function parseDate(string $date) {
+        return DateTime::createFromFormat(__('Date', 'datetime_parseformat'), $date)->setTime(0, 0);
     }
 
     /**
@@ -131,7 +169,8 @@ class InputService {
      * @param string $filtered The value
      * @return string|null
      */
-    private function returnIfNotBlank($filtered) {
+    private function returnIfNotBlank(string $filtered): ?string
+    {
         if ($filtered) {
             $withoutSpaces = str_replace(' ', '', $filtered);
             if (!empty($withoutSpaces)) {

app/classes/Framadate/Services/InstallService.php

@@ -17,7 +17,10 @@
  * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
  */
 namespace Framadate\Services;
+use function __f;
+use Exception;
 use Framadate\Utils;
+use PDO;
 use Smarty;
 
 /**
@@ -40,24 +43,27 @@ class InstallService {
         'migrationTable' => 'framadate_migration'
     ];
 
-    function __construct() {}
+    public function __construct() {}
 
-    public function updateFields($data) {
+    public function updateFields($data): void
+    {
         foreach ($data as $field => $value) {
             $this->fields[$field] = $value;
         }
     }
 
-    public function install(Smarty &$smarty) {
+    public function install(Smarty &$smarty): array
+    {
         // Check values are present
         if (empty($this->fields['appName']) || empty($this->fields['appMail']) || empty($this->fields['defaultLanguage']) || empty($this->fields['dbConnectionString']) || empty($this->fields['dbUser'])) {
             return $this->error('MISSING_VALUES');
         }
 
         // Connect to database
-        $connect = $this->connectTo($this->fields['dbConnectionString'], $this->fields['dbUser'], $this->fields['dbPassword']);
-        if (!$connect) {
-            return $this->error('CANT_CONNECT_TO_DATABASE');
+        try {
+            $connect = $this->connectTo($this->fields['dbConnectionString'], $this->fields['dbUser'], $this->fields['dbPassword']);
+        } catch(Exception $e) {
+            return $this->error('CANT_CONNECT_TO_DATABASE', $e->getMessage());
         }
 
         // Write configuration to conf.php file
@@ -68,18 +74,26 @@ class InstallService {
         return $this->ok();
     }
 
-    function connectTo($connectionString, $user, $password) {
-        try {
-            $pdo = @new \PDO($connectionString, $user, $password);
-            $pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_OBJ);
-            $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-            return $pdo;
-        } catch(\Exception $e) {
-            return null;
-        }
+    /**
+     * Connect to PDO compatible source
+     *
+     * @param string $connectionString
+     * @param string $user
+     * @param string $password
+     * @return PDO
+     */
+    public function connectTo(string $connectionString, string $user, string $password): PDO
+    {
+        $pdo = @new PDO($connectionString, $user, $password);
+        $pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
+        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        return $pdo;
     }
 
-    function writeConfiguration(Smarty &$smarty) {
+    /**
+     * @return false|int
+     */
+    public function writeConfiguration(Smarty &$smarty) {
         foreach($this->fields as $field=>$value) {
             $smarty->assign($field, $value);
         }
@@ -91,15 +105,17 @@ class InstallService {
 
     /**
      * @param $content
+     * @return false|int
      */
-    function writeToFile($content) {
+    public function writeToFile(string $content) {
         return @file_put_contents(CONF_FILENAME, $content);
     }
 
     /**
      * @return array
      */
-    function ok() {
+    public function ok(): array
+    {
         return [
             'status' => 'OK',
             'msg' => __f('Installation', 'Ended', Utils::get_server_name())
@@ -107,17 +123,21 @@ class InstallService {
     }
 
     /**
-     * @param $msg
+     * @param string $msg
+     * @param string $details
      * @return array
      */
-    function error($msg) {
+    public function error(string $msg, string $details = ''): array
+    {
         return [
             'status' => 'ERROR',
-            'code' => $msg
+            'code' => $msg,
+            'details' => $details,
         ];
     }
 
-    public function getFields() {
+    public function getFields(): array
+    {
         return $this->fields;
     }
 }

app/classes/Framadate/Services/LogService.php

@@ -7,7 +7,7 @@ namespace Framadate\Services;
  * @package Framadate\Services
  */
 class LogService {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -16,8 +16,8 @@ class LogService {
      * @param $tag string A tag is used to quickly found a message when reading log file
      * @param $message string some message
      */
-    function log($tag, $message) {
+    public function log(string $tag, string $message): void
+    {
         error_log(date('Ymd His') . ' [' . $tag . '] ' . $message . "\n", 3, ROOT_DIR . LOG_FILE);
     }
 }
- 

app/classes/Framadate/Services/MailService.php

@@ -1,12 +1,13 @@
 <?php
 namespace Framadate\Services;
 
+use PHPMailer\PHPMailer\Exception;
 use PHPMailer\PHPMailer\PHPMailer;
 
 class MailService {
-    const DELAY_BEFORE_RESEND = 300;
+    public const DELAY_BEFORE_RESEND = 300;
 
-    const MAILSERVICE_KEY = 'mailservice';
+    public const MAILSERVICE_KEY = 'mailservice';
 
     private $smtp_allowed;
 
@@ -14,7 +15,7 @@ class MailService {
 
     private $logService;
 
-    function __construct($smtp_allowed, $smtp_options = []) {
+    public function __construct($smtp_allowed, $smtp_options = []) {
         $this->logService = new LogService();
         $this->smtp_allowed = $smtp_allowed;
         if (true === is_array($smtp_options)) {
@@ -22,11 +23,18 @@ class MailService {
         }
     }
 
+    /**
+     * @return false|string
+     */
     public function isValidEmail($email) {
         return filter_var($email, FILTER_VALIDATE_EMAIL);
     }
 
-    public function send($to, $subject, $body, $msgKey = null) {
+    /**
+     * @throws Exception
+     */
+    public function send(string $to, string $subject, string $body, ?string $msgKey = null): void
+    {
         if ($this->smtp_allowed === true && $this->canSendMsg($msgKey)) {
             $mail = new PHPMailer(true);
             $this->configureMailer($mail);
@@ -45,7 +53,7 @@ class MailService {
             $mail->Subject = $subject;
 
             // Bodies
-            $body = $body . ' <br/><br/>' . __('Mail', 'Thanks for your trust.') . ' <br/>' . NOMAPPLICATION . ' <hr/>' . __('Mail', 'FOOTER');
+            $body .= ' <br/><br/>' . __('Mail', 'Thanks for your trust.') . ' <br/>' . NOMAPPLICATION . ' <hr/>' . __('Mail', 'FOOTER');
             $mail->isHTML(true);
             $mail->msgHTML($body, ROOT_DIR, true);
 
@@ -53,6 +61,7 @@ class MailService {
             $mail->CharSet = 'UTF-8';
             $mail->addCustomHeader('Auto-Submitted', 'auto-generated');
             $mail->addCustomHeader('Return-Path', '<>');
+            $mail->XMailer = ' ';
 
             // Send mail
             $mail->send();
@@ -61,19 +70,25 @@ class MailService {
             $this->logService->log('MAIL', 'Mail sent to: ' . $to . ', key: ' . $msgKey);
 
             // Store the mail sending date
+            $this->initializeSession();
             $_SESSION[self::MAILSERVICE_KEY][$msgKey] = time();
         }
     }
 
-    public function canSendMsg($msgKey) {
+    public function canSendMsg(?string $msgKey): bool
+    {
         if ($msgKey === null) {
             return true;
         }
 
+        $this->initializeSession();
+        return !isset($_SESSION[self::MAILSERVICE_KEY][$msgKey]) || time() - $_SESSION[self::MAILSERVICE_KEY][$msgKey] > self::DELAY_BEFORE_RESEND;
+    }
+
+    private function initializeSession(): void {
         if (!isset($_SESSION[self::MAILSERVICE_KEY])) {
             $_SESSION[self::MAILSERVICE_KEY] = [];
         }
-        return !isset($_SESSION[self::MAILSERVICE_KEY][$msgKey]) || time() - $_SESSION[self::MAILSERVICE_KEY][$msgKey] > self::DELAY_BEFORE_RESEND;
     }
 
     /**
@@ -81,12 +96,14 @@ class MailService {
      *
      * @param PHPMailer $mailer
      */
-    private function configureMailer(PHPMailer $mailer) {
+    private function configureMailer(PHPMailer $mailer): void
+    {
         $mailer->isSMTP();
 
         $available_options = [
             'host' => 'Host',
             'auth' => 'SMTPAuth',
+            'authtype' => 'AuthType',
             'username' => 'Username',
             'password' => 'Password',
             'secure' => 'SMTPSecure',

app/classes/Framadate/Services/NotificationService.php

@@ -1,22 +1,24 @@
 <?php
 
-
 namespace Framadate\Services;
 
 use \stdClass;
-use Framadate\Services\MailService;
+use function __;
+use function __f;
 use Framadate\Utils;
+use o80\i18n\CantLoadDictionaryException;
+use PHPMailer\PHPMailer\Exception;
 
 class NotificationService {
-    const UPDATE_VOTE = 1;
-    const ADD_VOTE = 2;
-    const ADD_COMMENT = 3;
-    const UPDATE_POLL = 10;
-    const DELETED_POLL = 11;
+    public const UPDATE_VOTE = 1;
+    public const ADD_VOTE = 2;
+    public const ADD_COMMENT = 3;
+    public const UPDATE_POLL = 10;
+    public const DELETED_POLL = 11;
 
     private $mailService;
 
-    function __construct(MailService $mailService) {
+    public function __construct(MailService $mailService) {
         $this->mailService = $mailService;
     }
 
@@ -26,8 +28,10 @@ class NotificationService {
      * @param $poll stdClass The poll
      * @param $name string The name user who triggered the notification
      * @param $type int cf: Constants on the top of this page
+     * @throws Exception|CantLoadDictionaryException
      */
-    function sendUpdateNotification(stdClass $poll, $type, $name='') {
+    public function sendUpdateNotification($poll, int $type, string $name=''): void
+    {
         if (!isset($_SESSION['mail_sent'])) {
             $_SESSION['mail_sent'] = [];
         }
@@ -37,7 +41,7 @@ class NotificationService {
         $isOtherType = $type !== self::UPDATE_VOTE && $type !== self::ADD_VOTE && $type !== self::ADD_COMMENT;
 
         if ($isVoteAndCanSendIt || $isCommentAndCanSendIt || $isOtherType) {
-            if (self::isParticipation($type)) {
+            if ($this->isParticipation($type)) {
                 $translationString = 'Poll\'s participation: %s';
             } else {
                 $translationString = 'Notification of poll: %s';
@@ -75,11 +79,13 @@ class NotificationService {
             }
 
             $messageTypeKey = $type . '-' . $poll->id;
-            $this->mailService->send($poll->admin_mail, $subject, $message, $messageTypeKey);
+            if ($poll->admin_mail) {
+                $this->mailService->send($poll->admin_mail, $subject, $message, $messageTypeKey);
+            }
         }
     }
 
-    function isParticipation($type)
+    public function isParticipation(int $type): bool
     {
        return $type >= self::UPDATE_POLL;
     }

app/classes/Framadate/Services/PollService.php

@@ -18,16 +18,19 @@
  */
 namespace Framadate\Services;
 
+use DateInterval;
+use DateTime;
+use Exception;
 use Framadate\Exception\AlreadyExistsException;
 use Framadate\Exception\ConcurrentEditionException;
 use Framadate\Exception\ConcurrentVoteException;
+use Framadate\Exception\PollNotFoundException;
 use Framadate\Form;
-use Framadate\FramaDB;
 use Framadate\Repositories\RepositoryFactory;
 use Framadate\Security\Token;
+use stdClass;
 
 class PollService {
-    private $connect;
     private $logService;
 
     private $pollRepository;
@@ -35,8 +38,7 @@ class PollService {
     private $voteRepository;
     private $commentRepository;
 
-    function __construct(FramaDB $connect, LogService $logService) {
-        $this->connect = $connect;
+    public function __construct(LogService $logService) {
         $this->logService = $logService;
         $this->pollRepository = RepositoryFactory::pollRepository();
         $this->slotRepository = RepositoryFactory::slotRepository();
@@ -47,10 +49,10 @@ class PollService {
     /**
      * Find a poll from its ID.
      *
-     * @param $poll_id int The ID of the poll
-     * @return \stdClass|null The found poll, or null
+     * @param string $poll_id The ID of the poll
+     * @return stdClass|null The found poll, or null
      */
-    function findById($poll_id) {
+    public function findById(string $poll_id) {
         if (preg_match(POLL_REGEX, $poll_id)) {
             return $this->pollRepository->findById($poll_id);
         }
@@ -58,7 +60,7 @@ class PollService {
         return null;
     }
 
-    public function findByAdminId($admin_poll_id) {
+    public function findByAdminId(string $admin_poll_id) {
         if (preg_match(ADMIN_POLL_REGEX, $admin_poll_id)) {
             return $this->pollRepository->findByAdminId($admin_poll_id);
         }
@@ -66,15 +68,15 @@ class PollService {
         return null;
     }
 
-    function allCommentsByPollId($poll_id) {
+    public function allCommentsByPollId(string $poll_id) {
         return $this->commentRepository->findAllByPollId($poll_id);
     }
 
-    function allVotesByPollId($poll_id) {
+    public function allVotesByPollId(string $poll_id) {
         return $this->voteRepository->allUserVotesByPollId($poll_id);
     }
 
-    function allSlotsByPoll($poll) {
+    public function allSlotsByPoll(stdClass $poll) {
         $slots = $this->slotRepository->listByPollId($poll->id);
         if ($poll->format === 'D') {
             $this->sortSlorts($slots);
@@ -83,48 +85,49 @@ class PollService {
     }
 
     /**
-     * @param $poll_id
-     * @param $vote_id
-     * @param $name
-     * @param $choices
-     * @param $slots_hash
+     * @param string $poll_id
+     * @param int $vote_id
+     * @param string $name
+     * @param array $choices
+     * @param string $slots_hash
      * @throws AlreadyExistsException
      * @throws ConcurrentEditionException
      * @throws ConcurrentVoteException
      * @return bool
      */
-    public function updateVote($poll_id, $vote_id, $name, $choices, $slots_hash) {
+    public function updateVote(string $poll_id, int $vote_id, string $name, array $choices, string $slots_hash): bool
+    {
         $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id);
-        
+
         // Update vote
-        $choices = implode($choices);
-        return $this->voteRepository->update($poll_id, $vote_id, $name, $choices);
-    }
-    
-    /**
-     * @param $poll_id
-     * @param $name
-     * @param $choices
-     * @param $slots_hash
-     * @throws AlreadyExistsException
-     * @throws ConcurrentEditionException
-     * @throws ConcurrentVoteException
-     * @return \stdClass
-     */
-    function addVote($poll_id, $name, $choices, $slots_hash) {
-        $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name);
-        
-        // Insert new vote
-        $choices = implode($choices);
-        $token = $this->random(16);
-        return $this->voteRepository->insert($poll_id, $name, $choices, $token);
+        return $this->voteRepository->update($poll_id, $vote_id, $name, implode($choices));
     }
 
-    function addComment($poll_id, $name, $comment) {
+    /**
+     * @param string $poll_id
+     * @param string $name
+     * @param array $choices
+     * @param string $slots_hash
+     * @throws ConcurrentEditionException
+     * @throws ConcurrentVoteException
+     * @throws PollNotFoundException
+     * @throws AlreadyExistsException
+     * @return stdClass
+     */
+    public function addVote(string $poll_id, string $name, array $choices, string $slots_hash): stdClass
+    {
+        $this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name);
+
+        // Insert new vote
+        return $this->voteRepository->insert($poll_id, $name, implode($choices), $this->random(16));
+    }
+
+    public function addComment($poll_id, $name, $comment): bool
+    {
         if ($this->commentRepository->exists($poll_id, $name, $comment)) {
             return true;
         }
-        
+
         return $this->commentRepository->insert($poll_id, $name, $comment);
     }
 
@@ -132,7 +135,8 @@ class PollService {
      * @param Form $form
      * @return array
      */
-    function createPoll(Form $form) {
+    public function createPoll(Form $form): array
+    {
         // Generate poll IDs, loop while poll ID already exists
 
         if (empty($form->id)) { // User want us to generate an id for him
@@ -158,16 +162,18 @@ class PollService {
         return [$poll_id, $admin_poll_id];
     }
 
-    public function findAllByAdminMail($mail) {
+    public function findAllByAdminMail($mail): array
+    {
         return $this->pollRepository->findAllByAdminMail($mail);
     }
 
     /**
      * @param array $votes
-     * @param \stdClass $poll
+     * @param stdClass $poll
      * @return array
      */
-    public function computeBestChoices($votes, $poll) {
+    public function computeBestChoices(array $votes, $poll): array
+    {
         if (0 === count($votes)) {
            return $this->computeEmptyBestChoices($poll);
         }
@@ -193,10 +199,11 @@ class PollService {
         return $result;
     }
 
-    function splitSlots($slots) {
+    public function splitSlots($slots): array
+    {
         $splitted = [];
         foreach ($slots as $slot) {
-            $obj = new \stdClass();
+            $obj = new stdClass();
             $obj->day = $slot->title;
             $obj->moments = explode(',', $slot->moments);
 
@@ -210,16 +217,18 @@ class PollService {
      * @param $slots array The slots to hash
      * @return string The hash
      */
-    public function hashSlots($slots) {
-        return md5(array_reduce($slots, function($carry, $item) {
+    public function hashSlots(array $slots): string
+    {
+        return md5(array_reduce($slots, static function($carry, $item) {
             return $carry . $item->id . '@' . $item->moments . ';';
         }));
     }
 
-    function splitVotes($votes) {
+    public function splitVotes(array $votes): array
+    {
         $splitted = [];
         foreach ($votes as $vote) {
-            $obj = new \stdClass();
+            $obj = new stdClass();
             $obj->id = $vote->id;
             $obj->name = $vote->name;
             $obj->uniqId = $vote->uniqId;
@@ -232,35 +241,40 @@ class PollService {
     }
 
     /**
-     * @return int The max timestamp allowed for expiry date
+     * @throws Exception
+     * @return DateTime The max date allowed for expiry date
      */
-    public function maxExpiryDate() {
+    public function maxExpiryDate(): DateTime {
         global $config;
-        return time() + (86400 * $config['default_poll_duration']);
+        return (new DateTime())->add(new DateInterval('P' . $config['default_poll_duration'] . 'D'));
     }
 
     /**
-     * @return int The min timestamp allowed for expiry date
+     * @return DateTime The min date allowed for expiry date
      */
-    public function minExpiryDate() {
-        return time() + 86400;
+    public function minExpiryDate(): DateTime
+    {
+        return (new DateTime())->add(new DateInterval('P1D'));
     }
 
     /**
      * @return mixed
      */
-    public function sortSlorts(&$slots) {
-        uasort($slots, function ($a, $b) {
-            return $a->title > $b->title;
+    public function sortSlorts(array &$slots): array {
+        uasort($slots, static function ($a, $b) {
+            if ($a->title === $b->title) {
+                return 0;
+            }
+            return $a->title > $b->title ? 1 : -1;
         });
         return $slots;
     }
 
     /**
-     * @param \stdClass $poll
+     * @param stdClass $poll
      * @return array
      */
-    private function computeEmptyBestChoices($poll)
+    private function computeEmptyBestChoices($poll): array
     {
         $result = ['y' => [], 'inb' => []];
         // if there is no votes, calculates the number of slot
@@ -270,7 +284,7 @@ class PollService {
         if ($poll->format === 'A') {
             // poll format classic
 
-            for ($i = 0; $i < count($slots); $i++) {
+            for ($i = 0, $iMax = count($slots); $i < $iMax; $i++) {
                 $result['y'][] = 0;
                 $result['inb'][] = 0;
             }
@@ -280,7 +294,7 @@ class PollService {
             $slots = $this->splitSlots($slots);
 
             foreach ($slots as $slot) {
-                for ($i = 0; $i < count($slot->moments); $i++) {
+                for ($i = 0, $iMax = count($slot->moments); $i < $iMax; $i++) {
                     $result['y'][] = 0;
                     $result['inb'][] = 0;
                 }
@@ -289,41 +303,48 @@ class PollService {
         return $result;
     }
 
-    private function random($length) {
+    private function random(int $length): string
+    {
         return Token::getToken($length);
     }
-    
+
     /**
-     * @param $choices
-     * @param $poll_id
-     * @param $slots_hash
-     * @param $name
-     * @param string $vote_id
+     * @param array $choices
+     * @param string $poll_id
+     * @param string $slots_hash
+     * @param string $name
+     * @param bool|int $vote_id
      * @throws AlreadyExistsException
-     * @throws ConcurrentVoteException
      * @throws ConcurrentEditionException
+     * @throws ConcurrentVoteException
+     * @throws PollNotFoundException
      */
-    private function checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id = FALSE) {
+    private function checkVoteConstraints(array $choices, string $poll_id, string $slots_hash, string $name, $vote_id = false): void
+    {
         // Check if vote already exists with the same name
-        if (FALSE === $vote_id) {
+        if (false === $vote_id) {
         	$exists = $this->voteRepository->existsByPollIdAndName($poll_id, $name);
         } else {
         	$exists = $this->voteRepository->existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id);
         }
-        
+
         if ($exists) {
             throw new AlreadyExistsException();
         }
-        
+
         $poll = $this->findById($poll_id);
-        
+
+        if (!$poll) {
+            throw new PollNotFoundException();
+        }
+
         // Check that no-one voted in the meantime and it conflicts the maximum votes constraint
         $this->checkMaxVotes($choices, $poll, $poll_id);
-        
+
         // Check if slots are still the same
         $this->checkThatSlotsDidntChanged($poll, $slots_hash);
     }
-    
+
     /**
      * This method checks if the hash send by the user is the same as the computed hash.
      *
@@ -331,7 +352,8 @@ class PollService {
      * @param $slots_hash string The hash sent by the user
      * @throws ConcurrentEditionException Thrown when hashes are differents
      */
-    private function checkThatSlotsDidntChanged($poll, $slots_hash) {
+    private function checkThatSlotsDidntChanged(stdClass $poll, string $slots_hash): void
+    {
         $slots = $this->allSlotsByPoll($poll);
         if ($slots_hash !== $this->hashSlots($slots)) {
             throw new ConcurrentEditionException();
@@ -342,11 +364,12 @@ class PollService {
      * This method checks if the votes doesn't conflicts the maximum votes constraint
      *
      * @param $user_choice
-     * @param \stdClass $poll
+     * @param stdClass $poll
      * @param string $poll_id
      * @throws ConcurrentVoteException
      */
-    private function checkMaxVotes($user_choice, $poll, $poll_id) {
+    private function checkMaxVotes(array $user_choice, $poll, string $poll_id): void
+    {
         $votes = $this->allVotesByPollId($poll_id);
         if (count($votes) <= 0) {
             return;

app/classes/Framadate/Services/PurgeService.php

@@ -15,7 +15,7 @@ class PurgeService {
     private $voteRepository;
     private $commentRepository;
 
-    function __construct(FramaDB $connect, LogService $logService) {
+    public function __construct(LogService $logService) {
         $this->logService = $logService;
         $this->pollRepository = RepositoryFactory::pollRepository();
         $this->slotRepository = RepositoryFactory::slotRepository();
@@ -26,9 +26,10 @@ class PurgeService {
     /**
      * This methode purges all old polls (the ones with end_date in past).
      *
-     * @return bool true is action succeeded
+     * @return int number of purged polls
      */
-    function purgeOldPolls() {
+    public function purgeOldPolls(): int
+    {
         $oldPolls = $this->pollRepository->findOldPolls();
         $count = count($oldPolls);
 
@@ -50,10 +51,11 @@ class PurgeService {
     /**
      * This methode delete all data about a poll.
      *
-     * @param $poll_id int The ID of the poll
+     * @param string $poll_id The ID of the poll
      * @return bool true is action succeeded
      */
-    function purgePollById($poll_id) {
+    public function purgePollById(string $poll_id): bool
+    {
         $done = true;
 
         $this->pollRepository->beginTransaction();
@@ -71,4 +73,3 @@ class PurgeService {
         return $done;
     }
 }
- 

app/classes/Framadate/Services/SecurityService.php

@@ -5,7 +5,7 @@ use Framadate\Security\PasswordHasher;
 use Framadate\Security\Token;
 
 class SecurityService {
-    function __construct() {
+    public function __construct() {
     }
 
     /**
@@ -18,9 +18,10 @@ class SecurityService {
      * </ul>
      *
      * @param $tokan_name string The name of the CSRF token
-     * @return Token The token
+     * @return string The token
      */
-    function getToken($tokan_name) {
+    function getToken(string $tokan_name): string
+    {
         if (!isset($_SESSION['tokens'])) {
             $_SESSION['tokens'] = [];
         }
@@ -38,7 +39,8 @@ class SecurityService {
      * @param $csrf string Value to check
      * @return bool true if the token is well checked
      */
-    public function checkCsrf($tokan_name, $csrf) {
+    public function checkCsrf(string $tokan_name, string $csrf): bool
+    {
         $checked = $_SESSION['tokens'][$tokan_name]->getValue() === $csrf;
 
         if($checked) {
@@ -54,17 +56,18 @@ class SecurityService {
      * @param $poll \stdClass The poll which we seek access
      * @return bool true if the current session can access this poll
      */
-    public function canAccessPoll($poll) {
+    public function canAccessPoll($poll): bool
+    {
         if (is_null($poll->password_hash)) {
             return true;
         }
 
         $this->ensureSessionPollSecurityIsCreated();
 
-        $currentPassword = isset($_SESSION['poll_security'][$poll->id]) ? $_SESSION['poll_security'][$poll->id] : null;
+        $currentPassword = $_SESSION['poll_security'][$poll->id] ?? null;
         if (!empty($currentPassword) && PasswordHasher::verify($currentPassword, $poll->password_hash)) {
             return true;
-        }  
+        }
             unset($_SESSION['poll_security'][$poll->id]);
             return false;
     }
@@ -75,17 +78,18 @@ class SecurityService {
      * @param $poll \stdClass The poll which we seek access
      * @param $password string the password to compare
      */
-    public function submitPollAccess($poll, $password) {
+    public function submitPollAccess($poll, string $password): void
+    {
         if (!empty($password)) {
             $this->ensureSessionPollSecurityIsCreated();
             $_SESSION['poll_security'][$poll->id] = $password;
         }
     }
 
-    private function ensureSessionPollSecurityIsCreated() {
+    private function ensureSessionPollSecurityIsCreated(): void
+    {
         if (!isset($_SESSION['poll_security'])) {
             $_SESSION['poll_security'] = [];
         }
     }
 }
- 

app/classes/Framadate/Services/SessionService.php

@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Framadate\Services;
 
 class SessionService {
@@ -18,12 +17,7 @@ class SessionService {
 
         $this->initSectionIfNeeded($section);
 
-        $returnValue = $defaultValue;
-        if (isset($_SESSION[$section][$key])) {
-            $returnValue = $_SESSION[$section][$key];
-        }
-
-        return $returnValue;
+        return $_SESSION[$section][$key] ?? $defaultValue;
     }
 
     /**
@@ -33,7 +27,8 @@ class SessionService {
      * @param $key
      * @param $value
      */
-    public function set($section, $key, $value) {
+    public function set($section, $key, $value): void
+    {
         assert(!empty($key));
         assert(!empty($section));
 
@@ -48,16 +43,18 @@ class SessionService {
      * @param $section
      * @param $key
      */
-    public function remove($section, $key) {
+    public function remove($section, $key): void
+    {
         assert(!empty($key));
         assert(!empty($section));
 
         unset($_SESSION[$section][$key]);
     }
 
-    private function initSectionIfNeeded($section) {
+    private function initSectionIfNeeded($section): void
+    {
         if (!isset($_SESSION[$section])) {
             $_SESSION[$section] = [];
         }
     }
-} 
+}

app/classes/Framadate/Services/SuperAdminService.php

@@ -11,7 +11,7 @@ use Framadate\Repositories\RepositoryFactory;
 class SuperAdminService {
     private $pollRepository;
 
-    function __construct() {
+    public function __construct() {
         $this->pollRepository = RepositoryFactory::pollRepository();
     }
 
@@ -23,7 +23,8 @@ class SuperAdminService {
      * @param int $limit The limit size
      * @return array ['polls' => The {$limit} polls, 'count' => Entries found by the query, 'total' => Total count]
      */
-    public function findAllPolls($search, $page, $limit) {
+    public function findAllPolls(array $search, int $page, int $limit): array
+    {
         $start = $page * $limit;
         $polls = $this->pollRepository->findAll($search, $start, $limit);
         $count = $this->pollRepository->count($search);
@@ -32,4 +33,3 @@ class SuperAdminService {
         return ['polls' => $polls, 'count' => $count, 'total' => $total];
     }
 }
- 

app/classes/Framadate/Utils.php

@@ -24,13 +24,13 @@ class Utils {
     /**
      * @return string Server name
      */
-    public static function get_server_name() {
+    public static function get_server_name(): string
+    {
         $scheme = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')) ? 'https' : 'http';
         $port = in_array($_SERVER['SERVER_PORT'], ['80', '443'], true) ? '' : ':' . $_SERVER['SERVER_PORT'];
         $dirname = dirname($_SERVER['SCRIPT_NAME']);
         $dirname = $dirname === '\\' ? '/' : $dirname . '/';
-        $dirname = str_replace('/admin', '', $dirname);
-        $dirname = str_replace('/action', '', $dirname);
+        $dirname = str_replace(['/admin', '/action'], '', $dirname);
         $server_name = (defined('APP_URL') ? APP_URL : $_SERVER['SERVER_NAME']) . $port . $dirname;
 
         return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
@@ -38,9 +38,10 @@ class Utils {
 
     /**
      * @param string $title
+     *
      * @deprecated
      */
-    public static function print_header($title = '') {
+    public static function print_header($title = ''): void {
         global $locale;
 
         echo '<!DOCTYPE html>
@@ -60,17 +61,17 @@ class Utils {
         <link rel="stylesheet" href="' . self::get_server_name() . 'css/style.css" />
         <link rel="stylesheet" href="' . self::get_server_name() . 'css/frama.css" />
         <link rel="stylesheet" href="' . self::get_server_name() . 'css/print.css" media="print" />
-        <script type="text/javascript" src="' . self::get_server_name() . 'js/jquery-1.12.4.min.js"></script>
-        <script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap.min.js"></script>
-        <script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap-datepicker.js"></script>';
+        <script src="' . self::get_server_name() . 'js/jquery-3.6.0.min.js"></script>
+        <script src="' . self::get_server_name() . 'js/bootstrap.min.js"></script>
+        <script src="' . self::get_server_name() . 'js/bootstrap-datepicker.js"></script>';
         if ('en' !== $locale) {
         	   echo '
-        <script type="text/javascript" src="' . self::get_server_name() . 'js/locales/bootstrap-datepicker.' . $locale . '.js"></script>';
+        <script src="' . self::get_server_name() . 'js/locales/bootstrap-datepicker.' . $locale . '.js"></script>';
         }
         echo '
-        <script type="text/javascript" src="' . self::get_server_name() . 'js/core.js"></script>';
+        <script src="' . self::get_server_name() . 'js/core.js"></script>';
         if (is_file($_SERVER['DOCUMENT_ROOT'] . "/nav/nav.js")) {
-            echo '<script src="/nav/nav.js" id="nav_js" type="text/javascript" charset="utf-8"></script><!-- /Framanav -->';
+            echo '<script src="/nav/nav.js" id="nav_js" charset="utf-8"></script><!-- /Framanav -->';
         }
 
         echo '
@@ -81,16 +82,17 @@ class Utils {
 
     /**
      * Function allowing to generate poll's url
-     * @param   string $id The poll's id
-     * @param   bool $admin True to generate an admin URL, false for a public one
-     * @param   string $vote_id (optional) The vote's unique id
-     * @param null $action
-     * @param null $action_value
-     * @return  string The poll's URL.
+     * @param string $id The poll's id
+     * @param bool $admin True to generate an admin URL, false for a public one
+     * @param string $vote_id (optional) The vote's unique id
+     * @param string|null $action
+     * @param string|null $action_value
+     * @return string The poll's URL.
      */
-    public static function getUrlSondage($id, $admin = false, $vote_id = '', $action = null, $action_value = null) {
+    public static function getUrlSondage(string $id, bool $admin = false, string $vote_id = '', string $action = null, string $action_value = null): string
+    {
         // URL-Encode $action_value
-        $action_value = $action_value ? Utils::base64url_encode($action_value) : null;
+        $action_value = $action_value ? self::base64url_encode($action_value) : null;
 
         if (URL_PROPRE) {
             if ($admin === true) {
@@ -132,17 +134,20 @@ class Utils {
      *
      * @param mixed $object The object to print.
      */
-    public static function debug($object) {
+    public static function debug($object): void
+    {
         echo '<pre>';
         print_r($object);
         echo '</pre>';
     }
 
-    public static function table($tableName) {
+    public static function table(string $tableName): string
+    {
         return TABLENAME_PREFIX . $tableName;
     }
 
-    public static function markdown($md, $clear=false, $line=true) {
+    public static function markdown(string $md, bool $clear=false, bool $line=true): string
+    {
         $parseDown = new Parsedown();
 
         $parseDown
@@ -155,7 +160,7 @@ class Utils {
         } else {
             $md = preg_replace_callback(
                 '#( ){2,}#',
-                function ($m) {
+                static function ($m) {
                     return str_repeat('&nbsp;', strlen($m[0]));
                 },
                 $md
@@ -168,39 +173,38 @@ class Utils {
         return $clear ? $text : $html;
     }
 
-    public static function htmlEscape($html) {
+    public static function htmlEscape(string $html): string {
         return htmlentities($html, ENT_HTML5 | ENT_QUOTES);
     }
 
-    public static function htmlMailEscape($html) {
+    public static function htmlMailEscape(string $html): string
+    {
         return htmlspecialchars($html, ENT_HTML5 | ENT_QUOTES);
     }
 
-    public static function csvEscape($text) {
-        $escaped = str_replace('"', '""', $text);
-        $escaped = str_replace("\r\n", '', $escaped);
-        $escaped = str_replace("\n", '', $escaped);
+    public static function csvEscape(string $text): string
+    {
+        $escaped = str_replace(['"', "\r\n", "\n"], ['""', '', ''], $text);
         $escaped = preg_replace("/^(=|\+|\-|\@)/", "'$1", $escaped);
 
         return '"' . $escaped . '"';
     }
 
-    public static function cleanFilename($title) {
+    public static function cleanFilename(string $title): string {
         $cleaned = preg_replace('[^a-zA-Z0-9._-]', '_', $title);
-        $cleaned = preg_replace(' {2,}', ' ', $cleaned);
-
-        return $cleaned;
+        return preg_replace(' {2,}', ' ', $cleaned);
     }
 
-    public static function fromPostOrDefault($postKey, $default = '') {
+    public static function fromPostOrDefault(string $postKey, ?string $default = '') {
         return !empty($_POST[$postKey]) ? $_POST[$postKey] : $default;
     }
 
-    public static function base64url_encode($input) {
+    public static function base64url_encode(string $input): string
+    {
         return rtrim(strtr(base64_encode($input), '+/', '-_'), '=');
     }
 
-    public static function base64url_decode($input) {
+    public static function base64url_decode(string $input): string {
         return base64_decode(str_pad(strtr($input, '-_', '+/'), strlen($input) % 4, '=', STR_PAD_RIGHT), true);
     }
 }

app/inc/constants.php

@@ -18,10 +18,10 @@
  */
 
 // FRAMADATE version
-const VERSION = '1.1.7';
+const VERSION = '1.1.19';
 
 // PHP Needed version
-const PHP_NEEDED_VERSION = '5.6';
+const PHP_NEEDED_VERSION = '7.3';
 
 // Config constants
 const COMPILE_DIR = '/tpl_c/';
@@ -42,3 +42,6 @@ const SESSION_EDIT_LINK_TIME = "EditLinkMail";
 
 // CSRF (300s = 5min)
 const TOKEN_TIME = 300;
+
+const ICAL_ENDING = ".ics";
+const ICAL_PRODID = "-//Framasoft//Framadate//EN";

app/inc/i18n.php

@@ -18,12 +18,14 @@
  */
 
 // Prepare I18N instance
-$i18n = \o80\i18n\I18N::instance();
+use o80\i18n\I18N;
+
+$i18n = I18N::instance();
 $i18n->setDefaultLang(DEFAULT_LANGUAGE);
 $i18n->setPath(__DIR__ . '/../../locale');
 
-// Change langauge when user asked for it
-if (isset($_POST['lang']) && is_string($_POST['lang']) && in_array($_POST['lang'], array_keys($ALLOWED_LANGUAGES), true)) {
+// Change language when user asked for it
+if (isset($_POST['lang']) && is_string($_POST['lang']) && array_key_exists($_POST['lang'], $ALLOWED_LANGUAGES)) {
     $_SESSION['lang'] = $_POST['lang'];
 }
 
@@ -38,7 +40,7 @@ $date_format['txt_day'] = __('Date', 'DAY');
 $date_format['txt_date'] = __('Date', 'DATE');
 $date_format['txt_month_year'] = __('Date', 'MONTH_YEAR');
 $date_format['txt_datetime_short'] = __('Date', 'DATETIME');
-if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { //%e can't be used on Windows platform, use %#d instead
+if (PHP_OS_FAMILY === 'Windows') { //%e can't be used on Windows platform, use %#d instead
     foreach ($date_format as $k => $v) {
         $date_format[$k] = preg_replace('#(?<!%)((?:%%)*)%e#', '\1%#d', $v); //replace %e by %#d for windows
     }

app/inc/init.php

@@ -18,6 +18,7 @@
  */
 use Framadate\FramaDB;
 use Framadate\Repositories\RepositoryFactory;
+use Framadate\Utils;
 
 // Autoloading of dependencies with Composer
 require_once __DIR__ . '/../../vendor/autoload.php';
@@ -39,10 +40,17 @@ require_once __DIR__ . '/constants.php';
 if (is_file(CONF_FILENAME)) {
     @include_once __DIR__ . '/config.php';
 
-    // Connection to database
-    $connect = new FramaDB(DB_CONNECTION_STRING, DB_USER, DB_PASSWORD);
-    RepositoryFactory::init($connect);
-    $err = 0;
+    try {
+        // Connection to database
+        $connect = new FramaDB(DB_CONNECTION_STRING, DB_USER, DB_PASSWORD);
+        RepositoryFactory::init($connect);
+    } catch (PDOException $e) {
+        if ($_SERVER['SCRIPT_NAME'] !== '/maintenance.php') {
+            header(('Location: ' . Utils::get_server_name() . 'maintenance.php'));
+            exit;
+        }
+        $error = $e->getMessage();
+    }
 } else {
     define('NOMAPPLICATION', 'Framadate');
     define('DEFAULT_LANGUAGE', 'fr');
@@ -55,6 +63,7 @@ if (is_file(CONF_FILENAME)) {
         'de' => 'Deutsch',
         'it' => 'Italiano',
         'br' => 'Brezhoneg',
+        'ca' => 'Català'
     ];
 }
 

app/inc/smarty.php

@@ -50,9 +50,10 @@ if (isset($_SERVER['FRAMADATE_DEVMODE']) && $_SERVER['FRAMADATE_DEVMODE']) {
     $smarty->compile_check = false;
 }
 
-function smarty_function_poll_url($params, Smarty_Internal_Template $template) {
+function smarty_function_poll_url($params, Smarty_Internal_Template $template): string
+{
     $poll_id =  filter_var($params['id'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
-    $admin =  (isset($params['admin']) && $params['admin']) ? true : false;
+    $admin = isset($params['admin']) && $params['admin'];
     $action =  (isset($params['action']) && !empty($params['action'])) ? Utils::htmlEscape($params['action']) : false;
     $action_value = (isset($params['action_value']) && !empty($params['action_value'])) ? $params['action_value'] : false;
     $vote_unique_id = isset($params['vote_id']) ? filter_var($params['vote_id'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]) : '';
@@ -62,26 +63,40 @@ function smarty_function_poll_url($params, Smarty_Internal_Template $template) {
     return Utils::getUrlSondage($poll_id, $admin, $vote_unique_id, $action, $action_value);
 }
 
-function smarty_modifier_markdown($md, $clear = false, $inline=true) {
+function smarty_modifier_markdown(string $md, bool $clear = false, bool $inline=true): string
+{
     return Utils::markdown($md, $clear, $inline);
 }
 
-function smarty_modifier_resource($link) {
+function smarty_modifier_resource(string $link): string
+{
     return Utils::get_server_name() . $link;
 }
-function smarty_modifier_addslashes_single_quote($string) {
+function smarty_modifier_addslashes_single_quote(string $string): string
+{
     return addcslashes($string, '\\\'');
 }
 
-function smarty_modifier_html($html) {
+function smarty_modifier_addslashes(string $string): string
+{
+    return addslashes($string);
+}
+
+function smarty_modifier_html(?string $html): string
+{
+    if (!$html) {
+        return '';
+    }
     return Utils::htmlEscape($html);
 }
 
-function smarty_modifier_html_special_chars($html) {
+function smarty_modifier_html_special_chars(string $html): string
+{
     return Utils::htmlMailEscape($html);
 }
 
-function smarty_modifier_datepicker_path($lang) {
+function smarty_modifier_datepicker_path(string $lang): string
+{
     $i = 0;
     while (!is_file(path_for_datepicker_locale($lang)) && $i < 3) {
         $lang_arr = explode('-', $lang);
@@ -90,12 +105,13 @@ function smarty_modifier_datepicker_path($lang) {
         } else {
             $lang = 'en';
         }
-        $i += 1;
+        ++$i;
     }
     return 'js/locales/bootstrap-datepicker.' . $lang . '.js';
 }
 
-function smarty_modifier_locale_2_lang($locale) {
+function smarty_modifier_locale_2_lang(string $locale): string
+{
     $lang_arr = explode('-', $locale);
     if ($lang_arr && count($lang_arr) > 1) {
         return $lang_arr[0];
@@ -103,6 +119,10 @@ function smarty_modifier_locale_2_lang($locale) {
     return $locale;
 }
 
-function path_for_datepicker_locale($lang) {
+function path_for_datepicker_locale(string $lang): string
+{
     return __DIR__ . '/../../js/locales/bootstrap-datepicker.' . $lang . '.js';
 }
+
+# Customization #4871 par Didier le 28/08/2021.
+$smarty->assign('VERSION',VERSION);

app/tests/Framadate/FramaTestCase.php

@@ -4,11 +4,12 @@ namespace Framadate;
 use PHPUnit\Framework\TestCase;
 
 abstract class FramaTestCase extends TestCase {
-    protected function getTestResourcePath($resourcepath) {
+    protected function getTestResourcePath(string $resourcepath): string
+    {
         return __DIR__ . '/../resources/' . $resourcepath;
     }
 
-    protected function readTestResource($resourcepath) {
+    protected function readTestResource(string $resourcepath) {
         return file_get_contents($this->getTestResourcePath($resourcepath));
     }
 

app/tests/Framadate/Services/InputServiceUnitTest.php

@@ -5,7 +5,8 @@ use Framadate\FramaTestCase;
 
 class InputServiceUnitTest extends FramaTestCase
 {
-    public function liste_emails() {
+    public function liste_emails(): array
+    {
         return [
             // valids addresses
             "valid address" 		=> ["example@example.com", "example@example.com"],
@@ -23,7 +24,8 @@ class InputServiceUnitTest extends FramaTestCase
 	/**
 	 * @dataProvider liste_emails
 	 */
-	public function test_filterMail($email, $expected) {
+	public function test_filterMail($email, $expected): void
+    {
 		$inputService = new InputService();
 		$filtered = $inputService->filterMail($email);
 

app/tests/Framadate/Services/MailServiceUnitTest.php

@@ -4,9 +4,10 @@ namespace Framadate\Services;
 use Framadate\FramaTestCase;
 
 class MailServiceUnitTest extends FramaTestCase {
-    const MSG_KEY = '666';
+    public const MSG_KEY = '666';
 
-    public function test_should_send_a_2nd_mail_after_a_good_interval() {
+    public function test_should_send_a_2nd_mail_after_a_good_interval(): void
+    {
         // Given
         $mailService = new MailService(true);
         $_SESSION[MailService::MAILSERVICE_KEY] = [self::MSG_KEY => time() - 1000];
@@ -15,10 +16,11 @@ class MailServiceUnitTest extends FramaTestCase {
         $canSendMsg = $mailService->canSendMsg(self::MSG_KEY);
 
         // Then
-        $this->assertSame(true, $canSendMsg);
+        $this->assertTrue($canSendMsg);
     }
 
-    public function test_should_not_send_2_mails_in_a_short_interval() {
+    public function test_should_not_send_2_mails_in_a_short_interval(): void
+    {
         // Given
         $mailService = new MailService(true);
         $_SESSION[MailService::MAILSERVICE_KEY] = [self::MSG_KEY => time()];
@@ -27,6 +29,6 @@ class MailServiceUnitTest extends FramaTestCase {
         $canSendMsg = $mailService->canSendMsg(self::MSG_KEY);
 
         // Then
-        $this->assertSame(false, $canSendMsg);
+        $this->assertFalse($canSendMsg);
     }
 }

bandeaux.php

@@ -28,7 +28,7 @@ function bandeau_titre($titre)
     echo '
     <header role="banner">';
     if(count($ALLOWED_LANGUAGES) > 1){
-        echo '<form method="post" action="" class="hidden-print">
+        echo '<form method="post" class="hidden-print">
             <div class="input-group input-group-sm pull-right col-md-2 col-xs-4">
                 <select name="lang" class="form-control" title="' . __('Language selector', 'Select the language') . '" >' . liste_lang() . '</select>
                 <span class="input-group-btn">
@@ -43,7 +43,7 @@ function bandeau_titre($titre)
         <hr class="trait" role="presentation" />
     </header>
     <main role="main">';
-    
+
     global $connect;
     $tables = $connect->allTables();
     $diff = array_diff([Utils::table('comment'), Utils::table('poll'), Utils::table('slot'), Utils::table('vote')], $tables);
@@ -54,14 +54,14 @@ function bandeau_titre($titre)
     }
 }
 
-function liste_lang()
+function liste_lang(): string
 {
     global $ALLOWED_LANGUAGES; global $locale;
 
     $str = '';
 
     foreach ($ALLOWED_LANGUAGES as $k => $v ) {
-        if (substr($k,0,2)===$locale) {
+        if (strpos($k, $locale) === 0) {
             $str .= '<option lang="' . substr($k,0,2) . '" selected value="' . $k . '">' . $v . '</option>' . "\n" ;
         } else {
             $str .= '<option lang="' . substr($k,0,2) . '" value="' . $k . '">' . $v . '</option>' . "\n" ;

buildlang.php

@@ -10,8 +10,8 @@ include_once __DIR__ . '/app/inc/init.php';
     $goodLang = $_GET['good'];
     $otherLang = $_GET['other'];
 
-    $good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.json'), true);
-    $other = json_decode(file_get_contents(__DIR__ . '/locale/' . $otherLang . '.json'), true);
+    $good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.json'), true, 512, JSON_THROW_ON_ERROR);
+    $other = json_decode(file_get_contents(__DIR__ . '/locale/' . $otherLang . '.json'), true, 512, JSON_THROW_ON_ERROR);
 
     foreach ($good as $sectionName => $section) {
         foreach ($section as $key => $value) {
@@ -19,15 +19,15 @@ include_once __DIR__ . '/app/inc/init.php';
         }
     }
 
-    echo json_encode($good, JSON_PRETTY_PRINT | ~(JSON_ERROR_UTF8 | JSON_HEX_QUOT | JSON_HEX_APOS));
+    echo json_encode($good, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT | ~(JSON_ERROR_UTF8 | JSON_HEX_QUOT | JSON_HEX_APOS));
 
-    function getFromOther($other, $goodKey, $default, $otherLang) {
+    function getFromOther($other, $goodKey, $default, $otherLang): string {
         foreach ($other as $sectionName => $section) {
             foreach ($section as $key => $value) {
                 if (
                     strtolower($key) === strtolower($goodKey) ||
+                    stripos($key, strtolower($goodKey)) === 0 ||
                     strtolower(trim($key)) === strtolower($goodKey) ||
-                    strtolower(substr($key, 0, strlen($key) - 1)) === strtolower($goodKey) ||
                     strtolower(trim(substr(trim($key), 0, strlen($key) - 1))) === strtolower($goodKey)
                 ) {
                     return $value;

compare.php

@@ -10,8 +10,8 @@ include_once __DIR__ . '/app/inc/init.php';
     $goodLang = $_GET['good'];
     $testLang = $_GET['test'];
 
-    $good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.json'), true);
-    $test = json_decode(file_get_contents(__DIR__ . '/locale/' . $testLang . '.json'), true);
+    $good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.json'), true, 512, JSON_THROW_ON_ERROR);
+    $test = json_decode(file_get_contents(__DIR__ . '/locale/' . $testLang . '.json'), true, 512, JSON_THROW_ON_ERROR);
 
     $diffSection = false;
 
@@ -46,8 +46,8 @@ include_once __DIR__ . '/app/inc/init.php';
             }
         }
 
-        if (!$diffSection and array_keys($good[$sectionName]) !== array_keys($test[$sectionName])) {
-            $diff[$sectionName]['order_good'] = array_keys($good[$sectionName]);
+        if (!$diffSection and array_keys($section) !== array_keys($test[$sectionName])) {
+            $diff[$sectionName]['order_good'] = array_keys($section);
             $diff[$sectionName]['order_test'] = array_keys($test[$sectionName]);
         }
     }

composer.json

@@ -2,10 +2,12 @@
     "name": "framasoft/framadate",
     "description": "Application to facilitate the schedule of events or classic polls",
     "homepage": "https://framadate.org/",
-    "keywords": ["poll", "framadate"],
+    "keywords": [
+        "poll",
+        "framadate"
+    ],
     "version": "0.9.0",
     "license": "CECILL-B",
-
     "type": "project",
     "support": {
         "issues": "https://framagit.org/framasoft/framadate/issues"
@@ -52,33 +54,43 @@
             "email": "raphael.droz@gmail.com"
         }
     ],
-
+    "scripts": {
+        "cs:check": "php-cs-fixer fix --dry-run --diff",
+        "cs:fix": "php-cs-fixer fix",
+        "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -not -path './tests/integration/vendor/*' -print0 | xargs -0 -n1 php -l"
+    },
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.3.0",
         "ext-pdo": "*",
-        "smarty/smarty": "^3.1",
+        "ext-json": "*",
+        "smarty/smarty": "^4.0",
         "o80/i18n": "dev-develop",
-        "phpmailer/phpmailer": "~6.0",
+        "phpmailer/phpmailer": "~6.2",
         "ircmaxell/password-compat": "dev-master",
         "roave/security-advisories": "dev-master",
         "erusev/parsedown": "^1.7",
-        "egulias/email-validator": "~2.1"
+        "egulias/email-validator": "^3.1",
+        "sabre/vobject": "~4.1"
     },
-
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "friendsofphp/php-cs-fixer": "~2.0"
+        "phpunit/phpunit": "^9",
+        "friendsofphp/php-cs-fixer": "^3.2",
+        "vimeo/psalm": "^4.15"
     },
-
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://framagit.org/framasoft/framadate/o80-i18n"
+        }
+    ],
     "autoload": {
         "psr-4": {
             "Framadate\\": "app/classes/Framadate/"
         }
     },
-
     "config": {
         "platform": {
-            "php": "5.6.0"
+            "php": "7.3.0"
         }
     }
 }

create_classic_poll.php

@@ -17,6 +17,7 @@
  * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
  */
 use Framadate\Choice;
+use Framadate\Services\InputService;
 use Framadate\Services\LogService;
 use Framadate\Services\MailService;
 use Framadate\Services\PollService;
@@ -29,10 +30,11 @@ include_once __DIR__ . '/app/inc/init.php';
 /* Service */
 /*---------*/
 $logService = new LogService();
-$pollService = new PollService($connect, $logService);
+$pollService = new PollService($logService);
 $mailService = new MailService($config['use_smtp'], $config['smtp_options']);
-$purgeService = new PurgeService($connect, $logService);
+$purgeService = new PurgeService($logService);
 $sessionService = new SessionService();
+$inputService = new InputService();
 
 if (is_file('bandeaux_local.php')) {
     include_once('bandeaux_local.php');
@@ -40,51 +42,33 @@ if (is_file('bandeaux_local.php')) {
     include_once('bandeaux.php');
 }
 
+$form = unserialize($_SESSION['form']);
+
 // Step 1/4 : error if $_SESSION from info_sondage are not valid
-if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (($config['use_smtp']) ? empty($_SESSION['form']->admin_mail) : false)) {
+if (empty($form->title) || empty($form->admin_name) || ($config['use_smtp'] && empty($form->admin_mail))) {
     $smarty->assign('title', __('Error', 'Error!'));
     $smarty->assign('error', __('Error', 'You haven\'t filled the first section of the poll creation.'));
     $smarty->display('error.tpl');
     exit;
 }
-    // Min/Max archive date
-    $min_expiry_time = $pollService->minExpiryDate();
-    $max_expiry_time = $pollService->maxExpiryDate();
-
-    // The poll format is AUTRE (other)
-    if ($_SESSION['form']->format !== 'A') {
-        $_SESSION['form']->format = 'A';
-        $_SESSION['form']->clearChoices();
+    // The poll format is other (A) if we are in this file
+    if (!isset($form->format)) {
+        $form->format = 'A';
+    }
+    // If we come from another format, we need to clear choices
+    if (isset($form->format) && $form->format !== 'A') {
+        $form->format = 'A';
+        $form->clearChoices();
     }
 
     // Step 4 : Data prepare before insert in DB
     if (isset($_POST['confirmation'])) {
         // Define expiration date
-        $enddate = filter_input(INPUT_POST, 'enddate', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '#^[0-9]{2}/[0-9]{2}/[0-9]{4}$#']]);
-
-        if (!empty($enddate)) {
-            $registredate = explode('/', $enddate);
-
-            if (is_array($registredate) && count($registredate) === 3) {
-                $time = mktime(0, 0, 0, $registredate[1], $registredate[0], $registredate[2]);
-
-                if ($time < $min_expiry_time) {
-                    $_SESSION['form']->end_date = $min_expiry_time;
-                } elseif ($max_expiry_time < $time) {
-                    $_SESSION['form']->end_date = $max_expiry_time;
-                } else {
-                    $_SESSION['form']->end_date = $time;
-                }
-            }
-        }
-
-        if (empty($_SESSION['form']->end_date)) {
-            // By default, expiration date is 6 months after last day
-            $_SESSION['form']->end_date = $max_expiry_time;
-        }
+        $expiration_date = $inputService->parseDate($_POST['enddate']);
+        $form->end_date = $inputService->validateDate($expiration_date, $pollService->minExpiryDate(), $pollService->maxExpiryDate())->getTimestamp();
 
         // Insert poll in database
-        $ids = $pollService->createPoll($_SESSION['form']);
+        $ids = $pollService->createPoll($form);
         $poll_id = $ids[0];
         $admin_poll_id = $ids[1];
 
@@ -92,15 +76,15 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
         if ($config['use_smtp'] === true) {
             $message = __('Mail', "This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.");
             $message .= '<br/><br/>';
-            $message .= Utils::htmlMailEscape($_SESSION['form']->admin_name) . ' ' . __('Mail', 'hast just created a poll called') . ' : "' . Utils::htmlMailEscape($_SESSION['form']->title) . '".<br/>';
+            $message .= Utils::htmlMailEscape($form->admin_name) . ' ' . __('Mail', 'hast just created a poll called') . ' : "' . Utils::htmlMailEscape($form->title) . '".<br/>';
             $message .= sprintf(__('Mail', 'Thanks for filling the poll at the link above') . ' :<br/><br/><a href="%1$s">%1$s</a>', Utils::getUrlSondage($poll_id));
 
             $message_admin = __('Mail', "This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above");
             $message_admin .= sprintf(' :<br/><br/><a href="%1$s">%1$s</a>', Utils::getUrlSondage($admin_poll_id, true));
 
-            if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) {
-                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . $_SESSION['form']->title, $message_admin);
-                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . $_SESSION['form']->title, $message);
+            if ($mailService->isValidEmail($form->admin_mail)) {
+                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message_admin);
+                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message);
             }
         }
 
@@ -112,7 +96,7 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
 
         // creation message
         $sessionService->set("Framadate", "messagePollCreated", TRUE);
-        
+
         // Redirect to poll administration
         header('Location:' . Utils::getUrlSondage($admin_poll_id, true));
         exit;
@@ -120,26 +104,26 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
     else if (isset($_POST['fin_sondage_autre'])) {
         // Store choices in $_SESSION
         if (isset($_POST['choices'])) {
-            $_SESSION['form']->clearChoices();
+            $form->clearChoices();
             foreach ($_POST['choices'] as $c) {
                 if (!empty($c)) {
                     $c = strip_tags($c);
                     $choice = new Choice($c);
-                    $_SESSION['form']->addChoice($choice);
+                    $form->addChoice($choice);
                 }
             }
         }
 
         // Expiration date is initialised with config parameter. Value will be modified in step 4 if user has defined an other date
-        $_SESSION['form']->end_date = $max_expiry_time;
+        $form->end_date = $pollService->maxExpiryDate()->format('Y-m-d H:i:s');
 
         // Summary
         $summary = '<ol>';
-        foreach ($_SESSION['form']->getChoices() as $i=>$choice) {
+        foreach ($form->getChoices() as $i=>$choice) {
             preg_match_all('/\[!\[(.*?)\]\((.*?)\)\]\((.*?)\)/', $choice->getName(), $md_a_img); // Markdown [![alt](src)](href)
             preg_match_all('/!\[(.*?)\]\((.*?)\)/', $choice->getName(), $md_img); // Markdown ![alt](src)
             preg_match_all('/\[(.*?)\]\((.*?)\)/', $choice->getName(), $md_a); // Markdown [text](href)
-            if (isset($md_a_img[2][0]) && $md_a_img[2][0] !== '' && isset($md_a_img[3][0]) && $md_a_img[3][0] !== '') { // [![alt](src)](href)
+            if (isset($md_a_img[2][0], $md_a_img[3][0]) && $md_a_img[2][0] !== '' && $md_a_img[3][0] !== '') { // [![alt](src)](href)
                 $li_subject_text = (isset($md_a_img[1][0]) && $md_a_img[1][0] !== '') ? stripslashes($md_a_img[1][0]) : __('Generic', 'Choice') . ' ' . ($i + 1);
                 $li_subject_html = '<a href="' . $md_a_img[3][0] . '"><img src="' . $md_a_img[2][0] . '" class="img-responsive" alt="' . $li_subject_text . '" /></a>';
             } elseif (isset($md_img[2][0]) && $md_img[2][0] !== '') { // ![alt](src)
@@ -157,7 +141,9 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
         }
         $summary .= '</ol>';
 
-        $end_date_str = utf8_encode(strftime($date_format['txt_date'], $max_expiry_time)); //textual date
+        $end_date_str = utf8_encode(strftime($date_format['txt_date'], $pollService->maxExpiryDate()->getTimestamp())); //textual date
+
+        $_SESSION['form'] = serialize($form);
 
         $smarty->assign('title', __('Step 3', 'Removal date and confirmation (3 on 3)'));
         $smarty->assign('summary', $summary);
@@ -173,7 +159,7 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
         bandeau_titre(__('Step 2 classic', 'Poll subjects (2 on 3)'));
 
         echo '
-    <form name="formulaire" action="' . Utils::get_server_name() . 'create_classic_poll.php" method="POST" class="form-horizontal" role="form">
+    <form name="formulaire" action="' . Utils::get_server_name() . 'create_classic_poll.php" method="POST" class="form-horizontal">
     <div class="row">
         <div class="col-md-8 col-md-offset-2">';
         echo '
@@ -186,10 +172,10 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
         echo '    </div>' . "\n";
 
         // Fields choices : 5 by default
-        $choices = $_SESSION['form']->getChoices();
+        $choices = $form->getChoices();
         $nb_choices = max(count($choices), 5);
         for ($i = 0; $i < $nb_choices; $i++) {
-            $choice = isset($choices[$i]) ? $choices[$i] : new Choice();
+            $choice = $choices[$i] ?? new Choice();
             echo '
             <div class="form-group choice-field">
                 <label for="choice' . $i . '" class="col-sm-2 control-label">' . __('Generic', 'Choice') . ' ' . ($i + 1) . '</label>
@@ -247,10 +233,9 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
     </div>
     </form>
 
-    <script type="text/javascript" src="js/app/framadatepicker.js"></script>
-    <script type="text/javascript" src="js/app/classic_poll.js"></script>
+    <script src="js/app/framadatepicker.js"></script>
+    <script src="js/app/classic_poll.js"></script>
     ' . "\n";
 
         bandeau_pied();
     }
-

create_date_poll.php

@@ -30,9 +30,9 @@ include_once __DIR__ . '/app/inc/init.php';
 /* Service */
 /*---------*/
 $logService = new LogService();
-$pollService = new PollService($connect, $logService);
+$pollService = new PollService($logService);
 $mailService = new MailService($config['use_smtp'], $config['smtp_options']);
-$purgeService = new PurgeService($connect, $logService);
+$purgeService = new PurgeService($logService);
 $inputService = new InputService();
 $sessionService = new SessionService();
 
@@ -40,21 +40,23 @@ if (is_readable('bandeaux_local.php')) {
     include_once('bandeaux_local.php');
 }
 
-// Min/Max archive date
-$min_expiry_time = $pollService->minExpiryDate();
-$max_expiry_time = $pollService->maxExpiryDate();
+$form = unserialize($_SESSION['form']);
 
-// The poll format is DATE
-if ($_SESSION['form']->format !== 'D') {
-    $_SESSION['form']->format = 'D';
-    $_SESSION['form']->clearChoices();
+// The poll format is DATE if we are in this file
+if (!isset($form->format)) {
+    $form->format = 'D';
+}
+// If we come from another format, we need to clear choices
+if (isset($form->format) && $form->format !== 'D') {
+    $form->format = 'D';
+    $form->clearChoices();
 }
 
-if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) || ($config['use_smtp'] && !isset($_SESSION['form']->admin_mail))) {
+if (!isset($form->title, $form->admin_name) || ($config['use_smtp'] && !isset($form->admin_mail))) {
     $step = 1;
 } else if (!empty($_POST['confirmation'])) {
     $step = 4;
-} else if (empty($_POST['choixheures']) || isset($_SESSION['form']->totalchoixjour)) {
+} else if (empty($_POST['choixheures']) || isset($form->totalchoixjour)) {
     $step = 2;
 } else {
     $step = 3;
@@ -72,25 +74,28 @@ switch ($step) {
         // Step 2/4 : Select dates of the poll
 
         // Prefill form->choices
-        foreach ($_SESSION['form']->getChoices() as $c) {
+        foreach ($form->getChoices() as $c) {
+            /** @var Choice $c */
             $count = 3 - count($c->getSlots());
             for ($i = 0; $i < $count; $i++) {
                 $c->addSlot('');
             }
         }
 
-        $count = 3 - count($_SESSION['form']->getChoices());
+        $count = 3 - count($form->getChoices());
         for ($i = 0; $i < $count; $i++) {
             $c = new Choice('');
             $c->addSlot('');
             $c->addSlot('');
             $c->addSlot('');
-            $_SESSION['form']->addChoice($c);
+            $form->addChoice($c);
         }
 
+        $_SESSION['form'] = serialize($form);
+
         // Display step 2
         $smarty->assign('title', __('Step 2 date', 'Poll dates (2 on 3)'));
-        $smarty->assign('choices', $_SESSION['form']->getChoices());
+        $smarty->assign('choices', $form->getChoices());
         $smarty->assign('error', null);
 
         $smarty->display('create_date_poll_step_2.tpl');
@@ -102,7 +107,7 @@ switch ($step) {
         // Handle Step2 submission
         if (!empty($_POST['days'])) {
             // Remove empty dates
-            $_POST['days'] = array_filter($_POST['days'], function ($d) {
+            $_POST['days'] = array_filter($_POST['days'], static function ($d) {
                 return !empty($d);
             });
 
@@ -110,7 +115,7 @@ switch ($step) {
             if (count($_POST['days']) > MAX_SLOTS_PER_POLL) {
                 // Display step 2
                 $smarty->assign('title', __('Step 2 date', 'Poll dates (2 on 3)'));
-                $smarty->assign('choices', $_SESSION['form']->getChoices());
+                $smarty->assign('choices', $form->getChoices());
                 $smarty->assign('error', __f('Error', 'You can\'t select more than %d dates', MAX_SLOTS_PER_POLL));
 
                 $smarty->display('create_date_poll_step_2.tpl');
@@ -118,7 +123,7 @@ switch ($step) {
             }
 
             // Clear previous choices
-            $_SESSION['form']->clearChoices();
+            $form->clearChoices();
 
             // Reorder moments to deal with suppressed dates
             $moments = [];
@@ -130,7 +135,7 @@ switch ($step) {
                 $i++;
             }
 
-            for ($i = 0; $i < count($_POST['days']); $i++) {
+            for ($i = 0, $iMax = count($_POST['days']); $i < $iMax; $i++) {
                 $day = $_POST['days'][$i];
 
                 if (!empty($day)) {
@@ -138,22 +143,22 @@ switch ($step) {
                     $date = DateTime::createFromFormat(__('Date', 'datetime_parseformat'), $_POST['days'][$i])->setTime(0, 0, 0);
                     $time = $date->getTimestamp();
                     $choice = new Choice($time);
-                    $_SESSION['form']->addChoice($choice);
+                    $form->addChoice($choice);
 
                     $schedules = $inputService->filterArray($moments[$i], FILTER_DEFAULT);
-                    for ($j = 0; $j < count($schedules); $j++) {
+                    for ($j = 0, $jMax = count($schedules); $j < $jMax; $j++) {
                         if (!empty($schedules[$j])) {
                             $choice->addSlot(strip_tags($schedules[$j]));
                         }
                     }
                 }
             }
-            $_SESSION['form']->sortChoices();
+            $form->sortChoices();
         }
 
         // Display step 3
         $summary = '<ul>';
-        $choices = $_SESSION['form']->getChoices();
+        $choices = $form->getChoices();
         foreach ($choices as $choice) {
             $summary .= '<li>' . strftime($date_format['txt_full'], $choice->getName());
             $first = true;
@@ -166,7 +171,9 @@ switch ($step) {
         }
         $summary .= '</ul>';
 
-        $end_date_str = utf8_encode(strftime($date_format['txt_date'], $max_expiry_time)); // textual date
+        $end_date_str = utf8_encode(strftime($date_format['txt_date'], $pollService->maxExpiryDate()->getTimestamp())); // textual date
+
+        $_SESSION['form'] = serialize($form);
 
         $smarty->assign('title', __('Step 3', 'Removal date and confirmation (3 on 3)'));
         $smarty->assign('summary', $summary);
@@ -181,31 +188,11 @@ switch ($step) {
         // Step 4 : Data prepare before insert in DB
 
         // Define expiration date
-        $enddate = filter_input(INPUT_POST, 'enddate', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '#^[0-9]{2}/[0-9]{2}/[0-9]{4}$#']]);
-
-        if (!empty($enddate)) {
-            $registredate = explode('/', $enddate);
-
-            if (is_array($registredate) && count($registredate) === 3) {
-                $time = mktime(0, 0, 0, $registredate[1], $registredate[0], $registredate[2]);
-
-                if ($time < $min_expiry_time) {
-                    $_SESSION['form']->end_date = $min_expiry_time;
-                } elseif ($max_expiry_time < $time) {
-                    $_SESSION['form']->end_date = $max_expiry_time;
-                } else {
-                    $_SESSION['form']->end_date = $time;
-                }
-            }
-        }
-
-        if (empty($_SESSION['form']->end_date)) {
-            // By default, expiration date is 6 months after last day
-            $_SESSION['form']->end_date = $max_expiry_time;
-        }
+        $expiration_date = $inputService->parseDate($_POST['enddate']);
+        $form->end_date = $inputService->validateDate($expiration_date, $pollService->minExpiryDate(), $pollService->maxExpiryDate())->getTimestamp();
 
         // Insert poll in database
-        $ids = $pollService->createPoll($_SESSION['form']);
+        $ids = $pollService->createPoll($form);
         $poll_id = $ids[0];
         $admin_poll_id = $ids[1];
 
@@ -213,7 +200,7 @@ switch ($step) {
         if ($config['use_smtp'] === true) {
             $message = __('Mail', "This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.");
             $message .= '<br/><br/>';
-            $message .= Utils::htmlEscape($_SESSION['form']->admin_name) . ' ' . __('Mail', 'hast just created a poll called') . ' : "' . Utils::htmlEscape($_SESSION['form']->title) . '".<br/>';
+            $message .= Utils::htmlEscape($form->admin_name) . ' ' . __('Mail', 'hast just created a poll called') . ' : "' . Utils::htmlEscape($form->title) . '".<br/>';
             $message .= __('Mail', 'Thanks for filling the poll at the link above') . ' :<br/><br/><a href="%1$s">%1$s</a>';
 
             $message_admin = __('Mail', "This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above");
@@ -222,9 +209,9 @@ switch ($step) {
             $message = sprintf($message, Utils::getUrlSondage($poll_id));
             $message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
 
-            if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) {
-                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin);
-                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message);
+            if ($mailService->isValidEmail($form->admin_mail)) {
+                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message_admin);
+                $mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message);
             }
         }
 

create_poll.php

@@ -35,20 +35,21 @@ $pollRepository = RepositoryFactory::pollRepository();
 
 /* PAGE */
 /* ---- */
+$form = isset($_SESSION['form']) ? unserialize($_SESSION['form']) : null;
 
-if (!isset($_SESSION['form'])) {
-    $_SESSION['form'] = new Form();
+if ($form === null && !($form instanceof Form)) {
+    $form = new Form();
 }
 
 // Type de sondage
-if (isset($_GET['type']) && $_GET['type'] === 'date' ||
-    isset($_POST['type']) && $_POST['type'] === 'date'
+if ((isset($_GET['type']) && $_GET['type'] === 'date') ||
+    (isset($_POST['type']) && $_POST['type'] === 'date')
 ) {
     $poll_type = 'date';
-    $_SESSION['form']->choix_sondage = $poll_type;
+    $form->choix_sondage = $poll_type;
 } else {
     $poll_type = 'classic';
-    $_SESSION['form']->choix_sondage = $poll_type;
+    $form->choix_sondage = $poll_type;
 }
 
 // We clean the data
@@ -56,21 +57,21 @@ $goToStep2 = filter_input(INPUT_POST, GO_TO_STEP_2, FILTER_VALIDATE_REGEXP, ['op
 if ($goToStep2) {
     $title = $inputService->filterTitle($_POST['title']);
 
-    $use_ValueMax = isset($_POST['use_ValueMax']) ? $inputService->filterBoolean($_POST['use_ValueMax']) : false;
+    $use_ValueMax = isset($_POST['use_ValueMax']) && $inputService->filterBoolean($_POST['use_ValueMax']);
     $ValueMax = $use_ValueMax === true ? $inputService->filterValueMax($_POST['ValueMax']) : null;
 
-    $use_customized_url = isset($_POST['use_customized_url']) ? $inputService->filterBoolean($_POST['use_customized_url']) : false;
+    $use_customized_url = isset($_POST['use_customized_url']) && $inputService->filterBoolean($_POST['use_customized_url']);
     $customized_url = $use_customized_url === true ? $inputService->filterId($_POST['customized_url']) : null;
-    $name = $inputService->filterName($_POST['name']);
+    $name = mb_substr($inputService->filterName($_POST['name']), 0, 32);
     $mail = $config['use_smtp'] === true ? $inputService->filterMail($_POST['mail']) : null;
     $description = $inputService->filterDescription($_POST['description']);
     $editable = $inputService->filterEditable($_POST['editable']);
-    $receiveNewVotes = isset($_POST['receiveNewVotes']) ? $inputService->filterBoolean($_POST['receiveNewVotes']) : false;
-    $receiveNewComments = isset($_POST['receiveNewComments']) ? $inputService->filterBoolean($_POST['receiveNewComments']) : false;
-    $hidden = isset($_POST['hidden']) ? $inputService->filterBoolean($_POST['hidden']) : false;
+    $receiveNewVotes = isset($_POST['receiveNewVotes']) && $inputService->filterBoolean($_POST['receiveNewVotes']);
+    $receiveNewComments = isset($_POST['receiveNewComments']) && $inputService->filterBoolean($_POST['receiveNewComments']);
+    $hidden = isset($_POST['hidden']) && $inputService->filterBoolean($_POST['hidden']);
     $use_password = filter_input(INPUT_POST, 'use_password', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]);
-    $password = isset($_POST['password']) ? $_POST['password'] : null;
-    $password_repeat = isset($_POST['password_repeat']) ? $_POST['password_repeat'] : null;
+    $password = $_POST['password'] ?? null;
+    $password_repeat = $_POST['password_repeat'] ?? null;
     $results_publicly_visible = filter_input(INPUT_POST, 'results_publicly_visible', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]);
 
     // On initialise également les autres variables
@@ -83,20 +84,20 @@ if ($goToStep2) {
     $error_on_customized_url = false;
     $error_on_ValueMax = false;
 
-    $_SESSION['form']->title = $title;
-    $_SESSION['form']->id = $customized_url;
-    $_SESSION['form']->use_customized_url = $use_customized_url;
-    $_SESSION['form']->use_ValueMax = $use_ValueMax;
-    $_SESSION['form']->ValueMax = $ValueMax;
-    $_SESSION['form']->admin_name = $name;
-    $_SESSION['form']->admin_mail = $mail;
-    $_SESSION['form']->description = $description;
-    $_SESSION['form']->editable = $editable;
-    $_SESSION['form']->receiveNewVotes = $receiveNewVotes;
-    $_SESSION['form']->receiveNewComments = $receiveNewComments;
-    $_SESSION['form']->hidden = $hidden;
-    $_SESSION['form']->use_password = ($use_password !== null);
-    $_SESSION['form']->results_publicly_visible = ($results_publicly_visible !== null);
+    $form->title = $title;
+    $form->id = $customized_url;
+    $form->use_customized_url = $use_customized_url;
+    $form->use_ValueMax = $use_ValueMax;
+    $form->ValueMax = $ValueMax;
+    $form->admin_name = $name;
+    $form->admin_mail = $mail;
+    $form->description = $description;
+    $form->editable = $editable;
+    $form->receiveNewVotes = $receiveNewVotes;
+    $form->receiveNewComments = $receiveNewComments;
+    $form->hidden = $hidden;
+    $form->use_password = ($use_password !== null);
+    $form->results_publicly_visible = ($results_publicly_visible !== null);
 
     if ($config['use_smtp'] === true && empty($mail)) {
         $error_on_mail = true;
@@ -149,13 +150,15 @@ if ($goToStep2) {
         && !$error_on_password && !$error_on_password_repeat &&!$error_on_ValueMax
     ) {
         // If no errors, we hash the password if needed
-        if ($_SESSION['form']->use_password) {
-            $_SESSION['form']->password_hash = PasswordHasher::hash($password);
+        if ($form->use_password) {
+            $form->password_hash = PasswordHasher::hash($password);
         } else {
-            $_SESSION['form']->password_hash = null;
-            $_SESSION['form']->results_publicly_visible = null;
+            $form->password_hash = null;
+            $form->results_publicly_visible = null;
         }
 
+        $_SESSION['form'] = serialize($form);
+
         if ($goToStep2 === 'date') {
             header('Location:create_date_poll.php');
             exit();
@@ -232,7 +235,7 @@ if (!empty($_POST[GO_TO_STEP_2])) {
     if ($error_on_customized_url) {
         $errors['customized_url']['aria'] = 'aria-describeby="customized_url" ';
         $errors['customized_url']['class'] = ' has-error';
-        $errors['customized_url']['msg'] = isset($error_on_customized_url_msg) ? $error_on_customized_url_msg : __('Error', "Something is wrong with the format: customized urls should only consist of alphanumeric characters and hyphens.");
+        $errors['customized_url']['msg'] = $error_on_customized_url_msg ?? __('Error', "Something is wrong with the format: customized urls should only consist of alphanumeric characters and hyphens.");
     }
 
     if ($error_on_description) {
@@ -245,6 +248,10 @@ if (!empty($_POST[GO_TO_STEP_2])) {
         $errors['name']['aria'] = 'aria-describeby="poll_name_error" ';
         $errors['name']['class'] = ' has-error';
         $errors['name']['msg'] = __('Error', 'Enter a name');
+    } elseif (mb_strlen($inputService->filterName($_POST['name'])) > 32) {
+        $errors['name']['aria'] = 'aria-describeby="poll_name_error" ';
+        $errors['name']['class'] = ' has-error';
+        $errors['name']['msg'] = __('Error', "Name is limited to 32 characters");
     } elseif ($error_on_name) {
         $errors['name']['aria'] = 'aria-describeby="poll_name_error" ';
         $errors['name']['class'] = ' has-error';
@@ -289,20 +296,20 @@ $smarty->assign('default_to_marldown_editor', $config['markdown_editor_by_defaul
 $smarty->assign('goToStep2', GO_TO_STEP_2);
 
 $smarty->assign('poll_type', $poll_type);
-$smarty->assign('poll_title', Utils::fromPostOrDefault('title', $_SESSION['form']->title));
-$smarty->assign('customized_url', Utils::fromPostOrDefault('customized_url', $_SESSION['form']->id));
-$smarty->assign('use_customized_url', Utils::fromPostOrDefault('use_customized_url', $_SESSION['form']->use_customized_url));
-$smarty->assign('ValueMax', Utils::fromPostOrDefault('ValueMax', $_SESSION['form']->ValueMax));
-$smarty->assign('use_ValueMax', Utils::fromPostOrDefault('use_ValueMax', $_SESSION['form']->use_ValueMax));
-$smarty->assign('poll_description', !empty($_POST['description']) ? $_POST['description'] :  $_SESSION['form']->description);
-$smarty->assign('poll_name', Utils::fromPostOrDefault('name', $_SESSION['form']->admin_name));
-$smarty->assign('poll_mail', Utils::fromPostOrDefault('mail', $_SESSION['form']->admin_mail));
-$smarty->assign('poll_editable', Utils::fromPostOrDefault('editable', $_SESSION['form']->editable));
-$smarty->assign('poll_receiveNewVotes', Utils::fromPostOrDefault('receiveNewVotes', $_SESSION['form']->receiveNewVotes));
-$smarty->assign('poll_receiveNewComments', Utils::fromPostOrDefault('receiveNewComments', $_SESSION['form']->receiveNewComments));
-$smarty->assign('poll_hidden', Utils::fromPostOrDefault('hidden', $_SESSION['form']->hidden));
-$smarty->assign('poll_use_password', Utils::fromPostOrDefault('use_password', $_SESSION['form']->use_password));
-$smarty->assign('poll_results_publicly_visible', Utils::fromPostOrDefault('results_publicly_visible', $_SESSION['form']->results_publicly_visible));
-$smarty->assign('form', $_SESSION['form']);
+$smarty->assign('poll_title', Utils::fromPostOrDefault('title', $form->title));
+$smarty->assign('customized_url', Utils::fromPostOrDefault('customized_url', $form->id));
+$smarty->assign('use_customized_url', Utils::fromPostOrDefault('use_customized_url', $form->use_customized_url));
+$smarty->assign('ValueMax', Utils::fromPostOrDefault('ValueMax', $form->ValueMax));
+$smarty->assign('use_ValueMax', Utils::fromPostOrDefault('use_ValueMax', $form->use_ValueMax));
+$smarty->assign('poll_description', !empty($_POST['description']) ? $_POST['description'] :  $form->description);
+$smarty->assign('poll_name', Utils::fromPostOrDefault('name', $form->admin_name));
+$smarty->assign('poll_mail', Utils::fromPostOrDefault('mail', $form->admin_mail));
+$smarty->assign('poll_editable', Utils::fromPostOrDefault('editable', $form->editable));
+$smarty->assign('poll_receiveNewVotes', Utils::fromPostOrDefault('receiveNewVotes', $form->receiveNewVotes));
+$smarty->assign('poll_receiveNewComments', Utils::fromPostOrDefault('receiveNewComments', $form->receiveNewComments));
+$smarty->assign('poll_hidden', Utils::fromPostOrDefault('hidden', $form->hidden));
+$smarty->assign('poll_use_password', Utils::fromPostOrDefault('use_password', $form->use_password));
+$smarty->assign('poll_results_publicly_visible', Utils::fromPostOrDefault('results_publicly_visible', $form->results_publicly_visible));
+$smarty->assign('form', $form);
 
 $smarty->display('create_poll.tpl');

css/style.css

@@ -64,8 +64,6 @@ a:focus { /* a11y */
     outline:#000 dotted 1px;
 }
 
-header, footer {
-}
 main {
     margin-top: 20px;
 }
@@ -185,7 +183,7 @@ caption {
     font-weight:bold;
 }
 
-.results a.btn-default.btn-sm {
+.results a.btn-default.btn-sm, .best-choice .list-unstyled a.btn-default.btn-sm {
     padding: 3px 7px;
     font-size: 0.7em;
 }

exportcsv.php

@@ -35,7 +35,7 @@ $poll = null;
 /*----------*/
 
 $logService = new LogService();
-$pollService = new PollService($connect, $logService);
+$pollService = new PollService($logService);
 $securityService = new SecurityService();
 
 /* PAGE */
@@ -110,7 +110,7 @@ foreach ($votes as $vote) {
                 $text = __('Generic', 'Yes');
                 break;
             default:
-                $text = 'unkown';
+                $text = __('Generic', 'Unknown');
         }
         echo Utils::csvEscape($text);
         echo ',';

find_polls.php

@@ -27,7 +27,7 @@ include_once __DIR__ . '/app/inc/init.php';
 /* SERVICES */
 /* -------- */
 $logService =  new LogService();
-$pollService = new PollService($connect,  $logService);
+$pollService = new PollService($logService);
 $mailService = new MailService($config['use_smtp'], $config['smtp_options']);
 
 /* PAGE */

htaccess.txt

@@ -1,17 +0,0 @@
-######################
-# .htaccess example. #
-######################
-
-<IfModule mod_rewrite.c>
-  RewriteEngine On
-  RewriteCond %{REQUEST_FILENAME} -f [OR]
-  RewriteCond %{REQUEST_FILENAME} -d
-  RewriteRule . - [L]
-
-  RewriteRule ^([a-zA-Z0-9-]+)$ studs.php?poll=$1 [L]
-  RewriteRule ^([a-zA-Z0-9-]+)/action/([a-zA-Z_-]+)/(.+)$ studs.php?poll=$1&$2=$3
-  RewriteRule ^([a-zA-Z0-9-]+)/vote/([a-zA-Z0-9]{16})$ studs.php?poll=$1&vote=$2
-  RewriteRule ^([a-zA-Z0-9-]{24})/admin$ adminstuds.php?poll=$1
-  RewriteRule ^([a-zA-Z0-9-]{24})/admin/vote/([a-zA-Z0-9]{16})$ adminstuds.php?poll=$1&vote=$2
-  RewriteRule ^([a-zA-Z0-9-]{24})/admin/action/([a-zA-Z_-]+)(/(.+))?$ adminstuds.php?poll=$1&$2=$4
-</IfModule>

index.php

@@ -1,4 +1,6 @@
 <?php
+
+use Framadate\Services\LogService;
 /**
  * This software is governed by the CeCILL-B license. If a copy of this license
  * is not distributed with this file, you can obtain one at
@@ -29,8 +31,7 @@ if (!is_file(CONF_FILENAME)) {
 
 /* SERVICES */
 /* -------- */
-$logService = '\Framadate\Services\LogService';
-$pollService = new PollService($connect, new $logService());
+$pollService = new PollService(new LogService());
 
 /* PAGE */
 /* ---- */

js/app/create_poll.js

@@ -17,13 +17,13 @@
  */
 
 $(document).ready(function () {
-
     /**
      * Error check when submitting form
      */
     $("#formulaire").submit(function (event) {
-        var isHidden = $("#hidden").prop('checked');
-        var isOptionAllUserCanModifyEverything = $("#editableByAll").is(":checked");
+        var isHidden = $("#hidden").prop("checked");
+        var isOptionAllUserCanModifyEverything =
+            $("#editableByAll").is(":checked");
 
         if (isHidden && isOptionAllUserCanModifyEverything) {
             event.preventDefault();
@@ -44,22 +44,23 @@ $(document).ready(function () {
         }
     });
 
- /**
+    /**
      * Enable/Disable ValueMax options
      */
-    $("#use_ValueMax").change(function () {
-        if ($(this).prop("checked")) {
-            $("#ValueMax").removeClass("hidden");
+    const useValueMax = document.querySelector("#use_ValueMax");
+    useValueMax.addEventListener("change", function () {
+        const valueMaxOptions = document.querySelector("#value_max_options");
+        if (useValueMax.checked) {
+            valueMaxOptions.classList.remove("hidden");
         } else {
-            $("#ValueMax").addClass("hidden");
+            valueMaxOptions.classList.add("hidden");
         }
     });
 
-
     /**
      * Hide/Show password options
      */
-    $("#use_password").change(function(){
+    $("#use_password").change(function () {
         if ($(this).prop("checked")) {
             $("#password_options").removeClass("hidden");
         } else {
@@ -88,9 +89,12 @@ $(document).ready(function () {
         document.getElementById("cookie-warning").setAttribute("style", "");
     }
 
-    var wrapper = new MDEWrapper($('#poll_comments')[0], $('#rich-editor-button'), $('#simple-editor-button'));
-    if ($('#rich-editor-button').hasClass('active')) {
+    var wrapper = new MDEWrapper(
+        $("#poll_comments")[0],
+        $("#rich-editor-button"),
+        $("#simple-editor-button")
+    );
+    if ($("#rich-editor-button").hasClass("active")) {
         wrapper.enable();
     }
-
 });

js/app/studs.js

@@ -66,8 +66,7 @@ $(document).ready(function () {
                 url: form.attr('action'),
                 data: form.serialize(),
                 dataType: 'json',
-                success: function(data)
-                {
+                success: function(data) {
                     $('#comment').val('');
                     if (data.result) {
                         $('#comments_list')
@@ -95,6 +94,9 @@ $(document).ready(function () {
                         }, 750);
                     }
                 },
+                error: function (data) {
+                    console.error(data);
+                },
                 complete: function() {
                     $('#add_comment').removeAttr("disabled");
                 }

js/locales/bootstrap-datepicker.oc.js

@@ -0,0 +1,17 @@
+/**
+ * Occitan translation for bootstrap-datepicker
+ */
+;(function($){
+	$.fn.datepicker.dates['oc'] = {
+		days: ["Dimenge", "Diluns", "Dimars", "Dimècres", "Dijòus", "Divendres", "Dissabte"],
+		daysShort: ["Dim",  "Dil", "Dmr", "Dmc", "Dij", "Div", "Dis"],
+		daysMin: ["dg", "dl", "dr", "dc", "dj", "dv", "ds"],
+		months: ["Genièr", "Febrièr", "Març", "Abrial", "Mai", "Junh", "Julhet", "Agost", "Setembre", "Octobre", "Novembre", "Decembre"],
+		monthsShort: ["Gen", "Feb", "Mar", "Abr", "Mai", "Jun", "Jul", "Ago", "Set", "Oct", "Nov", "Dec"],
+		today: "Uèi",
+		monthsTitle: "Meses",
+		clear: "Escafar",
+		weekStart: 1,
+		format: "dd/mm/yyyy"
+	};
+}(jQuery));

js/mde-wrapper.js

@@ -1,12 +1,12 @@
-function myPreviewRender (text) {
-    text = text.replace(/[\u00A0-\u9999<>\&]/gim, function(i) {
-        return '&#'+i.charCodeAt(0)+';';
+function myPreviewRender(text) {
+    text = text.replace(/[\u00A0-\u9999<>\&]/gim, function (i) {
+        return "&#" + i.charCodeAt(0) + ";";
     });
-    text = SimpleMDE.prototype.markdown(text);
-    text = text.replace(/ /g, '&nbsp;');
+    text = EasyMDE.prototype.markdown(text);
+    text = DOMPurify.sanitize(text);
 
     return text;
-};
+}
 
 function MDEWrapper(textarea, enableButton, disableButton) {
     this.element = textarea;
@@ -17,47 +17,58 @@ function MDEWrapper(textarea, enableButton, disableButton) {
     var wrapper = this;
 
     if (this.enableButton) {
-        this.enableButton.on('click', function() {wrapper.enable()});
+        this.enableButton.on("click", function () {
+            wrapper.enable();
+        });
     }
     if (this.disableButton) {
-        this.disableButton.on('click', function() {wrapper.disable()});
+        this.disableButton.on("click", function () {
+            wrapper.disable();
+        });
     }
 }
 
-MDEWrapper.prototype.enable = function() {
+MDEWrapper.prototype.enable = function () {
     var wrapper = this;
     if (this.simplemde == null) {
-        this.simplemde = new SimpleMDE({
+        this.simplemde = new EasyMDE({
             element: wrapper.element,
             forceSync: true,
             status: true,
-            previewRender: myPreviewRender,
+            // previewRender: myPreviewRender,
+            renderingConfig: {
+                sanitizerFunction: function (text) {
+                    return DOMPurify.sanitize(text);
+                },
+            },
             spellChecker: false,
             promptURLs: true,
-            autoDownloadFontAwesome: false
+            minHeight: "200px",
+            maxHeight: "300px",
+            autoDownloadFontAwesome: false,
         });
         if (this.enableButton) {
-            this.enableButton.addClass('active');
+            this.enableButton.addClass("active");
         }
         if (this.disableButton) {
-            this.disableButton.removeClass('active');
+            this.disableButton.removeClass("active");
         }
     }
-}
+};
 
-MDEWrapper.prototype.disable = function() {
+MDEWrapper.prototype.disable = function () {
     if (this.simplemde != null) {
         this.simplemde.toTextArea();
         this.simplemde = null;
         if (this.disableButton) {
-            this.disableButton.addClass('active');
+            this.disableButton.addClass("active");
         }
         if (this.enableButton) {
-            this.enableButton.removeClass('active');
+            this.enableButton.removeClass("active");
         }
     }
-}
+};
 
-MDEWrapper.prototype.isEnabled = function() {
+MDEWrapper.prototype.isEnabled = function () {
     return this.simplemde != null;
-}
+};

locale/ar.json

@@ -208,7 +208,8 @@
       "seconds": "ثواني",
       "vote": "vote",
       "votes": "أصوات",
-      "with": "with"
+      "with": "with",
+      "Unknown": "مجهول"
    },
    "Homepage": {
       "Make a classic poll": "Make a standard poll",
@@ -236,7 +237,7 @@
    },
    "Mail": {
       "Author's message": "Author's message",
-      "FOOTER": "\"The road is long, but the way is clear…\"<br/>Framasoft lives only by your donations.<br/>Thank you in advance for your support https://soutenir.framasoft.org",
+      "FOOTER": "April - Promouvoir et défendre le logiciel libre",
       "For sending to the polled users": "Participant link",
       "Notification of poll: %s": "Notification of poll: %s",
       "Poll's participation: %s": "Poll participation: %s",

locale/br.json

@@ -208,7 +208,8 @@
       "seconds": "eilenn",
       "vote": "vouezh",
       "votes": "a vouezhioù",
-      "with": "gant"
+      "with": "gant",
+      "Unknown": "Dianav"
    },
    "Homepage": {
       "Make a classic poll": "Krouiñ ur sontadeg klasel",
@@ -236,7 +237,7 @@
    },
    "Mail": {
       "Author's message": "Evit an aozer hepken",
-      "FOOTER": "« Hir eo an hent, met frank eo ar roudenn… »<br/>Framasoft a vev gant ho roadoù hepken (didennadus eus an tailhoù).<br/>Trugarez en a-raok evit ho skoazell https://soutenir.framasoft.org.",
+      "FOOTER": "April - Promouvoir et défendre le logiciel libre",
       "For sending to the polled users": "Da gas d'an dud sontet",
       "Notification of poll: %s": "Rebuziñ ur sontadeg: %s",
       "Poll's participation: %s": "Mouezh nevez: %s",

locale/ca.json

@@ -0,0 +1,456 @@
+{
+    "studs": {
+        "Your vote has been registered successfully, but be careful: regarding this poll options, you need to keep this personal link to edit your own vote:": "S'ha desat el vostre vot, però tingueu en compte que cal que conserveu aquest enllaç personalitzat per a poder-lo modificar.",
+        "Update vote succeeded": "S'ha actualitzat el vot",
+        "The poll is expired, it will be deleted soon.": "L'enquesta ha caducat, aviat se suprimirà.",
+        "POLL_LOCKED_WARNING": "L'administrador ha blocat aquesta enquesta. Els vots i els comentaris estan congelats, ja no és possible de participar-hi",
+        "Deletion date:": "Data de supressió:",
+        "Adding the vote succeeded": "S'ha afegit el vot",
+        "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.": "Si voleu votar en aquesta enquesta, heu de donar el vostre nom, triar i enviar-lo amb el botó més al final de la línia."
+    },
+    "adminstuds": {
+        "remove a column or a line with": "treu una columna o una línia amb",
+        "and add a new column with": "i afegeix una columna nova amb",
+        "Your poll has been removed!": "S'ha eliminat l'enquesta!",
+        "You can add a new scheduling date to your poll.": "Podeu afegir una altra data de programació a l'enquesta.",
+        "Vote updated": "S'ha actualitzat el vot",
+        "Vote deleted": "S'ha suprimit el vot",
+        "Vote added": "S'ha afegit el vot",
+        "The poll is created.": "S'ha creat l'enquesta.",
+        "Remove the votes": "Elimina els vots",
+        "Remove the comments": "Elimina els comentaris",
+        "Remove the column": "Elimina la columna",
+        "Poll saved": "S'ha desat la votació",
+        "Poll fully deleted": "L'enquesta s'ha eliminat completament",
+        "Keep votes": "Conserva els vots",
+        "Keep this poll": "Conserva aquesta enquesta",
+        "Keep the votes": "Conserva els vots",
+        "Keep the poll": "Conserva l'enquesta",
+        "Keep the comments": "Conserva els comentaris",
+        "Keep comments": "Conserva els comentaris",
+        "Finally, you can change the informations of this poll like the title, the comments or your email address.": "Finalment, podeu canviar les propietats d'aquesta enquesta, com ara el títol, els comentaris o l'adreça de correu electrònic.",
+        "Confirm removal of the poll": "Confirmeu l'eliminació de l'enquesta",
+        "Confirm removal of the column.": "Confirmeu l'eliminació de la columna.",
+        "Confirm removal of all votes of the poll": "Confirma l'eliminació de tots els vots",
+        "Confirm removal of all comments of the poll": "Confirmeu l'eliminació de tots els comentaris",
+        "Comment deleted": "Comentaris eliminats",
+        "Column's adding": "S'està afegint una columna",
+        "Column removed": "S'ha suprimit la columna",
+        "Choice added": "S'ha afegit una opció",
+        "Back to the poll": "Torna a l'enquesta",
+        "As poll administrator, you can change all the lines of this poll with this button": "Com a administrador, podeu canviar totes les línies d'aquesta enquesta amb aquest botó",
+        "All votes deleted": "S'han suprimit tots els vots",
+        "All comments deleted": "S'han suprimit tots els comentaris",
+        "Add a column": "Afegeix una columna",
+        "If you just want to add a new hour to an existant date, put the same date and choose a new hour.": "Si només voleu afegir una franja horària nova a una data existent, afegiu aquesta data i escolliu un interval horari.",
+        "Delete the poll": "Elimina la enquesta"
+    },
+    "Step 3": {
+        "after the last date of your poll.": "després de l'última data de l'enquesta.",
+        "Your poll will be automatically archived in %d days.": "L'enquesta s'arxivarà automàticament d'aquí a %d dies.",
+        "Your poll will automatically be archived": "L'enquesta s'arxivarà automàticament",
+        "You can set a closer archiving date for it.": "Podeu establir una data de venciment específica de l'enquesta.",
+        "Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.": "A continuació, rebreu dos correus electrònics: un que contindrà l'enllaç de l'enquesta per a enviar-la als participants i l'altre que contindrà l'enllaç a la pàgina d'administració de l'enquesta.",
+        "Removal date and confirmation (3 on 3)": "Data de supressió i confirmació (3 de 3)",
+        "Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.": "Un cop hagis confirmat la creació de l'enquesta, se us redirigirà automàticament a la pàgina d'administració de l'enquesta.",
+        "List of your choices": "Llista d'opcions",
+        "Create the poll": "Crea l'enquesta",
+        "Confirm the creation of your poll": "Confirmeu la creació de l'enquesta",
+        "Back to step 2": "Torna al pas 2",
+        "Archiving date:": "Data de venciment:"
+    },
+    "Step 2 date": {
+        "You can add or remove additionnal days and hours with the buttons": "Podeu afegir o treure dies i hores addicionals amb els botons",
+        "To schedule an event you need to propose at least two choices (two hours for one day or two days).": "Per a programar un esdeveniment, cal que proporcioneu almenys dues opcions (per exemple, dos espais horaris en un o dos dies).",
+        "Remove this day": "Elimina aquest dia",
+        "Remove an hour": "Elimina un espai horari",
+        "Remove all hours": "Elimina tots els temps",
+        "Remove all days": "Elimina tots els dies",
+        "Remove a day": "Elimina un dia",
+        "Poll dates (2 on 3)": "Dates de l'enquesta (2 de 3)",
+        "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8h-10h\", \"evening\", etc.)": "Per cada dia seleccionat, podeu suggerir temps de trobada (per exemple, \"8h\", \"8:30\", \"8h-10h\", \"tarda\", etc.)",
+        "Copy hours of the first day": "Copia els temps del primer dia",
+        "Choose the dates of your poll": "Tria dates per a l'enquesta",
+        "Add an hour": "Afegeix un espai horari",
+        "Add a day": "Afegeix un dia"
+    },
+    "Step 2 classic": {
+        "the Markdown syntax": "Sintaxi Markdown",
+        "You can add or remove additional choices with the buttons": "Podeu afegir o eliminar opcions amb els botons",
+        "URL of the image": "URL de la imatge",
+        "To make a generic poll you need to propose at least two choices between differents subjects.": "Per a crear una enquesta, heu de proporcionar almenys dues opcions diferents.",
+        "These fields are optional. You can add a link, an image or both.": "Aquests camps són opcionals. Podeu afegir un enllaç, una imatge o ambdós.",
+        "Remove a choice": "Elimina una elecció",
+        "Poll subjects (2 on 3)": "Opcions de votació (2 de 3)",
+        "It's possible to propose links or images by using": "Es poden incloure enllaços o imatges utilitzant",
+        "Alternative text": "Text alternatiu",
+        "Add a link or an image": "Afegeix un enllaç o una imatge",
+        "Add a choice": "Afegeix una elecció"
+    },
+    "Step 2": {
+        "Go to step 3": "Vés al pas 3",
+        "Back to step 1": "Torna al pas 1"
+    },
+    "Step 1": {
+        "You can enable or disable the editor at will.": "Podeu habilitar o deshabilitar l'editor a voluntat.",
+        "You are in the poll creation section.": "Sou a la secció de creació d'enquestes.",
+        "Votes cannot be modified": "Els vots no es poden modificar",
+        "Voters can modify their vote themselves": "Els votants poden modificar el seu vot ells mateixos",
+        "Value Max": "Valor màxim",
+        "Use a password to restrict access": "Utilitzeu una contrasenya per restringir l'accés",
+        "To receive an email for each new vote": "Rebeu un correu electrònic per a cada nou vot",
+        "To receive an email for each new comment": "Rebreu un correu electrònic per a cada comentari nou",
+        "To make the description more attractive, you can use the Markdown format.": "Per a fer que la descripció sigui més atractiva, podeu utilitzar el format Markdown.",
+        "The results are publicly visible": "Els resultats són visibles públicament",
+        "Required fields cannot be left blank.": "Els camps obligatoris no es poden deixar en blanc.",
+        "Poll title": "Títol de l'enquesta",
+        "Poll password": "Contrasenya",
+        "Poll id warning": "Si definiu un identificador per a l'enquesta, podríeu facilitar-hi l'accés per a persones no desitjades. Es recomana protegir-la amb una contrasenya.",
+        "Poll id rules": "L'identificador pot contenir lletres, números i guions \"-\".",
+        "Poll id": "Enllaç de l'enquesta",
+        "Poll creation (1 on 3)": "Creació d'enquestes (1 de 3)",
+        "Permissions": "Permisos",
+        "Password confirmation": "Confirmació",
+        "Password choice": "Elecció",
+        "Optional parameters": "Paràmetres opcionals",
+        "Only the poll maker can see the poll's results": "Només el creador de l'enquesta pot veure els resultats de l'enquesta",
+        "More informations here:": "Més informació aquí:",
+        "Limit the amount of voters per option": "Limita la quantitat de votants per opció",
+        "Go to step 2": "Ves al pas 2",
+        "Customize the URL": "Personalitza l'URL",
+        "All voters can modify any vote": "Tots els votants poden modificar qualsevol vot",
+        "ValueMax instructions": "votants per opcions "
+    },
+    "PollInfo": {
+        "Votes protected by password": "Vots protegits amb contrasenya",
+        "Votes and comments are locked": "Els vots i els comentaris estan blocats",
+        "Title": "Títol de l'enquesta",
+        "Simple editor": "Editor simple",
+        "Save the new title": "Desa el títol nou",
+        "Save the new rules": "Desa les regles noves",
+        "Save the new name": "Desa el nom nou",
+        "Save the new expiration date": "Desa la nova data de venciment",
+        "Save the email address": "Desa l'adreça de correu electrònic",
+        "Save the description": "Desa la descripció",
+        "Rich editor": "Editor enriquit",
+        "Results are visible": "Els resultats són visibles",
+        "Results are hidden": "Els resultats són ocults",
+        "Remove the poll": "Elimina l'enquesta",
+        "Remove password": "Elimina la contrasenya",
+        "Remove all the votes": "Elimina tots els vots",
+        "Remove all the comments": "Elimina tots els comentaris",
+        "Public link of the poll": "Enllaç públic de l'enquesta",
+        "Print": "Imprimeix",
+        "Poll rules": "Regles de l'enquesta",
+        "Password protected": "Contrasenya protegida",
+        "Only votes are protected": "Només els vots estan protegits",
+        "No password": "Sense contrasenya",
+        "Initiator of the poll": "Creador de l'enquesta",
+        "Export to CSV": "Exporta a CSV",
+        "Expiration date": "Data de caducitat",
+        "Email": "Adreça electrònica",
+        "Edit the title": "Edita el títol",
+        "Edit the poll rules": "Edita les regles d'enquesta",
+        "Edit the name": "Edita el nom",
+        "Edit the expiration date": "Edita la data de venciment",
+        "Edit the email adress": "Edita l'adreça de correu electrònic",
+        "Edit the description": "Edita la descripció",
+        "Cancel the title edit": "Cancel·la l'edició del títol",
+        "Cancel the rules edit": "Cancel·la l'edició de les regles",
+        "Cancel the name edit": "Cancel·la l'edició del nom",
+        "Cancel the expiration date edit": "Cancel·la l'edició de la data de venciment",
+        "Cancel the email address edit": "Cancel·la l'edició de l'adreça electrònica",
+        "Cancel the description edit": "Cancel·la l'edició de la descripció",
+        "Admin link of the poll": "Enllaç d'administració per a l'enquesta"
+    },
+    "Poll results": {
+        "polled users": "usuaris enquestats",
+        "polled user": "usuari enquestat",
+        "Votes of the poll": "Vots",
+        "Vote yes for": "Vota «sí» per a",
+        "Vote no for": "Vota «no» per a",
+        "The bests choices at this time are:": "Ara per ara, les opcions més votades són:",
+        "The best choice at this time is:": "Ara per ara, l'opció més votada és:",
+        "Scroll to the right": "Desplaça't cap a la dreta",
+        "Scroll to the left": "Desplaça't cap a l'esquerra",
+        "Save the choices": "Desa les opcions",
+        "Remove the line:": "Suprimeix la línia:",
+        "Link to edit this particular line has been copied inside the clipboard!": "L'enllaç per a editar aquesta línia en particular s'ha copiat al porta-retalls!",
+        "Link to edit this particular line": "Enllaç per a editar aquesta línia en particular",
+        "Edit the line: %s": "Edita la línia: %s",
+        "Display the chart of the results": "Mostra el gràfic dels resultats",
+        "Chart": "Gràfic",
+        "Best choices": "Millors eleccions",
+        "Best choice": "Millor elecció",
+        "Addition": "Total",
+        "Vote ifneedbe for": "Vota en reserva de"
+    },
+    "Password": {
+        "You have to provide a password to access the poll.": "Cal que proporcioneu una contrasenya per a accedir a l'enquesta.",
+        "You have to provide a password so you can participate to the poll.": "Cal que proporcioneu una contrasenya perquè pugeu participar en l'enquesta.",
+        "Wrong password": "La contrasenya  és errònia",
+        "Submit access": "Enviar accés",
+        "Password": "Contrasenya"
+    },
+    "Maintenance": {
+        "is currently under maintenance.": "actualment està en manteniment.",
+        "The application": "L'aplicació",
+        "Thank you for your understanding.": "Gràcies per la vostra comprensió."
+    },
+    "Mail": {
+        "wrote a comment.\nYou can find your poll at the link": "ha escrit un comentari. <br/> Podeu visitar l'enquesta a l'enllaç",
+        "updated a vote.\nYou can find your poll at the link": "s'ha actualitzat una votació. <br/> Podeu visitar l'enquesta en l'enllaç",
+        "hast just created a poll called": "acaba de crear una enquesta anomenada",
+        "filled a vote.\nYou can find your poll at the link": "ha votat. <br/> Podeu visitar l'enquesta a l'enllaç",
+        "This is the message you have to send to the people you want to poll. \nNow, you have to send this message to everyone you want to poll.": "Aquest és el missatge que es reenviarà als participants de l'enquesta.",
+        "Thanks for your trust.": "Gràcies per la vostra confiança.",
+        "Someone just delete your poll %s.": "Algú acaba d'eliminar la vostra enquesta «%s».",
+        "Someone just change your poll available at the following link %s.": "Algú ha canviat l'enquesta de l'enllaç següent <a href=\"%1$s\">%1$s</a>.",
+        "Poll's participation: %s": "Participació en l'enquesta: %s",
+        "Notification of poll: %s": "Notificació de l'enquesta: %s",
+        "For sending to the polled users": "Enllaç per als participants",
+        "FOOTER": "\"El camí és llarg, però el camí està clar ...\" <br/> Framasoft només viu de les vostres donacions. <br/> Gràcies per endavant pel vostre suport https://soutenir.framasoft.org",
+        "[ADMINISTRATOR] New settings for your poll": "[ADMINISTRATOR] Configuració nova de la vostra enquesta",
+        "You have changed the settings of your poll. \nYou can modify this poll with this link": "Heu canviat la configuració de la vostra enquesta. <br/>Podeu modificar aquesta enquesta amb aquest enllaç",
+        "This message should NOT be sent to the polled people. It is private for the poll's creator.\n\nYou can now modify it at the link above": "Aquest missatge NO s’ha d’enviar als participants a l’enquesta. Hauríeu de mantenir-lo privat. <br/><br/>Podeu modificar la vostra enquesta a l’enllaç anterior",
+        "Thanks for filling the poll at the link above": "Si us plau, ompliu l’enquesta a l’enllaç anterior",
+        "Author's message": "Missatge de l’autor"
+    },
+    "Language selector": {
+        "Select the language": "Trieu la llengua",
+        "Change the language": "Canvia la llengua"
+    },
+    "Installation": {
+        "ResponseMail": "Respon a l'adreça de correu",
+        "MigrationTable": "Taula de migració",
+        "Install": "Instal·la",
+        "General": "General",
+        "DefaultLanguage": "Llengua predeterminada",
+        "DbUser": "Usuari",
+        "DbPrefix": "Prefix",
+        "DbPassword": "Contrasenya",
+        "Database": "Nom de la base de dades",
+        "CleanUrl": "Neteja l'URL",
+        "AppName": "Nom de l'aplicació",
+        "AppMail": "Adreça de correu d'administrador",
+        "DbConnectionString": "Cadena de connexió"
+    },
+    "Homepage": {
+        "Where are my polls": "On són les enquestes?",
+        "Schedule an event": "Programeu un esdeveniment",
+        "Make a classic poll": "Feu una enquesta estàndard"
+    },
+    "Generic": {
+        "with": "amb",
+        "votes": "vots",
+        "vote": "vota",
+        "seconds": "segons",
+        "months": "mesos",
+        "for": "per a",
+        "days": "dies",
+        "Your name": "El vostre nom",
+        "Your email address": "La vostra adreça de correu electrònic",
+        "Yes": "Sí",
+        "Validate": "Valida",
+        "Time": "Hora",
+        "Search": "Cerca",
+        "Save": "Desa",
+        "Remove": "Elimina",
+        "Poll": "Enquesta",
+        "Page generated in": "Pàgina generada en",
+        "No": "No",
+        "Next": "Pròxim",
+        "Markdown": "Markdown",
+        "Link": "Enllaç",
+        "Legend:": "Llegenda:",
+        "Ifneedbe": "Si és necessari",
+        "Home": "Inici",
+        "Edit": "Edita",
+        "Description": "Descripció",
+        "Day": "Dia",
+        "Date": "Data",
+        "Creation date:": "Data de creació:",
+        "Close": "Tanca",
+        "Classic": "Clàssic",
+        "Choice": "Elecció",
+        "Cancel": "Cancel·la",
+        "Back to the homepage of": "Torna a la pàgina d'inici de",
+        "Back": "Enrere",
+        "Add": "Afegeix",
+        "(in the format name@mail.com)": "(en format nom@mail.com)",
+        "Make your polls": "Feu el vostre sondeig",
+        "Framadate is an online service for planning an appointment or make a decision quickly and easily.": "Framadate és un servei en línia per planificar una cita o prendre una decisió de forma ràpida i senzilla.",
+        "Caption": "Títol",
+        "ASTERISK": "*",
+        "Unknown": "Desconegut"
+    },
+    "FindPolls": {
+        "Send me my polls": "Envia'm les enquestes",
+        "Polls sent": "Enquestes enviades",
+        "PS: this email has been sent because you – or someone else – asked to get back the polls created with your email address.": "PS: aquest correu electrònic s'ha enviat perquè heu sol·licitat (o algú altre) recuperar les enquestes creades amb la vostra adreça de correu electrònic.",
+        "List of your polls": "Llista de les vostres enquestes",
+        "Here is the list of the polls that you manage on %s:": "Aquesta és la llista de les enquestes que gestioneu a %s:",
+        "Have a good day!": "Que tingueu un bon dia!",
+        "If you weren't the source of this action and if you think this is an abuse of the service, please notify the administrator on %s.": "Si no éreu l’origen d’aquesta acció i creieu que es tracta d’un abús del servei, notifiqueu l’administrador al %s."
+    },
+    "Error": {
+        "Your vote wasn't counted, because someone voted in the meantime and it conflicted with your choices and the poll conditions. Please retry.": "El vostre vot no es tindrà en compte, perquè algú ha votat en el mateix moment i això entra en conflicte amb les vostres opcions i les condicions de l'enquesta. Torneu-ho a provar.",
+        "You can't select more than %d dates": "No podeu seleccionar més de %d dates",
+        "You can't create a poll with hidden results with the following edition option:": "No podeu crear una enquesta amb resultats ocults amb la següent opció:· ",
+        "You already voted": "Ja heu votat",
+        "Update vote failed": "S'ha produït un error en actualitzar el vot",
+        "This poll doesn't exist !": "Aquesta enquesta no existeix!",
+        "There is a problem with your choices": "Hi ha un problema amb les vostres eleccions",
+        "The name you've chosen already exist in this poll!": "El nom que heu introduït ja existeix!",
+        "The name is invalid.": "El nom no és vàlid.",
+        "The column already exists": "La columna ja existeix",
+        "The address is not correct! You should enter a valid email address (like r.stallman@outlock.com) in order to receive the link to your poll.": "L'adreça no és correcta. Has d'introduir una adreça de correu electrònic vàlida (com ara r.stallman@outlock.com) per a rebre l'enllaç a l'enquesta.",
+        "Something is wrong with the format: name shouldn't have any spaces before or after": "Alguna cosa està malament amb el format: el nom no hauria de tenir cap espai abans ni després",
+        "Something is wrong with the format: customized urls should only consist of alphanumeric characters and hyphens.": "Alguna cosa està malament amb el format: els URL personalitzats només han de consistir en caràcters alfanumèrics i guions.",
+        "Something is wrong with the format": "Alguna cosa està malament amb el format",
+        "Something is going wrong...":"Alguna cosa no ha anat bé...",
+        "Poll id already used": "Ja s'utilitza l'identificador",
+        "Poll has been updated before you vote": "L'enquesta s'ha actualitzat abans que votéssiu",
+        "Passwords do not match": "Les contrasenyes no coincideixen.",
+        "Password is empty": "La contrasenya és buida.",
+        "No polls found": "No s'ha trobat cap enquesta",
+        "MISSING_VALUES": "Valors que manquen",
+        "Javascript is disabled on your browser. Its activation is required to create a poll": "JavaScript està desactivat al vostre navegador. Cal activar-lo per a crear una enquesta.",
+        "Forbidden!": "Prohibit!",
+        "Failed to save poll": "No ha pogut desar l'enquesta",
+        "Failed to insert the comment!": "No s'ha pogut inserí el comentari!",
+        "Failed to delete the vote!": "No s'ha pogut eliminar el vot!",
+        "Failed to delete the poll": "No s'ha pogut eliminar l'enquesta",
+        "Failed to delete the comment": "No s'han pogut eliminar el comentari",
+        "Failed to delete column": "No s'ha pogut eliminar la columna",
+        "Failed to delete all votes": "No s'han pogut eliminar tots els vots",
+        "Failed to delete all comments": "No s'han pogut eliminar tots els comentaris",
+        "Error!": "Error!",
+        "Enter an email address": "Introduïu una adreça de correu electrònic",
+        "Enter a title": "Intrdoduïu un títol",
+        "Enter a name and a comment!": "Introduiïu un nom i un comentari!",
+        "Enter a name": "Introduïu un nom",
+        "Cookies are disabled on your browser. Theirs activation is required to create a poll.": "Les galetes estan desactivades al vostre navegador. Cal que estiguin activades per a poder crear una enquesta.",
+        "Comment failed": "Error de comentari",
+        "Can't create the config.php file in '%s'.": "No es pot crear el fitxer config.php a «%s».",
+        "Can't create an empty column.": "No es pot crear una columna buida.",
+        "CANT_CONNECT_TO_DATABASE": "No es pot connectar a la base de dades",
+        "Adding vote failed": "S'ha produït un error en afegir el vot",
+        "You haven't filled the first section of the poll creation.": "No heu omplert la primera secció de la enquesta.",
+        "This id is not allowed": "Aquest identificador no està permès",
+        "Framadate is not properly installed, please check the \"INSTALL\" to setup the database before continuing.": "Framadate no està instal·lat correctament, consulteu el fitxer “INSTAL·LAR” per obtenir instruccions sobre la configuració de la base de dades abans de continuar.",
+        "Error on amount of voters limitation : value must be an integer greater than 0": "Error per la quantitat de votants: el valor ha de ser un nombre enter superior a 0"
+    },
+    "1st section": {
+        "Discuss and make a decision": "Discutiu i preneu una decisió",
+        "Define dates or subjects to choose": "Definiu les dates o els temes per triar",
+        "view an example?": "Voleu veure un exemple?",
+        "What is that?": "Què és Framadate?",
+        "Send the poll link to your friends or colleagues": "Envieu l'enllaç de l'enquesta als amics o col·legues",
+        "Make a poll": "Creeu una enquesta",
+        "Here is how it works:": "Així és com funciona:",
+        "Framadate is an online service for planning an appointment or make a decision quickly and easily. No registration is required.": "Framadate és un servei en línia per a planificar una cita o prendre una decisió de forma ràpida i senzilla. No cal registrar-s'hi.",
+        "Do you want to": "Voleu"
+    },
+    "EditLink": {
+        "Your reminder has been successfully sent!": "El recordatori s'ha enviat amb èxit!",
+        "The email address is not correct.": "L'adreça de correu electrònic no és correcta.",
+        "Send": "Envia",
+        "REMINDER": "RECORDATORI",
+        "Please wait %d seconds before we can send an email to you then try again.": "Espereu %d segons abans que us puguem enviar un correu electrònic i torna-ho a provar.",
+        "Here is the link for editing your vote:": "Aquest és l'enllaç per a editar el vostre vot:",
+        "Edit link for poll \"%s\"": "Edita l'enllaç de l'enquesta «%s»",
+        "If you don't want to lose your personalized link, we can send it to your email.": "Si no voleu perdre el vostre enllaç personalitzat, el podem enviar al vostre correu electrònic."
+    },
+    "Date": {
+        "dd/mm/yyyy": "dd/mm/yyyy",
+        "datetime_parseformat": "d/m/Y",
+        "datepicker": "dd/mm/yyyy",
+        "Start date": "Data d'inici",
+        "SHORT": "%A %e %B %Y",
+        "Max dates count": "Podeu seleccionar com a màxim 4 mesos",
+        "MONTH_YEAR": "%B %Y",
+        "FULL": "%A, %B %e, %Y",
+        "End date": "Data final",
+        "DAY": "%a %e",
+        "DATETIME": "%m/%d/%Y %H:%M",
+        "DATE": "%Y-%m-%d",
+        "Add range dates": "Afegeix un interval de dates"
+    },
+    "Comments": {
+        "Your comment": "Comentari",
+        "Send the comment": "Envia el comentari",
+        "Remove the comment": "Elimina el comentari",
+        "Comments of polled people": "Comentaris",
+        "Comment added": "S'ha desat el comentari",
+        "Add a comment to the poll": "Afegeix un comentari a l'enquesta",
+        "anonyme": "anònim"
+    },
+    "Check": {
+        "date.timezone is set.": "date.timezone està establert.",
+        "Your PHP version (%s) is too old. This application needs at least PHP %s.": "La vostra versió PHP (%s) és massa vella. Aquesta aplicació necessita almenys PHP %s.",
+        "You need to enable the PHP Intl extension.": "Cal que habiliteu l'extensió de PHP Intl.",
+        "The template compile directory (%s) is writable.": "El directori de compilació de la plantilla (%s) es pot escriure.",
+        "The template compile directory (%s) is not writable.": "El directori de compilació de plantilla (%s) no es pot escriure.",
+        "The template compile directory (%s) doesn't exist in \"%s\". Retry the installation process.": "El directori de compilació de plantilles (%s) no existeix al «%s». Torneu a intentar el procés d'instal·lació.",
+        "The config file exists.": "Existeix el fitxer de configuració.",
+        "The config file directory (%s) is writable.": "El directori de fitxers de configuració (%s) es pot escriure.",
+        "The config file directory (%s) is not writable and the config file (%s) does not exists.": "El directori de fitxers de configuració (%s) no es pot escriure i el fitxer de configuració (%s) no existeix.",
+        "PHP version %s is enough (needed at least PHP %s).": "La versió %s PHP és suficient (almenys es necessita PHP %s).",
+        "PHP Intl extension is enabled.": "L'extensió de PHP Intl està habilitada.",
+        "OpenSSL extension loaded.": "L'extensió OpenSSL s'ha carregat.",
+        "Installation checking": "Comprovació de la instal·lació",
+        "Cookies are served from HTTP only.": "Les galetes només es poden enviar des d'HTTP.",
+        "Continue the installation": "Continua amb la instal·lació",
+        "Consider setting « session.cookie_httponly = 1 » inside your php.ini or add « php_value session.cookie_httponly 1 » to your .htaccess so that cookies can't be accessed through Javascript.": "Considereu definirr «session.cookie_httponly = 1» al fitxer php.ini o afegegiu «php_value session.cookie_httponly 1» al fitxer .htaccess de forma que les galetes no siguin accessibles des de Javascript.",
+        "Consider setting the date.timezone in php.ini.": "Considereu definir un valor per a date.timezone al fitxer php.ini.",
+        "Consider enabling the PHP extension OpenSSL for increased security.": "Per a més seguretat, considereu habilitar l'extensió  OpenSSL de PHP OpenSSL.",
+        "Check again": "Comprova-ho una altra vegada"
+    },
+    "Admin": {
+        "polls in the database at this time": "enquestes a la base de dades en aquest moment",
+        "Votes": "Vots",
+        "Title": "Títol",
+        "Summary": "Resum",
+        "Success": "Èxit",
+        "Succeeded:": "Amb èxit:",
+        "Skipped:": "Omesos:",
+        "See the poll": "Mostra l'enquesta",
+        "Purged:": "Purgats:",
+        "Purge the polls": "Purga les enquestes",
+        "Purge": "Purga",
+        "Polls": "Enquestes",
+        "Poll ID": "ID de l'enquesta",
+        "Pages:": "Pàgines:",
+        "Nothing": "Res",
+        "Migration": "Migració",
+        "Logs": "Registre",
+        "Installation": "Instal·lació",
+        "Format": "Format de",
+        "Failed:": "Ha fallat:",
+        "Fail": "Fallada",
+        "Expiration date": "Data de caducitat",
+        "Email": "Adreça electrònica",
+        "Change the poll": "Canvia l'enquesta",
+        "Back to administration": "Torna a l'administració",
+        "Author": "Autor",
+        "Administration": "Administració",
+        "Actions": "Accions",
+        "Deleted the poll": "S'ha suprimit el sondeig",
+        "Confirm removal of the poll": "Confirmeu que elimineu el sondeig "
+    },
+    "3rd section": {
+        "the development site": "el lloc del desenvolupament",
+        "If you want to install the software for your own use and thus increase your independence, we help you on:": "Si voleu instal·lar el programari per al vostre ús i, per tant, augmentar la vostra independència, us podem ajudar en:",
+        "Cultivate your garden": "Cultiveu el vostre jardí",
+        "To participate in the software development, suggest improvements or simply download it, please visit ": "Per participar en el desenvolupament del programari, suggerir millores o simplement descarregar-lo, visiteu "
+    },
+    "2nd section": {
+        "a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft.": "programari desenvolupat per la Universitat d'Estrasburg. Actualment desenvolupat per l'associació Framasoft.",
+        "The software": "El programari",
+        "It is governed by the": "Framadate està llicenciat sota la",
+        "CeCILL-B license": "Llicència CeCILL-B",
+        "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "Aquest programari necessita JavaScript i cookies habilitades. És compatible amb els navegadors web següents:",
+        "Framadate was initially based on ": "Framadate es va basar inicialment en "
+    }
+}

locale/de.json

@@ -208,7 +208,8 @@
       "seconds": "Sekunden",
       "vote": "Stimme",
       "votes": "Stimmen",
-      "with": "mit"
+      "with": "mit",
+      "Unknown": "Unbekannt"
    },
    "Homepage": {
       "Make a classic poll": "Klassische Umfrage",
@@ -236,7 +237,7 @@
    },
    "Mail": {
       "Author's message": "Nachricht vom Autor ",
-      "FOOTER": "„Die Strecke ist lang, aber der Weg ist frei… \"<br/>Framasoft besteht nur durch Ihre Spenden (in Frankreich von der Steuer absetzbar).<br/>Herzlichen Dank für Ihre Unterstützung https://soutenir.framasoft.org",
+      "FOOTER": "April - Promouvoir et défendre le logiciel libre",
       "For sending to the polled users": "Nachricht für die Teilnehmer",
       "Notification of poll: %s": "Mitteilung bezüglich der Umfrage: %s",
       "Poll's participation: %s": "Beteiligung an der Umfrage: %s",
@@ -445,6 +446,7 @@
    "studs": {
       "Adding the vote succeeded": "Die Wertung wurde hinzugefügt",
       "Deletion date:": "Löschdatum:",
+      "Download as ical/ics file": "Als ical/ics-Datei herunterladen",
       "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.": "Wenn Sie an dieser Umfrage teilnehmen möchten, müssen Sie ihren Namen angeben, die Auswahl treffen, die Ihnen am ehesten zusagt und mit dem Plus-Button am Ende der Zeile bestätigen.",
       "POLL_LOCKED_WARNING": "Die Abstimmung wurde vom Administrator gesperrt. Bewertungen und Kommentare werden eingefroren; es ist nicht mehr möglich teilzunehmen",
       "The poll is expired, it will be deleted soon.": "Der Zeitraum für die Umfrage ist überschritten, sie wird bald gelöscht werden.",

locale/en.json

@@ -3,24 +3,24 @@
       "Define dates or subjects to choose": "Define dates or subjects to choose from",
       "Discuss and make a decision": "Discuss and make a decision",
       "Do you want to": "Do you want to",
-      "Framadate is an online service for planning an appointment or make a decision quickly and easily. No registration is required.": "Framadate is an online service for planning an appointment or making a decision quickly and easily. No registration is required.",
+      "Framadate is an online service for planning an appointment or make a decision quickly and easily. No registration is required.": "DateChaprilOrg is an online service for planning an appointment or making a decision quickly and easily. No registration is required.",
       "Here is how it works:": "Here is how it works:",
       "Make a poll": "Create a poll",
       "Send the poll link to your friends or colleagues": "Send the poll link to your friends or colleagues",
-      "What is that?": "What is Framadate?",
+      "What is that?": "What is DateChaprilOrg?",
       "view an example?": "view an example?"
    },
    "2nd section": {
       "CeCILL-B license": "CeCILL-B license",
-      "Framadate was initially based on ": "Framadate was initially based on ",
-      "It is governed by the": "Framadate is licensed under the",
+      "Framadate was initially based on ": "DateChaprilOrg is a Framadate initially based on ",
+      "It is governed by the": "It is licensed under the",
       "The software": "The software",
-      "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "This software needs JavaScript and cookies enabled. It is compatible with the following web browsers:",
+      "This software needs javascript and cookies enabled. It is compatible with the following web browsers:": "This software needs JavaScript and cookies enabled. It is compatible with the usuals web browsers",
       "a software developed by the University of Strasbourg. Today, it is devevoped by the association Framasoft.": "software developed by the University of Strasbourg. These days, it is developed by the Framasoft association."
    },
    "3rd section": {
       "Cultivate your garden": "Grow your own",
-      "If you want to install the software for your own use and thus increase your independence, we help you on:": "If you want to install the software for your own use and thus increase your independence, we can help you at:",
+      "If you want to install the software for your own use and thus increase your independence, we help you on:": "If you want to install the software for your own use and thus increase your independence, you will find of the help at:",
       "To participate in the software development, suggest improvements or simply download it, please visit ": "To participate in the software development, suggest improvements or simply download it, please visit ",
       "the development site": "the development site"
    },
@@ -66,6 +66,7 @@
       "Installation checking": "Installation checking",
       "OpenSSL extension loaded.": "OpenSSL extension loaded.",
       "PHP Intl extension is enabled.": "PHP Intl extension is enabled.",
+      "PHP mbstring extension is enabled.": "PHP mbstring extension is enabled.",
       "PHP version %s is enough (needed at least PHP %s).": "PHP version %s is enough (needed at least PHP %s).",
       "The config file directory (%s) is not writable and the config file (%s) does not exists.": "The config file directory (%s) is not writable and the config file (%s) does not exists.",
       "The config file directory (%s) is writable.": "The config file directory (%s) is writable.",
@@ -74,6 +75,7 @@
       "The template compile directory (%s) is not writable.": "The template compile directory (%s) is not writable.",
       "The template compile directory (%s) is writable.": "The template compile directory (%s) is writable.",
       "You need to enable the PHP Intl extension.": "You need to enable the PHP Intl extension.",
+      "You need to enable the PHP mbstring extension.": "You need to enable the PHP mbstring extension.",
       "Your PHP version (%s) is too old. This application needs at least PHP %s.": "Your PHP version (%s) is too old. This application needs at least PHP %s.",
       "date.timezone is set.": "date.timezone is set."
    },
@@ -136,6 +138,7 @@
       "Framadate is not properly installed, please check the \"INSTALL\" to setup the database before continuing.": "Framadate is not properly installed, please see the 'INSTALL' file for instructions on setting up the database before continuing.",
       "Javascript is disabled on your browser. Its activation is required to create a poll.": "JavaScript is disabled on your browser. It is required to create a poll.",
       "MISSING_VALUES": "Missing values",
+      "Name is limited to 32 characters": "Name is limited to 32 characters",
       "No polls found": "No polls found",
       "Password is empty": "Password is empty.",
       "Passwords do not match": "Passwords do not match.",
@@ -184,7 +187,7 @@
       "Day": "Day",
       "Description": "Description",
       "Edit": "Edit",
-      "Framadate is an online service for planning an appointment or make a decision quickly and easily.": "Framadate is an online service for planning an appointment or make a decision quickly and easily.",
+      "Framadate is an online service for planning an appointment or make a decision quickly and easily.": "DateChaprilOrg is an online service for planning an appointment or make a decision quickly and easily. This service is based on framadate",
       "Home": "Home",
       "Ifneedbe": "Under reserve",
       "Legend:": "Legend:",
@@ -199,6 +202,7 @@
       "Save": "Save",
       "Search": "Search",
       "Time": "Time",
+      "Unknown": "",
       "Validate": "Validate",
       "Yes": "Yes",
       "Your email address": "Your email address",
@@ -209,7 +213,8 @@
       "seconds": "seconds",
       "vote": "vote",
       "votes": "votes",
-      "with": "with"
+      "with": "with",
+      "Unknown": "Unknown"
    },
    "Homepage": {
       "Make a classic poll": "Make a standard poll",
@@ -237,8 +242,10 @@
    },
    "Mail": {
       "Author's message": "Author's message",
-      "FOOTER": "\"The road is long, but the way is clear…\"<br/>Framasoft lives only by your donations.<br/>Thank you in advance for your support https://soutenir.framasoft.org",
+      "Message for the author": "Author's message", 
+      "FOOTER": "April -  Promoting and Protecting Free Software",
       "For sending to the polled users": "Participant link",
+      "Participant link": "Participant link",
       "Notification of poll: %s": "Notification of poll: %s",
       "Poll's participation: %s": "Poll participation: %s",
       "Someone just change your poll available at the following link %s.": "Someone just changed your poll at the following link <a href=\"%1$s\">%1$s</a>.",
@@ -266,7 +273,8 @@
       "You have to provide a password so you can participate to the poll.": "You have to provide a password so you can participate to the poll.",
       "You have to provide a password to access the poll.": "You have to provide a password to access the poll."
    },
-   "Poll results": {
+    "Poll results": {
+      "Add a column": "Add a column",
       "Addition": "Total",
       "Best choice": "Best choice",
       "Best choices": "Best choices",
@@ -274,6 +282,7 @@
       "Display the chart of the results": "Display the chart of the results",
       "Edit the line: %s": "Edit line: %s",
       "Link to edit this particular line": "Link to edit this particular line",
+      "Link to edit this particular line has been copied!": "The link to edit this particular line has been copied!",
       "Link to edit this particular line has been copied inside the clipboard!": "The link to edit this particular line has been copied to the clipboard!",
       "Remove the line:": "Remove line:",
       "Save the choices": "Save choices",
@@ -401,10 +410,10 @@
       "Once you have confirmed the creation of your poll, you will be automatically redirected on the administration page of your poll.": "Once you have confirmed the creation of your poll, you will automatically be redirected to the poll's administration page.",
       "Removal date and confirmation (3 on 3)": "Removal date and confirmation (3 of 3)",
       "Then, you will receive quickly two emails: one contening the link of your poll for sending it to the voters, the other contening the link to the administration page of your poll.": "Then you will receive two emails: one containing the link of your poll for sending to the participants, the other containing the link to the poll administration page.",
-      "You can set a closer archiving date for it.": "You can set a specific expiry date for the poll.",
-      "Your poll will automatically be archived": "Your poll will automatically be archived",
+      "You can set a closer archiving date for it.": "You can set a closer expiry date for the poll.",
+      "Your poll will automatically be archived": "Your poll will automatically expired in",
       "Your poll will be automatically archived in %d days.": "Your poll will be automatically archived in %d days.",
-      "after the last date of your poll.": "after the last date of your poll."
+      "after the last date of your poll.": " from today. It will definitively be deleted 60 days after its expiration."
    },
    "adminstuds": {
       "Add a column": "Add a column",
@@ -446,6 +455,7 @@
    "studs": {
       "Adding the vote succeeded": "Vote added",
       "Deletion date:": "Deletion date:",
+      "Download as ical/ics file": "Download as ical/ics file",
       "If you want to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.": "If you want to vote in this poll, you have to give your name, make your choice, and submit it with the plus button at the end of the line.",
       "POLL_LOCKED_WARNING": "The administrator locked this poll. Votes and comments are frozen, it is no longer possible to participate",
       "The poll is expired, it will be deleted soon.": "The poll has expired, it will soon be deleted.",

locale/eo.json

@@ -208,7 +208,8 @@
       "seconds": "seconds",
       "vote": "vote",
       "votes": "votes",
-      "with": "with"
+      "with": "with",
+      "Unknown": "Nekonata"
    },
    "Homepage": {
       "Make a classic poll": "Make a standard poll",
@@ -236,7 +237,7 @@
    },
    "Mail": {
       "Author's message": "Author's message",
-      "FOOTER": "\"The road is long, but the way is clear…\"<br/>Framasoft lives only by your donations.<br/>Thank you in advance for your support https://soutenir.framasoft.org",
+      "FOOTER": "April - Promouvoir et défendre le logiciel libre",
       "For sending to the polled users": "Participant link",
       "Notification of poll: %s": "Notification of poll: %s",
       "Poll's participation: %s": "Poll participation: %s",