Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix html in add. text; fix url in email

  • Loading branch information...
commit 5a11cb2ce9dccbed2f2887d6afcac5bafd8235e8 1 parent 22b5350
Ollie Armstrong authored
View
3  lib/Wpsqt/Page/Maintenance/Upgrade.php
@@ -36,9 +36,12 @@ public function process(){
$wpdb->query("ALTER TABLE `".WPSQT_TABLE_RESULTS."` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci");
$wpdb->query("ALTER TABLE `".WPSQT_TABLE_SURVEY_CACHE."` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci");
$wpdb->query("ALTER TABLE `".WPSQT_TABLE_QUIZ_SURVEYS."` CHANGE `name` `name` VARCHAR( 512 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL");
+ echo '<p>Updated all columns to use UTF8</p>';
case '2.5.1':
echo '<h4>Updating to 2.5.2</h4>';
$wpdb->query("ALTER TABLE `".WPSQT_TABLE_RESULTS."` ADD `datetaken` VARCHAR(255) NOT NULL AFTER `item_id`");
+ case '2.5.2':
+ echo '<h4>Updating to 2.5.3</h4>';
echo '<p><strong>Updated. Return to the <a href="'.WPSQT_URL_MAIN.'">main page</a> to ensure the notice disappears</strong></p>';
break;
}
View
4 lib/Wpsqt/Shortcode.php
@@ -424,10 +424,6 @@ public function finishQuiz(){
}
}
- //$dateTaken = $_SESSION['wpsqt'][$quizName]['start_time'];
-
- echo '<pre>'; var_dump($_SESSION['wpsqt'][$quizName]['start_time']); echo '</pre>';
-
if ( !isset($_SESSION['wpsqt'][$quizName]['details']['store_results']) || $_SESSION['wpsqt'][$quizName]['details']['store_results'] !== "no" ){
$wpdb->query(
$wpdb->prepare("INSERT INTO `".WPSQT_TABLE_RESULTS."` (datetaken,timetaken,person,sections,item_id,person_name,ipaddress,score,total,percentage,status,pass)
View
2  lib/Wpsqt/Tokens.php
@@ -121,7 +121,7 @@ public function setDefaultValues(){
$this->setTokenValue('HOSTNAME' , gethostbyaddr($_SERVER['REMOTE_ADDR']) );
$this->setTokenValue('USER_AGENT' , $_SERVER['HTTP_USER_AGENT'] );
$this->setTokenValue('SCORE' , ( isset($_SESSION['wpsqt']['current_score']) ) ? $_SESSION['wpsqt']['current_score'] : '');
- $this->setTokenValue('RESULT_URL' , WPSQT_URL_MAIN."&section=results&subsection=mark&id=".$_SESSION['wpsqt']['result_id'] );
+ $this->setTokenValue('RESULT_URL' , WPSQT_URL_MAIN."&section=results&subsection=mark&id=".$_SESSION['wpsqt']['item_id']."&resultid=".$_SESSION['wpsqt']['result_id'] );
$this->setTokenValue('USER_EMAIL' , ( isset($_SESSION['wpsqt'][$quizName]['person']['email']) ) ? $_SESSION['wpsqt'][$quizName]['person']['email'] : '');
$this->setTokenValue('USER_NAME' , ( isset($_SESSION['wpsqt'][$quizName]['person']['name']) ) ? $_SESSION['wpsqt'][$quizName]['person']['name'] : 'Anonymous User');
$this->setTokenValue('USER_FNAME' , ( isset($_SESSION['wpsqt'][$quizName]['person']['fname']) ) ? $_SESSION['wpsqt'][$quizName]['person']['fname'] : 'Anonymous');
View
2  pages/site/quiz/section.php
@@ -39,7 +39,7 @@
if ( !empty($question['add_text']) ){
?>
- <p><?php echo nl2br( htmlentities( stripslashes($question['add_text']) ) ); ?></p>
+ <p><?php echo nl2br($question['add_text']); ?></p>
<?php } ?>
<?php if ( isset($question['image'])) { ?>
View
14 readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=99WUG
Tags: Quiz,test,exam,survey,results,email,quizzes,charts,google charts,wpsqt,tool,poll,polling,polls
Requires at least: 3.1
Tested up to: 3.2.1
-Stable tag: 2.5.2
+Stable tag: 2.5.3
A highly customisable Quiz, Survey and Poll plugin to which allows for unlimited questions and sections.
@@ -50,6 +50,11 @@ Developed by <a href="http://www.catn.com">PHP Hosting Experts CatN</a>
== ChangeLog ==
+= 2.5.3 =
+
+* Update the URL in the email notification to point to the correct resultid
+* Remove htmlentities and stripslashes on the additional text field so HTML can actually be used
+
= 2.5.2 =
* Made the maintenance menu more informative
@@ -157,6 +162,12 @@ Developed by <a href="http://www.catn.com">PHP Hosting Experts CatN</a>
== Upgrade Notice ==
+= 2.5.2 =
+Fixes for new poll system, doc updates, general bug fixes. Worth updating!
+
+= 2.4 =
+Lots of new features, mainly polls.
+
= 2.2.1 =
Almost completely stable and loads of improvements over the beta release.
@@ -167,6 +178,7 @@ A lot more stable than beta releases. There is still going to be a few bugs, ple
* Download/upload plugin to wp-content/plugins directory
* Activate Plugin within Admin Dashboard.
+* Run the upgrade script if prompted to
== Screenshots ==
View
4 wp-survey-and-quiz-tool.php
@@ -5,7 +5,7 @@
Description: Allows wordpress owners to create their own web based quizes.
Author: Fubra Limited
Author URI: http://www.catn.com
-Version: 2.5.2
+Version: 2.5.3
WP Survey And Quiz Tool
Copyright (C) 2011 Fubra Limited
@@ -50,7 +50,7 @@
define( 'WPSQT_URL_MAIN' , admin_url('admin.php?page='.WPSQT_PAGE_MAIN) );
define( 'WPSQT_URL_MAINENTANCE' , admin_url('admin.php?page='.WPSQT_PAGE_MAINTENANCE) );
define( 'WPSQT_CONTACT_EMAIL' , 'support@catn.com' );
-define( 'WPSQT_VERSION' , '2.5.2' );
+define( 'WPSQT_VERSION' , '2.5.3' );
define( 'WPSQT_DIR' , dirname(__FILE__).'/' );
define( 'WPSQT_FILE' , __FILE__ );
Please sign in to comment.
Something went wrong with that request. Please try again.