Compare commits
162 Commits
1.1.1
...
chapril-1.
Author | SHA1 | Date | |
---|---|---|---|
ff6abe4001 | |||
6d8c60c88b | |||
|
cd9b00d0e9 | ||
|
36681dcdea | ||
|
125045bb74 | ||
|
c2f20b1ab2 | ||
|
cffbeaf51d | ||
|
7343463c74 | ||
|
7465852eb4 | ||
|
f30fe54c4c | ||
|
ac932e55f6 | ||
|
fb04860c78 | ||
|
9322a41d0c | ||
|
65cbc8b4b4 | ||
|
fc353ce708 | ||
|
7603bed6d9 | ||
|
6144f33e9f | ||
|
2995851e2a | ||
|
0d4bbe8f2d | ||
|
dffd7edf42 | ||
|
e7f7e26141 | ||
|
3de07eb565 | ||
|
9239954123 | ||
|
76e59902e4 | ||
|
2c3148fe9e | ||
|
5a5c233a5e | ||
|
9c969f8896 | ||
|
3b9dcd8085 | ||
|
bd12f33e12 | ||
|
f877e4a27f | ||
|
86934e9753 | ||
|
12ce504421 | ||
|
0aa11211f3 | ||
|
61a63c55bd | ||
|
03dbceea5a | ||
|
d971e015a6 | ||
|
bfd2fe5351 | ||
|
d87243873f | ||
|
6e40f1cf02 | ||
ff62406853 | |||
8d9770c584 | |||
eed7da32bd | |||
|
02229c671b | ||
|
e0028dc813 | ||
|
ecee1b5025 | ||
|
ab211a93e8 | ||
|
6ec188da23 | ||
|
709b48f293 | ||
|
b46430ebe2 | ||
|
36cef8cc39 | ||
|
a5c7df64b2 | ||
|
c266373344 | ||
|
76f936b0cf | ||
|
fa6bd17365 | ||
|
2ce6e56f8a | ||
|
9dd52be963 | ||
|
299b87a2b6 | ||
|
00ad08d037 | ||
|
12d4bdb857 | ||
|
15e72d6957 | ||
|
dda9c851ab | ||
|
cb7823574e | ||
|
eab3150ba6 | ||
|
69e69efe32 | ||
|
dcd30e0974 | ||
|
d0e01434b7 | ||
f1587f7b36 | |||
9068919c47 | |||
c269048008 | |||
4ec047218a | |||
d0ffcd0dba | |||
fe0558955b | |||
a48b48abc8 | |||
75ee2ef419 | |||
|
8357c0e757 | ||
|
6d2101a3cb | ||
|
1b87fac9fa | ||
|
de56c42d64 | ||
f6855dce8f | |||
6030c3da3a | |||
163630bc66 | |||
a540df01ef | |||
2db36d63bd | |||
415637f4f8 | |||
88c62dc13d | |||
51b27b6b73 | |||
bbe505ed41 | |||
0bab6f939f | |||
c6fda43581 | |||
fd91b558a3 | |||
|
e8747ffef6 | ||
|
0900c92fd6 | ||
|
b30d7f2076 | ||
|
ee8a423e00 | ||
23f933595b | |||
a75ce8aab5 | |||
b108cbbd15 | |||
4d58bc9371 | |||
|
bf3313118a | ||
|
ec53d9c504 | ||
|
5b29497859 | ||
|
30045fd56d | ||
add73d3189 | |||
80f99c9c68 | |||
f3aab00199 | |||
b9715d7142 | |||
2c7d79dca2 | |||
4cf50cb7bf | |||
1bf1656d87 | |||
8d76fae8a1 | |||
|
0e72dafbf6 | ||
|
e35589e1a8 | ||
|
4fa7ae12d4 | ||
|
15e1d1cc18 | ||
|
ca347b024d | ||
4106e2ca96 | |||
|
faa2ee1289 | ||
|
46338cc078 | ||
cb10c87d07 | |||
ebe9add057 | |||
13c2543a7a | |||
c2eb45666a | |||
30c94c7aa1 | |||
4fe0b2097f | |||
f4debb7da8 | |||
506c56aa28 | |||
782a42d571 | |||
205c9230ad | |||
46356b9744 | |||
25def10867 | |||
|
e3060e18d2 | ||
|
84ac58c430 | ||
|
79586319fc | ||
|
70db1e91e0 | ||
|
5ffd4361e4 | ||
fcfc8786fa | |||
7ba226af4a | |||
07368eb2d5 | |||
9a6784c6a6 | |||
|
2badf15074 | ||
|
b40957f484 | ||
|
a6e337e046 | ||
|
0da24788d0 | ||
|
cad9dac189 | ||
|
bc28281477 | ||
|
be128e8158 | ||
|
a1a7d180f8 | ||
|
15e78ba070 | ||
|
88fb61660a | ||
a31dcd60d6 | |||
7088684b2e | |||
f62e0408de | |||
|
59569071e8 | ||
|
30e77a77c4 | ||
|
367b239549 | ||
|
8ce671e4d9 | ||
|
901f907dd4 | ||
|
a80602e3d5 | ||
|
53572dbc1f | ||
|
b2fc3a9d53 | ||
|
baadea8e74 | ||
|
075ba1739c |
8
.gitignore
vendored
8
.gitignore
vendored
@ -8,8 +8,9 @@ nav
|
|||||||
app/inc/config.php
|
app/inc/config.php
|
||||||
vendor
|
vendor
|
||||||
cache/
|
cache/
|
||||||
tpl_c/
|
tpl_c/*
|
||||||
.php_cs.cache
|
!tpl_c/.gitkeep
|
||||||
|
.php-cs-fixer.cache
|
||||||
.zanata-cache/
|
.zanata-cache/
|
||||||
|
|
||||||
# Temp files
|
# Temp files
|
||||||
@ -24,3 +25,6 @@ Thumbs.db
|
|||||||
.project
|
.project
|
||||||
.idea/
|
.idea/
|
||||||
*.iml
|
*.iml
|
||||||
|
|
||||||
|
#ics temp file
|
||||||
|
out.ics
|
||||||
|
102
.gitlab-ci.yml
102
.gitlab-ci.yml
@ -1,36 +1,27 @@
|
|||||||
image: framasoft/framadate-ci
|
image: framasoft/framadate-ci:7.3-pdo_mysql
|
||||||
stages:
|
stages:
|
||||||
- test
|
- test
|
||||||
- deploy
|
- deploy
|
||||||
- beta
|
|
||||||
- funky
|
|
||||||
|
|
||||||
# Run php-cs-fixer and phpunit on all branches
|
# Run php-cs-fixer and phpunit on all branches
|
||||||
test:
|
test:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- composer install -o --no-interaction --no-progress --prefer-dist
|
- composer install -o --no-interaction --no-progress --prefer-dist
|
||||||
- mkdir tpl_c
|
|
||||||
- php vendor/bin/php-cs-fixer fix --verbose --dry-run
|
- php vendor/bin/php-cs-fixer fix --verbose --dry-run
|
||||||
- vendor/bin/phpunit --bootstrap app/tests/bootstrap.php --debug app/tests
|
- 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:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
- vendor/
|
- 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
|
# Create artifacts on master
|
||||||
pages:
|
pages:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
@ -39,14 +30,29 @@ pages:
|
|||||||
- git checkout ${latesttag}
|
- git checkout ${latesttag}
|
||||||
- composer install -o --no-interaction --no-progress --prefer-dist --no-dev
|
- composer install -o --no-interaction --no-progress --prefer-dist --no-dev
|
||||||
- composer dump-autoload --optimize --no-dev --classmap-authoritative
|
- composer dump-autoload --optimize --no-dev --classmap-authoritative
|
||||||
- mkdir tpl_c
|
|
||||||
- mkdir framadate
|
- mkdir framadate
|
||||||
- mv `ls -A | grep -v framadate` ./framadate
|
- mv `ls -A | grep -v framadate` ./framadate
|
||||||
- chmod -R 644 framadate/ && chmod -R 770 framadate/tpl_c/ && chmod -R 770 framadate/app/inc/
|
- echo $latesttag > framadate/VERSION
|
||||||
- zip -r latest.zip framadate
|
- 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
|
- mkdir .public
|
||||||
- cp latest.zip .public
|
- cp $RELEASE_ZIP .public/latest.zip
|
||||||
- mv .public public
|
- 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:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
@ -54,55 +60,3 @@ pages:
|
|||||||
- tags
|
- tags
|
||||||
except:
|
except:
|
||||||
- (beta|alpha)
|
- (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
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
return PhpCsFixer\Config::create()
|
return (new PhpCsFixer\Config())
|
||||||
->setRiskyAllowed(true)
|
->setRiskyAllowed(true)
|
||||||
->setRules([
|
->setRules([
|
||||||
'array_syntax' => [
|
'array_syntax' => [
|
||||||
@ -8,7 +8,8 @@ return PhpCsFixer\Config::create()
|
|||||||
],
|
],
|
||||||
'combine_consecutive_unsets' => true,
|
'combine_consecutive_unsets' => true,
|
||||||
'heredoc_to_nowdoc' => true,
|
'heredoc_to_nowdoc' => true,
|
||||||
'no_extra_consecutive_blank_lines' => [
|
'no_extra_blank_lines' => [
|
||||||
|
'tokens' => [
|
||||||
'break',
|
'break',
|
||||||
'continue',
|
'continue',
|
||||||
'extra',
|
'extra',
|
||||||
@ -18,6 +19,7 @@ return PhpCsFixer\Config::create()
|
|||||||
'parenthesis_brace_block',
|
'parenthesis_brace_block',
|
||||||
'square_brace_block',
|
'square_brace_block',
|
||||||
'curly_brace_block'
|
'curly_brace_block'
|
||||||
|
]
|
||||||
],
|
],
|
||||||
'no_unreachable_default_argument_value' => true,
|
'no_unreachable_default_argument_value' => true,
|
||||||
'no_useless_else' => true,
|
'no_useless_else' => true,
|
||||||
@ -38,7 +40,8 @@ return PhpCsFixer\Config::create()
|
|||||||
->exclude([
|
->exclude([
|
||||||
'vendor',
|
'vendor',
|
||||||
'var',
|
'var',
|
||||||
'web'
|
'web',
|
||||||
|
'tpl_c'
|
||||||
])
|
])
|
||||||
->in(__DIR__)
|
->in(__DIR__)
|
||||||
)
|
)
|
210
CHANGELOG.md
210
CHANGELOG.md
@ -1,5 +1,215 @@
|
|||||||
# Changelog de framadate
|
# 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)
|
## 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 : 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
|
- Amélioration : Les mails sont envoyés en multipart pour les lecteurs ne supportant pas HTML
|
||||||
|
14
README.md
14
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.
|
![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
|
# 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
|
# Contribute
|
||||||
|
|
||||||
## Code
|
## 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
|
# 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
|
# Used libraries
|
||||||
|
|
||||||
* PHP [PHP 5.6](http://php.net)
|
* PHP [PHP 7.3](http://php.net)
|
||||||
* Templating [Smarty](http://www.smarty.net/),
|
* Templating [Smarty](http://www.smarty.net/),
|
||||||
* I18N [o80-i18n](https://github.com/olivierperez/o80-i18n)
|
* I18N [o80-i18n](https://framagit.org/framasoft/framadate/o80-i18nn)
|
||||||
* Database: PostgreSQL ou [MySQL 5.5](https://dev.mysql.com/downloads/mysql/5.5.html)
|
* Database: MySQL or MariaDB.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ $is_admin = false;
|
|||||||
/*----------*/
|
/*----------*/
|
||||||
|
|
||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($logService);
|
||||||
$inputService = new InputService();
|
$inputService = new InputService();
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
$notificationService = new NotificationService($mailService);
|
$notificationService = new NotificationService($mailService);
|
||||||
@ -63,7 +63,7 @@ if (!empty($_POST['poll_admin'])) {
|
|||||||
|
|
||||||
if (!$poll) {
|
if (!$poll) {
|
||||||
$message = new Message('error', __('Error', 'This poll doesn\'t exist !'));
|
$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'));
|
$message = new Message('error', __('Password', 'Wrong password'));
|
||||||
} else {
|
} else {
|
||||||
$name = $inputService->filterName($_POST['name']);
|
$name = $inputService->filterName($_POST['name']);
|
||||||
@ -88,8 +88,10 @@ if (!$poll) {
|
|||||||
|
|
||||||
$smarty->error_reporting = E_ALL & ~E_NOTICE;
|
$smarty->error_reporting = E_ALL & ~E_NOTICE;
|
||||||
$smarty->assign('comments', $comments);
|
$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');
|
$comments_html = $smarty->fetch('part/comments_list.tpl');
|
||||||
|
|
||||||
$response = ['result' => $result, 'message' => $message, 'comments' => $comments_html];
|
$response = ['result' => $result, 'message' => $message, 'comments' => $comments_html];
|
||||||
|
|
||||||
echo json_encode($response);
|
echo json_encode($response, JSON_THROW_ON_ERROR);
|
||||||
|
@ -29,7 +29,7 @@ include_once __DIR__ . '/../app/inc/init.php';
|
|||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$sessionService = new SessionService();
|
$sessionService = new SessionService();
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($logService);
|
||||||
|
|
||||||
$result = false;
|
$result = false;
|
||||||
$message = null;
|
$message = null;
|
||||||
@ -45,7 +45,7 @@ if (!empty($_POST['poll'])) {
|
|||||||
$token = $sessionService->get("Common", SESSION_EDIT_LINK_TOKEN);
|
$token = $sessionService->get("Common", SESSION_EDIT_LINK_TOKEN);
|
||||||
$token_form_value = empty($_POST['token']) ? null : $_POST['token'];
|
$token_form_value = empty($_POST['token']) ? null : $_POST['token'];
|
||||||
$editedVoteUniqueId = filter_input(INPUT_POST, 'editedVoteUniqueId', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
|
$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)) {
|
|| !$token->check($token_form_value) || is_null($editedVoteUniqueId)) {
|
||||||
$message = new Message('error', __('Error', 'Something is going wrong...'));
|
$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];
|
$response = ['result' => $result, 'message' => $message];
|
||||||
|
|
||||||
echo json_encode($response);
|
echo json_encode($response, JSON_THROW_ON_ERROR);
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
use Framadate\Message;
|
use Framadate\Message;
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
|
||||||
define('ROOT_DIR', __DIR__ . '/../');
|
const ROOT_DIR = __DIR__ . '/../';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checking for missing vendors.
|
* Checking for missing vendors.
|
||||||
@ -46,6 +46,7 @@ $ALLOWED_LANGUAGES = [
|
|||||||
'de' => 'Deutsch',
|
'de' => 'Deutsch',
|
||||||
'it' => 'Italiano',
|
'it' => 'Italiano',
|
||||||
'br' => 'Brezhoneg',
|
'br' => 'Brezhoneg',
|
||||||
|
'ca' => 'Català',
|
||||||
];
|
];
|
||||||
const DEFAULT_LANGUAGE = 'en';
|
const DEFAULT_LANGUAGE = 'en';
|
||||||
require_once ROOT_DIR . 'app/inc/i18n.php';
|
require_once ROOT_DIR . 'app/inc/i18n.php';
|
||||||
@ -57,7 +58,7 @@ require_once ROOT_DIR . 'app/inc/i18n.php';
|
|||||||
* @param Message $b
|
* @param Message $b
|
||||||
* @return int
|
* @return int
|
||||||
*/
|
*/
|
||||||
function compareCheckMessage(Message $a, Message $b)
|
function compareCheckMessage(Message $a, Message $b): int
|
||||||
{
|
{
|
||||||
$values = [
|
$values = [
|
||||||
'danger' => 0,
|
'danger' => 0,
|
||||||
@ -89,7 +90,7 @@ $conf_filename = $inc_directory . 'config.php';
|
|||||||
if (version_compare(PHP_VERSION, PHP_NEEDED_VERSION) >= 0) {
|
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));
|
$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 {
|
} 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
|
// INTL extension
|
||||||
@ -99,6 +100,13 @@ if (extension_loaded('intl')) {
|
|||||||
$messages[] = new Message('danger', __('Check','You need to enable the PHP Intl extension.'));
|
$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 ?
|
// Is template compile dir exists and writable ?
|
||||||
if (!file_exists(ROOT_DIR . COMPILE_DIR)) {
|
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)));
|
$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)) {
|
if (file_exists($conf_filename)) {
|
||||||
$messages[] = new Message('info', __('Check','The config file exists.'));
|
$messages[] = new Message('info', __('Check','The config file exists.'));
|
||||||
} elseif (is_writable($inc_directory)) {
|
} 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 {
|
} 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));
|
$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>
|
<body>
|
||||||
<div class="container ombre">
|
<div class="container ombre">
|
||||||
<div class="row">
|
<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">
|
<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')?>" >
|
<select name="lang" class="form-control" title="<?=__('Language selector', 'Select the language')?>" >
|
||||||
<?php foreach ($ALLOWED_LANGUAGES as $lang_key => $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 } ?>
|
<?php } ?>
|
||||||
</select>
|
</select>
|
||||||
<span class="input-group-btn">
|
<span class="input-group-btn">
|
||||||
|
91
admin/cron_purge.php
Normal file
91
admin/cron_purge.php
Normal file
@ -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"
|
||||||
|
|
||||||
|
?>
|
@ -29,6 +29,7 @@ if (is_file(CONF_FILENAME)) {
|
|||||||
|
|
||||||
$error = null;
|
$error = null;
|
||||||
$installService = new InstallService();
|
$installService = new InstallService();
|
||||||
|
$result['details'] = null;
|
||||||
|
|
||||||
if (!empty($_POST)) {
|
if (!empty($_POST)) {
|
||||||
$installService->updateFields($_POST);
|
$installService->updateFields($_POST);
|
||||||
@ -38,10 +39,12 @@ if (!empty($_POST)) {
|
|||||||
header(('Location: ' . Utils::get_server_name() . 'admin/migration.php'));
|
header(('Location: ' . Utils::get_server_name() . 'admin/migration.php'));
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
$error = __('Error', $result['code']);
|
$error = __('Error', $result['code']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$smarty->assign('error', $error);
|
$smarty->assign('error', $error);
|
||||||
|
$smarty->assign('error_details', $result['details']);
|
||||||
$smarty->assign('title', __('Admin', 'Installation'));
|
$smarty->assign('title', __('Admin', 'Installation'));
|
||||||
$smarty->assign('fields', $installService->getFields());
|
$smarty->assign('fields', $installService->getFields());
|
||||||
$smarty->display('admin/install.tpl');
|
$smarty->display('admin/install.tpl');
|
@ -17,6 +17,7 @@
|
|||||||
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
* 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_hidden_In_poll_For_0_9;
|
||||||
use Framadate\Migration\AddColumn_receiveNewComments_For_0_9;
|
use Framadate\Migration\AddColumn_receiveNewComments_For_0_9;
|
||||||
use Framadate\Migration\AddColumn_uniqId_In_vote_For_0_9;
|
use Framadate\Migration\AddColumn_uniqId_In_vote_For_0_9;
|
||||||
@ -57,7 +58,7 @@ $migrations = [
|
|||||||
// ---------------------------------------
|
// ---------------------------------------
|
||||||
|
|
||||||
// Check if MIGRATION_TABLE already exists
|
// Check if MIGRATION_TABLE already exists
|
||||||
/** @var \Framadate\FramaDB $connect */
|
/** @var FramaDB $connect */
|
||||||
$tables = $connect->allTables();
|
$tables = $connect->allTables();
|
||||||
$pdo = $connect->getPDO();
|
$pdo = $connect->getPDO();
|
||||||
$prefixedMigrationTable = Utils::table(MIGRATION_TABLE);
|
$prefixedMigrationTable = Utils::table(MIGRATION_TABLE);
|
||||||
|
@ -50,7 +50,7 @@ $poll_to_delete = null;
|
|||||||
/*----------*/
|
/*----------*/
|
||||||
|
|
||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($logService);
|
||||||
$adminPollService = new AdminPollService($connect, $pollService, $logService);
|
$adminPollService = new AdminPollService($connect, $pollService, $logService);
|
||||||
$superAdminService = new SuperAdminService();
|
$superAdminService = new SuperAdminService();
|
||||||
$securityService = new SecurityService();
|
$securityService = new SecurityService();
|
||||||
|
@ -34,14 +34,14 @@ $message = null;
|
|||||||
/*----------*/
|
/*----------*/
|
||||||
|
|
||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$purgeService = new PurgeService($connect, $logService);
|
$purgeService = new PurgeService($logService);
|
||||||
$securityService = new SecurityService();
|
$securityService = new SecurityService();
|
||||||
$inputService = new InputService();
|
$inputService = new InputService();
|
||||||
|
|
||||||
/* POST */
|
/* POST */
|
||||||
/*-----*/
|
/*-----*/
|
||||||
|
|
||||||
$action = $inputService->filterName(isset($_POST['action']) ? $_POST['action'] : null);
|
$action = $inputService->filterName($_POST['action'] ?? null);
|
||||||
|
|
||||||
/* PAGE */
|
/* PAGE */
|
||||||
/* ---- */
|
/* ---- */
|
||||||
|
@ -47,7 +47,7 @@ $editingVoteId = 0;
|
|||||||
/*----------*/
|
/*----------*/
|
||||||
|
|
||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($logService);
|
||||||
$adminPollService = new AdminPollService($connect, $pollService, $logService);
|
$adminPollService = new AdminPollService($connect, $pollService, $logService);
|
||||||
$inputService = new InputService();
|
$inputService = new InputService();
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
@ -113,7 +113,7 @@ if (isset($_POST['update_poll_info'])) {
|
|||||||
$updated = true;
|
$updated = true;
|
||||||
}
|
}
|
||||||
} elseif ($field === 'rules') {
|
} elseif ($field === 'rules') {
|
||||||
$rules = strip_tags($_POST['rules']);
|
$rules = (int) strip_tags($_POST['rules']);
|
||||||
switch ($rules) {
|
switch ($rules) {
|
||||||
case 0:
|
case 0:
|
||||||
$poll->active = false;
|
$poll->active = false;
|
||||||
@ -137,38 +137,41 @@ if (isset($_POST['update_poll_info'])) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
} elseif ($field === 'expiration_date') {
|
} elseif ($field === 'expiration_date') {
|
||||||
$expiration_date = $inputService->filterDate($_POST['expiration_date']);
|
$givenExpirationDate = $inputService->parseDate($_POST['expiration_date']);
|
||||||
if ($expiration_date) {
|
$expiration_date = $inputService->validateDate($givenExpirationDate, $pollService->minExpiryDate(), $pollService->maxExpiryDate());
|
||||||
$poll->end_date = $expiration_date;
|
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;
|
$updated = true;
|
||||||
}
|
}
|
||||||
} elseif ($field === 'name') {
|
} 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) {
|
if ($admin_name) {
|
||||||
$poll->admin_name = $admin_name;
|
$poll->admin_name = $admin_name;
|
||||||
$updated = true;
|
$updated = true;
|
||||||
}
|
}
|
||||||
} elseif ($field === 'hidden') {
|
} elseif ($field === 'hidden') {
|
||||||
$hidden = isset($_POST['hidden']) ? $inputService->filterBoolean($_POST['hidden']) : false;
|
$hidden = isset($_POST['hidden']) && $inputService->filterBoolean($_POST['hidden']);
|
||||||
if ($hidden !== $poll->hidden) {
|
if ($hidden !== $poll->hidden) {
|
||||||
$poll->hidden = $hidden;
|
$poll->hidden = $hidden;
|
||||||
$poll->results_publicly_visible = false;
|
$poll->results_publicly_visible = false;
|
||||||
$updated = true;
|
$updated = true;
|
||||||
}
|
}
|
||||||
} elseif ($field === 'removePassword') {
|
} elseif ($field === 'removePassword') {
|
||||||
$removePassword = isset($_POST['removePassword']) ? $inputService->filterBoolean($_POST['removePassword']) : false;
|
$removePassword = isset($_POST['removePassword']) && $inputService->filterBoolean($_POST['removePassword']);
|
||||||
if ($removePassword) {
|
if ($removePassword) {
|
||||||
$poll->results_publicly_visible = false;
|
$poll->results_publicly_visible = false;
|
||||||
$poll->password_hash = null;
|
$poll->password_hash = null;
|
||||||
$updated = true;
|
$updated = true;
|
||||||
}
|
}
|
||||||
} elseif ($field === 'password') {
|
} elseif ($field === 'password') {
|
||||||
$password = isset($_POST['password']) ? $_POST['password'] : null;
|
$password = $_POST['password'] ?? null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Did the user choose results to be publicly visible ?
|
* 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
|
* If there's one, save the password
|
||||||
*/
|
*/
|
||||||
|
@ -36,22 +36,22 @@ class Choice
|
|||||||
$this->slots = [];
|
$this->slots = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function addSlot($slot)
|
public function addSlot($slot): void
|
||||||
{
|
{
|
||||||
$this->slots[] = $slot;
|
$this->slots[] = $slot;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getName()
|
public function getName(): string
|
||||||
{
|
{
|
||||||
return $this->name;
|
return $this->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getSlots()
|
public function getSlots(): array
|
||||||
{
|
{
|
||||||
return $this->slots;
|
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);
|
return strcmp($a->name, $b->name);
|
||||||
}
|
}
|
||||||
|
@ -23,14 +23,13 @@ namespace Framadate;
|
|||||||
* Class Editable
|
* Class Editable
|
||||||
*
|
*
|
||||||
* Is used to specify the poll's edition permissions.
|
* Is used to specify the poll's edition permissions.
|
||||||
* @TODO : wait to use the SplEnum
|
|
||||||
*
|
*
|
||||||
* @package Framadate
|
* @package Framadate
|
||||||
*/
|
*/
|
||||||
class Editable { // extends SplEnum
|
class Editable { // extends SplEnum
|
||||||
const __default = self::EDITABLE_BY_ALL;
|
const __default = self::EDITABLE_BY_ALL;
|
||||||
|
|
||||||
const NOT_EDITABLE = 0;
|
public const NOT_EDITABLE = 0;
|
||||||
const EDITABLE_BY_ALL = 1;
|
public const EDITABLE_BY_ALL = 1;
|
||||||
const EDITABLE_BY_OWN = 2;
|
public const EDITABLE_BY_OWN = 2;
|
||||||
}
|
}
|
@ -2,6 +2,4 @@
|
|||||||
namespace Framadate\Exception;
|
namespace Framadate\Exception;
|
||||||
|
|
||||||
class AlreadyExistsException extends \Exception {
|
class AlreadyExistsException extends \Exception {
|
||||||
function __construct() {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,4 @@
|
|||||||
namespace Framadate\Exception;
|
namespace Framadate\Exception;
|
||||||
|
|
||||||
class ConcurrentEditionException extends \Exception {
|
class ConcurrentEditionException extends \Exception {
|
||||||
function __construct() {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -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
|
* Thrown when a poll has a maximum votes constraint for options, and a vote happened since the poll was rendered
|
||||||
*/
|
*/
|
||||||
class ConcurrentVoteException extends \Exception {
|
class ConcurrentVoteException extends \Exception {
|
||||||
function __construct() {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,4 @@
|
|||||||
namespace Framadate\Exception;
|
namespace Framadate\Exception;
|
||||||
|
|
||||||
class MomentAlreadyExistsException extends \Exception {
|
class MomentAlreadyExistsException extends \Exception {
|
||||||
function __construct() {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
10
app/classes/Framadate/Exception/PollNotFoundException.php
Normal file
10
app/classes/Framadate/Exception/PollNotFoundException.php
Normal file
@ -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 {
|
||||||
|
}
|
@ -32,7 +32,7 @@ class Form
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Tells if users can modify their choices.
|
* Tells if users can modify their choices.
|
||||||
* @var \Framadate\Editable
|
* @var int
|
||||||
*/
|
*/
|
||||||
public $editable;
|
public $editable;
|
||||||
|
|
||||||
@ -92,11 +92,12 @@ class Form
|
|||||||
$this->clearChoices();
|
$this->clearChoices();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function clearChoices() {
|
public function clearChoices(): void
|
||||||
|
{
|
||||||
$this->choices = [];
|
$this->choices = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function addChoice(Choice $choice)
|
public function addChoice(Choice $choice): void
|
||||||
{
|
{
|
||||||
$this->choices[] = $choice;
|
$this->choices[] = $choice;
|
||||||
}
|
}
|
||||||
@ -106,8 +107,8 @@ class Form
|
|||||||
return $this->choices;
|
return $this->choices;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function sortChoices()
|
public function sortChoices(): void
|
||||||
{
|
{
|
||||||
usort($this->choices, ['Framadate\Choice', 'compare']);
|
usort($this->choices, [Choice::class, 'compare']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,19 +23,21 @@ use PDO;
|
|||||||
class FramaDB {
|
class FramaDB {
|
||||||
/**
|
/**
|
||||||
* PDO Object, connection to database.
|
* PDO Object, connection to database.
|
||||||
|
* @var PDO
|
||||||
*/
|
*/
|
||||||
private $pdo = null;
|
private $pdo;
|
||||||
|
|
||||||
function __construct($connection_string, $user, $password) {
|
public function __construct(string $connection_string, string $user, string $password) {
|
||||||
$this->pdo = new \PDO($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_DEFAULT_FETCH_MODE, PDO::FETCH_OBJ);
|
||||||
$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
|
$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;
|
return $this->pdo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -44,42 +46,50 @@ class FramaDB {
|
|||||||
*
|
*
|
||||||
* @return array The array of table names
|
* @return array The array of table names
|
||||||
*/
|
*/
|
||||||
function allTables() {
|
public function allTables(): array
|
||||||
$result = $this->pdo->query('SHOW TABLES');
|
{
|
||||||
$schemas = $result->fetchAll(\PDO::FETCH_COLUMN);
|
return $this->pdo->query('SHOW TABLES')->fetchAll(PDO::FETCH_COLUMN);
|
||||||
|
|
||||||
return $schemas;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepare($sql) {
|
/**
|
||||||
|
* @return \PDOStatement|false
|
||||||
|
*/
|
||||||
|
public function prepare(string $sql) {
|
||||||
return $this->pdo->prepare($sql);
|
return $this->pdo->prepare($sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
function beginTransaction() {
|
public function beginTransaction(): void
|
||||||
|
{
|
||||||
$this->pdo->beginTransaction();
|
$this->pdo->beginTransaction();
|
||||||
}
|
}
|
||||||
|
|
||||||
function commit() {
|
public function commit(): void
|
||||||
|
{
|
||||||
$this->pdo->commit();
|
$this->pdo->commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
function rollback() {
|
public function rollback(): void
|
||||||
|
{
|
||||||
$this->pdo->rollback();
|
$this->pdo->rollback();
|
||||||
}
|
}
|
||||||
|
|
||||||
function errorCode() {
|
public function errorCode(): ?string {
|
||||||
return $this->pdo->errorCode();
|
return $this->pdo->errorCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
function errorInfo() {
|
public function errorInfo(): array
|
||||||
|
{
|
||||||
return $this->pdo->errorInfo();
|
return $this->pdo->errorInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
function query($sql) {
|
/**
|
||||||
|
* @return \PDOStatement|false
|
||||||
|
*/
|
||||||
|
public function query($sql) {
|
||||||
return $this->pdo->query($sql);
|
return $this->pdo->query($sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function lastInsertId() {
|
public function lastInsertId(): string {
|
||||||
return $this->pdo->lastInsertId();
|
return $this->pdo->lastInsertId();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ class Message {
|
|||||||
var $linkIcon;
|
var $linkIcon;
|
||||||
var $includeTemplate;
|
var $includeTemplate;
|
||||||
|
|
||||||
function __construct($type, $message, $link=null, $linkTitle=null, $linkIcon=null, $includeTemplate=null) {
|
public function __construct($type, $message, $link=null, $linkTitle=null, $linkIcon=null, $includeTemplate=null) {
|
||||||
$this->type = $type;
|
$this->type = $type;
|
||||||
$this->message = $message;
|
$this->message = $message;
|
||||||
$this->link = $link;
|
$this->link = $link;
|
||||||
@ -35,4 +35,3 @@ class Message {
|
|||||||
$this->includeTemplate = $includeTemplate;
|
$this->includeTemplate = $includeTemplate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration adds the field Value_Max on the poll table.
|
* This migration adds the field Value_Max on the poll table.
|
||||||
@ -27,7 +28,7 @@ use Framadate\Utils;
|
|||||||
* @version 0.9
|
* @version 0.9
|
||||||
*/
|
*/
|
||||||
class AddColumn_ValueMax_In_poll_For_1_1 implements Migration {
|
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
|
* @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';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @return bool true is the Migration should be executed.
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method is called only one time in the migration page.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$this->alterPollTable($pdo);
|
$this->alterPollTable($pdo);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function alterPollTable(\PDO $pdo) {
|
private function alterPollTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('poll') . '`
|
ALTER TABLE `' . Utils::table('poll') . '`
|
||||||
ADD `ValueMax` TINYINT NULL;');
|
ADD `ValueMax` TINYINT NULL;');
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration adds the field hidden on the poll table.
|
* This migration adds the field hidden on the poll table.
|
||||||
@ -27,7 +28,7 @@ use Framadate\Utils;
|
|||||||
* @version 0.9
|
* @version 0.9
|
||||||
*/
|
*/
|
||||||
class AddColumn_hidden_In_poll_For_0_9 implements Migration {
|
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
|
* @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';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @return bool true is the Migration should be executed.
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool
|
||||||
|
{
|
||||||
$stmt = $pdo->query('SHOW TABLES');
|
$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
|
// Check if tables of v0.9 are presents
|
||||||
$diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
|
$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.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool
|
||||||
|
{
|
||||||
$this->alterPollTable($pdo);
|
$this->alterPollTable($pdo);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function alterPollTable(\PDO $pdo) {
|
private function alterPollTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('poll') . '`
|
ALTER TABLE `' . Utils::table('poll') . '`
|
||||||
ADD `hidden` TINYINT( 1 ) NOT NULL DEFAULT "0"');
|
ADD `hidden` TINYINT( 1 ) NOT NULL DEFAULT "0"');
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration adds the field receiveNewComments on the poll table.
|
* This migration adds the field receiveNewComments on the poll table.
|
||||||
@ -27,7 +28,7 @@ use Framadate\Utils;
|
|||||||
* @version 0.9
|
* @version 0.9
|
||||||
*/
|
*/
|
||||||
class AddColumn_receiveNewComments_For_0_9 implements Migration {
|
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
|
* @return string The description of the migration class
|
||||||
*/
|
*/
|
||||||
function description() {
|
public function description(): string
|
||||||
|
{
|
||||||
return 'Add column "receiveNewComments" for version 0.9';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @return bool true is the Migration should be executed.
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool
|
||||||
|
{
|
||||||
$stmt = $pdo->query('SHOW TABLES');
|
$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
|
// Check if tables of v0.9 are presents
|
||||||
$diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
|
$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.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool
|
||||||
|
{
|
||||||
$this->alterPollTable($pdo);
|
$this->alterPollTable($pdo);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function alterPollTable(\PDO $pdo) {
|
private function alterPollTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('poll') . '`
|
ALTER TABLE `' . Utils::table('poll') . '`
|
||||||
ADD `receiveNewComments` TINYINT(1) DEFAULT \'0\'
|
ADD `receiveNewComments` TINYINT(1) DEFAULT \'0\'
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration adds the field uniqId on the vote table.
|
* This migration adds the field uniqId on the vote table.
|
||||||
@ -27,7 +28,7 @@ use Framadate\Utils;
|
|||||||
* @version 0.9
|
* @version 0.9
|
||||||
*/
|
*/
|
||||||
class AddColumn_uniqId_In_vote_For_0_9 implements Migration {
|
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
|
* @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';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @return bool true is the Migration should be executed.
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool {
|
||||||
$stmt = $pdo->query('SHOW TABLES');
|
$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
|
// Check if tables of v0.9 are presents
|
||||||
$diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
|
$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.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$this->alterPollTable($pdo);
|
$this->alterPollTable($pdo);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function alterPollTable(\PDO $pdo) {
|
private function alterPollTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('vote') . '`
|
ALTER TABLE `' . Utils::table('vote') . '`
|
||||||
ADD `uniqId` CHAR(16) NOT NULL
|
ADD `uniqId` CHAR(16) NOT NULL
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration adds the fields password_hash and results_publicly_visible on the poll table.
|
* 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
|
* @version 0.9
|
||||||
*/
|
*/
|
||||||
class AddColumns_password_hash_And_results_publicly_visible_In_poll_For_0_9 implements Migration {
|
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
|
* @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';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @return bool true is the Migration should be executed.
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool {
|
||||||
$stmt = $pdo->query('SHOW TABLES');
|
$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
|
// Check if tables of v0.9 are presents
|
||||||
$diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
|
$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.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$this->alterPollTable($pdo);
|
$this->alterPollTable($pdo);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function alterPollTable(\PDO $pdo) {
|
private function alterPollTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('poll') . '`
|
ALTER TABLE `' . Utils::table('poll') . '`
|
||||||
ADD `password_hash` VARCHAR(255) NULL DEFAULT NULL ,
|
ADD `password_hash` VARCHAR(255) NULL DEFAULT NULL ,
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration alter the comment table to add a date column.
|
* This migration alter the comment table to add a date column.
|
||||||
@ -27,7 +28,7 @@ use Framadate\Utils;
|
|||||||
* @version 1.0
|
* @version 1.0
|
||||||
*/
|
*/
|
||||||
class Alter_Comment_table_adding_date implements Migration {
|
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
|
* @return string The description of the migration class
|
||||||
*/
|
*/
|
||||||
function description() {
|
public function description():string {
|
||||||
return 'Alter the comment table to add a date column.';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @return bool true is the Migration should be executed.
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This methode is called only one time in the migration page.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$this->alterCommentTable($pdo);
|
$this->alterCommentTable($pdo);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function alterCommentTable(\PDO $pdo) {
|
private function alterCommentTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('comment') . '`
|
ALTER TABLE `' . Utils::table('comment') . '`
|
||||||
ADD `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ;');
|
ADD `date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ;');
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration alter the comment table to set a length to the name column.
|
* This migration alter the comment table to set a length to the name column.
|
||||||
@ -27,7 +28,7 @@ use Framadate\Utils;
|
|||||||
* @version 1.0
|
* @version 1.0
|
||||||
*/
|
*/
|
||||||
class Alter_Comment_table_for_name_length implements Migration {
|
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
|
* @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.';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @return bool true is the Migration should be executed.
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This methode is called only one time in the migration page.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$this->alterCommentTable($pdo);
|
$this->alterCommentTable($pdo);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function alterCommentTable(\PDO $pdo) {
|
private function alterCommentTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('comment') . '`
|
ALTER TABLE `' . Utils::table('comment') . '`
|
||||||
CHANGE `name` `name` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ;');
|
CHANGE `name` `name` VARCHAR( 64 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL ;');
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration sets Poll.end_date to NULL by default
|
* This migration sets Poll.end_date to NULL by default
|
||||||
@ -27,7 +28,7 @@ use Framadate\Utils;
|
|||||||
* @version 1.1
|
* @version 1.1
|
||||||
*/
|
*/
|
||||||
class Fix_MySQL_No_Zero_Date implements Migration {
|
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
|
* @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)';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @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 = $pdo->prepare("SELECT Column_Default from Information_Schema.Columns where Table_Name = ? AND Column_Name = ?;");
|
||||||
$stmt->bindValue(1, Utils::table('poll'));
|
$stmt->bindValue(1, Utils::table('poll'));
|
||||||
$stmt->bindValue(2, 'end_date');
|
$stmt->bindValue(2, 'end_date');
|
||||||
$stmt->execute();
|
$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';
|
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.
|
* 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|void if the execution succeeded
|
* @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;');
|
$pdo->exec('ALTER TABLE ' . Utils::table('poll') . ' MODIFY end_date TIMESTAMP NULL DEFAULT NULL;');
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class From_0_0_to_0_8_Migration
|
* Class From_0_0_to_0_8_Migration
|
||||||
@ -27,7 +28,7 @@ use Framadate\Utils;
|
|||||||
* @version 0.8
|
* @version 0.8
|
||||||
*/
|
*/
|
||||||
class From_0_0_to_0_8_Migration implements Migration {
|
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
|
* @return string The description of the migration class
|
||||||
*/
|
*/
|
||||||
function description() {
|
public function description(): string {
|
||||||
return 'First installation of the Framadate application (v0.8)';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @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.
|
$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
|
// Check if there is no tables but the MIGRATION_TABLE one
|
||||||
$diff = array_diff($tables, [Utils::table(MIGRATION_TABLE)]);
|
$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.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
CREATE TABLE IF NOT EXISTS `sondage` (
|
CREATE TABLE IF NOT EXISTS `sondage` (
|
||||||
`id_sondage` char(16) NOT NULL,
|
`id_sondage` char(16) NOT NULL,
|
||||||
@ -104,5 +105,6 @@ CREATE TABLE IF NOT EXISTS `user_studs` (
|
|||||||
PRIMARY KEY (`id_users`),
|
PRIMARY KEY (`id_users`),
|
||||||
KEY `id_sondage` (`id_sondage`)
|
KEY `id_sondage` (`id_sondage`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;');
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;');
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class executes the aciton in database to migrate data from version 0.8 to 0.9.
|
* 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
|
* @version 0.9
|
||||||
*/
|
*/
|
||||||
class From_0_8_to_0_9_Migration implements Migration {
|
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
|
* @return string The description of the migration class
|
||||||
*/
|
*/
|
||||||
function description() {
|
public function description(): string {
|
||||||
return 'From 0.8 to 0.9';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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.
|
* @return bool true is the Migration should be executed.
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool {
|
||||||
$stmt = $pdo->query('SHOW TABLES');
|
$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
|
// Check if tables of v0.8 are presents
|
||||||
$diff = array_diff(['sondage', 'sujet_studs', 'comments', 'user_studs'], $tables);
|
$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.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$this->createPollTable($pdo);
|
$this->createPollTable($pdo);
|
||||||
$this->createCommentTable($pdo);
|
$this->createCommentTable($pdo);
|
||||||
$this->createSlotTable($pdo);
|
$this->createSlotTable($pdo);
|
||||||
@ -79,7 +80,8 @@ class From_0_8_to_0_9_Migration implements Migration {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function createPollTable(\PDO $pdo) {
|
private function createPollTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
CREATE TABLE IF NOT EXISTS `' . Utils::table('poll') . '` (
|
CREATE TABLE IF NOT EXISTS `' . Utils::table('poll') . '` (
|
||||||
`id` CHAR(16) NOT NULL,
|
`id` CHAR(16) NOT NULL,
|
||||||
@ -100,7 +102,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('poll') . '` (
|
|||||||
DEFAULT CHARSET = utf8');
|
DEFAULT CHARSET = utf8');
|
||||||
}
|
}
|
||||||
|
|
||||||
private function migrateFromSondageToPoll(\PDO $pdo) {
|
private function migrateFromSondageToPoll(PDO $pdo): void
|
||||||
|
{
|
||||||
$select = $pdo->query('
|
$select = $pdo->query('
|
||||||
SELECT
|
SELECT
|
||||||
`id_sondage`,
|
`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`)
|
(`id`, `admin_id`, `title`, `description`, `admin_name`, `admin_mail`, `creation_date`, `end_date`, `format`, `editable`, `receiveNewVotes`, `active`)
|
||||||
VALUE (?,?,?,?,?,?,?,?,?,?,?,?)');
|
VALUE (?,?,?,?,?,?,?,?,?,?,?,?)');
|
||||||
|
|
||||||
while ($row = $select->fetch(\PDO::FETCH_OBJ)) {
|
while ($row = $select->fetch(PDO::FETCH_OBJ)) {
|
||||||
$insert->execute([
|
$insert->execute([
|
||||||
$row->id_sondage,
|
$row->id_sondage,
|
||||||
$row->id_sondage_admin,
|
$row->id_sondage_admin,
|
||||||
@ -144,7 +147,8 @@ VALUE (?,?,?,?,?,?,?,?,?,?,?,?)');
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function createSlotTable(\PDO $pdo) {
|
private function createSlotTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` (
|
CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` (
|
||||||
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
|
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||||
@ -158,7 +162,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('slot') . '` (
|
|||||||
DEFAULT CHARSET = utf8');
|
DEFAULT CHARSET = utf8');
|
||||||
}
|
}
|
||||||
|
|
||||||
private function migrateFromSujetStudsToSlot(\PDO $pdo) {
|
private function migrateFromSujetStudsToSlot(PDO $pdo): void
|
||||||
|
{
|
||||||
$stmt = $pdo->query('SELECT * FROM sujet_studs');
|
$stmt = $pdo->query('SELECT * FROM sujet_studs');
|
||||||
$sujets = $stmt->fetchAll();
|
$sujets = $stmt->fetchAll();
|
||||||
$slots = [];
|
$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('
|
$pdo->exec('
|
||||||
CREATE TABLE IF NOT EXISTS `' . Utils::table('comment') . '` (
|
CREATE TABLE IF NOT EXISTS `' . Utils::table('comment') . '` (
|
||||||
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
|
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||||
@ -194,7 +200,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('comment') . '` (
|
|||||||
DEFAULT CHARSET = utf8');
|
DEFAULT CHARSET = utf8');
|
||||||
}
|
}
|
||||||
|
|
||||||
private function migrateFromCommentsToComment(\PDO $pdo) {
|
private function migrateFromCommentsToComment(PDO $pdo): void
|
||||||
|
{
|
||||||
$select = $pdo->query('
|
$select = $pdo->query('
|
||||||
SELECT
|
SELECT
|
||||||
`id_sondage`,
|
`id_sondage`,
|
||||||
@ -206,7 +213,7 @@ SELECT
|
|||||||
INSERT INTO `' . Utils::table('comment') . '` (`poll_id`, `name`, `comment`)
|
INSERT INTO `' . Utils::table('comment') . '` (`poll_id`, `name`, `comment`)
|
||||||
VALUE (?,?,?)');
|
VALUE (?,?,?)');
|
||||||
|
|
||||||
while ($row = $select->fetch(\PDO::FETCH_OBJ)) {
|
while ($row = $select->fetch(PDO::FETCH_OBJ)) {
|
||||||
$insert->execute([
|
$insert->execute([
|
||||||
$row->id_sondage,
|
$row->id_sondage,
|
||||||
$this->unescape($row->usercomment),
|
$this->unescape($row->usercomment),
|
||||||
@ -215,7 +222,8 @@ VALUE (?,?,?)');
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function createVoteTable(\PDO $pdo) {
|
private function createVoteTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
CREATE TABLE IF NOT EXISTS `' . Utils::table('vote') . '` (
|
CREATE TABLE IF NOT EXISTS `' . Utils::table('vote') . '` (
|
||||||
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
|
`id` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||||
@ -229,7 +237,8 @@ CREATE TABLE IF NOT EXISTS `' . Utils::table('vote') . '` (
|
|||||||
DEFAULT CHARSET = utf8');
|
DEFAULT CHARSET = utf8');
|
||||||
}
|
}
|
||||||
|
|
||||||
private function migrateFromUserStudsToVote(\PDO $pdo) {
|
private function migrateFromUserStudsToVote(PDO $pdo): void
|
||||||
|
{
|
||||||
$select = $pdo->query('
|
$select = $pdo->query('
|
||||||
SELECT
|
SELECT
|
||||||
`id_sondage`,
|
`id_sondage`,
|
||||||
@ -241,7 +250,7 @@ SELECT
|
|||||||
INSERT INTO `' . Utils::table('vote') . '` (`poll_id`, `name`, `choices`)
|
INSERT INTO `' . Utils::table('vote') . '` (`poll_id`, `name`, `choices`)
|
||||||
VALUE (?,?,?)');
|
VALUE (?,?,?)');
|
||||||
|
|
||||||
while ($row = $select->fetch(\PDO::FETCH_OBJ)) {
|
while ($row = $select->fetch(PDO::FETCH_OBJ)) {
|
||||||
$insert->execute([
|
$insert->execute([
|
||||||
$row->id_sondage,
|
$row->id_sondage,
|
||||||
$this->unescape($row->nom),
|
$this->unescape($row->nom),
|
||||||
@ -250,7 +259,8 @@ VALUE (?,?,?)');
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function transformSujetToSlot($sujet) {
|
private function transformSujetToSlot($sujet): array
|
||||||
|
{
|
||||||
$slots = [];
|
$slots = [];
|
||||||
$ex = explode(',', $sujet->sujet);
|
$ex = explode(',', $sujet->sujet);
|
||||||
$isDatePoll = strpos($sujet->sujet, '@');
|
$isDatePoll = strpos($sujet->sujet, '@');
|
||||||
@ -279,14 +289,16 @@ VALUE (?,?,?)');
|
|||||||
return $slots;
|
return $slots;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function dropOldTables(\PDO $pdo) {
|
private function dropOldTables(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('DROP TABLE `comments`');
|
$pdo->exec('DROP TABLE `comments`');
|
||||||
$pdo->exec('DROP TABLE `sujet_studs`');
|
$pdo->exec('DROP TABLE `sujet_studs`');
|
||||||
$pdo->exec('DROP TABLE `user_studs`');
|
$pdo->exec('DROP TABLE `user_studs`');
|
||||||
$pdo->exec('DROP TABLE `sondage`');
|
$pdo->exec('DROP TABLE `sondage`');
|
||||||
}
|
}
|
||||||
|
|
||||||
private function unescape($value) {
|
private function unescape(string $value): string
|
||||||
|
{
|
||||||
return stripslashes(html_entity_decode($value, ENT_QUOTES));
|
return stripslashes(html_entity_decode($value, ENT_QUOTES));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,7 @@ namespace Framadate\Migration;
|
|||||||
|
|
||||||
use Framadate\Security\Token;
|
use Framadate\Security\Token;
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This migration generate uniqId for all legacy votes.
|
* This migration generate uniqId for all legacy votes.
|
||||||
@ -28,16 +29,16 @@ use Framadate\Utils;
|
|||||||
* @version 0.9
|
* @version 0.9
|
||||||
*/
|
*/
|
||||||
class Generate_uniqId_for_old_votes implements Migration {
|
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';
|
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');
|
$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
|
// Check if tables of v0.9 are presents
|
||||||
$diff = array_diff([Utils::table('poll'), Utils::table('slot'), Utils::table('vote'), Utils::table('comment')], $tables);
|
$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.
|
* 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
|
* @return bool true is the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$pdo->beginTransaction();
|
$pdo->beginTransaction();
|
||||||
$this->generateUniqIdsForEmptyOnes($pdo);
|
$this->generateUniqIdsForEmptyOnes($pdo);
|
||||||
$pdo->commit();
|
$pdo->commit();
|
||||||
@ -58,7 +59,8 @@ class Generate_uniqId_for_old_votes implements Migration {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function generateUniqIdsForEmptyOnes($pdo) {
|
private function generateUniqIdsForEmptyOnes(PDO $pdo): void
|
||||||
|
{
|
||||||
$select = $pdo->query('
|
$select = $pdo->query('
|
||||||
SELECT `id`
|
SELECT `id`
|
||||||
FROM `' . Utils::table('vote') . '`
|
FROM `' . Utils::table('vote') . '`
|
||||||
@ -69,7 +71,7 @@ UPDATE `' . Utils::table('vote') . '`
|
|||||||
SET `uniqid` = :uniqid
|
SET `uniqid` = :uniqid
|
||||||
WHERE `id` = :id');
|
WHERE `id` = :id');
|
||||||
|
|
||||||
while ($row = $select->fetch(\PDO::FETCH_OBJ)) {
|
while ($row = $select->fetch(PDO::FETCH_OBJ)) {
|
||||||
$token = Token::getToken(16);
|
$token = Token::getToken(16);
|
||||||
$update->execute([
|
$update->execute([
|
||||||
'uniqid' => $token,
|
'uniqid' => $token,
|
||||||
|
@ -2,9 +2,10 @@
|
|||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
|
|
||||||
class Increase_pollId_size implements Migration {
|
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
|
* @return string The description of the migration class
|
||||||
*/
|
*/
|
||||||
function description() {
|
public function description(): string {
|
||||||
return 'Increase the size of id column in poll table';
|
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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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
|
* @return bool true if the Migration should be executed
|
||||||
*/
|
*/
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(PDO $pdo): bool {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This methode is called only one time in the migration page.
|
* 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
|
* @return bool true if the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo) {
|
public function execute(PDO $pdo): bool {
|
||||||
$this->alterCommentTable($pdo);
|
$this->alterCommentTable($pdo);
|
||||||
$this->alterPollTable($pdo);
|
$this->alterPollTable($pdo);
|
||||||
$this->alterSlotTable($pdo);
|
$this->alterSlotTable($pdo);
|
||||||
$this->alterVoteTable($pdo);
|
$this->alterVoteTable($pdo);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function alterCommentTable(\PDO $pdo) {
|
private function alterCommentTable(PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('comment') . '`
|
ALTER TABLE `' . Utils::table('comment') . '`
|
||||||
CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
|
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('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('poll') . '`
|
ALTER TABLE `' . Utils::table('poll') . '`
|
||||||
CHANGE `id` `id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
|
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('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('slot') . '`
|
ALTER TABLE `' . Utils::table('slot') . '`
|
||||||
CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
|
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('
|
$pdo->exec('
|
||||||
ALTER TABLE `' . Utils::table('vote') . '`
|
ALTER TABLE `' . Utils::table('vote') . '`
|
||||||
CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
|
CHANGE `poll_id` `poll_id` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;');
|
||||||
|
@ -18,29 +18,30 @@
|
|||||||
*/
|
*/
|
||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
|
|
||||||
|
use PDO;
|
||||||
|
|
||||||
interface Migration {
|
interface Migration {
|
||||||
/**
|
/**
|
||||||
* This method should describe in english what is the purpose of the migration class.
|
* This method should describe in english what is the purpose of the migration class.
|
||||||
*
|
*
|
||||||
* @return string The description 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.
|
* This method could check if the execute method should be called.
|
||||||
* It is called before the execute method.
|
* 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
|
* @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.
|
* 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
|
* @return bool true if the execution succeeded
|
||||||
*/
|
*/
|
||||||
function execute(\PDO $pdo);
|
public function execute(PDO $pdo): bool;
|
||||||
}
|
}
|
||||||
|
|
@ -4,16 +4,16 @@
|
|||||||
* is not distributed with this file, you can obtain one at
|
* is not distributed with this file, you can obtain one at
|
||||||
* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
|
* 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)
|
* 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
|
* ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
|
||||||
* http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
|
* 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)
|
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
||||||
*/
|
*/
|
||||||
namespace Framadate\Migration;
|
namespace Framadate\Migration;
|
||||||
@ -28,11 +28,11 @@ use Framadate\Utils;
|
|||||||
* @version 0.9
|
* @version 0.9
|
||||||
*/
|
*/
|
||||||
class RPadVotes_from_0_8 implements Migration {
|
class RPadVotes_from_0_8 implements Migration {
|
||||||
function description() {
|
public function description(): string {
|
||||||
return 'RPad votes from version 0.8.';
|
return 'RPad votes from version 0.8.';
|
||||||
}
|
}
|
||||||
|
|
||||||
function preCondition(\PDO $pdo) {
|
public function preCondition(\PDO $pdo): bool {
|
||||||
$stmt = $pdo->query('SHOW TABLES');
|
$stmt = $pdo->query('SHOW TABLES');
|
||||||
$tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
|
$tables = $stmt->fetchAll(\PDO::FETCH_COLUMN);
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ class RPadVotes_from_0_8 implements Migration {
|
|||||||
return count($diff) === 0;
|
return count($diff) === 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
function execute(\PDO $pdo) {
|
public function execute(\PDO $pdo): bool {
|
||||||
$pdo->beginTransaction();
|
$pdo->beginTransaction();
|
||||||
$this->rpadVotes($pdo);
|
$this->rpadVotes($pdo);
|
||||||
$pdo->commit();
|
$pdo->commit();
|
||||||
@ -49,7 +49,8 @@ class RPadVotes_from_0_8 implements Migration {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function rpadVotes($pdo) {
|
private function rpadVotes(\PDO $pdo): void
|
||||||
|
{
|
||||||
$pdo->exec('UPDATE ' . Utils::table('vote') . ' fv
|
$pdo->exec('UPDATE ' . Utils::table('vote') . ' fv
|
||||||
INNER JOIN (
|
INNER JOIN (
|
||||||
SELECT v.id, RPAD(v.choices, inn.slots_count, \'0\') new_choices
|
SELECT v.id, RPAD(v.choices, inn.slots_count, \'0\') new_choices
|
||||||
|
@ -13,31 +13,40 @@ abstract class AbstractRepository {
|
|||||||
* PollRepository constructor.
|
* PollRepository constructor.
|
||||||
* @param FramaDB $connect
|
* @param FramaDB $connect
|
||||||
*/
|
*/
|
||||||
function __construct(FramaDB $connect) {
|
public function __construct(FramaDB $connect) {
|
||||||
$this->connect = $connect;
|
$this->connect = $connect;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function beginTransaction() {
|
public function beginTransaction(): void
|
||||||
|
{
|
||||||
$this->connect->beginTransaction();
|
$this->connect->beginTransaction();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function commit() {
|
public function commit(): void
|
||||||
|
{
|
||||||
$this->connect->commit();
|
$this->connect->commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
function rollback() {
|
public function rollback(): void
|
||||||
|
{
|
||||||
$this->connect->rollback();
|
$this->connect->rollback();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function prepare($sql) {
|
/**
|
||||||
|
* @return \PDOStatement|false
|
||||||
|
*/
|
||||||
|
public function prepare(string $sql) {
|
||||||
return $this->connect->prepare($sql);
|
return $this->connect->prepare($sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
function query($sql) {
|
/**
|
||||||
|
* @return \PDOStatement|false
|
||||||
|
*/
|
||||||
|
public function query($sql) {
|
||||||
return $this->connect->query($sql);
|
return $this->connect->query($sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
function lastInsertId() {
|
public function lastInsertId(): string {
|
||||||
return $this->connect->lastInsertId();
|
return $this->connect->lastInsertId();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Framadate\Repositories;
|
namespace Framadate\Repositories;
|
||||||
|
|
||||||
use Framadate\FramaDB;
|
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
|
||||||
class CommentRepository extends AbstractRepository {
|
class CommentRepository extends AbstractRepository {
|
||||||
function __construct(FramaDB $connect) {
|
/**
|
||||||
parent::__construct($connect);
|
* @return array|false
|
||||||
}
|
*/
|
||||||
|
public function findAllByPollId(string $poll_id) {
|
||||||
function findAllByPollId($poll_id) {
|
|
||||||
$prepared = $this->prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id');
|
$prepared = $this->prepare('SELECT * FROM `' . Utils::table('comment') . '` WHERE poll_id = ? ORDER BY id');
|
||||||
$prepared->execute([$poll_id]);
|
$prepared->execute([$poll_id]);
|
||||||
|
|
||||||
@ -19,18 +17,20 @@ class CommentRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Insert a new comment.
|
* Insert a new comment.
|
||||||
*
|
*
|
||||||
* @param $poll_id
|
* @param string $poll_id
|
||||||
* @param $name
|
* @param string $name
|
||||||
* @param $comment
|
* @param string $comment
|
||||||
* @return bool
|
* @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 (?,?,?)');
|
$prepared = $this->prepare('INSERT INTO `' . Utils::table('comment') . '` (poll_id, name, comment) VALUES (?,?,?)');
|
||||||
|
|
||||||
return $prepared->execute([$poll_id, $name, $comment]);
|
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 = ?');
|
$prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND id = ?');
|
||||||
|
|
||||||
return $prepared->execute([$poll_id, $comment_id]);
|
return $prepared->execute([$poll_id, $comment_id]);
|
||||||
@ -39,16 +39,18 @@ class CommentRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Delete all comments of a given poll.
|
* 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.
|
* @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 = ?');
|
$prepared = $this->prepare('DELETE FROM `' . Utils::table('comment') . '` WHERE poll_id = ?');
|
||||||
|
|
||||||
return $prepared->execute([$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 = $this->prepare('SELECT 1 FROM `' . Utils::table('comment') . '` WHERE poll_id = ? AND name = ? AND comment = ?');
|
||||||
$prepared->execute([$poll_id, $name, $comment]);
|
$prepared->execute([$poll_id, $name, $comment]);
|
||||||
|
|
||||||
|
@ -6,11 +6,8 @@ use Framadate\Utils;
|
|||||||
use PDO;
|
use PDO;
|
||||||
|
|
||||||
class PollRepository extends AbstractRepository {
|
class PollRepository extends AbstractRepository {
|
||||||
function __construct(FramaDB $connect) {
|
public function insertPoll(string $poll_id, string $admin_poll_id, $form): void
|
||||||
parent::__construct($connect);
|
{
|
||||||
}
|
|
||||||
|
|
||||||
public function insertPoll($poll_id, $admin_poll_id, $form) {
|
|
||||||
$sql = 'INSERT INTO `' . Utils::table('poll') . '`
|
$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)
|
(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(?),?,?,?,?,?,?,?,?)';
|
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]);
|
$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 = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE id = ?');
|
||||||
|
|
||||||
$prepared->execute([$poll_id]);
|
$prepared->execute([$poll_id]);
|
||||||
@ -28,7 +25,7 @@ class PollRepository extends AbstractRepository {
|
|||||||
return $poll;
|
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 = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE admin_id = ?');
|
||||||
|
|
||||||
$prepared->execute([$admin_poll_id]);
|
$prepared->execute([$admin_poll_id]);
|
||||||
@ -38,7 +35,8 @@ class PollRepository extends AbstractRepository {
|
|||||||
return $poll;
|
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 = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE id = ?');
|
||||||
|
|
||||||
$prepared->execute([$poll_id]);
|
$prepared->execute([$poll_id]);
|
||||||
@ -46,7 +44,8 @@ class PollRepository extends AbstractRepository {
|
|||||||
return $prepared->rowCount() > 0;
|
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 = $this->prepare('SELECT 1 FROM `' . Utils::table('poll') . '` WHERE admin_id = ?');
|
||||||
|
|
||||||
$prepared->execute([$admin_poll_id]);
|
$prepared->execute([$admin_poll_id]);
|
||||||
@ -54,13 +53,15 @@ class PollRepository extends AbstractRepository {
|
|||||||
return $prepared->rowCount() > 0;
|
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 = ?');
|
$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 = ?');
|
$prepared = $this->prepare('DELETE FROM `' . Utils::table('poll') . '` WHERE id = ?');
|
||||||
|
|
||||||
return $prepared->execute([$poll_id]);
|
return $prepared->execute([$poll_id]);
|
||||||
@ -71,7 +72,8 @@ class PollRepository extends AbstractRepository {
|
|||||||
*
|
*
|
||||||
* @return array Array of old polls
|
* @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 = $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([]);
|
$prepared->execute([]);
|
||||||
|
|
||||||
@ -86,11 +88,11 @@ class PollRepository extends AbstractRepository {
|
|||||||
* @param int $limit The number of entries to find
|
* @param int $limit The number of entries to find
|
||||||
* @return array The found polls
|
* @return array The found polls
|
||||||
*/
|
*/
|
||||||
public function findAll($search, $start, $limit) {
|
public function findAll(array $search, int $start, int $limit): array
|
||||||
|
{
|
||||||
// Polls
|
// 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 .= " (SELECT count(1) FROM `" . Utils::table('vote') . "` v WHERE p.id=v.poll_id) votes";
|
||||||
$request .= " FROM `" . Utils::table('poll') . "` p";
|
$request .= " FROM `" . Utils::table('poll') . "` p";
|
||||||
$request .= " WHERE 1";
|
$request .= " WHERE 1";
|
||||||
@ -115,7 +117,7 @@ class PollRepository extends AbstractRepository {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$request .= " AND p.$columnName LIKE :$searchKey";
|
$request .= " AND p.$columnName LIKE :$searchKey";
|
||||||
$values[$searchKey] = "%{$search[$searchKey]}%";
|
$values[$searchKey] = "%$search[$searchKey]%";
|
||||||
}
|
}
|
||||||
|
|
||||||
$request .= " ORDER BY p.title ASC";
|
$request .= " ORDER BY p.title ASC";
|
||||||
@ -141,7 +143,8 @@ class PollRepository extends AbstractRepository {
|
|||||||
* @param string $mail Email address of the poll admin
|
* @param string $mail Email address of the poll admin
|
||||||
* @return array The list of matching polls
|
* @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 = $this->prepare('SELECT * FROM `' . Utils::table('poll') . '` WHERE admin_mail = :admin_mail');
|
||||||
$prepared->execute(['admin_mail' => $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
|
* @return int The number of polls
|
||||||
*/
|
*/
|
||||||
public function count($search = null) {
|
public function count(array $search = null): int
|
||||||
|
{
|
||||||
// Total count
|
// Total count
|
||||||
$prepared = $this->prepare('
|
$prepared = $this->prepare('
|
||||||
SELECT count(1) nb
|
SELECT count(1) nb
|
||||||
@ -172,13 +176,7 @@ SELECT count(1) nb
|
|||||||
$prepared->bindParam(':name', $name, PDO::PARAM_STR);
|
$prepared->bindParam(':name', $name, PDO::PARAM_STR);
|
||||||
|
|
||||||
$prepared->execute();
|
$prepared->execute();
|
||||||
$count = $prepared->fetch();
|
|
||||||
|
|
||||||
/*echo '---';
|
return $prepared->fetch()->nb;
|
||||||
print_r($count);
|
|
||||||
echo '---';
|
|
||||||
exit;*/
|
|
||||||
|
|
||||||
return $count->nb;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,14 +31,15 @@ class RepositoryFactory {
|
|||||||
/**
|
/**
|
||||||
* @param FramaDB $connect
|
* @param FramaDB $connect
|
||||||
*/
|
*/
|
||||||
static function init(FramaDB $connect) {
|
public static function init(FramaDB $connect): void {
|
||||||
self::$connect = $connect;
|
self::$connect = $connect;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return PollRepository The singleton of PollRepository
|
* @return PollRepository The singleton of PollRepository
|
||||||
*/
|
*/
|
||||||
static function pollRepository() {
|
public static function pollRepository(): PollRepository
|
||||||
|
{
|
||||||
if (self::$pollRepository === null) {
|
if (self::$pollRepository === null) {
|
||||||
self::$pollRepository = new PollRepository(self::$connect);
|
self::$pollRepository = new PollRepository(self::$connect);
|
||||||
}
|
}
|
||||||
@ -49,7 +50,8 @@ class RepositoryFactory {
|
|||||||
/**
|
/**
|
||||||
* @return SlotRepository The singleton of SlotRepository
|
* @return SlotRepository The singleton of SlotRepository
|
||||||
*/
|
*/
|
||||||
static function slotRepository() {
|
public static function slotRepository(): SlotRepository
|
||||||
|
{
|
||||||
if (self::$slotRepository === null) {
|
if (self::$slotRepository === null) {
|
||||||
self::$slotRepository = new SlotRepository(self::$connect);
|
self::$slotRepository = new SlotRepository(self::$connect);
|
||||||
}
|
}
|
||||||
@ -60,7 +62,8 @@ class RepositoryFactory {
|
|||||||
/**
|
/**
|
||||||
* @return VoteRepository The singleton of VoteRepository
|
* @return VoteRepository The singleton of VoteRepository
|
||||||
*/
|
*/
|
||||||
static function voteRepository() {
|
public static function voteRepository(): VoteRepository
|
||||||
|
{
|
||||||
if (self::$voteRepository === null) {
|
if (self::$voteRepository === null) {
|
||||||
self::$voteRepository = new VoteRepository(self::$connect);
|
self::$voteRepository = new VoteRepository(self::$connect);
|
||||||
}
|
}
|
||||||
@ -71,7 +74,8 @@ class RepositoryFactory {
|
|||||||
/**
|
/**
|
||||||
* @return CommentRepository The singleton of CommentRepository
|
* @return CommentRepository The singleton of CommentRepository
|
||||||
*/
|
*/
|
||||||
static function commentRepository() {
|
public static function commentRepository(): CommentRepository
|
||||||
|
{
|
||||||
if (self::$commentRepository === null) {
|
if (self::$commentRepository === null) {
|
||||||
self::$commentRepository = new CommentRepository(self::$connect);
|
self::$commentRepository = new CommentRepository(self::$connect);
|
||||||
}
|
}
|
||||||
|
@ -4,16 +4,16 @@
|
|||||||
* is not distributed with this file, you can obtain one at
|
* is not distributed with this file, you can obtain one at
|
||||||
* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
|
* 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)
|
* 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
|
* ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
|
||||||
* http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
|
* 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)
|
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
||||||
*/
|
*/
|
||||||
namespace Framadate\Repositories;
|
namespace Framadate\Repositories;
|
||||||
@ -22,17 +22,14 @@ use Framadate\FramaDB;
|
|||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
|
||||||
class SlotRepository extends AbstractRepository {
|
class SlotRepository extends AbstractRepository {
|
||||||
function __construct(FramaDB $connect) {
|
|
||||||
parent::__construct($connect);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert a bulk of slots.
|
* Insert a bulk of slots.
|
||||||
*
|
*
|
||||||
* @param int $poll_id
|
* @param string $poll_id
|
||||||
* @param array $choices
|
* @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 (?, ?, ?)');
|
$prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?, ?, ?)');
|
||||||
|
|
||||||
foreach ($choices as $choice) {
|
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 = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? ORDER BY id');
|
||||||
$prepared->execute([$poll_id]);
|
$prepared->execute([$poll_id]);
|
||||||
|
|
||||||
@ -67,11 +67,11 @@ class SlotRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Find the slot into poll for a given datetime.
|
* 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
|
* @param $datetime int The datetime of the slot
|
||||||
* @return mixed Object The slot found, or null
|
* @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 = $this->prepare('SELECT * FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND SUBSTRING_INDEX(title, \'@\', 1) = ?');
|
||||||
|
|
||||||
$prepared->execute([$poll_id, $datetime]);
|
$prepared->execute([$poll_id, $datetime]);
|
||||||
@ -84,12 +84,13 @@ class SlotRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Insert a new slot into a given poll.
|
* 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 $title mixed The title of the slot
|
||||||
* @param $moments mixed|null The moments joined with ","
|
* @param $moments mixed|null The moments joined with ","
|
||||||
* @return bool true if action succeeded
|
* @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 (?,?,?)');
|
$prepared = $this->prepare('INSERT INTO `' . Utils::table('slot') . '` (poll_id, title, moments) VALUES (?,?,?)');
|
||||||
|
|
||||||
return $prepared->execute([$poll_id, $title, $moments]);
|
return $prepared->execute([$poll_id, $title, $moments]);
|
||||||
@ -98,12 +99,13 @@ class SlotRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Update a slot into a poll.
|
* 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 $datetime int The datetime of the slot to update
|
||||||
* @param $newMoments mixed The new moments
|
* @param $newMoments mixed The new moments
|
||||||
* @return bool|null true if action succeeded.
|
* @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 = ?');
|
$prepared = $this->prepare('UPDATE `' . Utils::table('slot') . '` SET moments = ? WHERE poll_id = ? AND title = ?');
|
||||||
|
|
||||||
return $prepared->execute([$newMoments, $poll_id, $datetime]);
|
return $prepared->execute([$newMoments, $poll_id, $datetime]);
|
||||||
@ -112,15 +114,17 @@ class SlotRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Delete a entire slot from a poll.
|
* 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
|
* @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 = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ? AND title = ?');
|
||||||
$prepared->execute([$poll_id, $datetime]);
|
$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 = ?');
|
$prepared = $this->prepare('DELETE FROM `' . Utils::table('slot') . '` WHERE poll_id = ?');
|
||||||
|
|
||||||
return $prepared->execute([$poll_id]);
|
return $prepared->execute([$poll_id]);
|
||||||
|
@ -5,24 +5,24 @@ use Framadate\FramaDB;
|
|||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
|
||||||
class VoteRepository extends AbstractRepository {
|
class VoteRepository extends AbstractRepository {
|
||||||
function __construct(FramaDB $connect) {
|
/**
|
||||||
parent::__construct($connect);
|
* @return array|false
|
||||||
}
|
*/
|
||||||
|
public function allUserVotesByPollId(string $poll_id) {
|
||||||
function allUserVotesByPollId($poll_id) {
|
|
||||||
$prepared = $this->prepare('SELECT * FROM `' . Utils::table('vote') . '` WHERE poll_id = ? ORDER BY id');
|
$prepared = $this->prepare('SELECT * FROM `' . Utils::table('vote') . '` WHERE poll_id = ? ORDER BY id');
|
||||||
$prepared->execute([$poll_id]);
|
$prepared->execute([$poll_id]);
|
||||||
|
|
||||||
return $prepared->fetchAll();
|
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
|
$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]);
|
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 = $this->prepare('INSERT INTO `' . Utils::table('vote') . '` (poll_id, name, choices, uniqId) VALUES (?,?,?,?)');
|
||||||
$prepared->execute([$poll_id, $name, $choices, $token]);
|
$prepared->execute([$poll_id, $name, $choices, $token]);
|
||||||
|
|
||||||
@ -36,7 +36,8 @@ class VoteRepository extends AbstractRepository {
|
|||||||
return $newVote;
|
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 = ?');
|
$prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND id = ?');
|
||||||
|
|
||||||
return $prepared->execute([$poll_id, $vote_id]);
|
return $prepared->execute([$poll_id, $vote_id]);
|
||||||
@ -45,10 +46,11 @@ class VoteRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Delete all votes of a given poll.
|
* 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.
|
* @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 = ?');
|
$prepared = $this->prepare('DELETE FROM `' . Utils::table('vote') . '` WHERE poll_id = ?');
|
||||||
|
|
||||||
return $prepared->execute([$poll_id]);
|
return $prepared->execute([$poll_id]);
|
||||||
@ -57,17 +59,19 @@ class VoteRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Delete all votes made on given moment index.
|
* 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
|
* @param $index int The index of the vote into the poll
|
||||||
* @return bool|null true if action succeeded.
|
* @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 = ?');
|
$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]);
|
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 = ?');
|
$prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = ?, name = ? WHERE poll_id = ? AND id = ?');
|
||||||
|
|
||||||
return $prepared->execute([$choices, $name, $poll_id, $vote_id]);
|
return $prepared->execute([$choices, $name, $poll_id, $vote_id]);
|
||||||
@ -76,11 +80,12 @@ class VoteRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Check if name is already used for the given poll.
|
* 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
|
* @param string $name Name of the vote
|
||||||
* @return bool true if vote already exists
|
* @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 = $this->prepare('SELECT 1 FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND name = ?');
|
||||||
$prepared->execute([$poll_id, $name]);
|
$prepared->execute([$poll_id, $name]);
|
||||||
return $prepared->rowCount() > 0;
|
return $prepared->rowCount() > 0;
|
||||||
@ -89,12 +94,13 @@ class VoteRepository extends AbstractRepository {
|
|||||||
/**
|
/**
|
||||||
* Check if name is already used for the given poll and another vote.
|
* 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 string $name Name of the vote
|
||||||
* @param int $vote_id ID of the current vote
|
* @param int $vote_id ID of the current vote
|
||||||
* @return bool true if vote already exists
|
* @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 = $this->prepare('SELECT 1 FROM `' . Utils::table('vote') . '` WHERE poll_id = ? AND name = ? AND id != ?');
|
||||||
$prepared->execute([$poll_id, $name, $vote_id]);
|
$prepared->execute([$poll_id, $name, $vote_id]);
|
||||||
return $prepared->rowCount() > 0;
|
return $prepared->rowCount() > 0;
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
namespace Framadate\Security;
|
namespace Framadate\Security;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -17,7 +16,7 @@ class PasswordHasher {
|
|||||||
* @param string $password the password to hash.
|
* @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.
|
* @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);
|
return password_hash($password, PASSWORD_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -28,7 +27,8 @@ class PasswordHasher {
|
|||||||
* @param string $hash the hash to compare.
|
* @param string $hash the hash to compare.
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public static function verify($password, $hash) {
|
public static function verify(string $password, string $hash): bool
|
||||||
|
{
|
||||||
return password_verify($password, $hash);
|
return password_verify($password, $hash);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -2,31 +2,35 @@
|
|||||||
namespace Framadate\Security;
|
namespace Framadate\Security;
|
||||||
|
|
||||||
class Token {
|
class Token {
|
||||||
const DEFAULT_LENGTH = 64;
|
public const DEFAULT_LENGTH = 64;
|
||||||
private $time;
|
private $time;
|
||||||
private $value;
|
private $value;
|
||||||
private $length;
|
private $length;
|
||||||
private static $codeAlphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789';
|
private static $codeAlphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789';
|
||||||
|
|
||||||
function __construct($length = self::DEFAULT_LENGTH) {
|
public function __construct($length = self::DEFAULT_LENGTH) {
|
||||||
$this->length = $length;
|
$this->length = $length;
|
||||||
$this->time = time() + TOKEN_TIME;
|
$this->time = time() + TOKEN_TIME;
|
||||||
$this->value = $this->generate();
|
$this->value = $this->generate();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getTime() {
|
public function getTime(): int
|
||||||
|
{
|
||||||
return $this->time;
|
return $this->time;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getValue() {
|
public function getValue(): string
|
||||||
|
{
|
||||||
return $this->value;
|
return $this->value;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function isGone() {
|
public function isGone(): bool
|
||||||
|
{
|
||||||
return $this->time < time();
|
return $this->time < time();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function check($value) {
|
public function check($value): bool
|
||||||
|
{
|
||||||
return $value === $this->value;
|
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.
|
* @param bool $crypto_strong If passed, tells if the token is "cryptographically strong" or not.
|
||||||
* @return string
|
* @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')) {
|
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"
|
openssl_random_pseudo_bytes(1, $crypto_strong); // Fake use to see if the algorithm used was "cryptographically strong"
|
||||||
return self::getSecureToken($length);
|
return self::getSecureToken($length);
|
||||||
@ -45,7 +50,8 @@ class Token {
|
|||||||
return self::getUnsecureToken($length);
|
return self::getUnsecureToken($length);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getUnsecureToken($length) {
|
public static function getUnsecureToken(int $length): string
|
||||||
|
{
|
||||||
$string = '';
|
$string = '';
|
||||||
mt_srand();
|
mt_srand();
|
||||||
for ($i = 0; $i < $length; $i++) {
|
for ($i = 0; $i < $length; $i++) {
|
||||||
@ -58,7 +64,8 @@ class Token {
|
|||||||
/**
|
/**
|
||||||
* @author http://stackoverflow.com/a/13733588
|
* @author http://stackoverflow.com/a/13733588
|
||||||
*/
|
*/
|
||||||
public static function getSecureToken($length){
|
public static function getSecureToken(int $length): string
|
||||||
|
{
|
||||||
$token = "";
|
$token = "";
|
||||||
for($i=0;$i<$length;$i++){
|
for($i=0;$i<$length;$i++){
|
||||||
$token .= self::$codeAlphabet[self::crypto_rand_secure(0,strlen(self::$codeAlphabet))];
|
$token .= self::$codeAlphabet[self::crypto_rand_secure(0,strlen(self::$codeAlphabet))];
|
||||||
@ -66,25 +73,33 @@ class Token {
|
|||||||
return $token;
|
return $token;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function generate() {
|
private function generate(): string
|
||||||
|
{
|
||||||
return self::getToken($this->length);
|
return self::getToken($this->length);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author http://us1.php.net/manual/en/function.openssl-random-pseudo-bytes.php#104322
|
* @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;
|
$range = $max - $min;
|
||||||
if ($range < 0) return $min; // not so random...
|
// not so random...
|
||||||
|
if ($range < 0) {
|
||||||
|
return $min;
|
||||||
|
}
|
||||||
$log = log($range, 2);
|
$log = log($range, 2);
|
||||||
$bytes = (int) ($log / 8) + 1; // length in bytes
|
$bytes = (int) ($log / 8) + 1; // length in bytes
|
||||||
$bits = (int) $log + 1; // length in bits
|
$bits = (int) $log + 1; // length in bits
|
||||||
$filter = (int) (1 << $bits) - 1; // set all lower bits to 1
|
$filter = (int) (1 << $bits) - 1; // set all lower bits to 1
|
||||||
do {
|
do {
|
||||||
$rnd = hexdec(bin2hex(openssl_random_pseudo_bytes($bytes)));
|
$rnd = hexdec(bin2hex(openssl_random_pseudo_bytes($bytes)));
|
||||||
$rnd = $rnd & $filter; // discard irrelevant bits
|
$rnd &= $filter; // discard irrelevant bits
|
||||||
} while ($rnd >= $range);
|
} while ($rnd >= $range);
|
||||||
return $min + $rnd;
|
return $min + $rnd;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -21,7 +21,7 @@ class AdminPollService {
|
|||||||
private $voteRepository;
|
private $voteRepository;
|
||||||
private $commentRepository;
|
private $commentRepository;
|
||||||
|
|
||||||
function __construct(FramaDB $connect, PollService $pollService, LogService $logService) {
|
public function __construct(FramaDB $connect, PollService $pollService, LogService $logService) {
|
||||||
$this->connect = $connect;
|
$this->connect = $connect;
|
||||||
$this->pollService = $pollService;
|
$this->pollService = $pollService;
|
||||||
$this->logService = $logService;
|
$this->logService = $logService;
|
||||||
@ -31,32 +31,38 @@ class AdminPollService {
|
|||||||
$this->commentRepository = RepositoryFactory::commentRepository();
|
$this->commentRepository = RepositoryFactory::commentRepository();
|
||||||
}
|
}
|
||||||
|
|
||||||
function updatePoll($poll) {
|
public function updatePoll($poll): bool
|
||||||
|
{
|
||||||
global $config;
|
global $config;
|
||||||
if ($poll->end_date > $poll->creation_date) {
|
|
||||||
return $this->pollRepository->update($poll);
|
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 false;
|
|
||||||
|
return $this->pollRepository->update($poll);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete a comment from a 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
|
* @param $comment_id int The ID of the comment
|
||||||
* @return mixed true is action succeeded
|
* @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);
|
return $this->commentRepository->deleteById($poll_id, $comment_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove all comments of a poll.
|
* 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
|
* @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");
|
$this->logService->log("CLEAN_COMMENTS", "id:$poll_id");
|
||||||
return $this->commentRepository->deleteByPollId($poll_id);
|
return $this->commentRepository->deleteByPollId($poll_id);
|
||||||
}
|
}
|
||||||
@ -64,21 +70,23 @@ class AdminPollService {
|
|||||||
/**
|
/**
|
||||||
* Delete a vote from a poll.
|
* 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
|
* @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);
|
return $this->voteRepository->deleteById($poll_id, $vote_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove all votes of a poll.
|
* 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
|
* @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);
|
$this->logService->log('CLEAN_VOTES', 'id:' . $poll_id);
|
||||||
return $this->voteRepository->deleteByPollId($poll_id);
|
return $this->voteRepository->deleteByPollId($poll_id);
|
||||||
}
|
}
|
||||||
@ -86,10 +94,11 @@ class AdminPollService {
|
|||||||
/**
|
/**
|
||||||
* Delete the entire given poll.
|
* 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
|
* @return bool true is action succeeded
|
||||||
*/
|
*/
|
||||||
function deleteEntirePoll($poll_id) {
|
public function deleteEntirePoll(string $poll_id): bool
|
||||||
|
{
|
||||||
$poll = $this->pollRepository->findById($poll_id);
|
$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");
|
$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)
|
* @param object $slot The slot informations (datetime + moment)
|
||||||
* @return bool true if action succeeded
|
* @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));
|
$this->logService->log('DELETE_SLOT', 'id:' . $poll->id . ', slot:' . json_encode($slot));
|
||||||
|
|
||||||
$datetime = $slot->title;
|
$datetime = $slot->title;
|
||||||
@ -120,7 +130,9 @@ class AdminPollService {
|
|||||||
// We can't delete the last slot
|
// We can't delete the last slot
|
||||||
if ($poll->format === 'D' && count($slots) === 1 && strpos($slots[0]->moments, ',') === false) {
|
if ($poll->format === 'D' && count($slots) === 1 && strpos($slots[0]->moments, ',') === false) {
|
||||||
return false;
|
return false;
|
||||||
} elseif ($poll->format === 'A' && count($slots) === 1) {
|
}
|
||||||
|
|
||||||
|
if ($poll->format === 'A' && count($slots) === 1) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -157,7 +169,8 @@ class AdminPollService {
|
|||||||
return true;
|
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);
|
$this->logService->log('DELETE_SLOT', 'id:' . $poll->id . ', slot:' . $slot_title);
|
||||||
|
|
||||||
$slots = $this->pollService->allSlotsByPoll($poll);
|
$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>
|
* <li>Create a new moment if a slot already exists for the given date</li>
|
||||||
* </ul>
|
* </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 $datetime int The datetime
|
||||||
* @param $new_moment string The moment's name
|
* @param $new_moment string The moment's name
|
||||||
* @throws MomentAlreadyExistsException When the moment to add already exists in database
|
* @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);
|
$this->logService->log('ADD_COLUMN', 'id:' . $poll_id . ', datetime:' . $datetime . ', moment:' . $new_moment);
|
||||||
|
|
||||||
$slots = $this->slotRepository->listByPollId($poll_id);
|
$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>
|
* <li>Create a new slot if no one exists for the given title</li>
|
||||||
* </ul>
|
* </ul>
|
||||||
*
|
*
|
||||||
* @param $poll_id int The ID of the poll
|
* @param string $poll_id The ID of the poll
|
||||||
* @param $title int The title
|
* @param string $title The title
|
||||||
* @throws MomentAlreadyExistsException When the moment to add already exists in database
|
* @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);
|
$this->logService->log('ADD_COLUMN', 'id:' . $poll_id . ', title:' . $title);
|
||||||
|
|
||||||
$slots = $this->slotRepository->listByPollId($poll_id);
|
$slots = $this->slotRepository->listByPollId($poll_id);
|
||||||
|
|
||||||
// Check if slot already exists
|
// Check if slot already exists
|
||||||
$titles = array_map(function ($slot) {
|
$titles = array_map(static function ($slot) {
|
||||||
return $slot->title;
|
return $slot->title;
|
||||||
}, $slots);
|
}, $slots);
|
||||||
if (in_array($title, $titles, true)) {
|
if (in_array($title, $titles, true)) {
|
||||||
@ -274,7 +289,7 @@ class AdminPollService {
|
|||||||
* @param $datetime int The datetime of the new slot
|
* @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.
|
* @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 = new \stdClass();
|
||||||
$result->slot = null;
|
$result->slot = null;
|
||||||
$result->insert = 0;
|
$result->insert = 0;
|
||||||
@ -284,7 +299,7 @@ class AdminPollService {
|
|||||||
|
|
||||||
// Search where to insert new column
|
// Search where to insert new column
|
||||||
foreach ($slots as $k=>$slot) {
|
foreach ($slots as $k=>$slot) {
|
||||||
$rowDatetime = $slot->title;
|
$rowDatetime = (int) $slot->title;
|
||||||
$moments = explode(',', $slot->moments);
|
$moments = explode(',', $slot->moments);
|
||||||
|
|
||||||
if ($datetime === $rowDatetime) {
|
if ($datetime === $rowDatetime) {
|
||||||
@ -292,7 +307,9 @@ class AdminPollService {
|
|||||||
$result->insert += count($moments);
|
$result->insert += count($moments);
|
||||||
$result->slot = $slot;
|
$result->slot = $slot;
|
||||||
break;
|
break;
|
||||||
} elseif ($datetime < $rowDatetime) {
|
}
|
||||||
|
|
||||||
|
if ($datetime < $rowDatetime) {
|
||||||
// We have to insert before this slot
|
// We have to insert before this slot
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -302,4 +319,3 @@ class AdminPollService {
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
182
app/classes/Framadate/Services/ICalService.php
Normal file
182
app/classes/Framadate/Services/ICalService.php
Normal file
@ -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));
|
||||||
|
}
|
||||||
|
}
|
@ -17,25 +17,28 @@
|
|||||||
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
||||||
*/
|
*/
|
||||||
namespace Framadate\Services;
|
namespace Framadate\Services;
|
||||||
|
use function __;
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use Egulias\EmailValidator\EmailValidator;
|
use Egulias\EmailValidator\EmailValidator;
|
||||||
use Egulias\EmailValidator\Validation\RFCValidation;
|
use Egulias\EmailValidator\Validation\RFCValidation;
|
||||||
|
use o80\i18n\CantLoadDictionaryException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class helps to clean all inputs from the users or external services.
|
* This class helps to clean all inputs from the users or external services.
|
||||||
*/
|
*/
|
||||||
class InputService {
|
class InputService {
|
||||||
function __construct() {}
|
public function __construct() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method filter an array calling "filter_var" on each items.
|
* 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.
|
* Only items validated are added at their own indexes, the others are not returned.
|
||||||
* @param array $arr The array to filter
|
* @param array $arr The array to filter
|
||||||
* @param int $type The type of filter to apply
|
* @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
|
* @return array The filtered array
|
||||||
*/
|
*/
|
||||||
function filterArray(array $arr, $type, $options = null) {
|
public function filterArray(array $arr, int $type, $options = 0): array
|
||||||
|
{
|
||||||
$newArr = [];
|
$newArr = [];
|
||||||
|
|
||||||
foreach($arr as $id=>$item) {
|
foreach($arr as $id=>$item) {
|
||||||
@ -48,24 +51,32 @@ class InputService {
|
|||||||
return $newArr;
|
return $newArr;
|
||||||
}
|
}
|
||||||
|
|
||||||
function filterAllowedValues($value, array $allowedValues) {
|
public function filterAllowedValues($value, array $allowedValues) {
|
||||||
return in_array($value, $allowedValues, true) ? $value : null;
|
return in_array($value, $allowedValues, true) ? $value : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function filterTitle($title) {
|
public function filterTitle($title): ?string
|
||||||
|
{
|
||||||
return $this->returnIfNotBlank($title);
|
return $this->returnIfNotBlank($title);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return false|string
|
||||||
|
*/
|
||||||
public function filterId($id) {
|
public function filterId($id) {
|
||||||
$filtered = filter_var($id, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
|
$filtered = filter_var($id, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]);
|
||||||
return $filtered ? substr($filtered, 0, 64) : false;
|
return $filtered ? substr($filtered, 0, 64) : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function filterName($name) {
|
public function filterName($name): ?string
|
||||||
|
{
|
||||||
$filtered = trim($name);
|
$filtered = trim($name);
|
||||||
return $this->returnIfNotBlank($filtered);
|
return $this->returnIfNotBlank($filtered);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return false|string
|
||||||
|
*/
|
||||||
public function filterMail($mail) {
|
public function filterMail($mail) {
|
||||||
///////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////
|
||||||
// formatting
|
// formatting
|
||||||
@ -89,40 +100,67 @@ class InputService {
|
|||||||
return $resultat;
|
return $resultat;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function filterDescription($description) {
|
public function filterDescription($description): string {
|
||||||
$description = str_replace("\r\n", "\n", $description);
|
return str_replace("\r\n", "\n", $description);
|
||||||
return $description;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return false|string
|
||||||
|
*/
|
||||||
public function filterMD5($control) {
|
public function filterMD5($control) {
|
||||||
return filter_var($control, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => MD5_REGEX]]);
|
return filter_var($control, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => MD5_REGEX]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return false|int
|
||||||
|
*/
|
||||||
public function filterInteger($int) {
|
public function filterInteger($int) {
|
||||||
return filter_var($int, FILTER_VALIDATE_INT);
|
return filter_var($int, FILTER_VALIDATE_INT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return false|int
|
||||||
|
*/
|
||||||
public function filterValueMax($int)
|
public function filterValueMax($int)
|
||||||
{
|
{
|
||||||
return $this->filterInteger($int) >= 1;
|
return $this->filterInteger($int) >= 1 ? $this->filterInteger($int) : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function filterBoolean($boolean) {
|
public function filterBoolean($boolean): bool
|
||||||
return !!filter_var($boolean, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_TRUE_REGEX]]);
|
{
|
||||||
|
return (bool)filter_var($boolean, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_TRUE_REGEX]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return false|string
|
||||||
|
*/
|
||||||
public function filterEditable($editable) {
|
public function filterEditable($editable) {
|
||||||
return filter_var($editable, FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => EDITABLE_CHOICE_REGEX]]);
|
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);
|
$comment = str_replace("\r\n", "\n", $comment);
|
||||||
return $this->returnIfNotBlank($comment);
|
return $this->returnIfNotBlank($comment);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function filterDate($date) {
|
public function validateDate(DateTime $date, DateTime $minDate, DateTime $maxDate): DateTime {
|
||||||
$dDate = DateTime::createFromFormat(__('Date', 'datetime_parseformat'), $date)->setTime(0, 0, 0);
|
if ($date < $minDate) {
|
||||||
return $dDate->format('Y-m-d H:i:s');
|
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
|
* @param string $filtered The value
|
||||||
* @return string|null
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
private function returnIfNotBlank($filtered) {
|
private function returnIfNotBlank(string $filtered): ?string
|
||||||
|
{
|
||||||
if ($filtered) {
|
if ($filtered) {
|
||||||
$withoutSpaces = str_replace(' ', '', $filtered);
|
$withoutSpaces = str_replace(' ', '', $filtered);
|
||||||
if (!empty($withoutSpaces)) {
|
if (!empty($withoutSpaces)) {
|
||||||
|
@ -17,7 +17,10 @@
|
|||||||
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
||||||
*/
|
*/
|
||||||
namespace Framadate\Services;
|
namespace Framadate\Services;
|
||||||
|
use function __f;
|
||||||
|
use Exception;
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use PDO;
|
||||||
use Smarty;
|
use Smarty;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -40,24 +43,27 @@ class InstallService {
|
|||||||
'migrationTable' => 'framadate_migration'
|
'migrationTable' => 'framadate_migration'
|
||||||
];
|
];
|
||||||
|
|
||||||
function __construct() {}
|
public function __construct() {}
|
||||||
|
|
||||||
public function updateFields($data) {
|
public function updateFields($data): void
|
||||||
|
{
|
||||||
foreach ($data as $field => $value) {
|
foreach ($data as $field => $value) {
|
||||||
$this->fields[$field] = $value;
|
$this->fields[$field] = $value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function install(Smarty &$smarty) {
|
public function install(Smarty &$smarty): array
|
||||||
|
{
|
||||||
// Check values are present
|
// 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'])) {
|
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');
|
return $this->error('MISSING_VALUES');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Connect to database
|
// Connect to database
|
||||||
|
try {
|
||||||
$connect = $this->connectTo($this->fields['dbConnectionString'], $this->fields['dbUser'], $this->fields['dbPassword']);
|
$connect = $this->connectTo($this->fields['dbConnectionString'], $this->fields['dbUser'], $this->fields['dbPassword']);
|
||||||
if (!$connect) {
|
} catch(Exception $e) {
|
||||||
return $this->error('CANT_CONNECT_TO_DATABASE');
|
return $this->error('CANT_CONNECT_TO_DATABASE', $e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write configuration to conf.php file
|
// Write configuration to conf.php file
|
||||||
@ -68,18 +74,26 @@ class InstallService {
|
|||||||
return $this->ok();
|
return $this->ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
function connectTo($connectionString, $user, $password) {
|
/**
|
||||||
try {
|
* Connect to PDO compatible source
|
||||||
$pdo = @new \PDO($connectionString, $user, $password);
|
*
|
||||||
$pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_OBJ);
|
* @param string $connectionString
|
||||||
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
|
* @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;
|
return $pdo;
|
||||||
} catch(\Exception $e) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function writeConfiguration(Smarty &$smarty) {
|
/**
|
||||||
|
* @return false|int
|
||||||
|
*/
|
||||||
|
public function writeConfiguration(Smarty &$smarty) {
|
||||||
foreach($this->fields as $field=>$value) {
|
foreach($this->fields as $field=>$value) {
|
||||||
$smarty->assign($field, $value);
|
$smarty->assign($field, $value);
|
||||||
}
|
}
|
||||||
@ -91,15 +105,17 @@ class InstallService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $content
|
* @param $content
|
||||||
|
* @return false|int
|
||||||
*/
|
*/
|
||||||
function writeToFile($content) {
|
public function writeToFile(string $content) {
|
||||||
return @file_put_contents(CONF_FILENAME, $content);
|
return @file_put_contents(CONF_FILENAME, $content);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
function ok() {
|
public function ok(): array
|
||||||
|
{
|
||||||
return [
|
return [
|
||||||
'status' => 'OK',
|
'status' => 'OK',
|
||||||
'msg' => __f('Installation', 'Ended', Utils::get_server_name())
|
'msg' => __f('Installation', 'Ended', Utils::get_server_name())
|
||||||
@ -107,17 +123,21 @@ class InstallService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $msg
|
* @param string $msg
|
||||||
|
* @param string $details
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
function error($msg) {
|
public function error(string $msg, string $details = ''): array
|
||||||
|
{
|
||||||
return [
|
return [
|
||||||
'status' => 'ERROR',
|
'status' => 'ERROR',
|
||||||
'code' => $msg
|
'code' => $msg,
|
||||||
|
'details' => $details,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getFields() {
|
public function getFields(): array
|
||||||
|
{
|
||||||
return $this->fields;
|
return $this->fields;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,7 @@ namespace Framadate\Services;
|
|||||||
* @package Framadate\Services
|
* @package Framadate\Services
|
||||||
*/
|
*/
|
||||||
class LogService {
|
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 $tag string A tag is used to quickly found a message when reading log file
|
||||||
* @param $message string some message
|
* @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);
|
error_log(date('Ymd His') . ' [' . $tag . '] ' . $message . "\n", 3, ROOT_DIR . LOG_FILE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,12 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Framadate\Services;
|
namespace Framadate\Services;
|
||||||
|
|
||||||
use PHPMailer;
|
use PHPMailer\PHPMailer\Exception;
|
||||||
|
use PHPMailer\PHPMailer\PHPMailer;
|
||||||
|
|
||||||
class MailService {
|
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;
|
private $smtp_allowed;
|
||||||
|
|
||||||
@ -14,7 +15,7 @@ class MailService {
|
|||||||
|
|
||||||
private $logService;
|
private $logService;
|
||||||
|
|
||||||
function __construct($smtp_allowed, $smtp_options = []) {
|
public function __construct($smtp_allowed, $smtp_options = []) {
|
||||||
$this->logService = new LogService();
|
$this->logService = new LogService();
|
||||||
$this->smtp_allowed = $smtp_allowed;
|
$this->smtp_allowed = $smtp_allowed;
|
||||||
if (true === is_array($smtp_options)) {
|
if (true === is_array($smtp_options)) {
|
||||||
@ -22,11 +23,18 @@ class MailService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return false|string
|
||||||
|
*/
|
||||||
public function isValidEmail($email) {
|
public function isValidEmail($email) {
|
||||||
return filter_var($email, FILTER_VALIDATE_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)) {
|
if ($this->smtp_allowed === true && $this->canSendMsg($msgKey)) {
|
||||||
$mail = new PHPMailer(true);
|
$mail = new PHPMailer(true);
|
||||||
$this->configureMailer($mail);
|
$this->configureMailer($mail);
|
||||||
@ -45,7 +53,7 @@ class MailService {
|
|||||||
$mail->Subject = $subject;
|
$mail->Subject = $subject;
|
||||||
|
|
||||||
// Bodies
|
// 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->isHTML(true);
|
||||||
$mail->msgHTML($body, ROOT_DIR, true);
|
$mail->msgHTML($body, ROOT_DIR, true);
|
||||||
|
|
||||||
@ -53,6 +61,7 @@ class MailService {
|
|||||||
$mail->CharSet = 'UTF-8';
|
$mail->CharSet = 'UTF-8';
|
||||||
$mail->addCustomHeader('Auto-Submitted', 'auto-generated');
|
$mail->addCustomHeader('Auto-Submitted', 'auto-generated');
|
||||||
$mail->addCustomHeader('Return-Path', '<>');
|
$mail->addCustomHeader('Return-Path', '<>');
|
||||||
|
$mail->XMailer = ' ';
|
||||||
|
|
||||||
// Send mail
|
// Send mail
|
||||||
$mail->send();
|
$mail->send();
|
||||||
@ -61,19 +70,25 @@ class MailService {
|
|||||||
$this->logService->log('MAIL', 'Mail sent to: ' . $to . ', key: ' . $msgKey);
|
$this->logService->log('MAIL', 'Mail sent to: ' . $to . ', key: ' . $msgKey);
|
||||||
|
|
||||||
// Store the mail sending date
|
// Store the mail sending date
|
||||||
|
$this->initializeSession();
|
||||||
$_SESSION[self::MAILSERVICE_KEY][$msgKey] = time();
|
$_SESSION[self::MAILSERVICE_KEY][$msgKey] = time();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function canSendMsg($msgKey) {
|
public function canSendMsg(?string $msgKey): bool
|
||||||
|
{
|
||||||
if ($msgKey === null) {
|
if ($msgKey === null) {
|
||||||
return true;
|
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])) {
|
if (!isset($_SESSION[self::MAILSERVICE_KEY])) {
|
||||||
$_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
|
* @param PHPMailer $mailer
|
||||||
*/
|
*/
|
||||||
private function configureMailer(PHPMailer $mailer) {
|
private function configureMailer(PHPMailer $mailer): void
|
||||||
|
{
|
||||||
$mailer->isSMTP();
|
$mailer->isSMTP();
|
||||||
|
|
||||||
$available_options = [
|
$available_options = [
|
||||||
'host' => 'Host',
|
'host' => 'Host',
|
||||||
'auth' => 'SMTPAuth',
|
'auth' => 'SMTPAuth',
|
||||||
|
'authtype' => 'AuthType',
|
||||||
'username' => 'Username',
|
'username' => 'Username',
|
||||||
'password' => 'Password',
|
'password' => 'Password',
|
||||||
'secure' => 'SMTPSecure',
|
'secure' => 'SMTPSecure',
|
||||||
|
@ -1,22 +1,24 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
namespace Framadate\Services;
|
namespace Framadate\Services;
|
||||||
|
|
||||||
use \stdClass;
|
use \stdClass;
|
||||||
use Framadate\Services\MailService;
|
use function __;
|
||||||
|
use function __f;
|
||||||
use Framadate\Utils;
|
use Framadate\Utils;
|
||||||
|
use o80\i18n\CantLoadDictionaryException;
|
||||||
|
use PHPMailer\PHPMailer\Exception;
|
||||||
|
|
||||||
class NotificationService {
|
class NotificationService {
|
||||||
const UPDATE_VOTE = 1;
|
public const UPDATE_VOTE = 1;
|
||||||
const ADD_VOTE = 2;
|
public const ADD_VOTE = 2;
|
||||||
const ADD_COMMENT = 3;
|
public const ADD_COMMENT = 3;
|
||||||
const UPDATE_POLL = 10;
|
public const UPDATE_POLL = 10;
|
||||||
const DELETED_POLL = 11;
|
public const DELETED_POLL = 11;
|
||||||
|
|
||||||
private $mailService;
|
private $mailService;
|
||||||
|
|
||||||
function __construct(MailService $mailService) {
|
public function __construct(MailService $mailService) {
|
||||||
$this->mailService = $mailService;
|
$this->mailService = $mailService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -26,8 +28,10 @@ class NotificationService {
|
|||||||
* @param $poll stdClass The poll
|
* @param $poll stdClass The poll
|
||||||
* @param $name string The name user who triggered the notification
|
* @param $name string The name user who triggered the notification
|
||||||
* @param $type int cf: Constants on the top of this page
|
* @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'])) {
|
if (!isset($_SESSION['mail_sent'])) {
|
||||||
$_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;
|
$isOtherType = $type !== self::UPDATE_VOTE && $type !== self::ADD_VOTE && $type !== self::ADD_COMMENT;
|
||||||
|
|
||||||
if ($isVoteAndCanSendIt || $isCommentAndCanSendIt || $isOtherType) {
|
if ($isVoteAndCanSendIt || $isCommentAndCanSendIt || $isOtherType) {
|
||||||
if (self::isParticipation($type)) {
|
if ($this->isParticipation($type)) {
|
||||||
$translationString = 'Poll\'s participation: %s';
|
$translationString = 'Poll\'s participation: %s';
|
||||||
} else {
|
} else {
|
||||||
$translationString = 'Notification of poll: %s';
|
$translationString = 'Notification of poll: %s';
|
||||||
@ -75,11 +79,13 @@ class NotificationService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$messageTypeKey = $type . '-' . $poll->id;
|
$messageTypeKey = $type . '-' . $poll->id;
|
||||||
|
if ($poll->admin_mail) {
|
||||||
$this->mailService->send($poll->admin_mail, $subject, $message, $messageTypeKey);
|
$this->mailService->send($poll->admin_mail, $subject, $message, $messageTypeKey);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function isParticipation($type)
|
public function isParticipation(int $type): bool
|
||||||
{
|
{
|
||||||
return $type >= self::UPDATE_POLL;
|
return $type >= self::UPDATE_POLL;
|
||||||
}
|
}
|
||||||
|
@ -18,16 +18,19 @@
|
|||||||
*/
|
*/
|
||||||
namespace Framadate\Services;
|
namespace Framadate\Services;
|
||||||
|
|
||||||
|
use DateInterval;
|
||||||
|
use DateTime;
|
||||||
|
use Exception;
|
||||||
use Framadate\Exception\AlreadyExistsException;
|
use Framadate\Exception\AlreadyExistsException;
|
||||||
use Framadate\Exception\ConcurrentEditionException;
|
use Framadate\Exception\ConcurrentEditionException;
|
||||||
use Framadate\Exception\ConcurrentVoteException;
|
use Framadate\Exception\ConcurrentVoteException;
|
||||||
|
use Framadate\Exception\PollNotFoundException;
|
||||||
use Framadate\Form;
|
use Framadate\Form;
|
||||||
use Framadate\FramaDB;
|
|
||||||
use Framadate\Repositories\RepositoryFactory;
|
use Framadate\Repositories\RepositoryFactory;
|
||||||
use Framadate\Security\Token;
|
use Framadate\Security\Token;
|
||||||
|
use stdClass;
|
||||||
|
|
||||||
class PollService {
|
class PollService {
|
||||||
private $connect;
|
|
||||||
private $logService;
|
private $logService;
|
||||||
|
|
||||||
private $pollRepository;
|
private $pollRepository;
|
||||||
@ -35,8 +38,7 @@ class PollService {
|
|||||||
private $voteRepository;
|
private $voteRepository;
|
||||||
private $commentRepository;
|
private $commentRepository;
|
||||||
|
|
||||||
function __construct(FramaDB $connect, LogService $logService) {
|
public function __construct(LogService $logService) {
|
||||||
$this->connect = $connect;
|
|
||||||
$this->logService = $logService;
|
$this->logService = $logService;
|
||||||
$this->pollRepository = RepositoryFactory::pollRepository();
|
$this->pollRepository = RepositoryFactory::pollRepository();
|
||||||
$this->slotRepository = RepositoryFactory::slotRepository();
|
$this->slotRepository = RepositoryFactory::slotRepository();
|
||||||
@ -47,10 +49,10 @@ class PollService {
|
|||||||
/**
|
/**
|
||||||
* Find a poll from its ID.
|
* Find a poll from its ID.
|
||||||
*
|
*
|
||||||
* @param $poll_id int The ID of the poll
|
* @param string $poll_id The ID of the poll
|
||||||
* @return \stdClass|null The found poll, or null
|
* @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)) {
|
if (preg_match(POLL_REGEX, $poll_id)) {
|
||||||
return $this->pollRepository->findById($poll_id);
|
return $this->pollRepository->findById($poll_id);
|
||||||
}
|
}
|
||||||
@ -58,7 +60,7 @@ class PollService {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findByAdminId($admin_poll_id) {
|
public function findByAdminId(string $admin_poll_id) {
|
||||||
if (preg_match(ADMIN_POLL_REGEX, $admin_poll_id)) {
|
if (preg_match(ADMIN_POLL_REGEX, $admin_poll_id)) {
|
||||||
return $this->pollRepository->findByAdminId($admin_poll_id);
|
return $this->pollRepository->findByAdminId($admin_poll_id);
|
||||||
}
|
}
|
||||||
@ -66,15 +68,15 @@ class PollService {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function allCommentsByPollId($poll_id) {
|
public function allCommentsByPollId(string $poll_id) {
|
||||||
return $this->commentRepository->findAllByPollId($poll_id);
|
return $this->commentRepository->findAllByPollId($poll_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
function allVotesByPollId($poll_id) {
|
public function allVotesByPollId(string $poll_id) {
|
||||||
return $this->voteRepository->allUserVotesByPollId($poll_id);
|
return $this->voteRepository->allUserVotesByPollId($poll_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
function allSlotsByPoll($poll) {
|
public function allSlotsByPoll(stdClass $poll) {
|
||||||
$slots = $this->slotRepository->listByPollId($poll->id);
|
$slots = $this->slotRepository->listByPollId($poll->id);
|
||||||
if ($poll->format === 'D') {
|
if ($poll->format === 'D') {
|
||||||
$this->sortSlorts($slots);
|
$this->sortSlorts($slots);
|
||||||
@ -83,44 +85,45 @@ class PollService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $poll_id
|
* @param string $poll_id
|
||||||
* @param $vote_id
|
* @param int $vote_id
|
||||||
* @param $name
|
* @param string $name
|
||||||
* @param $choices
|
* @param array $choices
|
||||||
* @param $slots_hash
|
* @param string $slots_hash
|
||||||
* @throws AlreadyExistsException
|
* @throws AlreadyExistsException
|
||||||
* @throws ConcurrentEditionException
|
* @throws ConcurrentEditionException
|
||||||
* @throws ConcurrentVoteException
|
* @throws ConcurrentVoteException
|
||||||
* @return bool
|
* @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);
|
$this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name, $vote_id);
|
||||||
|
|
||||||
// Update vote
|
// Update vote
|
||||||
$choices = implode($choices);
|
return $this->voteRepository->update($poll_id, $vote_id, $name, implode($choices));
|
||||||
return $this->voteRepository->update($poll_id, $vote_id, $name, $choices);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $poll_id
|
* @param string $poll_id
|
||||||
* @param $name
|
* @param string $name
|
||||||
* @param $choices
|
* @param array $choices
|
||||||
* @param $slots_hash
|
* @param string $slots_hash
|
||||||
* @throws AlreadyExistsException
|
|
||||||
* @throws ConcurrentEditionException
|
* @throws ConcurrentEditionException
|
||||||
* @throws ConcurrentVoteException
|
* @throws ConcurrentVoteException
|
||||||
* @return \stdClass
|
* @throws PollNotFoundException
|
||||||
|
* @throws AlreadyExistsException
|
||||||
|
* @return stdClass
|
||||||
*/
|
*/
|
||||||
function addVote($poll_id, $name, $choices, $slots_hash) {
|
public function addVote(string $poll_id, string $name, array $choices, string $slots_hash): stdClass
|
||||||
|
{
|
||||||
$this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name);
|
$this->checkVoteConstraints($choices, $poll_id, $slots_hash, $name);
|
||||||
|
|
||||||
// Insert new vote
|
// Insert new vote
|
||||||
$choices = implode($choices);
|
return $this->voteRepository->insert($poll_id, $name, implode($choices), $this->random(16));
|
||||||
$token = $this->random(16);
|
|
||||||
return $this->voteRepository->insert($poll_id, $name, $choices, $token);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function addComment($poll_id, $name, $comment) {
|
public function addComment($poll_id, $name, $comment): bool
|
||||||
|
{
|
||||||
if ($this->commentRepository->exists($poll_id, $name, $comment)) {
|
if ($this->commentRepository->exists($poll_id, $name, $comment)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -132,7 +135,8 @@ class PollService {
|
|||||||
* @param Form $form
|
* @param Form $form
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
function createPoll(Form $form) {
|
public function createPoll(Form $form): array
|
||||||
|
{
|
||||||
// Generate poll IDs, loop while poll ID already exists
|
// Generate poll IDs, loop while poll ID already exists
|
||||||
|
|
||||||
if (empty($form->id)) { // User want us to generate an id for him
|
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];
|
return [$poll_id, $admin_poll_id];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findAllByAdminMail($mail) {
|
public function findAllByAdminMail($mail): array
|
||||||
|
{
|
||||||
return $this->pollRepository->findAllByAdminMail($mail);
|
return $this->pollRepository->findAllByAdminMail($mail);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $votes
|
* @param array $votes
|
||||||
* @param \stdClass $poll
|
* @param stdClass $poll
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function computeBestChoices($votes, $poll) {
|
public function computeBestChoices(array $votes, $poll): array
|
||||||
|
{
|
||||||
if (0 === count($votes)) {
|
if (0 === count($votes)) {
|
||||||
return $this->computeEmptyBestChoices($poll);
|
return $this->computeEmptyBestChoices($poll);
|
||||||
}
|
}
|
||||||
@ -193,10 +199,11 @@ class PollService {
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
function splitSlots($slots) {
|
public function splitSlots($slots): array
|
||||||
|
{
|
||||||
$splitted = [];
|
$splitted = [];
|
||||||
foreach ($slots as $slot) {
|
foreach ($slots as $slot) {
|
||||||
$obj = new \stdClass();
|
$obj = new stdClass();
|
||||||
$obj->day = $slot->title;
|
$obj->day = $slot->title;
|
||||||
$obj->moments = explode(',', $slot->moments);
|
$obj->moments = explode(',', $slot->moments);
|
||||||
|
|
||||||
@ -210,16 +217,18 @@ class PollService {
|
|||||||
* @param $slots array The slots to hash
|
* @param $slots array The slots to hash
|
||||||
* @return string The hash
|
* @return string The hash
|
||||||
*/
|
*/
|
||||||
public function hashSlots($slots) {
|
public function hashSlots(array $slots): string
|
||||||
return md5(array_reduce($slots, function($carry, $item) {
|
{
|
||||||
|
return md5(array_reduce($slots, static function($carry, $item) {
|
||||||
return $carry . $item->id . '@' . $item->moments . ';';
|
return $carry . $item->id . '@' . $item->moments . ';';
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
function splitVotes($votes) {
|
public function splitVotes(array $votes): array
|
||||||
|
{
|
||||||
$splitted = [];
|
$splitted = [];
|
||||||
foreach ($votes as $vote) {
|
foreach ($votes as $vote) {
|
||||||
$obj = new \stdClass();
|
$obj = new stdClass();
|
||||||
$obj->id = $vote->id;
|
$obj->id = $vote->id;
|
||||||
$obj->name = $vote->name;
|
$obj->name = $vote->name;
|
||||||
$obj->uniqId = $vote->uniqId;
|
$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;
|
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() {
|
public function minExpiryDate(): DateTime
|
||||||
return time() + 86400;
|
{
|
||||||
|
return (new DateTime())->add(new DateInterval('P1D'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return mixed
|
* @return mixed
|
||||||
*/
|
*/
|
||||||
public function sortSlorts(&$slots) {
|
public function sortSlorts(array &$slots): array {
|
||||||
uasort($slots, function ($a, $b) {
|
uasort($slots, static function ($a, $b) {
|
||||||
return $a->title > $b->title;
|
if ($a->title === $b->title) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return $a->title > $b->title ? 1 : -1;
|
||||||
});
|
});
|
||||||
return $slots;
|
return $slots;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param \stdClass $poll
|
* @param stdClass $poll
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
private function computeEmptyBestChoices($poll)
|
private function computeEmptyBestChoices($poll): array
|
||||||
{
|
{
|
||||||
$result = ['y' => [], 'inb' => []];
|
$result = ['y' => [], 'inb' => []];
|
||||||
// if there is no votes, calculates the number of slot
|
// if there is no votes, calculates the number of slot
|
||||||
@ -270,7 +284,7 @@ class PollService {
|
|||||||
if ($poll->format === 'A') {
|
if ($poll->format === 'A') {
|
||||||
// poll format classic
|
// poll format classic
|
||||||
|
|
||||||
for ($i = 0; $i < count($slots); $i++) {
|
for ($i = 0, $iMax = count($slots); $i < $iMax; $i++) {
|
||||||
$result['y'][] = 0;
|
$result['y'][] = 0;
|
||||||
$result['inb'][] = 0;
|
$result['inb'][] = 0;
|
||||||
}
|
}
|
||||||
@ -280,7 +294,7 @@ class PollService {
|
|||||||
$slots = $this->splitSlots($slots);
|
$slots = $this->splitSlots($slots);
|
||||||
|
|
||||||
foreach ($slots as $slot) {
|
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['y'][] = 0;
|
||||||
$result['inb'][] = 0;
|
$result['inb'][] = 0;
|
||||||
}
|
}
|
||||||
@ -289,23 +303,26 @@ class PollService {
|
|||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function random($length) {
|
private function random(int $length): string
|
||||||
|
{
|
||||||
return Token::getToken($length);
|
return Token::getToken($length);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $choices
|
* @param array $choices
|
||||||
* @param $poll_id
|
* @param string $poll_id
|
||||||
* @param $slots_hash
|
* @param string $slots_hash
|
||||||
* @param $name
|
* @param string $name
|
||||||
* @param string $vote_id
|
* @param bool|int $vote_id
|
||||||
* @throws AlreadyExistsException
|
* @throws AlreadyExistsException
|
||||||
* @throws ConcurrentVoteException
|
|
||||||
* @throws ConcurrentEditionException
|
* @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
|
// Check if vote already exists with the same name
|
||||||
if (FALSE === $vote_id) {
|
if (false === $vote_id) {
|
||||||
$exists = $this->voteRepository->existsByPollIdAndName($poll_id, $name);
|
$exists = $this->voteRepository->existsByPollIdAndName($poll_id, $name);
|
||||||
} else {
|
} else {
|
||||||
$exists = $this->voteRepository->existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id);
|
$exists = $this->voteRepository->existsByPollIdAndNameAndVoteId($poll_id, $name, $vote_id);
|
||||||
@ -317,6 +334,10 @@ class PollService {
|
|||||||
|
|
||||||
$poll = $this->findById($poll_id);
|
$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
|
// Check that no-one voted in the meantime and it conflicts the maximum votes constraint
|
||||||
$this->checkMaxVotes($choices, $poll, $poll_id);
|
$this->checkMaxVotes($choices, $poll, $poll_id);
|
||||||
|
|
||||||
@ -331,7 +352,8 @@ class PollService {
|
|||||||
* @param $slots_hash string The hash sent by the user
|
* @param $slots_hash string The hash sent by the user
|
||||||
* @throws ConcurrentEditionException Thrown when hashes are differents
|
* @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);
|
$slots = $this->allSlotsByPoll($poll);
|
||||||
if ($slots_hash !== $this->hashSlots($slots)) {
|
if ($slots_hash !== $this->hashSlots($slots)) {
|
||||||
throw new ConcurrentEditionException();
|
throw new ConcurrentEditionException();
|
||||||
@ -342,11 +364,12 @@ class PollService {
|
|||||||
* This method checks if the votes doesn't conflicts the maximum votes constraint
|
* This method checks if the votes doesn't conflicts the maximum votes constraint
|
||||||
*
|
*
|
||||||
* @param $user_choice
|
* @param $user_choice
|
||||||
* @param \stdClass $poll
|
* @param stdClass $poll
|
||||||
* @param string $poll_id
|
* @param string $poll_id
|
||||||
* @throws ConcurrentVoteException
|
* @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);
|
$votes = $this->allVotesByPollId($poll_id);
|
||||||
if (count($votes) <= 0) {
|
if (count($votes) <= 0) {
|
||||||
return;
|
return;
|
||||||
|
@ -15,7 +15,7 @@ class PurgeService {
|
|||||||
private $voteRepository;
|
private $voteRepository;
|
||||||
private $commentRepository;
|
private $commentRepository;
|
||||||
|
|
||||||
function __construct(FramaDB $connect, LogService $logService) {
|
public function __construct(LogService $logService) {
|
||||||
$this->logService = $logService;
|
$this->logService = $logService;
|
||||||
$this->pollRepository = RepositoryFactory::pollRepository();
|
$this->pollRepository = RepositoryFactory::pollRepository();
|
||||||
$this->slotRepository = RepositoryFactory::slotRepository();
|
$this->slotRepository = RepositoryFactory::slotRepository();
|
||||||
@ -26,9 +26,10 @@ class PurgeService {
|
|||||||
/**
|
/**
|
||||||
* This methode purges all old polls (the ones with end_date in past).
|
* 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();
|
$oldPolls = $this->pollRepository->findOldPolls();
|
||||||
$count = count($oldPolls);
|
$count = count($oldPolls);
|
||||||
|
|
||||||
@ -50,10 +51,11 @@ class PurgeService {
|
|||||||
/**
|
/**
|
||||||
* This methode delete all data about a poll.
|
* 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
|
* @return bool true is action succeeded
|
||||||
*/
|
*/
|
||||||
function purgePollById($poll_id) {
|
public function purgePollById(string $poll_id): bool
|
||||||
|
{
|
||||||
$done = true;
|
$done = true;
|
||||||
|
|
||||||
$this->pollRepository->beginTransaction();
|
$this->pollRepository->beginTransaction();
|
||||||
@ -71,4 +73,3 @@ class PurgeService {
|
|||||||
return $done;
|
return $done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,7 @@ use Framadate\Security\PasswordHasher;
|
|||||||
use Framadate\Security\Token;
|
use Framadate\Security\Token;
|
||||||
|
|
||||||
class SecurityService {
|
class SecurityService {
|
||||||
function __construct() {
|
public function __construct() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -18,9 +18,10 @@ class SecurityService {
|
|||||||
* </ul>
|
* </ul>
|
||||||
*
|
*
|
||||||
* @param $tokan_name string The name of the CSRF token
|
* @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'])) {
|
if (!isset($_SESSION['tokens'])) {
|
||||||
$_SESSION['tokens'] = [];
|
$_SESSION['tokens'] = [];
|
||||||
}
|
}
|
||||||
@ -38,7 +39,8 @@ class SecurityService {
|
|||||||
* @param $csrf string Value to check
|
* @param $csrf string Value to check
|
||||||
* @return bool true if the token is well checked
|
* @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;
|
$checked = $_SESSION['tokens'][$tokan_name]->getValue() === $csrf;
|
||||||
|
|
||||||
if($checked) {
|
if($checked) {
|
||||||
@ -54,14 +56,15 @@ class SecurityService {
|
|||||||
* @param $poll \stdClass The poll which we seek access
|
* @param $poll \stdClass The poll which we seek access
|
||||||
* @return bool true if the current session can access this poll
|
* @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)) {
|
if (is_null($poll->password_hash)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->ensureSessionPollSecurityIsCreated();
|
$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)) {
|
if (!empty($currentPassword) && PasswordHasher::verify($currentPassword, $poll->password_hash)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -75,17 +78,18 @@ class SecurityService {
|
|||||||
* @param $poll \stdClass The poll which we seek access
|
* @param $poll \stdClass The poll which we seek access
|
||||||
* @param $password string the password to compare
|
* @param $password string the password to compare
|
||||||
*/
|
*/
|
||||||
public function submitPollAccess($poll, $password) {
|
public function submitPollAccess($poll, string $password): void
|
||||||
|
{
|
||||||
if (!empty($password)) {
|
if (!empty($password)) {
|
||||||
$this->ensureSessionPollSecurityIsCreated();
|
$this->ensureSessionPollSecurityIsCreated();
|
||||||
$_SESSION['poll_security'][$poll->id] = $password;
|
$_SESSION['poll_security'][$poll->id] = $password;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function ensureSessionPollSecurityIsCreated() {
|
private function ensureSessionPollSecurityIsCreated(): void
|
||||||
|
{
|
||||||
if (!isset($_SESSION['poll_security'])) {
|
if (!isset($_SESSION['poll_security'])) {
|
||||||
$_SESSION['poll_security'] = [];
|
$_SESSION['poll_security'] = [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
namespace Framadate\Services;
|
namespace Framadate\Services;
|
||||||
|
|
||||||
class SessionService {
|
class SessionService {
|
||||||
@ -18,12 +17,7 @@ class SessionService {
|
|||||||
|
|
||||||
$this->initSectionIfNeeded($section);
|
$this->initSectionIfNeeded($section);
|
||||||
|
|
||||||
$returnValue = $defaultValue;
|
return $_SESSION[$section][$key] ?? $defaultValue;
|
||||||
if (isset($_SESSION[$section][$key])) {
|
|
||||||
$returnValue = $_SESSION[$section][$key];
|
|
||||||
}
|
|
||||||
|
|
||||||
return $returnValue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -33,7 +27,8 @@ class SessionService {
|
|||||||
* @param $key
|
* @param $key
|
||||||
* @param $value
|
* @param $value
|
||||||
*/
|
*/
|
||||||
public function set($section, $key, $value) {
|
public function set($section, $key, $value): void
|
||||||
|
{
|
||||||
assert(!empty($key));
|
assert(!empty($key));
|
||||||
assert(!empty($section));
|
assert(!empty($section));
|
||||||
|
|
||||||
@ -48,14 +43,16 @@ class SessionService {
|
|||||||
* @param $section
|
* @param $section
|
||||||
* @param $key
|
* @param $key
|
||||||
*/
|
*/
|
||||||
public function remove($section, $key) {
|
public function remove($section, $key): void
|
||||||
|
{
|
||||||
assert(!empty($key));
|
assert(!empty($key));
|
||||||
assert(!empty($section));
|
assert(!empty($section));
|
||||||
|
|
||||||
unset($_SESSION[$section][$key]);
|
unset($_SESSION[$section][$key]);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function initSectionIfNeeded($section) {
|
private function initSectionIfNeeded($section): void
|
||||||
|
{
|
||||||
if (!isset($_SESSION[$section])) {
|
if (!isset($_SESSION[$section])) {
|
||||||
$_SESSION[$section] = [];
|
$_SESSION[$section] = [];
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@ use Framadate\Repositories\RepositoryFactory;
|
|||||||
class SuperAdminService {
|
class SuperAdminService {
|
||||||
private $pollRepository;
|
private $pollRepository;
|
||||||
|
|
||||||
function __construct() {
|
public function __construct() {
|
||||||
$this->pollRepository = RepositoryFactory::pollRepository();
|
$this->pollRepository = RepositoryFactory::pollRepository();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -23,7 +23,8 @@ class SuperAdminService {
|
|||||||
* @param int $limit The limit size
|
* @param int $limit The limit size
|
||||||
* @return array ['polls' => The {$limit} polls, 'count' => Entries found by the query, 'total' => Total count]
|
* @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;
|
$start = $page * $limit;
|
||||||
$polls = $this->pollRepository->findAll($search, $start, $limit);
|
$polls = $this->pollRepository->findAll($search, $start, $limit);
|
||||||
$count = $this->pollRepository->count($search);
|
$count = $this->pollRepository->count($search);
|
||||||
@ -32,4 +33,3 @@ class SuperAdminService {
|
|||||||
return ['polls' => $polls, 'count' => $count, 'total' => $total];
|
return ['polls' => $polls, 'count' => $count, 'total' => $total];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -24,13 +24,13 @@ class Utils {
|
|||||||
/**
|
/**
|
||||||
* @return string Server name
|
* @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';
|
$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'];
|
$port = in_array($_SERVER['SERVER_PORT'], ['80', '443'], true) ? '' : ':' . $_SERVER['SERVER_PORT'];
|
||||||
$dirname = dirname($_SERVER['SCRIPT_NAME']);
|
$dirname = dirname($_SERVER['SCRIPT_NAME']);
|
||||||
$dirname = $dirname === '\\' ? '/' : $dirname . '/';
|
$dirname = $dirname === '\\' ? '/' : $dirname . '/';
|
||||||
$dirname = str_replace('/admin', '', $dirname);
|
$dirname = str_replace(['/admin', '/action'], '', $dirname);
|
||||||
$dirname = str_replace('/action', '', $dirname);
|
|
||||||
$server_name = (defined('APP_URL') ? APP_URL : $_SERVER['SERVER_NAME']) . $port . $dirname;
|
$server_name = (defined('APP_URL') ? APP_URL : $_SERVER['SERVER_NAME']) . $port . $dirname;
|
||||||
|
|
||||||
return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
|
return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
|
||||||
@ -38,9 +38,10 @@ class Utils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $title
|
* @param string $title
|
||||||
|
*
|
||||||
* @deprecated
|
* @deprecated
|
||||||
*/
|
*/
|
||||||
public static function print_header($title = '') {
|
public static function print_header($title = ''): void {
|
||||||
global $locale;
|
global $locale;
|
||||||
|
|
||||||
echo '<!DOCTYPE html>
|
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/style.css" />
|
||||||
<link rel="stylesheet" href="' . self::get_server_name() . 'css/frama.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" />
|
<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 src="' . self::get_server_name() . 'js/jquery-3.6.0.min.js"></script>
|
||||||
<script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap.min.js"></script>
|
<script 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/bootstrap-datepicker.js"></script>';
|
||||||
if ('en' !== $locale) {
|
if ('en' !== $locale) {
|
||||||
echo '
|
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 '
|
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")) {
|
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 '
|
echo '
|
||||||
@ -84,13 +85,14 @@ class Utils {
|
|||||||
* @param string $id The poll's id
|
* @param string $id The poll's id
|
||||||
* @param bool $admin True to generate an admin URL, false for a public one
|
* @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 $vote_id (optional) The vote's unique id
|
||||||
* @param null $action
|
* @param string|null $action
|
||||||
* @param null $action_value
|
* @param string|null $action_value
|
||||||
* @return string The poll's URL.
|
* @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
|
// 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 (URL_PROPRE) {
|
||||||
if ($admin === true) {
|
if ($admin === true) {
|
||||||
@ -132,30 +134,33 @@ class Utils {
|
|||||||
*
|
*
|
||||||
* @param mixed $object The object to print.
|
* @param mixed $object The object to print.
|
||||||
*/
|
*/
|
||||||
public static function debug($object) {
|
public static function debug($object): void
|
||||||
|
{
|
||||||
echo '<pre>';
|
echo '<pre>';
|
||||||
print_r($object);
|
print_r($object);
|
||||||
echo '</pre>';
|
echo '</pre>';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function table($tableName) {
|
public static function table(string $tableName): string
|
||||||
|
{
|
||||||
return TABLENAME_PREFIX . $tableName;
|
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 = new Parsedown();
|
||||||
|
|
||||||
$parseDown
|
$parseDown
|
||||||
->setMarkupEscaped(true)
|
|
||||||
->setBreaksEnabled(true)
|
->setBreaksEnabled(true)
|
||||||
->setUrlsLinked(false);
|
->setSafeMode(true)
|
||||||
|
;
|
||||||
|
|
||||||
if ($line) {
|
if ($line) {
|
||||||
$html = $parseDown->line($md);
|
$html = $parseDown->line($md);
|
||||||
} else {
|
} else {
|
||||||
$md = preg_replace_callback(
|
$md = preg_replace_callback(
|
||||||
'#( ){2,}#',
|
'#( ){2,}#',
|
||||||
function ($m) {
|
static function ($m) {
|
||||||
return str_repeat(' ', strlen($m[0]));
|
return str_repeat(' ', strlen($m[0]));
|
||||||
},
|
},
|
||||||
$md
|
$md
|
||||||
@ -168,39 +173,38 @@ class Utils {
|
|||||||
return $clear ? $text : $html;
|
return $clear ? $text : $html;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function htmlEscape($html) {
|
public static function htmlEscape(string $html): string {
|
||||||
return htmlentities($html, ENT_HTML5 | ENT_QUOTES);
|
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);
|
return htmlspecialchars($html, ENT_HTML5 | ENT_QUOTES);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function csvEscape($text) {
|
public static function csvEscape(string $text): string
|
||||||
$escaped = str_replace('"', '""', $text);
|
{
|
||||||
$escaped = str_replace("\r\n", '', $escaped);
|
$escaped = str_replace(['"', "\r\n", "\n"], ['""', '', ''], $text);
|
||||||
$escaped = str_replace("\n", '', $escaped);
|
|
||||||
$escaped = preg_replace("/^(=|\+|\-|\@)/", "'$1", $escaped);
|
$escaped = preg_replace("/^(=|\+|\-|\@)/", "'$1", $escaped);
|
||||||
|
|
||||||
return '"' . $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('[^a-zA-Z0-9._-]', '_', $title);
|
||||||
$cleaned = preg_replace(' {2,}', ' ', $cleaned);
|
return preg_replace(' {2,}', ' ', $cleaned);
|
||||||
|
|
||||||
return $cleaned;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function fromPostOrDefault($postKey, $default = '') {
|
public static function fromPostOrDefault(string $postKey, ?string $default = '') {
|
||||||
return !empty($_POST[$postKey]) ? $_POST[$postKey] : $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), '+/', '-_'), '=');
|
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);
|
return base64_decode(str_pad(strtr($input, '-_', '+/'), strlen($input) % 4, '=', STR_PAD_RIGHT), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,110 +0,0 @@
|
|||||||
<?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)
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Fully qualified domain name of your webserver.
|
|
||||||
// If this is unset or empty, the servername is determined automatically.
|
|
||||||
// You *have to set this* if you are running Framadate behind a reverse proxy.
|
|
||||||
// const APP_URL = '<www.mydomain.fr>';
|
|
||||||
|
|
||||||
// Application name
|
|
||||||
const NOMAPPLICATION = '<Application name>';
|
|
||||||
|
|
||||||
// Database administrator email
|
|
||||||
const ADRESSEMAILADMIN = '<email address>';
|
|
||||||
|
|
||||||
// Email for automatic responses (you should set it to "no-reply")
|
|
||||||
const ADRESSEMAILREPONSEAUTO = '<no-reply@mydomain.com>';
|
|
||||||
|
|
||||||
// Database user
|
|
||||||
const DB_USER= '<database user>';
|
|
||||||
|
|
||||||
// Database password
|
|
||||||
const DB_PASSWORD = '<database password>';
|
|
||||||
|
|
||||||
// Database server name, leave empty to use a socket
|
|
||||||
const DB_CONNECTION_STRING = 'mysql:host=<database host>;dbname=<database name>;port=<database port>';
|
|
||||||
|
|
||||||
// Name of the table that stores migration script already executed
|
|
||||||
const MIGRATION_TABLE = 'framadate_migration';
|
|
||||||
|
|
||||||
// Table name prefix
|
|
||||||
const TABLENAME_PREFIX = 'fd_';
|
|
||||||
|
|
||||||
// Default Language
|
|
||||||
const DEFAULT_LANGUAGE = 'fr';
|
|
||||||
|
|
||||||
// List of supported languages, fake constant as arrays can be used as constants only in PHP >=5.6
|
|
||||||
$ALLOWED_LANGUAGES = [
|
|
||||||
'fr' => 'Français',
|
|
||||||
'en' => 'English',
|
|
||||||
'oc' => 'Occitan',
|
|
||||||
'es' => 'Español',
|
|
||||||
'de' => 'Deutsch',
|
|
||||||
'nl' => 'Dutch',
|
|
||||||
'it' => 'Italiano',
|
|
||||||
'br' => 'Brezhoneg',
|
|
||||||
];
|
|
||||||
|
|
||||||
// Path to image file with the title
|
|
||||||
const IMAGE_TITRE = 'images/logo-framadate.png';
|
|
||||||
|
|
||||||
// Relative path to favicon
|
|
||||||
const FAVICON = 'favicon.ico';
|
|
||||||
|
|
||||||
// Clean URLs, boolean
|
|
||||||
const URL_PROPRE = false;
|
|
||||||
|
|
||||||
// Use REMOTE_USER data provided by web server
|
|
||||||
const USE_REMOTE_USER = true;
|
|
||||||
|
|
||||||
// Path to the log file
|
|
||||||
const LOG_FILE = 'admin/stdout.log';
|
|
||||||
|
|
||||||
// Days (after expiration date) before purging a poll
|
|
||||||
const PURGE_DELAY = 60;
|
|
||||||
|
|
||||||
// Max slots per poll
|
|
||||||
const MAX_SLOTS_PER_POLL = 366;
|
|
||||||
|
|
||||||
// Number of seconds before we allow to resend an "Remember Edit Link" email.
|
|
||||||
const TIME_EDIT_LINK_EMAIL = 60;
|
|
||||||
|
|
||||||
// Config
|
|
||||||
$config = [
|
|
||||||
/* general config */
|
|
||||||
'use_smtp' => true, // use email for polls creation/modification/responses notification
|
|
||||||
'smtp_options' => [
|
|
||||||
'host' => 'localhost', // SMTP server (you could add many servers (main and backup for example) : use ";" like separator
|
|
||||||
'auth' => false, // Enable SMTP authentication
|
|
||||||
'username' => '', // SMTP username
|
|
||||||
'password' => '', // SMTP password
|
|
||||||
'secure' => '', // Enable encryption (false, tls or ssl)
|
|
||||||
'port' => 25, // TCP port to connect to
|
|
||||||
],
|
|
||||||
'tracking_code' => '', // add HTML code to every page, useful for tools like Piwik
|
|
||||||
/* home */
|
|
||||||
'show_what_is_that' => true, // display "how to use" section
|
|
||||||
'show_the_software' => true, // display technical information about the software
|
|
||||||
'show_cultivate_your_garden' => true, // display "development and administration" information
|
|
||||||
/* create_classic_poll.php / create_date_poll.php */
|
|
||||||
'default_poll_duration' => 180, // default values for the new poll duration (number of days).
|
|
||||||
/* create_classic_poll.php */
|
|
||||||
'user_can_add_img_or_link' => true, // user can add link or URL when creating his poll.
|
|
||||||
'markdown_editor_by_default' => true, // The markdown editor for the description is enabled by default
|
|
||||||
];
|
|
@ -18,10 +18,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// FRAMADATE version
|
// FRAMADATE version
|
||||||
const VERSION = '1.1.1';
|
const VERSION = '1.1.19';
|
||||||
|
|
||||||
// PHP Needed version
|
// PHP Needed version
|
||||||
const PHP_NEEDED_VERSION = '5.6';
|
const PHP_NEEDED_VERSION = '7.3';
|
||||||
|
|
||||||
// Config constants
|
// Config constants
|
||||||
const COMPILE_DIR = '/tpl_c/';
|
const COMPILE_DIR = '/tpl_c/';
|
||||||
@ -42,3 +42,6 @@ const SESSION_EDIT_LINK_TIME = "EditLinkMail";
|
|||||||
|
|
||||||
// CSRF (300s = 5min)
|
// CSRF (300s = 5min)
|
||||||
const TOKEN_TIME = 300;
|
const TOKEN_TIME = 300;
|
||||||
|
|
||||||
|
const ICAL_ENDING = ".ics";
|
||||||
|
const ICAL_PRODID = "-//Framasoft//Framadate//EN";
|
||||||
|
@ -18,12 +18,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Prepare I18N instance
|
// Prepare I18N instance
|
||||||
$i18n = \o80\i18n\I18N::instance();
|
use o80\i18n\I18N;
|
||||||
|
|
||||||
|
$i18n = I18N::instance();
|
||||||
$i18n->setDefaultLang(DEFAULT_LANGUAGE);
|
$i18n->setDefaultLang(DEFAULT_LANGUAGE);
|
||||||
$i18n->setPath(__DIR__ . '/../../locale');
|
$i18n->setPath(__DIR__ . '/../../locale');
|
||||||
|
|
||||||
// Change langauge when user asked for it
|
// Change language when user asked for it
|
||||||
if (isset($_POST['lang']) && is_string($_POST['lang']) && in_array($_POST['lang'], array_keys($ALLOWED_LANGUAGES), true)) {
|
if (isset($_POST['lang']) && is_string($_POST['lang']) && array_key_exists($_POST['lang'], $ALLOWED_LANGUAGES)) {
|
||||||
$_SESSION['lang'] = $_POST['lang'];
|
$_SESSION['lang'] = $_POST['lang'];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -38,7 +40,7 @@ $date_format['txt_day'] = __('Date', 'DAY');
|
|||||||
$date_format['txt_date'] = __('Date', 'DATE');
|
$date_format['txt_date'] = __('Date', 'DATE');
|
||||||
$date_format['txt_month_year'] = __('Date', 'MONTH_YEAR');
|
$date_format['txt_month_year'] = __('Date', 'MONTH_YEAR');
|
||||||
$date_format['txt_datetime_short'] = __('Date', 'DATETIME');
|
$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) {
|
foreach ($date_format as $k => $v) {
|
||||||
$date_format[$k] = preg_replace('#(?<!%)((?:%%)*)%e#', '\1%#d', $v); //replace %e by %#d for windows
|
$date_format[$k] = preg_replace('#(?<!%)((?:%%)*)%e#', '\1%#d', $v); //replace %e by %#d for windows
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
*/
|
*/
|
||||||
use Framadate\FramaDB;
|
use Framadate\FramaDB;
|
||||||
use Framadate\Repositories\RepositoryFactory;
|
use Framadate\Repositories\RepositoryFactory;
|
||||||
|
use Framadate\Utils;
|
||||||
|
|
||||||
// Autoloading of dependencies with Composer
|
// Autoloading of dependencies with Composer
|
||||||
require_once __DIR__ . '/../../vendor/autoload.php';
|
require_once __DIR__ . '/../../vendor/autoload.php';
|
||||||
@ -39,10 +40,17 @@ require_once __DIR__ . '/constants.php';
|
|||||||
if (is_file(CONF_FILENAME)) {
|
if (is_file(CONF_FILENAME)) {
|
||||||
@include_once __DIR__ . '/config.php';
|
@include_once __DIR__ . '/config.php';
|
||||||
|
|
||||||
|
try {
|
||||||
// Connection to database
|
// Connection to database
|
||||||
$connect = new FramaDB(DB_CONNECTION_STRING, DB_USER, DB_PASSWORD);
|
$connect = new FramaDB(DB_CONNECTION_STRING, DB_USER, DB_PASSWORD);
|
||||||
RepositoryFactory::init($connect);
|
RepositoryFactory::init($connect);
|
||||||
$err = 0;
|
} catch (PDOException $e) {
|
||||||
|
if ($_SERVER['SCRIPT_NAME'] !== '/maintenance.php') {
|
||||||
|
header(('Location: ' . Utils::get_server_name() . 'maintenance.php'));
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
$error = $e->getMessage();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
define('NOMAPPLICATION', 'Framadate');
|
define('NOMAPPLICATION', 'Framadate');
|
||||||
define('DEFAULT_LANGUAGE', 'fr');
|
define('DEFAULT_LANGUAGE', 'fr');
|
||||||
@ -55,6 +63,7 @@ if (is_file(CONF_FILENAME)) {
|
|||||||
'de' => 'Deutsch',
|
'de' => 'Deutsch',
|
||||||
'it' => 'Italiano',
|
'it' => 'Italiano',
|
||||||
'br' => 'Brezhoneg',
|
'br' => 'Brezhoneg',
|
||||||
|
'ca' => 'Català'
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@ $smarty->assign('SERVER_URL', Utils::get_server_name());
|
|||||||
$smarty->assign('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
|
$smarty->assign('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
|
||||||
$smarty->assign('TITLE_IMAGE', IMAGE_TITRE);
|
$smarty->assign('TITLE_IMAGE', IMAGE_TITRE);
|
||||||
$smarty->assign('use_nav_js', strstr($_SERVER['SERVER_NAME'], 'framadate.org'));
|
$smarty->assign('use_nav_js', strstr($_SERVER['SERVER_NAME'], 'framadate.org'));
|
||||||
|
$smarty->assign('provide_fork_awesome', !isset($config['provide_fork_awesome']) || $config['provide_fork_awesome']);
|
||||||
$smarty->assign('locale', $locale);
|
$smarty->assign('locale', $locale);
|
||||||
$smarty->assign('langs', $ALLOWED_LANGUAGES);
|
$smarty->assign('langs', $ALLOWED_LANGUAGES);
|
||||||
$smarty->assign('date_format', $date_format);
|
$smarty->assign('date_format', $date_format);
|
||||||
@ -49,9 +50,10 @@ if (isset($_SERVER['FRAMADATE_DEVMODE']) && $_SERVER['FRAMADATE_DEVMODE']) {
|
|||||||
$smarty->compile_check = false;
|
$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]]);
|
$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 = (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;
|
$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]]) : '';
|
$vote_unique_id = isset($params['vote_id']) ? filter_var($params['vote_id'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => POLL_REGEX]]) : '';
|
||||||
@ -61,22 +63,40 @@ function smarty_function_poll_url($params, Smarty_Internal_Template $template) {
|
|||||||
return Utils::getUrlSondage($poll_id, $admin, $vote_unique_id, $action, $action_value);
|
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);
|
return Utils::markdown($md, $clear, $inline);
|
||||||
}
|
}
|
||||||
|
|
||||||
function smarty_modifier_resource($link) {
|
function smarty_modifier_resource(string $link): string
|
||||||
|
{
|
||||||
return Utils::get_server_name() . $link;
|
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, '\\\'');
|
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);
|
return Utils::htmlEscape($html);
|
||||||
}
|
}
|
||||||
|
|
||||||
function smarty_modifier_datepicker_path($lang) {
|
function smarty_modifier_html_special_chars(string $html): string
|
||||||
|
{
|
||||||
|
return Utils::htmlMailEscape($html);
|
||||||
|
}
|
||||||
|
|
||||||
|
function smarty_modifier_datepicker_path(string $lang): string
|
||||||
|
{
|
||||||
$i = 0;
|
$i = 0;
|
||||||
while (!is_file(path_for_datepicker_locale($lang)) && $i < 3) {
|
while (!is_file(path_for_datepicker_locale($lang)) && $i < 3) {
|
||||||
$lang_arr = explode('-', $lang);
|
$lang_arr = explode('-', $lang);
|
||||||
@ -85,12 +105,13 @@ function smarty_modifier_datepicker_path($lang) {
|
|||||||
} else {
|
} else {
|
||||||
$lang = 'en';
|
$lang = 'en';
|
||||||
}
|
}
|
||||||
$i += 1;
|
++$i;
|
||||||
}
|
}
|
||||||
return 'js/locales/bootstrap-datepicker.' . $lang . '.js';
|
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);
|
$lang_arr = explode('-', $locale);
|
||||||
if ($lang_arr && count($lang_arr) > 1) {
|
if ($lang_arr && count($lang_arr) > 1) {
|
||||||
return $lang_arr[0];
|
return $lang_arr[0];
|
||||||
@ -98,6 +119,10 @@ function smarty_modifier_locale_2_lang($locale) {
|
|||||||
return $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';
|
return __DIR__ . '/../../js/locales/bootstrap-datepicker.' . $lang . '.js';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Customization #4871 par Didier le 28/08/2021.
|
||||||
|
$smarty->assign('VERSION',VERSION);
|
@ -4,11 +4,12 @@ namespace Framadate;
|
|||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
abstract class FramaTestCase extends TestCase {
|
abstract class FramaTestCase extends TestCase {
|
||||||
protected function getTestResourcePath($resourcepath) {
|
protected function getTestResourcePath(string $resourcepath): string
|
||||||
|
{
|
||||||
return __DIR__ . '/../resources/' . $resourcepath;
|
return __DIR__ . '/../resources/' . $resourcepath;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function readTestResource($resourcepath) {
|
protected function readTestResource(string $resourcepath) {
|
||||||
return file_get_contents($this->getTestResourcePath($resourcepath));
|
return file_get_contents($this->getTestResourcePath($resourcepath));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,8 @@ use Framadate\FramaTestCase;
|
|||||||
|
|
||||||
class InputServiceUnitTest extends FramaTestCase
|
class InputServiceUnitTest extends FramaTestCase
|
||||||
{
|
{
|
||||||
public function liste_emails() {
|
public function liste_emails(): array
|
||||||
|
{
|
||||||
return [
|
return [
|
||||||
// valids addresses
|
// valids addresses
|
||||||
"valid address" => ["example@example.com", "example@example.com"],
|
"valid address" => ["example@example.com", "example@example.com"],
|
||||||
@ -23,7 +24,8 @@ class InputServiceUnitTest extends FramaTestCase
|
|||||||
/**
|
/**
|
||||||
* @dataProvider liste_emails
|
* @dataProvider liste_emails
|
||||||
*/
|
*/
|
||||||
public function test_filterMail($email, $expected) {
|
public function test_filterMail($email, $expected): void
|
||||||
|
{
|
||||||
$inputService = new InputService();
|
$inputService = new InputService();
|
||||||
$filtered = $inputService->filterMail($email);
|
$filtered = $inputService->filterMail($email);
|
||||||
|
|
||||||
|
@ -4,9 +4,10 @@ namespace Framadate\Services;
|
|||||||
use Framadate\FramaTestCase;
|
use Framadate\FramaTestCase;
|
||||||
|
|
||||||
class MailServiceUnitTest extends 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
|
// Given
|
||||||
$mailService = new MailService(true);
|
$mailService = new MailService(true);
|
||||||
$_SESSION[MailService::MAILSERVICE_KEY] = [self::MSG_KEY => time() - 1000];
|
$_SESSION[MailService::MAILSERVICE_KEY] = [self::MSG_KEY => time() - 1000];
|
||||||
@ -15,10 +16,11 @@ class MailServiceUnitTest extends FramaTestCase {
|
|||||||
$canSendMsg = $mailService->canSendMsg(self::MSG_KEY);
|
$canSendMsg = $mailService->canSendMsg(self::MSG_KEY);
|
||||||
|
|
||||||
// Then
|
// 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
|
// Given
|
||||||
$mailService = new MailService(true);
|
$mailService = new MailService(true);
|
||||||
$_SESSION[MailService::MAILSERVICE_KEY] = [self::MSG_KEY => time()];
|
$_SESSION[MailService::MAILSERVICE_KEY] = [self::MSG_KEY => time()];
|
||||||
@ -27,6 +29,6 @@ class MailServiceUnitTest extends FramaTestCase {
|
|||||||
$canSendMsg = $mailService->canSendMsg(self::MSG_KEY);
|
$canSendMsg = $mailService->canSendMsg(self::MSG_KEY);
|
||||||
|
|
||||||
// Then
|
// Then
|
||||||
$this->assertSame(false, $canSendMsg);
|
$this->assertFalse($canSendMsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,7 @@ function bandeau_titre($titre)
|
|||||||
echo '
|
echo '
|
||||||
<header role="banner">';
|
<header role="banner">';
|
||||||
if(count($ALLOWED_LANGUAGES) > 1){
|
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">
|
<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>
|
<select name="lang" class="form-control" title="' . __('Language selector', 'Select the language') . '" >' . liste_lang() . '</select>
|
||||||
<span class="input-group-btn">
|
<span class="input-group-btn">
|
||||||
@ -54,14 +54,14 @@ function bandeau_titre($titre)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function liste_lang()
|
function liste_lang(): string
|
||||||
{
|
{
|
||||||
global $ALLOWED_LANGUAGES; global $locale;
|
global $ALLOWED_LANGUAGES; global $locale;
|
||||||
|
|
||||||
$str = '';
|
$str = '';
|
||||||
|
|
||||||
foreach ($ALLOWED_LANGUAGES as $k => $v ) {
|
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" ;
|
$str .= '<option lang="' . substr($k,0,2) . '" selected value="' . $k . '">' . $v . '</option>' . "\n" ;
|
||||||
} else {
|
} else {
|
||||||
$str .= '<option lang="' . substr($k,0,2) . '" value="' . $k . '">' . $v . '</option>' . "\n" ;
|
$str .= '<option lang="' . substr($k,0,2) . '" value="' . $k . '">' . $v . '</option>' . "\n" ;
|
||||||
|
@ -10,8 +10,8 @@ include_once __DIR__ . '/app/inc/init.php';
|
|||||||
$goodLang = $_GET['good'];
|
$goodLang = $_GET['good'];
|
||||||
$otherLang = $_GET['other'];
|
$otherLang = $_GET['other'];
|
||||||
|
|
||||||
$good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.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);
|
$other = json_decode(file_get_contents(__DIR__ . '/locale/' . $otherLang . '.json'), true, 512, JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
foreach ($good as $sectionName => $section) {
|
foreach ($good as $sectionName => $section) {
|
||||||
foreach ($section as $key => $value) {
|
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 ($other as $sectionName => $section) {
|
||||||
foreach ($section as $key => $value) {
|
foreach ($section as $key => $value) {
|
||||||
if (
|
if (
|
||||||
strtolower($key) === strtolower($goodKey) ||
|
strtolower($key) === strtolower($goodKey) ||
|
||||||
|
stripos($key, strtolower($goodKey)) === 0 ||
|
||||||
strtolower(trim($key)) === strtolower($goodKey) ||
|
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)
|
strtolower(trim(substr(trim($key), 0, strlen($key) - 1))) === strtolower($goodKey)
|
||||||
) {
|
) {
|
||||||
return $value;
|
return $value;
|
||||||
|
@ -10,8 +10,8 @@ include_once __DIR__ . '/app/inc/init.php';
|
|||||||
$goodLang = $_GET['good'];
|
$goodLang = $_GET['good'];
|
||||||
$testLang = $_GET['test'];
|
$testLang = $_GET['test'];
|
||||||
|
|
||||||
$good = json_decode(file_get_contents(__DIR__ . '/locale/' . $goodLang . '.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);
|
$test = json_decode(file_get_contents(__DIR__ . '/locale/' . $testLang . '.json'), true, 512, JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
$diffSection = false;
|
$diffSection = false;
|
||||||
|
|
||||||
@ -46,8 +46,8 @@ include_once __DIR__ . '/app/inc/init.php';
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$diffSection and array_keys($good[$sectionName]) !== array_keys($test[$sectionName])) {
|
if (!$diffSection and array_keys($section) !== array_keys($test[$sectionName])) {
|
||||||
$diff[$sectionName]['order_good'] = array_keys($good[$sectionName]);
|
$diff[$sectionName]['order_good'] = array_keys($section);
|
||||||
$diff[$sectionName]['order_test'] = array_keys($test[$sectionName]);
|
$diff[$sectionName]['order_test'] = array_keys($test[$sectionName]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,10 +2,12 @@
|
|||||||
"name": "framasoft/framadate",
|
"name": "framasoft/framadate",
|
||||||
"description": "Application to facilitate the schedule of events or classic polls",
|
"description": "Application to facilitate the schedule of events or classic polls",
|
||||||
"homepage": "https://framadate.org/",
|
"homepage": "https://framadate.org/",
|
||||||
"keywords": ["poll", "framadate"],
|
"keywords": [
|
||||||
|
"poll",
|
||||||
|
"framadate"
|
||||||
|
],
|
||||||
"version": "0.9.0",
|
"version": "0.9.0",
|
||||||
"license": "CECILL-B",
|
"license": "CECILL-B",
|
||||||
|
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://framagit.org/framasoft/framadate/issues"
|
"issues": "https://framagit.org/framasoft/framadate/issues"
|
||||||
@ -52,33 +54,43 @@
|
|||||||
"email": "raphael.droz@gmail.com"
|
"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": {
|
"require": {
|
||||||
"php": ">=5.6.0",
|
"php": ">=7.3.0",
|
||||||
"ext-pdo": "*",
|
"ext-pdo": "*",
|
||||||
"smarty/smarty": "^3.1",
|
"ext-json": "*",
|
||||||
|
"smarty/smarty": "^4.0",
|
||||||
"o80/i18n": "dev-develop",
|
"o80/i18n": "dev-develop",
|
||||||
"phpmailer/phpmailer": "^5.2",
|
"phpmailer/phpmailer": "~6.2",
|
||||||
"ircmaxell/password-compat": "dev-master",
|
"ircmaxell/password-compat": "dev-master",
|
||||||
"roave/security-advisories": "dev-master",
|
"roave/security-advisories": "dev-master",
|
||||||
"erusev/parsedown": "^1.7",
|
"erusev/parsedown": "^1.7",
|
||||||
"egulias/email-validator": "~2.1"
|
"egulias/email-validator": "^3.1",
|
||||||
|
"sabre/vobject": "~4.1"
|
||||||
},
|
},
|
||||||
|
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^5.7",
|
"phpunit/phpunit": "^9",
|
||||||
"friendsofphp/php-cs-fixer": "~2.0"
|
"friendsofphp/php-cs-fixer": "^3.2",
|
||||||
|
"vimeo/psalm": "^4.15"
|
||||||
},
|
},
|
||||||
|
"repositories": [
|
||||||
|
{
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://framagit.org/framasoft/framadate/o80-i18n"
|
||||||
|
}
|
||||||
|
],
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Framadate\\": "app/classes/Framadate/"
|
"Framadate\\": "app/classes/Framadate/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
"config": {
|
"config": {
|
||||||
"platform": {
|
"platform": {
|
||||||
"php": "5.6.0"
|
"php": "7.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
4782
composer.lock
generated
4782
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -17,6 +17,7 @@
|
|||||||
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
|
||||||
*/
|
*/
|
||||||
use Framadate\Choice;
|
use Framadate\Choice;
|
||||||
|
use Framadate\Services\InputService;
|
||||||
use Framadate\Services\LogService;
|
use Framadate\Services\LogService;
|
||||||
use Framadate\Services\MailService;
|
use Framadate\Services\MailService;
|
||||||
use Framadate\Services\PollService;
|
use Framadate\Services\PollService;
|
||||||
@ -29,10 +30,11 @@ include_once __DIR__ . '/app/inc/init.php';
|
|||||||
/* Service */
|
/* Service */
|
||||||
/*---------*/
|
/*---------*/
|
||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($logService);
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
$purgeService = new PurgeService($connect, $logService);
|
$purgeService = new PurgeService($logService);
|
||||||
$sessionService = new SessionService();
|
$sessionService = new SessionService();
|
||||||
|
$inputService = new InputService();
|
||||||
|
|
||||||
if (is_file('bandeaux_local.php')) {
|
if (is_file('bandeaux_local.php')) {
|
||||||
include_once('bandeaux_local.php');
|
include_once('bandeaux_local.php');
|
||||||
@ -40,51 +42,33 @@ if (is_file('bandeaux_local.php')) {
|
|||||||
include_once('bandeaux.php');
|
include_once('bandeaux.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$form = unserialize($_SESSION['form']);
|
||||||
|
|
||||||
// Step 1/4 : error if $_SESSION from info_sondage are not valid
|
// 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('title', __('Error', 'Error!'));
|
||||||
$smarty->assign('error', __('Error', 'You haven\'t filled the first section of the poll creation.'));
|
$smarty->assign('error', __('Error', 'You haven\'t filled the first section of the poll creation.'));
|
||||||
$smarty->display('error.tpl');
|
$smarty->display('error.tpl');
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
// Min/Max archive date
|
// The poll format is other (A) if we are in this file
|
||||||
$min_expiry_time = $pollService->minExpiryDate();
|
if (!isset($form->format)) {
|
||||||
$max_expiry_time = $pollService->maxExpiryDate();
|
$form->format = 'A';
|
||||||
|
}
|
||||||
// The poll format is AUTRE (other)
|
// If we come from another format, we need to clear choices
|
||||||
if ($_SESSION['form']->format !== 'A') {
|
if (isset($form->format) && $form->format !== 'A') {
|
||||||
$_SESSION['form']->format = 'A';
|
$form->format = 'A';
|
||||||
$_SESSION['form']->clearChoices();
|
$form->clearChoices();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Step 4 : Data prepare before insert in DB
|
// Step 4 : Data prepare before insert in DB
|
||||||
if (isset($_POST['confirmation'])) {
|
if (isset($_POST['confirmation'])) {
|
||||||
// Define expiration date
|
// Define expiration date
|
||||||
$enddate = filter_input(INPUT_POST, 'enddate', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '#^[0-9]{2}/[0-9]{2}/[0-9]{4}$#']]);
|
$expiration_date = $inputService->parseDate($_POST['enddate']);
|
||||||
|
$form->end_date = $inputService->validateDate($expiration_date, $pollService->minExpiryDate(), $pollService->maxExpiryDate())->getTimestamp();
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert poll in database
|
// Insert poll in database
|
||||||
$ids = $pollService->createPoll($_SESSION['form']);
|
$ids = $pollService->createPoll($form);
|
||||||
$poll_id = $ids[0];
|
$poll_id = $ids[0];
|
||||||
$admin_poll_id = $ids[1];
|
$admin_poll_id = $ids[1];
|
||||||
|
|
||||||
@ -92,15 +76,15 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
|
|||||||
if ($config['use_smtp'] === true) {
|
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 = __('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 .= '<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 .= 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 = __('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));
|
$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)) {
|
if ($mailService->isValidEmail($form->admin_mail)) {
|
||||||
$mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . $_SESSION['form']->title, $message_admin);
|
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message_admin);
|
||||||
$mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . $_SESSION['form']->title, $message);
|
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,26 +104,26 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
|
|||||||
else if (isset($_POST['fin_sondage_autre'])) {
|
else if (isset($_POST['fin_sondage_autre'])) {
|
||||||
// Store choices in $_SESSION
|
// Store choices in $_SESSION
|
||||||
if (isset($_POST['choices'])) {
|
if (isset($_POST['choices'])) {
|
||||||
$_SESSION['form']->clearChoices();
|
$form->clearChoices();
|
||||||
foreach ($_POST['choices'] as $c) {
|
foreach ($_POST['choices'] as $c) {
|
||||||
if (!empty($c)) {
|
if (!empty($c)) {
|
||||||
$c = strip_tags($c);
|
$c = strip_tags($c);
|
||||||
$choice = new Choice($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
|
// 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
|
||||||
$summary = '<ol>';
|
$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_a_img); // Markdown [![alt](src)](href)
|
||||||
preg_match_all('/!\[(.*?)\]\((.*?)\)/', $choice->getName(), $md_img); // Markdown ![alt](src)
|
preg_match_all('/!\[(.*?)\]\((.*?)\)/', $choice->getName(), $md_img); // Markdown ![alt](src)
|
||||||
preg_match_all('/\[(.*?)\]\((.*?)\)/', $choice->getName(), $md_a); // Markdown [text](href)
|
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_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>';
|
$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)
|
} 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>';
|
$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('title', __('Step 3', 'Removal date and confirmation (3 on 3)'));
|
||||||
$smarty->assign('summary', $summary);
|
$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)'));
|
bandeau_titre(__('Step 2 classic', 'Poll subjects (2 on 3)'));
|
||||||
|
|
||||||
echo '
|
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="row">
|
||||||
<div class="col-md-8 col-md-offset-2">';
|
<div class="col-md-8 col-md-offset-2">';
|
||||||
echo '
|
echo '
|
||||||
@ -186,10 +172,10 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
|
|||||||
echo ' </div>' . "\n";
|
echo ' </div>' . "\n";
|
||||||
|
|
||||||
// Fields choices : 5 by default
|
// Fields choices : 5 by default
|
||||||
$choices = $_SESSION['form']->getChoices();
|
$choices = $form->getChoices();
|
||||||
$nb_choices = max(count($choices), 5);
|
$nb_choices = max(count($choices), 5);
|
||||||
for ($i = 0; $i < $nb_choices; $i++) {
|
for ($i = 0; $i < $nb_choices; $i++) {
|
||||||
$choice = isset($choices[$i]) ? $choices[$i] : new Choice();
|
$choice = $choices[$i] ?? new Choice();
|
||||||
echo '
|
echo '
|
||||||
<div class="form-group choice-field">
|
<div class="form-group choice-field">
|
||||||
<label for="choice' . $i . '" class="col-sm-2 control-label">' . __('Generic', 'Choice') . ' ' . ($i + 1) . '</label>
|
<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>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<script type="text/javascript" src="js/app/framadatepicker.js"></script>
|
<script src="js/app/framadatepicker.js"></script>
|
||||||
<script type="text/javascript" src="js/app/classic_poll.js"></script>
|
<script src="js/app/classic_poll.js"></script>
|
||||||
' . "\n";
|
' . "\n";
|
||||||
|
|
||||||
bandeau_pied();
|
bandeau_pied();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,9 +30,9 @@ include_once __DIR__ . '/app/inc/init.php';
|
|||||||
/* Service */
|
/* Service */
|
||||||
/*---------*/
|
/*---------*/
|
||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($logService);
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
$purgeService = new PurgeService($connect, $logService);
|
$purgeService = new PurgeService($logService);
|
||||||
$inputService = new InputService();
|
$inputService = new InputService();
|
||||||
$sessionService = new SessionService();
|
$sessionService = new SessionService();
|
||||||
|
|
||||||
@ -40,21 +40,23 @@ if (is_readable('bandeaux_local.php')) {
|
|||||||
include_once('bandeaux_local.php');
|
include_once('bandeaux_local.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Min/Max archive date
|
$form = unserialize($_SESSION['form']);
|
||||||
$min_expiry_time = $pollService->minExpiryDate();
|
|
||||||
$max_expiry_time = $pollService->maxExpiryDate();
|
|
||||||
|
|
||||||
// The poll format is DATE
|
// The poll format is DATE if we are in this file
|
||||||
if ($_SESSION['form']->format !== 'D') {
|
if (!isset($form->format)) {
|
||||||
$_SESSION['form']->format = 'D';
|
$form->format = 'D';
|
||||||
$_SESSION['form']->clearChoices();
|
}
|
||||||
|
// 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;
|
$step = 1;
|
||||||
} else if (!empty($_POST['confirmation'])) {
|
} else if (!empty($_POST['confirmation'])) {
|
||||||
$step = 4;
|
$step = 4;
|
||||||
} else if (empty($_POST['choixheures']) || isset($_SESSION['form']->totalchoixjour)) {
|
} else if (empty($_POST['choixheures']) || isset($form->totalchoixjour)) {
|
||||||
$step = 2;
|
$step = 2;
|
||||||
} else {
|
} else {
|
||||||
$step = 3;
|
$step = 3;
|
||||||
@ -72,25 +74,28 @@ switch ($step) {
|
|||||||
// Step 2/4 : Select dates of the poll
|
// Step 2/4 : Select dates of the poll
|
||||||
|
|
||||||
// Prefill form->choices
|
// Prefill form->choices
|
||||||
foreach ($_SESSION['form']->getChoices() as $c) {
|
foreach ($form->getChoices() as $c) {
|
||||||
|
/** @var Choice $c */
|
||||||
$count = 3 - count($c->getSlots());
|
$count = 3 - count($c->getSlots());
|
||||||
for ($i = 0; $i < $count; $i++) {
|
for ($i = 0; $i < $count; $i++) {
|
||||||
$c->addSlot('');
|
$c->addSlot('');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$count = 3 - count($_SESSION['form']->getChoices());
|
$count = 3 - count($form->getChoices());
|
||||||
for ($i = 0; $i < $count; $i++) {
|
for ($i = 0; $i < $count; $i++) {
|
||||||
$c = new Choice('');
|
$c = new Choice('');
|
||||||
$c->addSlot('');
|
$c->addSlot('');
|
||||||
$c->addSlot('');
|
$c->addSlot('');
|
||||||
$c->addSlot('');
|
$c->addSlot('');
|
||||||
$_SESSION['form']->addChoice($c);
|
$form->addChoice($c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$_SESSION['form'] = serialize($form);
|
||||||
|
|
||||||
// Display step 2
|
// Display step 2
|
||||||
$smarty->assign('title', __('Step 2 date', 'Poll dates (2 on 3)'));
|
$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->assign('error', null);
|
||||||
|
|
||||||
$smarty->display('create_date_poll_step_2.tpl');
|
$smarty->display('create_date_poll_step_2.tpl');
|
||||||
@ -102,7 +107,7 @@ switch ($step) {
|
|||||||
// Handle Step2 submission
|
// Handle Step2 submission
|
||||||
if (!empty($_POST['days'])) {
|
if (!empty($_POST['days'])) {
|
||||||
// Remove empty dates
|
// Remove empty dates
|
||||||
$_POST['days'] = array_filter($_POST['days'], function ($d) {
|
$_POST['days'] = array_filter($_POST['days'], static function ($d) {
|
||||||
return !empty($d);
|
return !empty($d);
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -110,7 +115,7 @@ switch ($step) {
|
|||||||
if (count($_POST['days']) > MAX_SLOTS_PER_POLL) {
|
if (count($_POST['days']) > MAX_SLOTS_PER_POLL) {
|
||||||
// Display step 2
|
// Display step 2
|
||||||
$smarty->assign('title', __('Step 2 date', 'Poll dates (2 on 3)'));
|
$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->assign('error', __f('Error', 'You can\'t select more than %d dates', MAX_SLOTS_PER_POLL));
|
||||||
|
|
||||||
$smarty->display('create_date_poll_step_2.tpl');
|
$smarty->display('create_date_poll_step_2.tpl');
|
||||||
@ -118,7 +123,7 @@ switch ($step) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Clear previous choices
|
// Clear previous choices
|
||||||
$_SESSION['form']->clearChoices();
|
$form->clearChoices();
|
||||||
|
|
||||||
// Reorder moments to deal with suppressed dates
|
// Reorder moments to deal with suppressed dates
|
||||||
$moments = [];
|
$moments = [];
|
||||||
@ -130,7 +135,7 @@ switch ($step) {
|
|||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
for ($i = 0; $i < count($_POST['days']); $i++) {
|
for ($i = 0, $iMax = count($_POST['days']); $i < $iMax; $i++) {
|
||||||
$day = $_POST['days'][$i];
|
$day = $_POST['days'][$i];
|
||||||
|
|
||||||
if (!empty($day)) {
|
if (!empty($day)) {
|
||||||
@ -138,22 +143,22 @@ switch ($step) {
|
|||||||
$date = DateTime::createFromFormat(__('Date', 'datetime_parseformat'), $_POST['days'][$i])->setTime(0, 0, 0);
|
$date = DateTime::createFromFormat(__('Date', 'datetime_parseformat'), $_POST['days'][$i])->setTime(0, 0, 0);
|
||||||
$time = $date->getTimestamp();
|
$time = $date->getTimestamp();
|
||||||
$choice = new Choice($time);
|
$choice = new Choice($time);
|
||||||
$_SESSION['form']->addChoice($choice);
|
$form->addChoice($choice);
|
||||||
|
|
||||||
$schedules = $inputService->filterArray($moments[$i], FILTER_DEFAULT);
|
$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])) {
|
if (!empty($schedules[$j])) {
|
||||||
$choice->addSlot(strip_tags($schedules[$j]));
|
$choice->addSlot(strip_tags($schedules[$j]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$_SESSION['form']->sortChoices();
|
$form->sortChoices();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Display step 3
|
// Display step 3
|
||||||
$summary = '<ul>';
|
$summary = '<ul>';
|
||||||
$choices = $_SESSION['form']->getChoices();
|
$choices = $form->getChoices();
|
||||||
foreach ($choices as $choice) {
|
foreach ($choices as $choice) {
|
||||||
$summary .= '<li>' . strftime($date_format['txt_full'], $choice->getName());
|
$summary .= '<li>' . strftime($date_format['txt_full'], $choice->getName());
|
||||||
$first = true;
|
$first = true;
|
||||||
@ -166,7 +171,9 @@ switch ($step) {
|
|||||||
}
|
}
|
||||||
$summary .= '</ul>';
|
$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('title', __('Step 3', 'Removal date and confirmation (3 on 3)'));
|
||||||
$smarty->assign('summary', $summary);
|
$smarty->assign('summary', $summary);
|
||||||
@ -181,31 +188,11 @@ switch ($step) {
|
|||||||
// Step 4 : Data prepare before insert in DB
|
// Step 4 : Data prepare before insert in DB
|
||||||
|
|
||||||
// Define expiration date
|
// Define expiration date
|
||||||
$enddate = filter_input(INPUT_POST, 'enddate', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '#^[0-9]{2}/[0-9]{2}/[0-9]{4}$#']]);
|
$expiration_date = $inputService->parseDate($_POST['enddate']);
|
||||||
|
$form->end_date = $inputService->validateDate($expiration_date, $pollService->minExpiryDate(), $pollService->maxExpiryDate())->getTimestamp();
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert poll in database
|
// Insert poll in database
|
||||||
$ids = $pollService->createPoll($_SESSION['form']);
|
$ids = $pollService->createPoll($form);
|
||||||
$poll_id = $ids[0];
|
$poll_id = $ids[0];
|
||||||
$admin_poll_id = $ids[1];
|
$admin_poll_id = $ids[1];
|
||||||
|
|
||||||
@ -213,7 +200,7 @@ switch ($step) {
|
|||||||
if ($config['use_smtp'] === true) {
|
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 = __('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 .= '<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 .= __('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");
|
$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 = sprintf($message, Utils::getUrlSondage($poll_id));
|
||||||
$message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
|
$message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
|
||||||
|
|
||||||
if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) {
|
if ($mailService->isValidEmail($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($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($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);
|
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
106
create_poll.php
106
create_poll.php
@ -35,20 +35,21 @@ $pollRepository = RepositoryFactory::pollRepository();
|
|||||||
|
|
||||||
/* PAGE */
|
/* PAGE */
|
||||||
/* ---- */
|
/* ---- */
|
||||||
|
$form = isset($_SESSION['form']) ? unserialize($_SESSION['form']) : null;
|
||||||
|
|
||||||
if (!isset($_SESSION['form'])) {
|
if ($form === null && !($form instanceof Form)) {
|
||||||
$_SESSION['form'] = new Form();
|
$form = new Form();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type de sondage
|
// Type de sondage
|
||||||
if (isset($_GET['type']) && $_GET['type'] === 'date' ||
|
if ((isset($_GET['type']) && $_GET['type'] === 'date') ||
|
||||||
isset($_POST['type']) && $_POST['type'] === 'date'
|
(isset($_POST['type']) && $_POST['type'] === 'date')
|
||||||
) {
|
) {
|
||||||
$poll_type = 'date';
|
$poll_type = 'date';
|
||||||
$_SESSION['form']->choix_sondage = $poll_type;
|
$form->choix_sondage = $poll_type;
|
||||||
} else {
|
} else {
|
||||||
$poll_type = 'classic';
|
$poll_type = 'classic';
|
||||||
$_SESSION['form']->choix_sondage = $poll_type;
|
$form->choix_sondage = $poll_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
// We clean the data
|
// We clean the data
|
||||||
@ -56,21 +57,21 @@ $goToStep2 = filter_input(INPUT_POST, GO_TO_STEP_2, FILTER_VALIDATE_REGEXP, ['op
|
|||||||
if ($goToStep2) {
|
if ($goToStep2) {
|
||||||
$title = $inputService->filterTitle($_POST['title']);
|
$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;
|
$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;
|
$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;
|
$mail = $config['use_smtp'] === true ? $inputService->filterMail($_POST['mail']) : null;
|
||||||
$description = $inputService->filterDescription($_POST['description']);
|
$description = $inputService->filterDescription($_POST['description']);
|
||||||
$editable = $inputService->filterEditable($_POST['editable']);
|
$editable = $inputService->filterEditable($_POST['editable']);
|
||||||
$receiveNewVotes = isset($_POST['receiveNewVotes']) ? $inputService->filterBoolean($_POST['receiveNewVotes']) : false;
|
$receiveNewVotes = isset($_POST['receiveNewVotes']) && $inputService->filterBoolean($_POST['receiveNewVotes']);
|
||||||
$receiveNewComments = isset($_POST['receiveNewComments']) ? $inputService->filterBoolean($_POST['receiveNewComments']) : false;
|
$receiveNewComments = isset($_POST['receiveNewComments']) && $inputService->filterBoolean($_POST['receiveNewComments']);
|
||||||
$hidden = isset($_POST['hidden']) ? $inputService->filterBoolean($_POST['hidden']) : false;
|
$hidden = isset($_POST['hidden']) && $inputService->filterBoolean($_POST['hidden']);
|
||||||
$use_password = filter_input(INPUT_POST, 'use_password', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]);
|
$use_password = filter_input(INPUT_POST, 'use_password', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]);
|
||||||
$password = isset($_POST['password']) ? $_POST['password'] : null;
|
$password = $_POST['password'] ?? null;
|
||||||
$password_repeat = isset($_POST['password_repeat']) ? $_POST['password_repeat'] : null;
|
$password_repeat = $_POST['password_repeat'] ?? null;
|
||||||
$results_publicly_visible = filter_input(INPUT_POST, 'results_publicly_visible', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]);
|
$results_publicly_visible = filter_input(INPUT_POST, 'results_publicly_visible', FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => BOOLEAN_REGEX]]);
|
||||||
|
|
||||||
// On initialise également les autres variables
|
// On initialise également les autres variables
|
||||||
@ -83,20 +84,20 @@ if ($goToStep2) {
|
|||||||
$error_on_customized_url = false;
|
$error_on_customized_url = false;
|
||||||
$error_on_ValueMax = false;
|
$error_on_ValueMax = false;
|
||||||
|
|
||||||
$_SESSION['form']->title = $title;
|
$form->title = $title;
|
||||||
$_SESSION['form']->id = $customized_url;
|
$form->id = $customized_url;
|
||||||
$_SESSION['form']->use_customized_url = $use_customized_url;
|
$form->use_customized_url = $use_customized_url;
|
||||||
$_SESSION['form']->use_ValueMax = $use_ValueMax;
|
$form->use_ValueMax = $use_ValueMax;
|
||||||
$_SESSION['form']->ValueMax = $ValueMax;
|
$form->ValueMax = $ValueMax;
|
||||||
$_SESSION['form']->admin_name = $name;
|
$form->admin_name = $name;
|
||||||
$_SESSION['form']->admin_mail = $mail;
|
$form->admin_mail = $mail;
|
||||||
$_SESSION['form']->description = $description;
|
$form->description = $description;
|
||||||
$_SESSION['form']->editable = $editable;
|
$form->editable = $editable;
|
||||||
$_SESSION['form']->receiveNewVotes = $receiveNewVotes;
|
$form->receiveNewVotes = $receiveNewVotes;
|
||||||
$_SESSION['form']->receiveNewComments = $receiveNewComments;
|
$form->receiveNewComments = $receiveNewComments;
|
||||||
$_SESSION['form']->hidden = $hidden;
|
$form->hidden = $hidden;
|
||||||
$_SESSION['form']->use_password = ($use_password !== null);
|
$form->use_password = ($use_password !== null);
|
||||||
$_SESSION['form']->results_publicly_visible = ($results_publicly_visible !== null);
|
$form->results_publicly_visible = ($results_publicly_visible !== null);
|
||||||
|
|
||||||
if ($config['use_smtp'] === true && empty($mail)) {
|
if ($config['use_smtp'] === true && empty($mail)) {
|
||||||
$error_on_mail = true;
|
$error_on_mail = true;
|
||||||
@ -112,6 +113,9 @@ if ($goToStep2) {
|
|||||||
} else if ($pollRepository->existsById($customized_url)) {
|
} else if ($pollRepository->existsById($customized_url)) {
|
||||||
$error_on_customized_url = true;
|
$error_on_customized_url = true;
|
||||||
$error_on_customized_url_msg = __('Error', 'Poll id already used');
|
$error_on_customized_url_msg = __('Error', 'Poll id already used');
|
||||||
|
} else if (in_array($customized_url, ['admin', 'vote', 'action'], true)) {
|
||||||
|
$error_on_customized_url = true;
|
||||||
|
$error_on_customized_url_msg = __('Error', 'This id is not allowed');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,13 +150,15 @@ if ($goToStep2) {
|
|||||||
&& !$error_on_password && !$error_on_password_repeat &&!$error_on_ValueMax
|
&& !$error_on_password && !$error_on_password_repeat &&!$error_on_ValueMax
|
||||||
) {
|
) {
|
||||||
// If no errors, we hash the password if needed
|
// If no errors, we hash the password if needed
|
||||||
if ($_SESSION['form']->use_password) {
|
if ($form->use_password) {
|
||||||
$_SESSION['form']->password_hash = PasswordHasher::hash($password);
|
$form->password_hash = PasswordHasher::hash($password);
|
||||||
} else {
|
} else {
|
||||||
$_SESSION['form']->password_hash = null;
|
$form->password_hash = null;
|
||||||
$_SESSION['form']->results_publicly_visible = null;
|
$form->results_publicly_visible = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$_SESSION['form'] = serialize($form);
|
||||||
|
|
||||||
if ($goToStep2 === 'date') {
|
if ($goToStep2 === 'date') {
|
||||||
header('Location:create_date_poll.php');
|
header('Location:create_date_poll.php');
|
||||||
exit();
|
exit();
|
||||||
@ -229,7 +235,7 @@ if (!empty($_POST[GO_TO_STEP_2])) {
|
|||||||
if ($error_on_customized_url) {
|
if ($error_on_customized_url) {
|
||||||
$errors['customized_url']['aria'] = 'aria-describeby="customized_url" ';
|
$errors['customized_url']['aria'] = 'aria-describeby="customized_url" ';
|
||||||
$errors['customized_url']['class'] = ' has-error';
|
$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) {
|
if ($error_on_description) {
|
||||||
@ -242,6 +248,10 @@ if (!empty($_POST[GO_TO_STEP_2])) {
|
|||||||
$errors['name']['aria'] = 'aria-describeby="poll_name_error" ';
|
$errors['name']['aria'] = 'aria-describeby="poll_name_error" ';
|
||||||
$errors['name']['class'] = ' has-error';
|
$errors['name']['class'] = ' has-error';
|
||||||
$errors['name']['msg'] = __('Error', 'Enter a name');
|
$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) {
|
} elseif ($error_on_name) {
|
||||||
$errors['name']['aria'] = 'aria-describeby="poll_name_error" ';
|
$errors['name']['aria'] = 'aria-describeby="poll_name_error" ';
|
||||||
$errors['name']['class'] = ' has-error';
|
$errors['name']['class'] = ' has-error';
|
||||||
@ -286,20 +296,20 @@ $smarty->assign('default_to_marldown_editor', $config['markdown_editor_by_defaul
|
|||||||
$smarty->assign('goToStep2', GO_TO_STEP_2);
|
$smarty->assign('goToStep2', GO_TO_STEP_2);
|
||||||
|
|
||||||
$smarty->assign('poll_type', $poll_type);
|
$smarty->assign('poll_type', $poll_type);
|
||||||
$smarty->assign('poll_title', Utils::fromPostOrDefault('title', $_SESSION['form']->title));
|
$smarty->assign('poll_title', Utils::fromPostOrDefault('title', $form->title));
|
||||||
$smarty->assign('customized_url', Utils::fromPostOrDefault('customized_url', $_SESSION['form']->id));
|
$smarty->assign('customized_url', Utils::fromPostOrDefault('customized_url', $form->id));
|
||||||
$smarty->assign('use_customized_url', Utils::fromPostOrDefault('use_customized_url', $_SESSION['form']->use_customized_url));
|
$smarty->assign('use_customized_url', Utils::fromPostOrDefault('use_customized_url', $form->use_customized_url));
|
||||||
$smarty->assign('ValueMax', Utils::fromPostOrDefault('ValueMax', $_SESSION['form']->ValueMax));
|
$smarty->assign('ValueMax', Utils::fromPostOrDefault('ValueMax', $form->ValueMax));
|
||||||
$smarty->assign('use_ValueMax', Utils::fromPostOrDefault('use_ValueMax', $_SESSION['form']->use_ValueMax));
|
$smarty->assign('use_ValueMax', Utils::fromPostOrDefault('use_ValueMax', $form->use_ValueMax));
|
||||||
$smarty->assign('poll_description', !empty($_POST['description']) ? $_POST['description'] : $_SESSION['form']->description);
|
$smarty->assign('poll_description', !empty($_POST['description']) ? $_POST['description'] : $form->description);
|
||||||
$smarty->assign('poll_name', Utils::fromPostOrDefault('name', $_SESSION['form']->admin_name));
|
$smarty->assign('poll_name', Utils::fromPostOrDefault('name', $form->admin_name));
|
||||||
$smarty->assign('poll_mail', Utils::fromPostOrDefault('mail', $_SESSION['form']->admin_mail));
|
$smarty->assign('poll_mail', Utils::fromPostOrDefault('mail', $form->admin_mail));
|
||||||
$smarty->assign('poll_editable', Utils::fromPostOrDefault('editable', $_SESSION['form']->editable));
|
$smarty->assign('poll_editable', Utils::fromPostOrDefault('editable', $form->editable));
|
||||||
$smarty->assign('poll_receiveNewVotes', Utils::fromPostOrDefault('receiveNewVotes', $_SESSION['form']->receiveNewVotes));
|
$smarty->assign('poll_receiveNewVotes', Utils::fromPostOrDefault('receiveNewVotes', $form->receiveNewVotes));
|
||||||
$smarty->assign('poll_receiveNewComments', Utils::fromPostOrDefault('receiveNewComments', $_SESSION['form']->receiveNewComments));
|
$smarty->assign('poll_receiveNewComments', Utils::fromPostOrDefault('receiveNewComments', $form->receiveNewComments));
|
||||||
$smarty->assign('poll_hidden', Utils::fromPostOrDefault('hidden', $_SESSION['form']->hidden));
|
$smarty->assign('poll_hidden', Utils::fromPostOrDefault('hidden', $form->hidden));
|
||||||
$smarty->assign('poll_use_password', Utils::fromPostOrDefault('use_password', $_SESSION['form']->use_password));
|
$smarty->assign('poll_use_password', Utils::fromPostOrDefault('use_password', $form->use_password));
|
||||||
$smarty->assign('poll_results_publicly_visible', Utils::fromPostOrDefault('results_publicly_visible', $_SESSION['form']->results_publicly_visible));
|
$smarty->assign('poll_results_publicly_visible', Utils::fromPostOrDefault('results_publicly_visible', $form->results_publicly_visible));
|
||||||
$smarty->assign('form', $_SESSION['form']);
|
$smarty->assign('form', $form);
|
||||||
|
|
||||||
$smarty->display('create_poll.tpl');
|
$smarty->display('create_poll.tpl');
|
||||||
|
7
css/easymde.min.css
vendored
Normal file
7
css/easymde.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
2431
css/fork-awesome.css
Normal file
2431
css/fork-awesome.css
Normal file
File diff suppressed because it is too large
Load Diff
4
css/fork-awesome.min.css
vendored
Normal file
4
css/fork-awesome.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
css/fork-awesome.min.css.map
Normal file
1
css/fork-awesome.min.css.map
Normal file
File diff suppressed because one or more lines are too long
7
css/simplemde.min.css
vendored
7
css/simplemde.min.css
vendored
File diff suppressed because one or more lines are too long
@ -64,8 +64,6 @@ a:focus { /* a11y */
|
|||||||
outline:#000 dotted 1px;
|
outline:#000 dotted 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
header, footer {
|
|
||||||
}
|
|
||||||
main {
|
main {
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
}
|
}
|
||||||
@ -185,7 +183,7 @@ caption {
|
|||||||
font-weight:bold;
|
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;
|
padding: 3px 7px;
|
||||||
font-size: 0.7em;
|
font-size: 0.7em;
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ $poll = null;
|
|||||||
/*----------*/
|
/*----------*/
|
||||||
|
|
||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($logService);
|
||||||
$securityService = new SecurityService();
|
$securityService = new SecurityService();
|
||||||
|
|
||||||
/* PAGE */
|
/* PAGE */
|
||||||
@ -110,7 +110,7 @@ foreach ($votes as $vote) {
|
|||||||
$text = __('Generic', 'Yes');
|
$text = __('Generic', 'Yes');
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$text = 'unkown';
|
$text = __('Generic', 'Unknown');
|
||||||
}
|
}
|
||||||
echo Utils::csvEscape($text);
|
echo Utils::csvEscape($text);
|
||||||
echo ',';
|
echo ',';
|
||||||
|
@ -27,7 +27,7 @@ include_once __DIR__ . '/app/inc/init.php';
|
|||||||
/* SERVICES */
|
/* SERVICES */
|
||||||
/* -------- */
|
/* -------- */
|
||||||
$logService = new LogService();
|
$logService = new LogService();
|
||||||
$pollService = new PollService($connect, $logService);
|
$pollService = new PollService($logService);
|
||||||
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
$mailService = new MailService($config['use_smtp'], $config['smtp_options']);
|
||||||
|
|
||||||
/* PAGE */
|
/* PAGE */
|
||||||
|
BIN
fonts/forkawesome-webfont.eot
Normal file
BIN
fonts/forkawesome-webfont.eot
Normal file
Binary file not shown.
2692
fonts/forkawesome-webfont.svg
Normal file
2692
fonts/forkawesome-webfont.svg
Normal file
File diff suppressed because it is too large
Load Diff
After Width: | Height: | Size: 443 KiB |
BIN
fonts/forkawesome-webfont.ttf
Normal file
BIN
fonts/forkawesome-webfont.ttf
Normal file
Binary file not shown.
BIN
fonts/forkawesome-webfont.woff
Normal file
BIN
fonts/forkawesome-webfont.woff
Normal file
Binary file not shown.
BIN
fonts/forkawesome-webfont.woff2
Normal file
BIN
fonts/forkawesome-webfont.woff2
Normal file
Binary file not shown.
17
htaccess.txt
17
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>
|
|
BIN
images/logo-DateChaprilOrg.png
Normal file
BIN
images/logo-DateChaprilOrg.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
BIN
images/logo-DateChaprilOrg3_360_50.png
Normal file
BIN
images/logo-DateChaprilOrg3_360_50.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 10 KiB |
@ -1,4 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use Framadate\Services\LogService;
|
||||||
/**
|
/**
|
||||||
* This software is governed by the CeCILL-B license. If a copy of this license
|
* 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
|
* is not distributed with this file, you can obtain one at
|
||||||
@ -29,8 +31,7 @@ if (!is_file(CONF_FILENAME)) {
|
|||||||
|
|
||||||
/* SERVICES */
|
/* SERVICES */
|
||||||
/* -------- */
|
/* -------- */
|
||||||
$logService = '\Framadate\Services\LogService';
|
$pollService = new PollService(new LogService());
|
||||||
$pollService = new PollService($connect, new $logService());
|
|
||||||
|
|
||||||
/* PAGE */
|
/* PAGE */
|
||||||
/* ---- */
|
/* ---- */
|
||||||
|
@ -17,13 +17,13 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Error check when submitting form
|
* Error check when submitting form
|
||||||
*/
|
*/
|
||||||
$("#formulaire").submit(function (event) {
|
$("#formulaire").submit(function (event) {
|
||||||
var isHidden = $("#hidden").prop('checked');
|
var isHidden = $("#hidden").prop("checked");
|
||||||
var isOptionAllUserCanModifyEverything = $("#editableByAll").is(":checked");
|
var isOptionAllUserCanModifyEverything =
|
||||||
|
$("#editableByAll").is(":checked");
|
||||||
|
|
||||||
if (isHidden && isOptionAllUserCanModifyEverything) {
|
if (isHidden && isOptionAllUserCanModifyEverything) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
@ -47,19 +47,20 @@ $(document).ready(function () {
|
|||||||
/**
|
/**
|
||||||
* Enable/Disable ValueMax options
|
* Enable/Disable ValueMax options
|
||||||
*/
|
*/
|
||||||
$("#use_ValueMax").change(function () {
|
const useValueMax = document.querySelector("#use_ValueMax");
|
||||||
if ($(this).prop("checked")) {
|
useValueMax.addEventListener("change", function () {
|
||||||
$("#ValueMax").removeClass("hidden");
|
const valueMaxOptions = document.querySelector("#value_max_options");
|
||||||
|
if (useValueMax.checked) {
|
||||||
|
valueMaxOptions.classList.remove("hidden");
|
||||||
} else {
|
} else {
|
||||||
$("#ValueMax").addClass("hidden");
|
valueMaxOptions.classList.add("hidden");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hide/Show password options
|
* Hide/Show password options
|
||||||
*/
|
*/
|
||||||
$("#use_password").change(function(){
|
$("#use_password").change(function () {
|
||||||
if ($(this).prop("checked")) {
|
if ($(this).prop("checked")) {
|
||||||
$("#password_options").removeClass("hidden");
|
$("#password_options").removeClass("hidden");
|
||||||
} else {
|
} else {
|
||||||
@ -88,9 +89,12 @@ $(document).ready(function () {
|
|||||||
document.getElementById("cookie-warning").setAttribute("style", "");
|
document.getElementById("cookie-warning").setAttribute("style", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
var wrapper = new MDEWrapper($('#poll_comments')[0], $('#rich-editor-button'), $('#simple-editor-button'));
|
var wrapper = new MDEWrapper(
|
||||||
if ($('#rich-editor-button').hasClass('active')) {
|
$("#poll_comments")[0],
|
||||||
|
$("#rich-editor-button"),
|
||||||
|
$("#simple-editor-button")
|
||||||
|
);
|
||||||
|
if ($("#rich-editor-button").hasClass("active")) {
|
||||||
wrapper.enable();
|
wrapper.enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -66,8 +66,7 @@ $(document).ready(function () {
|
|||||||
url: form.attr('action'),
|
url: form.attr('action'),
|
||||||
data: form.serialize(),
|
data: form.serialize(),
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(data)
|
success: function(data) {
|
||||||
{
|
|
||||||
$('#comment').val('');
|
$('#comment').val('');
|
||||||
if (data.result) {
|
if (data.result) {
|
||||||
$('#comments_list')
|
$('#comments_list')
|
||||||
@ -95,6 +94,9 @@ $(document).ready(function () {
|
|||||||
}, 750);
|
}, 750);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
error: function (data) {
|
||||||
|
console.error(data);
|
||||||
|
},
|
||||||
complete: function() {
|
complete: function() {
|
||||||
$('#add_comment').removeAttr("disabled");
|
$('#add_comment').removeAttr("disabled");
|
||||||
}
|
}
|
||||||
|
7
js/easymde.min.js
vendored
Normal file
7
js/easymde.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
11008
js/jquery-1.12.4.js
vendored
11008
js/jquery-1.12.4.js
vendored
File diff suppressed because it is too large
Load Diff
5
js/jquery-1.12.4.min.js
vendored
5
js/jquery-1.12.4.min.js
vendored
File diff suppressed because one or more lines are too long
2
js/jquery-3.6.0.min.js
vendored
Normal file
2
js/jquery-3.6.0.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
17
js/locales/bootstrap-datepicker.oc.js
vendored
Normal file
17
js/locales/bootstrap-datepicker.oc.js
vendored
Normal file
@ -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));
|
@ -1,12 +1,12 @@
|
|||||||
function myPreviewRender (text) {
|
function myPreviewRender(text) {
|
||||||
text = text.replace(/[\u00A0-\u9999<>\&]/gim, function(i) {
|
text = text.replace(/[\u00A0-\u9999<>\&]/gim, function (i) {
|
||||||
return '&#'+i.charCodeAt(0)+';';
|
return "&#" + i.charCodeAt(0) + ";";
|
||||||
});
|
});
|
||||||
text = SimpleMDE.prototype.markdown(text);
|
text = EasyMDE.prototype.markdown(text);
|
||||||
text = text.replace(/ /g, ' ');
|
text = DOMPurify.sanitize(text);
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
};
|
}
|
||||||
|
|
||||||
function MDEWrapper(textarea, enableButton, disableButton) {
|
function MDEWrapper(textarea, enableButton, disableButton) {
|
||||||
this.element = textarea;
|
this.element = textarea;
|
||||||
@ -17,46 +17,58 @@ function MDEWrapper(textarea, enableButton, disableButton) {
|
|||||||
var wrapper = this;
|
var wrapper = this;
|
||||||
|
|
||||||
if (this.enableButton) {
|
if (this.enableButton) {
|
||||||
this.enableButton.on('click', function() {wrapper.enable()});
|
this.enableButton.on("click", function () {
|
||||||
|
wrapper.enable();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (this.disableButton) {
|
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;
|
var wrapper = this;
|
||||||
if (this.simplemde == null) {
|
if (this.simplemde == null) {
|
||||||
this.simplemde = new SimpleMDE({
|
this.simplemde = new EasyMDE({
|
||||||
element: wrapper.element,
|
element: wrapper.element,
|
||||||
forceSync: true,
|
forceSync: true,
|
||||||
status: true,
|
status: true,
|
||||||
previewRender: myPreviewRender,
|
// previewRender: myPreviewRender,
|
||||||
|
renderingConfig: {
|
||||||
|
sanitizerFunction: function (text) {
|
||||||
|
return DOMPurify.sanitize(text);
|
||||||
|
},
|
||||||
|
},
|
||||||
spellChecker: false,
|
spellChecker: false,
|
||||||
promptURLs: true
|
promptURLs: true,
|
||||||
|
minHeight: "200px",
|
||||||
|
maxHeight: "300px",
|
||||||
|
autoDownloadFontAwesome: false,
|
||||||
});
|
});
|
||||||
if (this.enableButton) {
|
if (this.enableButton) {
|
||||||
this.enableButton.addClass('active');
|
this.enableButton.addClass("active");
|
||||||
}
|
}
|
||||||
if (this.disableButton) {
|
if (this.disableButton) {
|
||||||
this.disableButton.removeClass('active');
|
this.disableButton.removeClass("active");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
MDEWrapper.prototype.disable = function() {
|
MDEWrapper.prototype.disable = function () {
|
||||||
if (this.simplemde != null) {
|
if (this.simplemde != null) {
|
||||||
this.simplemde.toTextArea();
|
this.simplemde.toTextArea();
|
||||||
this.simplemde = null;
|
this.simplemde = null;
|
||||||
if (this.disableButton) {
|
if (this.disableButton) {
|
||||||
this.disableButton.addClass('active');
|
this.disableButton.addClass("active");
|
||||||
}
|
}
|
||||||
if (this.enableButton) {
|
if (this.enableButton) {
|
||||||
this.enableButton.removeClass('active');
|
this.enableButton.removeClass("active");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
MDEWrapper.prototype.isEnabled = function() {
|
MDEWrapper.prototype.isEnabled = function () {
|
||||||
return this.simplemde != null;
|
return this.simplemde != null;
|
||||||
}
|
};
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user