Merge branch 'master' of https://github.com/smartinkc/Multilingual

Author: smartinkc

js/multilingual_survey.js

@@ -630,12 +630,16 @@ var Multilingual = (function(){
 					for(id2 in translations['answers'][id]['text']){
 						$('.ec').each(function(){
 							var tmp = $(this).parent().attr('comps').split(',');
-							$(this).show();
+							if($(this).parent().parent().hasClass('enhancedchoice')) {
+								$(this).parent().show();
+							}
 							if(tmp[0] == id && tmp[2] == id2) {
 								$(this).html(' ' + translations['answers'][id]['text'][id2]);
 								$(this).data('lang', lang);
 							} else if(settings['hide-answers-without-translation-survey'] && settings['hide-answers-without-translation-survey']['value'] && $(this).data('lang') !== lang) {
-								$(this).hide();
+								if($(this).parent().parent().hasClass('enhancedchoice')) {
+									$(this).parent().hide();
+								}
 							}
 						});
 					}
@@ -644,7 +648,10 @@ var Multilingual = (function(){
 					var id2;
 					for(id2 in translations['answers'][id]['text']){
 						$('#'+id+'-tr .choicevert').each(function(){
-							//$(this).show();
+							if(!$(this).hasClass('hidden')) {
+								$(this).show();
+							}
+
 							if($(this).find('[name="__chk__' + id + '_RC_' + id2 + '"]').length) {
 								$(this).contents().last().html(' ' + translations['answers'][id]['text'][id2]);
 								$(this).data('lang', lang);
@@ -657,12 +664,19 @@ var Multilingual = (function(){
 					for(id2 in translations['answers'][id]['text']){
 						$('.ec').each(function(){
 							var tmp = $(this).parent().attr('comps').split(',');
-							//$(this).show();
+
+							if($(this).parent().parent().hasClass('enhancedchoice')) {
+								$(this).parent().show();
+							}
+							// console.log($(this).parent());
+
 							if(tmp[0] == id && tmp[2] == id2) {
 								$(this).html(translations['answers'][id]['text'][id2]);
 								$(this).data('lang', lang);
 							} else if(settings['hide-answers-without-translation-survey'] && settings['hide-answers-without-translation-survey']['value'] && $(this).data('lang') !== lang) {
-								$(this).hide();
+								if($(this).parent().parent().hasClass('enhancedchoice')) {
+									$(this).parent().hide();
+								}
 							}
 						});
 					}

multilingualPDF.php

@@ -90,7 +90,6 @@ function getName($n) {
 
 	//save metadata to file
 	file_put_contents(APP_PATH_DOCROOT."PDF".DS."$random.json", json_encode($metadata));
-	chmod(775, APP_PATH_DOCROOT."PDF".DS."$random.php");
 
 	//split up PDF/index.php file and add details
 	$pdfFile = file_get_contents(APP_PATH_DOCROOT."PDF".DS."index.php");
@@ -123,4 +122,4 @@ function getName($n) {
 	chmod(775, APP_PATH_DOCROOT."PDF".DS."index_multilingual_$random.php");
 
 	header('Location:' . APP_PATH_WEBROOT . "PDF" . DS . "index_multilingual_$random.php?pid=" . $_GET['pid'] . (isset($_GET['form']) ? "&page=" . $_GET['form'] : '') . "&id=" . $_GET['id'] . (isset($_GET['event_id']) ? "&event_id=" . $_GET['event_id'] : '') . (isset($_GET['instance']) && $_GET['instance'] > 1 ? "&instance=" . $_GET['instance'] : '')); 
-?>
+?>