Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git

LimeSurvey · Apr 23, 2013 · d6b50f7 · d6b50f7
2 parents 1acfede + 18fffc6
commit d6b50f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -514,26 +514,26 @@ function buildSelects($allfields, $surveyid, $language) {
                     if (substr($pv, -1, 1) == "E" && !empty($_POST[$pv]))
                     {
                         $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i');
-                        $_POST[$pv]=$datetimeobj->convert("Y-m-d");
+                        $sDateValue=$datetimeobj->convert("Y-m-d");
 
-                        $selects[] = Yii::app()->db->quoteColumnName('datestamp')." >= ".dbQuoteAll($_POST[$pv]." 00:00:00")." and ".Yii::app()->db->quoteColumnName('datestamp')." <= ".dbQuoteAll($_POST[$pv]." 23:59:59");
+                        $selects[] = Yii::app()->db->quoteColumnName('datestamp')." >= ".dbQuoteAll($sDateValue." 00:00:00")." and ".Yii::app()->db->quoteColumnName('datestamp')." <= ".dbQuoteAll($sDateValue." 23:59:59");
                     }
                     else
                     {
                         //timestamp less than
                         if (substr($pv, -1, 1) == "L" && !empty($_POST[$pv]))
                         {
                             $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i');
-                            $_POST[$pv]=$datetimeobj->convert("Y-m-d H:i:s");
-                            $selects[]= Yii::app()->db->quoteColumnName('datestamp')." < ".dbQuoteAll($_POST[$pv]);
+                            $sDateValue=$datetimeobj->convert("Y-m-d H:i:s");
+                            $selects[]= Yii::app()->db->quoteColumnName('datestamp')." < ".dbQuoteAll($sDateValue);
                         }
 
                         //timestamp greater than
                         if (substr($pv, -1, 1) == "G" && !empty($_POST[$pv]))
                         {
                             $datetimeobj = new Date_Time_Converter($_POST[$pv], $formatdata['phpdate'].' H:i');
-                            $_POST[$pv]=$datetimeobj->convert("Y-m-d H:i:s");
-                            $selects[]= Yii::app()->db->quoteColumnName('datestamp')." > ".dbQuoteAll($_POST[$pv]);
+                            $sDateValue=$datetimeobj->convert("Y-m-d H:i:s");
+                            $selects[]= Yii::app()->db->quoteColumnName('datestamp')." > ".dbQuoteAll($sDateValue);
                         }
                     }
                 }
@@ -1803,7 +1803,7 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
             elseif (incompleteAnsFilterState() == "complete") {$query .= " AND submitdate is not null";}
 
             //check for any "sql" that has been passed from another script
-            if ($sql != "NULL") {$query .= " AND $sql";}
+            if (!empty($sql)) {$query .= " AND $sql";}
 
             //get data
             $row=Yii::app()->db->createCommand($query)->queryScalar();

diff --git a/application/views/admin/export/statistics_view.php b/application/views/admin/export/statistics_view.php
@@ -96,7 +96,7 @@
                 if (isset($datestamp) && $datestamp == "Y") {?>
                     <fieldset id='right'><legend><?php $clang->eT("Submission date"); ?></legend><ul><li>
                     <label for='datestampE'><?php $clang->eT("Equals:"); ?></label>
-                    <?php echo CHtml::textField('datestampeE',isset($_POST['datestampE'])?$_POST['datestampE']:'',array('id'=>'datestampE', 'class'=>'popupdate', 'size'=>'12'));?>
+                    <?php echo CHtml::textField('datestampE',isset($_POST['datestampE'])?$_POST['datestampE']:'',array('id'=>'datestampE', 'class'=>'popupdate', 'size'=>'12'));?>
                     </li><li><label for='datestampG'><?php $clang->eT("Later than:");?></label>
                     <?php echo CHtml::textField('datestampG',isset($_POST['datestampG'])?$_POST['datestampG']:'',array('id'=>'datestampG', 'class'=>'popupdate', 'size'=>'12'));?>
                     </li><li><label for='datestampL'><?php $clang->eT("Earlier than:");?></label>