ILB
/
moodle-mod_game
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix: PHP coding style problems

MOODLE_20_STABLE
bdaloukas 8 years ago
parent
b0ffb2d355
commit
552fad457f
14 changed files with 159 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 178
      exporthtml_snakes.php
  2. 2
      hangman/play.php
  3. 14
      lib.php
  4. 30
      locallib.php
  5. 2
      mod_form.php
  6. 4
      report/overview/report.php
  7. 4
      showattempts.php
  8. 6
      sudoku/class.Sudoku.php
  9. 2
      sudoku/play.php
  10. 2
      tabs.php
  11. 3
      translate.php

178
exporthtml_snakes.php
View File

@ -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('<div id="pawn1"><img id="pawn" alt="" src="images/player1.png"></div>');
move_pawn();
@ -252,12 +253,14 @@ function check_answer_M() {
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='<strong>'+str_score+': </strong><strong class="score">' +score+ '</strong>';
var s = '<strong>'+str_score+': </strong><strong class="score">' +score+ '</strong>';
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='<strong>'+str_score+': </strong><strong class="score">' +score+ '</strong>';
var s = '<strong>'+str_score+': </strong><strong class="score">' +score+ '</strong>';
document.getElementById("show_score").innerHTML = s;
check_exists_snake();
}
@ -273,13 +276,15 @@ function check_answer_S() {
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='<strong>'+str_score+': </strong><strong class="score">' +score+ '</strong>';
var s = '<strong>'+str_score+': </strong><strong class="score">' +score+ '</strong>';
document.getElementById("show_score").innerHTML = s;
check_game_over();
check_exists_ladder();
} else {
} else {
document.getElementById("feedb_wrong").style.display = "block";
score = Math.round((correct_ans/all_ans)*100);
document.getElementById("show_score").innerHTML='<strong>'+str_score+': </strong><strong class="score">' +score+ '</strong>';
var s = '<strong>'+str_score+': </strong><strong class="score">' +score+ '</strong>';
document.getElementById("show_score").innerHTML = s;
check_exists_snake();
}
@ -357,7 +362,7 @@ function display_quest() {
if( IsMultipleChoiceQuestion()) {
display_quest_M();
} else {
} else {
display_quest_S();
}
}
@ -414,9 +419,9 @@ function display_quest_S() {
s = s + feedb_wrong_S+' </div> <div id="feedb" style="display:none; color:yellow;"> ';
s = s + feedb_correct_S+'</div> <br /><div id="OK_btn" style="display:none;">';
s = s + '<input type="button" onclick="display_quest();" value="OK"/></div> </div>';
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;
};
// 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;
}
}
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);
}
}
return string;
}
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;
}
</script>
</body>

2
hangman/play.php
View File

@ -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;

14
lib.php
View File

@ -17,7 +17,7 @@
/**
* Library of functions and constants for module game
*
* @author
* @author Vasilis Daloukas
* @package game
**/
@ -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');
}
}

30
locallib.php
View File

@ -1580,8 +1580,8 @@ function game_print_question_multichoice( $game, $question, $context) {
<table class="answer">
<?php
$row = 1;
foreach ($anss as $answer) {
$row = 1;
foreach ($anss as $answer) {
?>
<tr class="<?php echo 'r'.$row = $row ? 0 : 1; ?>">
<td>
@ -1589,7 +1589,7 @@ function game_print_question_multichoice( $game, $question, $context) {
</td>
</tr>
<?php
}
}
?>
</table>
</div>
@ -1636,8 +1636,8 @@ function game_print_question_multianswer( $game, $question, $context) {
<table class="answer">
<?php
$row = 1;
foreach ($anss as $answer) {
$row = 1;
foreach ($anss as $answer) {
?>
<tr class="<?php echo 'r'.$row = $row ? 0 : 1; ?>">
<td>
@ -1645,7 +1645,7 @@ function game_print_question_multianswer( $game, $question, $context) {
</td>
</tr>
<?php
}
}
?>
</table>
</div>
@ -1657,7 +1657,9 @@ function game_print_question_shortanswer( $game, $question, $context) {
?>
<div class="qtext">
<?php echo game_filterquestion(str_replace( '\"', '"', $questiontext), $question->id, $context->id, $game->course); ?>
<?php
echo game_filterquestion(str_replace( '\"', '"', $questiontext), $question->id, $context->id, $game->course);
?>
</div>
<div class="ablock clearfix">
@ -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<hr><b>$title</b><br>";print_r( $a);echo "<hr>\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 '<br>'.$title.' ';
print_r( $a);
echo '<br>';
}
*/
function game_get_version() {
global $CFG, $DB;

2
mod_form.php
View File

@ -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');

4
report/overview/report.php
View File

@ -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');

4
showattempts.php
View File

@ -75,7 +75,7 @@ function game_showusers($game) {
window.location.href = "<?php echo $href;?>" + document.getElementById('menuuser').value + '&groupid='+groupid;
}
</script>
<?php
<?php
$attributes = 'onchange="javascript:onselectuser();"';
$name = 'user';
@ -128,7 +128,7 @@ function game_showgroups($game) {
window.location.href = "<?php echo $href;?>" + document.getElementById('menugroup').value;
}
</script>
<?php
<?php
$attributes = 'onchange="javascript:onselectgroup();"';
$name = 'group';

6
sudoku/class.Sudoku.php
View File

@ -336,7 +336,7 @@ class cell extends objects {
* @package Sudoku
*/
class rcs extends ObjectS{
class rcs extends ObjectS {
protected $theindex;
protected $therow = array();
@ -781,8 +781,8 @@ class r extends rcs {
* @access private
* @param integer $theIndex the index of the cell within the row or column.
* @return integer the "coupling coefficient" for the cell. The sum of the
* sizes of the intersection between this and all other
* cells in the row or column.
* sizes of the intersection between this and all other
* cells in the row or column.
*/
protected function _coupling($theindex) {

2
sudoku/play.php
View File

@ -285,7 +285,7 @@ function game_sudoku_showsudoku( $data, $guess, $bshowlegend, $bshowsolution, $o
window.location.href = "<?php echo $href; ?>&pos=" + pos + "&num=" + s;
}
</script>
<?php
<?php
// Here are the congratulations.
if ($attempt->timefinish) {

2
tabs.php
View File

@ -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) {

3
translate.php
View File

@ -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");

Write Preview
Loading…
Cancel
Save