diff --git a/course/category.php b/course/category.php
index bac0ae985ea..b48c05f39e8 100644
--- a/course/category.php
+++ b/course/category.php
@@ -36,19 +36,20 @@
     }
 
 
-/// Rename the category if requested
-
-    if (!empty($_GET['rename'])) {
-        $category->name = $rename;
-        if (! set_field("course_categories", "name", $category->name, "id", $category->id)) {
-            notify("An error occurred while renaming the category");
+    if (isadmin()) {
+        /// Rename the category if requested
+        if (!empty($_POST['rename'])) {
+            $category->name = $_POST['rename'];
+            if (! set_field("course_categories", "name", $category->name, "id", $category->id)) {
+                notify("An error occurred while renaming the category");
+            }
         }
-    }
 
-/// Resort the category if requested
+        /// Resort the category if requested
 
-    if (!empty($_GET['resort'])) {
-        fix_course_sortorder($category->id, "fullname ASC");
+        if (!empty($_GET['resort'])) {
+            fix_course_sortorder($category->id, "fullname ASC");
+        }
     }
 
 
@@ -197,7 +198,6 @@
     
 /// Print out all the courses
 
-
     if (!$courses = get_courses($category->id)) {
         print_heading(get_string("nocoursesyet"));
 
@@ -292,8 +292,14 @@
                 echo "</td>";
             } else {
                 echo "<td>";
+                if ($course->summary) {
+                    link_to_popup_window ("/course/info.php?id=$course->id", "courseinfo", 
+                                          "<img alt=\"info\" height=16 width=16 border=0 src=\"$pixpath/i/info.gif\">", 
+                                           400, 500, $strsummary);
+                    echo "&nbsp;";
+                }
                 if ($course->guest ) {
-                echo "<img title=\"$strallowguests\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/user.gif\">";
+                    echo "<img title=\"$strallowguests\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/user.gif\">&nbsp;";
                 }
                 if ($course->password) {
                     echo "<img title=\"$strrequireskey\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/key.gif\">";
@@ -318,7 +324,7 @@
     }
 
 
-    if ($adminediting) {
+    if (isadmin()) {
         echo "<center>";
 
     /// Print button to re-sort courses by name
@@ -343,8 +349,6 @@
         echo "</center>";
         echo "<br />";
     }
-
-
     
     print_footer();
 
diff --git a/course/info.php b/course/info.php
new file mode 100644
index 00000000000..9758fd47bac
--- /dev/null
+++ b/course/info.php
@@ -0,0 +1,73 @@
+<?PHP // $Id$
+
+/// Displays external information about a course
+
+    require_once("../config.php");
+    require_once("lib.php");
+
+    require_variable($id);    // Course id
+    optional_variable($name);
+
+    if (!$id and !$name) {
+        error("Must specify course id or short name");
+    }
+
+    if ($name) {
+        if (! $course = get_record("course", "shortname", $name) ) {
+            error("That's an invalid short course name");
+        }
+    } else {
+        if (! $course = get_record("course", "id", $id) ) {
+            error("That's an invalid course id");
+        }
+    }
+
+    $site = get_site();
+
+    if (empty($THEME->custompix)) {
+        $pixpath = "$CFG->wwwroot/pix";
+    } else {
+        $pixpath = "$CFG->wwwroot/theme/$CFG->theme/pix";
+    }
+
+    print_header(get_string("summaryof", "", $course->fullname));
+
+    echo "<h3 align=\"center\">$course->fullname<br />($course->shortname)</h3>";
+
+    echo "<center>";
+    if ($course->guest) {
+        $strallowguests = get_string("allowguests");
+        echo "<p><font size=1><img align=\"absmiddle\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/user.gif\"></a>&nbsp;$strallowguests</font></p>";
+    }
+    if ($course->password) {
+        $strrequireskey = get_string("requireskey");
+        echo "<p><font size=1><img align=\"absmiddle\" alt=\"\" height=16 width=16 border=0 src=\"$pixpath/i/key.gif\"></a>&nbsp;$strrequireskey</font></p>";
+    }
+
+
+    if ($teachers = get_course_teachers($course->id)) {
+        echo "<table align=center><tr><td nowrap>";
+        echo "<p><font size=\"1\">\n";
+        foreach ($teachers as $teacher) {
+            if ($teacher->authority > 0) {
+                if (!$teacher->role) {
+                    $teacher->role = $course->teacher;
+                }
+                echo "$teacher->role: <a target=\"userinfo\" href=\"$CFG->wwwroot/user/view.php?id=$teacher->id&course=$site->id\">$teacher->firstname $teacher->lastname</a><br />";
+            }
+        }
+        echo "</font></p>";
+        echo "</td</tr></table>";
+    }
+    echo "<br />";
+
+    print_simple_box_start("center", "100%");
+    echo text_to_html($course->summary);
+    print_simple_box_end();
+
+    echo "<br />";
+
+    close_window_button();
+
+?>
+