Merge branch 'refs/heads/dev_tms' into dev

Conflicts: admin/admin.php admin/browse.php admin/classes/quexml/quexmlpdf.php admin/database.php admin/editsurveysettings.php admin/html.php admin/install/create-mssql.sql admin/install/create-mssqlnative.sql admin/install/create-mysql.sql admin/install/create-postgres.sql admin/labels.php admin/preview.php admin/printablesurvey.php admin/questionhandling.php admin/scripts/admin_core.js admin/scripts/templates.js admin/statistics_function.php admin/templates.php admin/tokens.php admin/translate_functions.php admin/update/upgrade-all.php admin/update/upgrade-mssql.php admin/update/upgrade-mssqlnative.php admin/update/upgrade-mysql.php admin/update/upgrade-postgres.php admin/usercontrol.php classes/eval/ExpressionManager.php classes/eval/LimeExpressionManager.php classes/eval/em_javascript.js classes/eval/test/conditions2relevance.php classes/eval/test/data.php classes/eval/test/functions.php classes/eval/test/navigation_test.php classes/eval/test/relevance.php classes/eval/test/reset_syntax_error_log.php classes/eval/test/strings_with_expressions.php classes/eval/test/stringsplit.php classes/eval/test/survey_logic_file.php classes/eval/test/syntax_errors.php classes/eval/test/test.php classes/eval/test/tokenizer.php classes/eval/test/unit.php classes/eval/test/upgrade_conditions2relevance.php classes/eval/test/usage.php common_functions.php config-defaults.php config.php delete.php docs/demosurveys/limesurvey2_sample_survey_english.lss docs/release_notes.txt group.php index.php locale/ar/LC_MESSAGES/ar.mo locale/ar/LC_MESSAGES/ar.po locale/be/LC_MESSAGES/be.mo locale/be/LC_MESSAGES/be.po locale/bg/LC_MESSAGES/bg.mo locale/bg/LC_MESSAGES/bg.po locale/bs/LC_MESSAGES/bs.mo locale/bs/LC_MESSAGES/bs.po locale/ca/LC_MESSAGES/ca.mo locale/ca/LC_MESSAGES/ca.po locale/cs/LC_MESSAGES/cs.mo locale/cs/LC_MESSAGES/cs.po locale/cy/LC_MESSAGES/cy.mo locale/cy/LC_MESSAGES/cy.po locale/da/LC_MESSAGES/da.mo locale/da/LC_MESSAGES/da.po locale/de-informal/LC_MESSAGES/de-informal.mo locale/de-informal/LC_MESSAGES/de-informal.po locale/de/LC_MESSAGES/de.mo locale/de/LC_MESSAGES/de.po locale/el/LC_MESSAGES/el.mo locale/el/LC_MESSAGES/el.po locale/en/LC_MESSAGES/en.mo locale/en/LC_MESSAGES/en.po locale/es-MX/LC_MESSAGES/es-MX.mo locale/es-MX/LC_MESSAGES/es-MX.po locale/es/LC_MESSAGES/es.mo locale/es/LC_MESSAGES/es.po locale/et/LC_MESSAGES/et.mo locale/et/LC_MESSAGES/et.po locale/eu/LC_MESSAGES/eu.mo locale/eu/LC_MESSAGES/eu.po locale/fa/LC_MESSAGES/fa.mo locale/fa/LC_MESSAGES/fa.po locale/fi/LC_MESSAGES/fi.mo locale/fi/LC_MESSAGES/fi.po locale/fr/LC_MESSAGES/fr.mo locale/fr/LC_MESSAGES/fr.po locale/ga/LC_MESSAGES/ga.mo locale/ga/LC_MESSAGES/ga.po locale/gl/LC_MESSAGES/gl.mo locale/gl/LC_MESSAGES/gl.po locale/he/LC_MESSAGES/he.mo locale/he/LC_MESSAGES/he.po locale/hi/LC_MESSAGES/hi.mo locale/hi/LC_MESSAGES/hi.po locale/hr/LC_MESSAGES/hr.mo locale/hr/LC_MESSAGES/hr.po locale/hu/LC_MESSAGES/hu.mo locale/hu/LC_MESSAGES/hu.po locale/id/LC_MESSAGES/id.mo locale/id/LC_MESSAGES/id.po locale/is/LC_MESSAGES/is.mo locale/is/LC_MESSAGES/is.po locale/it-formal/LC_MESSAGES/it-formal.mo locale/it-formal/LC_MESSAGES/it-formal.po locale/it/LC_MESSAGES/it.mo locale/it/LC_MESSAGES/it.po locale/ja/LC_MESSAGES/ja.mo locale/ja/LC_MESSAGES/ja.po locale/ko/LC_MESSAGES/ko.mo locale/ko/LC_MESSAGES/ko.po locale/lt/LC_MESSAGES/lt.mo locale/lt/LC_MESSAGES/lt.po locale/lv/LC_MESSAGES/lv.mo locale/lv/LC_MESSAGES/lv.po locale/mk/LC_MESSAGES/mk.mo locale/mk/LC_MESSAGES/mk.po locale/ms/LC_MESSAGES/ms.mo locale/ms/LC_MESSAGES/ms.po locale/mt/LC_MESSAGES/mt.mo locale/mt/LC_MESSAGES/mt.po locale/nb/LC_MESSAGES/nb.mo locale/nb/LC_MESSAGES/nb.po locale/nl-informal/LC_MESSAGES/nl-informal.mo locale/nl-informal/LC_MESSAGES/nl-informal.po locale/nl/LC_MESSAGES/nl.mo locale/nl/LC_MESSAGES/nl.po locale/nn/LC_MESSAGES/nn.mo locale/nn/LC_MESSAGES/nn.po locale/pa/LC_MESSAGES/pa.mo locale/pa/LC_MESSAGES/pa.po locale/pl/LC_MESSAGES/pl.mo locale/pl/LC_MESSAGES/pl.po locale/pt-BR/LC_MESSAGES/pt-BR.mo locale/pt-BR/LC_MESSAGES/pt-BR.po locale/pt/LC_MESSAGES/pt.mo locale/pt/LC_MESSAGES/pt.po locale/ro/LC_MESSAGES/ro.mo locale/ro/LC_MESSAGES/ro.po locale/ru/LC_MESSAGES/ru.mo locale/ru/LC_MESSAGES/ru.po locale/si/LC_MESSAGES/si.mo locale/si/LC_MESSAGES/si.po locale/sk/LC_MESSAGES/sk.mo locale/sk/LC_MESSAGES/sk.po locale/sl/LC_MESSAGES/sl.mo locale/sl/LC_MESSAGES/sl.po locale/sq/LC_MESSAGES/sq.mo locale/sq/LC_MESSAGES/sq.po locale/sr/LC_MESSAGES/sr.mo locale/sr/LC_MESSAGES/sr.po locale/sv/LC_MESSAGES/sv.mo locale/sv/LC_MESSAGES/sv.po locale/th/LC_MESSAGES/th.mo locale/th/LC_MESSAGES/th.po locale/tr/LC_MESSAGES/tr.mo locale/tr/LC_MESSAGES/tr.po locale/ur/LC_MESSAGES/ur.mo locale/ur/LC_MESSAGES/ur.po locale/vi/LC_MESSAGES/vi.mo locale/vi/LC_MESSAGES/vi.po locale/zh-Hans/LC_MESSAGES/zh-Hans.mo locale/zh-Hans/LC_MESSAGES/zh-Hans.po locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po qanda.php replacements.php save.php scripts/modaldialog.js scripts/survey_runtime.js scripts/uploader.js templates/citronade/ie_fix_6.css templates/citronade/ie_fix_7.css templates/citronade/ie_fix_8.css templates/citronade/startpage.pstpl templates/citronade/template.css uploader.php version.php
LimeSurvey · Jan 28, 2012 · 9cc7725 · 9cc7725
2 parents 1a11716 + 000fb69
commit 9cc7725
Show file tree

