Browse Source

add ability to restrict by IP

MOODLE_32_STABLE
Lihi Dor 8 years ago
committed by Dan Marsden
parent
commit
8dc0bf2d95
  1. 10
      attendance.php
  2. 2
      classes/structure.php
  3. 3
      db/install.xml
  4. 8
      db/upgrade.php
  5. 5
      lang/en/attendance.php
  6. 9
      mod_form.php
  7. 2
      version.php

10
attendance.php

@ -83,5 +83,15 @@ $PAGE->navbar->add($att->name);
$output = $PAGE->get_renderer('mod_attendance'); $output = $PAGE->get_renderer('mod_attendance');
echo $output->header(); echo $output->header();
if (!empty ($attendance->subnet)) {
if (!address_in_subnet(getremoteaddr(), $attendance->subnet)) {
$wrongip = html_writer::tag('p', get_string('subnetwrong', 'attendance'));
$button = html_writer::tag('p', $output->continue_button($CFG->wwwroot . '/course/view.php?id=' . $course->id));
echo $output->box($wrongip ."\n\n".$button."\n", 'generalbox', 'notice');
} else {
$mform->display();
} else {
$mform->display(); $mform->display();
}
echo $output->footer(); echo $output->footer();

2
classes/structure.php

@ -58,6 +58,8 @@ class mod_attendance_structure {
/** current page parameters */ /** current page parameters */
public $pageparams; public $pageparams;
public $subnet;
private $groupmode; private $groupmode;
private $statuses; private $statuses;

3
db/install.xml

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<XMLDB PATH="mod/attendance/db" VERSION="20160829" COMMENT="XMLDB file for Moodle mod/attendance" <XMLDB PATH="mod/attendance/db" VERSION="20161107" COMMENT="XMLDB file for Moodle mod/attendance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd" xsi:noNamespaceSchemaLocation="../../../lib/xmldb/xmldb.xsd"
> >
@ -11,6 +11,7 @@
<FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false"/> <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false"/>
<FIELD NAME="grade" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="100" SEQUENCE="false" COMMENT="This is maximum grade for instance"/> <FIELD NAME="grade" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="100" SEQUENCE="false" COMMENT="This is maximum grade for instance"/>
<FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="The time the settings for this attendance instance were last modified."/> <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false" COMMENT="The time the settings for this attendance instance were last modified."/>
<FIELD NAME="subnet" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="add ability to restrict by IP."/>
</FIELDS> </FIELDS>
<KEYS> <KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for attendance"/> <KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="Primary key for attendance"/>

8
db/upgrade.php

@ -191,6 +191,14 @@ function xmldb_attendance_upgrade($oldversion=0) {
// Attendance savepoint reached. // Attendance savepoint reached.
upgrade_mod_savepoint(true, 2016082900, 'attendance'); upgrade_mod_savepoint(true, 2016082900, 'attendance');
} }
if ($oldversion < 201611071400) {
$table = new xmldb_table('attendance');
$newfield = $table->add_field('subnet', XMLDB_TYPE_CHAR, '255', null, null, null, null);
if (!$dbman->field_exists($table, $newfield)) {
$dbman->add_field($table, $newfield);
}
upgrade_mod_savepoint(true, 201611071400, 'attendance');
}
return $result; return $result;
} }

5
lang/en/attendance.php

@ -332,4 +332,7 @@ $string['repeatuntil'] = 'Repeat until';
$string['repeaton'] = 'Repeat on'; $string['repeaton'] = 'Repeat on';
$string['invalidsessionendtime'] = 'The end time must be greater than start time'; $string['invalidsessionendtime'] = 'The end time must be greater than start time';
$string['deletedgroup'] = 'The group associated with this session has been deleted'; $string['deletedgroup'] = 'The group associated with this session has been deleted';
$string['search:activity'] = 'Attendance - activity information'; $string['extrarestrictions'] = 'Extra restrictions';
$string['configrequiresubnet'] = 'Students can only record own attendance from these computers.';
$string['subnetwrong'] = 'Attendance can only be recorded from certain locations, and this computer is not on the allowed list.';
$string['requiresubnet_help'] = 'Attendance recording may be restricted to particular subnets by specifying a comma-separated list of partial or full IP addresses.';

9
mod_form.php

@ -42,6 +42,7 @@ class mod_attendance_mod_form extends moodleform_mod {
* @return void * @return void
*/ */
public function definition() { public function definition() {
$attendanceconfig = get_config('attendance');
$mform =& $this->_form; $mform =& $this->_form;
$mform->addElement('header', 'general', get_string('general', 'form')); $mform->addElement('header', 'general', get_string('general', 'form'));
@ -55,6 +56,14 @@ class mod_attendance_mod_form extends moodleform_mod {
$this->standard_grading_coursemodule_elements(); $this->standard_grading_coursemodule_elements();
$this->standard_coursemodule_elements(true); $this->standard_coursemodule_elements(true);
$mform->addElement('header', 'security', get_string('extrarestrictions', 'attendance'));
// IP address.
$mform->addElement('text', 'subnet', get_string('requiresubnet', 'attendance'), array('size' => '164'));
$mform->setType('subnet', PARAM_TEXT);
$mform->addHelpButton('subnet', 'requiresubnet', 'attendance');
$mform->setDefault('subnet', $attendanceconfig->subnet);
$this->add_action_buttons(); $this->add_action_buttons();
} }
} }

2
version.php

@ -22,7 +22,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/ */
$plugin->version = 2016082900; $plugin->version = 2016110714;
$plugin->requires = 2016052300; $plugin->requires = 2016052300;
$plugin->release = '3.1.1.1'; $plugin->release = '3.1.1.1';
$plugin->maturity = MATURITY_STABLE; $plugin->maturity = MATURITY_STABLE;

Loading…
Cancel
Save