' . $answer->feedback;
+ $result .= '
'. $answer->feedback;
}
}
else {
- $result .= t('This answer has not yet been scored.') .
- '
' .
+ $result .= t('This answer has not yet been scored.') .'
'.
t('Until the answer is scored, the total score will not be correct.');
}
if (user_access('score long answer')) {
$path = sprintf('admin/quiz/score-long-answer/%s/%s', $question->vid, $answer->result_id);
- $result .= '
' . l(t('Score this answer'), $path) . '
';
+ $result .= '
'. l(t('Score this answer'), $path) .'
';
}
}
else {
@@ -61,10 +60,10 @@ function theme_long_answer_report($quest
* This is basically useless for long answer questions.
*/
function theme_long_answer_feedback($quiz, $report) {
- $output = '
' . t('Q:') . ''.
+ $output = '
'. t('Q:') .''.
check_markup($report->body, $report->format) .
'
'.
t('The answer to this question will be scored by hand.')
- . '
';
+ .'
';
return $output;
-}
\ No newline at end of file
+}
Index: multichoice.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quiz/multichoice.install,v
retrieving revision 1.6.4.2
diff -u -p -r1.6.4.2 multichoice.install
--- multichoice.install 24 Mar 2009 20:42:11 -0000 1.6.4.2
+++ multichoice.install 30 Mar 2009 10:47:37 -0000
@@ -40,7 +40,7 @@ function multichoice_schema() {
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
- ),
+ ),
'question_vid' => array(
'type' => 'int',
'unsigned' => TRUE,
@@ -61,7 +61,7 @@ function multichoice_schema() {
'result_id', 'question_nid', 'question_vid', 'answer_id',
),
);
-
+
/**
* Stores user answers for multichoice quiz.
*/
@@ -108,7 +108,7 @@ function multichoice_schema() {
);
// Default the "Show Author and Date" for this question type to OFF.
- $temp_array = variable_get('theme_settings','' /*$default*/);
+ $temp_array = variable_get('theme_settings', '' /*$default*/);
$temp_array['toggle_node_info_multichoice'] = 0;
variable_set('theme_settings', $temp_array);
@@ -140,4 +140,4 @@ function multichoice_uninstall() {
// Inform the user that uninstall was sucessful.
drupal_set_message(t("The Multichoice module, it's settings, and all saved questions were successfully removed."));
}
-
\ No newline at end of file
+
Index: quiz.actions.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quiz/Attic/quiz.actions.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 quiz.actions.inc
--- quiz.actions.inc 1 Dec 2008 17:46:33 -0000 1.1.2.1
+++ quiz.actions.inc 30 Mar 2009 10:47:37 -0000
@@ -1,4 +1,5 @@
(int) $form_state['values']['playing_card_id']);
*/
}
-?>
\ No newline at end of file
Index: quiz.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quiz/quiz.admin.inc,v
retrieving revision 1.2.2.10
diff -u -p -r1.2.2.10 quiz.admin.inc
--- quiz.admin.inc 24 Mar 2009 20:55:17 -0000 1.2.2.10
+++ quiz.admin.inc 30 Mar 2009 10:47:37 -0000
@@ -67,7 +67,7 @@ function quiz_admin_results($qid) {
$summary = _quiz_get_summary_text($quiz, $score);
// Lets add the quiz title to the breadcrumb array.
- $breadcrumb[] = l($quiz->title, 'admin/quiz/'.$result->nid.'/view');
+ $breadcrumb[] = l($quiz->title, 'admin/quiz/'. $result->nid .'/view');
drupal_set_breadcrumb($breadcrumb);
return theme('quiz_admin_summary', $quiz, $questions, $score, $summary);
}
@@ -130,7 +130,7 @@ function quiz_questions_form($context, $
// Display questions 'always' on this quiz.
$form['filtered_question_list_always'] = array(
'#type' => 'fieldset',
- '#title' => t("Questions 'always' on this quiz"),
+ '#title' => t('Questions \'always\' quiz'),
'#theme' => 'quiz_filtered_questions',
'#collapsible' => TRUE,
'question_status' => array('#tree' => TRUE),
@@ -160,7 +160,7 @@ function quiz_questions_form($context, $
// Display questions 'random' on this quiz.
$form['filtered_question_list_random'] = array(
'#type' => 'fieldset',
- '#title' => t("Questions 'random' on this quiz"),
+ '#title' => t('Questions \'random\' on this quiz'),
'#theme' => 'quiz_filtered_questions',
'#collapsible' => TRUE,
'question_status' => array('#tree' => TRUE),
@@ -169,7 +169,7 @@ function quiz_questions_form($context, $
// Display filtered question list.
$form['filtered_question_list'] = array(
'#type' => 'fieldset',
- '#title' => t("Questions 'never' on this quiz"),
+ '#title' => t('Questions \'never\' on this quiz'),
'#theme' => 'quiz_filtered_questions',
'#collapsible' => TRUE,
'question_status' => array('#tree' => TRUE),
@@ -269,7 +269,7 @@ function quiz_questions_form_submit($for
else {
// Warn user if not enough questions available with this term_id.
//$available_random = count(_quiz_get_random_questions($form_state['values']['number_of_random_questions'], $form_state['values']['random_term_id']));
- $available_random = count(_quiz_get_random_taxonomy_question_ids($form_state['values']['random_term_id'],$form_state['values']['number_of_random_questions']));
+ $available_random = count(_quiz_get_random_taxonomy_question_ids($form_state['values']['random_term_id'], $form_state['values']['number_of_random_questions']));
if ($form_state['values']['number_of_random_questions'] > $available_random) {
$form_state['values']['number_of_random_questions'] = $available_random;
drupal_set_message(t('There are currently not enough questions assigned to this term (@random). Please lower the number of random quetions or assign more questions to this taxonomy term before taking this @quiz.', array('@random' => $available_random, '@quiz' => QUIZ_NAME)), 'error');
@@ -328,7 +328,7 @@ function quiz_admin_settings() {
'#type' => 'textfield',
'#title' => t('Maximum Result Options'),
'#description' => t('Set the maximum number of result options (categorizations for scoring a quiz).'),
- '#default_value' => variable_get('quiz_max_result_options',5),
+ '#default_value' => variable_get('quiz_max_result_options', 5),
'#size' => 2,
'#maxlength' => 2,
'#required' => FALSE,
@@ -540,4 +540,4 @@ function theme_quiz_admin_summary($quiz,
$output .= theme('quiz_feedback', $questions, TRUE, TRUE);
return $output;
}
-
\ No newline at end of file
+
Index: quiz.help.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quiz/quiz.help.inc,v
retrieving revision 1.2
diff -u -p -r1.2 quiz.help.inc
--- quiz.help.inc 20 Oct 2008 19:57:31 -0000 1.2
+++ quiz.help.inc 30 Mar 2009 10:47:37 -0000
@@ -1,4 +1,5 @@
t('Quiz admin', array('@quiz' => QUIZ_NAME)),
'page callback' => 'theme',
- 'page arguments' => array('quiz_view',1),
+ 'page arguments' => array('quiz_view', 1),
'access arguments' => array('administer quiz'),
'type' => MENU_LOCAL_TASK,
'file' => 'quiz.admin.inc',
@@ -291,15 +291,15 @@ function quiz_theme() {
'file' => 'quiz.admin.inc',
),
'quiz_admin_summary' => array(
- 'arguments' => array('quiz' =>NULL, 'questions' => NULL, 'score' =>NULL, 'summary' => NULL),
+ 'arguments' => array('quiz' => NULL, 'questions' => NULL, 'score' => NULL, 'summary' => NULL),
'file' => 'quiz.admin.inc',
),
'quiz_user_summary' => array(
- 'arguments' => array('quiz' =>NULL, 'questions' => NULL, 'score' =>NULL, 'summary' => NULL),
+ 'arguments' => array('quiz' => NULL, 'questions' => NULL, 'score' => NULL, 'summary' => NULL),
'file' => 'quiz.pages.inc',
),
'quiz_feedback' => array(
- 'arguments' => array('questions' => NULL, 'showpoints' =>TRUE, 'showfeedback' => FALSE),
+ 'arguments' => array('questions' => NULL, 'showpoints' => TRUE, 'showfeedback' => FALSE),
'file' => 'quiz.pages.inc',
),
'quiz_single_question_feedback' => array(
@@ -307,11 +307,11 @@ function quiz_theme() {
'file' => 'quiz.pages.inc',
),
'quiz_questions' => array(
- 'arguments' => array('form' => NULL),
- 'file' => 'quiz.pages.inc',
+ 'arguments' => array('form' => NULL),
+ 'file' => 'quiz.pages.inc',
),
'quiz_progress' => array(
- 'arguments' => array('question_number' =>NULL, 'num_of_question' => NULL),
+ 'arguments' => array('question_number' => NULL, 'num_of_question' => NULL),
'file' => 'quiz.pages.inc',
),
'quiz_question_table' => array(
@@ -660,7 +660,7 @@ function quiz_form(&$node) {
$num_options = max(3, (!empty($options)) ? count($options) : variable_get('quiz_max_result_options', 5));
for ($i=0; $i < $num_options; $i++) {
- $option = (count($options) > 0) ? array_shift($options) : null; // grab each option in the array
+ $option = (count($options) > 0) ? array_shift($options) : NULL; // grab each option in the array
$form['resultoptions'][$i] = array(
'#type' => 'fieldset',
'#title' => t('Result Option ') . ($i + 1),
@@ -776,8 +776,8 @@ function quiz_validate($node) {
*/
function quiz_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
// We need to filter on node type to prevent this from overriding any other node
- if($node->type == 'quiz') {
- switch($op) {
+ if ($node->type == 'quiz') {
+ switch ($op) {
case 'presave':
/*
* convert the action id to the actual id from the MD5 hash
@@ -893,7 +893,7 @@ function quiz_take_quiz($quiz) {
drupal_access_denied();
return;
}
- if(!isset($quiz)) {
+ if (!isset($quiz)) {
drupal_not_found();
return;
}
@@ -942,7 +942,7 @@ function quiz_take_quiz($quiz) {
// TODO: This can be maintained more efficiently with a single array of
// all questions and then a pointer to the current question. That makes
// rewinding much easier.
- $quiz_id = 'quiz_' . $quiz->nid;
+ $quiz_id = 'quiz_'. $quiz->nid;
$last_q = array_pop($_SESSION[$quiz_id]['previous_quiz_questions']);
array_unshift($_SESSION[$quiz_id]['quiz_questions'], $last_q);
}
@@ -1120,7 +1120,7 @@ function quiz_end_actions($quiz, $rid) {
* Lets piggy back here to perform the quiz defined action since were done with this quiz.
* We will verify that there is an associated action with this quiz and then perform that action.
*/
- if(!empty($quiz->aid)) {
+ if (!empty($quiz->aid)) {
/*
* Some actions are reliant on objects and I am unsure which ones, for now I have simply
* passed the actions_do() function an empty array. By passing this function a single id
@@ -1274,8 +1274,8 @@ function quiz_start_actions($quiz) {
}
// Check to see if this user is allowed to take the quiz again:
- if($quiz->takes > 0) {
- $query = "SELECT COUNT(*) AS takes FROM {quiz_node_results} WHERE uid = %s AND nid = %s AND vid = %s";
+ if ($quiz->takes > 0) {
+ $query = "SELECT COUNT(*) AS takes FROM {quiz_node_results} WHERE uid = %d AND nid = %d AND vid = %d";
$taken = db_result(db_query($query, $user->uid, $quiz->nid, $quiz->vid));
$allowed_times = format_plural($quiz->takes, '1 time', '@count times');
$taken_times = format_plural($taken, '1 time', '@count times');
@@ -1364,7 +1364,7 @@ function quiz_calculate_score($quiz, $ri
// We don't use module_invoke() because (1) we don't necessarily want to wed quiz type to
// module, and (2) this is more efficient -- no NULL checks.
$mod = quiz_module_for_type($question->type);
- $function = $mod . '_quiz_question_score';
+ $function = $mod .'_quiz_question_score';
if (function_exists($function)) {
$scores[] = $function($quiz, $question->child_nid, $question->child_vid, $rid);
@@ -1423,7 +1423,7 @@ function quiz_calculate_personality_scor
$scores = array();
$options = array();
while ($question = db_fetch_object($results)) {
- $function = $question->type . '_quiz_personality_question_score';
+ $function = $question->type .'_quiz_personality_question_score';
if (function_exists($function)) {
$option_id = $function($quiz, $question->child_nid, $question->child_vid, $rid);
//$options[$option_id] = isset($options[$option_id]) ? $options[$option_id] + 1 : 1;
@@ -1546,10 +1546,10 @@ function quiz_update_questions(&$quiz, $
continue;
}
$existing = $existing_questions[$nid];
- if($stat != QUESTION_NEVER) {
+ if ($stat != QUESTION_NEVER) {
if ($existing) {
// This appears to be comparing publishing status with question_status?
- if($existing->question_status != $stat) {
+ if ($existing->question_status != $stat) {
// Question's status has been changed.
$existing->question_status = $stat;
$i_am_different = TRUE;
@@ -1783,7 +1783,7 @@ function _quiz_get_random_questions(/*$n
$questions = array();
if ($num_random > 0) {
if ($tid > 0) {
- $questions = _quiz_get_random_taxonomy_question_ids($tid,$num_random);
+ $questions = _quiz_get_random_taxonomy_question_ids($tid, $num_random);
/*
// Select random questions by taxonomy.
$term = taxonomy_get_term($tid);
@@ -1827,7 +1827,7 @@ function _quiz_get_random_questions(/*$n
* @return
* Array of nid/vid combos, like array(array('nid'=>1, 'vid'=>2)).
*/
-function _quiz_get_random_taxonomy_question_ids($tid,$num_random) {
+function _quiz_get_random_taxonomy_question_ids($tid, $num_random) {
if ($tid == 0) {
return array();
}
@@ -1850,9 +1850,9 @@ function _quiz_get_random_taxonomy_quest
FROM {node} n
INNER JOIN {term_node} tn USING (nid)
WHERE n.status = 1 AND tn.tid IN ($term_ids)
- AND n.type IN ('"
- . implode("','", array_keys(_quiz_get_question_types()))
- . "') ORDER BY RAND()", 0, $num_random);
+ AND n.type IN ('".
+ implode("','", array_keys(_quiz_get_question_types()))
+ ."') ORDER BY RAND()", 0, $num_random);
$questions = array();
while ($question_node = db_fetch_array($result)) {
Index: quiz.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quiz/quiz.pages.inc,v
retrieving revision 1.2.2.10
diff -u -p -r1.2.2.10 quiz.pages.inc
--- quiz.pages.inc 26 Mar 2009 19:55:15 -0000 1.2.2.10
+++ quiz.pages.inc 30 Mar 2009 10:47:42 -0000
@@ -141,10 +141,10 @@ function theme_quiz_view($node, $teaser
$output .= '
'. t('Days @quiz live for: ', array('@quiz' => QUIZ_NAME)) .' '. floor(($node->quiz_close - $node->quiz_open) / 60 / 60 / 24) .'
';
$remaining = floor(($node->quiz_close - time()) / 60 / 60 / 24);
$remaining = ($remaining < 0) ? t('Expired') : $remaining;
- $output .= '
'. t('Days remaining:') . ' '. $remaining .'
';
+ $output .= '
'. t('Days remaining:') .''. $remaining .'
';
$elapsed = floor((time() - $node->quiz_open) / 60 / 60 / 24);
$elapsed = ($elapsed < 0)?(-$elapsed) . t(' days to go') : $elapsed;
- $output .= '
' . t('Days since start:') . ' '. $elapsed .'
';
+ $output .= '
'. t('Days since start:') .''. $elapsed .'
';
}
else {
$output .= '
'. t('This Quiz is always available.') .'
'."\n";
@@ -277,7 +277,7 @@ function theme_quiz_filtered_questions($
}
}
if (!empty($rows)) {
- $output .= theme('table', $header, $rows);
+ $output .= theme('table', $header, $rows);
}
else {
$output .= t('No questions found.');
@@ -551,4 +551,4 @@ function theme_quiz_no_feedback() {
function theme_quiz_single_question_node($node) {
return $node->body;
}
-
\ No newline at end of file
+
Index: quiz_datetime.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quiz/quiz_datetime.inc,v
retrieving revision 1.2
diff -u -p -r1.2 quiz_datetime.inc
--- quiz_datetime.inc 13 Apr 2007 20:33:38 -0000 1.2
+++ quiz_datetime.inc 30 Mar 2009 10:47:42 -0000
@@ -7,7 +7,8 @@
// - All references to event variables should be optional
/////////////////////////////////
-/**
+/*
+ * @file
* Handles the start and end times in a node form submission.
* - Takes the array from form_date() and turns it into a timestamp
* - Adjusts times for time zone offsets.
@@ -70,7 +71,7 @@ function _quiz_mktime($hour, $minute, $s
* @param $offset Time zone offset to apply to the timestamp.
* @return gmdate() formatted date value
*/
-function _quiz_date($format, $timestamp, $offset = null) {
+function _quiz_date($format, $timestamp, $offset = NULL) {
global $user;
if (isset($offset)) {
Index: quiz_question.core.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quiz/Attic/quiz_question.core.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 quiz_question.core.inc
--- quiz_question.core.inc 26 Mar 2009 19:55:15 -0000 1.1.2.2
+++ quiz_question.core.inc 30 Mar 2009 10:47:42 -0000
@@ -1,5 +1,5 @@
array(
- 'vid','nid'
+ 'vid', 'nid'
),
);
// Place to store user answers for T/F questions
Index: quiz_question.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quiz/Attic/quiz_question.theme.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 quiz_question.theme.inc
--- quiz_question.theme.inc 26 Mar 2009 21:02:42 -0000 1.1.2.3
+++ quiz_question.theme.inc 30 Mar 2009 10:47:42 -0000
@@ -1,7 +1,8 @@
feedback)) {
- $result .= '
' . $answer->feedback;
+ $result .= '