diff --git a/add_form.php b/add_form.php index 2d294a6..cf27bf3 100644 --- a/add_form.php +++ b/add_form.php @@ -213,14 +213,21 @@ class mod_attendance_add_form extends moodleform { if (!empty($studentscanmark)) { $mgroup = array(); - $mgroup[] = &$mform->createElement('text', 'studentpassword', get_string('studentpassword', 'attendance')); - $mgroup[] = &$mform->createElement('checkbox', 'randompassword', '', get_string('randompassword', 'attendance')); - $mgroup[] = &$mform->createElement('checkbox', 'includeqrcode', '', get_string('includeqrcode', 'attendance')); + $mgroup[] = & $mform->createElement('text', 'studentpassword', get_string('studentpassword', 'attendance')); + $mform->disabledif('studentpassword', 'rotateqrcode', 'checked'); + $mgroup[] = & $mform->createElement('checkbox', 'randompassword', '', get_string('randompassword', 'attendance')); + $mform->disabledif('randompassword', 'rotateqrcode', 'checked'); + $mgroup[] = & $mform->createElement('checkbox', 'includeqrcode', '', get_string('includeqrcode', 'attendance')); + $mform->disabledif('includeqrcode', 'rotateqrcode', 'checked'); + $mform->addGroup($mgroup, 'passwordgrp', get_string('passwordgrp', 'attendance'), array(' '), false); $mform->setType('studentpassword', PARAM_TEXT); $mform->addHelpButton('passwordgrp', 'passwordgrp', 'attendance'); + $mform->addElement('checkbox', 'rotateqrcode', '', get_string('rotateqrcode', 'attendance')); + $mform->hideif('rotateqrcode', 'studentscanmark', 'notchecked'); + $mform->hideif('passwordgrp', 'studentscanmark', 'notchecked'); $mform->hideif('studentpassword', 'randompassword', 'checked'); $mform->hideif('passwordgrp', 'automark', 'eq', ATTENDANCE_AUTOMARK_ALL); @@ -240,6 +247,10 @@ class mod_attendance_add_form extends moodleform { if (isset($pluginconfig->includeqrcode_default)) { $mform->setDefault('includeqrcode', $pluginconfig->includeqrcode_default); } + // TODO - Change in DB and provide value + if (isset($pluginconfig->includeqrcode_default)) { + $mform->setDefault('rotateqrcode', $pluginconfig->includeqrcode_default); + } if (isset($pluginconfig->automark_default)) { $mform->setDefault('automark', $pluginconfig->automark_default); } diff --git a/attendance.php b/attendance.php index 9562543..638ea4b 100644 --- a/attendance.php +++ b/attendance.php @@ -37,6 +37,43 @@ $attendance = $DB->get_record('attendance', array('id' => $attforsession->attend $cm = get_coursemodule_from_instance('attendance', $attendance->id, 0, false, MUST_EXIST); $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST); +// If the randomised code is on grab it. +if ($attforsession->rotateqrcode == 1) { + $cookiename = 'attendance_'.$attforsession->id; + $secrethash = md5($USER->id.$attforsession->rotateqrcodesecret); + $url = new moodle_url('/mod/attendance/view.php', array('id' => $cm->id)); + + // Check if cookie is set and verify + if (isset($_COOKIE[$cookiename])) { + // Check the token + if ($secrethash !== $_COOKIE[$cookiename]) { + // Flag error + print_error('qr_cookie_error', 'mod_attendance', $url); + } + } else { + // Check password + $sql = 'SELECT * FROM {attendance_rotate_passwords}'. + ' WHERE attendanceid = ? AND expirytime > ? ORDER BY expirytime ASC LIMIT 2'; + $qrpassdatabase = $DB->get_records_sql($sql, ['attendanceid' => $id, time() - 2]); + + $qrpassflag = false; + + foreach ($qrpassdatabase as $qrpasselement) { + if ($qrpass == $qrpasselement->password) { + $qrpassflag = true; + } + } + + if ($qrpassflag) { + // Create and store the token + setcookie($cookiename, $secrethash, time() + (60 * 5), "/"); + } else { + // Flag error + print_error('qr_pass_wrong', 'mod_attendance', $url); + } + } +} + // Require the user is logged in. require_login($course, true, $cm); @@ -80,7 +117,6 @@ if ($attforsession->autoassignstatus && empty($attforsession->studentpassword)) } } -// Check to see if autoassignstatus is in use and if qrcode is being used. if (!empty($qrpass) && !empty($attforsession->autoassignstatus)) { $fromform = new stdClass(); @@ -118,9 +154,15 @@ if (!empty($qrpass) && !empty($attforsession->autoassignstatus)) { $PAGE->set_url($att->url_sessions()); // Create the form. -$mform = new mod_attendance_student_attendance_form(null, +if ($attforsession->rotateqrcode == 1) { + $mform = new mod_attendance_student_attendance_form(null, + array('course' => $course, 'cm' => $cm, 'modcontext' => $PAGE->context, 'session' => $attforsession, + 'attendance' => $att, 'password' => $attforsession->studentpassword)); +} else { + $mform = new mod_attendance_student_attendance_form(null, array('course' => $course, 'cm' => $cm, 'modcontext' => $PAGE->context, 'session' => $attforsession, - 'attendance' => $att, 'password' => $qrpass)); + 'attendance' => $att, 'password' => $qrpass)); +} if ($mform->is_cancelled()) { // The user cancelled the form, so redirect them to the view page. diff --git a/classes/structure.php b/classes/structure.php index 6b2f14f..3a93c77 100644 --- a/classes/structure.php +++ b/classes/structure.php @@ -512,6 +512,10 @@ class mod_attendance_structure { if (!isset($sess->includeqrcode)) { $sess->includeqrcode = 0; } + if (!isset($sess->rotateqrcode)) { + $sess->rotateqrcode = 0; + $sess->rotateqrcodesecret = ''; + } $event->add_record_snapshot('attendance_sessions', $sess); $event->trigger(); } @@ -552,6 +556,9 @@ class mod_attendance_structure { $sess->preventsharedip = 0; $sess->preventsharediptime = ''; $sess->includeqrcode = 0; + $sess->rotateqrcode = 0; + $sess->rotateqrcodesecret = ''; + if (!empty(get_config('attendance', 'enablewarnings'))) { $sess->absenteereport = empty($formdata->absenteereport) ? 0 : 1; } @@ -568,6 +575,11 @@ class mod_attendance_structure { if (!empty($formdata->includeqrcode)) { $sess->includeqrcode = $formdata->includeqrcode; } + if (!empty($formdata->rotateqrcode)) { + $sess->rotateqrcode = $formdata->rotateqrcode; + $sess->studentpassword = attendance_random_string(); + $sess->rotateqrcodesecret = attendance_random_string(); + } } if (!empty($formdata->usedefaultsubnet)) { $sess->subnet = $this->subnet; diff --git a/classes/task/clear_temporary_passwords.php b/classes/task/clear_temporary_passwords.php new file mode 100644 index 0000000..0f5d727 --- /dev/null +++ b/classes/task/clear_temporary_passwords.php @@ -0,0 +1,54 @@ +. + +/** + * Attendance task - clear temporary passwords. + * + * @package mod_attendance + * @copyright 2019 Maksud R + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +namespace mod_attendance\task; +defined('MOODLE_INTERNAL') || die(); + +/** + * clear_temporary_passwords class, used to clean up the temporary passwords. + * + * @package mod_attendance + * @copyright 2019 Maksud R + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class clear_temporary_passwords extends \core\task\scheduled_task { + /** + * Return the task's name as shown in admin screens. + * + * @return string + */ + public function get_name() { + return get_string('rotateqrcode_cleartemppass_task', 'mod_attendance'); + } + + /** + * Execute the task. + */ + public function execute() { + global $DB; + + $params = array('currenttime' => time()); + $DB->delete_records_select('attendance_rotate_passwords', 'expirytime < :currenttime', $params); + } +} \ No newline at end of file diff --git a/db/install.xml b/db/install.xml old mode 100644 new mode 100755 index 01f7a09..ae0d375 --- a/db/install.xml +++ b/db/install.xml @@ -1,7 +1,7 @@ - @@ -50,6 +50,8 @@ + + @@ -153,5 +155,16 @@
+ + + + + + + + + + +
-
+ \ No newline at end of file diff --git a/db/tasks.php b/db/tasks.php index 361f9f3..4cf8e17 100644 --- a/db/tasks.php +++ b/db/tasks.php @@ -40,5 +40,13 @@ $tasks = array( 'hour' => '1', 'day' => '*', 'dayofweek' => '*', + 'month' => '*'), + array( + 'classname' => 'mod_attendance\task\clear_temporary_passwords', + 'blocking' => 0, + 'minute' => '0', + 'hour' => '1', + 'day' => '*', + 'dayofweek' => '*', 'month' => '*') ); \ No newline at end of file diff --git a/db/upgrade.php b/db/upgrade.php old mode 100644 new mode 100755 index eedccf3..7131823 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -586,5 +586,47 @@ function xmldb_attendance_upgrade($oldversion=0) { upgrade_mod_savepoint(true, 2019062000, 'attendance'); } + if ($oldversion < 2019062200) { + + // Define table attendance_rotate_passwords to be created. + $table = new xmldb_table('attendance_rotate_passwords'); + + // Adding fields to table attendance_rotate_passwords. + $table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null); + $table->add_field('attendanceid', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null); + $table->add_field('password', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null); + $table->add_field('expirytime', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null); + + // Adding keys to table attendance_rotate_passwords. + $table->add_key('id', XMLDB_KEY_PRIMARY, ['id']); + + // Conditionally launch create table for attendance_rotate_passwords. + if (!$dbman->table_exists($table)) { + $dbman->create_table($table); + } + + // Define field rotateqrcode to be added to attendance_sessions. + $table = new xmldb_table('attendance_sessions'); + $field = new xmldb_field('rotateqrcode', XMLDB_TYPE_INTEGER, '1', null, XMLDB_NOTNULL, null, '0', 'includeqrcode'); + + // Conditionally launch add field rotateqrcode. + if (!$dbman->field_exists($table, $field)) { + $dbman->add_field($table, $field); + } + + // Define field rotateqrcodesecret to be added to attendance_sessions. + $table = new xmldb_table('attendance_sessions'); + $field = new xmldb_field('rotateqrcodesecret', XMLDB_TYPE_CHAR, '10', null, null, null, null, 'rotateqrcode'); + + // Conditionally launch add field rotateqrcodesecret. + if (!$dbman->field_exists($table, $field)) { + $dbman->add_field($table, $field); + } + + // Attendance savepoint reached. + upgrade_mod_savepoint(true, 2019062200, 'attendance'); + + } + return $result; } diff --git a/js/password/attendance_QRCodeRotate.js b/js/password/attendance_QRCodeRotate.js new file mode 100644 index 0000000..4b17ac1 --- /dev/null +++ b/js/password/attendance_QRCodeRotate.js @@ -0,0 +1,80 @@ +/** + * + * @copyright 2019 Maksud R + * @package mod_attendance + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + * + */ + +class attendance_QRCodeRotate { + + constructor() { + this.sessionId = 0; + this.password = ""; + this.qrCodeInstance = ""; + this.qrCodeHTMLElement = ""; + } + + start(sessionId, qrCodeHTMLElement) { + this.sessionId = sessionId; + this.qrCodeHTMLElement = qrCodeHTMLElement; + this.fetchAndRotate(); + } + + qrCodeSetUp() { + this.qrCodeInstance = new QRCode(this.qrCodeHTMLElement, { + text: '', + width: 328, + height: 328, + colorDark : "#000000", + colorLight : "#ffffff", + correctLevel : QRCode.CorrectLevel.H + }); + } + + changeQRCode(password) { + var qrcodeurl = document.URL.substr(0,document.URL.lastIndexOf('/')) + '/attendance.php?qrpass=' + password + '&sessid=' + this.sessionId; + this.qrCodeInstance.clear(); + this.qrCodeInstance.makeCode(qrcodeurl); + } + + startRotating() { + var parent = this; + + setInterval(function() { + var found = Object.values(parent.password).find(function(element) { + + if (element.expirytime > Math.round(new Date().getTime() / 1000)) { + return element; + } + }); + + if (found == undefined) { + location.reload(true); + } else { + parent.changeQRCode(found.password); + } + + }, 1000); + + } + + fetchAndRotate() { + var parent = this; + + fetch('password.php?session='+this.sessionId+'&returnpasswords=1', { + headers: { + 'Content-Type': 'application/json; charset=utf-8' + } + }) + .then((resp) => resp.json()) // Transform the data into json + .then(function(data) { + parent.password = data; + parent.qrCodeSetUp(); + // this.changeQRCode( password ); + parent.startRotating(); + }).catch(err => { + console.error("Error fetching QR passwords from API."); + }); + } +} \ No newline at end of file diff --git a/js/qrcode/README.md b/js/qrcode/README.md new file mode 100644 index 0000000..5e2d2dc --- /dev/null +++ b/js/qrcode/README.md @@ -0,0 +1,46 @@ +# QRCode.js +QRCode.js is javascript library for making QRCode. QRCode.js supports Cross-browser with HTML5 Canvas and table tag in DOM. +QRCode.js has no dependencies. + +## Basic Usages +``` +
+ +``` + +or with some options + +``` +
+ +``` + +and you can use some methods + +``` +qrcode.clear(); // clear the code. +qrcode.makeCode("http://naver.com"); // make another code. +``` + +## Browser Compatibility +IE6~10, Chrome, Firefox, Safari, Opera, Mobile Safari, Android, Windows Mobile, ETC. + +## License +MIT License + +## Contact +twitter @davidshimjs + +[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/davidshimjs/qrcodejs/trend.png)](https://bitdeli.com/free "Bitdeli Badge") + diff --git a/js/qrcode/qrcode.js b/js/qrcode/qrcode.js new file mode 100644 index 0000000..5507c15 --- /dev/null +++ b/js/qrcode/qrcode.js @@ -0,0 +1,614 @@ +/** + * @fileoverview + * - Using the 'QRCode for Javascript library' + * - Fixed dataset of 'QRCode for Javascript library' for support full-spec. + * - this library has no dependencies. + * + * @author davidshimjs + * @see http://www.d-project.com/ + * @see http://jeromeetienne.github.com/jquery-qrcode/ + */ +var QRCode; + +(function () { + //--------------------------------------------------------------------- + // QRCode for JavaScript + // + // Copyright (c) 2009 Kazuhiko Arase + // + // URL: http://www.d-project.com/ + // + // Licensed under the MIT license: + // http://www.opensource.org/licenses/mit-license.php + // + // The word "QR Code" is registered trademark of + // DENSO WAVE INCORPORATED + // http://www.denso-wave.com/qrcode/faqpatent-e.html + // + //--------------------------------------------------------------------- + function QR8bitByte(data) { + this.mode = QRMode.MODE_8BIT_BYTE; + this.data = data; + this.parsedData = []; + + // Added to support UTF-8 Characters + for (var i = 0, l = this.data.length; i < l; i++) { + var byteArray = []; + var code = this.data.charCodeAt(i); + + if (code > 0x10000) { + byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18); + byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12); + byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[3] = 0x80 | (code & 0x3F); + } else if (code > 0x800) { + byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12); + byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[2] = 0x80 | (code & 0x3F); + } else if (code > 0x80) { + byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6); + byteArray[1] = 0x80 | (code & 0x3F); + } else { + byteArray[0] = code; + } + + this.parsedData.push(byteArray); + } + + this.parsedData = Array.prototype.concat.apply([], this.parsedData); + + if (this.parsedData.length != this.data.length) { + this.parsedData.unshift(191); + this.parsedData.unshift(187); + this.parsedData.unshift(239); + } + } + + QR8bitByte.prototype = { + getLength: function (buffer) { + return this.parsedData.length; + }, + write: function (buffer) { + for (var i = 0, l = this.parsedData.length; i < l; i++) { + buffer.put(this.parsedData[i], 8); + } + } + }; + + function QRCodeModel(typeNumber, errorCorrectLevel) { + this.typeNumber = typeNumber; + this.errorCorrectLevel = errorCorrectLevel; + this.modules = null; + this.moduleCount = 0; + this.dataCache = null; + this.dataList = []; + } + + QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);} + return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row=7){this.setupTypeNumber(test);} + if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);} + this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}} + return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;} + for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}} + for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}} + this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex>>bitIndex)&1)==1);} + var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;} + this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}} + row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;itotalDataCount*8){throw new Error("code length overflow. (" + +buffer.getLengthInBits() + +">" + +totalDataCount*8 + +")");} + if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);} + while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);} + while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;} + buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;} + buffer.put(QRCodeModel.PAD1,8);} + return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r=0)?modPoly.get(modIndex):0;}} + var totalCodeCount=0;for(var i=0;i=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));} + return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));} + return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;} + return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i5){lostPoint+=(3+sameCount-5);}}} + for(var row=0;row=256){n-=255;} + return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);} + if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));} + this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]]; + + function _isSupportCanvas() { + return typeof CanvasRenderingContext2D != "undefined"; + } + + // android 2.x doesn't support Data-URI spec + function _getAndroid() { + var android = false; + var sAgent = navigator.userAgent; + + if (/android/i.test(sAgent)) { // android + android = true; + var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i); + + if (aMat && aMat[1]) { + android = parseFloat(aMat[1]); + } + } + + return android; + } + + var svgDrawer = (function() { + + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + + this.clear(); + + function makeSVG(tag, attrs) { + var el = document.createElementNS('http://www.w3.org/2000/svg', tag); + for (var k in attrs) + if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]); + return el; + } + + var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight}); + svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink"); + _el.appendChild(svg); + + svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"})); + svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"})); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + if (oQRCode.isDark(row, col)) { + var child = makeSVG("use", {"x": String(col), "y": String(row)}); + child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template") + svg.appendChild(child); + } + } + } + }; + Drawing.prototype.clear = function () { + while (this._el.hasChildNodes()) + this._el.removeChild(this._el.lastChild); + }; + return Drawing; + })(); + + var useSVG = document.documentElement.tagName.toLowerCase() === "svg"; + + // Drawing in DOM by using Table tag + var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () { + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + var aHTML = ['']; + + for (var row = 0; row < nCount; row++) { + aHTML.push(''); + + for (var col = 0; col < nCount; col++) { + aHTML.push(''); + } + + aHTML.push(''); + } + + aHTML.push('
'); + _el.innerHTML = aHTML.join(''); + + // Fix the margin values as real size. + var elTable = _el.childNodes[0]; + var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2; + var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2; + + if (nLeftMarginTable > 0 && nTopMarginTable > 0) { + elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px"; + } + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._el.innerHTML = ''; + }; + + return Drawing; + })() : (function () { // Drawing in Canvas + function _onMakeImage() { + this._elImage.src = this._elCanvas.toDataURL("image/png"); + this._elImage.style.display = "block"; + this._elCanvas.style.display = "none"; + } + + // Android 2.1 bug workaround + // http://code.google.com/p/android/issues/detail?id=5141 + if (this._android && this._android <= 2.1) { + var factor = 1 / window.devicePixelRatio; + var drawImage = CanvasRenderingContext2D.prototype.drawImage; + CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) { + if (("nodeName" in image) && /img/i.test(image.nodeName)) { + for (var i = arguments.length - 1; i >= 1; i--) { + arguments[i] = arguments[i] * factor; + } + } else if (typeof dw == "undefined") { + arguments[1] *= factor; + arguments[2] *= factor; + arguments[3] *= factor; + arguments[4] *= factor; + } + + drawImage.apply(this, arguments); + }; + } + + /** + * Check whether the user's browser supports Data URI or not + * + * @private + * @param {Function} fSuccess Occurs if it supports Data URI + * @param {Function} fFail Occurs if it doesn't support Data URI + */ + function _safeSetDataURI(fSuccess, fFail) { + var self = this; + self._fFail = fFail; + self._fSuccess = fSuccess; + + // Check it just once + if (self._bSupportDataURI === null) { + var el = document.createElement("img"); + var fOnError = function() { + self._bSupportDataURI = false; + + if (self._fFail) { + self._fFail.call(self); + } + }; + var fOnSuccess = function() { + self._bSupportDataURI = true; + + if (self._fSuccess) { + self._fSuccess.call(self); + } + }; + + el.onabort = fOnError; + el.onerror = fOnError; + el.onload = fOnSuccess; + el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data. + return; + } else if (self._bSupportDataURI === true && self._fSuccess) { + self._fSuccess.call(self); + } else if (self._bSupportDataURI === false && self._fFail) { + self._fFail.call(self); + } + }; + + /** + * Drawing QRCode by using canvas + * + * @constructor + * @param {HTMLElement} el + * @param {Object} htOption QRCode Options + */ + var Drawing = function (el, htOption) { + this._bIsPainted = false; + this._android = _getAndroid(); + + this._htOption = htOption; + this._elCanvas = document.createElement("canvas"); + this._elCanvas.width = htOption.width; + this._elCanvas.height = htOption.height; + el.appendChild(this._elCanvas); + this._el = el; + this._oContext = this._elCanvas.getContext("2d"); + this._bIsPainted = false; + this._elImage = document.createElement("img"); + this._elImage.alt = "Scan me!"; + this._elImage.style.display = "none"; + this._el.appendChild(this._elImage); + this._bSupportDataURI = null; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _elImage = this._elImage; + var _oContext = this._oContext; + var _htOption = this._htOption; + + var nCount = oQRCode.getModuleCount(); + var nWidth = _htOption.width / nCount; + var nHeight = _htOption.height / nCount; + var nRoundedWidth = Math.round(nWidth); + var nRoundedHeight = Math.round(nHeight); + + _elImage.style.display = "none"; + this.clear(); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + var bIsDark = oQRCode.isDark(row, col); + var nLeft = col * nWidth; + var nTop = row * nHeight; + _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.lineWidth = 1; + _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.fillRect(nLeft, nTop, nWidth, nHeight); + + // 안티 앨리어싱 방지 처리 + _oContext.strokeRect( + Math.floor(nLeft) + 0.5, + Math.floor(nTop) + 0.5, + nRoundedWidth, + nRoundedHeight + ); + + _oContext.strokeRect( + Math.ceil(nLeft) - 0.5, + Math.ceil(nTop) - 0.5, + nRoundedWidth, + nRoundedHeight + ); + } + } + + this._bIsPainted = true; + }; + + /** + * Make the image from Canvas if the browser supports Data URI. + */ + Drawing.prototype.makeImage = function () { + if (this._bIsPainted) { + _safeSetDataURI.call(this, _onMakeImage); + } + }; + + /** + * Return whether the QRCode is painted or not + * + * @return {Boolean} + */ + Drawing.prototype.isPainted = function () { + return this._bIsPainted; + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height); + this._bIsPainted = false; + }; + + /** + * @private + * @param {Number} nNumber + */ + Drawing.prototype.round = function (nNumber) { + if (!nNumber) { + return nNumber; + } + + return Math.floor(nNumber * 1000) / 1000; + }; + + return Drawing; + })(); + + /** + * Get the type by string length + * + * @private + * @param {String} sText + * @param {Number} nCorrectLevel + * @return {Number} type + */ + function _getTypeNumber(sText, nCorrectLevel) { + var nType = 1; + var length = _getUTF8Length(sText); + + for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) { + var nLimit = 0; + + switch (nCorrectLevel) { + case QRErrorCorrectLevel.L : + nLimit = QRCodeLimitLength[i][0]; + break; + case QRErrorCorrectLevel.M : + nLimit = QRCodeLimitLength[i][1]; + break; + case QRErrorCorrectLevel.Q : + nLimit = QRCodeLimitLength[i][2]; + break; + case QRErrorCorrectLevel.H : + nLimit = QRCodeLimitLength[i][3]; + break; + } + + if (length <= nLimit) { + break; + } else { + nType++; + } + } + + if (nType > QRCodeLimitLength.length) { + throw new Error("Too long data"); + } + + return nType; + } + + function _getUTF8Length(sText) { + var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a'); + return replacedText.length + (replacedText.length != sText ? 3 : 0); + } + + /** + * @class QRCode + * @constructor + * @example + * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie"); + * + * @example + * var oQRCode = new QRCode("test", { + * text : "http://naver.com", + * width : 128, + * height : 128 + * }); + * + * oQRCode.clear(); // Clear the QRCode. + * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode. + * + * @param {HTMLElement|String} el target element or 'id' attribute of element. + * @param {Object|String} vOption + * @param {String} vOption.text QRCode link data + * @param {Number} [vOption.width=256] + * @param {Number} [vOption.height=256] + * @param {String} [vOption.colorDark="#000000"] + * @param {String} [vOption.colorLight="#ffffff"] + * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H] + */ + QRCode = function (el, vOption) { + this._htOption = { + width : 256, + height : 256, + typeNumber : 4, + colorDark : "#000000", + colorLight : "#ffffff", + correctLevel : QRErrorCorrectLevel.H + }; + + if (typeof vOption === 'string') { + vOption = { + text : vOption + }; + } + + // Overwrites options + if (vOption) { + for (var i in vOption) { + this._htOption[i] = vOption[i]; + } + } + + if (typeof el == "string") { + el = document.getElementById(el); + } + + if (this._htOption.useSVG) { + Drawing = svgDrawer; + } + + this._android = _getAndroid(); + this._el = el; + this._oQRCode = null; + this._oDrawing = new Drawing(this._el, this._htOption); + + if (this._htOption.text) { + this.makeCode(this._htOption.text); + } + }; + + /** + * Make the QRCode + * + * @param {String} sText link data + */ + QRCode.prototype.makeCode = function (sText) { + this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel); + this._oQRCode.addData(sText); + this._oQRCode.make(); + this._el.title = sText; + this._oDrawing.draw(this._oQRCode); + this.makeImage(); + }; + + /** + * Make the Image from Canvas element + * - It occurs automatically + * - Android below 3 doesn't support Data-URI spec. + * + * @private + */ + QRCode.prototype.makeImage = function () { + if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) { + this._oDrawing.makeImage(); + } + }; + + /** + * Clear the QRCode + */ + QRCode.prototype.clear = function () { + this._oDrawing.clear(); + }; + + /** + * @name QRCode.CorrectLevel + */ + QRCode.CorrectLevel = QRErrorCorrectLevel; +})(); diff --git a/js/qrcode/qrcode.min.js b/js/qrcode/qrcode.min.js new file mode 100644 index 0000000..993e88f --- /dev/null +++ b/js/qrcode/qrcode.min.js @@ -0,0 +1 @@ +var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); \ No newline at end of file diff --git a/lang/en/attendance.php b/lang/en/attendance.php index cc5b885..ab0652d 100644 --- a/lang/en/attendance.php +++ b/lang/en/attendance.php @@ -244,6 +244,10 @@ $string['identifyby'] = 'Identify student by'; $string['includeall'] = 'Select all sessions'; $string['includenottaken'] = 'Include not taken sessions'; $string['includeqrcode'] = 'Include QR code'; +$string['rotateqrcode'] = 'Rotate QR code'; +$string['rotateqrcodeinterval'] = 'Rotate QR code interval (seconds)'; +$string['rotateqrcodeinterval_desc'] = 'Time interval (seconds) to rotate QR codes by.'; +$string['rotateqrcode_cleartemppass_task'] = 'Task to clear temporary passwords generated by rotate QR code functionality.'; $string['includeremarks'] = 'Include remarks'; $string['incorrectpassword'] = 'You have entered an incorrect password and your attendance has not been recorded, please enter the correct password.'; $string['incorrectpasswordshort'] = 'Incorrect password, attendance not recorded.'; @@ -534,6 +538,8 @@ $string['includeabsentee'] = 'Include session when calculating absentee report'; $string['includeabsentee_help'] = 'If checked this session will be included in the absentee report calculations.'; $string['attendance_no_status'] = 'No valid status was available - you may be too late to record attendance.'; $string['studentmarked'] = 'Your attendance in this session has been recorded.'; +$string['qr_cookie_error'] = 'QR session has expired.'; +$string['qr_pass_wrong'] = 'QR password is wrong or has expired.'; $string['privacy:metadata:sessionid'] = 'Attendance session ID.'; $string['privacy:metadata:studentid'] = 'ID of student having attendance recorded.'; $string['privacy:metadata:statusid'] = 'ID of student\'s attendance status.'; diff --git a/locallib.php b/locallib.php index fe1ec2f..619fe27 100644 --- a/locallib.php +++ b/locallib.php @@ -634,6 +634,9 @@ function attendance_construct_sessions_data_for_add($formdata, mod_attendance_st $sess->absenteereport = $absenteereport; $sess->studentpassword = ''; $sess->includeqrcode = 0; + $sess->rotateqrcode = 0; + $sess->rotateqrcodesecret = ''; + if (!empty($formdata->usedefaultsubnet)) { $sess->subnet = $att->subnet; } else { @@ -662,6 +665,23 @@ function attendance_construct_sessions_data_for_add($formdata, mod_attendance_st if (!empty($formdata->includeqrcode)) { $sess->includeqrcode = $formdata->includeqrcode; } + if (!empty($formdata->rotateqrcode)) { + $sess->rotateqrcode = $formdata->rotateqrcode; + $sess->studentpassword = attendance_random_string(); + $sess->rotateqrcodesecret = attendance_random_string(); + } + if (!empty($formdata->preventsharedip)) { + $sess->preventsharedip = $formdata->preventsharedip; + } + if (!empty($formdata->preventsharediptime)) { + $sess->preventsharediptime = $formdata->preventsharediptime; + } + } else { + $sess->subnet = ''; + $sess->automark = 0; + $sess->automarkcompleted = 0; + $sess->preventsharedip = 0; + $sess->preventsharediptime = ''; } $sess->statusset = $formdata->statusset; @@ -690,6 +710,8 @@ function attendance_construct_sessions_data_for_add($formdata, mod_attendance_st $sess->automarkcompleted = 0; $sess->absenteereport = $absenteereport; $sess->includeqrcode = 0; + $sess->rotateqrcode = 0; + $sess->rotateqrcodesecret = ''; if (!empty($formdata->usedefaultsubnet)) { $sess->subnet = $att->subnet; @@ -721,6 +743,26 @@ function attendance_construct_sessions_data_for_add($formdata, mod_attendance_st if (!empty($formdata->includeqrcode)) { $sess->includeqrcode = $formdata->includeqrcode; } + if (!empty($formdata->rotateqrcode)) { + $sess->rotateqrcode = $formdata->rotateqrcode; + $sess->studentpassword = attendance_random_string(); + $sess->rotateqrcodesecret = attendance_random_string(); + } + if (!empty($formdata->usedefaultsubnet)) { + $sess->subnet = $att->subnet; + } else { + $sess->subnet = $formdata->subnet; + } + + if (!empty($formdata->automark)) { + $sess->automark = $formdata->automark; + } + if (!empty($formdata->preventsharedip)) { + $sess->preventsharedip = $formdata->preventsharedip; + } + if (!empty($formdata->preventsharediptime)) { + $sess->preventsharediptime = $formdata->preventsharediptime; + } } $sess->statusset = $formdata->statusset; @@ -1062,8 +1104,7 @@ function attendance_renderqrcode($session) { global $CFG; if (strlen($session->studentpassword) > 0) { - $qrcodeurl = $CFG->wwwroot . '/mod/attendance/attendance.php?qrpass=' . $session->studentpassword . - '&sessid=' . $session->id; + $qrcodeurl = $CFG->wwwroot . '/mod/attendance/attendance.php?qrpass=' . $session->studentpassword . '&sessid=' . $session->id; } else { $qrcodeurl = $CFG->wwwroot . '/mod/attendance/attendance.php?sessid=' . $session->id; } @@ -1073,4 +1114,62 @@ function attendance_renderqrcode($session) { $barcode = new TCPDF2DBarcode($qrcodeurl, 'QRCODE'); $image = $barcode->getBarcodePngData(15, 15); echo html_writer::img('data:image/png;base64,' . base64_encode($image), get_string('qrcode', 'attendance')); +} + +/** + * Generate QR code passwords. + * + * @param stdClass $session + */ +function attendance_generate_passwords($session) { + global $DB; + $attconfig = get_config('attendance'); + $password = array(); + + for ($i = 0; $i < 30; $i++) { + array_push($password, array("attendanceid" => $session->id, "password" => mt_rand(1000, 10000), "expirytime" => time() + ($attconfig->rotateqrcodeinterval * $i))); + } + + $DB->insert_records('attendance_rotate_passwords', $password); +} + +/** + * Render JS for rotate QR code passwords. + * + * @param stdClass $session + */ +function attendance_renderqrcoderotate($session) { + echo html_writer::tag('h3', get_string('qrcode', 'attendance')); + // load requered js + echo html_writer::tag('script', '', + [ + 'src' => 'js/qrcode/qrcode.min.js', + 'type' => 'text/javascript' + ] + ); + echo html_writer::tag('script', '', + [ + 'src' => 'js/password/attendance_QRCodeRotate.js', + 'type' => 'text/javascript' + ] + ); + echo html_writer::tag('div', '', ['id' => 'qrcode']); // div to display qr code + // js to start the password manager + echo ' + '; +} + +/** + * Return QR code passwords. + * + * @param stdClass $session + */ +function attendance_return_passwords($session) { + global $DB; + + $sql = 'SELECT * FROM {attendance_rotate_passwords} WHERE attendanceid = ? AND expirytime > ? ORDER BY expirytime ASC'; + return json_encode($DB->get_records_sql($sql, ['attendanceid' => $session->id, time()], $strictness = IGNORE_MISSING)); } \ No newline at end of file diff --git a/password.php b/password.php index f15be09..e55baff 100644 --- a/password.php +++ b/password.php @@ -41,6 +41,12 @@ if (!has_any_capability($capabilities, $context)) { exit; } +if (optional_param('returnpasswords', 0, PARAM_INT) == 1) { + header('Content-Type: application/json'); + echo attendance_return_passwords($session); + exit; +} + $PAGE->set_url('/mod/attendance/password.php'); $PAGE->set_pagelayout('popup'); @@ -52,8 +58,9 @@ echo $OUTPUT->header(); $showpassword = (isset($session->studentpassword) && strlen($session->studentpassword) > 0); $showqr = (isset($session->includeqrcode) && $session->includeqrcode == 1); +$rotateqr = (isset($session->rotateqrcode) && $session->rotateqrcode == 1); -if ($showpassword) { +if ($showpassword && !$rotateqr) { attendance_renderpassword($session); } @@ -61,4 +68,9 @@ if ($showqr) { attendance_renderqrcode($session); } +if ($rotateqr) { + attendance_generate_passwords($session); + attendance_renderqrcoderotate($session); +} + echo $OUTPUT->footer(); diff --git a/renderer.php b/renderer.php index 18d4261..5af41d4 100644 --- a/renderer.php +++ b/renderer.php @@ -319,7 +319,7 @@ class mod_attendance_renderer extends plugin_renderer_base { $icon = new attendance_password_icon($sess->studentpassword, $sess->id); - if ($sess->includeqrcode == 1) { + if ($sess->includeqrcode == 1||$sess->rotateqrcode == 1) { $icon->includeqrcode = 1; } else { $icon->includeqrcode = 0; diff --git a/settings.php b/settings.php index 4d28ad6..e498d0c 100644 --- a/settings.php +++ b/settings.php @@ -52,6 +52,10 @@ if ($ADMIN->fulltree) { $settings->add(new admin_setting_configcheckbox('attendance/studentscanmark', get_string('studentscanmark', 'attendance'), get_string('studentscanmark_desc', 'attendance'), 1)); + $settings->add(new admin_setting_configtext('attendance/rotateqrcodeinterval', + get_string('rotateqrcodeinterval', 'attendance'), + get_string('rotateqrcodeinterval_desc', 'attendance'), '15', PARAM_INT)); + $settings->add(new admin_setting_configcheckbox('attendance/studentscanmarksessiontime', get_string('studentscanmarksessiontime', 'attendance'), get_string('studentscanmarksessiontime_desc', 'attendance'), 1)); diff --git a/thirdpartylibs.xml b/thirdpartylibs.xml new file mode 100644 index 0000000..85c62a2 --- /dev/null +++ b/thirdpartylibs.xml @@ -0,0 +1,10 @@ + + + + js/qrcode/qrcode.js + jquery.qrcode.js + 1.0 + MIT + + + \ No newline at end of file diff --git a/update_form.php b/update_form.php index ead2a65..05bd34f 100644 --- a/update_form.php +++ b/update_form.php @@ -77,7 +77,8 @@ class mod_attendance_update_form extends moodleform { 'automarkcompleted' => 0, 'preventsharedip' => $sess->preventsharedip, 'preventsharediptime' => $sess->preventsharediptime, - 'includeqrcode' => $sess->includeqrcode + 'includeqrcode' => $sess->includeqrcode, + 'rotateqrcode' => $sess->rotateqrcode, ); if ($sess->subnet == $attendancesubnet) { $data['usedefaultsubnet'] = 1; @@ -150,11 +151,15 @@ class mod_attendance_update_form extends moodleform { $mform->addElement('text', 'studentpassword', get_string('studentpassword', 'attendance')); $mform->setType('studentpassword', PARAM_TEXT); $mform->addHelpButton('studentpassword', 'passwordgrp', 'attendance'); + $mform->disabledif('studentpassword', 'rotateqrcode', 'checked'); $mform->hideif('studentpassword', 'studentscanmark', 'notchecked'); $mform->hideif('studentpassword', 'automark', 'eq', ATTENDANCE_AUTOMARK_ALL); $mform->hideif('randompassword', 'automark', 'eq', ATTENDANCE_AUTOMARK_ALL); $mform->addElement('checkbox', 'includeqrcode', '', get_string('includeqrcode', 'attendance')); $mform->hideif('includeqrcode', 'studentscanmark', 'notchecked'); + $mform->disabledif('includeqrcode', 'rotateqrcode', 'checked'); + $mform->addElement('checkbox', 'rotateqrcode', '', get_string('rotateqrcode', 'attendance')); + $mform->hideif('rotateqrcode', 'studentscanmark', 'notchecked'); $mform->addElement('checkbox', 'autoassignstatus', '', get_string('autoassignstatus', 'attendance')); $mform->addHelpButton('autoassignstatus', 'autoassignstatus', 'attendance'); $mform->hideif('autoassignstatus', 'studentscanmark', 'notchecked'); diff --git a/version.php b/version.php old mode 100644 new mode 100755 index ca652c0..af98ceb --- a/version.php +++ b/version.php @@ -23,7 +23,7 @@ */ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2019062000; +$plugin->version = 2019062200; $plugin->requires = 2018102700; // Requires 3.6. $plugin->release = '3.6.7'; $plugin->maturity = MATURITY_STABLE;