Fix for bug #1280: the "showrecent" course setting has to go.

Updated script and editing page.

diff --git a/course/edit.html b/course/edit.html
index aedce100b8743a0a60c0998feca0c19c37a5ebab..db59781d9e2dfe2fa08e4814d6084e2f91e3e9e7 100644 (file)
--- a/course/edit.html
+++ b/course/edit.html
@@ -11,7 +11,7 @@
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
     <td align="right"><P><?php  print_string("category") ?>:</td>
-    <td><?php  
+    <td><?php
            $displaylist = array();
            $parentlist = array();
            make_categories_list($displaylist, $parentlist);
@@ -36,16 +36,16 @@
 </tr>
 <tr valign=top>
     <td align="right"><P><?php  print_string("summary") ?>:</td>
-    <td><?php 
+    <td><?php
         print_textarea($usehtmleditor, 10, 50, 660, 200, "summary", $form->summary);
         helpbutton("text", get_string("helptext"));
-        if (isset($err["summary"])) formerr($err["summary"]); 
+        if (isset($err["summary"])) formerr($err["summary"]);
     ?>
     </td>
 </tr>
 <tr valign=top>
     <td align="right"><P><?php  print_string("format") ?>:</td>
-    <td><?php  
+    <td><?php
            choose_from_menu ($form->courseformats, "format", "$form->format", "");
            helpbutton("courseformats", get_string("courseformats"));
         ?>
@@ -128,7 +128,7 @@
 </tr>
 <tr valign=top>
     <td align="right"><P><?php  print_string("newsitemsnumber") ?>:</td>
-    <td><?php  
+    <td><?php
        $newsitem = get_string("newsitem");
        $newsitems = get_string("newsitems");
 
@@ -148,16 +148,6 @@
     ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align="right"><P><?php  print_string("showrecent") ?>:</td>
-    <td><?php
-    unset($choices);
-    $choices["0"] = get_string("no");
-    $choices["1"] = get_string("yes");
-    choose_from_menu ($choices, "showrecent", $form->showrecent, "");
-    helpbutton("courserecent", get_string("recentactivity")); ?>
-    </td>
-</tr>
 <tr valign=top>
     <td align="right"><P><?php  print_string("showgrades") ?>:</td>
     <td><?php
@@ -189,7 +179,7 @@
 <tr valign=top>
     <td align="right"><P><?php  print_string("wordforteacher") ?>:</td>
     <td><input type="text" name="teacher" maxlength="100" size=25 value="<?php  p($form->teacher) ?>">
-    (<?php  print_string("wordforteachereg") ?>) 
+    (<?php  print_string("wordforteachereg") ?>)
     <?php  if (isset($err["teacher"])) formerr($err["teacher"]); ?>
     </td>
 </tr>
@@ -203,24 +193,24 @@
 <tr valign=top>
     <td align="right"><P><?php  print_string("wordforstudent") ?>:</td>
     <td><input type="text" name="student" maxlength="100" size=25 value="<?php  p($form->student) ?>">
-    (<?php  print_string("wordforstudenteg") ?>) 
+    (<?php  print_string("wordforstudenteg") ?>)
     <?php  if (isset($err["student"])) formerr($err["student"]); ?>
     </td>
 </tr>
 <tr valign=top>
     <td align="right"><P><?php  print_string("wordforstudents") ?>:</td>
     <td><input type="text" name="students" maxlength="100" size=25 value="<?php  p($form->students) ?>">
-    (<?php  print_string("wordforstudentseg") ?>) 
+    (<?php  print_string("wordforstudentseg") ?>)
     <?php  if (isset($err["students"])) formerr($err["students"]); ?>
     </td>
 </tr>
 <tr valign=top>
     <td align="right"><P><?php  print_string("forcelanguage") ?>:</td>
        <td>
-    <?php 
+    <?php
         $languages[''] = get_string("forceno");
         $languages += get_list_of_languages();
-        choose_from_menu ($languages, "lang", $form->lang, "", "", ""); 
+        choose_from_menu ($languages, "lang", $form->lang, "", "", "");
     ?>
     </td>
 </tr>

diff --git a/course/edit.php b/course/edit.php
index 420bf1df59e2737fb0acf10767bb3c7ea56258c8..5565402eea05562eaae3c147919f41fd6dd7ed87 100644 (file)
--- a/course/edit.php
+++ b/course/edit.php
@@ -80,7 +80,7 @@
                         redirect("teacher.php?id=$newcourseid", get_string("changessaved"));
 
                     } else {         // Add current teacher and send to course
-                        
+
                         $newteacher = NULL;
                         $newteacher->userid = $USER->id;
                         $newteacher->course = $newcourseid;
@@ -106,7 +106,7 @@
             foreach ($err as $key => $value) {
                 $focus = "form.$key";
             }
-            
+
         }
        }
 
@@ -125,7 +125,6 @@
             $form->guest = 0;
             $form->numsections = 10;
             $form->newsitems = 5;
-            $form->showrecent = 1;
             $form->showgrades = 1;
             $form->groupmode = 0;
             $form->groupmodeforce = 0;
@@ -168,8 +167,8 @@
     $strcategories = get_string("categories");
 
     if (!empty($course)) {
-           print_header($streditcoursesettings, "$course->fullname", 
-                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> 
+           print_header($streditcoursesettings, "$course->fullname",
+                     "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a>
                       -> $streditcoursesettings", $focus);
     } else {
         print_header("$site->shortname: $straddnewcourse", "$site->fullname",
@@ -184,7 +183,7 @@
 
     print_footer($course);
 
-    if ($usehtmleditor) { 
+    if ($usehtmleditor) {
         use_html_editor();
     }