03937: {QUESTION_NUMBER} is only available in printable survey

This bug affects 1 person(s).

ID	Project	Category	View Status	Date Submitted	Last Update

03937	Bug reports	Theme editor	public	2009-12-02 16:53	2010-07-06 11:22

Reporter	mdekker	Assigned To	Evan
Priority	normal	Severity	minor
Status	closed	Resolution	fixed
Product Version	1.87RC4
Target Version	1.90RC1	Fixed in Version	1.90RC2

Summary	03937: {QUESTION_NUMBER} is only available in printable survey
Description	In printable survey each question is numbered with the {QUESTION_NUMBER} replacementfield. I wanted to use this in my normal survey but found out this replacement tag wasn't available. If possible, please add this tag to normal survey templates too so I can create a consistent look & feel for online and offline surveys.
Tags	No tags attached.
Attached Files	DIFF__showqcodes.diff (94,175 bytes) Index: locale/ms/LC_MESSAGES/ms.po =================================================================== --- locale/ms/LC_MESSAGES/ms.po (revision 8698) +++ locale/ms/LC_MESSAGES/ms.po (working copy) @@ -8835,6 +8835,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Muat turun URL secara automatik ketika kajian tamat?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2403 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3016 msgid "Publication & Access control" Index: locale/sq/LC_MESSAGES/sq.po =================================================================== --- locale/sq/LC_MESSAGES/sq.po (revision 8698) +++ locale/sq/LC_MESSAGES/sq.po (working copy) @@ -6259,6 +6259,26 @@ msgid "Automatically load URL when survey complete?" msgstr "Automatikisht ngarkon URL kur kerkimi perfundon?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/da/LC_MESSAGES/da.po =================================================================== --- locale/da/LC_MESSAGES/da.po (revision 8698) +++ locale/da/LC_MESSAGES/da.po (working copy) @@ -5339,6 +5339,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Automatisk åbning af URL, når spørgeskemaet er fuldført?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2403 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3016 msgid "Publication & Access control" Index: locale/sr/LC_MESSAGES/sr.po =================================================================== --- locale/sr/LC_MESSAGES/sr.po (revision 8698) +++ locale/sr/LC_MESSAGES/sr.po (working copy) @@ -6014,6 +6014,26 @@ msgid "Automatically load URL when survey complete?" msgstr "Аутоматски учитај URL по завршетку анкете?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2333 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/fa/LC_MESSAGES/fa.po =================================================================== --- locale/fa/LC_MESSAGES/fa.po (revision 8698) +++ locale/fa/LC_MESSAGES/fa.po (working copy) @@ -6274,6 +6274,27 @@ msgid "Automatically load URL when survey complete?" msgstr "آیا آدرس اینترنتی بطور خودکار هنگام تکمیل نظرسنجی بار شود؟" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/bg/LC_MESSAGES/bg.po =================================================================== --- locale/bg/LC_MESSAGES/bg.po (revision 8698) +++ locale/bg/LC_MESSAGES/bg.po (working copy) @@ -6825,6 +6825,27 @@ msgid "Automatically load URL when survey complete?" msgstr "" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2394 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3071 msgid "Publication & Access control" Index: locale/de/LC_MESSAGES/de.po =================================================================== --- locale/de/LC_MESSAGES/de.po (revision 8698) +++ locale/de/LC_MESSAGES/de.po (working copy) @@ -5274,6 +5274,27 @@ msgid "Automatically load URL when survey complete?" msgstr "URL automatisch laden, wenn die Umfrage abgeschlossen ist?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2696 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3308 msgid "Publication & Access control" Index: locale/sv/LC_MESSAGES/sv.po =================================================================== --- locale/sv/LC_MESSAGES/sv.po (revision 8698) +++ locale/sv/LC_MESSAGES/sv.po (working copy) @@ -4672,6 +4672,26 @@ msgid "Automatically load URL when survey complete?" msgstr "Automatiskt ladda sida när enkäten slutförts?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /Users/max/src/limesurvey/admin/html.php:2509 #: /Users/max/src/limesurvey/admin/html.php:3363 msgid "Publication & Access control" Index: locale/ja/LC_MESSAGES/ja.po =================================================================== --- locale/ja/LC_MESSAGES/ja.po (revision 8698) +++ locale/ja/LC_MESSAGES/ja.po (working copy) @@ -8154,6 +8154,27 @@ msgid "Automatically load URL when survey complete?" msgstr "アンケート終了時に、URLを自動的にロードしますか？" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2377 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2988 msgid "Publication & Access control" Index: locale/he/LC_MESSAGES/he.po =================================================================== --- locale/he/LC_MESSAGES/he.po (revision 8698) +++ locale/he/LC_MESSAGES/he.po (working copy) @@ -5093,6 +5093,27 @@ msgid "Automatically load URL when survey complete?" msgstr "האם לטעון כתובת אוטומטית כשהסקר מסתיים?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2513 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3367 msgid "Publication & Access control" Index: locale/fi/LC_MESSAGES/fi.po =================================================================== --- locale/fi/LC_MESSAGES/fi.po (revision 8698) +++ locale/fi/LC_MESSAGES/fi.po (working copy) @@ -8092,6 +8092,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Lataa automaattisesti URL kun kysely on valmis?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2373 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3221 msgid "Publication & Access control" Index: locale/nb/LC_MESSAGES/nb.po =================================================================== --- locale/nb/LC_MESSAGES/nb.po (revision 8698) +++ locale/nb/LC_MESSAGES/nb.po (working copy) @@ -5292,6 +5292,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Automatisk laste URL når undersøkelsen er fullført?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2393 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3241 msgid "Publication & Access control" Index: locale/bs/LC_MESSAGES/bs.po =================================================================== --- locale/bs/LC_MESSAGES/bs.po (revision 8698) +++ locale/bs/LC_MESSAGES/bs.po (working copy) @@ -6509,6 +6509,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Automatski učitaj URL kada je anketa popunjena?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + # D:\web\xampp\htdocs\limesurvey/admin/html.php:2267 # D:\web\xampp\htdocs\limesurvey/admin/html.php:2946 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 Index: locale/fr/LC_MESSAGES/fr.po =================================================================== --- locale/fr/LC_MESSAGES/fr.po (revision 8698) +++ locale/fr/LC_MESSAGES/fr.po (working copy) @@ -5673,6 +5673,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Charger automatiquement l'URL quand le questionnaire est terminé ?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /home/b00z00/__WEB/limesurvey_dev/limesurvey/admin/html.php:2696 #: /home/b00z00/__WEB/limesurvey_dev/limesurvey/admin/html.php:3308 msgid "Publication & Access control" Index: locale/zh-Hans/LC_MESSAGES/zh-Hans.po =================================================================== --- locale/zh-Hans/LC_MESSAGES/zh-Hans.po (revision 8698) +++ locale/zh-Hans/LC_MESSAGES/zh-Hans.po (working copy) @@ -8135,6 +8135,26 @@ msgid "Automatically load URL when survey complete?" msgstr "调查完成后自动加载URL？" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2377 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2988 msgid "Publication & Access control" Index: locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po =================================================================== --- locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po (revision 8698) +++ locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po (working copy) @@ -5375,6 +5375,26 @@ msgid "Automatically load URL when survey complete?" msgstr "當完成答卷後馬上載入 url 嗎?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2363 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3211 msgid "Publication & Access control" Index: locale/nl/LC_MESSAGES/nl.po =================================================================== --- locale/nl/LC_MESSAGES/nl.po (revision 8698) +++ locale/nl/LC_MESSAGES/nl.po (working copy) @@ -3627,6 +3627,27 @@ msgid "Automatically load URL when survey complete?" msgstr "URL automatisch laden na afronding vragenlijst?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2648 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3260 msgid "Publication & Access control" Index: locale/hr/LC_MESSAGES/hr.po =================================================================== --- locale/hr/LC_MESSAGES/hr.po (revision 8698) +++ locale/hr/LC_MESSAGES/hr.po (working copy) @@ -6472,6 +6472,48 @@ msgid "Automatically load URL when survey complete?" msgstr "Automatski učitaj završni URL nakon ispunjenog upitnika?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\LimeSurvey #: 1/admin/html.php:2376 #: 1/admin/html.php:2987 Index: locale/th/LC_MESSAGES/th.po =================================================================== --- locale/th/LC_MESSAGES/th.po (revision 8698) +++ locale/th/LC_MESSAGES/th.po (working copy) @@ -5278,6 +5278,26 @@ msgid "Automatically load URL when survey complete?" msgstr "ต้องการให้ไปยังที่อยู่เว็บที่กำหนดไว้เมื่อจบแบบสำรวจ ?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2373 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3221 msgid "Publication & Access control" Index: locale/pl/LC_MESSAGES/pl.po =================================================================== --- locale/pl/LC_MESSAGES/pl.po (revision 8698) +++ locale/pl/LC_MESSAGES/pl.po (working copy) @@ -7816,6 +7816,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Wczytaj końcowy URL automatycznie?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2696 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3308 msgid "Publication & Access control" Index: locale/nn/LC_MESSAGES/nn.po =================================================================== --- locale/nn/LC_MESSAGES/nn.po (revision 8698) +++ locale/nn/LC_MESSAGES/nn.po (working copy) @@ -6048,6 +6048,28 @@ msgid "Automatically load URL when survey complete?" msgstr "" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + + + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2333 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/hu/LC_MESSAGES/hu.po =================================================================== --- locale/hu/LC_MESSAGES/hu.po (revision 8698) +++ locale/hu/LC_MESSAGES/hu.po (working copy) @@ -4523,6 +4523,27 @@ msgid "Automatically load URL when survey complete?" msgstr "URL betöltése automatikusan amikor a felmérés befejeződött?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2475 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3307 msgid "Publication & Access control" Index: locale/vi/LC_MESSAGES/vi.po =================================================================== --- locale/vi/LC_MESSAGES/vi.po (revision 8698) +++ locale/vi/LC_MESSAGES/vi.po (working copy) @@ -6580,6 +6580,26 @@ msgid "Automatically load URL when survey complete?" msgstr "Tự động đi đên URL khi kết thúc khảo sát?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/nl-informal/LC_MESSAGES/nl-informal.po =================================================================== --- locale/nl-informal/LC_MESSAGES/nl-informal.po (revision 8698) +++ locale/nl-informal/LC_MESSAGES/nl-informal.po (working copy) @@ -3627,6 +3627,27 @@ msgid "Automatically load URL when survey complete?" msgstr "URL automatisch laden na afronding vragenlijst?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2648 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3260 msgid "Publication & Access control" Index: locale/lt/LC_MESSAGES/lt.po =================================================================== --- locale/lt/LC_MESSAGES/lt.po (revision 8698) +++ locale/lt/LC_MESSAGES/lt.po (working copy) @@ -5116,6 +5116,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Automatiškai paleisti URL kai apklausa užbaigta?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2369 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3217 msgid "Publication & Access control" Index: locale/ro/LC_MESSAGES/ro.po =================================================================== --- locale/ro/LC_MESSAGES/ro.po (revision 8698) +++ locale/ro/LC_MESSAGES/ro.po (working copy) @@ -5388,6 +5388,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Încarc automat adresa URL la finalizarea chestionarului ?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2373 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3221 msgid "Publication & Access control" Index: locale/lv/LC_MESSAGES/lv.po =================================================================== --- locale/lv/LC_MESSAGES/lv.po (revision 8698) +++ locale/lv/LC_MESSAGES/lv.po (working copy) @@ -6345,6 +6345,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Automātiski ielādēt URL, kad pētījums pabeigts?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/pt/LC_MESSAGES/pt.po =================================================================== --- locale/pt/LC_MESSAGES/pt.po (revision 8698) +++ locale/pt/LC_MESSAGES/pt.po (working copy) @@ -3883,6 +3883,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Carregar automaticamente o URL depois de completo o inquérito?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2380 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2991 msgid "Publication & Access control" Index: locale/ca/LC_MESSAGES/ca.po =================================================================== --- locale/ca/LC_MESSAGES/ca.po (revision 8698) +++ locale/ca/LC_MESSAGES/ca.po (working copy) @@ -8331,6 +8331,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Carregar automàticament la URL quan s'hagi completat l'enquesta?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2377 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2988 msgid "Publication & Access control" Index: locale/pt-BR/LC_MESSAGES/pt-BR.po =================================================================== --- locale/pt-BR/LC_MESSAGES/pt-BR.po (revision 8698) +++ locale/pt-BR/LC_MESSAGES/pt-BR.po (working copy) @@ -5526,6 +5526,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Carregar automaticamente a URL depois que o questionário for preenchido?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2360 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3208 msgid "Publication & Access control" Index: locale/tr/LC_MESSAGES/tr.po =================================================================== --- locale/tr/LC_MESSAGES/tr.po (revision 8698) +++ locale/tr/LC_MESSAGES/tr.po (working copy) @@ -6847,6 +6847,26 @@ msgid "Automatically load URL when survey complete?" msgstr "Anket bitince otomatik URL yüklenecek mi?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2475 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3307 msgid "Publication & Access control" Index: locale/ru/LC_MESSAGES/ru.po =================================================================== --- locale/ru/LC_MESSAGES/ru.po (revision 8698) +++ locale/ru/LC_MESSAGES/ru.po (working copy) @@ -4658,6 +4658,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Загрузить URL автоматически, когда исследование будет закончено?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: c:\limesurvey/svn/admin/html.php:2513 #: c:\limesurvey/svn/admin/html.php:3367 msgid "Publication & Access control" Index: locale/es-MX/LC_MESSAGES/es-MX.po =================================================================== --- locale/es-MX/LC_MESSAGES/es-MX.po (revision 8698) +++ locale/es-MX/LC_MESSAGES/es-MX.po (working copy) @@ -3955,6 +3955,27 @@ msgid "Automatically load URL when survey complete?" msgstr "¿Cargar la URL automáticamente cuando se haya completado la encuesta?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2653 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3264 msgid "Publication & Access control" Index: locale/it-formal/LC_MESSAGES/it-formal.po =================================================================== --- locale/it-formal/LC_MESSAGES/it-formal.po (revision 8698) +++ locale/it-formal/LC_MESSAGES/it-formal.po (working copy) @@ -4712,6 +4712,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Rinvia automaticamente ad URL" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: c:\limesurvey/svn/admin/html.php:2509 #: c:\limesurvey/svn/admin/html.php:3363 msgid "Publication & Access control" Index: locale/id/LC_MESSAGES/id.po =================================================================== --- locale/id/LC_MESSAGES/id.po (revision 8698) +++ locale/id/LC_MESSAGES/id.po (working copy) @@ -6211,6 +6211,27 @@ msgid "Automatically load URL when survey complete?" msgstr "" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/de-informal/LC_MESSAGES/de-informal.po =================================================================== --- locale/de-informal/LC_MESSAGES/de-informal.po (revision 8698) +++ locale/de-informal/LC_MESSAGES/de-informal.po (working copy) @@ -5320,6 +5320,27 @@ msgid "Automatically load URL when survey complete?" msgstr "URL automatisch laden, wenn die Umfrage abgeschlossen ist?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2377 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2988 msgid "Publication & Access control" Index: locale/el/LC_MESSAGES/el.po =================================================================== --- locale/el/LC_MESSAGES/el.po (revision 8698) +++ locale/el/LC_MESSAGES/el.po (working copy) @@ -8249,6 +8249,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Αυτόματη μεταφορά σε Ιστοσελίδα με την ολοκλήρωση του ερωτηματολογίου;" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2399 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3247 msgid "Publication & Access control" Index: locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po =================================================================== --- locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po (revision 8698) +++ locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po (working copy) @@ -6379,6 +6379,26 @@ msgid "Automatically load URL when survey complete?" msgstr "當完成答案卷後馬上傳入 url 嗎?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/gl/LC_MESSAGES/gl.po =================================================================== --- locale/gl/LC_MESSAGES/gl.po (revision 8698) +++ locale/gl/LC_MESSAGES/gl.po (working copy) @@ -5334,6 +5334,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Cargar automaticamente a URL cando finalice a enquisa?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: C:\Users\carlos\Documents\Linux\LimeSurvey\Localización\Tortoise\1.x_stable/admin/html.php:2377 #: C:\Users\carlos\Documents\Linux\LimeSurvey\Localización\Tortoise\1.x_stable/admin/html.php:2988 msgid "Publication & Access control" Index: locale/ar/LC_MESSAGES/ar.po =================================================================== --- locale/ar/LC_MESSAGES/ar.po (revision 8698) +++ locale/ar/LC_MESSAGES/ar.po (working copy) @@ -6265,6 +6265,27 @@ msgid "Automatically load URL when survey complete?" msgstr "انتقل الى عنوان صفحة الويب تلقائيا عند اكمال الاستبيان؟ " + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2382 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3051 msgid "Publication & Access control" Index: locale/en/LC_MESSAGES/en.po =================================================================== --- locale/en/LC_MESSAGES/en.po (revision 8698) +++ locale/en/LC_MESSAGES/en.po (working copy) @@ -4602,6 +4602,27 @@ msgid "Automatically load URL when survey complete?" msgstr "" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2475 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3307 msgid "Publication & Access control" Index: locale/cs/LC_MESSAGES/cs.po =================================================================== --- locale/cs/LC_MESSAGES/cs.po (revision 8698) +++ locale/cs/LC_MESSAGES/cs.po (working copy) @@ -5369,6 +5369,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Zobrazit automaticky po ukončení průzkumu stránku, na kterou odkazuje URL?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2369 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3217 msgid "Publication & Access control" Index: locale/es/LC_MESSAGES/es.po =================================================================== --- locale/es/LC_MESSAGES/es.po (revision 8698) +++ locale/es/LC_MESSAGES/es.po (working copy) @@ -8751,6 +8751,27 @@ msgid "Automatically load URL when survey complete?" msgstr "¿Cargar la URL automáticamente cuando se haya completado la encuesta?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2377 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2989 msgid "Publication & Access control" Index: locale/mk/LC_MESSAGES/mk.po =================================================================== --- locale/mk/LC_MESSAGES/mk.po (revision 8698) +++ locale/mk/LC_MESSAGES/mk.po (working copy) @@ -6205,6 +6205,27 @@ msgid "Automatically load URL when survey complete?" msgstr "" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/et/LC_MESSAGES/et.po =================================================================== --- locale/et/LC_MESSAGES/et.po (revision 8698) +++ locale/et/LC_MESSAGES/et.po (working copy) @@ -4671,6 +4671,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Automaatselt lae URL kui ankeet on lõpetatud?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2509 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3363 msgid "Publication & Access control" Index: locale/ko/LC_MESSAGES/ko.po =================================================================== --- locale/ko/LC_MESSAGES/ko.po (revision 8698) +++ locale/ko/LC_MESSAGES/ko.po (working copy) @@ -6347,6 +6347,27 @@ msgid "Automatically load URL when survey complete?" msgstr "설문이 완성되면 자동으로 URL을 불러오겠습니까?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/eu/LC_MESSAGES/eu.po =================================================================== --- locale/eu/LC_MESSAGES/eu.po (revision 8698) +++ locale/eu/LC_MESSAGES/eu.po (working copy) @@ -6875,6 +6875,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Inkesta burututakoan URLa automatikoki kargatu?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/is/LC_MESSAGES/is.po =================================================================== --- locale/is/LC_MESSAGES/is.po (revision 8698) +++ locale/is/LC_MESSAGES/is.po (working copy) @@ -6382,6 +6382,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Hlaða sjálfvirkt vefslóð (URL) þegar könnun er lokið?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2333 #: /var/www/virtual/limesurvey.org/subversion1x/admin/html.php:2983 msgid "Publication & Access control" Index: locale/cy/LC_MESSAGES/cy.po =================================================================== --- locale/cy/LC_MESSAGES/cy.po (revision 8698) +++ locale/cy/LC_MESSAGES/cy.po (working copy) @@ -7117,6 +7117,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Llwytho'r URL yn awtomatig pan fydd yr arolwg ar ben?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2513 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3370 msgid "Publication & Access control" Index: locale/si/LC_MESSAGES/si.po =================================================================== --- locale/si/LC_MESSAGES/si.po (revision 8698) +++ locale/si/LC_MESSAGES/si.po (working copy) @@ -4467,6 +4467,27 @@ msgid "Automatically load URL when survey complete?" msgstr "සමීක්ෂණය සම්පූර්ණවූ පසු ස්වයංක්‍රීයව URL වෙත යන්න " +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2475 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3307 msgid "Publication & Access control" Index: locale/it/LC_MESSAGES/it.po =================================================================== --- locale/it/LC_MESSAGES/it.po (revision 8698) +++ locale/it/LC_MESSAGES/it.po (working copy) @@ -8820,6 +8820,27 @@ msgid "Automatically load URL when survey complete?" msgstr "Rinvia automaticamente ad URL" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2708 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3339 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2403 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3016 msgid "Publication & Access control" Index: locale/sk/LC_MESSAGES/sk.po =================================================================== --- locale/sk/LC_MESSAGES/sk.po (revision 8698) +++ locale/sk/LC_MESSAGES/sk.po (working copy) @@ -5307,6 +5307,26 @@ msgid "Automatically load URL when survey complete?" msgstr "Zobraziť automaticky po ukončení prieskumu stránku, na ktorú odkazuje URL?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: D:\web\xampp\htdocs\limesurvey/admin/html.php:2369 #: D:\web\xampp\htdocs\limesurvey/admin/html.php:3217 msgid "Publication & Access control" Index: locale/sl/LC_MESSAGES/sl.po =================================================================== --- locale/sl/LC_MESSAGES/sl.po (revision 8698) +++ locale/sl/LC_MESSAGES/sl.po (working copy) @@ -3692,6 +3692,26 @@ msgid "Automatically load URL when survey complete?" msgstr "Samodejno pojdi na ta URL naslov, ko uporabnik konča z anketo?" +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2693 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3305 +msgid "Show question codes" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2707 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3334 +msgid "Show No answer" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2719 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3347 +msgid "\"Show no answer\" has been forced on by the system adminstrator" +msgstr "" + +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:2722 +#: D:\web\xampp\htdocs\limesurvey/admin/html.php:3351 +msgid "\"Show no answer\" has been forced off by the system adminstrator" +msgstr "" + #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:2680 #: /var/lib/limesurvey-svn/subversion1x/admin/html.php:3291 msgid "Publication & Access control" Index: config-defaults.php =================================================================== --- config-defaults.php (revision 8698) +++ config-defaults.php (working copy) @@ -425,6 +425,31 @@ $updatecheckperiod=7; +/** + * @var $force_secure string - forces LimeSurvey to run through HTTPS or to block HTTPS + * 'on' = force SSL/HTTPS to be on (This will cause LimeSurvey + * to fail in SSL is turned off) + * 'off' = block SSL/HTTPS (this prevents LimeSurvey from + * running through SSL) + * '' = do nothing (default) + * + * DO NOT turn on secure unless you are sure SSL/HTTPS is working and + * that you have a current, working, valid certificate. If you are + * unsure whether your server has a valid certificate, just add 's' + * to the http part of your normal LimeSurvey URL. + * e.g. https://your.domain.org/limesurvey/admin/admin.php + * If LimeSurvey comes up as normal, then everything is fine. If you + * get a page not found error or permission denied error then + / +$force_secure = ''; // DO not turn on unless you are sure your server supports SSL/HTTPS + + + + + + + + //DO NOT EVER CHANGE THE FOLLOWING LINE --------------- require_once(dirname(__FILE__).'/config.php'); //----------------------------------------------------- Index: qanda.php =================================================================== --- qanda.php (revision 8698) +++ qanda.php (working copy) @@ -46,6 +46,15 @@ $condition[n][7] => scenario NEW BY R.L.J. van den Burg / +if($shownoanswer == 1 && $thissurvey['shownoanswer'] != 'N') +{ + define('SHOW_NO_ANSWER',1); +} +else +{ + define('SHOW_NO_ANSWER',0); +}; + function retrieveConditionInfo($ia) { //This function returns an array containing all related conditions @@ -474,7 +482,7 @@ function retrieveAnswers($ia, $notanswered=null, $notvalidated=null) { //globalise required config variables - global $dbprefix, $shownoanswer, $clang; //These are from the config-defaults.php file + global $dbprefix, $clang; //These are from the config-defaults.php file global $thissurvey, $gl; //These are set by index.php global $connect; @@ -511,16 +520,17 @@ // this is an attempt to allow users (or rather system admins) some control over how the starting text is formatted. $question_text = array( - 'all' => '' // All has been added for backwards compatibility with templates that use question_start.pstpl (now redundant) - ,'text' => $qtitle - ,'help' => '' - ,'mandatory' => '' - ,'man_message' => '' - ,'valid_message' => '' - ,'class' => '' - ,'man_class' => '' - ,'input_error_class' => ''// provides a class. - ,'essentials' => '' + 'all' => '' // All has been added for backwards compatibility with templates that use question_start.pstpl (now redundant) + ,'text' => $qtitle + ,'code' => $ia[2] + ,'help' => '' + ,'mandatory' => '' + ,'man_message' => '' + ,'valid_message' => '' + ,'class' => '' + ,'man_class' => '' + ,'input_error_class' => ''// provides a class. + ,'essentials' => '' ); switch ($ia[4]) @@ -1410,7 +1420,7 @@ // --------------------------------------------------------------- function do_5pointchoice($ia) { - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { @@ -1432,7 +1442,7 @@ $answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n<label for=\"answer$ia[1]$fp\" class=\"answertext\">$fp</label>\n\t</li>\n"; } - if ($ia[6] != "Y" && $shownoanswer == 1) // Add "No Answer" option if question is not mandatory + if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) // Add "No Answer" option if question is not mandatory { $answer .= "\t<li>\n<input class=\"radio\" type=\"radio\" name=\"$ia[1]\" id=\"NoAnswer\" value=\"\""; if (!$_SESSION[$ia[1]]) @@ -1682,7 +1692,7 @@ function do_list_dropdown($ia) { global $dbprefix, $dropdownthreshold, $lwcdropdowns, $connect; - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { $checkconditionFunction = "checkconditions"; @@ -1839,7 +1849,7 @@ $answer .= ' <option value="-oth-"'.$opt_select.'>'.$othertext."</option>\n"; } - if ((isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] != '') && (!isset($defexists) \|\| !$defexists) && $ia[6] != 'Y' && $shownoanswer == 1) + if ((isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] != '') && (!isset($defexists) \|\| !$defexists) && $ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= '<option value="">'.$clang->gT('No answer')."</option>\n"; } @@ -1949,7 +1959,7 @@ function do_list_radio($ia) { global $dbprefix, $dropdownthreshold, $lwcdropdowns, $connect, $clang; - global $shownoanswer, $thissurvey; + global $thissurvey; if ($ia[8] == 'Y') @@ -2011,7 +2021,7 @@ } if (isset($other) && $other=='Y') {$anscount++;} //Count up for the Other answer - if ($ia[6] != 'Y' && $shownoanswer == 1) {$anscount++;} //Count up if "No answer" is showing + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) {$anscount++;} //Count up if "No answer" is showing $wrapper = setup_columns($dcols , $anscount); $answer = $wrapper['whole-start']; @@ -2135,7 +2145,7 @@ } } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { if (((!isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] == '') && (!isset($defexists) \|\| !$defexists)) \|\| ($_SESSION[$ia[1]] == ' ' && (!isset($defexists) \|\| !$defexists))) { @@ -2208,7 +2218,7 @@ function do_listwithcomment($ia) { global $maxoptionsize, $dbprefix, $dropdownthreshold, $lwcdropdowns; - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { @@ -2270,7 +2280,7 @@ '; } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { if (((!isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] == '') && (!isset($defexists) \|\| !$defexists)) \|\|($_SESSION[$ia[1]] == ' ' && (!isset($defexists) \|\| !$defexists))) { @@ -2340,7 +2350,7 @@ $maxoptionsize = strlen($ansrow['answer']); } } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { if (((!isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] == '') && (!isset($defexists) \|\| !$defexists)) \|\|($_SESSION[$ia[1]] == ' ' && (!isset($defexists) \|\| !$defexists))) { @@ -4391,7 +4401,7 @@ // --------------------------------------------------------------- function do_yesno($ia) { - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { @@ -4422,7 +4432,7 @@ $answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n<label for=\"answer{$ia[1]}N\" class=\"answertext\" >\n\t".$clang->gT('No')."\n</label>\n\t</li>\n"; // --> END NEW FEATURE - SAVE - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= "\t<li>\n<input class=\"radio\" type=\"radio\" name=\"{$ia[1]}\" id=\"answer{$ia[1]}\" value=\"\""; if ($_SESSION[$ia[1]] == '') @@ -4445,7 +4455,7 @@ // --------------------------------------------------------------- function do_gender($ia) { - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { @@ -4476,7 +4486,7 @@ } $answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n<label for=\"answer$ia[1]M\" class=\"answertext\">".$clang->gT('Male')."</label>\n\t</li>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { / columns now done by CSS if ($dcols > 2) @@ -4520,7 +4530,7 @@ / function do_array_5point($ia) { - global $dbprefix, $shownoanswer, $notanswered, $thissurvey, $clang; + global $dbprefix, $notanswered, $thissurvey, $clang; if ($ia[8] == 'Y') { @@ -4544,7 +4554,7 @@ } $cellwidth = 5; // number of columns - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { ++$cellwidth; // add another column } @@ -4579,7 +4589,7 @@ $odd_even = alternation($odd_even); $answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n"; @@ -4592,7 +4602,7 @@ $answer .= "\t<th>$xc</th>\n"; } if ($right_exists) {$answer .= "\t<td width='$answerwidth%'> </td>\n";} - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -4655,7 +4665,7 @@ } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer_t_content .= "\t<td>\n<label for=\"answer$myfname-\">" ."\n\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" title=\"".$clang->gT('No answer').'"'; @@ -4687,7 +4697,7 @@ / function do_array_10point($ia) { - global $dbprefix, $shownoanswer, $notanswered, $thissurvey, $clang; + global $dbprefix, $notanswered, $thissurvey, $clang; if ($ia[8] == 'Y') { @@ -4712,7 +4722,7 @@ $answerwidth = 20; } $cellwidth = 10; // number of columns - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { ++$cellwidth; // add another column } @@ -4739,7 +4749,7 @@ $odd_even = alternation($odd_even); $answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth$\" />\n"; @@ -4751,7 +4761,7 @@ { $answer .= "\t<th>$xc</th>\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -4798,7 +4808,7 @@ // --> END NEW FEATURE - SAVE } - if ($ia[6] != "Y" && $shownoanswer == 1) + if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) { $answer_t_content .= "\t<td>\n<label for=\"answer$myfname-\">\n" ."\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" title=\"".$clang->gT('No answer')."\""; @@ -4823,7 +4833,7 @@ // --------------------------------------------------------------- function do_array_yesnouncertain($ia) { - global $dbprefix, $shownoanswer, $notanswered, $thissurvey, $clang; + global $dbprefix, $notanswered, $thissurvey, $clang; if ($ia[8] == 'Y') { @@ -4847,7 +4857,7 @@ $answerwidth = 20; } $cellwidth = 3; // number of columns - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { ++$cellwidth; // add another column } @@ -4872,7 +4882,7 @@ $odd_even = alternation($odd_even); $answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n"; @@ -4883,7 +4893,7 @@ . "\t<th>".$clang->gT('Yes')."</th>\n" . "\t<th>".$clang->gT('Uncertain')."</th>\n" . "\t<th>".$clang->gT('No')."</th>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -4954,7 +4964,7 @@ } $answer_t_content .= "\" />\n\t</td>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer_t_content .= "\t<td>\n\t<label for=\"answer$myfname-\">\n" . "\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" title=\"".$clang->gT('No answer')."\""; @@ -4978,7 +4988,6 @@ function do_array_increasesamedecrease($ia) { global $dbprefix, $thissurvey, $clang; - global $shownoanswer; global $notanswered; if ($ia[8] == 'Y') @@ -5002,7 +5011,7 @@ $answerwidth = 20; } $cellwidth = 3; // number of columns - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { ++$cellwidth; // add another column } @@ -5034,7 +5043,7 @@ $odd_even = alternation($odd_even); $answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n"; @@ -5046,7 +5055,7 @@ . "\t<th>".$clang->gT('Increase')."</th>\n" . "\t<th>".$clang->gT('Same')."</th>\n" . "\t<th>".$clang->gT('Decrease')."</th>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -5123,7 +5132,7 @@ if (isset($_SESSION[$myfname])) {$answer_body .= $_SESSION[$myfname];} $answer_body .= "\" />\n\t</td>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer_body .= "\t<td>\n" . "<label for=\"answer$myfname-\">\n" @@ -5148,7 +5157,6 @@ function do_array_flexible($ia) { global $dbprefix, $connect, $thissurvey, $clang; - global $shownoanswer; global $repeatheadings; global $notanswered; global $minrepeatheadings; @@ -5205,7 +5213,7 @@ $fn=1; $numrows = count($labelans); - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { ++$numrows; } @@ -5224,7 +5232,7 @@ $answer_head .= "\t<th>".$ld."</th>\n"; } if ($right_exists) {$answer_head .= "\t<td> </td>\n";} - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory and we can show "no answer" + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory and we can show "no answer" { $answer_head .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -5246,7 +5254,7 @@ { $answer .= "\t<th>".$ld."</th>\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory and we can show "no answer" + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory and we can show "no answer" { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -5313,7 +5321,7 @@ $answer .= "\t<td class=\"answertextright\"> </td>\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= "\t<td>\n<label for=\"answer$myfname-\">\n" ."\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" value=\"\" id=\"answer$myfname-\" title=\"".$clang->gT('No answer').'"'; @@ -5346,7 +5354,7 @@ $odd_even = alternation($odd_even); $answer_cols .= "<col class=\"answertextright $odd_even\" width=\"$answerwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer_cols .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n"; @@ -5370,7 +5378,6 @@ function do_array_multitext($ia) { global $dbprefix, $connect, $thissurvey, $clang; - global $shownoanswer; global $repeatheadings; global $notanswered; global $minrepeatheadings; @@ -5430,7 +5437,7 @@ $labelcode[]=$lrow['title']; } $numrows=count($labelans); - if ($ia[6] != 'Y' && $shownoanswer == 1) {$numrows++;} + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) {$numrows++;} $cellwidth=$columnswidth/$numrows; $cellwidth=sprintf('%02d', $cellwidth); @@ -5587,7 +5594,6 @@ function do_array_multiflexi($ia) { global $dbprefix, $connect, $thissurvey, $clang; - global $shownoanswer; global $repeatheadings; global $notanswered; global $minrepeatheadings; @@ -5670,7 +5676,7 @@ $labelcode[]=$lrow['title']; } $numrows=count($labelans); - if ($ia[6] != 'Y' && $shownoanswer == 1) {$numrows++;} + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) {$numrows++;} $cellwidth=$columnswidth/$numrows; $cellwidth=sprintf('%02d', $cellwidth); @@ -5891,7 +5897,6 @@ function do_array_flexiblecolumns($ia) { global $dbprefix; - global $shownoanswer; global $notanswered, $clang; if ($ia[8] == 'Y') @@ -5917,7 +5922,7 @@ $labelcode[]=$lrow['code']; $labels[]=array("answer"=>$lrow['answer'], "code"=>$lrow['code']); } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $labelcode[]=''; $labelans[]=$clang->gT('No answer'); @@ -6044,7 +6049,6 @@ function do_array_flexible_dual($ia) { global $dbprefix, $connect, $thissurvey, $clang; - global $shownoanswer; global $repeatheadings; global $notanswered; global $minrepeatheadings; @@ -6120,7 +6124,7 @@ } } $numrows=count($labelans) + count($labelans1); - if ($ia[6] != "Y" && $shownoanswer == 1) {$numrows++;} + if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) {$numrows++;} $cellwidth=$columnswidth/$numrows; $cellwidth=sprintf("%02d", $cellwidth); @@ -6211,7 +6215,7 @@ { $mycolumns .= "\n\t<col class=\"seperator\" />\n\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory and we can show "no answer" + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory and we can show "no answer" { $myheader2 .= "\t<th>".$clang->gT('No answer')."</th>\n"; $odd_even = alternation($odd_even); @@ -6238,7 +6242,7 @@ $myheader1 .= "\t<td> </td>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $myheader1 .= "\t<th> </th>\n"; } @@ -6278,7 +6282,7 @@ $answer .= "\t<th>".$ld."</th>\n"; } } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory and we can show "no answer" + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory and we can show "no answer" { $answer .= "\t<td> </td>\n"; // separator $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; @@ -6385,7 +6389,7 @@ $answer .= "\t<td> </td>\n"; // separator } - if ($ia[6] != "Y" && $shownoanswer == 1) + if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) { $answer .= "\t<td>\n" . "<label for='answer$myfname-'>\n" @@ -6596,7 +6600,7 @@ $answer .= '>'.$lrow['title']."</option>\n"; } // If not mandatory and showanswer, show no ans - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= "\t<option value=\"\" "; if (!isset($_SESSION[$myfname]) \|\| $_SESSION[$myfname] == '') @@ -6650,7 +6654,7 @@ $answer .= '>'.$lrow1['title']."</option>\n"; } // If not mandatory and showanswer, show no ans - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= "\t<option value='' "; if (!isset($_SESSION[$myfname1]) \|\| $_SESSION[$myfname1] == '') Index: admin/html.php =================================================================== --- admin/html.php (revision 8698) +++ admin/html.php (working copy) @@ -2689,6 +2689,41 @@ . "</select></li>"; + // Show Question Codes block + $editsurvey .= '<li><label for="showqcodes">'.$clang->gT("Show Question Codes")."</label>\n" + . '<select id="showqcodes" name="showqcodes">'; + $editsurvey .= '<option value="Y"'; + if (isset($esrow['showqcodes']) && $esrow['showqcodes'] == 'Y') {$editsurvey .= ' selected="selected"';} + $editsurvey .= '>'.$clang->gT('Yes')."</option>\n"; + $editsurvey .= '<option value="N"'; + if (!isset($esrow['showqcodes']) \|\| $esrow['showqcodes'] != 'Y') {$editsurvey .= ' selected="selected"';} + $editsurvey .= '>'.$clang->gT('No')."</option>\n" + . '</select></li>'; + + + // Show "No Answer" block + switch($shownoanswer) + { + case 0: + $editsurvey .= '<li>'.$clang->gT('"Show no answer" is forced off by the system adminstrator.').'</li>'; + break; + case 2 + $editsurvey .= '<li>'.$clang->gT('"Show no answer" is forced on by the system adminstrator.').'</li>'; + break; + default: + $editsurvey .= '<li><label for="showqcodes">'.$clang->gT('Show No Answer')."</label>\n" + . '<select id="shownoanswer" name="shownowanser">'; + $editsurvey .= '<option value="Y"'; + if ( !isset($esrow['shownoanswer']) \|\| $esrow['shownoanswer'] == 'Y') {$editsurvey .= ' selected="selected"';} + $editsurvey .= '>'.$clang->gT('Yes')."</option>\n"; + $editsurvey .= '<option value="N"'; + if ( isset($esrow['shownoanswer']) && $esrow['shownoanswer'] == 'N') {$editsurvey .= ' selected="selected"';} + $editsurvey .= '>'.$clang->gT('No')."</option>\n" + . '</select></li>'; + break; + }; + + // End Presention and navigation TAB $editsurvey .= "</ul></div>\n"; @@ -3286,10 +3321,40 @@ . "<select name='autoredirect' id='autoredirect'>\n" . "<option value='Y'>".$clang->gT("Yes")."</option>\n" . "<option value='N' selected='selected'>".$clang->gT("No")."</option>\n" - . "</select></li>" + . '</select></li>'; + + // Show question codes + $newsurvey .= '<li><label for="showqcodes">'.$clang->gT('Show question codes?')."</label>\n" + . "<select name\="showqcodes\" id=\"showqcodes\">\n" + . '<option value="Y">".$clang->gT('Yes')."</option>\n" + . '<option value="N" selected="selected">'.$clang->gT('No')."</option>\n" + . '</select></li>'; + + + // Show no answer + switch($shownoanswer) + { + case 0: + $newsurvey .= '<li>'.$clang->gT('"Show no answer" is forced off by the system adminstrator.').'</li>'; + break; + + case 2: + $newsurvey .= '<li>'.$clang->gT('"Show no answer" is foced on by the system adminstrator.').'</li>'; + break; + + default: + $newsurvey .= '<li><label for="showqcodes">'.$clang->gT('Show no answer?')."</label>\n" + . "<select name=\"shownoanswer\" id=\"shownoanswer\">\n" + . '<option value="Y" selected="selected">'.$clang->gT('Yes')."</option>\n" + . '<option value="N">'.$clang->gT('No')."</option>\n" + . '</select></li>'; + break; + }; + + //Default date format - . "<li><label for='dateformat'>".$clang->gT("Date format:")."</label>\n" + $newsurvey .= "<li><label for='dateformat'>".$clang->gT("Date format:")."</label>\n" . "<select size='1' id='dateformat' name='dateformat'>\n"; foreach (getDateFormatData() as $index=>$dateformatdata) { Index: admin/database.php =================================================================== --- admin/database.php (revision 8698) +++ admin/database.php (working copy) @@ -1070,6 +1070,8 @@ 'printanswers'=>$_POST['printanswers'], 'publicstatistics'=>$_POST['publicstatistics'], 'autoredirect'=>$_POST['autoredirect'], + 'showqcodes'=>$_POST['showqcodes'], + 'shownoanswer'=>$_POST['shownoanswer'], 'allowprev'=>$_POST['allowprev'], 'listpublic'=>$_POST['public'], 'htmlemail'=>$_POST['htmlemail'], @@ -1317,6 +1319,7 @@ 'allowregister'=>$_POST['allowregister'], 'allowsave'=>$_POST['allowsave'], 'autoredirect'=>$_POST['autoredirect'], + 'showqcodes'=>$_POST['showqcodes'], 'allowprev'=>$_POST['allowprev'], 'printanswers'=>$_POST['printanswers'], // 'usetokens'=>$_POST['usetokens'], @@ -1443,4 +1446,4 @@ } } -?> \ No newline at end of file +?> Index: admin/install/create-mysql.sql =================================================================== --- admin/install/create-mysql.sql (revision 8698) +++ admin/install/create-mysql.sql (working copy) @@ -199,6 +199,8 @@ `allowsave` char(1) default 'Y', `autonumber_start` bigint(11) default '0', `autoredirect` char(1) default 'N', + `showqcodes` char(1) default 'N', + `shownoanswer` char(1) default 'Y', `allowprev` char(1) default 'Y', `printanswers` char(1) default 'N', `ipaddr` char(1) default 'N', Index: admin/install/create-mssqlnative.sql =================================================================== --- admin/install/create-mssqlnative.sql (revision 8698) +++ admin/install/create-mssqlnative.sql (working copy) @@ -243,6 +243,8 @@ [allowsave] char(1) default 'Y', [autonumber_start] bigINT default '0', [autoredirect] char(1) default 'N', + [showqcodes] char(1) default 'N', + [shownoanswer] char(1) default 'Y', [allowprev] char(1) default 'Y', [printanswers] char(1) default 'N', [ipaddr] char(1) default 'N', Index: admin/install/create-postgres.sql =================================================================== --- admin/install/create-postgres.sql (revision 8698) +++ admin/install/create-postgres.sql (working copy) @@ -271,6 +271,8 @@ printanswers character(1) DEFAULT 'N'::bpchar, autonumber_start integer DEFAULT 0, autoredirect character(1) DEFAULT 'N'::bpchar, + showqcodes character(1) DEFAULT 'N'::bpchar, + shownoanswer character(1) DEFAULT 'Y'::bpchar, allowprev character(1) DEFAULT 'Y'::bpchar, ipaddr character(1) DEFAULT 'N'::bpchar, refurl character(1) DEFAULT 'N'::bpchar, Index: admin/install/create-mssql.sql =================================================================== --- admin/install/create-mssql.sql (revision 8698) +++ admin/install/create-mssql.sql (working copy) @@ -243,6 +243,8 @@ [allowsave] char(1) default 'Y', [autonumber_start] bigINT default '0', [autoredirect] char(1) default 'N', + [showqcodes] char(1) default 'N', + [shownoanswer] char(1) default 'Y', [allowprev] char(1) default 'Y', [printanswers] char(1) default 'N', [ipaddr] char(1) default 'N', Index: templates/default/question.pstpl =================================================================== --- templates/default/question.pstpl (revision 8698) +++ templates/default/question.pstpl (working copy) @@ -5,6 +5,7 @@ <table width="100%" cellspacing="0"> <tr> <td class="questiontext"> + (Q-CODE {QUESTION_CODE}) <span class="asterisk">{QUESTION_MANDATORY}</span>{QUESTION_TEXT}<br /><span class="questionhelp">{QUESTION_HELP}</span> {QUESTION_MAN_MESSAGE} {QUESTION_VALID_MESSAGE} DIFF__showqcodes.diff (94,175 bytes) question_number_patch.diff (3,593 bytes) ### Eclipse Workspace Patch 1.0 #P limesurvey Index: survey.php =================================================================== --- survey.php (revision 8703) +++ survey.php (working copy) @@ -251,8 +251,10 @@ { $gid=$gl[0]; $groupUnconditionnalQuestionsCount[$gid]=0; + $qnumber = 0; foreach ($_SESSION['fieldarray'] as $ia) { + $qnumber++; if ($ia[5] == $gid) { $qidattributes=getQuestionAttributes($ia[0]); @@ -265,6 +267,7 @@ { $plus_qanda[] = $ia[4]; $plus_qanda[] = $ia[6]; // adds madatory identifyer for adding mandatory class to question wrapping div + $plus_qanda['number'] = $qnumber; $qanda[]=$plus_qanda; } if ($plus_inputnames) @@ -880,6 +883,7 @@ $question['essentials'] = 'id="question'.$qa[4].'"'.$n_q_display; $question['class'] = $q_class; $question['man_class'] = $man_class; + $question['number'] = $qa['number']; //=================================================================== $answer=$qa[1]; $help=$qa[2]; Index: question.php =================================================================== --- question.php (revision 8703) +++ question.php (working copy) @@ -520,6 +520,7 @@ $question['essentials'] = 'id="question'.$qa[4].'"'.$n_q_display; $question['class'] = $q_class; $question['man_class'] = $man_class; + $question['number'] = $_SESSION['step']; //=================================================================== $answer=$qa[1]; $help=$qa[2]; Index: group.php =================================================================== --- group.php (revision 8703) +++ group.php (working copy) @@ -325,11 +325,11 @@ $inputnames=array(); $qtypesarray = array(); - +$qnumber = 0; foreach ($_SESSION['fieldarray'] as $ia) { $qtypesarray[$ia[1]] = $ia[4]; - + $qnumber++; if ($ia[5] == $gid) { $qidattributes=getQuestionAttributes($ia[0]); @@ -344,6 +344,7 @@ { $plus_qanda[] = $ia[4]; $plus_qanda[] = $ia[6]; // adds madatory identifyer for adding mandatory class to question wrapping div + $plus_qanda['number'] = $qnumber; $qanda[]=$plus_qanda; } if ($plus_inputnames) @@ -1077,6 +1078,7 @@ $question['class'] = $q_class; $question['man_class'] = $man_class; $question['code']=$qa[5]; + $question['number']=$qa['number']; //=================================================================== $answer=$qa[1]; $help=$qa[2]; Index: common.php =================================================================== --- common.php (revision 8703) +++ common.php (working copy) @@ -2844,6 +2844,7 @@ if (strpos($line, "{QUESTION_INPUT_ERROR_CLASS}") !== false) $line=str_replace("{QUESTION_INPUT_ERROR_CLASS}", $question['input_error_class'], $line); if (strpos($line, "{QUESTION_CODE}") !== false) $line=str_replace("{QUESTION_CODE}", $question['code'], $line); + if (strpos($line, "{QUESTION_NUMBER}") !== false) $line=str_replace("{QUESTION_NUMBER}", $question['number'], $line); if (strpos($line, "{ANSWER}") !== false) $line=str_replace("{ANSWER}", $answer, $line); $totalquestionsAsked = $totalquestions - $totalBoilerplatequestions; if ($totalquestionsAsked < 1) question_number_patch.diff (3,593 bytes) showXquestions.diff (25,010 bytes) Index: config-defaults.php =================================================================== --- config-defaults.php (revision 8708) +++ config-defaults.php (working copy) @@ -425,6 +425,41 @@ $updatecheckperiod=7; +/** + * @var $showXquestions allows you to control whether or not + * {THEREAREXQUESTIONS} is displayed (if it is included in a template) + * hide = always hide {THEREAREXQUESTIONS} + * show = always show {THEREAREXQUESTIONS} + * choose = allow survey admins to choose + / +$showXquestions = 'show'; + + +/* + * @var $showgroupinfo allows you to control whether or not + * {GROUPNAME} and/or {GROUPDESCRIPTION} are displayed (if they are + * included in a template) + * none = always hide both title and description + * name = always {GROUPNAME} only + * description = always show {GROUPDESCRIPTION} only + * both = always show both {GROUPNAME} and {GROUPDESCRIPTION} + * choose = allow survey admins to choose + / +$showgroupinfo = 'both'; + + +/* + * @var $showqnumcode allows you to control whether or not + * {QUESTION_NUMBER} and/or {QUESTION_CODE} are displayed (if they + * are included in a template) + * none = always hide both {QUESTION_NUMBER} and {QUESTION_CODE} + * code = always show {QUESTION_CODE} only + * number = always show {QUESTION_NUMBER} only + * both = always show both {QUESTION_NUMBER} and {QUESTION_CODE} + * choose = allow survey admins to choose + / +$showqnumcode = 'none'; + //DO NOT EVER CHANGE THE FOLLOWING LINE --------------- require_once(dirname(__FILE__).'/config.php'); //----------------------------------------------------- Index: qanda.php =================================================================== --- qanda.php (revision 8708) +++ qanda.php (working copy) @@ -34,6 +34,7 @@ $ia[6] => mandatory Y \|\| N * $ia[7] => conditions exist for this question * $ia[8] => other questions have conditions which rely on this question (including array_filter and array_filter_exclude attributes) + * $ia[9] => incremental question count (used by {QUESTION_NUMBER}) * * $conditions element structure * $condition[n][0] => qid = question id @@ -476,6 +477,7 @@ / function retrieveAnswers($ia, $notanswered=null, $notvalidated=null) { +//echo '<pre>(qanda.php '.__LINE__.') $ia = '.print_r($ia,true).'</pre>'; //globalise required config variables global $dbprefix, $shownoanswer, $clang; //These are from the config-defaults.php file global $thissurvey, $gl; //These are set by index.php @@ -516,6 +518,8 @@ $question_text = array( 'all' => '' // All has been added for backwards compatibility with templates that use question_start.pstpl (now redundant) ,'text' => $qtitle + ,'code' => $ia[2] + ,'number' => $ia[9] ,'help' => '' ,'mandatory' => '' ,'man_message' => '' Index: common.php =================================================================== --- common.php (revision 8708) +++ common.php (working copy) @@ -2754,7 +2754,8 @@ global $percentcomplete, $move; global $groupname, $groupdescription; global $question; - global $questioncode, $answer, $navigator; + global $showXquestions, $showgroupinfo, $showqnumcode; + global $answer, $navigator; global $help, $totalquestions, $surveyformat; global $completed, $register_errormsg; global $notanswered, $privacy, $surveyid; @@ -2816,9 +2817,34 @@ if (strpos($line, "{WELCOME}") !== false) $line=str_replace("{WELCOME}", $thissurvey['welcome'], $line); if (strpos($line, "{LANGUAGECHANGER}") !== false) $line=str_replace("{LANGUAGECHANGER}", $languagechanger, $line); if (strpos($line, "{PERCENTCOMPLETE}") !== false) $line=str_replace("{PERCENTCOMPLETE}", $percentcomplete, $line); - if (strpos($line, "{GROUPNAME}") !== false) $line=str_replace("{GROUPNAME}", $groupname, $line); - if (strpos($line, "{GROUPDESCRIPTION}") !== false) $line=str_replace("{GROUPDESCRIPTION}", $groupdescription, $line); + if( + $showgroupinfo == 'both' \|\| + $showgroupinfo == 'name' \|\| + ($showgroupinfo == 'choose' && $thissurvey['showgroupinfo'] == 'B') \|\| + ($showgroupinfo == 'choose' && $thissurvey['showgroupinfo'] == 'N') + ) + { + if (strpos($line, "{GROUPNAME}") !== false) $line=str_replace("{GROUPNAME}", $groupname, $line); + } + else + { + if (strpos($line, "{GROUPNAME}") !== false) $line=str_replace("{GROUPNAME}", '' , $line); + }; + if( + $showgroupinfo == 'both' \|\| + $showgroupinfo == 'number' \|\| + ($showgroupinfo == 'choose' && $thissurvey['showgroupinfo'] == 'B') \|\| + ($showgroupinfo == 'choose' && $thissurvey['showgroupinfo'] == 'D') + ) + { + if (strpos($line, "{GROUPDESCRIPTION}") !== false) $line=str_replace("{GROUPDESCRIPTION}", $groupdescription, $line); + } + else + { + if (strpos($line, "{GROUPDESCRIPTION}") !== false) $line=str_replace("{GROUPDESCRIPTION}", '' , $line); + }; + if (is_array($question)) { if (strpos($line, "{QUESTION}") !== false) @@ -2843,21 +2869,54 @@ if (strpos($line, '{QUESTION_MAN_CLASS}') !== false) $line=str_replace('{QUESTION_MAN_CLASS}', $question['man_class'], $line); if (strpos($line, "{QUESTION_INPUT_ERROR_CLASS}") !== false) $line=str_replace("{QUESTION_INPUT_ERROR_CLASS}", $question['input_error_class'], $line); - if (strpos($line, "{QUESTION_CODE}") !== false) $line=str_replace("{QUESTION_CODE}", $question['code'], $line); - if (strpos($line, "{ANSWER}") !== false) $line=str_replace("{ANSWER}", $answer, $line); - $totalquestionsAsked = $totalquestions - $totalBoilerplatequestions; - if ($totalquestionsAsked < 1) + if( + $showqnumcode == 'both' \|\| + $showqnumcode == 'number' \|\| + ($showqnumcode == 'choose' && $thissurvey['showqnumcode'] == 'B') \|\| + ($showqnumcode == 'choose' && $thissurvey['showqnumcode'] == 'N') + ) { - if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There are no questions in this survey"), $line); //Singular + if (strpos($line, "{QUESTION_NUMBER}") !== false) $line=str_replace("{QUESTION_NUMBER}", $question['number'], $line); } - if ($totalquestionsAsked == 1) + else { - if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There is 1 question in this survey"), $line); //Singular + if (strpos($line, "{QUESTION_NUMBER}") !== false) $line=str_replace("{QUESTION_NUMBER}", '' , $line); + }; + if( + $showqnumcode == 'both' \|\| + $showqnumcode == 'code' \|\| + ($showqnumcode == 'choose' && $thissurvey['showqnumcode'] == 'B') \|\| + ($showqnumcode == 'choose' && $thissurvey['showqnumcode'] == 'C') + ) + { + if (strpos($line, "{QUESTION_CODE}") !== false) $line=str_replace("{QUESTION_CODE}", $question['code'], $line); } else { - if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There are {NUMBEROFQUESTIONS} questions in this survey."), $line); //Note this line MUST be before {NUMBEROFQUESTIONS} + if (strpos($line, "{QUESTION_CODE}") !== false) $line=str_replace("{QUESTION_CODE}", '' , $line); + }; + + if (strpos($line, "{ANSWER}") !== false) $line=str_replace("{ANSWER}", $answer, $line); + $totalquestionsAsked = $totalquestions - $totalBoilerplatequestions; + if($showXquestions == 'show' \|\| ($showXquestions == 'choose' && $thissurvey['showXquestions'] == 'Y')) + { + if ($totalquestionsAsked < 1) + { + if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There are no questions in this survey"), $line); //Singular + } + if ($totalquestionsAsked == 1) + { + if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There is 1 question in this survey"), $line); //Singular + } + else + { + if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There are {NUMBEROFQUESTIONS} questions in this survey."), $line); //Note this line MUST be before {NUMBEROFQUESTIONS} + }; } + else + { + if (strpos($line, '{THEREAREXQUESTIONS}') !== false) $line=str_replace('{THEREAREXQUESTIONS}' , '' , $line); + }; if (strpos($line, "{NUMBEROFQUESTIONS}") !== false) $line=str_replace("{NUMBEROFQUESTIONS}", $totalquestionsAsked, $line); if (strpos($line, "{TOKEN}") !== false) { Index: group.php =================================================================== --- group.php (revision 8708) +++ group.php (working copy) @@ -326,9 +326,13 @@ $qtypesarray = array(); +$qnumber = 0; + foreach ($_SESSION['fieldarray'] as $ia) { $qtypesarray[$ia[1]] = $ia[4]; + ++$qnumber; + $ia[9] = $qnumber; // incremental question count; if ($ia[5] == $gid) { Index: question.php =================================================================== --- question.php (revision 8708) +++ question.php (working copy) @@ -109,7 +109,7 @@ else {$currentquestion=$_SESSION['step']-1;} $ia=$_SESSION['fieldarray'][$currentquestion]; - +$ia[]=$_SESSION['step']; list($newgroup, $gid, $groupname, $groupdescription, $gl)=checkIfNewGroup($ia); // MANAGE CONDITIONAL QUESTIONS AND HIDDEN QUESTIONS Index: survey.php =================================================================== --- survey.php (revision 8708) +++ survey.php (working copy) @@ -251,8 +251,11 @@ { $gid=$gl[0]; $groupUnconditionnalQuestionsCount[$gid]=0; + $qnumber = 0; foreach ($_SESSION['fieldarray'] as $ia) { + ++$qnumber; + $ia[9] = $qnumber; // incremental question count; if ($ia[5] == $gid) { $qidattributes=getQuestionAttributes($ia[0]); @@ -260,6 +263,7 @@ continue; } $qtypesarray[$ia[1]] = $ia[4]; + list($plus_qanda, $plus_inputnames)=retrieveAnswers($ia); if ($plus_qanda) { Index: admin/html.php =================================================================== --- admin/html.php (revision 8708) +++ admin/html.php (working copy) @@ -2689,6 +2689,149 @@ . "</select></li>"; + // Show {THEREAREXQUESTIONS} block + switch($showXquestions) + { + case 'choose': $editsurvey .= '<li><label for="showXquestions">'.$clang->gT('Show "There are X questions in this survey"')."</label>\n" + . '<select id="showXquestions" name="showXquestions">'; + $editsurvey .= '<option value="Y"'; + if (isset($esrow['showXquestions']) && $esrow['showXquestions'] == 'Y') + { + $editsurvey .= ' selected="selected"'; + } + $editsurvey .= '>'.$clang->gT('Yes')."</option>\n"; + $editsurvey .= '<option value="N"'; + if (!isset($esrow['showXquestions']) \|\| $esrow['showXquestions'] != 'Y') + { + $editsurvey .= ' selected="selected"'; + } + $editsurvey .= '>'.$clang->gT('No')."</option>\n" + . '</select></li>'; + break; + case 'show': + $editsurvey .= '<li>' + .$clang->gT('Show "There are X questions in this survey"').' '.$clang->gT('is forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showXquestions" value="Y" /></li>'; + break; + case 'hide': + $editsurvey .= '<li>' + .$clang->gT('Show "There are X questions in this survey"').' '.$clang->gT('is forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showXquestions" value="N" /></li>'; + break; + } + + + // Show {GROUPNAME} and/or {GROUPDESCRIPTION} block + switch($showgroupinfo) + { + case 'both': + $editsurvey .= '<li>' + .$clang->gT('Both Group Name and Group Description are forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showgroupinfo" value="B" /></li>'; + break; + case 'choose': $editsurvey .= '<li><label for="showgroupinfo">'.$clang->gT('Show Group Name and/or Group Description')."</label>\n" + . '<select id="showgroupinfo" name="showgroupinfo">'; + $editsurvey .= '<option value="B"'; + if (isset($esrow['showgroupinfo']) && $esrow['showgroupinfo'] == 'B') + { + $editsurvey .= ' selected="selected"'; + }; + $editsurvey .= '>'.$clang->gT('Both')."</option>\n"; + $editsurvey .= '<option value="N"'; + if (isset($esrow['showgroupinfo']) && $esrow['showgroupinfo'] == 'N') + { + $editsurvey .= ' selected="selected"'; + }; + $editsurvey .= '>'.$clang->gT('Name')."</option>\n"; + $editsurvey .= '<option value="D"'; + if (isset($esrow['showgroupinfo']) && $esrow['showgroupinfo'] == 'D') + { + $editsurvey .= ' selected="selected"'; + }; + $editsurvey .= '>'.$clang->gT('Description')."</option>\n"; + $editsurvey .= '<option value="X"'; + if (isset($esrow['showgroupinfo']) && $esrow['showgroupinfo'] == 'X') + { + $editsurvey .= ' selected="selected"'; + }; + $editsurvey .= '>'.$clang->gT('Neither')."</option>\n" + . '</select></li>'; + break; + case 'name': + $editsurvey .= '<li>' + .$clang->gT('Group Name is forced and Group Description is forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showgroupinfo" value="N" /></li>'; + break; + case 'description': + $editsurvey .= '<li>' + .$clang->gT('Group Name is forced off and Group Description is forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showgroupinfo" value="D" /></li>'; + break; + case 'none': + $editsurvey .= '<li>' + .$clang->gT('Both Group Name and Group Description are forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showgroupinfo" value="X" /></li>'; + break; + }; + + + + // Show {GROUPNAME} and/or {GROUPDESCRIPTION} block + switch($showqnumcode) + { + case 'none': + $editsurvey .= '<li>' + .$clang->gT('Both Question Number and Question Code are forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showqnumcode" value="0" /></li>'; + break; + case 'choose': $editsurvey .= '<li><label for="showqnumcode">'.$clang->gT('Show Question Number and/or Question Code')."</label>\n" + . '<select id="showqnumcode" name="showqnumcode">'; + $editsurvey .= '<option value="B"'; + if (isset($esrow['showqnumcode']) && $esrow['showqnumcode'] == 'B') + { + $editsurvey .= ' selected="selected"'; + }; + $editsurvey .= '>'.$clang->gT('Both')."</option>\n"; + $editsurvey .= '<option value="N"'; + if (isset($esrow['showqnumcode']) && $esrow['showqnumcode'] == 'N') + { + $editsurvey .= ' selected="selected"'; + }; + $editsurvey .= '>'.$clang->gT('Number')."</option>\n"; + $editsurvey .= '<option value="C"'; + if (isset($esrow['showqnumcode']) && $esrow['showqnumcode'] == 'C') + { + $editsurvey .= ' selected="selected"'; + }; + $editsurvey .= '>'.$clang->gT('Code')."</option>\n"; + $editsurvey .= '<option value="X"'; + if (isset($esrow['showqnumcode']) && $esrow['showqnumcode'] == 'X') + { + $editsurvey .= ' selected="selected"'; + }; + $editsurvey .= '>'.$clang->gT('Neither')."</option>\n" + . '</select></li>'; + break; + case 'number': + $editsurvey .= '<li>' + .$clang->gT('Question Number is forced on and Question Code is forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showqnumcode" value="N" /></li>'; + break; + case 'code': + $editsurvey .= '<li>' + .$clang->gT('Question Number is forced off and Question Code is forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showqnumcode" value="C" /></li>'; + break; + case 'both': + $editsurvey .= '<li>' + .$clang->gT('Both Question Number and Question Code are forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showqnumcode" value="B" /></li>'; + break; + }; + + + + // End Presention and navigation TAB $editsurvey .= "</ul></div>\n"; @@ -3286,10 +3429,103 @@ . "<select name='autoredirect' id='autoredirect'>\n" . "<option value='Y'>".$clang->gT("Yes")."</option>\n" . "<option value='N' selected='selected'>".$clang->gT("No")."</option>\n" - . "</select></li>" + . "</select></li>"; + // Show {THEREAREXQUESTIONS} block + switch($showXquestions) + { + case 'choose': $newsurvey .= '<li><label for="showXquestions">'.$clang->gT('Show "There are X questions in this survey"')."</label>\n" + . '<select id="showXquestions" name="showXquestions">' + . '<option value="Y" selected="selected">'.$clang->gT('Yes')."</option>\n" + . '<option value="N">'.$clang->gT('No')."</option>\n" + . '</select></li>'; + break; + case 'show': + $newsurvey .= '<li>'. + $clang->gT('Show "There are X questions in this survey"').' '.$clang->gT('is forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showXquestions" value="Y" /></li>'; + break; + case 'hide': + $newsurvey .= '<li>' + .$clang->gT('Show "There are X questions in this survey"').' '.$clang->gT('is forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showXquestions" value="N" /></li>'; + break; + }; + + + // Show {GROUPNAME} and/or {GROUPDESCRIPTION} block + switch($showgroupinfo) + { + case 'both': + $newsurvey .= '<li>' + .$clang->gT('Both Group Name and Group Description are forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showgroupinfo" value="B" /></li>'; + break; + case 'choose': $newsurvey .= '<li><label for="showgroupinfo">'.$clang->gT('Show Group Name and/or Group Description')."</label>\n" + . '<select id="showgroupinfo" name="showgroupinfo">' + . '<option value="B" selected="selected">'.$clang->gT('Both')."</option>\n" + . '<option value="N">'.$clang->gT('Name')."</option>\n" + . '<option value="D">'.$clang->gT('Description')."</option>\n" + . '<option value="X">'.$clang->gT('Neither')."</option>\n" + . '</select></li>'; + break; + case 'name': + $newsurvey .= '<li>' + .$clang->gT('Group Name is forced and Group Description is forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showgroupinfo" value="N" /></li>';uu + break; + case 'description': + $newsurvey .= '<li>' + .$clang->gT('Group Name is forced off and Group Description is forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showgroupinfo" value="D" /></li>'; + break; + case 'none': + $newsurvey .= '<li>' + .gT('Both Group Name and Group Description are forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showgroupinfo" value="X" /></li>'; + break; + }; + + + + // Show {GROUPNAME} and/or {GROUPDESCRIPTION} block + switch($showqnumcode) + { + case 'none': + $newsurvey .= '<li>' + .$clang->gT('Both Question Number and Question Code are forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showqnumcode" value="X" /></li>'; + break; + case 'choose': $newsurvey .= '<li><label for="showqnumcode">'.$clang->gT('Show Question Number and/or Question Code')."</label>\n" + . '<select id="showqnumcode" name="showqnumcode">' + . '<option value="B">'.$clang->gT('Both')."</option>\n" + . '<option value="N">'.$clang->gT('Number')."</option>\n" + . '<option value="C">'.$clang->gT('Code')."</option>\n" + . '<option value="X" selected="selected">'.$clang->gT('Neither')."</option>\n" + . '</select></li>'; + break; + case 'number': + $newsurvey .= '<li>' + .$clang->gT('Question Number is forced and Question Code is forced off by the LimeSurvey administrator') + .'<input type="hidden" name="showqnumcode" value="N" /></li>'; + break; + case 'code': + $newsurvey .= '<li>' + .$clang->gT('Question Number is forced off and Question Code is forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showqnumcode" value="C" /></li>'; + break; + case 'both': + $newsurvey .= '<li>' + .$clang->gT('Both Question Number and Question Code are forced on by the LimeSurvey administrator') + .'<input type="hidden" name="showqnumcode" value="B" /></li>'; + break; + }; + + + + //Default date format - . "<li><label for='dateformat'>".$clang->gT("Date format:")."</label>\n" + $newsurvey .= "<li><label for='dateformat'>".$clang->gT("Date format:")."</label>\n" . "<select size='1' id='dateformat' name='dateformat'>\n"; foreach (getDateFormatData() as $index=>$dateformatdata) { Index: admin/database.php =================================================================== --- admin/database.php (revision 8708) +++ admin/database.php (working copy) @@ -1070,6 +1070,9 @@ 'printanswers'=>$_POST['printanswers'], 'publicstatistics'=>$_POST['publicstatistics'], 'autoredirect'=>$_POST['autoredirect'], + 'showXquestions'=>$_POST['showXquestions'], + 'showgroupinfo'=>$_POST['showgroupinfo'], + 'showqnumcode'=>$_POST['showqnumcode'], 'allowprev'=>$_POST['allowprev'], 'listpublic'=>$_POST['public'], 'htmlemail'=>$_POST['htmlemail'], @@ -1317,6 +1320,9 @@ 'allowregister'=>$_POST['allowregister'], 'allowsave'=>$_POST['allowsave'], 'autoredirect'=>$_POST['autoredirect'], + 'showXquestions'=>$_POST['showXquestions'], + 'showgroupinfo'=>$_POST['showgroupinfo'], + 'showqnumcode'=>$_POST['showqnumcode'], 'allowprev'=>$_POST['allowprev'], 'printanswers'=>$_POST['printanswers'], // 'usetokens'=>$_POST['usetokens'], @@ -1443,4 +1449,4 @@ } } -?> \ No newline at end of file +?> Index: admin/install/create-mysql.sql =================================================================== --- admin/install/create-mysql.sql (revision 8708) +++ admin/install/create-mysql.sql (working copy) @@ -199,6 +199,9 @@ `allowsave` char(1) default 'Y', `autonumber_start` bigint(11) default '0', `autoredirect` char(1) default 'N', + `showXquestions` char(1) default 'Y', + `showgroupinfo` char(1) default 'B', + `showqnumcode` char(1) default '0', `allowprev` char(1) default 'Y', `printanswers` char(1) default 'N', `ipaddr` char(1) default 'N', Index: admin/install/create-postgres.sql =================================================================== --- admin/install/create-postgres.sql (revision 8708) +++ admin/install/create-postgres.sql (working copy) @@ -271,6 +271,9 @@ printanswers character(1) DEFAULT 'N'::bpchar, autonumber_start integer DEFAULT 0, autoredirect character(1) DEFAULT 'N'::bpchar, + showXquestions character(1) DEFAULT 'Y'::bpchar, + showgroupinfo character(1) DEFAULT 'B'::bpchar, + showqnumcode character(1) DEFAULT '0'::bpchar, allowprev character(1) DEFAULT 'Y'::bpchar, ipaddr character(1) DEFAULT 'N'::bpchar, refurl character(1) DEFAULT 'N'::bpchar, Index: admin/install/create-mssqlnative.sql =================================================================== --- admin/install/create-mssqlnative.sql (revision 8708) +++ admin/install/create-mssqlnative.sql (working copy) @@ -243,6 +243,9 @@ [allowsave] char(1) default 'Y', [autonumber_start] bigINT default '0', [autoredirect] char(1) default 'N', + [showXquestions] char(1) default 'Y', + [showgroupinfo] char(1) default 'B', + [showqnumcode] char(1) default '0', [allowprev] char(1) default 'Y', [printanswers] char(1) default 'N', [ipaddr] char(1) default 'N', Index: admin/install/create-mssql.sql =================================================================== --- admin/install/create-mssql.sql (revision 8708) +++ admin/install/create-mssql.sql (working copy) @@ -243,6 +243,9 @@ [allowsave] char(1) default 'Y', [autonumber_start] bigINT default '0', [autoredirect] char(1) default 'N', + [showXquestions] char(1) default 'Y', + [showgroupinfo] char(1) default 'B', + [showqnumcode] char(1) default '0', [allowprev] char(1) default 'Y', [printanswers] char(1) default 'N', [ipaddr] char(1) default 'N', showXquestions.diff (25,010 bytes) DIFF__dev__qcode_qnum.diff (59,570 bytes) Index: group.php =================================================================== --- group.php (revision 8796) +++ group.php (working copy) @@ -326,9 +326,13 @@ $qtypesarray = array(); +$qnumber = 0; + foreach ($_SESSION['fieldarray'] as $ia) { $qtypesarray[$ia[1]] = $ia[4]; + ++$qnumber; + $ia[9] = $qnumber; // incremental question count; if ($ia[5] == $gid) { Index: question.php =================================================================== --- question.php (revision 8796) +++ question.php (working copy) @@ -109,7 +109,7 @@ else {$currentquestion=$_SESSION['step']-1;} $ia=$_SESSION['fieldarray'][$currentquestion]; - +$ia[]=$_SESSION['step']; list($newgroup, $gid, $groupname, $groupdescription, $gl)=checkIfNewGroup($ia); // MANAGE CONDITIONAL QUESTIONS AND HIDDEN QUESTIONS Index: config-defaults.php =================================================================== --- config-defaults.php (revision 8796) +++ config-defaults.php (working copy) @@ -76,7 +76,7 @@ // has not been answered. 1=Allow, 0=Deny $deletenonvalues = 1; // By default, LimeSurvey does not save responses to conditional questions that haven't been answered/shown. To have LimeSurvey save these responses change this value to 0. $printanswershonorsconditions = 1; // Set to 1 if you want the participant printanswers feature to show only the questions that were displayed survey branching-logic -$shownoanswer = 1; // Show 'no answer' for non mandatory questions +$shownoanswer = 1; // Show 'no answer' for non mandatory questions ( 0 = no , 1 = yes , 2 = survey admin can choose ) $admintheme = 'default'; // This setting specifys the directory where the admin finds it theme/css style files, e.g. setting 'default' points to /admin/styles/default $defaulttemplate = 'default'; // This setting specifys the default theme used for the 'public list' of surveys @@ -425,6 +425,41 @@ $updatecheckperiod=7; +/* + * @var $showXquestions string allows you to control whether or not + * {THEREAREXQUESTIONS} is displayed (if it is included in a template) + * hide = always hide {THEREAREXQUESTIONS} + * show = always show {THEREAREXQUESTIONS} + * choose = allow survey admins to choose + / +$showXquestions = 'choose'; + + +/* + * @var $showgroupinfo string allows you to control whether or not + * {GROUPNAME} and/or {GROUPDESCRIPTION} are displayed (if they are + * included in a template) + * none = always hide both title and description + * name = always {GROUPNAME} only + * description = always show {GROUPDESCRIPTION} only + * both = always show both {GROUPNAME} and {GROUPDESCRIPTION} + * choose = allow survey admins to choose + / +$showgroupinfo = 'choose'; + + +/* + * @var $showqnumcode string allows you to control whether or not + * {QUESTION_NUMBER} and/or {QUESTION_CODE} are displayed (if they + * are included in a template) + * none = always hide both {QUESTION_NUMBER} and {QUESTION_CODE} + * code = always show {QUESTION_CODE} only + * number = always show {QUESTION_NUMBER} only + * both = always show both {QUESTION_NUMBER} and {QUESTION_CODE} + * choose = allow survey admins to choose + / +$showqnumcode = 'choose'; + //DO NOT EVER CHANGE THE FOLLOWING LINE --------------- require_once(dirname(__FILE__).'/config.php'); //----------------------------------------------------- Index: qanda.php =================================================================== --- qanda.php (revision 8796) +++ qanda.php (working copy) @@ -34,6 +34,7 @@ $ia[6] => mandatory Y \|\| N * $ia[7] => conditions exist for this question * $ia[8] => other questions have conditions which rely on this question (including array_filter and array_filter_exclude attributes) + * $ia[9] => incremental question count (used by {QUESTION_NUMBER}) * * $conditions element structure * $condition[n][0] => qid = question id @@ -46,6 +47,15 @@ * $condition[n][7] => scenario NEW BY R.L.J. van den Burg / +if($shownoanswer > 0 && $thissurvey['shownoanswer'] != 'N') +{ + define('SHOW_NO_ANSWER',1); +} +else +{ + define('SHOW_NO_ANSWER',0); +}; + function retrieveConditionInfo($ia) { //This function returns an array containing all related conditions @@ -474,7 +484,7 @@ function retrieveAnswers($ia, $notanswered=null, $notvalidated=null) { //globalise required config variables - global $dbprefix, $shownoanswer, $clang; //These are from the config-defaults.php file + global $dbprefix, $clang; //These are from the config-defaults.php file global $thissurvey, $gl; //These are set by index.php global $connect; @@ -513,6 +523,8 @@ $question_text = array( 'all' => '' // All has been added for backwards compatibility with templates that use question_start.pstpl (now redundant) ,'text' => $qtitle + ,'code' => $ia[2] + ,'number' => $ia[9] ,'help' => '' ,'mandatory' => '' ,'man_message' => '' @@ -1414,7 +1426,7 @@ // --------------------------------------------------------------- function do_5pointchoice($ia) { - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { @@ -1436,7 +1448,7 @@ $answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n<label for=\"answer$ia[1]$fp\" class=\"answertext\">$fp</label>\n\t</li>\n"; } - if ($ia[6] != "Y" && $shownoanswer == 1) // Add "No Answer" option if question is not mandatory + if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) // Add "No Answer" option if question is not mandatory { $answer .= "\t<li>\n<input class=\"radio\" type=\"radio\" name=\"$ia[1]\" id=\"NoAnswer\" value=\"\""; if (!$_SESSION[$ia[1]]) @@ -1686,7 +1698,7 @@ function do_list_dropdown($ia) { global $dbprefix, $dropdownthreshold, $lwcdropdowns, $connect; - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { $checkconditionFunction = "checkconditions"; @@ -1843,7 +1855,7 @@ $answer .= ' <option value="-oth-"'.$opt_select.'>'.$othertext."</option>\n"; } - if ((isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] != '') && (!isset($defexists) \|\| !$defexists) && $ia[6] != 'Y' && $shownoanswer == 1) + if ((isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] != '') && (!isset($defexists) \|\| !$defexists) && $ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= '<option value="">'.$clang->gT('No answer')."</option>\n"; } @@ -1953,7 +1965,7 @@ function do_list_radio($ia) { global $dbprefix, $dropdownthreshold, $lwcdropdowns, $connect, $clang; - global $shownoanswer, $thissurvey; + global $thissurvey; if ($ia[8] == 'Y') @@ -2015,7 +2027,7 @@ } if (isset($other) && $other=='Y') {$anscount++;} //Count up for the Other answer - if ($ia[6] != 'Y' && $shownoanswer == 1) {$anscount++;} //Count up if "No answer" is showing + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) {$anscount++;} //Count up if "No answer" is showing $wrapper = setup_columns($dcols , $anscount); $answer = $wrapper['whole-start']; @@ -2139,7 +2151,7 @@ } } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { if (((!isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] == '') && (!isset($defexists) \|\| !$defexists)) \|\| ($_SESSION[$ia[1]] == ' ' && (!isset($defexists) \|\| !$defexists))) { @@ -2212,7 +2224,7 @@ function do_listwithcomment($ia) { global $maxoptionsize, $dbprefix, $dropdownthreshold, $lwcdropdowns; - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { @@ -2274,7 +2286,7 @@ '; } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { if (((!isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] == '') && (!isset($defexists) \|\| !$defexists)) \|\|($_SESSION[$ia[1]] == ' ' && (!isset($defexists) \|\| !$defexists))) { @@ -2344,7 +2356,7 @@ $maxoptionsize = strlen($ansrow['answer']); } } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { if (((!isset($_SESSION[$ia[1]]) \|\| $_SESSION[$ia[1]] == '') && (!isset($defexists) \|\| !$defexists)) \|\|($_SESSION[$ia[1]] == ' ' && (!isset($defexists) \|\| !$defexists))) { @@ -4519,7 +4531,7 @@ // --------------------------------------------------------------- function do_yesno($ia) { - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { @@ -4550,7 +4562,7 @@ $answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n<label for=\"answer{$ia[1]}N\" class=\"answertext\" >\n\t".$clang->gT('No')."\n</label>\n\t</li>\n"; // --> END NEW FEATURE - SAVE - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= "\t<li>\n<input class=\"radio\" type=\"radio\" name=\"{$ia[1]}\" id=\"answer{$ia[1]}\" value=\"\""; if ($_SESSION[$ia[1]] == '') @@ -4573,7 +4585,7 @@ // --------------------------------------------------------------- function do_gender($ia) { - global $shownoanswer, $clang; + global $clang; if ($ia[8] == 'Y') { @@ -4604,7 +4616,7 @@ } $answer .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n<label for=\"answer$ia[1]M\" class=\"answertext\">".$clang->gT('Male')."</label>\n\t</li>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { / columns now done by CSS if ($dcols > 2) @@ -4648,7 +4660,7 @@ / function do_array_5point($ia) { - global $dbprefix, $shownoanswer, $notanswered, $thissurvey, $clang; + global $dbprefix, $notanswered, $thissurvey, $clang; if ($ia[8] == 'Y') { @@ -4672,7 +4684,7 @@ } $cellwidth = 5; // number of columns - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { ++$cellwidth; // add another column } @@ -4707,7 +4719,7 @@ $odd_even = alternation($odd_even); $answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n"; @@ -4720,7 +4732,7 @@ $answer .= "\t<th>$xc</th>\n"; } if ($right_exists) {$answer .= "\t<td width='$answerwidth%'> </td>\n";} - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -4783,7 +4795,7 @@ } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer_t_content .= "\t<td>\n<label for=\"answer$myfname-\">" ."\n\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" title=\"".$clang->gT('No answer').'"'; @@ -4815,7 +4827,7 @@ / function do_array_10point($ia) { - global $dbprefix, $shownoanswer, $notanswered, $thissurvey, $clang; + global $dbprefix, $notanswered, $thissurvey, $clang; if ($ia[8] == 'Y') { @@ -4840,7 +4852,7 @@ $answerwidth = 20; } $cellwidth = 10; // number of columns - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { ++$cellwidth; // add another column } @@ -4867,7 +4879,7 @@ $odd_even = alternation($odd_even); $answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth$\" />\n"; @@ -4879,7 +4891,7 @@ { $answer .= "\t<th>$xc</th>\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -4926,7 +4938,7 @@ // --> END NEW FEATURE - SAVE } - if ($ia[6] != "Y" && $shownoanswer == 1) + if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) { $answer_t_content .= "\t<td>\n<label for=\"answer$myfname-\">\n" ."\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" title=\"".$clang->gT('No answer')."\""; @@ -4951,7 +4963,7 @@ // --------------------------------------------------------------- function do_array_yesnouncertain($ia) { - global $dbprefix, $shownoanswer, $notanswered, $thissurvey, $clang; + global $dbprefix, $notanswered, $thissurvey, $clang; if ($ia[8] == 'Y') { @@ -4975,7 +4987,7 @@ $answerwidth = 20; } $cellwidth = 3; // number of columns - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { ++$cellwidth; // add another column } @@ -5000,7 +5012,7 @@ $odd_even = alternation($odd_even); $answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n"; @@ -5011,7 +5023,7 @@ . "\t<th>".$clang->gT('Yes')."</th>\n" . "\t<th>".$clang->gT('Uncertain')."</th>\n" . "\t<th>".$clang->gT('No')."</th>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -5082,7 +5094,7 @@ } $answer_t_content .= "\" />\n\t</td>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer_t_content .= "\t<td>\n\t<label for=\"answer$myfname-\">\n" . "\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" title=\"".$clang->gT('No answer')."\""; @@ -5106,7 +5118,6 @@ function do_array_increasesamedecrease($ia) { global $dbprefix, $thissurvey, $clang; - global $shownoanswer; global $notanswered; if ($ia[8] == 'Y') @@ -5130,7 +5141,7 @@ $answerwidth = 20; } $cellwidth = 3; // number of columns - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { ++$cellwidth; // add another column } @@ -5162,7 +5173,7 @@ $odd_even = alternation($odd_even); $answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n"; @@ -5174,7 +5185,7 @@ . "\t<th>".$clang->gT('Increase')."</th>\n" . "\t<th>".$clang->gT('Same')."</th>\n" . "\t<th>".$clang->gT('Decrease')."</th>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -5251,7 +5262,7 @@ if (isset($_SESSION[$myfname])) {$answer_body .= $_SESSION[$myfname];} $answer_body .= "\" />\n\t</td>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer_body .= "\t<td>\n" . "<label for=\"answer$myfname-\">\n" @@ -5276,7 +5287,6 @@ function do_array_flexible($ia) { global $dbprefix, $connect, $thissurvey, $clang; - global $shownoanswer; global $repeatheadings; global $notanswered; global $minrepeatheadings; @@ -5342,7 +5352,7 @@ $fn=1; $numrows = count($labelans); - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { ++$numrows; } @@ -5361,7 +5371,7 @@ $answer_head .= "\t<th>".$ld."</th>\n"; } if ($right_exists) {$answer_head .= "\t<td> </td>\n";} - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory and we can show "no answer" + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory and we can show "no answer" { $answer_head .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -5383,7 +5393,7 @@ { $answer .= "\t<th>".$ld."</th>\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory and we can show "no answer" + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory and we can show "no answer" { $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; } @@ -5450,7 +5460,7 @@ $answer .= "\t<td class=\"answertextright\"> </td>\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= "\t<td>\n<label for=\"answer$myfname-\">\n" ."\t<input class=\"radio\" type=\"radio\" name=\"$myfname\" value=\"\" id=\"answer$myfname-\" title=\"".$clang->gT('No answer').'"'; @@ -5483,7 +5493,7 @@ $odd_even = alternation($odd_even); $answer_cols .= "<col class=\"answertextright $odd_even\" width=\"$answerwidth%\" />\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory { $odd_even = alternation($odd_even); $answer_cols .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n"; @@ -5624,7 +5634,6 @@ function do_array_multitext($ia) { global $dbprefix, $connect, $thissurvey, $clang; - global $shownoanswer; global $repeatheadings; global $notanswered; global $minrepeatheadings; @@ -5684,7 +5693,7 @@ $labelcode[]=$lrow['title']; } $numrows=count($labelans); - if ($ia[6] != 'Y' && $shownoanswer == 1) {$numrows++;} + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) {$numrows++;} $cellwidth=$columnswidth/$numrows; $cellwidth=sprintf('%02d', $cellwidth); @@ -5841,7 +5850,6 @@ function do_array_multiflexi($ia) { global $dbprefix, $connect, $thissurvey, $clang; - global $shownoanswer; global $repeatheadings; global $notanswered; global $minrepeatheadings; @@ -5924,7 +5932,7 @@ $labelcode[]=$lrow['title']; } $numrows=count($labelans); - if ($ia[6] != 'Y' && $shownoanswer == 1) {$numrows++;} + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) {$numrows++;} $cellwidth=$columnswidth/$numrows; $cellwidth=sprintf('%02d', $cellwidth); @@ -6145,7 +6153,6 @@ function do_array_flexiblecolumns($ia) { global $dbprefix; - global $shownoanswer; global $notanswered, $clang; if ($ia[8] == 'Y') @@ -6171,7 +6178,7 @@ $labelcode[]=$lrow['code']; $labels[]=array("answer"=>$lrow['answer'], "code"=>$lrow['code']); } - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $labelcode[]=''; $labelans[]=$clang->gT('No answer'); @@ -6298,7 +6305,6 @@ function do_array_flexible_dual($ia) { global $dbprefix, $connect, $thissurvey, $clang; - global $shownoanswer; global $repeatheadings; global $notanswered; global $minrepeatheadings; @@ -6374,7 +6380,7 @@ } } $numrows=count($labelans) + count($labelans1); - if ($ia[6] != "Y" && $shownoanswer == 1) {$numrows++;} + if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) {$numrows++;} $cellwidth=$columnswidth/$numrows; $cellwidth=sprintf("%02d", $cellwidth); @@ -6465,7 +6471,7 @@ { $mycolumns .= "\n\t<col class=\"seperator\" />\n\n"; } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory and we can show "no answer" + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory and we can show "no answer" { $myheader2 .= "\t<th>".$clang->gT('No answer')."</th>\n"; $odd_even = alternation($odd_even); @@ -6492,7 +6498,7 @@ $myheader1 .= "\t<td> </td>\n"; - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $myheader1 .= "\t<th> </th>\n"; } @@ -6532,7 +6538,7 @@ $answer .= "\t<th>".$ld."</th>\n"; } } - if ($ia[6] != 'Y' && $shownoanswer == 1) //Question is not mandatory and we can show "no answer" + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory and we can show "no answer" { $answer .= "\t<td> </td>\n"; // separator $answer .= "\t<th>".$clang->gT('No answer')."</th>\n"; @@ -6639,7 +6645,7 @@ $answer .= "\t<td> </td>\n"; // separator } - if ($ia[6] != "Y" && $shownoanswer == 1) + if ($ia[6] != "Y" && SHOW_NO_ANSWER == 1) { $answer .= "\t<td>\n" . "<label for='answer$myfname-'>\n" @@ -6850,7 +6856,7 @@ $answer .= '>'.$lrow['title']."</option>\n"; } // If not mandatory and showanswer, show no ans - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= "\t<option value=\"\" "; if (!isset($_SESSION[$myfname]) \|\| $_SESSION[$myfname] == '') @@ -6904,7 +6910,7 @@ $answer .= '>'.$lrow1['title']."</option>\n"; } // If not mandatory and showanswer, show no ans - if ($ia[6] != 'Y' && $shownoanswer == 1) + if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) { $answer .= "\t<option value='' "; if (!isset($_SESSION[$myfname1]) \|\| $_SESSION[$myfname1] == '') Index: version.php =================================================================== --- version.php (revision 8796) +++ version.php (working copy) @@ -1,7 +1,7 @@ <?php $versionnumber = "1.90beta"; -$dbversionnumber = 143; +$dbversionnumber = 144; $buildnumber = ''; -?> \ No newline at end of file +?> Index: common.php =================================================================== --- common.php (revision 8796) +++ common.php (working copy) @@ -2805,7 +2805,8 @@ global $percentcomplete, $move; global $groupname, $groupdescription; global $question; - global $questioncode, $answer, $navigator; + global $showXquestions, $showgroupinfo, $showqnumcode; + global $answer, $navigator; global $help, $totalquestions, $surveyformat; global $completed, $register_errormsg; global $notanswered, $privacy, $surveyid; @@ -2867,9 +2868,36 @@ if (strpos($line, "{WELCOME}") !== false) $line=str_replace("{WELCOME}", $thissurvey['welcome'], $line); if (strpos($line, "{LANGUAGECHANGER}") !== false) $line=str_replace("{LANGUAGECHANGER}", $languagechanger, $line); if (strpos($line, "{PERCENTCOMPLETE}") !== false) $line=str_replace("{PERCENTCOMPLETE}", $percentcomplete, $line); - if (strpos($line, "{GROUPNAME}") !== false) $line=str_replace("{GROUPNAME}", $groupname, $line); - if (strpos($line, "{GROUPDESCRIPTION}") !== false) $line=str_replace("{GROUPDESCRIPTION}", $groupdescription, $line); + if( + $showgroupinfo == 'both' \|\| + $showgroupinfo == 'name' \|\| + ($showgroupinfo == 'choose' && !isset($thissurvey['showgroupinfo'])) \|\| + ($showgroupinfo == 'choose' && $thissurvey['showgroupinfo'] == 'B') \|\| + ($showgroupinfo == 'choose' && $thissurvey['showgroupinfo'] == 'N') + ) + { + if (strpos($line, "{GROUPNAME}") !== false) $line=str_replace("{GROUPNAME}", $groupname, $line); + } + else + { + if (strpos($line, "{GROUPNAME}") !== false) $line=str_replace("{GROUPNAME}", '' , $line); + }; + if( + $showgroupinfo == 'both' \|\| + $showgroupinfo == 'description' \|\| + ($showgroupinfo == 'choose' && !isset($thissurvey['showgroupinfo'])) \|\| + ($showgroupinfo == 'choose' && $thissurvey['showgroupinfo'] == 'B') \|\| + ($showgroupinfo == 'choose' && $thissurvey['showgroupinfo'] == 'D') + ) + { + if (strpos($line, "{GROUPDESCRIPTION}") !== false) $line=str_replace("{GROUPDESCRIPTION}", $groupdescription, $line); + } + else + { + if (strpos($line, "{GROUPDESCRIPTION}") !== false) $line=str_replace("{GROUPDESCRIPTION}", '' , $line); + }; + if (is_array($question)) { if (strpos($line, "{QUESTION}") !== false) @@ -2894,10 +2922,39 @@ if (strpos($line, '{QUESTION_MAN_CLASS}') !== false) $line=str_replace('{QUESTION_MAN_CLASS}', $question['man_class'], $line); if (strpos($line, "{QUESTION_INPUT_ERROR_CLASS}") !== false) $line=str_replace("{QUESTION_INPUT_ERROR_CLASS}", $question['input_error_class'], $line); + if( + $showqnumcode == 'both' \|\| + $showqnumcode == 'number' \|\| + ($showqnumcode == 'choose' && !isset($thissurvey['showqnumcode'])) \|\| + ($showqnumcode == 'choose' && $thissurvey['showqnumcode'] == 'B') \|\| + ($showqnumcode == 'choose' && $thissurvey['showqnumcode'] == 'N') + ) + { + if (strpos($line, "{QUESTION_NUMBER}") !== false) $line=str_replace("{QUESTION_NUMBER}", $question['number'], $line); + } + else + { + if (strpos($line, "{QUESTION_NUMBER}") !== false) $line=str_replace("{QUESTION_NUMBER}", '' , $line); + }; + if( + $showqnumcode == 'both' \|\| + $showqnumcode == 'code' \|\| + ($showqnumcode == 'choose' && !isset($thissurvey['showqnumcode'])) \|\| + ($showqnumcode == 'choose' && $thissurvey['showqnumcode'] == 'B') \|\| + ($showqnumcode == 'choose' && $thissurvey['showqnumcode'] == 'C') + ) + { + if (strpos($line, "{QUESTION_CODE}") !== false) $line=str_replace("{QUESTION_CODE}", $question['code'], $line); + } + else + { + if (strpos($line, "{QUESTION_CODE}") !== false) $line=str_replace("{QUESTION_CODE}", '' , $line); + }; + if (strpos($line, "{QUESTION_CODE}") !== false) $line=str_replace("{QUESTION_CODE}", $question['code'], $line); if (strpos($line, "{ANSWER}") !== false) $line=str_replace("{ANSWER}", $answer, $line); $totalquestionsAsked = $totalquestions - $totalBoilerplatequestions; - if ($totalquestionsAsked < 1) +/* if ($totalquestionsAsked < 1) { if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There are no questions in this survey"), $line); //Singular } @@ -2909,6 +2966,30 @@ { if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There are {NUMBEROFQUESTIONS} questions in this survey."), $line); //Note this line MUST be before {NUMBEROFQUESTIONS} } +*/ + if( + $showXquestions == 'show' \|\| + ($showXquestions == 'choose' && !isset($thissurvey['showXquestions'])) \|\| + ($showXquestions == 'choose' && $thissurvey['showXquestions'] == 'Y') + ) + { + if ($totalquestionsAsked < 1) + { + if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There are no questions in this survey"), $line); //Singular + } + if ($totalquestionsAsked == 1) + { + if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There is 1 question in this survey"), $line); //Singular + } + else + { + if (strpos($line, "{THEREAREXQUESTIONS}") !== false) $line=str_replace("{THEREAREXQUESTIONS}", $clang->gT("There are {NUMBEROFQUESTIONS} questions in this survey."), $line); //Note this line MUST be before {NUMBEROFQUESTIONS} + }; + } + else + { + if (strpos($line, '{THEREAREXQUESTIONS}') !== false) $line=str_replace('{THEREAREXQUESTIONS}' , '' , $line); + }; if (strpos($line, "{NUMBEROFQUESTIONS}") !== false) $line=str_replace("{NUMBEROFQUESTIONS}", $totalquestionsAsked, $line); if (strpos($line, "{TOKEN}") !== false) { Index: survey.php =================================================================== --- survey.php (revision 8796) +++ survey.php (working copy) @@ -251,8 +251,11 @@ { $gid=$gl[0]; $groupUnconditionnalQuestionsCount[$gid]=0; + $qnumber = 0; foreach ($_SESSION['fieldarray'] as $ia) { + ++$qnumber; + $ia[9] = $qnumber; // incremental question count; if ($ia[5] == $gid) { $qidattributes=getQuestionAttributes($ia[0]); @@ -260,6 +263,7 @@ continue; } $qtypesarray[$ia[1]] = $ia[4]; + list($plus_qanda, $plus_inputnames)=retrieveAnswers($ia); if ($plus_qanda) { Index: admin/database.php =================================================================== --- admin/database.php (revision 8796) +++ admin/database.php (working copy) @@ -1070,6 +1070,10 @@ 'printanswers'=>$_POST['printanswers'], 'publicstatistics'=>$_POST['publicstatistics'], 'autoredirect'=>$_POST['autoredirect'], + 'showXquestions'=>$_POST['showXquestions'], + 'showgroupinfo'=>$_POST['showgroupinfo'], + 'showqnumcode'=>$_POST['showqnumcode'], + 'shownoanswer'=>$_POST['shownoanswer'], 'allowprev'=>$_POST['allowprev'], 'listpublic'=>$_POST['public'], 'htmlemail'=>$_POST['htmlemail'], @@ -1317,6 +1321,10 @@ 'allowregister'=>$_POST['allowregister'], 'allowsave'=>$_POST['allowsave'], 'autoredirect'=>$_POST['autoredirect'], + 'showXquestions'=>$_POST['showXquestions'], + 'showgroupinfo'=>$_POST['showgroupinfo'], + 'showqnumcode'=>$_POST['showqnumcode'], + 'shownoanswer'=>$_POST['shownoanswer'], 'allowprev'=>$_POST['allowprev'], 'printanswers'=>$_POST['printanswers'], // 'usetokens'=>$_POST['usetokens'], @@ -1443,4 +1451,4 @@ } } -?> \ No newline at end of file +?> Index: admin/html.php =================================================================== --- admin/html.php (revision 8796) +++ admin/html.php (working copy) @@ -2689,6 +2689,172 @@ . "</select></li>"; + // Show {THEREAREXQUESTIONS} block + switch($showXquestions) + { + case 'show': + $editsurvey .= '<li><label for="dis_showXquestions">' + . $clang->gT('Show "There are X questions in this survey"') + . '</label><input type="text" name="dis_showXquestions" id="dis_showXquestions" disabled="disabled" value="' + . $clang->gT('Yes (Forced by the system administrator)').'" size="50" />'; + break; + case 'hide': + $editsurvey .= '<li><label for="dis_showXquestions">' + . $clang->gT('Show "There are X questions in this survey"') + . '</label><input type="text" name="dis_showXquestions" id="dis_showXquestions" disabled="disabled" value="' + . $clang->gT('No (Forced by the system administrator)').'" size="50" />'; + break; + case 'choose': + default: + $sel_showxq = array( 'Y' => '' , 'N' => '' ); + if(isset($esrow['showXquestions'])) + { + $set_showxq = $esrow['showXquestions']; + $sel_showxq[$set_showxq] = ' selected="selected"'; + } + if(empty($sel_showxq['Y']) && empty($sel_showxq['N'])) + { + $sel_showxq['Y'] = ' selected="selected"'; + }; + $editsurvey .= '<li><label for="showXquestions">'.$clang->gT('Show "There are X questions in this survey"')."</label>\n" + . '<select id="showXquestions" name="showXquestions">' + . '<option value="Y"'.$sel_showxq['Y'].'>'.$clang->gT('Yes')."</option>\n" + . '<option value="N"'.$sel_showxq['N'].'>'.$clang->gT('No')."</option>\n" + . '</select></li>'; + unset($sel_showxq,$set_showxq); + break; + } + + + // Show {GROUPNAME} and/or {GROUPDESCRIPTION} block + switch($showgroupinfo) + { + case 'both': + $editsurvey .= '<li><label for="dis_showgroupinfo">' + . $clang->gT('Show Group Name and/or Group Description') + . '</label><input type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="' + . $clang->gT('Show both (Forced by the system administrator)').'" size="50" />'; + break; + case 'name': + $editsurvey .= '<li><label for="dis_showgroupinfo">' + . $clang->gT('Show Group Name and/or Group Description') + . '</label><input type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="' + . $clang->gT('Show group name only (Forced by the system administrator)').'" size="50" />'; + break; + case 'description': + $editsurvey .= '<li><label for="dis_showgroupinfo">' + . $clang->gT('Show Group Name and/or Group Description') + . '</label><input type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="' + . $clang->gT('Show group description only (Forced by the system administrator)').'" size="50" />'; + break; + case 'none': + $editsurvey .= '<li><label for="dis_showgroupinfo">' + . $clang->gT('Show Group Name and/or Group Description') + . '</label><input type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="' + . $clang->gT('Hide both (Forced by the system administrator)').'" size="50" />'; + break; + case 'choose': + default: + $sel_showgri = array( 'B' => '' , 'D' => '' , 'N' => '' , 'X' => '' ); + if(isset($esrow['showgroupinfo'])) + { + $set_showgri = $esrow['showgroupinfo']; + $sel_showgri[$set_showgri] = ' selected="selected"'; + } + if(empty($sel_showgri['B']) && empty($sel_showgri['D']) && empty($sel_showgri['N']) && empty($sel_showgri['X']) ) + { + $sel_showgri['C'] = ' selected="selected"'; + }; + $editsurvey .= '<li><label for="showgroupinfo">'.$clang->gT('Show Group Name and/or Group Description')."</label>\n" + . '<select id="showgroupinfo" name="showgroupinfo">' + . '<option value="B"'.$sel_showgri['B'].'>'.$clang->gT('Show both')."</option>\n" + . '<option value="N"'.$sel_showgri['N'].'>'.$clang->gT('Show group name only')."</option>\n" + . '<option value="D"'.$sel_showgri['D'].'>'.$clang->gT('Show group description only')."</option>\n" + . '<option value="X"'.$sel_showgri['X'].'>'.$clang->gT('Hide both')."</option>\n" + . '</select></li>'; + unset($sel_showgri,$set_showgri); + break; + }; + + + + // Show {QUESTION_CODE} and/or {QUESTION_NUMBER} block + switch($showqnumcode) + { + case 'none': + $editsurvey .= '<li><label for="dis_showqnumcode">' + . $clang->gT('Show Question Number and/or Question Code') + . '</label><input type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="' + . $clang->gT('Hide both (Forced by the system administrator)').'" size="50" />'; + break; + case 'number': + $editsurvey .= '<li><label for="dis_showqnumcode">' + . $clang->gT('Show Question Number and/or Question Code') + . '</label><input type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="' + . $clang->gT('Show question number only (Forced by the system administrator)').'" size="50" />'; + break; + case 'code': + $editsurvey .= '<li><label for="dis_showqnumcode">' + . $clang->gT('Show Question Number and/or Question Code') + . '</label><input type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="' + . $clang->gT('Show question code only (Forced by the system administrator)').'" size="50" />'; + break; + case 'both': + $editsurvey .= '<li><label for="dis_showqnumcode">' + . $clang->gT('Show Question Number and/or Question Code') + . '</label><input type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="' + . $clang->gT('Show both (Forced by the system administrator)').'" size="50" />'; + break; + case 'choose': + default: + $sel_showqnc = array( 'B' => '' , 'C' => '' , 'N' => '' , 'X' => '' ); + if(isset($esrow['showqnumcode'])) + { + $set_showqnc = $esrow['showqnumcode']; + $sel_showqnc[$set_showqnc] = ' selected="selected"'; + } + if(empty($sel_showqnc['B']) && empty($sel_showqnc['C']) && empty($sel_showqnc['N']) && empty($sel_showqnc['X']) ) + { + $sel_showqnc['C'] = ' selected="selected"'; + }; + $editsurvey .= '<li><label for="showqnumcode">'.$clang->gT('Show Question Number and/or Question Code')."</label>\n" + . '<select id="showqnumcode" name="showqnumcode">' + . '<option value="B"'.$sel_showqnc['B'].'>'.$clang->gT('Show both')."</option>\n" + . '<option value="N"'.$sel_showqnc['N'].'>'.$clang->gT('Show question number only')."</option>\n" + . '<option value="C"'.$sel_showqnc['C'].'>'.$clang->gT('Show question Code only')."</option>\n" + . '<option value="X"'.$sel_showqnc['X'].'>'.$clang->gT('Hide both')."</option>\n" + . '</select></li>'; + unset($sel_showqnc,$set_showqnc); + break; + }; + + + // Show "No Answer" block + switch($shownoanswer) + { + case 0: + $editsurvey .= '<li>'.$clang->gT('"Show no answer" is forced off by the system adminstrator.').'</li>'; + break; + case 2: + $editsurvey .= '<li><label for="shownoanswer">'.$clang->gT('Show No Answer')."</label>\n" + . '<select id="shownoanswer" name="shownoanswer">'; + $editsurvey .= '<option value="Y"'; + if ( !isset($esrow['shownoanswer']) \|\| $esrow['shownoanswer'] == 'Y') {$editsurvey .= ' selected="selected"';} + $editsurvey .= '>'.$clang->gT('Yes')."</option>\n"; + $editsurvey .= '<option value="N"'; + if ( isset($esrow['shownoanswer']) && $esrow['shownoanswer'] == 'N') {$editsurvey .= ' selected="selected"';} + $editsurvey .= '>'.$clang->gT('No')."</option>\n" + . '</select></li>'; + break; + default: + $editsurvey .= '<li>'.$clang->gT('"Show no answer" is forced on by the system adminstrator.').'</li>'; + break; + }; + + + + + // End Presention and navigation TAB $editsurvey .= "</ul></div>\n"; @@ -3286,10 +3452,140 @@ . "<select name='autoredirect' id='autoredirect'>\n" . "<option value='Y'>".$clang->gT("Yes")."</option>\n" . "<option value='N' selected='selected'>".$clang->gT("No")."</option>\n" - . "</select></li>" + . "</select></li>"; + // Show {THEREAREXQUESTIONS} block + switch($showXquestions) + { + case 'show': + $newsurvey .= '<li><label for "dis_showXquestions">'.$clang->gT('Show "There are X questions in this survey"').'</label>' + . '<input type="text" disabled="disabled" name="dis_showXquestions" value="' + . $clang->gT('Yes (Forced on by the system administrator)').'" size="50" />'; + break; + case 'hide': + $newsurvey .= '<li><label for "dis_showXquestions">'. $clang->gT('Show "There are X questions in this survey"').'</label>' + . '<input type="text" disabled="disabled" name="dis_showXquestions" value="' + . $clang->gT('No (Forced by the system administrator)').'" size="50" />'; + break; + case 'choose': + default: + $newsurvey .= '<li><label for="showXquestions">'.$clang->gT('Show "There are X questions in this survey"')."</label>\n" + . '<select id="showXquestions" name="showXquestions">' + . '<option value="Y" selected="selected">'.$clang->gT('Yes')."</option>\n" + . '<option value="N">'.$clang->gT('No')."</option>\n" + . '</select>'; + break; + }; + $newsurvey .= '</li>'; + + + // Show {GROUPNAME} and/or {GROUPDESCRIPTION} block + switch($showgroupinfo) + { + case 'both': + $newsurvey .= '<li><label for "dis_showgroupinfo">' + . $clang->gT('Show Group Name and/or Group Description') + . '</label><input type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="' + . $clang->gT('Show both (Forced by the system administrator)').'" size="50" />'; + break; + case 'name': + $newsurvey .= '<li><label for "dis_showgroupinfo">' + . $clang->gT('Show Group Name and/or Group Description') + . '</label><input type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="' + . $clang->gT('Show group name only (Forced by the system administrator)').'" size="50" />'; + break; + case 'description': + $newsurvey .= '<li><label for "dis_showgroupinfo">' + . $clang->gT('Show Group Name and/or Group Description') + . '</label><input type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="' + . $clang->gT('Show group description only (Forced by the system administrator)').'" size="50" />'; + break; + case 'none': + $newsurvey .= '<li><label for="dis_showgroupinfo">' + . $clang->gT('Show Group Name and/or Group Description') + . '</label><input type="text" name="dis_showgroupinfo" id="dis_showgroupinfo" disabled="disabled" value="' + . $clang->gT('Hide both (Forced by the system administrator)').'" size="50" />'; + break; + case 'choose': + default: + $newsurvey .= '<li><label for="showgroupinfo">'.$clang->gT('Show Group Name and/or Group Description')."</label>\n" + . '<select id="showgroupinfo" name="showgroupinfo">' + . '<option value="B" selected="selected">'.$clang->gT('Show both')."</option>\n" + . '<option value="N">'.$clang->gT('Show group name only')."</option>\n" + . '<option value="D">'.$clang->gT('Show group description only')."</option>\n" + . '<option value="X">'.$clang->gT('Hide both')."</option>\n" + . '</select></li>'; + break; + }; + + + + // Show {QUESTION_CODE} and/or {QUESTION_NUMBER} block + switch($showqnumcode) + { + case 'none': + $newsurvey .= '<li><label for="dis_showqnumcode">' + . $clang->gT('Show Question Number and/or Question Code') + . '</label><input type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="' + . $clang->gT('Hide both (Forced by the system administrator)').'" size="50" />'; + break; + case 'number': + $newsurvey .= '<li><label for="dis_showqnumcode">' + . $clang->gT('Show Question Number and/or Question Code') + . '</label><input type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="' + . $clang->gT('Show question number only (Forced by the system administrator)').'" size="50" />'; + break; + case 'code': + $newsurvey .= '<li><label for="dis_showqnumcode">' + . $clang->gT('Show Question Number and/or Question Code') + . '</label><input type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="' + . $clang->gT('Show question code only (Forced by the system administrator)').'" size="50" />'; + break; + case 'both': + $newsurvey .= '<li><label for="dis_showqnumcode">' + . $clang->gT('Show Question Number and/or Question Code') + . '</label><input type="text" name="dis_showqnumcode" id="dis_showqnumcode" disabled="disabled" value="' + . $clang->gT('Show both (Forced by the system administrator)').'" size="50" />'; + break; + case 'choose': + default: + $newsurvey .= '<li><label for="showqnumcode">'.$clang->gT('Show Question Number and/or Question Code')."</label>\n" + . '<select id="showqnumcode" name="showqnumcode">' + . '<option value="B">'.$clang->gT('Show both')."</option>\n" + . '<option value="N">'.$clang->gT('Show question number only')."</option>\n" + . '<option value="C">'.$clang->gT('Show question code only')."</option>\n" + . '<option value="X" selected="selected">'.$clang->gT('Hide both')."</option>\n" + . '</select></li>'; + break; + }; + + + // Show no answer + switch($shownoanswer) + { + case 0: + $newsurvey .= '<li>'.$clang->gT('"Show no answer" is forced off by the system adminstrator.').'</li>'; + break; + + case 2: + $newsurvey .= '<li><label for="shownoanswer">'.$clang->gT('Show no answer?')."</label>\n" + . "<select name=\"shownoanswer\" id=\"shownoanswer\">\n" + . '<option value="Y" selected="selected">'.$clang->gT('Yes')."</option>\n" + . '<option value="N">'.$clang->gT('No')."</option>\n" + . '</select></li>'; + break; + + default: + $newsurvey .= '<li>'.$clang->gT('"Show no answer" is foced on by the system adminstrator.').'</li>'; + break; + }; + + + + + //Default date format - . "<li><label for='dateformat'>".$clang->gT("Date format:")."</label>\n" + $newsurvey .= "<li><label for='dateformat'>".$clang->gT("Date format:")."</label>\n" . "<select size='1' id='dateformat' name='dateformat'>\n"; foreach (getDateFormatData() as $index=>$dateformatdata) { Index: admin/install/create-mysql.sql =================================================================== --- admin/install/create-mysql.sql (revision 8796) +++ admin/install/create-mysql.sql (working copy) @@ -199,6 +199,10 @@ `allowsave` char(1) default 'Y', `autonumber_start` bigint(11) default '0', `autoredirect` char(1) default 'N', + `showXquestions` char(1) default 'Y', + `showgroupinfo` char(1) default 'B', + `showqnumcode` char(1) default '0', + `shownoanswer` char(1) default 'Y', `allowprev` char(1) default 'Y', `printanswers` char(1) default 'N', `ipaddr` char(1) default 'N', Index: admin/install/create-postgres.sql =================================================================== --- admin/install/create-postgres.sql (revision 8796) +++ admin/install/create-postgres.sql (working copy) @@ -271,6 +271,10 @@ printanswers character(1) DEFAULT 'N'::bpchar, autonumber_start integer DEFAULT 0, autoredirect character(1) DEFAULT 'N'::bpchar, + showXquestions character(1) DEFAULT 'Y'::bpchar, + showgroupinfo character(1) DEFAULT 'B'::bpchar, + showqnumcode character(1) DEFAULT '0'::bpchar, + shownoanswer character(1) DEFAULT 'Y'::bpchar, allowprev character(1) DEFAULT 'Y'::bpchar, ipaddr character(1) DEFAULT 'N'::bpchar, refurl character(1) DEFAULT 'N'::bpchar, Index: admin/install/create-mssqlnative.sql =================================================================== --- admin/install/create-mssqlnative.sql (revision 8796) +++ admin/install/create-mssqlnative.sql (working copy) @@ -243,6 +243,10 @@ [allowsave] char(1) default 'Y', [autonumber_start] bigINT default '0', [autoredirect] char(1) default 'N', + [showXquestions] char(1) default 'Y', + [showgroupinfo] char(1) default 'B', + [showqnumcode] char(1) default '0', + [shownoanswer] char(1) default 'Y', [allowprev] char(1) default 'Y', [printanswers] char(1) default 'N', [ipaddr] char(1) default 'N', Index: admin/install/create-mssql.sql =================================================================== --- admin/install/create-mssql.sql (revision 8796) +++ admin/install/create-mssql.sql (working copy) @@ -243,6 +243,10 @@ [allowsave] char(1) default 'Y', [autonumber_start] bigINT default '0', [autoredirect] char(1) default 'N', + [showXquestions] char(1) default 'Y', + [showgroupinfo] char(1) default 'B', + [showqnumcode] char(1) default '0', + [shownoanswer] char(1) default 'Y', [allowprev] char(1) default 'Y', [printanswers] char(1) default 'N', [ipaddr] char(1) default 'N', Index: admin/globalsettings.php =================================================================== --- admin/globalsettings.php (revision 8796) +++ admin/globalsettings.php (working copy) @@ -72,6 +72,10 @@ setGlobalSetting('siteadminemail',strip_tags($_POST['siteadminemail'])); setGlobalSetting('siteadminname',strip_tags($_POST['siteadminname'])); setGlobalSetting('shownoanswer',sanitize_int($_POST['shownoanswer'])); + setGlobalSetting('showXquestions',($_POST['showXquestions'])); + setGlobalSetting('showgroupinfo',($_POST['showgroupinfo'])); + setGlobalSetting('showqnumcode',($_POST['showqnumcode'])); + $repeatheadingstemp=(int)($_POST['repeatheadings']); $repeatheadingstemp=(int)($_POST['repeatheadings']); if ($repeatheadingstemp==0) $repeatheadingstemp=25; setGlobalSetting('repeatheadings',$repeatheadingstemp); @@ -211,9 +215,11 @@ $dateformatdata=getDateFormatData($_SESSION['dateformat']); $editsurvey.= "\t<li><label for='timeadjust'>".$clang->gT("Time difference (in hours):")."</label>\n" - . "\t\t<input type='text' size='10' id='timeadjust' name='timeadjust' value=\"".htmlspecialchars(str_replace(array('+',' hours'),array('',''),getGlobalSetting('timeadjust')))."\" /> " + . "\t\t<span><input type='text' size='10' id='timeadjust' name='timeadjust' value=\"" + . htmlspecialchars(str_replace(array('+',' hours'),array('',''),getGlobalSetting('timeadjust'))) + . "\" /> " . $clang->gT("Server time:").' '.convertDateTimeFormat(date('Y-m-d H:i:s'),'Y-m-d H:i:s',$dateformatdata['phpdate'].' H:i')." - ".$clang->gT("Corrected time :").' '.convertDateTimeFormat(date_shift(date("Y-m-d H:i:s"), 'Y-m-d H:i:s', getGlobalSetting('timeadjust')),'Y-m-d H:i:s',$dateformatdata['phpdate'].' H:i')." - </li>\n"; + </span></li>\n"; $thisusepdfexport=getGlobalSetting('usepdfexport'); $editsurvey .= "\t<li><label for='usepdfexport'>".$clang->gT("PDF export available:")."</label>\n" @@ -270,8 +276,9 @@ if (getGlobalSetting('emailmethod')=='qmail') {$editsurvey .= " selected='selected'";} $editsurvey .= ">".$clang->gT("Qmail")."</option>\n" . "\t\t</select></li>\n" - . "\t<li><label for='emailsmtphost'>".$clang->gT("SMTP host:")."</label>\n" - . "\t\t<input type='text' size='50' id='emailsmtphost' name='emailsmtphost' value=\"".htmlspecialchars(getGlobalSetting('emailsmtphost'))."\" /> <font size='1'>".$clang->gT("Enter your hostname and port, e.g.: my.smtp.com:25")."</font></li>\n" + . "\t<li>\n\t\t<label for='emailsmtphost'>".$clang->gT("SMTP host:")."</label>\n" + . "\t\t<span>\n" + . "\t\t\t<input type='text' size='50' id='emailsmtphost' name='emailsmtphost' value=\"".htmlspecialchars(getGlobalSetting('emailsmtphost'))."\" /> <font size='1'>".$clang->gT("Enter your hostname and port, e.g.: my.smtp.com:25")."</font>\n\t\t</span>\n\t</li>\n" . "\t<li><label for='emailsmtpuser'>".$clang->gT("SMTP username:")."</label>\n" . "\t\t<input type='text' size='50' id='emailsmtpuser' name='emailsmtpuser' value=\"".htmlspecialchars(getGlobalSetting('emailsmtpuser'))."\" /></li>\n" . "\t<li><label for='emailsmtppassword'>".$clang->gT("SMTP password:")."</label>\n" @@ -351,19 +358,77 @@ $editsurvey .= "\t<div class='tab-page'> <h2 class='tab'>".$clang->gT("Miscellaneous")."</h2><ul>\n"; // shownoanswer - $shownoanswer=getGlobalSetting('shownoanswer'); - $editsurvey .= "\t<li><label for='shownoanswer'>".$clang->gT("Show 'no answer' option for non-mandatory questions:")."</label>\n" - . "\t\t<select id='shownoanswer' name='shownoanswer'>\n" - . "\t\t\t<option value='1'"; - if ($shownoanswer == 1) {$editsurvey .= " selected='selected'";} - $editsurvey .= ">".$clang->gT("Yes")."</option>\n" - . "\t\t\t<option value='0'"; - if ($shownoanswer == 0) {$editsurvey .= " selected='selected'";} - $editsurvey .= ">".$clang->gT("No")."</option>\n" + $shownoanswer=getGlobalSetting('shownoanswer'); + $editsurvey .= "\t<li><label for='shownoanswer'>".$clang->gT("Show 'no answer' option for non-mandatory questions:")."</label>\n" + . "\t\t<select id='shownoanswer' name='shownoanswer'>\n" + . "\t\t\t<option value=\"1\""; + if ($shownoanswer == 1) {$editsurvey .= " selected='selected'";} + $editsurvey .= '>'.$clang->gT('Yes')."</option>\n" + . "\t\t\t<option value=\"0\""; + if ($shownoanswer == 0) {$editsurvey .= " selected='selected'";} + $editsurvey .= '>'.$clang->gT('No')."</option>\n" + . "\t\t\t<option value=\"2\""; + if ($shownoanswer == 2) {$editsurvey .= ' selected="selected"';} + $editsurvey .= '>'.$clang->gT('Choose')."</option>\n" . "\t\t</select></li>\n"; + $thisrepeatheadings=getGlobalSetting('repeatheadings'); $editsurvey .= "\t<li><label for='repeatheadings'>".$clang->gT("Number of answers to show before repeating the headings in array questions:")."</label>\n" . "\t\t<input id='repeatheadings' name='repeatheadings' value='$thisrepeatheadings' size='4' maxlength='4' /></li>\n"; + + + // showXquestions + $set_xq=getGlobalSetting('showXquestions'); + $sel_xq = array( 'hide' => '' , 'show' => '' , 'choose' => ''); + $sel_xq[$set_xq] = ' selected="selected"'; + if( empty($sel_xq['hide']) && empty($sel_xq['show']) && empty($sel_xq['choose'])) + { + $sel_xq['choose'] = ' selected="selected"'; + }; + $editsurvey .= "\t<li><label for=\"showXquestions\">".$clang->gT('Show "There are X questions in this survey"')."</label>\n" + . "\t\t<select id=\"showXquestions\" name=\"showXquestions\">\n" + . "\t\t\t<option value=\"show\"{$sel_xq['show']}>".$clang->gT('Yes')."</option>\n" + . "\t\t\t<option value=\"hide\"{$sel_xq['hide']}>".$clang->gT('No')."</option>\n" + . "\t\t\t<option value=\"choose\"{$sel_xq['choose']}>".$clang->gT('Survey admin can choose')."</option>\n" + . "\t\t</select></li>\n"; + unset($set_xq,$sel_xq); + + // showgroupinfo + $set_gri=getGlobalSetting('showgroupinfo'); + $sel_gri = array( 'both' => '' , 'choose' =>'' , 'description' => '' , 'name' => '' , 'none' => '' ); + $sel_gri[$set_gri] = ' selected="selected"'; + if( empty($sel_gri['both']) && empty($sel_gri['choose']) && empty($sel_gri['description']) && empty($sel_gri['name']) && empty($sel_gri['none'])) + { + $sel_gri['choose'] = ' selected="selected"'; + }; + $editsurvey .= "\t<li><label for=\"showgroupinfo\">".$clang->gT('Show Group Name and/or Group Description')."</label>\n" + . "\t\t<select id=\"showgroupinfo\" name=\"showgroupinfo\">\n" + . "\t\t\t<option value=\"both\"{$sel_gri['both']}>".$clang->gT('Show both')."</option>\n" + . "\t\t\t<option value=\"name\"{$sel_gri['name']}>".$clang->gT('Show group name only')."</option>\n" + . "\t\t\t<option value=\"description\"{$sel_gri['description']}>".$clang->gT('Show group description only')."</option>\n" + . "\t\t\t<option value=\"none\"{$sel_gri['none']}>".$clang->gT('Hide both')."</option>\n" + . "\t\t\t<option value=\"choose\"{$sel_gri['choose']}>".$clang->gT('Survey admin can Choose')."</option>\n" + . "\t\t</select></li>\n"; + unset($set_gri,$sel_gri); + + // showqnumcode + $set_qnc=getGlobalSetting('showqnumcode'); + $sel_qnc = array( 'both' => '' , 'choose' =>'' , 'number' => '' , 'code' => '' , 'none' => '' ); + $sel_qnc[$set_qnc] = ' selected="selected"'; + if( empty($sel_qnc['both']) && empty($sel_qnc['choose']) && empty($sel_qnc['number']) && empty($sel_qnc['code']) && empty($sel_qnc['none'])) + { + $sel_qnc['choose'] = ' selected="selected"'; + }; + $editsurvey .= "\t<li><label for=\"showqnumcode\">".$clang->gT('Show Question Number and/or Question Code')."</label>\n" + . "\t\t<select id=\"showqnumcode\" name=\"showqnumcode\">\n" + . "\t\t\t<option value=\"both\"{$sel_qnc['both']}>".$clang->gT('Show both')."</option>\n" + . "\t\t\t<option value=\"number\"{$sel_qnc['number']}>".$clang->gT('Show question number only')."</option>\n" + . "\t\t\t<option value=\"code\"{$sel_qnc['code']}>".$clang->gT('Show question code only')."</option>\n" + . "\t\t\t<option value=\"none\"{$sel_qnc['none']}>".$clang->gT('Hide both')."</option>\n" + . "\t\t\t<option value=\"choose\"{$sel_qnc['choose']}>".$clang->gT('Survey admin can Choose')."</option>\n" + . "\t\t</select></li>\n"; + unset($set_qnc,$sel_qnc); + $editsurvey .= "\t</ul>\n"; // End TAB page & form $editsurvey .= "\t</div><input type='hidden' name='action' value='globalsettingssave'/></form>\n"; DIFF__dev__qcode_qnum.diff (59,570 bytes)

