From 5d9b33d6ab71f8db9074106cc550817c812e2bbf Mon Sep 17 00:00:00 2001
From: FramaJosephK <josephk@framasoft.org>
Date: Wed, 22 Oct 2014 15:42:35 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20#9,=20#10,=20bug=20r=C3=A9cap=20liste=20d?=
 =?UTF-8?q?es=20choix,=20=C2=AB=20email=20adress=20=C2=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adminstuds.php                    |   4 ++--
 choix_autre.php                   |   4 ++--
 js/core.js                        |   2 ++
 locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 18570 -> 18573 bytes
 locale/fr_FR/LC_MESSAGES/Studs.po |   4 ++--
 studs.php                         |  33 ++++++++++++++----------------
 6 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/adminstuds.php b/adminstuds.php
index af2cbaf..9904f78 100644
--- a/adminstuds.php
+++ b/adminstuds.php
@@ -742,8 +742,8 @@ echo '
                                 <div class="input-group">
                                     <input type="text" class="form-control" id="newemail" name="nouvelleadresse" size="40" value="'.$email_admin.'" />
                                     <span class="input-group-btn">
-                                        <button type="submit" name="boutonnouvelleadresse" value="1" class="btn btn-success" title="'. _('Save the adress email') .'"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">' . _('Save') . '</span></button>
-                                        <button class="btn btn-link btn-cancel" title="'. _('Cancel the adress email edit') .'"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">' . _('Cancel') . '</span></button>
+                                        <button type="submit" name="boutonnouvelleadresse" value="1" class="btn btn-success" title="'. _('Save the email address ') .'"><span class="glyphicon glyphicon-ok"></span><span class="sr-only">' . _('Save') . '</span></button>
+                                        <button class="btn btn-link btn-cancel" title="'. _('Cancel the email address edit') .'"><span class="glyphicon glyphicon-remove"></span><span class="sr-only">' . _('Cancel') . '</span></button>
                                     </span>
                                 </div>
                             </div>
diff --git a/choix_autre.php b/choix_autre.php
index 66e8498..f854120 100644
--- a/choix_autre.php
+++ b/choix_autre.php
@@ -119,7 +119,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
 
             } else { // text only
 
-                $li_subject_text = stripslashes($toutsujet[$i]);
+                $li_subject_text = stripslashes($_SESSION['choices'][$i]);
                 $li_subject_html = $li_subject_text;
 
             }
@@ -188,7 +188,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
                 <label for="choice'.$i.'" class="col-sm-2 control-label">'. _("Choice") .' '.($i+1).'</label>
                 <div class="col-sm-10 input-group">
                     <input type="text" class="form-control" name="choices[]" size="40" value="'.$choice_value.'" id="choice'.$i.'" />
-                    <span class="input-group-addon btn-link md-a-img" title="'. _("Add a link or an image") .'" ><span class="glyphicon glyphicon-picture"></span> <span class="glyphicon glyphicon-link"></span></span>
+                    <span class="input-group-addon btn-link md-a-img" title="'. _("Add a link or an image") .' - '. _("Choice") .' '.($i+1).'" ><span class="glyphicon glyphicon-picture"></span> <span class="glyphicon glyphicon-link"></span></span>
                 </div>
             </div>'."\n";
         }
diff --git a/js/core.js b/js/core.js
index 0472981..5a01e8f 100644
--- a/js/core.js
+++ b/js/core.js
@@ -284,6 +284,7 @@ $(document).ready(function() {
     $(document).on('click', '.md-a-img', function() {
         $('#md-a-imgModal').modal('show');
         $('#md-a-imgModal .btn-primary').attr('value',$(this).prev().attr('id'));
+        $('#md-a-imgModalLabel').text($(this).attr('title'));
     });
     $('#md-a-imgModal .btn-primary').on('click', function() {
         if($('#md-img').val()!='' && $('#md-a').val()!='') {
@@ -297,6 +298,7 @@ $(document).ready(function() {
         }
         $('#md-a-imgModal').modal('hide');
         $('#md-img').val(''); $('#md-a').val('');$('#md-text').val('');
+        SubmitChoicesAvalaible();
     });
 
 
diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo
index 680e114fca5f185b4b3c1d8f3b822000ec09941d..b7274c3770d1faa475eab51b675cb0908c4bc7df 100644
GIT binary patch
delta 3145
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

delta 3147
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
BY_$LY

diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po
index 234a3bc..c7eb8de 100644
--- a/locale/fr_FR/LC_MESSAGES/Studs.po
+++ b/locale/fr_FR/LC_MESSAGES/Studs.po
@@ -196,10 +196,10 @@ msgstr "Adresse email"
 msgid "Edit the email adress"
 msgstr "Modifier l'adresse email"
 
-msgid "Save the adress email"
+msgid "Save the email address "
 msgstr "Enregistrer l'adresse email"
 
-msgid "Cancel the adress email edit"
+msgid "Cancel the email address edit"
 msgstr "Annuler le changement d'adresse email"
 
 msgid "Edit the description"
diff --git a/studs.php b/studs.php
index f4aa4da..c1d3459 100644
--- a/studs.php
+++ b/studs.php
@@ -47,13 +47,21 @@ if(Utils::issetAndNoEmpty('sondage') === true) {
     $numsondage = $_SESSION["numsondage"];
 }
 
-if ($numsondage !== false) {
-    $dsondage = Utils::get_sondage_from_id($numsondage);
-    if($dsondage === false) {
-        $err |= NO_POLL;
-    }
-} else {
-    $err |= NO_POLL_ID;
+$dsondage = ($numsondage != false) ? Utils::get_sondage_from_id($numsondage) : false;
+if (!$dsondage || $dsondage->id_sondage == ''){
+    Utils::print_header( _("Error!"));
+
+    bandeau_titre(_("Error!"));
+
+    echo '
+    <div class="alert alert-warning">
+        <h2>' . _("This poll doesn't exist !") . '</h2>
+        <p>' . _('Back to the homepage of ') . ' <a href="' . Utils::get_server_name() . '"> ' . NOMAPPLICATION . '</a></p>
+    </div>'."\n";
+
+    bandeau_pied();
+
+    die();
 }
 
 //output a CSV and die()
@@ -199,17 +207,6 @@ if($err != 0) {
 
     echo '</ul></div>';
 
-    if(Utils::is_error(NO_POLL_ID) || Utils::is_error(NO_POLL)) {
-        echo '
-    <div class="col-md-6 col-md-offset-3">
-        <h2>' . _("This poll doesn't exist !") . '</h2>
-        <p>' . _('Back to the homepage of') . ' <a href="' . Utils::get_server_name() . '"> ' . NOMAPPLICATION . '</a></p>
-    </div>'."\n";
-
-        bandeau_pied();
-
-        die();
-    }
 } else {
     Utils::print_header(_('Poll').' - '.$dsondage->titre);
     bandeau_titre(_("Make your polls"));