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

Merge pull request #40 from fevrier/optional_REMOTE_USER

Browse Source 
Rend optionnelle l'utilisation de la variable REMOTE_USER
This commit is contained in:
pyg77 2013-02-27 05:44:41 -08:00
commit 4c6fc65603
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fonctions.php
View File

@ -111,7 +111,7 @@ function is_error($cerr)
function is_user() function is_user()
{ {
return isset($_SERVER['REMOTE_USER']) || (isset($_SESSION['nom'])); return ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || (isset($_SESSION['nom']));
} }

4
infos_sondage.php
View File

@ -192,7 +192,7 @@ if ($erreur_injection_commentaires) {
echo '</tr>'."\n"; echo '</tr>'."\n";
echo '<tr><td>'. _("Your name*: ") .'</td><td>'; echo '<tr><td>'. _("Your name*: ") .'</td><td>';
if (isset($_SERVER['REMOTE_USER'])) { if (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) {
echo '<input type="hidden" name="nom" size="40" maxlength="40" value="'.$_SESSION["nom"].'">'.stripslashes($_SESSION["nom"]).'</td>'."\n"; echo '<input type="hidden" name="nom" size="40" maxlength="40" value="'.$_SESSION["nom"].'">'.stripslashes($_SESSION["nom"]).'</td>'."\n";
} else { } else {
echo '<input type="text" name="nom" size="40" maxlength="40" value="'.stripslashes($_SESSION["nom"]).'"></td>'."\n"; echo '<input type="text" name="nom" size="40" maxlength="40" value="'.stripslashes($_SESSION["nom"]).'"></td>'."\n";
@ -207,7 +207,7 @@ if (!$_SESSION["nom"] && issetAndNoEmpty("poursuivre")) {
echo '</tr>'."\n"; echo '</tr>'."\n";
echo '<tr><td>'. _("Your e-mail address *: ") .'</td><td>'; echo '<tr><td>'. _("Your e-mail address *: ") .'</td><td>';
if (isset($_SERVER['REMOTE_USER'])) { if (USE_REMOTE_USER && isset($_SERVER['REMOTE_USER'])) {
echo '<input type="hidden" name="adresse" size="40" maxlength="64" value="'.$_SESSION["adresse"].'">'.$_SESSION["adresse"].'</td>'."\n"; echo '<input type="hidden" name="adresse" size="40" maxlength="64" value="'.$_SESSION["adresse"].'">'.$_SESSION["adresse"].'</td>'."\n";
} else { } else {
echo '<input type="text" name="adresse" size="40" maxlength="64" value="'.$_SESSION["adresse"].'"></td>'."\n"; echo '<input type="text" name="adresse" size="40" maxlength="64" value="'.$_SESSION["adresse"].'"></td>'."\n";

6
studs.php
View File

@ -136,7 +136,7 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"]
$err |= NAME_EMPTY; $err |= NAME_EMPTY;
} }
if(!is_error(NAME_EMPTY) && (!isset($_SERVER['REMOTE_USER']) || $_POST["nom"] == $_SESSION["nom"])) { if(!is_error(NAME_EMPTY) && (! ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || $_POST["nom"] == $_SESSION["nom"])) {
$nouveauchoix = ''; $nouveauchoix = '';
for ($i=0;$i<$nbcolonnes;$i++) { for ($i=0;$i<$nbcolonnes;$i++) {
// Si la checkbox est enclenchée alors la valeur est 1 // Si la checkbox est enclenchée alors la valeur est 1
@ -444,7 +444,7 @@ while ($data = $user_studs->FetchNextObject(false)) {
$ensemblereponses = $data->reponses; $ensemblereponses = $data->reponses;
// ligne d'un usager pré-authentifié // ligne d'un usager pré-authentifié
$mod_ok = !isset($_SERVER['REMOTE_USER']) || ($nombase == $_SESSION['nom']); $mod_ok = !( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || ($nombase == $_SESSION['nom']);
$user_mod |= $mod_ok; $user_mod |= $mod_ok;
// pour chaque colonne // pour chaque colonne
@ -490,7 +490,7 @@ while ($data = $user_studs->FetchNextObject(false)) {
} }
// affichage de la ligne pour un nouvel utilisateur // affichage de la ligne pour un nouvel utilisateur
if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) { if (! ( USE_REMOTE_USER && isset($_SERVER['REMOTE_USER']) ) || !$user_mod) {
echo '<tr class="ajout_reponse">'."\n"; echo '<tr class="ajout_reponse">'."\n";
echo '<td class="nom">'."\n"; echo '<td class="nom">'."\n";
if (isset($_SESSION['nom'])) { if (isset($_SESSION['nom'])) {

3
variables.php.template
View File

@ -81,6 +81,9 @@ define('URL_PROPRE', false);
// Activation de Google Analytics (false si inactif, l'identifiant sinon) // Activation de Google Analytics (false si inactif, l'identifiant sinon)
define('GOOGLE_ANALYTICS_ID', false); define('GOOGLE_ANALYTICS_ID', false);
// Utilisation de l'identité (REMOTE_USER) fournie par le serveur web
define('USE_REMOTE_USER', true);
if (@file_exists('variables.local.php')) { if (@file_exists('variables.local.php')) {
include('variables.local.php'); include('variables.local.php');
} }