Commit 5e660917 authored by Antoine's avatar Antoine
Browse files

Merge branch 'v1.1.x' into scoodle

parents f6407572 12d4bdb8
Pipeline #2870 passed with stage
in 19 seconds
......@@ -29,6 +29,7 @@ if (is_file(CONF_FILENAME)) {
$error = null;
$installService = new InstallService();
$result['details'] = null;
if (!empty($_POST)) {
$installService->updateFields($_POST);
......
<?php
namespace Framadate\Services;
use \stdClass;
......
<?php
namespace Framadate\Services;
class SessionService {
......
......@@ -18,10 +18,10 @@
*/
// FRAMADATE version
const VERSION = '1.1.10';
const VERSION = '1.1.12';
// PHP Needed version
const PHP_NEEDED_VERSION = '5.6';
const PHP_NEEDED_VERSION = '7.3';
// Config constants
const COMPILE_DIR = '/tpl_c/';
......
......@@ -2,10 +2,12 @@
"name": "framasoft/framadate",
"description": "Application to facilitate the schedule of events or classic polls",
"homepage": "https://framadate.org/",
"keywords": ["poll", "framadate"],
"keywords": [
"poll",
"framadate"
],
"version": "0.9.0",
"license": "CECILL-B",
"type": "project",
"support": {
"issues": "https://framagit.org/framasoft/framadate/issues"
......@@ -52,33 +54,29 @@
"email": "raphael.droz@gmail.com"
}
],
"require": {
"php": ">=5.6.0",
"php": ">=7.3.0",
"ext-pdo": "*",
"smarty/smarty": "^3.1",
"o80/i18n": "dev-develop",
"phpmailer/phpmailer": "~6.0",
"phpmailer/phpmailer": "~6.2",
"ircmaxell/password-compat": "dev-master",
"roave/security-advisories": "dev-master",
"erusev/parsedown": "^1.7",
"egulias/email-validator": "~2.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"phpunit/phpunit": "^9",
"friendsofphp/php-cs-fixer": "~2.0"
},
"autoload": {
"psr-4": {
"Framadate\\": "app/classes/Framadate/"
}
},
"config": {
"platform": {
"php": "5.6.0"
"php": "7.3.0"
}
}
}
This diff is collapsed.
......@@ -105,8 +105,8 @@ if (empty($form->title) || empty($form->admin_name) || (($config['use_smtp']) ?
$message_admin .= sprintf(' :<br/><br/><a href="%1$s">%1$s</a>', Utils::getUrlSondage($admin_poll_id, true));
if ($mailService->isValidEmail($form->admin_mail)) {
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . $form->title, $message_admin);
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . $form->title, $message);
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message_admin);
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message);
}
}
......
......@@ -234,8 +234,8 @@ switch ($step) {
$message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
if ($mailService->isValidEmail($form->admin_mail)) {
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Message for the author') . '] ' . __('Generic', 'Poll') . ': ' . $form->title, $message_admin);
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Participant link') . '] ' . __('Generic', 'Poll') . ': ' . $form->title, $message);
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message_admin);
$mailService->send($form->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($form->title), $message);
}
}
......
......@@ -96,7 +96,6 @@ if ($goToStep2) {
$form->receiveNewVotes = $receiveNewVotes;
$form->receiveNewComments = $receiveNewComments;
$form->hidden = $hidden;
$form->collect_users_mail = $collect_users_mail;
$form->use_password = ($use_password !== null);
$form->results_publicly_visible = ($results_publicly_visible !== null);
......@@ -298,7 +297,6 @@ $smarty->assign('customized_url', Utils::fromPostOrDefault('customized_url', $fo
$smarty->assign('use_customized_url', Utils::fromPostOrDefault('use_customized_url', $form->use_customized_url));
$smarty->assign('ValueMax', Utils::fromPostOrDefault('ValueMax', $form->ValueMax));
$smarty->assign('use_ValueMax', Utils::fromPostOrDefault('use_ValueMax', $form->use_ValueMax));
$smarty->assign('collect_users_mail', Utils::fromPostOrDefault('collect_users_mail', $form->collect_users_mail));
$smarty->assign('poll_description', !empty($_POST['description']) ? $_POST['description'] : $form->description);
$smarty->assign('poll_name', Utils::fromPostOrDefault('name', $form->admin_name));
$smarty->assign('poll_mail', Utils::fromPostOrDefault('mail', $form->admin_mail));
......
/**
* 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));
This diff is collapsed.
......@@ -306,7 +306,7 @@
"Export to CSV": "Export Tableur (CSV)",
"Initiator of the poll": "Auteur·rice du sondage",
"No password": "Pas de mot de passe",
"Only votes are protected": "Seul les votes sont protégés",
"Only votes are protected": "Seuls les votes sont protégés",
"Password protected": "Protégé par mot de passe",
"Poll rules": "Permissions du sondage",
"Print": "Imprimer",
......
......@@ -306,7 +306,7 @@
"Export to CSV": "Export Tableur (CSV)",
"Initiator of the poll": "Auteur·rice du sondage",
"No password": "Pas de mot de passe",
"Only votes are protected": "Seul les votes sont protégés",
"Only votes are protected": "Seuls les votes sont protégés",
"Password protected": "Protégé par mot de passe",
"Poll rules": "Permissions du sondage",
"Print": "Imprimer",
......
......@@ -146,7 +146,7 @@
<i class="glyphicon glyphicon-pencil"></i><span class="sr-only">{__('Generic', 'Edit')}</span>
</a>
{if $admin}
<a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm clipboard-url" data-toggle="popover" data-trigger="manual" title="{__('Poll results', 'Link to edit this particular line')}" data-content="{__('Poll results', 'Link to edit this particular line has been copied!')}">
<a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm clipboard-url" data-toggle="popover" data-trigger="manual" title="{__('Poll results', 'Link to edit this particular line')}" data-content="{__('Poll results', 'Link to edit this particular line has been copied inside the clipboard!')}">
<span class="btn-link glyphicon glyphicon-link"></span>
</a>
<a href="{poll_url id=$admin_poll_id admin=true action='delete_vote' action_value=$vote->id}"
......@@ -205,7 +205,7 @@
</label>
</li>
<li class="hide">
<input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" "
<input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" "
{(isset($selectedNewVotes[$id]) && ("" !== $selectedNewVotes[$id])) ? "" : " checked"}
/>
</li>
......
......@@ -204,7 +204,7 @@
<i class="glyphicon glyphicon-pencil"></i><span class="sr-only">{__('Generic', 'Edit')}</span>
</a>
{if $admin}
<a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm clipboard-url" data-toggle="popover" data-trigger="manual" title="{__('Poll results', 'Link to edit this particular line')}" data-content="{__('Poll results', 'Link to edit this particular line has been copied!')}">
<a href="{poll_url id=$poll->id vote_id=$vote->uniqId}" class="btn btn-default btn-sm clipboard-url" data-toggle="popover" data-trigger="manual" title="{__('Poll results', 'Link to edit this particular line')}" data-content="{__('Poll results', 'Link to edit this particular line has been copied inside the clipboard!')}">
<i class="glyphicon glyphicon-link"></i><span class="sr-only">{__('Generic', 'Link')}</span>
</a>
<a href="{poll_url id=$admin_poll_id admin=true action='delete_vote' action_value=$vote->id}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment