Permalink
Browse files

cvsimport fixups

  • Loading branch information...
Martin Langhoff
Martin Langhoff committed Jul 7, 2007
1 parent 305726a commit 90846814971bc58d60a5eee4bfec943bcbd6a6a6
Showing with 3 additions and 65 deletions.
  1. +1 −1 course/format/weeks/format.php
  2. +0 −60 lib/simpletest/testcourses.php
  3. +2 −4 mod/resource/type/file/localfile.php
@@ -206,7 +206,7 @@
// around. For now, just hide all the dates to avoid confusion.
$weekperiod = '';
} else {
- $weekperiod = $weekday.' '.$endweekday;
+ $weekperiod = $weekday.' - '.$endweekday;
}
@@ -1,60 +0,0 @@
-<?php // $Id$
-
-///////////////////////////////////////////////////////////////////////////
-// //
-// NOTICE OF COPYRIGHT //
-// //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment //
-// http://moodle.org //
-// //
-// Copyright (C) 1999-2004 Martin Dougiamas http://dougiamas.com //
-// //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// This program is distributed in the hope that it will be useful, //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
-// GNU General Public License for more details: //
-// //
-// http://www.gnu.org/copyleft/gpl.html //
-// //
-///////////////////////////////////////////////////////////////////////////
-
-require_once(dirname(__FILE__) . '/../../config.php');
-global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
-require_once($CFG->libdir . '/moodlelib.php');
-
-/**
- * This test is meant(!?) to run extensive tests on as much of moodle's
- * xhtml output as possible, using a test database as a stable test bed,
- * and sending the output of each page to the w3c validating service
- * (or some other service that can return a better report), and checking
- * whether that report is valid or not.
- *
- * A global function for validating xhtml output is badly needed.
- *
- * One possible solution is to extend this WebTestCase class by adding a
- * AssertValidXhtml($output) method. The output is obtained by any
- * WebTestCase using $this->_browser->getContent().
- *
- * Setting up validation scripts would then be very simple.
- */
-class xhtml_test extends WebTestCase {
-
- function setUp() {
- global $CFG;
-
- $this->get($CFG->wwwroot);
- $this->click('Course 4');
- }
-
- function testLogin() {
- $this->assertTitle('Nick\'s tests & Things: Login to the site');
-
- }
-}
-?>
@@ -3,7 +3,7 @@
require('../../../../config.php');
require('../../lib.php');
- $choose = required_param('choose');
+ $choose = required_param('choose', PARAM_FILE);
require_login();
@@ -15,8 +15,6 @@
print_simple_box(get_string('localfileinfo', 'resource'), 'center');
- $chooseparts = explode('.', $choose);
-
?>
<script type="text/javascript">
//<![CDATA[
@@ -28,7 +26,7 @@ function set_value(txt) {
} else {
window.close();
}
- opener.document.forms['<?php echo $chooseparts[0]."'].".$chooseparts[1] ?>.value = '<?php p(RESOURCE_LOCALPATH) ?>'+path;
+ opener.document.getElementById('<?php echo $choose ?>').value = '<?php p(RESOURCE_LOCALPATH) ?>'+path;
window.close();
}
//]]>

0 comments on commit 9084681

Please sign in to comment.