Removed old glossary formats.

Part of the new formats plugin structure.
See Bug 936
(http://moodle.org/bugs/bug.php?op=show&bugid=936)

diff --git a/mod/glossary/formats/1.php b/mod/glossary/formats/1.php
deleted file mode 100644 (file)
index ad47fcd..0000000
--- a/mod/glossary/formats/1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?PHP  // $Id$
-
-function glossary_print_entry_by_format($course, $cm, $glossary, $entry,$currentview="",$cat="") {
-    global $THEME, $USER;
-
-    $colour = $THEME->cellheading2;
-
-    echo "\n<table border=1 cellspacing=0 width=95% valign=top cellpadding=10>";
-
-    echo "\n<tr>";
-    echo "<td width=100% bgcolor=\"$colour\">";
-    if ($entry->attachment) {
-        $entry->course = $course->id;
-        echo "<table border=0 align=right><tr><td>";
-        echo glossary_print_attachments($entry, "html");
-        echo "</td></tr></table>";
-    }
-    echo "<b>$entry->concept</b><br>";
-    if ($entry) {
-        echo "&nbsp;&nbsp;<font size=1>".get_string("lastedited").": ".userdate($entry->timemodified)."</font>";
-    }
-    echo "</tr>";
-
-    echo "\n<tr><td width=100% bgcolor=\"$THEME->cellcontent\">";
-    if ($entry) {
-        glossary_print_entry_definition($entry);
-        glossary_print_entry_icons($course, $cm, $glossary, $entry, $currentview, $cat);
-
-    } else {
-        echo "<center>";
-        print_string("noentry", "glossary");
-        echo "</center>";
-    }
-    echo "</td></tr>";
-
-    echo "</table>\n";
-
-}
-
-?>

diff --git a/mod/glossary/formats/2.php b/mod/glossary/formats/2.php
deleted file mode 100644 (file)
index 8eb95e9..0000000
--- a/mod/glossary/formats/2.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?PHP  // $Id$
-
-function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="",$hook="",$printicons=1,$ratings=NULL) {
-    global $THEME, $CFG, $USER;
-
-    $colour = $THEME->cellheading2;
-
-    $user = get_record("user", "id", $entry->userid);
-    $strby = get_string("writtenby", "glossary");
-
-    echo "\n<br /><table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
-
-    echo "\n<tr>";
-    echo "\n<td bgcolor=\"$colour\" width=35 valign=top class=\"forumpostpicture\">";
-    $return = false;
-    if ($entry) {
-        print_user_picture($user->id, $course->id, $user->picture);
-
-        echo "</td>";
-        echo "<td valign=\"top\" width=100% bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\">";
-
-        glossary_print_entry_approval($cm, $entry, $mode);
-        glossary_print_entry_attachment($entry,"html","right");
-
-        echo "<b>";
-        glossary_print_entry_concept($entry);
-               echo "</b><br />";
-
-        echo "<font size=\"2\">$strby " . fullname($user, isteacher($course->id)) . "</font>";
-        echo "&nbsp;&nbsp;<font size=1>(".get_string("lastedited").": ".
-             userdate($entry->timemodified).")</font>";
-        echo "</tr>";
-
-        echo "\n<tr>";
-        echo "\n<td bgcolor=\"$colour\" width=35 valign=top class=\"forumpostside\">&nbsp;</td>";
-        echo "\n<td width=100% bgcolor=\"$THEME->cellcontent\" class=\"forumpostmessage\">";
-
-        glossary_print_entry_definition($entry);
-        glossary_print_entry_lower_section($course, $cm, $glossary, $entry,$mode,$hook,$printicons);
-        echo ' ';
-        $return = glossary_print_entry_ratings($course, $entry, $ratings);
-
-    } else {
-        echo "<center>";
-        print_string("noentry", "glossary");
-        echo "</center>";
-    }
-    echo "</td></tr>";
-
-    echo "</table>\n";
-    return $return;
-}
-
-?>

diff --git a/mod/glossary/formats/3.php b/mod/glossary/formats/3.php
deleted file mode 100644 (file)
index 9df16b2..0000000
--- a/mod/glossary/formats/3.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?PHP  // $Id$
-
-function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="",$hook="",$printicons=1,$ratings=NULL) {
-    global $THEME, $CFG, $USER;
-
-    $colour = $THEME->cellheading2;
-
-    $user = get_record("user", "id", $entry->userid);
-    $strby = get_string("writtenby", "glossary");
-
-    echo "\n<br /><table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
-
-    echo "\n<tr>";
-    echo "\n<td bgcolor=\"$colour\" width=35 valign=top class=\"forumpostpicture\">";
-    $return = false;
-    if ($entry) {
-        print_user_picture($user->id, $course->id, $user->picture);
-        echo "</td>";
-        echo "<td align=\"top\" width=100% bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\">";
-        glossary_print_entry_approval($cm, $entry, $mode);
-        echo "<b>";
-        glossary_print_entry_concept($entry);
-               echo "</b><br />";
-        echo "<font size=\"2\">$strby " . fullname($user, isteacher($course->id)) . "</font>";
-        echo "&nbsp;&nbsp;<font size=1>(".get_string("lastedited").": ".
-             userdate($entry->timemodified).")</font>";
-        echo "</tr>";
-
-        echo "\n<tr>";
-        echo "\n<td bgcolor=\"$colour\" width=35 valign=top class=\"forumpostside\">&nbsp;</td>";
-        echo "\n<td width=100% align=\"top\" bgcolor=\"$THEME->cellcontent\" class=\"forumpostmessage\">";
-
-        if ($entry->attachment) {
-            $entry->course = $course->id;
-            if (strlen($entry->definition)%2) {
-                $align = "right";
-            } else {
-                $align = "left";
-            }
-            glossary_print_entry_attachment($entry,"",$align);
-        }
-        glossary_print_entry_definition($entry);
-
-        glossary_print_entry_lower_section($course, $cm, $glossary, $entry,$mode,$hook,$printicons);
-        echo ' ';
-        $return = glossary_print_entry_ratings($course, $entry, $ratings);
-
-    } else {
-        echo "<center>";
-        print_string("noentry", "glossary");
-        echo "</center>";
-    }
-    echo "</td></tr>";
-
-    echo "</table>\n";
-    
-    return $return;
-}
-
-?>

