From 17a2214f557226576b7df2e1d273300ef923d2b3 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Wed, 13 Jan 2010 16:45:23 +0000
Subject: [PATCH] Fixed issue #4041: Unable to filter statistics by date range

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8248 b72ed6b6-b9f8-46b5-92b4-906544132732
---
 admin/html.php                      | 12 ++++++------
 admin/statistics.php                |  6 +++---
 admin/statistics_function.php       | 14 +++++++++++---
 admin/styles/default/adminstyle.css |  8 ++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/admin/html.php b/admin/html.php
index cd6e4ba4097..8bab63cfdb6 100644
--- a/admin/html.php
+++ b/admin/html.php
@@ -982,7 +982,7 @@
         . "<div class='menubar-left'>\n"
 		. "<img src='$imagefiles/blank.gif' alt='' width='55' height='20' />\n"
 		. "<img src='$imagefiles/seperator.gif' alt='' />\n"
-		. "<img src='$imagefiles/blank.gif' alt='' width='171' height='20'  />\n"
+		. "<img src='$imagefiles/blank.gif' alt='' width='157' height='20'  />\n"
 		. "<img src='$imagefiles/seperator.gif' alt='' />\n";
 
 		if(hasRight($surveyid,'define_questions'))
@@ -1016,7 +1016,7 @@
 			}
 		}
 		else {$questionsummary .= "<img src='$imagefiles/blank.gif' alt='' width='40' />\n";}
-		$questionsummary .= "<img src='$imagefiles/blank.gif' alt='' width='84' />\n";
+		$questionsummary .= "<img src='$imagefiles/blank.gif' alt='' width='40' />\n";
 
 		if(hasRight($surveyid,'export'))
 		{
@@ -2412,8 +2412,8 @@
                 $startdate=$datetimeobj->convert($dateformatdetails['phpdate'].' H:i');
             }
             
-            $editsurvey .= "<li><label for='startdate_$surveyid'>".$clang->gT("Start date/time:")."</label>\n"
-            . "<input type='text' class='popupdatetime' id='startdate_$surveyid' size='20' name='startdate' value=\"{$startdate}\" /></li>\n";
+            $editsurvey .= "<li><label for='startdate'>".$clang->gT("Start date/time:")."</label>\n"
+            . "<input type='text' class='popupdatetime' id='startdate' size='20' name='startdate' value=\"{$startdate}\" /></li>\n";
 
 			// Expiration date
             $expires='';
@@ -2422,8 +2422,8 @@
                 $datetimeobj = new Date_Time_Converter($esrow['expires'] , "Y-m-d H:i:s");
                 $expires=$datetimeobj->convert($dateformatdetails['phpdate'].' H:i');
             }
-			$editsurvey .="<li><label for='enddate_$surveyid'>".$clang->gT("Expiry date/time:")."</label>\n"
-			. "<input type='text' class='popupdatetime' id='enddate_$surveyid' size='20' name='expires' value=\"{$expires}\" /></li>\n";
+			$editsurvey .="<li><label for='expires'>".$clang->gT("Expiry date/time:")."</label>\n"
+			. "<input type='text' class='popupdatetime' id='expires' size='20' name='expires' value=\"{$expires}\" /></li>\n";
 			//COOKIES
 			$editsurvey .= "<li><label for=''>".$clang->gT("Set cookie to prevent repeated participation?")."</label>\n"
 			. "<select name='usecookie'>\n"
diff --git a/admin/statistics.php b/admin/statistics.php
index 2211606c198..7251e1b577c 100644
--- a/admin/statistics.php
+++ b/admin/statistics.php
@@ -306,13 +306,13 @@
 
     $statisticsoutput .= "<fieldset id='right'><legend>".$clang->gT("Submission date")."</legend><ul><li>"
     ."<label for='datestampE'>".$clang->gT("Equals:")."</label>\n"
-    ."<input id='datestampE' name='datestampE' type='text' value='";
+    ."<input class='popupdate' id='datestampE' name='datestampE' type='text' value='";
     if (isset($_POST['datestampE'])) {$statisticsoutput .= $_POST['datestampE'];}
     $statisticsoutput .= "' /></li><li><label for='datestampG'>\n"
     ."&nbsp;&nbsp;".$clang->gT("Later than:")."</label>\n"
-    ."<input id='datestampG' name='datestampG' value='";
+    ."<input class='popupdatetime' id='datestampG' name='datestampG' value='";
     if (isset($_POST['datestampG'])) {$statisticsoutput .= $_POST['datestampG'];}
-    $statisticsoutput .= "' type='text' /></li><li><label for='datestampL'> ".$clang->gT("Earlier than:")."</label><input  id='datestampL' name='datestampL' value='";
+    $statisticsoutput .= "' type='text' /></li><li><label for='datestampL'> ".$clang->gT("Earlier than:")."</label><input  class='popupdatetime' id='datestampL' name='datestampL' value='";
     if (isset($_POST['datestampL'])) {$statisticsoutput .= $_POST['datestampL'];}
     $statisticsoutput .= "' type='text' /></li></ul></fieldset>\n";
     $statisticsoutput .= "<input type='hidden' name='summary[]' value='datestampE' />";
diff --git a/admin/statistics_function.php b/admin/statistics_function.php
index f4c9952d168..b1ecfdd3d02 100644
--- a/admin/statistics_function.php
+++ b/admin/statistics_function.php
@@ -410,22 +410,30 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
 			elseif (substr($pv, 0, 9) == "datestamp")
 			{
 				//timestamp equals
+                $formatdata=getDateFormatData($_SESSION['dateformat']);
 				if (substr($pv, -1, 1) == "E" && !empty($_POST[$pv]))
 				{
-					$selects[] = db_quote_id('datestamp')." = '".$_POST[$pv]."'";
+                    $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i');
+                    $_POST[$pv]=$datetimeobj->convert("Y-m-d");
+                    
+					$selects[] = db_quote_id('datestamp')." >= '".$_POST[$pv]." 00:00:00' and ".db_quote_id('datestamp')." <= '".$_POST[$pv]." 23:59:59'";
 				}
 				else
 				{
 					//timestamp less than
 					if (substr($pv, -1, 1) == "L" && !empty($_POST[$pv]))
 					{
-						$selects[]= db_quote_id('datestamp')." > '".$_POST[$pv]."'";
+                        $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i');
+                        $_POST[$pv]=$datetimeobj->convert("Y-m-d H:i:s");
+						$selects[]= db_quote_id('datestamp')." < '".$_POST[$pv]."'";
 					}
 						
 					//timestamp greater than
 					if (substr($pv, -1, 1) == "G" && !empty($_POST[$pv]))
 					{
-						$selects[]= db_quote_id('datestamp')." < '".$_POST[$pv]."'";
+                        $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i');
+                        $_POST[$pv]=$datetimeobj->convert("Y-m-d H:i:s");
+						$selects[]= db_quote_id('datestamp')." > '".$_POST[$pv]."'";
 					}
 				}
 			}
diff --git a/admin/styles/default/adminstyle.css b/admin/styles/default/adminstyle.css
index c22d5495dbe..913eb22fc7c 100644
--- a/admin/styles/default/adminstyle.css
+++ b/admin/styles/default/adminstyle.css
@@ -1124,14 +1124,14 @@ margin:0 auto;
 }
 #statistics_general_filter #left
 {
-    width:300px;
-    height:105px;
+    width:270px;
+    height:125px;
     float:left;
 }
 #statistics_general_filter #right
 {
-    width:300px;
-    height:105px;
+    width:330px;
+    height:125px;
     float:right;
 }