Merge remote-tracking branch 'origin/master'

LimeSurvey · May 1, 2012 · 8cd04c6 · 8cd04c6
2 parents 1dade90 + 42ce650
commit 8cd04c6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,2 @@
 
 /upload/surveys/*
-/config.php
-/conjoint_minke.php
-/conjoint_save.php
-/omniphon_options.php
-/omniphon_settings.php
-/omniphon_start.php
-/omniphon_start1.php
-/omniphon_start2.php
-/omniphon_style.css
-/omniphon_db.php
-/practice_db_converter.php
-/limesurvey_cronjob_reminders.php
-/practice_db_converter_2.php
-/practice_db_converter1.php
-/practice_db_question_exporter.php
-/practice_tokenforwarding.php
-/practice_tokenforwarding1.php
-/practice_go.php
-/qanda.php
-/upload
diff --git a/admin/quota.php b/admin/quota.php
@@ -323,15 +323,30 @@ function getQuotaAnswers($qid,$surveyid,$quota_id)
                 // Fix bug with FCKEditor saving strange BR types
                 $_POST['quotals_message_'.$lang]=fix_FCKeditor_text($_POST['quotals_message_'.$lang]);
 
-                //Now save the language to the database:
-                $query = "UPDATE ".db_table_name('quota_languagesettings')."
-				          SET quotals_name='".db_quote($_POST['quota_name'],true)."',
-						  quotals_message='".db_quote($_POST['quotals_message_'.$lang],true)."',
-						  quotals_url='".db_quote($_POST['quotals_url_'.$lang],true)."',
-						  quotals_urldescrip='".db_quote($_POST['quotals_urldescrip_'.$lang],true)."'
-				          WHERE quotals_quota_id =".db_quote($_POST['quota_id'],true)."
-						  AND quotals_language = '$lang'";
-                $connect->Execute($query) or safe_die($connect->ErrorMsg());
+                //Check to see if a matching language exists, and if not, INSERT one (no update possible)
+                $query = "SELECT * FROM ".db_table_name('quota_languagesettings')."
+                          WHERE quotals_quota_id = ".db_quote($_POST['quota_id'], true)."
+                          AND quotals_language = '$lang'";
+                $result = db_execute_assoc($query) or safe_die($connect->ErrorMsg());
+                if ($result->RecordCount() > 0) {
+                    //Now save the language to the database:
+                    $query = "UPDATE ".db_table_name('quota_languagesettings')."
+                              SET quotals_name='".db_quote($_POST['quota_name'],true)."',
+                              quotals_message='".db_quote($_POST['quotals_message_'.$lang],true)."',
+                              quotals_url='".db_quote($_POST['quotals_url_'.$lang],true)."',
+                              quotals_urldescrip='".db_quote($_POST['quotals_urldescrip_'.$lang],true)."'
+                              WHERE quotals_quota_id =".db_quote($_POST['quota_id'],true)."
+                              AND quotals_language = '$lang'";
+                    $connect->Execute($query) or safe_die($connect->ErrorMsg());
+                } else {
+                    /* If there is no matching record for this language, create one */
+                    $query = "INSERT INTO ".db_table_name('quota_languagesettings')."
+                              (quotals_quota_id,quotals_language,quotals_name,quotals_message,quotals_url,quotals_urldescrip)
+                              VALUES ('".db_quote($_POST['quota_id'])."', '$lang', '".db_quote($_POST['quota_name'],true)."',
+                              '".db_quote($_POST['quotals_message_'.$lang],true)."', '".db_quote($_POST['quotals_url_'.$lang],true)."',
+                              '".db_quote($_POST['quotals_urldescrip_'.$lang],true)."')";
+                    $connect->Execute($query) or safe_die($connect->ErrorMsg());
+                }
             }
         } //End insert language based components