Bug heat	6
Complete LimeSurvey version number (& build)	8084
I will donate to the project if issue is resolved
Browser
Database type & version	dna
Server OS (if known)	dna
Webserver software & version (if known)	dna
PHP Version	dna

User List	There are no users monitoring this issue.

c_schmitz 2009-12-04 19:43 administrator ~10459 Last edited: 2010-02-11 17:05	I didn't even know this tag was there. It seems to be undocumented. Evan, can you please document the changes you introduced in rev. 6497 on the page http://docs.limesurvey.org/tiki-index.php?page=Templates+and+Styles&structure=English+Instructions+for+LimeSurvey Thank you!

c_schmitz 2010-02-11 17:06 administrator ~11043	Evan??

c_schmitz 2010-03-10 21:32 administrator ~11292	Reminder sent to: Evan Evan?

Evan 2010-03-22 23:13 reporter ~11476	I have written the code but haven't finished testing it. (My laptop has been in for hardware repairs for 4 weeks) I get it back today and should be able to commit the changes by the end of the week. Will also update the documentation on docs.ls...

Evan 2010-05-01 17:31 reporter ~11682	Have updated the documentation to include all the keywords for question.pstpl, printanswers.pstpl, print_group.pstpl, print_question.pstpl & print_survey.pstpl

