$default_poll_duration variable creation

dynamic usage of the $default_poll_duration variable to display coherent information to user.

choix_autre.php

@@ -57,8 +57,8 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
         $temp_results=substr($temp_results,1);
         $_SESSION["toutchoix"]=$temp_results;
 
-        // Expiration date → after 6 months if not filled or in bad format
-        $_SESSION["champdatefin"]=time()+15552000;
+        // Expiration date → the configuration value is used if not filled or in bad format		
+        $_SESSION["champdatefin"]= time()+ (86400 * config_get('default_poll_duration')); //60 secondes * 60 minutes * 24 heures * config
 
         if (Utils::issetAndNoEmpty('champdatefin')) {
             $registredate = explode("/",$_POST["champdatefin"]);
@@ -137,7 +137,7 @@ if (Utils::issetAndNoEmpty('titre', $_SESSION) === false || Utils::issetAndNoEmp
                 '. $summary .'
             </div>
             <div class="alert alert-info">
-                <p>' . _("Your poll will be automatically removed after 6 months:") . ' <strong>'.$removal_date.'</strong>.<br />' . _("You can fix another removal date for it.") .'</p>
+                <p>' . _("Your poll will be automatically removed after"). " " . config_get('default_poll_duration') . " " . _("days") . ' <strong>'.$removal_date.'</strong>.<br />' . _("You can fix another removal date for it.") .'</p>
                 <div class="form-group">
                     <label for="champdatefin" class="col-sm-5 control-label">'. _("Removal date (optional)") .'</label>
                     <div class="col-sm-6">

config.inc.php

@@ -17,9 +17,30 @@
  * Auteurs de Framadate/OpenSondage : Framasoft (https://github.com/framasoft)
  */
  
+ /**
+ * general configuration
+ */
+ 
+	 //is a smtp server is configured to send e-mail ?
+	 //$use_smtp = true;
+	 
  /**
  * index.php
  */
- $show_what_is_that = true;
- $show_the_software = true;
- $show_cultivate_your_garden = true;
+ 
+	  //display "how to use" section
+	 $show_what_is_that = true;
+
+	 //display technical information about the software
+	 $show_the_software = true;
+
+	 //display "developpement and administration" information
+	 $show_cultivate_your_garden = true;
+    
+ /**
+ * choix_autre.php
+ */
+	   //default values for the new poll duration (number of days). 
+	  $default_poll_duration = 180;
+  
+  

locale/en_GB/LC_MESSAGES/Studs.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: Framadate 0.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-23 20:52+0100\n"
-"PO-Revision-Date: 2014-10-23 20:52+0100\n"
-"Last-Translator: JosephK\n"
+"PO-Revision-Date: 2014-11-11 20:12+0100\n"
+"Last-Translator: mrB <mr.bricodage@gmail.com>\n"
 "Language-Team: JosephK\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
@@ -81,6 +81,12 @@ msgstr "%A, den %e. %B %Y"
 msgid "Expiration's date"
 msgstr "Expiration's date"
 
+msgid "days"
+msgstr "days"
+
+msgid "months"
+msgstr "months"
+
 ########### Language selector ###########
 msgid "Change the language"
 msgstr "Change the language"
@@ -555,8 +561,8 @@ msgid "Removal date:"
 msgstr "Removal date:"
 
 # Step 3 choix_autre.php
-msgid "Your poll will be automatically removed after 6 months:"
-msgstr "Your poll will be automatically removed after 6 months:"
+msgid "Your poll will be automatically removed after"
+msgstr "Your poll will be automatically removed after"
 
 msgid "You can fix another removal date for it."
 msgstr "You can fix another removal date for it."
@@ -616,12 +622,15 @@ msgstr ""
 msgid "Thanks for your confidence."
 msgstr "Thanks for your confidence."
 
-msgid "\n"
-"--\n\n"
+msgid ""
+"\n"
+"--\n"
+"\n"
 "« La route est longue, mais la voie est libre… »\n"
 "Framasoft ne vit que par vos dons (déductibles des impôts).\n"
 "Merci d'avance pour votre soutien http://soutenir.framasoft.org."
-msgstr "\n"
+msgstr ""
+"\n"
 "\n"
 "\n"
 "\n"
@@ -666,3 +675,4 @@ msgstr "Author's message"
 
 msgid "For sending to the polled users"
 msgstr "For sending to the polled users"
+

locale/fr_FR/LC_MESSAGES/Studs.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: Framadate 0.8\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-23 20:52+0100\n"
-"PO-Revision-Date: 2014-10-23 20:52+0100\n"
-"Last-Translator: JosephK\n"
+"PO-Revision-Date: 2014-11-11 13:19+0100\n"
+"Last-Translator: mrB <mr.bricodage@gmail.com>\n"
 "Language-Team: JosephK\n"
 "Language: French\n"
 "MIME-Version: 1.0\n"
@@ -81,6 +81,12 @@ msgstr "%A %e %B %Y"
 msgid "Expiration's date"
 msgstr "Date d'expiration"
 
+msgid "days"
+msgstr "jours"
+
+msgid "months"
+msgstr "mois"
+
 ########### Language selector ###########
 msgid "Change the language"
 msgstr "Changer la langue"
@@ -555,8 +561,8 @@ msgid "Removal date:"
 msgstr "Date de suppression :"
 
 # Step 3 choix_autre.php
-msgid "Your poll will be automatically removed after 6 months:"
-msgstr "Votre sondage sera automatiquement effacé dans 6 mois :"
+msgid "Your poll will be automatically removed after"
+msgstr "Votre sondage sera automatiquement effacé dans"
 
 msgid "You can fix another removal date for it."
 msgstr "Néanmoins vous pouvez décider ci-dessous d'une date plus rapprochée pour la suppression de votre sondage."