Merge branch 'master' into 192_dev

LimeSurvey · Apr 8, 2012 · fda57a3 · fda57a3
2 parents 4b39135 + 1bb18a2
commit fda57a3
Show file tree

Hide file tree

Showing 17 changed files with 28,327 additions and 27,126 deletions.
diff --git a/admin/browse.php b/admin/browse.php
@@ -189,7 +189,7 @@
     //SHOW INDIVIDUAL RECORD
     $idquery = "SELECT * FROM {$surveytable} s";
     if ($surveyinfo['anonymized'] == "N" && db_tables_exist($tokentable))
-        $idquery .= "LEFT JOIN {$tokentable} t ON s.token = t.token ";
+        $idquery .= " LEFT JOIN {$tokentable} t ON s.token = t.token ";
     if (incompleteAnsFilterstate() == "inc")
         $idquery .= " WHERE (submitdate = ".$connect->DBDate('1980-01-01'). " OR submitdate IS NULL) AND ";
     elseif (incompleteAnsFilterstate() == "filter")

diff --git a/admin/conditionshandling.php b/admin/conditionshandling.php
@@ -1090,7 +1090,7 @@
 {
     foreach($canswers as $can)
     {
-        $an=json_encode(FlattenText($can[2]));
+        $an=ls_json_encode(FlattenText($can[2]));
         $conditionsoutput_main_content .= "Fieldnames[$jn]='$can[0]';\n"
         ."Codes[$jn]='$can[1]';\n"
         ."Answers[$jn]={$an};\n";

diff --git a/admin/dataentry.php b/admin/dataentry.php
@@ -267,7 +267,7 @@
                             }
 
                             $columns[] .= db_quote_id($fieldname);
-                            $values[] .= db_quoteall(json_encode($phparray), true);
+                            $values[] .= db_quoteall(ls_json_encode($phparray), true);
                         }
                         else
                         {

diff --git a/admin/questionhandling.php b/admin/questionhandling.php
@@ -348,7 +348,7 @@
     $qCodeToInfo = 'qCodeToInfo = {';
     foreach ($qtypelist as $qtype=>$qdesc){
         $qDescToCode .= " '{$qdesc['description']}' : '{$qtype}', \n";
-        $qCodeToInfo .= " '{$qtype}' : '".json_encode($qdesc)."', \n";
+        $qCodeToInfo .= " '{$qtype}' : '".ls_json_encode($qdesc)."', \n";
     }
     $qTypeOutput = "$qDescToCode 'null':'null' }; \n $qCodeToInfo 'null':'null' };";
 
@@ -924,7 +924,7 @@ function questionjavascript($type)
         $labels=$connect->GetArray($query);
         $resultdata[]=array($language=>array($labels,getLanguageNameFromCode($language,false)));
     }
-    echo json_encode($resultdata);
+    echo ls_json_encode($resultdata);
 }
 
 
@@ -941,7 +941,7 @@ function questionjavascript($type)
         $language=null;
     }
     $resultdata=getlabelsets($language);
-    echo json_encode($resultdata);
+    echo ls_json_encode($resultdata);
 }
 
 

diff --git a/admin/surveylist.php b/admin/surveylist.php
@@ -246,7 +246,7 @@
         while($rows = $result->FetchRow())
                 $aUsers['newowner'] = $rows['users_name'];
     }
-    $ajaxoutput = json_encode($aUsers) . "\n";
+    $ajaxoutput = ls_json_encode($aUsers) . "\n";
 
 }
 
@@ -260,6 +260,6 @@
                 $aUsers[] = array($userline['uid'], $userline['user']);
     }
 
-    $ajaxoutput = json_encode($aUsers) . "\n";
+    $ajaxoutput = ls_json_encode($aUsers) . "\n";
 }
 
diff --git a/admin/translate_google_api.php b/admin/translate_google_api.php
@@ -61,4 +61,4 @@
 
 }
 
-$ajaxoutput = json_encode($aOutput). "\n";
+$ajaxoutput = ls_json_encode($aOutput). "\n";
diff --git a/classes/expressions/LimeExpressionManager.php b/classes/expressions/LimeExpressionManager.php
@@ -6097,7 +6097,7 @@ static function ProcessCurrentResponses()
                                                 $phparray[$i]->filename = $sDestinationFileName;
                                             }
                                         }
-                                        $value = str_replace('{','{ ',json_encode($phparray));  // so that EM doesn't try to parse it.
+                                        $value = ls_json_encode($phparray);  // so that EM doesn't try to parse it.
                                     }
                                 }
                                 break;

diff --git a/common_functions.php b/common_functions.php
@@ -7240,5 +7240,16 @@ function fixSubquestions()
 
 }
 
+/**
+ * Need custom version of JSON encode to avoid having Expression Manager mangle it
+ * @param type $val
+ * @return type 
+ */
+function ls_json_encode($val)
+{
+    $ans = json_encode($val);
+    $ans = str_replace(array('{','}'),array('{ ',' }'), $ans);
+    return $ans;
+}
 
 // Closing PHP tag intentionally omitted - yes, it is okay
diff --git a/delete.php b/delete.php
@@ -78,7 +78,7 @@
            $iFileIndex++;
         }
         if ($found==true) unset($aFiles[$iFileIndex]);
-       $_SESSION[$sFieldname] = str_replace('{','{ ',json_encode($aFiles));
+       $_SESSION[$sFieldname] = ls_json_encode($aFiles);
     }
 
     if (@unlink($sFileDir.$sFilename))

diff --git a/locale/de-informal/LC_MESSAGES/de-informal.mo b/locale/de-informal/LC_MESSAGES/de-informal.mo