diff --git a/exporthtml_snakes.php b/exporthtml_snakes.php index a0638f0..dd921a6 100644 --- a/exporthtml_snakes.php +++ b/exporthtml_snakes.php @@ -169,12 +169,13 @@ function ShowMainForm() direction=Math.floor((current_position /cols))%2; if (direction == 1) { axis_x=(cols-(current_position %cols)-1); - } else { - axis_x=current_position %cols; + } else { + axis_x=current_position %cols; } axis_y=Math.floor((current_position /rows)); pawn_x=board_headerx[current_board]+(axis_x*col_width)+(col_width-pawn_width[current_board])/2; - pawn_y=board_footery[current_board]+pawn_height[current_board]+(axis_y*col_height)+(col_height-pawn_height[current_board])/2; + pawn_y=board_footery[current_board]+pawn_height[current_board]+(axis_y*col_height); + pawn_y += (col_height-pawn_height[current_board])/2; document.write('
'); move_pawn(); @@ -183,7 +184,7 @@ function ShowMainForm() function selectBoard() { current_board = document.getElementById("boardtype").value; - document.getElementById("boardimage").src = "images/" + board_images[ current_board]; + document.getElementById("boardimage").src = "images/" + board_images[ current_board]; } function select_quest() { @@ -238,7 +239,7 @@ function check_answer_M() { return; } - var feedbacks = decode_multiple_choice(quest_feedb); + var feedbacks = decode_multiple_choice(quest_feedb); var j; for (j=0;j' +score+ ''; + var s = ''+str_score+': ' +score+ ''; + document.getElementById("show_score").innerHTML = s; check_game_over(); check_exists_ladder(); } else { - score = Math.round((correct_ans/all_ans)*100); - document.getElementById("show_score").innerHTML=''+str_score+': ' +score+ ''; + score = Math.round((correct_ans/all_ans)*100); + var s = ''+str_score+': ' +score+ ''; + document.getElementById("show_score").innerHTML = s; check_exists_snake(); } - document.getElementById("OK_btn").style.display = "block"; + document.getElementById("OK_btn").style.display = "block"; } function check_answer_S() { document.getElementById("answer").disabled = "true"; document.getElementById("check_btn").style.display = "none"; - + if (document.getElementById("answer").value.toUpperCase() == quest_resp[ 1].toUpperCase()) { document.getElementById("feedb").style.display = "block"; current_position += current_dice; correct_ans =correct_ans+1; //calculate new score score = Math.round((correct_ans/all_ans)*100); - document.getElementById("show_score").innerHTML=''+str_score+': ' +score+ ''; + var s = ''+str_score+': ' +score+ ''; + document.getElementById("show_score").innerHTML = s; check_game_over(); - check_exists_ladder(); - } else { + check_exists_ladder(); + } else { document.getElementById("feedb_wrong").style.display = "block"; score = Math.round((correct_ans/all_ans)*100); - document.getElementById("show_score").innerHTML=''+str_score+': ' +score+ ''; + var s = ''+str_score+': ' +score+ ''; + document.getElementById("show_score").innerHTML = s; check_exists_snake(); } - document.getElementById("OK_btn").style.display = "block"; + document.getElementById("OK_btn").style.display = "block"; } function check_game_over() { @@ -301,7 +306,7 @@ function check_exists_ladder() { if( pos < 0) { return; } - + var s = board_contents[ current_board].substr( pos+find.length) pos = s.indexOf( ','); if (pos >= 0) { @@ -357,7 +362,7 @@ function display_quest() { if( IsMultipleChoiceQuestion()) { display_quest_M(); - } else { + } else { display_quest_S(); } } @@ -376,12 +381,12 @@ function display_quest_M() { for(i=0; i < mchoice_count ; i++) { mchoice_positions[ i] = i+1; } - for(i=0; i < mchoice_count ; i++) { + for(i=0; i < mchoice_count ; i++) { var j = Math.floor((Math.random() * mchoice_count)); var temp = mchoice_positions[ i]; mchoice_positions[ i] = mchoice_positions[ j]; mchoice_positions[ j] = temp; - } + } for(i=0; i < mchoice_count;i++) { s = s + '
'; - document.getElementById("dicecont").innerHTML = s; - document.getElementById("question_area").style.display = "block"; - document.getElementById("check_btn").style.display = "block"; + document.getElementById("dicecont").innerHTML = s; + document.getElementById("question_area").style.display = "block"; + document.getElementById("check_btn").style.display = "block"; } function move_pawn() { @@ -428,91 +433,86 @@ function move_pawn() { var col_width = (board_width[current_board]-board_headerx[current_board]-board_footerx[current_board])/cols; var col_height = (board_height[current_board]-board_headery[current_board]-board_footery[current_board])/rows; - if( current_position >= 0) { - direction=Math.floor((current_position /cols))%2; - if (direction == 1) { - axis_x=(cols-(current_position %cols)-1); - } else { - axis_x=current_position %cols; + if( current_position >= 0) { + direction=Math.floor((current_position /cols))%2; + if (direction == 1) { + axis_x=(cols-(current_position %cols)-1); + } else { + axis_x=current_position %cols; } - - axis_y=Math.floor((current_position /rows)); - pawn_x=board_headerx[current_board]+(axis_x*col_width)+(col_width-pawn_width[current_board])/2; - pawn_y=board_footery[current_board]+pawn_height[current_board]+(axis_y*col_height)+(col_height-pawn_height[current_board])/2; + + axis_y=Math.floor((current_position /rows)); + pawn_x=board_headerx[current_board]+(axis_x*col_width)+(col_width-pawn_width[current_board])/2; + pawn_y = board_footery[current_board]+pawn_height[current_board]+(axis_y*col_height); + pawn_y += (col_height-pawn_height[current_board])/2; document.getElementById("pawn1").style.position='relative'; - document.getElementById("pawn1").style.left=pawn_x+'px'; - document.getElementById("pawn1").style.bottom=pawn_y+'px'; - } + document.getElementById("pawn1").style.left=pawn_x+'px'; + document.getElementById("pawn1").style.bottom=pawn_y+'px'; + } } - function Base64decode(input) { - var output = ""; - var chr1, chr2, chr3; - var enc1, enc2, enc3, enc4; - var i = 0; - var keyStr="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - - input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); - - while (i < input.length) { - - enc1 = keyStr.indexOf(input.charAt(i++)); - enc2 = keyStr.indexOf(input.charAt(i++)); - enc3 = keyStr.indexOf(input.charAt(i++)); - enc4 = keyStr.indexOf(input.charAt(i++)); - - chr1 = (enc1 << 2) | (enc2 >> 4); - chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); - chr3 = ((enc3 & 3) << 6) | enc4; - - output = output + String.fromCharCode(chr1); - - if (enc3 != 64) { - output = output + String.fromCharCode(chr2); - } - if (enc4 != 64) { - output = output + String.fromCharCode(chr3); - } - } - - output = Base64_utf8_decode(output); - - return output; - - }; + function Base64decode(input) { + var output = ""; + var chr1, chr2, chr3; + var enc1, enc2, enc3, enc4; + var i = 0; + var keyStr="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - // Private method for UTF-8 decoding. - function Base64_utf8_decode(utftext) { - var string = ""; - var i = 0; - var c = c1 = c2 = 0; - - while ( i < utftext.length ) { - - c = utftext.charCodeAt(i); - - if (c < 128) { - string += String.fromCharCode(c); - i++; - } - else if((c > 191) && (c < 224)) { - c2 = utftext.charCodeAt(i+1); - string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); - i += 2; - } - else { - c2 = utftext.charCodeAt(i+1); - c3 = utftext.charCodeAt(i+2); - string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); - i += 3; - } - - } - - return string; - } + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); + + while (i < input.length) { + enc1 = keyStr.indexOf(input.charAt(i++)); + enc2 = keyStr.indexOf(input.charAt(i++)); + enc3 = keyStr.indexOf(input.charAt(i++)); + enc4 = keyStr.indexOf(input.charAt(i++)); + + chr1 = (enc1 << 2) | (enc2 >> 4); + chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); + chr3 = ((enc3 & 3) << 6) | enc4; + + output = output + String.fromCharCode(chr1); + + if (enc3 != 64) { + output = output + String.fromCharCode(chr2); + } + if (enc4 != 64) { + output = output + String.fromCharCode(chr3); + } + } + + output = Base64_utf8_decode(output); + + return output; + + }; + + // Private method for UTF-8 decoding. + function Base64_utf8_decode(utftext) { + var string = ""; + var i = 0; + var c = c1 = c2 = 0; + + while ( i < utftext.length ) { + c = utftext.charCodeAt(i); + + if (c < 128) { + string += String.fromCharCode(c); + i++; + } else if((c > 191) && (c < 224)) { + c2 = utftext.charCodeAt(i+1); + string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); + i += 2; + } else { + c2 = utftext.charCodeAt(i+1); + c3 = utftext.charCodeAt(i+2); + string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); + i += 3; + } + } + return string; + } diff --git a/exportjavame.php b/exportjavame.php index 218295f..c54e06e 100644 --- a/exportjavame.php +++ b/exportjavame.php @@ -16,7 +16,7 @@ /** * This page export the game to javame for mobile phones - * + * * @author bdaloukas * @package game **/ diff --git a/hangman/play.php b/hangman/play.php index 3ad37ff..630ec33 100644 --- a/hangman/play.php +++ b/hangman/play.php @@ -16,6 +16,8 @@ // This file plays the game hangman. +defined('MOODLE_INTERNAL') || die(); + function game_hangman_continue( $id, $game, $attempt, $hangman, $newletter, $action, $context) { global $DB, $USER; diff --git a/lib.php b/lib.php index e03cb0a..e9a89fb 100644 --- a/lib.php +++ b/lib.php @@ -17,7 +17,7 @@ /** * Library of functions and constants for module game * - * @author + * @author Vasilis Daloukas * @package game **/ @@ -179,7 +179,7 @@ function game_before_add_or_update(&$game) { } /** - * Given an ID of an instance of this module, + * Given an ID of an instance of this module, * this function will permanently delete the instance * and any data that depends on it. * @@ -262,7 +262,7 @@ function game_user_outline($course, $user, $mod, $game) { } /** - * Print a detailed representation of what a user has done with + * Print a detailed representation of what a user has done with * a given particular instance of this module, for user activity reports. **/ function game_user_complete($course, $user, $mod, $game) { @@ -291,7 +291,7 @@ function game_user_complete($course, $user, $mod, $game) { /** * Given a course and a time, this module should find recent activity * that has occurred in game activities and print it out. - * Return true if there was output, or false is there was none. + * Return true if there was output, or false is there was none. * * @uses $CFG * @return boolean @@ -320,9 +320,9 @@ function game_cron() { } /** - * Must return an array of grades for a given instance of this module, + * Must return an array of grades for a given instance of this module, * indexed by user. It also returns a maximum allowed grade. - * + * * Example: * $return->grades = array of grades; * $return->maxgrade = maximum allowed grade; @@ -972,7 +972,7 @@ if (!defined('USE_GET_SHORTCUTS')) { if (defined('USE_GET_SHORTCUTS')) { /** * Returns an array of game type objects to construct - * menu list when adding new game + * menu list when adding new game * */ function game_get_shortcuts($defaultitem) { @@ -1359,11 +1359,11 @@ function game_get_context_course_instance( $courseid) { } function game_pix_url( $filename) { - global $OUTPUT; + global $OUTPUT; - if (game_get_moodle_version() >= '03.03') { - return $OUTPUT->image_url($filename, 'mod_game'); - } else { - return $OUTPUT->pix_url($filename, 'mod_game'); - } + if (game_get_moodle_version() >= '03.03') { + return $OUTPUT->image_url($filename, 'mod_game'); + } else { + return $OUTPUT->pix_url($filename, 'mod_game'); + } } diff --git a/locallib.php b/locallib.php index d6e54fc..3fe1335 100644 --- a/locallib.php +++ b/locallib.php @@ -1579,17 +1579,17 @@ function game_print_question_multichoice( $game, $question, $context) { - -
control; ?>
@@ -1635,17 +1635,17 @@ function game_print_question_multianswer( $game, $question, $context) { - -
control; ?>
@@ -1657,7 +1657,9 @@ function game_print_question_shortanswer( $game, $question, $context) { ?>
- id, $context->id, $game->course); ?> +id, $context->id, $game->course); +?>
@@ -1890,12 +1892,6 @@ function game_addattempt( $game) { return $DB->get_record_select( 'game_attempts', 'id='.$newid); } -/* -function game_print_r( $title, $a) { - echo "\r\n
$title
";print_r( $a);echo "
\r\n"; -} -*/ - function game_get_contexts() { global $CFG, $COURSE; @@ -2016,14 +2012,6 @@ function game_question_get_id_from_name_prefix($name) { return (integer) $matches[ 1]; } -/* -function game_debug_array( $title, $a) { - echo '
'.$title.' '; - print_r( $a); - echo '
'; -} -*/ - function game_get_version() { global $CFG, $DB; diff --git a/mod_form.php b/mod_form.php index 63081cf..d07b3fe 100644 --- a/mod_form.php +++ b/mod_form.php @@ -22,6 +22,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +defined('MOODLE_INTERNAL') || die(); + require_once( $CFG->dirroot.'/course/moodleform_mod.php'); require( 'locallib.php'); diff --git a/preview.php b/preview.php index 1a5d883..6acaf2d 100644 --- a/preview.php +++ b/preview.php @@ -16,7 +16,7 @@ /** * This page prints a particular attempt of game - * + * * @author bdaloukas * @package game **/ diff --git a/report/overview/report.php b/report/overview/report.php index 05a95e2..5b60c53 100644 --- a/report/overview/report.php +++ b/report/overview/report.php @@ -16,13 +16,13 @@ defined('MOODLE_INTERNAL') || die(); -/** +/* * This script lists student attempts * * @author bdaloukas. * @license http://www.gnu.org/copyleft/gpl.html GNU Public License * @package game - *//** */ + */ require_once($CFG->libdir.'/tablelib.php'); diff --git a/settings.php b/settings.php index aaac733..a0b110f 100644 --- a/settings.php +++ b/settings.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * Form for creating and modifying a game + * Form for creating and modifying a game * * @package game * @author Vasilis Daloukas diff --git a/showattempts.php b/showattempts.php index 9dd2126..ab7e2bd 100644 --- a/showattempts.php +++ b/showattempts.php @@ -75,7 +75,7 @@ function game_showusers($game) { window.location.href = "" + document.getElementById('menuuser').value + '&groupid='+groupid; } -" + document.getElementById('menugroup').value; } - &pos=" + pos + "&num=" + s; } -timefinish) { diff --git a/tabs.php b/tabs.php index c3243a3..27118ea 100644 --- a/tabs.php +++ b/tabs.php @@ -72,7 +72,7 @@ if ($currenttab == 'reports' and isset($mode)) { $activated[] = 'reports'; $allreports = get_list_of_plugins("mod/game/report"); - // Standard reports we want to show first + // Standard reports we want to show first. $reportlist = array ('overview'); foreach ($allreports as $report) { diff --git a/translate.php b/translate.php index b2b0bf5..9eae5bc 100644 --- a/translate.php +++ b/translate.php @@ -17,8 +17,7 @@ /** * Check translation of module Game * - * @author - * @version $Id: translate.php,v 1.10 2012/07/25 23:07:43 bdaloukas Exp $ + * @author Vasilis Daloukas * @package game **/ require( "../../config.php");