Hide file tree

Showing 124 changed files with 723,652 additions and 8,713 deletions.
diff --git a/admin/admin.php b/admin/admin.php
@@ -260,13 +260,20 @@
     {
         if(bHasSurveyPermission($surveyid,'surveyactivation','read'))
         {
+<<<<<<< HEAD
             $surveyid = sanitize_int($surveyid);
             $thissurvey  = getSurveyInfo($surveyid);
             $_POST['sid'] = $surveyid . '|N';
             $_POST['LEM_PRETTY_PRINT_ALL_SYNTAX'] = 'Y';
             $_POST['surveyMode'] = 'survey';
             $_POST['LEMcalledFromAdmin'] = 'Y';
             $_POST['assessments'] = $thissurvey['assessments'];
+=======
+            $_POST['sid'] = sanitize_int($surveyid) . '|N';
+            $_POST['LEM_PRETTY_PRINT_ALL_SYNTAX'] = 'Y';
+            $_POST['surveyMode'] = 'survey';
+            $_POST['LEMcalledFromAdmin'] = 'Y';
+>>>>>>> refs/heads/dev_tms
             if (isset($_GET['gid'])) { $_POST['gid'] = $_GET['gid']; }
             if (isset($_GET['qid'])) { $_POST['qid'] = $_GET['qid']; }
             include($rootdir . '/classes/eval/test/survey_logic_file.php');

diff --git a/admin/browse.php b/admin/browse.php
@@ -121,7 +121,11 @@
     $dateformatdetails=getDateFormatData($_SESSION['dateformat']);
 
     //SHOW HEADER
+<<<<<<< HEAD
     if (!isset($_SESSION['sql']) || !$_SESSION['sql']) {$browseoutput .= $surveyoptions;} // Don't show options if coming from tokens/statistics script
+=======
+    if (!isset($_POST['sql']) || !$_POST['sql']) {$browseoutput .= $surveyoptions;} // Don't show options if coming from tokens/statistics script
+>>>>>>> refs/heads/dev_tms
     //FIRST LETS GET THE NAMES OF THE QUESTIONS AND MATCH THEM TO THE FIELD NAMES FOR THE DATABASE
 
     $fncount = 0;
@@ -321,9 +325,15 @@
                           var noFilesSelectedForDeletion = '".$clang->gT('Please select at least one file for deletion','js')."';
                           var noFilesSelectedForDnld = '".$clang->gT('Please select at least one file for download','js')."';
                         </script>\n";
+<<<<<<< HEAD
     $browseoutput .= $surveyoptions;
     $bClearFilter=returnglobal('clearfilter');
     if ($bClearFilter)
+=======
+    if (!isset($_POST['sql']))
+    {$browseoutput .= $surveyoptions;} //don't show options when called from another script with a filter on
+    else
+>>>>>>> refs/heads/dev_tms
     {
         unset($_SESSION['sql']);
     }
@@ -647,7 +657,11 @@
             }
             if ($_SESSION['sql'] !== "")
             {
+<<<<<<< HEAD
                 $dtquery .= ' AND '.$_SESSION['sql']." ";
+=======
+               // $dtquery .= ' AND '.stripcslashes($_POST['sql'])." ";
+>>>>>>> refs/heads/dev_tms
             }
             $dtquery .= " ORDER BY {$surveytable}.id";
         }