From 90846814971bc58d60a5eee4bfec943bcbd6a6a6 Mon Sep 17 00:00:00 2001
From: Martin Langhoff <martin@catalyst.net.nz>
Date: Sat, 7 Jul 2007 14:09:13 +1200
Subject: [PATCH] cvsimport fixups

---
 course/format/weeks/format.php       |  2 +-
 lib/simpletest/testcourses.php       | 60 ----------------------------
 mod/resource/type/file/localfile.php |  6 +--
 3 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 lib/simpletest/testcourses.php

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 9e3afe36fd2..c9ab1e43d69 100644
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -206,7 +206,7 @@
                 // around. For now, just hide all the dates to avoid confusion.
                 $weekperiod = '';
             } else {
-                $weekperiod = $weekday.' '.$endweekday;
+                $weekperiod = $weekday.' - '.$endweekday;
             }
 
 
diff --git a/lib/simpletest/testcourses.php b/lib/simpletest/testcourses.php
deleted file mode 100644
index 415b878c5c8..00000000000
--- a/lib/simpletest/testcourses.php
+++ /dev/null
@@ -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');
-        
-    }
-}
-?>
\ No newline at end of file
diff --git a/mod/resource/type/file/localfile.php b/mod/resource/type/file/localfile.php
index 8f412e1a5ce..576e7db020c 100644
--- a/mod/resource/type/file/localfile.php
+++ b/mod/resource/type/file/localfile.php
@@ -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 @@
         } 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();
     }
     //]]>