From e11e008f11109284ecb19c489369cf6fd004e9fc Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <c_schmitz@users.sourceforge.net>
Date: Mon, 13 Dec 2010 12:37:47 +0000
Subject: [PATCH] Fixed issue #4819: Data entry php error Fixed issue #4820:
 Question type 'Location' not workin at all Fixed issue #4810: End URL in
 overview should open in new browser tab or window

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9635 b72ed6b6-b9f8-46b5-92b4-906544132732
---
 admin/dataentry.php    | 19 +++++++++++--------
 admin/html.php         |  4 ++--
 common_functions.php   |  5 -----
 docs/release_notes.txt |  3 +--
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/admin/dataentry.php b/admin/dataentry.php
index eb796a45df6..45287fb50d8 100644
--- a/admin/dataentry.php
+++ b/admin/dataentry.php
@@ -271,20 +271,23 @@
                         }
                         else
                         {
-                        if ($irow['type'] == 'D')
-                        {
-                            $datetimeobj = new Date_Time_Converter($_POST[$fieldname],$dateformatdetails['phpdate']);
                             $columns[] .= db_quote_id($fieldname);
-                            $values[] .= db_quoteall($datetimeobj->convert("Y-m-d H:i:s"),true);
+                            $values[] .= db_quoteall(count($phparray), true);
                         }
-                        else
-                        {
-                            $columns[] .= db_quote_id($fieldname);
+                    }
+                    elseif ($irow['type'] == 'D')
+                    {
+                        $datetimeobj = new Date_Time_Converter($_POST[$fieldname],$dateformatdetails['phpdate']);
+                        $columns[] .= db_quote_id($fieldname);
+                        $values[] .= db_quoteall($datetimeobj->convert("Y-m-d H:i:s"),true);
+                    }
+                    else
+                    {
+                        $columns[] .= db_quote_id($fieldname);
                         $values[] .= db_quoteall($_POST[$fieldname],true);
                     }
                 }
             }
-            }
             
             $SQL = "INSERT INTO $surveytable
 					(".implode(',',$columns).")
diff --git a/admin/html.php b/admin/html.php
index 31218d07a21..e8fa7e0b7d2 100644
--- a/admin/html.php
+++ b/admin/html.php
@@ -744,11 +744,11 @@
 
         if ($surveyinfo['surveyls_urldescription']==""){$surveyinfo['surveyls_urldescription']=htmlspecialchars($surveyinfo['surveyls_url']);}
         $surveysummary .= "<tr><td align='right' valign='top'><strong>"
-        . $clang->gT("Exit Link").":</strong></td>\n"
+        . $clang->gT("End URL").":</strong></td>\n"
         . "<td align='left'>";                                             
         if ($surveyinfo['surveyls_url']!="") 
         {
-            $surveysummary .=" <a href=\"".htmlspecialchars($surveyinfo['surveyls_url'])."\" title=\"".htmlspecialchars($surveyinfo['surveyls_url'])."\">{$surveyinfo['surveyls_urldescription']}</a>";
+            $surveysummary .=" <a target='_blank' href=\"".htmlspecialchars($surveyinfo['surveyls_url'])."\" title=\"".htmlspecialchars($surveyinfo['surveyls_url'])."\">{$surveyinfo['surveyls_urldescription']}</a>";
         }
         else
         {
diff --git a/common_functions.php b/common_functions.php
index 9323554c508..8fea065cb36 100644
--- a/common_functions.php
+++ b/common_functions.php
@@ -145,11 +145,6 @@ function getqtypelist($SelectedCode = "T", $ReturnType = "selector")
                'subquestions'=>0,
                'assessable'=>0,
                'answerscales'=>0),
-    "J"=>array('description'=>$clang->gT("Location"),
-               'subquestions'=>0,
-               'hasdefaultvalues'=>0,
-               'assessable'=>0,
-               'answerscales'=>0),
     "K"=>array('description'=>$clang->gT("Multiple Numerical Input"),
                'hasdefaultvalues'=>0,
                'subquestions'=>1,
diff --git a/docs/release_notes.txt b/docs/release_notes.txt
index a2bcd7663a4..1e20f34ac90 100644
--- a/docs/release_notes.txt
+++ b/docs/release_notes.txt
@@ -80,7 +80,7 @@ Thank you to everyone who helped with this new release!
 Changes from 1.90 to 1.91beta
 +New feature: #4324: Allow dropdowns for Array(flexible label) questions - patch provided by CarbonaCat
 +New feature: Mail Bounce Tracking System (anishseth)
-+New feature: (Idea #103) Gives the user the ability to preview question groups. (parajulik)
++New feature: Gives the user the ability to preview question groups. (parajulik)
 +New feature: Ability to add Google Maps as a question (parajulik)
 +New feature: Survey toolbar redesign (c_schmitz)
 +New feature: Ability to add mass dummy tokens (parajulik)
@@ -100,7 +100,6 @@ Changes from 1.90 to 1.91beta
 +New feature: Detailed survey permissions based on a CRUD model (c_schmitz)
 +New feature: Direct export to queXML PDF file (azammitdcarf)
 +New feature: Emoticon slider (c_schmitz)
-+New feature: Extended condition editor (c_schmitz)
 +New feature: Google Translate support for quick translation feature - work done by Google Code-In participant Kshitij Parajuli. Thank you! 
 +New feature: In "question by question" mode, you can now go "back" from the starting element of a group - patch by wavexx 
 +New feature: Login page automatically sets login language to browser language (c_schmitz)