'.$text; - } - - echo "
".$titles[ $i]."
".$text."\r\n\r\n\r\n\r\n"; - - $rtexts[] = $text; - } -} - -function extract_data( $courseid, $modname, $id, $basedir, $subchapter, $levels, $titles, $texts) { - global $CFG; - global $matches; - - $dirtemp = $CFG->dataroot.'/temp/'.$basedir; - - for ($i = 0; $i < count( $levels); $i++) { - echo $levels[ $i]." ".$titles[ $i]."
"; - } - - $extractedpages = array(); - - // Directory for images. - make_mod_upload_directory( $courseid); // Make sure moddata is made. - make_upload_directory( $courseid.'/moddata/'.$modname, false); - // We store our images in a subfolder in here. - make_upload_directory( $courseid.'/moddata/'.$modname."/".$id, false); - - $imagedir = $CFG->dataroot.'/'.$courseid.'/moddata/'.$modname."/".$id; - - if ($CFG->slasharguments) { - $imagelink = $CFG->wwwroot.'/file.php/'.$courseid.'/moddata/'.$modname."/".$id; - } else { - $imagelink = $CFG->wwwroot.'/file.php?file=/'.$courseid.'/moddata/'.$modname."/".$id; - } - - // Try to make a unique subfolder to store the images. - $i = 1; - while (true) { - $newdir = $imagedir.'/'.$i; - if (!file_exists( $newdir)) { - // Ok doesnt exist so make the directory and update our paths. - mkdir( $newdir); - $imagedir = $newdir; - $imagelink = $imagelink.'/'.$i; - break; - } - $i++; - } - - for ($i = 0; $i < count( $titles); $i++) { - // Start building our page. - $page = new stdClass; - $page->title = $titles[ $i]; - $page->content = $texts[ $i]; - $page->subchapter = ( $levels[ $i] >= 2); - - // Check if the nexts are subchapters. - for ($j = $i + 1; $j < count( $titles); $j++) { - if ($levels[ $j] > 2) { - $page->content .= '
'.$titles[ $j].'
'.$texts[ $j]; - $i = $j; - continue; - } - break; - } - - preg_match_all('#="Pictures/([a-z .A-Z_0-9]*)"#es', $page->content, $imgs); - - foreach ($imgs[1] as $img) { - $src = $dirtemp.'/Pictures/'.$img; - $dest = $imagedir.'/'.$img; - rename( $src, $dest); - - $page->content = str_replace( "Pictures/$img", $imagelink."/".$img, $page->content); - } - - // Add the page to the array. - $extractedpages[] = $page; - } // End $pages foreach loop. - - return $extractedpages; -} - -/* - Clean up the temp directory - */ -function clean_temp( $base) { - global $CFG; - - // This function is broken, use it to clean up later. - // Should only clean up what we made as well because someone else could be importing ppt as well. - $dir = $CFG->dataroot.'/temp/'.$base; - - remove_dir( $dir); -} - -/* - Creates objects an chapter object that is to be inserted into the database -*/ -function game_bookquiz_create_objects( $pageobjects, $bookid) { - global $DB; - - $chapters = array(); - - $lastpagenum = $DB->get_field('book_chapters', 'MAX(pagenum) as num', array( 'bookid' => $bookid)); - - foreach ($pageobjects as $pageobject) { - $chapter = new stdClass; - - // Same for all chapters. - $chapter->bookid = $bookid; - $chapter->pagenum = ++$lastpagenum; - $chapter->timecreated = time(); - $chapter->timemodified = time(); - $chapter->subchapter = 0; - - if ($pageobject->title == '') { - $chapter->title = "Page $count"; // No title set so make a generic one. - } else { - $chapter->title = addslashes($pageobject->title); - } - $chapter->subchapter = $pageobject->subchapter; - - $content = str_replace("\n", '', $pageobject->content); - $content = str_replace("\r", '', $content); - $content = str_replace(' ', '', $content); // Puts in returns? - $content = '
'.$content.'
'; - - $chapter->content = addslashes( $content); - - $chapters[] = $chapter; - } - - return $chapters; -} - -// Save the chapter objects to the database. -function game_bookquiz_save_objects($chapters) { - global $DB; - - // Nothing fancy, just save them all in order. - foreach ($chapters as $chapter) { - if (!$newid = $DB->insert_record('book_chapters', $chapter)) { - print_error('Could not insert to table book_chapters'); - } - } - - return true; -} - -// Splits the data to. -function game_bookquiz_splitsections($data, &$positions, &$inputs, &$titles, &$titleframes, &$texts) { - preg_match_all('#'.game_bookquiz_convert_text( $text, $styles).'
'; - $data = str_replace( $originals[ $i], $new, $data); - } - } - - // Repairs text:span text:style-name. - preg_match_all( '#- '.$texts[ $i].'
', $data); - - return $data; -} - -function game_bookquiz_convert_text( $text, $styles) { - $pattern = "#
| ', $table);
- }
-
- // Maybe there are a lot of pictures inside a table.
- preg_match_all('#xlink:href="Pictures/([a-z.A-Z_0-9]*)"#es', $table, $repl);
- foreach ($repl[ 1] as $picture) {
- $table = str_replace(' |
'.$table.'
'; - - return $ret; -} - -function game_bookquiz_deletebook( $courseid, $bookid) { - global $CFG; - - if (!delete_records( 'book_chapters', 'bookid', $bookid)) { - print_error( "Can't delete records from book_chapters bookid=$bookid"); - } - - game_full_rmdir( "$CFG->dataroot/$courseid/moddata/book/$bookid"); -} - -function game_bookquiz_convert_ver2_computestyles( $data, &$styles, $isstyle) { - preg_match_all('#
"; - print_continue("{$CFG->wwwroot}/mod/$modname/view.php?id=$cm->id"); - echo $OUTPUT->footer($course); - exit; - } -} - -// Print upload form. -print_heading_with_help($strimportppt, "importppt", "lesson"); - -echo $OUTPUT->box_start('center'); -echo ""; -echo $OUTPUT->box_end(); - -echo $OUTPUT->footer($course); - -// START OF FUNCTIONS. - -/* this function expects a zip file to be uploaded. Then it parses - * outline.htm to determine the slide path. Then parses each - * slide to get data for the content - */ -function readdata($file, $courseid, $modname) { - - global $CFG; - - // Create an upload directory in temp. - make_upload_directory('temp/'.$modname); - - $base = $CFG->dataroot."/temp/$modname/"; - - $zipfile = $_FILES["newfile"]["name"]; - $tempzipfile = $_FILES["newfile"]["tmp_name"]; - - // Create our directory. - $pathparts = pathinfo($zipfile); - // Take off the extension. - $dirname = substr($zipfile, 0, strpos($zipfile, '.'.$pathparts['extension'])); - if (!file_exists($base.$dirname)) { - mkdir($base.$dirname); - } - - // Move our uploaded file to temp/lesson. - move_uploaded_file($tempzipfile, $base.$zipfile); - - // Unzip it! - unzip_file($base.$zipfile, $base, false); - - $base = $base.$dirname; // Update the base. - - // This is the file where we get the names of the files for the slides (in the correct order too). - $outline = $base.'/outline.htm'; - - $pages = array(); - - if (file_exists($outline) and is_readable($outline)) { - $outlinecontents = file_get_contents($outline); - $filenames = array(); - // This gets all of our files names. - preg_match_all("/javascript:GoToSld\('(.*)'\)/", $outlinecontents, $filenames); - - // File $pages with the contents of all of the slides. - foreach ($filenames[1] as $file) { - $path = $base.'/'.$file; - if (is_readable($path)) { - $pages[$path] = file_get_contents($path); - } else { - return false; - } - } - } else { - // Cannot find the outline, so grab all files that start with slide. - $dh = opendir($base); - while (false !== ($file = readdir($dh))) { // Read throug the directory. - if ('slide' == substr($file, 0, 5)) { - // Check for name (may want to check extension later). - $path = $base.'/'.$file; - if (is_readable($path)) { - $pages[$path] = file_get_contents($path); - } else { - return false; - } - } - } - - ksort($pages); // Order them by file name. - } - - if (empty($pages)) { - return false; - } - - return $pages; -} - -/* This function attempts to extract the content out of the slides - * the slides are ugly broken xml. and the xml is broken... yeah... - */ -function extract_data($pages, $courseid, $lessonname, $modname) { - - global $CFG; - global $matches; - - $extratedpages = array(); - - // Directory for images. - make_mod_upload_directory($courseid); // Make sure moddata is made. - // We store our images in a subfolder in here. - make_upload_directory($courseid.'/moddata/'.$modname, false); - - $imagedir = $CFG->dataroot.'/'.$courseid.'/moddata/'.$modname; - - if ($CFG->slasharguments) { - $imagelink = $CFG->wwwroot.'/file.php/'.$courseid.'/moddata/'.$modname; - } else { - $imagelink = $CFG->wwwroot.'/file.php?file=/'.$courseid.'/moddata/'.$modname; - } - - // Try to make a unique subfolder to store the images. - $lessonname = str_replace(' ', '_', $lessonname); // Get rid of spaces. - $i = 0; - while (true) { - if (!file_exists($imagedir.'/'.$lessonname.$i)) { - // Ok doesnt exist so make the directory and update our paths. - mkdir($imagedir.'/'.$lessonname.$i); - $imagedir = $imagedir.'/'.$lessonname.$i; - $imagelink = $imagelink.'/'.$lessonname.$i; - break; - } - $i++; - } - - foreach ($pages as $file => $content) { - /* to make life easier on our preg_match_alls, we strip out all tags except - * for div and img (where our content is). We want div because sometimes we - * can identify the content in the div based on the div's class - */ - - $tags = '
- ', $i, 0);
- break;
- default:
- if ($matches[3][$i] != '
') { // Odd crap generated... sigh.
- if (substr($matches[3][$i], 0, 1) == ':') {// Check for leading : ..hate MS .
- $page->contents[] = substr($matches[3][$i], 1); // Get rid of :.
- } else {
- $page->contents[] = $matches[3][$i];
- }
- }
- break;
- }
- }
-
- // Add the page to the array.
- $extratedpages[] = $page;
-
- } // End $pages foreach loop.
-
- return $extratedpages;
-}
-
-// A recursive function to build a html list.
-function build_list($list, &$i, $depth) {
- global $matches; // Not sure why I global this...
-
- while ($i < count($matches[1])) {
- $class = isolate_class($matches[1][$i]);
-
- if (strstr($class, 'B')) { // Make sure we are still working with bullet classes.
- if ($class == 'B') {
- $thisdepth = 0; // Calling class B depth 0.
- } else {
- // Set the depth number. So B1 is depth 1 and B2 is depth 2 and so on.
- $thisdepth = substr($class, 1);
- if (!is_numeric($thisdepth)) {
- print_error( 'Depth not parsed!');
- }
- if ($thisdepth < $depth) {
- // We are moving back a level in the nesting.
- break;
- }
- if ($thisdepth > $depth) {
- // We are moving in a lvl in nesting.
- $list .= '
- '.ppt_clean_text($matches[3][$i]).' '; - } - $i++; - } else { - // Not a B class, so get out of here... - break; - } - } - - // End the list and return it. - $list .= '
- ';
- $list = build_list($list, $i, $thisdepth);
- // Once we return back, should go to the start of the while.
- continue;
- }
- // No depth changes, so add the match to our list.
- if ($cleanstring = ppt_clean_text($matches[3][$i])) {
- $list .= '
.
- return substr($class, 0, strpos($class, '>'));
- }
- } else {
- // No class defined in the tag.
- return '';
- }
-}
-
-// This function strips off the random chars that ppt puts infront of bullet lists.
-function ppt_clean_text($string) {
- $chop = 1; // Default: just a single char infront of the content.
-
- // Look for any other crazy things that may be infront of the content.
- if (strstr($string, '<') and strpos($string, '<') == 0) {
- // Look for the < in the sting and make sure it is in the front.
- $chop = 4; // Increase the $chop.
- }
- // May need to add more later....
-
- $string = substr($string, $chop);
-
- if ($string != '
') {
- return $string;
- } else {
- return false;
- }
-}
-
-// Clean up the temp directory.
-function clean_temp() {
- global $CFG;
- /* this function is broken, use it to clean up later
- * should only clean up what we made as well because someone else could be importing ppt as well
- * delDirContents($CFG->dataroot.'/temp/lesson');
- */
-}
-
-// Creates objects an chapter object that is to be inserted into the database.
-function book_create_objects($pageobjects, $bookid) {
- $chapters = array();
- $chapter = new stdClass;
-
- // Same for all chapters.
- $chapter->bookid = $bookid;
- $chapter->pagenum = $DB->count_records('book_chapters', array( 'bookid' => $bookid)) + 1;
- $chapter->timecreated = time();
- $chapter->timemodified = time();
- $chapter->subchapter = 0;
-
- $i = 1;
- foreach ($pageobjects as $pageobject) {
- $page = prep_page($pageobject, $i); // Get title and contents.
- $chapter->importsrc = addslashes($pageobject->source); // Add the source.
- $chapter->title = $page->title;
- $chapter->content = $page->contents;
- $chapters[] = $chapter;
-
- // Increment our page number and our counter.
- $chapter->pagenum = $chapter->pagenum + 1;
- $i++;
- }
-
- return $chapters;
-}
-
-// Builds the title and content strings from an object.
-function prep_page($pageobject, $count) {
- if ($pageobject->title == '') {
- $page->title = "Page $count"; // No title set so make a generic one.
- } else {
- $page->title = addslashes($pageobject->title);
- }
-
- $page->contents = '';
-
- // Nab all the images first.
- foreach ($pageobject->images as $image) {
- $image = str_replace("\n", '', $image);
- $image = str_replace("\r", '', $image);
- $image = str_replace("'", '"', $image); // Imgstyle.
-
- $page->contents .= addslashes($image);
- }
- // Go through the contents array and put ';
echo "
tags around each element and strip out \n which I have found to be uneccessary. - foreach ($pageobject->contents as $content) { - $content = str_replace("\n", '', $content); - $content = str_replace("\r", '', $content); - $content = str_replace(' ', '', $content); // Puts in returns? - $content = '
'.$content.'
'; - $page->contents .= addslashes($content); - } - return $page; -} - -// Save the chapter objects to the database. -function book_save_objects($chapters, $bookid, $pageid='0') { - global $DB; - - // Nothing fancy, just save them all in order. - foreach ($chapters as $chapter) { - if (!$chapter->id = $DB->insert_record('book_chapters', $chapter)) { - print_error('Could not update your book'); - } - } - return true; -} diff --git a/classes/event/course_module_instance_list_viewed.php b/classes/event/course_module_instance_list_viewed.php index 3ba2ef7..57fb2b9 100644 --- a/classes/event/course_module_instance_list_viewed.php +++ b/classes/event/course_module_instance_list_viewed.php @@ -36,18 +36,5 @@ defined('MOODLE_INTERNAL') || die(); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ class course_module_instance_list_viewed extends \core\event\course_module_instance_list_viewed { - /** - * Create the event from course record. - * - * @param \stdClass $course - * @return course_module_instance_list_viewed - */ - public static function create_from_course(\stdClass $course) { - $params = array( - 'context' => \context_course::instance($course->id) - ); - $event = \mod_game\event\course_module_instance_list_viewed::create( $params); - $event->add_record_snapshot('course', $course); - return $event; - } + // No code required here as the parent class handles it all. } diff --git a/lib.php b/lib.php index 38ee320..c7a6054 100755 --- a/lib.php +++ b/lib.php @@ -539,7 +539,9 @@ function game_get_recent_mod_activity(&$activities, &$index, $timestart, $course $groupjoin = ""; } - if (!$attempts = $DB->get_records_sql("SELECT qa.*, qa.gameid, q.grade, u.lastname,u.firstname, firstnamephonetic, u.lastnamephonetic, u.middlename, u.alternatename, u.lastnamephonetic, u.picture + if (!$attempts = $DB->get_records_sql("SELECT qa.*, qa.gameid, q.grade, u.lastname,". + " u.firstname, firstnamephonetic, u.lastnamephonetic, u.middlename, u.alternatename,". + " u.lastnamephonetic, u.picture FROM {game_attempts} qa JOIN {game} q ON q.id = qa.gameid JOIN {user} u ON u.id = qa.userid @@ -604,7 +606,7 @@ function game_get_recent_mod_activity(&$activities, &$index, $timestart, $course $tmpactivity->user->alternatename = $attempt->alternatename; $tmpactivity->user->middlename = $attempt->middlename; $tmpactivity->user->firstnamephonetic = $attempt->firstnamephonetic; - $tmpactivity->user->lastnamephonetic = $attempt->lastnamephonetic; + $tmpactivity->user->lastnamephonetic = $attempt->lastnamephonetic; $tmpactivity->user->picture = $attempt->picture; $tmpactivity->user->imagealt = $attempt->imagealt; $tmpactivity->user->email = $attempt->email; @@ -619,7 +621,6 @@ function game_print_recent_mod_activity($activity, $courseid, $detail, $modnames echo '| "; - //print_user_picture($activity->user->userid, $courseid, $activity->user->picture); echo $OUTPUT->user_picture($activity->user, array('courseid' => $courseid)); echo " | ";
@@ -636,7 +637,8 @@ function game_print_recent_mod_activity($activity, $courseid, $detail, $modnames
echo get_string("attempt", "game")." {$activity->content->attempt}: ";
$grades = "({$activity->content->sumgrades} / {$activity->content->maxgrade})";
- echo "wwwroot}/mod/game/review.php?attempt={$activity->content->attemptid}&q={$activity->gameid}\">$grades";
+ echo "wwwroot}/mod/game/review.php".
+ "?attempt={$activity->content->attemptid}&q={$activity->gameid}\">$grades";
echo '';
echo ' ';
diff --git a/locallib.php b/locallib.php
index f734401..b37fc8c 100755
--- a/locallib.php
+++ b/locallib.php
@@ -1489,7 +1489,7 @@ function game_grade_responses( $question, $responses, $maxgrade, &$answertext, &
return $answer->fraction * $maxgrade;
} else {
$name = "resp{$question->id}_";
- if( !isset( $responses->$name)) {
+ if (!isset( $responses->$name)) {
$answered = false;
return 0; // Not answered this question.
}
@@ -1818,14 +1818,27 @@ function game_get_string_lang( $identifier, $module, $lang) {
$langfile = "{$CFG->dirroot}/mod/game/lang/$lang/game.php";
- if ($result = get_string_from_file( $identifier, $langfile, "\$ret")) {
- eval($result);
- if ($ret != '') {
- return $ret;
+ $result = get_string_from_file( $identifier, $langfile, "\$ret");
+ if ($result != '') {
+ $pos = strpos( $result, '=');
+ if ($pos > 0) {
+ $result = substr( $result, $pos + 1);
+ $pos = strpos( $result, "'");
+ if ($pos > 0) {
+ $result = substr( $result, $pos + 1);
+ $pos = strpos( $result, "'");
+ if ($pos > 0) {
+ $result = substr( $result, 0, $pos);
+ }
+ }
}
}
- return get_string( $identifier, $module);
+ if ($result != '') {
+ return $result;
+ } else {
+ return get_string( $identifier, $module);
+ }
}
function get_string_from_file($identifier, $langfile, $destination) {
diff --git a/millionaire/play.php b/millionaire/play.php
index 401c61d..d0825a3 100755
--- a/millionaire/play.php
+++ b/millionaire/play.php
@@ -172,7 +172,7 @@ function game_millionaire_showgrid( $game, $millionaire, $id, $query, $aanswer,
$styletext = "style='$stylequestion'";
}
- $aval = array( 100, 200, 300, 400, 500, 1000, 1500, 2000, 4000, 5000, 10000, 20000, 40000, 80000, 150000);
+ $aval = array( 100, 200, 300, 400, 500, 1000, 1500, 2000, 4000, 5000, 10000, 20000, 40000, 80000, 150000);
for ($i = 15; $i >= 1; $i--) {
$btr = false;
diff --git a/pagelib.php b/pagelib.php
index c379428..90b93f9 100755
--- a/pagelib.php
+++ b/pagelib.php
@@ -21,8 +21,6 @@ define('PAGE_GAME_VIEW', 'mod-game-view');
page_map_class( PAGE_GAME_VIEW, 'page_game');
-$DEFINEDPAGES = array( PAGE_GAME_VIEW);
-
/**
* Class that models the behavior of a game
*
diff --git a/showanswers.php b/showanswers.php
index 6c6cf55..eb33ee6 100755
--- a/showanswers.php
+++ b/showanswers.php
@@ -307,7 +307,6 @@ function game_showanswers_question_select( $game, $table, $select, $fields, $ord
foreach ($recs as $rec) {
if ($i++ > 0) {
echo ' '; - if ($rec->fraction == 1) { echo " $rec->answer"; if ($rec->feedback == '') { diff --git a/showattempts.php b/showattempts.php index a425c84..223ce4e 100755 --- a/showattempts.php +++ b/showattempts.php @@ -73,7 +73,7 @@ function game_showusers($game) { function onselectuser() { var groupid = document.getElementById('menugroup').value; - window.location.href = "" + document.getElementById('menuuser').value + '&groupid=' + groupid; + window.location.href = "" + document.getElementById('menuuser').value + '&groupid='+groupid; } dobject($thevalue, $thehtmlflag); } else { $theoutput[$theindex] = ($thehtmlflag ? preg_replace('|<|s', '<', var_export($thevalue, true)) : var_export($thevalue, true)); @@ -244,9 +244,9 @@ class sdd { foreach ($theclassvars[$theclass] as $thevariable => $value) { if (array_key_exists($thevariable, $theobjectvars)) { if (is_array($theobjectvars[$thevariable])) { - $theoutput[$theclass][] = $thevariable . " = " . sdd::darray($theobjectvars[$thevariable], $thehtmlflag); + $theoutput[$theclass][] = $thevariable . " = " .$this->darray($theobjectvars[$thevariable], $thehtmlflag); } else if (is_object($theobjectvars[$thevariable])) { - $theoutput[$theclass][] = $thevariable . " = " . sdd::dobject($theobjectvars[$thevariable], $thehtmlflag); + $theoutput[$theclass][] = $thevariable . " = ".$this->dobject($theobjectvars[$thevariable], $thehtmlflag); } else { $theotput[$theclass][] = $thevariable . " = " . ($thehtmlflag ? preg_replace('|<|s', '<', var_export( diff --git a/sudoku/sdd/class.logfile.php b/sudoku/sdd/class.logfile.php index 0735376..32ed65e 100755 --- a/sudoku/sdd/class.logfile.php +++ b/sudoku/sdd/class.logfile.php @@ -47,7 +47,7 @@ class logfile extends SDD { * @access public */ - public function logfile($thefilename) { + public function init($thefilename) { if (file_exists($thefilename)) { $this->m_handle = fopen($thefilename, 'a'); } else { |