Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'bugfix/config_encoding_on_install' into 'develop'

Browse Source 
Config.php has bad encoding on install

Fix #142 

See merge request !114
This commit is contained in:
Olivier Perez 2016-05-03 21:01:37 +02:00
commit 02b94b44d3
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/classes/Framadate/Utils.php
View File

@ -33,19 +33,6 @@ class Utils {
return $scheme . '://' . preg_replace('#//+#', '/', $server_name);
}
public static function is_error($cerr) {
global $err;
if ($err == 0) {
return false;
}
return ($err & $cerr) != 0;
}
public static function is_user() {
return (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) || isset($_SESSION['nom']);
}
/**
* @param string $title
* @deprecated
@ -85,17 +72,6 @@ class Utils {
<div class="container ombre">';
}
/**
* Check if an email address is valid using PHP filters
*
* @param string $email Email address to check
* @return bool True if valid. False if not valid.
* @deprecated
*/
public static function isValidEmail($email) {
return filter_var($email, FILTER_VALIDATE_EMAIL);
}
/**
* Function allowing to generate poll's url
* @param string $id The poll's id

10
tpl/admin/config.tpl
View File

@ -4,16 +4,16 @@
* is not distributed with this file, you can obtain one at
* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.txt
*
* Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and Raphaël DROZ
* Authors of STUdS (initial project): Guilhem BORGHESI (borghesi@unistra.fr) and 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
* Ce logiciel est régi par la licence CeCILL-B. Si une copie de cette licence
* ne se trouve pas avec ce fichier vous pouvez l'obtenir sur
* http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.txt
*
* Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
* Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
* Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
*/
@ -51,9 +51,9 @@ const DEFAULT_LANGUAGE = '{$defaultLanguage}';
// List of supported languages, fake constant as arrays can be used as constants only in PHP >=5.6
$ALLOWED_LANGUAGES = [
'fr' => 'Français',
'fr' => 'Français',
'en' => 'English',
'es' => 'Español',
'es' => 'Español',
'de' => 'Deutsch',
'it' => 'Italiano',
];