Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity
d37ec75550
date.chapril.org-framadate/app/classes/Framadate/Utils.php

197 lines
7.1 KiB
PHP
Raw Normal View History

Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
<?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/OpenSondate: 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;
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
class Utils {
Retouches après série de merges (cherry picked from commit 6751a8a9cfc84f2a49d46ccd2aec2ad0bcd72485) Conflicts: adminstuds.php app/classes/Framadate/Utils.php creation_sondage.php
2014-12-03 14:30:25 +01:00
/**
* @return string Server name
*/
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
public static function get_server_name() {
Set URLs to https if HTTP X-Forwarded-Proto=https This line changes all URLs to https URLs if the Framadate installation is behind a reverse proxy, and the reverse proxy adds the X-Forwarded-Proto header with the 'https' value. Configuration for nginx: proxy_set_header X-Forwarded-Proto https; This setup is currently used by the Framadate installation of Bits of Freedom (https://kies.bof.nl).
2015-10-26 15:02:02 +01:00
$scheme = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')) ? 'https' : 'http';
Refactoring some code: * Store all informations about forms into an object "Form" stored in $_SESSION['form'] * Replace connection to database by PDO object * Check if database is ready in bandeaux.php file
2014-12-03 21:08:08 +01:00
$port = in_array($_SERVER['SERVER_PORT'], [80, 443]) ? '' : ':' . $_SERVER['SERVER_PORT'];
$dirname = dirname($_SERVER['SCRIPT_NAME']);
$dirname = $dirname === '\\' ? '/' : $dirname . '/';
Fix pb when host on domain name starting with 'admin' * Do str_replace only on the $dirname variable
2015-03-04 23:46:42 +01:00
$dirname = str_replace('/admin', '', $dirname);
Host can now force URL, used behind a reverse-proxy
2015-06-23 22:03:56 +02:00
$server_name = (defined('APP_URL') ? APP_URL : $_SERVER['SERVER_NAME']) . $port . $dirname;
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
Fix usage of markdown
2015-04-13 14:52:43 +02:00
return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
}
Move mail sending to class \Framadate\Service\MailService
2014-12-23 00:58:00 +01:00
/**
* @param string $title
* @deprecated
*/
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
public static function print_header($title = '') {
Replace $html_lang by $locale
2015-04-13 11:24:44 +02:00
global $locale;
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
echo '<!DOCTYPE html>
Replace $html_lang by $locale
2015-04-13 11:24:44 +02:00
<html lang="' . $locale . '">
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
<head>
Minor modifications to Utils.php (cherry picked from commit e6d171a4b033aabe525f39dd463b5a686fb2d247) Conflicts: app/classes/Framadate/Utils.php
2014-11-27 01:15:01 +01:00
<meta charset="utf-8" />';
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
if (!empty($title)) {
Minor modifications to Utils.php (cherry picked from commit e6d171a4b033aabe525f39dd463b5a686fb2d247) Conflicts: app/classes/Framadate/Utils.php
2014-11-27 01:15:01 +01:00
echo '<title>' . stripslashes($title) . ' - ' . NOMAPPLICATION . '</title>';
} else {
echo '<title>' . NOMAPPLICATION . '</title>';
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
}
echo '
Minor modifications to Utils.php Cherry-picked : e6d171a4 Conflicts: app/classes/Framadate/Utils.php
2014-11-27 01:15:01 +01:00
<link rel="stylesheet" href="' . self::get_server_name() . 'css/bootstrap.min.css" />
<link rel="stylesheet" href="' . self::get_server_name() . 'css/datepicker3.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/print.css" media="print" />
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
<script type="text/javascript" src="' . self::get_server_name() . 'js/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap.min.js"></script>
<script type="text/javascript" src="' . self::get_server_name() . 'js/bootstrap-datepicker.js"></script>
Replace $html_lang by $locale
2015-04-13 11:24:44 +02:00
<script type="text/javascript" src="' . self::get_server_name() . 'js/locales/bootstrap-datepicker.' . $locale . '.js"></script>
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
<script type="text/javascript" src="' . self::get_server_name() . 'js/core.js"></script>';
Install: Redirections between Install and Index
2015-09-03 08:03:37 +02:00
if (is_file($_SERVER['DOCUMENT_ROOT'] . "/nav/nav.js")) {
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
echo '<script src="/nav/nav.js" id="nav_js" type="text/javascript" charset="utf-8"></script><!-- /Framanav -->';
}
echo '
</head>
<body>
The big one
2014-10-21 01:31:26 +02:00
<div class="container ombre">';
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
}
/**
Editing vote by link with unique id - Changed the smarty modifier poll_url to a function and added the vote_id parameter - Modified accordingly all poll_url occurence in templates - Added htaccess.txt to be sure to keep poll's URL changes up to date - Escaped some templates output in order to avoid to broke HTML - Using vote's uniqId instead of vote's id when it's needed
2015-04-02 16:52:46 +02:00
* Function allowing to generate poll's url
* @param string $id The poll's id
* @param bool $admin True to generate an admin URL, false for a public one
* @param string $vote_id (optional) The vote's unique id
* @return string The poll's URL.
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
*/
Merge remote-tracking branch 'upstream/develop' into develop Conflicts: app/classes/Framadate/Utils.php
2015-04-13 16:16:02 +02:00
public static function getUrlSondage($id, $admin = false, $vote_id = '', $action = null, $action_value = null) {
Move URL encore to Utils::getUrlSondage
2015-11-05 22:43:54 +01:00
// URL-Encode $action_value
Encode action values in base64 instead of url_encode (because of UrlRewrite)
2015-11-30 20:26:23 +01:00
$action_value = $action_value == null ? null : Utils::base64url_encode($action_value);
Move URL encore to Utils::getUrlSondage
2015-11-05 22:43:54 +01:00
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
if (URL_PROPRE) {
if ($admin === true) {
Don't redirect to studs when you edit a vote from adminstuds
2015-04-11 17:03:10 +02:00
$url = self::get_server_name() . $id . '/admin';
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
} else {
Fix usage of markdown
2015-04-13 14:52:43 +02:00
$url = self::get_server_name() . $id;
Don't redirect to studs when you edit a vote from adminstuds
2015-04-11 17:03:10 +02:00
}
if ($vote_id != '') {
Fix usage of markdown
2015-04-13 14:52:43 +02:00
$url .= '/vote/' . $vote_id . "#edit";
Encode action values in base64 instead of url_encode (because of UrlRewrite)
2015-11-30 20:26:23 +01:00
} elseif ($action != null) {
if ($action_value != null) {
$url .= '/action/' . $action . '/' . $action_value;
} else {
$url .= '/action/' . $action;
}
Changing some actions from POST to GET.
2015-04-13 12:33:43 +02:00
}
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
} else {
if ($admin === true) {
Don't redirect to studs when you edit a vote from adminstuds
2015-04-11 17:03:10 +02:00
$url = self::get_server_name() . 'adminstuds.php?poll=' . $id;
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
} else {
Don't redirect to studs when you edit a vote from adminstuds
2015-04-11 17:03:10 +02:00
$url = self::get_server_name() . 'studs.php?poll=' . $id;
}
if ($vote_id != '') {
Fix usage of markdown
2015-04-13 14:52:43 +02:00
$url .= '&vote=' . $vote_id . "#edit";
Encode action values in base64 instead of url_encode (because of UrlRewrite)
2015-11-30 20:26:23 +01:00
} elseif ($action != null) {
if ($action_value != null) {
$url .= '&' . $action . "=" . $action_value;
} else {
$url .= '&' . $action . "=";
}
Changing some actions from POST to GET.
2015-04-13 12:33:43 +02:00
}
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
}
return $url;
}
Remove old code + Add doc
2014-12-17 13:52:52 +01:00
/**
* This method pretty prints an object to the page framed by pre tags.
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
*
admin: Add availability to add a slot to a poll
2014-12-23 00:30:05 +01:00
* @param mixed $object The object to print.
Remove old code + Add doc
2014-12-17 13:52:52 +01:00
*/
Move mail sending to class \Framadate\Service\MailService
2014-12-23 00:58:00 +01:00
public static function debug($object) {
Refactor on choix_autre.php * Utils::issetAndNoEmpty is now removed * Use Form object to store value from page to page
2014-12-06 19:42:01 +01:00
echo '<pre>';
print_r($object);
echo '</pre>';
}
Define a prefix for database table names.
2014-12-31 15:19:15 +01:00
public static function table($tableName) {
return TABLENAME_PREFIX . $tableName;
}
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
Markdown pour la description - Ajout d'un editeur de markdown - On garde le formattage des espaces - On empeche l'utilisateur de mettre du html
2016-05-11 17:38:34 +02:00
public static function markdown($md, $clear=false, $line=true) {
Using the library
2016-05-10 17:53:06 +02:00
$parseDown = new \Parsedown();
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
Markdown pour la description - Ajout d'un editeur de markdown - On garde le formattage des espaces - On empeche l'utilisateur de mettre du html
2016-05-11 17:38:34 +02:00
$parseDown
Using the library
2016-05-10 17:53:06 +02:00
->setMarkupEscaped(true)
Markdown pour la description - Ajout d'un editeur de markdown - On garde le formattage des espaces - On empeche l'utilisateur de mettre du html
2016-05-11 17:38:34 +02:00
->setBreaksEnabled(true)
->setUrlsLinked(false);
if ($line) {
$html = $parseDown->line($md);
} else {
$md = preg_replace_callback(
'#( ){2,}#',
function ($m) {
return str_repeat('&nbsp;', strlen($m[0]));
},
$md
);
$html = $parseDown->text($md);
}
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
Using the library
2016-05-10 17:53:06 +02:00
$text = strip_tags($html);
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
CSV Export: Implements export for classical polls
2015-01-03 17:24:39 +01:00
return $clear ? $text : $html;
}
Improve management of errors in infos_sondage page
2015-01-17 16:20:42 +01:00
public static function htmlEscape($html) {
return htmlentities($html, ENT_HTML5 | ENT_QUOTES);
}
Adapting html escape for emails
2016-05-02 17:44:14 +02:00
public static function htmlMailEscape($html) {
Removing useless UTF-8 specification
2016-05-02 17:51:01 +02:00
return htmlspecialchars($html, ENT_HTML5 | ENT_QUOTES);
Adapting html escape for emails
2016-05-02 17:44:14 +02:00
}
CSV Export: Implements export for classical polls
2015-01-03 17:24:39 +01:00
public static function csvEscape($text) {
$escaped = str_replace('"', '""', $text);
$escaped = str_replace("\r\n", '', $escaped);
$escaped = str_replace("\n", '', $escaped);
return '"' . $escaped . '"';
}
public static function cleanFilename($title) {
$cleaned = preg_replace('[^a-zA-Z0-9._-]', '_', $title);
$cleaned = preg_replace(' {2,}', ' ', $cleaned);
return $cleaned;
Parse markdown on classic votes
2015-01-01 23:24:17 +01:00
}
Smartysize infos_creation, and rename it to create_poll
2015-03-29 22:13:22 +02:00
Fix back links to create_poll.php + Use values in session if _post is not present
2015-03-31 00:02:37 +02:00
public static function fromPostOrDefault($postKey, $default = '') {
return !empty($_POST[$postKey]) ? Utils::htmlEscape($_POST[$postKey]) : $default;
Smartysize infos_creation, and rename it to create_poll
2015-03-29 22:13:22 +02:00
}
Encode action values in base64 instead of url_encode (because of UrlRewrite)
2015-11-30 20:26:23 +01:00
public static function base64url_encode($input) {
return rtrim(strtr(base64_encode($input), '+/', '-_'), '=');
}
public static function base64url_decode($input) {
return base64_decode(str_pad(strtr($input, '-_', '+/'), strlen($input) % 4, '=', STR_PAD_RIGHT));
}
Mise à jour du dépôt avec la dernière version sur Github
2014-09-04 17:52:18 +02:00
}
Copy Permalink