Evan 2010-05-01 17:39 reporter ~11683	Discovered that {QUSTION_CODE} was not working so have fixed that. Have also realized that {QUESTION_CODE} should be switched on or off on a per-survey basis. To make turning it on and off per-servey required adding a new field to the 'survey' table in the DB. I have updated the install.sql files and the admin interface. Have tested all of it thoroughly and it all seems to be working fine. However I'm not sure on the protocol about adding DB fields. Would like some feedback/info on adding fields to the DB.

Evan 2010-05-01 17:41 reporter ~11684	In my fix, I've added a DB field to the 'survey' table (see above). I've updated the SQL files in admin/install but not sure what else needs doing to make the addition safe for upgrade. Will test upgrading in the next few days.

c_schmitz 2010-05-02 13:31 administrator ~11685	hello Evan, I would love to take a look, but there are no files attached.

Evan 2010-05-04 16:02 reporter ~11704 Last edited: 2010-05-10 05:04	Hi Carsten Sorry. I forgot to attach the diff. Here it is. PS: When I tried to do a patch with it, it had trouble finding the files but when I pointed to them manually during the patch process it worked fine. PPS: the diff file also includes updates to all the translation .po files. (I'm not sure if this is the correct way to deal with the translation stuff.) I had a look in the general translation docs as well as the commit docs but could find anything in either about what to do. I vaguely remember there being something about adding something to the commit message about the translations needing to be updated but can't remember the details or if I imagined it.

Evan 2010-05-10 05:07 reporter ~11740	Hi mdekker I've been fiddling with trying to implement {QUESTION_NUMBER} for screen surveys but can't work out how to do it. Instead I've opted for just using the {QUESTION_CODE}. While this is not ideal it's an OK solution until I work out something better.

mdekker 2010-05-11 14:50 reporter ~11761	Hey Evan, I uploaded a patch that seems to work on my install. Didn't test it well with conditions and it needs changes to question preview / template edit... but maybe it helps you :)

Evan 2010-05-14 00:47 reporter ~11811	Hi Mdkker Have uploaded another patch. The changes in your patch didn't work for me but they put me on the right track. Also this patch includes two (similar but unrelated) features, allowing survey admins (if allowed by sys admin) to switch "There are X questions", "Group name" and "Group description" on and off as they see fit. plus the ability to choose between displaying "Question code", "question number", "Both" or "none" again at the discretion of the sys admin. Can you let me know if it works for you?

mdekker 2010-05-17 12:21 reporter ~11830	Hi Evan, I will take a look and let you know. I didn't try yet but I saw no db update statement. As far as I can see now that is the only thing that needs to be done before it can be applied to 1.90 branch. Great new feature! Going to take a look now.

mdekker 2010-05-17 13:42 reporter ~11833	Hey Evan, I think you are almost there. I would really like to see this feature in 1.90 :) So the few points i found are: In the diff is a small typo: line 3446 has uu after the ; I would default all the global defaults to choose so one can change per survey and then set the 'survey default' (so when we create survey and no choice is made) to behave like it is now. The global defaults should be added to admin\globalsettings.php so you can change from within Limesurvey and don't have to edit the file. And as I said in my previous comment, you should make an update to the database so existing tables get updated as well. I have no knowledge of how that works, so you might have to wait for Carsten to come back to help with that. The files are in the admin\updates folder.

