From e0ff6ec0e72c02b5a038fd2fdd7348ca9699da12 Mon Sep 17 00:00:00 2001
From: FramaJosephK <josephk@framasoft.org>
Date: Thu, 13 Nov 2014 21:33:20 +0100
Subject: [PATCH] =?UTF-8?q?liens=20et=20images=20autoris=C3=A9s=20par=20d?=
 =?UTF-8?q?=C3=A9faut=20+=20purge=20auto=20limit=C3=A9e=20=C3=A0=2050=20po?=
 =?UTF-8?q?ur=201=20cr=C3=A9=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/classes/Framadate/Utils.php |  2 +-
 app/inc/config.inc.php          | 38 ++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index 08e76d2..9343cd6 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -252,7 +252,7 @@ class Utils
 
     public static function cleaning_polls($connect, $log_txt) {
         $connect->StartTrans();
-        $req = 'SELECT * FROM sondage WHERE date_fin < NOW()';
+        $req = 'SELECT * FROM sondage WHERE date_fin < NOW() LIMIT 50';
         $sql = $connect->Prepare($req);
         $cleaning = $connect->Execute($sql);
 
diff --git a/app/inc/config.inc.php b/app/inc/config.inc.php
index 07488aa..542d01a 100644
--- a/app/inc/config.inc.php
+++ b/app/inc/config.inc.php
@@ -16,34 +16,32 @@
  * Auteurs de STUdS (projet initial) : Guilhem BORGHESI (borghesi@unistra.fr) et Raphaël DROZ
  * Auteurs de Framadate/OpenSondage : Framasoft (https://git.framasoft.org/framasoft/framadate)
  */
- 
+
  /**
  * general configuration
  */
- 
-	 //use email for polls creation/modification/responses notification
-	 $use_smtp = true;
-	 
+
+    //use email for polls creation/modification/responses notification
+    $use_smtp = true;
+
  /**
  * index.php
  */
- 
-	  //display "how to use" section
-	 $show_what_is_that = true;
 
-	 //display technical information about the software
-	 $show_the_software = 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;
 
-	 //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 = 30;
-  
-  	   //user can add link or URL when creating his poll. 
-	  $user_can_add_link_or_url = false;
-  
-  
\ No newline at end of file
+    //default values for the new poll duration (number of days).
+    $default_poll_duration = 30;
+
+    //user can add link or URL when creating his poll.
+    $user_can_add_link_or_url = true;