diff --git a/mod/glossary/formats/4.php b/mod/glossary/formats/4.php
deleted file mode 100644 (file)
index 87bc412..0000000
--- a/mod/glossary/formats/4.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?PHP  // $Id$
-
-function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="",$hook="",$printicons=1,$ratings=NULL) {
-    global $THEME, $USER;
-    $return = false;
-    if ( $entry ) {
-        $colour = $THEME->cellheading2;
-
-        echo '<br /><table border=0 cellspacing=0 width=95% valign=top cellpadding=10 class=forumpost>';
-
-        echo '<tr>';
-        echo "<td width=100% bgcolor=\"$colour\">";
-        $entry->course = $course->id;
-        glossary_print_entry_approval($cm, $entry, $mode);
-        glossary_print_entry_attachment($entry,"html","right");
-
-        echo '<b>' . get_string("question","glossary") . ':</b> ';
-        glossary_print_entry_concept($entry) . '<br>';
-        echo '&nbsp;&nbsp;<font size=1>' . get_string("lastedited").': '.userdate($entry->timemodified) . '</font></tr>';
-        echo "<tr><td width=100% bgcolor=\"$THEME->cellcontent\">";            
-        echo '<b>' . get_string("answer","glossary") . ':</b> ';
-        glossary_print_entry_definition($entry);
-
-
-        glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook,$printicons);
-        echo ' ';
-        $return = glossary_print_entry_ratings($course, $entry, $ratings);
-        echo '</td></tr></table>';
-
-    } else {
-        echo '<center>';
-        print_string("noentry", "glossary");
-        echo '</center>';
-    }
-    return $return;
-}
-
-?>

diff --git a/mod/glossary/formats/5.php b/mod/glossary/formats/5.php
deleted file mode 100644 (file)
index 9bf3cb8..0000000
--- a/mod/glossary/formats/5.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?PHP  // $Id$
-
-function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="",$hook="",$printicons=1,$ratings=NULL) {
-    global $THEME, $USER;
-
-    $colour = $THEME->cellheading2;
-    $return = false;
-
-    echo "\n<br /><table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
-
-    echo "\n<tr>";
-    echo "<td width=100% bgcolor=\"$THEME->cellheading\">";
-    glossary_print_entry_approval($cm, $entry, $mode);
-    if ($entry) {
-        glossary_print_entry_attachment($entry,"html","right");
-        echo "<b>";
-        glossary_print_entry_concept($entry);
-        echo "</b><br />";
-        echo "<font size=1>".get_string("lastedited").": ".userdate($entry->timemodified)."</font>";
-        echo "</tr>";
-        echo "\n<tr><td width=100% bgcolor=\"$THEME->cellcontent\">";
-               
-        glossary_print_entry_definition($entry);
-        glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook,$printicons);
-        echo ' ';
-        $return = glossary_print_entry_ratings($course, $entry, $ratings);
-    } else {
-        echo "<center>";
-        print_string("noentry", "glossary");
-        echo "</center>";
-    }
-    echo "</td></tr>";
-
-    echo "</table>\n";
-    return $return;
-}
-
-?>

diff --git a/mod/glossary/formats/6.php b/mod/glossary/formats/6.php
deleted file mode 100644 (file)
index aacec2f..0000000
--- a/mod/glossary/formats/6.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?PHP  // $Id$
-
-function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="",$hook="",$printicons=1,$ratings=NULL) {
-    global $THEME, $USER;
-
-    $colour = "#FFFFFF";
-    $return = false;
-
-    echo "\n<table class=\"generalbox\" border=0 cellspacing=0 width=95% valign=top cellpadding=10>";
-
-    echo "\n<tr>";
-    echo "<td width=100% bgcolor=\"$colour\">";
-    if ($entry) {
-        echo "<b><a href=\"showentry.php?courseid=$course->id\&eid=$entry->id\&displayformat=5\" target=\"_blank\" onClick=\"return openpopup('/mod/glossary/showentry.php?courseid=$course->id\&eid=$entry->id\&displayformat=5', 'entry', 'menubar=0,location=0,scrollbars,resizable,width=600,height=450', 0);\">";
-
-        glossary_print_entry_concept($entry);
-        echo '</a></b> ';
-        if ( $return = glossary_print_entry_commentslink($course, $cm, $glossary, $entry,$mode,$hook, 'html') ) {
-            echo "<font size=-1>($return)</font>";
-        }
-
-        echo '<br />';
-    } else {
-        echo "<center>";
-        print_string("noentry", "glossary");
-        echo "</center>";
-    }
-    echo "</td></tr>";
-
-    echo "</table>\n";
-    return $return;
-}
-
-?>