mdekker 2010-05-20 09:46 reporter ~11883	I get errors in the template editor (undefined index showqnumcode in common.php lines 2875, 2976, 2888. 2889) can you have a look at that?

Evan 2010-06-04 16:27 reporter ~12171	Have uploaded a final patch with mdekker's template editor issue fixed. will try and commit the changes to the dev branch. (having some issues with getting the DB to automatically update, have incremented the DB number but can't seem to get it to work)

c_schmitz 2010-06-04 22:18 administrator ~12179	This patch seems to be vs. the _dev branch so it won't make it into 1.90 but in 1.91. If you upgrade the DB number you have to write according upgrade routines in \admin\update\upgrade-<dbtype>.php so LimeSurvey knows what to do ;). Contact me on Skype if you have more questions.

Evan 2010-06-29 16:11 reporter ~12307	Have committed changes at last {QUESTION_CODES} and {QUESTION_NUMBERS} are both working for screen templates. You can also turn them on and off per survey via the "Edit current survey" interface. Plus LS super admin has power to over ride. Also in the same commit allowed survey admins (at the discretion of the LS super admin) to show or hide {THEREAREXQUESTION}, {GROUPNAME}. {GROUPDESCRIPTION} "no answer".

Date Modified	Username	Field	Change
2009-12-02 16:53	mdekker	New Issue
2009-12-02 16:53	mdekker	Status	new => assigned
2009-12-02 16:53	mdekker	Assigned To	=> user372
2009-12-02 16:53	mdekker	LimeSurvey build number	=> 8084
2009-12-02 16:53	mdekker	Database & DB-Version	=> dna
2009-12-02 16:53	mdekker	Operating System (Server)	=> dna
2009-12-02 16:53	mdekker	Webserver	=> dna
2009-12-02 16:53	mdekker	PHP Version	=> dna
2009-12-02 18:12	~~user372~~	Assigned To	user372 => c_schmitz
2009-12-04 19:42	c_schmitz	Assigned To	c_schmitz => Evan
2009-12-04 19:43	c_schmitz	Note Added: 10459
2010-02-11 17:05	c_schmitz	Note Edited: 10459
2010-02-11 17:06	c_schmitz	Note Added: 11043
2010-03-02 21:09	rovinj	Relationship added	related to 04155
2010-03-10 21:32	c_schmitz	Note Added: 11292
2010-03-10 22:18	c_schmitz	Relationship deleted	related to 04155
2010-03-22 23:13	Evan	Note Added: 11476
2010-05-01 17:31	Evan	Note Added: 11682
2010-05-01 17:39	Evan	Note Added: 11683
2010-05-01 17:41	Evan	Note Added: 11684
2010-05-01 17:41	Evan	Status	assigned => feedback
2010-05-02 13:31	c_schmitz	Note Added: 11685
2010-05-02 14:23	Mazi	Status	feedback => assigned
2010-05-04 15:47	Evan	File Added: DIFF__showqcodes.diff
2010-05-04 16:02	Evan	Note Added: 11704
2010-05-10 01:09	Evan	File Deleted: DIFF__showqcodes.diff
2010-05-10 01:09	Evan	File Added: DIFF__showqcodes.diff
2010-05-10 05:04	Evan	Note Edited: 11704
2010-05-10 05:07	Evan	Note Added: 11740
2010-05-10 05:07	Evan	Status	assigned => feedback
2010-05-11 14:49	mdekker	File Added: question_number_patch.diff
2010-05-11 14:50	mdekker	Note Added: 11761
2010-05-11 14:50	mdekker	Status	feedback => assigned
2010-05-14 00:17	Evan	File Added: showXquestions.diff
2010-05-14 00:42	Evan	File Deleted: showXquestions.diff
2010-05-14 00:42	Evan	File Added: showXquestions.diff
2010-05-14 00:47	Evan	Note Added: 11811
2010-05-14 00:47	Evan	Status	assigned => feedback
2010-05-17 12:21	mdekker	Note Added: 11830
2010-05-17 12:21	mdekker	Status	feedback => assigned
2010-05-17 13:42	mdekker	Note Added: 11833
2010-05-17 13:42	mdekker	Status	assigned => feedback
2010-05-19 09:48	mdekker	Target Version	=> 1.90RC1
2010-05-20 09:46	mdekker	Note Added: 11883
2010-05-20 09:46	mdekker	Status	feedback => assigned
2010-06-01 14:39	c_schmitz	Assigned To	Evan => c_schmitz
2010-06-04 16:24	Evan	File Added: DIFF__qcode_qnum_xqs_grp-desc_grp-nm_sho-no-ans.diff
2010-06-04 16:27	Evan	Note Added: 12171
2010-06-04 16:27	Evan	Status	assigned => feedback
2010-06-04 16:42	Evan	File Deleted: DIFF__qcode_qnum_xqs_grp-desc_grp-nm_sho-no-ans.diff
2010-06-04 16:42	Evan	File Added: DIFF__dev__qcode_qnum.diff
2010-06-04 22:07	c_schmitz	Status	feedback => assigned
2010-06-04 22:18	c_schmitz	Note Added: 12179
2010-06-04 22:18	c_schmitz	Assigned To	c_schmitz => Evan
2010-06-29 16:11	Evan	Note Added: 12307
2010-06-29 16:11	Evan	Status	assigned => resolved
2010-06-29 16:11	Evan	Fixed in Version	=> 1.90RC2
2010-06-29 16:11	Evan	Resolution	open => fixed
2010-07-06 11:22	c_schmitz	Status	resolved => closed
2015-12-11 14:40	c_schmitz	Category	Templates => Theme editor

View Issue Details

Users monitoring this issue

Activities

Issue History