merged, student_can_post should be done properly using capabilities

diff --git a/mod/glossary/config.html b/mod/glossary/config.html
index 52b4604b02b49105602a578456e00b6e71e6911f..0f371a31ec05155b9a748de78d5a02908346404e 100644 (file)
--- a/mod/glossary/config.html
+++ b/mod/glossary/config.html
@@ -18,27 +18,6 @@
     <?php print_string("entbypage", "glossary") ?>
     </td>
 </tr>
-<tr valign=top>
-    <td align=right>glossary_studentspost:</td>
-    <td>
-    <select size=1 name=glossary_studentspost>
-<?php 
-    $yselected = "";
-    $nselected = "";
-    if ($CFG->glossary_studentspost) {
-        $yselected = " selected=\"selected\" ";
-    } else {
-        $nselected = " selected=\"selected\" ";
-    }
-?>
-    <option value=1 <?php p($yselected) ?>><?php p($yes)?></option>
-    <option value=0 <?php p($nselected) ?>><?php p($no)?></option>
-    </select>
-    </td>
-    <td>
-    <?php print_string("cnfstudentcanpost", "glossary") ?>
-    </td>
-</tr>
 <tr valign=top>
     <td align=right>glossary_dupentries:</td>
     <td>

diff --git a/mod/glossary/mod.html b/mod/glossary/mod.html
index e01616dc083aaf9669d6e6ec48509e5bb46ec8fc..03328529dfda5fe2bddeac063100bd77140e5345 100644 (file)
--- a/mod/glossary/mod.html
+++ b/mod/glossary/mod.html
@@ -2,9 +2,6 @@
 
 include_once($CFG->dirroot.'/mod/glossary/lib.php');
 
-if (!isset($form->studentcanpost)) {
-    $form->studentcanpost = $CFG->glossary_studentspost;
-}
 if (!isset($form->allowduplicatedentries)) {
     $form->allowduplicatedentries = $CFG->glossary_dupentries;
 }
@@ -148,25 +145,6 @@ if (!$mainglossary or $mainglossary->id == $form->instance ) {
   echo "<input type=\"hidden\" name=\"mainglossary\" value=\"0\" />";
 }
 ?>
-<tr valign="top">
-    <td align="right"><b><?php p(get_string("studentcanpost", "glossary")) ?>:</b><br />
-    <font size="1"><?php p(get_string("warningstudentcapost","glossary")) ?></font></td>
-    <td align="left">
-  <select size="1" name="studentcanpost">
-  <option value="1" <?php
-   if ( $form->studentcanpost ) {
-      echo "selected=\"selected\"";
-   }
-   ?>><?php echo get_string("yes") ?></option>
-  <option value="0" <?php
-   if ( !$form->studentcanpost ) {
-      echo "selected=\"selected\"";
-   }
-   ?>><?php echo get_string("no") ?>
-  </option>
-  </select> <?php helpbutton("studentcanpost", get_string("studentcanpost", "glossary"), "glossary") ?>
-    </td>
-</tr>
 <tr valign="top">
     <td align="right"><b><?php echo get_string("allowduplicatedentries", "glossary") ?>:</b></td>
     <td align="left">