MDL-11451 adding default ipaddress restriction and 7 days lifetime for user key

diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php
index b25e2293f38cfa36158ff8de96aa2eb7a0354ecf..c1b994b68059c0d7004b5318bd16ecaef0c0eed7 100755 (executable)
--- a/grade/export/grade_export_form.php
+++ b/grade/export/grade_export_form.php
@@ -50,10 +50,13 @@ class grade_export_form extends moodleform {
             $mform->addElement('text', 'iprestriction', get_string('keyiprestriction', 'userkey'), array('size'=>80));
             $mform->setHelpButton('iprestriction', array(false, get_string('keyiprestriction', 'userkey'),
                     false, true, false, get_string("keyiprestrictionhelp", 'userkey')));
+            $mform->setDefault('iprestriction', getremoteaddr()); // own IP - just in case somebody does not know what user key is
 
             $mform->addElement('date_time_selector', 'validuntil', get_string('keyvaliduntil', 'userkey'), array('optional'=>true));
             $mform->setHelpButton('validuntil', array(false, get_string('keyvaliduntil', 'userkey'),
                     false, true, false, get_string("keyvaliduntilhelp", 'userkey')));
+            $mform->setDefault('validuntil', time()+3600*24*7); // only 1 week default duration - just in case somebody does not know what user key is
+
             $mform->disabledIf('iprestriction', 'key', 'noteq', 1);
             $mform->disabledIf('validuntil', 'key', 'noteq', 1);
         }

diff --git a/grade/import/xml/grade_import_form.php b/grade/import/xml/grade_import_form.php
index fbb806a3b2e9bd87536faa052aff455617222d6e..e766de19eee14e631e5de51f6ca6b6c57e0fda63 100644 (file)
--- a/grade/import/xml/grade_import_form.php
+++ b/grade/import/xml/grade_import_form.php
@@ -39,10 +39,12 @@ class grade_import_form extends moodleform {
             $mform->addElement('text', 'iprestriction', get_string('keyiprestriction', 'userkey'), array('size'=>80));
             $mform->setHelpButton('iprestriction', array(false, get_string('keyiprestriction', 'userkey'),
                     false, true, false, get_string("keyiprestrictionhelp", 'userkey')));
+            $mform->setDefault('iprestriction', getremoteaddr()); // own IP - just in case somebody does not know what user key is
 
             $mform->addElement('date_time_selector', 'validuntil', get_string('keyvaliduntil', 'userkey'), array('optional'=>true));
             $mform->setHelpButton('validuntil', array(false, get_string('keyvaliduntil', 'userkey'),
                     false, true, false, get_string("keyvaliduntilhelp", 'userkey')));
+            $mform->setDefault('validuntil', time()+3600*24*7); // only 1 week default duration - just in case somebody does not know what user key is
 
             $mform->disabledIf('iprestriction', 'key', 'noteq', 1);
             $mform->disabledIf('validuntil', 'key', 'noteq', 1);