|
@ -122,16 +122,13 @@ class sessions { |
|
|
'from' => $data->header3, |
|
|
'from' => $data->header3, |
|
|
'to' => $data->header4, |
|
|
'to' => $data->header4, |
|
|
'description' => $data->header5, |
|
|
'description' => $data->header5, |
|
|
'repeaton' => $data->header6, |
|
|
'studentscanmark' => $data->header6, |
|
|
'repeatevery' => $data->header7, |
|
|
'passwordgrp' => $data->header7, |
|
|
'repeatuntil' => $data->header8, |
|
|
'randompassword' => $data->header8, |
|
|
'studentscanmark' => $data->header9, |
|
|
'subnet' => $data->header9, |
|
|
'passwordgrp' => $data->header10, |
|
|
'automark' => $data->header10, |
|
|
'randompassword' => $data->header11, |
|
|
'autoassignstatus' => $data->header11, |
|
|
'subnet' => $data->header12, |
|
|
'absenteereport' => $data->header12 |
|
|
'automark' => $data->header13, |
|
|
|
|
|
'autoassignstatus' => $data->header14, |
|
|
|
|
|
'absenteereport' => $data->header15 |
|
|
|
|
|
); |
|
|
); |
|
|
} else { |
|
|
} else { |
|
|
return array( |
|
|
return array( |
|
@ -141,16 +138,13 @@ class sessions { |
|
|
'from' => 3, |
|
|
'from' => 3, |
|
|
'to' => 4, |
|
|
'to' => 4, |
|
|
'description' => 5, |
|
|
'description' => 5, |
|
|
'repeaton' => 6, |
|
|
'studentscanmark' => 6, |
|
|
'repeatevery' => 7, |
|
|
'passwordgrp' => 7, |
|
|
'repeatuntil' => 8, |
|
|
'randompassword' => 8, |
|
|
'studentscanmark' => 9, |
|
|
'subnet' => 9, |
|
|
'passwordgrp' => 10, |
|
|
'automark' => 10, |
|
|
'randompassword' => 11, |
|
|
'autoassignstatus' => 11, |
|
|
'subnet' => 12, |
|
|
'absenteereport' => 12 |
|
|
'automark' => 13, |
|
|
|
|
|
'autoassignstatus' => 14, |
|
|
|
|
|
'absenteereport' => 15 |
|
|
|
|
|
); |
|
|
); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -279,10 +273,6 @@ class sessions { |
|
|
$session->sdescription['text'] = '<p>' . $this->get_column_data($row, $mapping['description']) . '</p>'; |
|
|
$session->sdescription['text'] = '<p>' . $this->get_column_data($row, $mapping['description']) . '</p>'; |
|
|
$session->sdescription['format'] = FORMAT_HTML; |
|
|
$session->sdescription['format'] = FORMAT_HTML; |
|
|
$session->sdescription['itemid'] = 0; |
|
|
$session->sdescription['itemid'] = 0; |
|
|
|
|
|
|
|
|
$session->repeaton = $this->get_column_data($row, $mapping['repeaton']); |
|
|
|
|
|
$session->repeatevery = $this->get_column_data($row, $mapping['repeatevery']); |
|
|
|
|
|
$session->repeatuntil = $this->get_column_data($row, $mapping['repeatuntil']); |
|
|
|
|
|
$session->passwordgrp = $this->get_column_data($row, $mapping['passwordgrp']); |
|
|
$session->passwordgrp = $this->get_column_data($row, $mapping['passwordgrp']); |
|
|
$session->subnet = $this->get_column_data($row, $mapping['subnet']); |
|
|
$session->subnet = $this->get_column_data($row, $mapping['subnet']); |
|
|
// Set session subnet restriction. Use the default activity level subnet if there isn't one set for this session. |
|
|
// Set session subnet restriction. Use the default activity level subnet if there isn't one set for this session. |
|
|