Skip to content

Commit

Permalink
Merge pull request #173 from fpcorso/release/4.2.3
Browse files Browse the repository at this point in the history 
Release 4.2.3
  • Loading branch information
@fpcorso
fpcorso committed Mar 26, 2015
2 parents 59323a1 + e4fe8f6 commit 53b616e
Show file tree
Hide file tree
Showing 20 changed files with 2,898 additions and 157 deletions.
121 changes: 42 additions & 79 deletions includes/qmn_credits.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@ function mlw_qmn_setTab(tab) {
jQuery("#mlw_quiz_requested").hide();
jQuery("#mlw_qmn_tab_2").toggleClass("nav-tab-active");
}
if (tab == 3)
{
jQuery("#mlw_quiz_what_new").hide();
jQuery("#mlw_quiz_changelog").hide();
jQuery("#mlw_quiz_requested").show();
jQuery("#mlw_qmn_tab_3").toggleClass("nav-tab-active");
}
}
</script>
<style>
Expand Down Expand Up @@ -80,78 +73,48 @@ function mlw_qmn_setTab(tab) {
}
</style>
<div class="wrap about-wrap">
<h1><?php _e('Welcome To Quiz Master Next', 'quiz-master-next'); ?></h1>
<div class="about-text"><?php _e('Thank you for updating!', 'quiz-master-next'); ?></div>
<div class="mlw_qmn_icon_wrap"><?php echo $mlw_quiz_version; ?></div>
<h2 class="nav-tab-wrapper">
<a href="javascript:mlw_qmn_setTab(1);" id="mlw_qmn_tab_1" class="nav-tab nav-tab-active">
<?php _e("What's New!", 'quiz-master-next'); ?></a>
<a href="javascript:mlw_qmn_setTab(2);" id="mlw_qmn_tab_2" class="nav-tab">
<?php _e('Changelog', 'quiz-master-next'); ?></a>
<a href="javascript:mlw_qmn_setTab(3);" id="mlw_qmn_tab_3" class="nav-tab">
<?php _e('Requested Features', 'quiz-master-next'); ?></a>
</h2>
<div id="mlw_quiz_what_new">
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">Fill In The Blank Questions</h2>
<p style="text-align: center;">You can now use the new fill in the blank question type. By placing the variable %BLANK% in your question, you will be able to designate where to show the text box so users can fill in their answer.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">Social Media Template Variables</h2>
<p style="text-align: center;">Using the new social media template variables, you can choose where on your results page to display the social media buttons.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">Redirect User Upon Completion</h2>
<p style="text-align: center;">If you decide to do so, you can have the user be redirected to a new page instead of being shown the results.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">5 New Translations</h2>
<p style="text-align: center;">Thanks to the generosity of some of our users, we now have translations for Portuguese, Spanish, Thai, Danish, and Dutch.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">Please Take Our Survey To Better Improve This Plugin</h2>
<p style="text-align: center;">When you have a moment, please take our survey for this plugin. By filling out the survey, you are helping us improve this plugin. Users who take the survey between now and March 31st, 2015 will be emailed a 25% off coupon for our WordPress Store. When you are ready, please <a href='http://mylocalwebstop.com/quiz-master-next-survey/'>take our survey</a>.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">This Plugin Is Now Translation Ready!</h2>
<p style="text-align: center;">For those who wish to assist in translating, you can find the POT in the languages folder. If you do not know what that is, feel free to contact me and I will assist you with it.</p>
<br />
<hr />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">For Developers:</h2>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">We Are On GitHub Now</h2>
<p style="text-align: center;">We have had several users ask for this so we thought we would try it out. We now love github! Be sure to <a href="https://github.com/fpcorso/quiz_master_next/">make suggestions or contribute</a>.</p>
<br />
</div>
<div id="mlw_quiz_changelog" style="display: none;">
<h3><?php echo $mlw_quiz_version; ?> (March 23, 2015)</h3>
<ul>
<li>* Minor Design Update</li>
</ul>
</div>
<div id="mlw_quiz_requested" style="display: none;">
<h3>Requested Features For Future Updates By Premium Support Users</h3>
<ul>
<li>None</li>
</ul>
<h3>Requested Features For Future Updates By Non-Premium Support Users</h3>
<ul>
<li>Importing Questions</li>
<li>Stats For Each Quiz</li>
<li>More Social Media Integration</li>
<li>Show Question Amount On Pagination</li>
<li>Allow Quiz To Not Show Start Page</li>
<li>Progress Bar For Timer</li>
<li>Graphical Click Aware Questions</li>
<li>Results Bar Graph For Users Taking Polls</li>
<li>Head To Head Comparison Questions</li>
<li>Ability To Highlight Incorrect Answers</li>
<li>Set Default Question Type</li>
<li>Show Pop-Up When Clicking Submit</li>
<li>Conditional Continuation To Next Quiz</li>
<li>Analyse Level Of Difficulty</li>
<li>Question Bank</li>
<li>Global Quiz Settings</li>
<li>Print Quiz</li>
<li>Easier Media In Questions</li>
<li>Easier Media In Answers</li>
<li>Mark Question To Be Reviewed</li>
</ul>
</div>
<h1><?php _e('Welcome To Quiz Master Next', 'quiz-master-next'); ?></h1>
<div class="about-text"><?php _e('Thank you for updating!', 'quiz-master-next'); ?></div>
<div class="mlw_qmn_icon_wrap"><?php echo $mlw_quiz_version; ?></div>
<h2 class="nav-tab-wrapper">
<a href="javascript:mlw_qmn_setTab(1);" id="mlw_qmn_tab_1" class="nav-tab nav-tab-active">
<?php _e("What's New!", 'quiz-master-next'); ?></a>
<a href="javascript:mlw_qmn_setTab(2);" id="mlw_qmn_tab_2" class="nav-tab">
<?php _e('Changelog', 'quiz-master-next'); ?></a>
</h2>
<div id="mlw_quiz_what_new">
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">Fill In The Blank Questions</h2>
<p style="text-align: center;">You can now use the new fill in the blank question type. By placing the variable %BLANK% in your question, you will be able to designate where to show the text box so users can fill in their answer.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">Social Media Template Variables</h2>
<p style="text-align: center;">Using the new social media template variables, you can choose where on your results page to display the social media buttons.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">Redirect User Upon Completion</h2>
<p style="text-align: center;">If you decide to do so, you can have the user be redirected to a new page instead of being shown the results.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">5 New Translations</h2>
<p style="text-align: center;">Thanks to the generosity of some of our users, we now have translations for Portuguese, Spanish, Thai, Danish, and Dutch.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">Please Take Our Survey To Better Improve This Plugin</h2>
<p style="text-align: center;">When you have a moment, please take our survey for this plugin. By filling out the survey, you are helping us improve this plugin. Users who take the survey between now and March 31st, 2015 will be emailed a 25% off coupon for our WordPress Store. When you are ready, please <a href='http://mylocalwebstop.com/quiz-master-next-survey/'>take our survey</a>.</p>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">This Plugin Is Now Translation Ready!</h2>
<p style="text-align: center;">For those who wish to assist in translating, you can find the POT in the languages folder. If you do not know what that is, feel free to contact me and I will assist you with it.</p>
<br />
<hr />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">For Developers:</h2>
<br />
<h2 style="margin: 1.1em 0 .2em;font-size: 2.4em;font-weight: 300;line-height: 1.3;text-align: center;">We Are On GitHub Now</h2>
<p style="text-align: center;">We have had several users ask for this so we thought we would try it out. We now love github! Be sure to <a href="https://github.com/fpcorso/quiz_master_next/">make suggestions or contribute</a>.</p>
<br />
</div>
<div id="mlw_quiz_changelog" style="display: none;">
<h3><?php echo $mlw_quiz_version; ?> (March 26, 2015)</h3>
<ul>
<li>* Minor Design Changes</li>
<li>* Minor Bug Fixes</li>
</ul>
</div>
</div>
<?php
}
Expand Down
4 changes: 2 additions & 2 deletions includes/qmn_options_questions_tab.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function mlw_options_questions_tab_content()
{
//Variables from edit question form
$edit_question_name = trim(preg_replace('/\s+/',' ', nl2br(htmlspecialchars(stripslashes($_POST["edit_question_name"]), ENT_QUOTES))));
$edit_question_answer_info = $_POST["edit_correct_answer_info"];
$edit_question_answer_info = htmlspecialchars(stripslashes($_POST["edit_correct_answer_info"]), ENT_QUOTES);
$mlw_edit_question_id = intval($_POST["edit_question_id"]);
$mlw_edit_question_type = $_POST["edit_question_type"];
$edit_comments = htmlspecialchars($_POST["edit_comments"], ENT_QUOTES);
Expand Down Expand Up @@ -235,7 +235,7 @@ function mlw_options_questions_tab_content()
{
//Variables from new question form
$question_name = trim(preg_replace('/\s+/',' ', nl2br(htmlspecialchars(stripslashes($_POST["question_name"]), ENT_QUOTES))));
$question_answer_info = $_POST["correct_answer_info"];
$question_answer_info = htmlspecialchars(stripslashes($_POST["correct_answer_info"]), ENT_QUOTES);
$question_type = $_POST["question_type"];
$comments = htmlspecialchars($_POST["comments"], ENT_QUOTES);
$hint = htmlspecialchars($_POST["hint"], ENT_QUOTES);
Expand Down
5 changes: 5 additions & 0 deletions includes/qmn_quiz.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ public function display_shortcode($atts)
global $qmn_allowed_visit;
$qmn_allowed_visit = true;
$mlwQuizMasterNext->quizCreator->set_id($quiz);

//Legacy variable
global $mlw_qmn_quiz;
$mlw_qmn_quiz = $quiz;

if (get_option('timezone_string') != '' && get_option('timezone_string') !== false)
{
date_default_timezone_set(get_option('timezone_string'));
Expand Down
18 changes: 9 additions & 9 deletions includes/qmn_quiz_creator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,12 @@ public function create_quiz($quiz_name)
$wpdb->prefix . "mlw_quizzes",
array(
'quiz_name' => $quiz_name,
'message_before' => 'Enter your text here',
'message_after' => 'Enter your text here',
'message_comment' => 'Enter your text here',
'message_end_template' => '',
'user_email_template' => 'Enter your text here',
'admin_email_template' => 'Enter your text here',
'message_before' => 'Welcome to your %QUIZ_NAME%',
'message_after' => '%QUESTIONS_ANSWERS%',
'message_comment' => 'Please fill in the comment box below.',
'message_end_template' => 'Be sure to click Submit Quiz to see your results!',
'user_email_template' => '%QUESTIONS_ANSWERS%',
'admin_email_template' => '%QUESTIONS_ANSWERS%',
'submit_button_text' => 'Submit Quiz',
'name_field_text' => 'Name',
'business_field_text' => 'Business',
Expand All @@ -274,7 +274,7 @@ public function create_quiz($quiz_name)
'comment_section' => 0,
'question_from_total' => 0,
'total_user_tries' => 0,
'total_user_tries_text' => 'Enter Your Text Here',
'total_user_tries_text' => 'You are only allowed 1 try and have already submitted your quiz.',
'certificate_template' => 'Enter Your Text Here!',
'social_media' => 0,
'social_media_text' => 'I just scored %CORRECT_SCORE%% on %QUIZ_NAME%!',
Expand All @@ -287,9 +287,9 @@ public function create_quiz($quiz_name)
'theme_selected' => 'default',
'last_activity' => date("Y-m-d H:i:s"),
'require_log_in' => 0,
'require_log_in_text' => 'Enter Your Text Here',
'require_log_in_text' => 'This quiz is for logged in users only.',
'limit_total_entries' => 0,
'limit_total_entries_text' => 'Enter Your Text Here',
'limit_total_entries_text' => 'Unfortunately, this quiz is limited the amount of entries it can recieve and has already reached that limit.',
'scheduled_timeframe' => '',
'scheduled_timeframe_text' => '',
'quiz_views' => 0,
Expand Down
2 changes: 1 addition & 1 deletion includes/qmn_template_variables.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function mlw_qmn_variable_average_point($content, $mlw_quiz_array)
{
if ($mlw_quiz_array["total_questions"] != 0)
{
$mlw_average_points = $mlw_quiz_array["total_points"]/$mlw_quiz_array["total_questions"];
$mlw_average_points = round($mlw_quiz_array["total_points"]/$mlw_quiz_array["total_questions"], 2);
}
else
{
Expand Down
Binary file modified languages/quiz-master-next-da_DK.mo
View file
Binary file not shown.
28 changes: 13 additions & 15 deletions languages/quiz-master-next-da_DK.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Quiz Master Next\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-22 19:28-0500\n"
"POT-Creation-Date: 2015-03-25 20:59-0500\n"
"PO-Revision-Date: \n"
"Last-Translator: Frank Corso <[email protected]>\n"
"Language-Team: My Local Webstop <[email protected]>\n"
Expand Down Expand Up @@ -314,51 +314,47 @@ msgstr "Dit quiz navn er blevet opdateret."
msgid "Your quiz has been duplicated successfully."
msgstr "Din Quiz er blevet dublikeret."

#: includes/qmn_quiz.php:326
#: includes/qmn_quiz.php:331
msgid "Not a valid e-mail address!"
msgstr "Ikke en gyldig e-mail-adresse!"

#: includes/qmn_quiz.php:327
#: includes/qmn_quiz.php:332
msgid "This field must be a number!"
msgstr "Dette felt skal være et tal!"

#: includes/qmn_quiz.php:328
#: includes/qmn_quiz.php:333
msgid "The entered text is not correct!"
msgstr "Den indtastede tekst er ikke korrekt!"

#: includes/qmn_quiz.php:329
#: includes/qmn_quiz.php:334
msgid "Please complete all required fields!"
msgstr "Venligst udfyld alle obligatoriske felter"

#: includes/qmn_quiz.php:441
#: includes/qmn_quiz.php:446
msgid "Hint"
msgstr "Hint"

#: includes/qmn_quiz.php:1230
#: includes/qmn_quiz.php:1235
#: includes/qmn_options_text_tab.php:73
msgid "Previous"
msgstr "Tidligere"

#: includes/qmn_credits.php:83
#: includes/qmn_credits.php:76
msgid "Welcome To Quiz Master Next"
msgstr "Velkommen til Quiz Master Next"

#: includes/qmn_credits.php:84
#: includes/qmn_credits.php:77
msgid "Thank you for updating!"
msgstr "Tak for opdatering!"

#: includes/qmn_credits.php:88
#: includes/qmn_credits.php:81
msgid "What's New!"
msgstr "Nyheder!"

#: includes/qmn_credits.php:90
#: includes/qmn_credits.php:83
msgid "Changelog"
msgstr "Ændringslog"

#: includes/qmn_credits.php:92
msgid "Requested Features"
msgstr "Efterspurgte funktioner"

#: includes/qmn_usage_tracking.php:193
msgid "Allow Quiz Master Next to anonymously track this plugin's usage and help us make this plugin better? No sensitive data is tracked."
msgstr "Tillad Quiz Master Next at følge brugen af dette plugin for at forbedre kvaliteten - ingen følsomme data overvåges."
Expand Down Expand Up @@ -1387,3 +1383,5 @@ msgstr "Widget titel"
msgid "Quiz ID"
msgstr "Quiz ID"

#~ msgid "Requested Features"
#~ msgstr "Efterspurgte funktioner"
Binary file modified languages/quiz-master-next-es_ES.mo
View file
Binary file not shown.
30 changes: 14 additions & 16 deletions languages/quiz-master-next-es_ES.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Quiz Master Next\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-22 19:28-0500\n"
"PO-Revision-Date: 2015-03-22 19:28-0500\n"
"POT-Creation-Date: 2015-03-25 20:59-0500\n"
"PO-Revision-Date: 2015-03-25 20:59-0500\n"
"Last-Translator: Frank Corso <[email protected]>\n"
"Language-Team: My Local Webstop <[email protected]>\n"
"Language: es_ES\n"
Expand Down Expand Up @@ -314,51 +314,47 @@ msgstr "Su cuestionario ha sido actualizado correctamente."
msgid "Your quiz has been duplicated successfully."
msgstr "Su cuestionario ha sido duplicado correctamente."

#: includes/qmn_quiz.php:326
#: includes/qmn_quiz.php:331
msgid "Not a valid e-mail address!"
msgstr "E-mail no válido!!"

#: includes/qmn_quiz.php:327
#: includes/qmn_quiz.php:332
msgid "This field must be a number!"
msgstr "Este campo debe ser númerico!"

#: includes/qmn_quiz.php:328
#: includes/qmn_quiz.php:333
msgid "The entered text is not correct!"
msgstr "El texto introducido no es correcto!"

#: includes/qmn_quiz.php:329
#: includes/qmn_quiz.php:334
msgid "Please complete all required fields!"
msgstr "Por favor, complete todas los campos obligatorios!"

#: includes/qmn_quiz.php:441
#: includes/qmn_quiz.php:446
msgid "Hint"
msgstr "Indicación"

#: includes/qmn_quiz.php:1230
#: includes/qmn_quiz.php:1235
#: includes/qmn_options_text_tab.php:73
msgid "Previous"
msgstr "Anterior"

#: includes/qmn_credits.php:83
#: includes/qmn_credits.php:76
msgid "Welcome To Quiz Master Next"
msgstr "Bienvenido a Quiz Master Next"

#: includes/qmn_credits.php:84
#: includes/qmn_credits.php:77
msgid "Thank you for updating!"
msgstr "Gracias por actualizar!"

#: includes/qmn_credits.php:88
#: includes/qmn_credits.php:81
msgid "What's New!"
msgstr "Novedades!"

#: includes/qmn_credits.php:90
#: includes/qmn_credits.php:83
msgid "Changelog"
msgstr "Historial de modificaciones"

#: includes/qmn_credits.php:92
msgid "Requested Features"
msgstr "Características solicitadas"

#: includes/qmn_usage_tracking.php:193
msgid "Allow Quiz Master Next to anonymously track this plugin's usage and help us make this plugin better? No sensitive data is tracked."
msgstr ""
Expand Down Expand Up @@ -1421,3 +1417,5 @@ msgstr "Título del Widget"
msgid "Quiz ID"
msgstr "ID del cuestionario"

#~ msgid "Requested Features"
#~ msgstr "Características solicitadas"
Binary file added languages/quiz-master-next-it_IT.mo
View file
Binary file not shown.
Loading

0 comments on commit 53b616e

Please sign in to comment.