From a3d27b749c3c0c751fa6595ffa1b15576b1d0048 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 30 May 2014 10:51:33 +0000 Subject: [PATCH] 2014-05-30 Miguel de Dios * godmode/agentes/agent_manager.php, godmode/setup/setup_visuals.php, include/functions_config.php, include/config_process.php, include/functions_ui.php, include/javascript/qrcode.js, include/javascript/pandora.js, operation/visual_console/public_console.php, images/qrcode_icon.jpg, general/header.php: added the feature to show the QR code of the pages for to make for example sticker for the fisical machines or other things. Incident: #818 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10047 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 13 + pandora_console/general/header.php | 37 +- .../godmode/agentes/agent_manager.php | 26 +- .../godmode/setup/setup_visuals.php | 11 + pandora_console/images/qrcode_icon.jpg | Bin 0 -> 681 bytes pandora_console/include/config_process.php | 6 +- pandora_console/include/functions_config.php | 8 +- pandora_console/include/functions_ui.php | 6 +- pandora_console/include/javascript/pandora.js | 105 +++ pandora_console/include/javascript/qrcode.js | 609 ++++++++++++++++++ .../visual_console/public_console.php | 14 + 11 files changed, 825 insertions(+), 10 deletions(-) create mode 100644 pandora_console/images/qrcode_icon.jpg create mode 100755 pandora_console/include/javascript/qrcode.js diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4a5030db99..06825ce054 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2014-05-30 Miguel de Dios + + * godmode/agentes/agent_manager.php, + godmode/setup/setup_visuals.php, include/functions_config.php, + include/config_process.php, include/functions_ui.php, + include/javascript/qrcode.js, include/javascript/pandora.js, + operation/visual_console/public_console.php, images/qrcode_icon.jpg, + general/header.php: added the feature to show the QR code of the + pages for to make for example sticker for the fisical machines or + other things. + + Incident: #818 + 2014-05-30 Sergio Martin * general/news_dialog.php: Missed file in last commit diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php index 15c43e7b60..c153bd425a 100644 --- a/pandora_console/general/header.php +++ b/pandora_console/general/header.php @@ -58,7 +58,11 @@ config_check(); $table->cellspacing = 0; $table->head = array (); $table->data = array (); - $table->style[0] = $table->style[1] = $table->style[3] = $table->style[4] = $table->style[5] = $table->style[6] = $table->style[8] = $table->style[9] = 'width: 22px; text-align:center; height: 22px; padding-right: 9px;'; + $table->style[0] = $table->style[1] = $table->style[3] = + $table->style[4] = $table->style[5] = + $table->style[6] = $table->style[8] = + $table->style[9] = $table->style['qr'] = + 'width: 22px; text-align:center; height: 22px; padding-right: 9px;'; $table->style[7] = 'width: 20px; padding-right: 9px;'; $table->style['searchbar'] = 'width: 180px; min-width: 180px;'; $table->style[11] = 'padding-left: 10px; padding-right: 5px;width: 16px;'; @@ -88,6 +92,36 @@ config_check(); $servers_link_open = ''; $servers_link_close = ''; + $show_qr_code_header = 'display: none;'; + if (isset($config['show_qr_code_header'])) + if ($config['show_qr_code_header']) + $show_qr_code_header = ''; + + $table->data[0]['qr'] = + ''; + + echo ""; + ?> + + data[0][0] = $servers_link_open . $servers_check_img . $servers_link_close; @@ -159,6 +193,7 @@ config_check(); + if ($config["alert_cnt"] > 0) { echo ''; diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index e3de6417bf..6b73c9a6a0 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -30,13 +30,13 @@ if (is_ajax ()) { switch ($config['dbtype']) { case "mysql": case "postgresql": - $filter[] = '(nombre COLLATE utf8_general_ci LIKE "%'.$string.'%" OR direccion LIKE "%'.$string.'%" OR comentarios LIKE "%'.$string.'%")'; + $filter[] = '(nombre COLLATE utf8_general_ci LIKE "%' . $string . '%" OR direccion LIKE "%'.$string.'%" OR comentarios LIKE "%'.$string.'%")'; break; case "oracle": - $filter[] = '(upper(nombre) LIKE upper("%'.$string.'%") OR upper(direccion) LIKE upper("%'.$string.'%") OR upper(comentarios) LIKE upper("%'.$string.'%"))'; + $filter[] = '(upper(nombre) LIKE upper("%' . $string . '%") OR upper(direccion) LIKE upper("%'.$string.'%") OR upper(comentarios) LIKE upper("%'.$string.'%"))'; break; } - $filter[] = 'id_agente != '.$id_agent; + $filter[] = 'id_agente != ' . $id_agent; $agents = agents_get_agents ($filter, array ('id_agente', 'nombre', 'direccion')); if ($agents === false) @@ -147,13 +147,17 @@ $table->style = array (); $table->style[0] = 'font-weight: bold; width: 150px;'; $table->data = array (); +$table->align[2] = 'center'; + $table->data[0][0] = __('Agent name') . ui_print_help_tip (__("The agent's name must be the same as the one defined at the console"), true); $table->data[0][1] = html_print_input_text ('agente', $nombre_agente, '', 50, 100,true); +$table->data[0][2] = __('QR Code Agent view'); + if ($id_agente) { - $table->data[0][1] .= " ".__("ID")."  $id_agente  "; + $table->data[0][1] .= " " . __("ID") . "  $id_agente  "; $table->data[0][1] .= '  '; $table->data[0][1] .= html_print_image ("images/zoom.png", true, array ("border" => 0, "title" => __('Agent detail'))); $table->data[0][1] .= ''; @@ -203,6 +207,18 @@ if ($id_agente) { $table->data[1][1] .= " ". html_print_checkbox ("delete_ip", 1, false, true).__('Delete selected'); } +?> + +rowspan[1][2] = 7; +$table->data[1][2] = + ""; + $groups = users_get_groups ($config["id_user"], "AR",false); $agents = agents_get_group_agents (array_keys ($groups)); @@ -445,6 +461,8 @@ function changeIcons() { $(document).ready (function () { $("select#id_os").pandoraSelectOS (); + + paint_qrcode("", "#qr_code_agent_view", 128, 128); }); /* ]]> */ diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 7f6f34e248..8fba17390d 100644 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -373,6 +373,17 @@ $table->data[$row][1] = html_print_checkbox('paginate_module', 1, $config['pagin $row++; +$table->data[$row][0] = __('Show QR Code icon in the header'); +$table->data[$row][1] = __('Yes') . ' ' . + html_print_radio_button ('show_qr_code_header', 1, '', $config["show_qr_code_header"], true) . + '  '; +$table->data[$row][1] .= __('No') . ' ' . + html_print_radio_button ('show_qr_code_header', 0, '', $config["show_qr_code_header"], true); + +$row++; + + + echo '
'; html_print_input_hidden ('update_config', 1); html_print_table ($table); diff --git a/pandora_console/images/qrcode_icon.jpg b/pandora_console/images/qrcode_icon.jpg new file mode 100644 index 0000000000000000000000000000000000000000..450097ccfac8d5b4e11eb9a480322785cb870c22 GIT binary patch literal 681 zcmex=``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTox{JFMz{AE-`BfC1<;WR*-TtisG9qCnLgKrOo)_6x>6%t;XB!T*UK;2npj(g}DQL*( z7|2lA2=kM@;*tkaYN9<~7XO_g%yle0eWJ-3ZOO;a?c^4)*(?OA0*4a=C|Cq0`Qz~s z$jbtRybM+#B>-{}F!awot- TPj;~cm`k_Iccie-|9=wzp$&qd literal 0 HcmV?d00001 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 54e5c42656..b1e17e3a64 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -190,7 +190,7 @@ $config['extensions'] = extensions_get_extensions (); // NOTICE: This variable (config[enterprise_installed] is used in several // sections. Faking or forcing to 1 will make pandora fails. -if (file_exists ($config["homedir"].'/'.ENTERPRISE_DIR.'/index.php')) { +if (file_exists ($config["homedir"] . '/' . ENTERPRISE_DIR . '/index.php')) { $config['enterprise_installed'] = 1; enterprise_include_once ('include/functions_enterprise.php'); } @@ -201,10 +201,10 @@ else { // Function include_graphs_dependencies() it's called in the code below require_once("include_graph_dependencies.php"); -include_graphs_dependencies($config['homedir'].'/'); +include_graphs_dependencies($config['homedir'] . '/'); // Updates autorefresh time -if (isset($_POST['vc_refr'])){ +if (isset($_POST['vc_refr'])) { config_update_value ('vc_refr', get_parameter('vc_refr', $config['vc_refr'])); } diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 4cbc1b1b80..8261bedea6 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -396,6 +396,8 @@ function config_update_config () { $error_update[] = __('Block size for pagination'); if (!config_update_value ('round_corner', (bool) get_parameter ('round_corner'))) $error_update[] = __('Use round corners'); + if (!config_update_value ('show_qr_code_header', (bool) get_parameter ('show_qr_code_header'))) + $error_update[] = __('Show QR code header'); if (!config_update_value ('status_images_set', (string) get_parameter ('status_images_set'))) $error_update[] = __('Status icon set'); if (!config_update_value ('fontpath', (string) get_parameter ('fontpath'))) @@ -642,6 +644,10 @@ function config_process_config () { config_update_value ('round_corner', false); } + if (!isset ($config["show_qr_code_header"])) { + config_update_value ('show_qr_code_header', false); + } + if (!isset ($config["agentaccess"])) { config_update_value ('agentaccess', true); } @@ -1198,7 +1204,7 @@ function config_check () { // Get remote file dir. $remote_config = db_get_value_filter('value', 'tconfig', array('token' => 'remote_config')); - $remote_config = io_safe_output($remote_config); + if (enterprise_installed()) { if (!is_readable ($remote_config)) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 6b13b9e0e3..c009a38039 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1301,7 +1301,8 @@ function ui_process_page_head ($string, $bitfield) { $config['css'] = array_merge (array ( "common" => "include/styles/common.css", "menu" => "include/styles/menu.css", - $config['style'] => "include/styles/" . $config['style'] . ".css"), $config['css']); + $config['style'] => "include/styles/" . $config['style'] . ".css"), + $config['css']); } // Add the jquery UI styles CSS @@ -1348,6 +1349,9 @@ function ui_process_page_head ($string, $bitfield) { //Load webchat javascript library $config['js']['webchat'] = "include/javascript/webchat.js"; + //Load qrcode library + $config['js']['qrcode'] = "include/javascript/qrcode.js"; + //Load other javascript //We can't load empty $loaded = array (''); diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index c36ff9532a..cc59418494 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -803,3 +803,108 @@ function hidded_sidebar(position, menuW, menuH, icon_width, top_dist, autotop, r function get_php_value(value) { return $.parseJSON($('#php_to_js_value_' + value).html()); } + +function paint_qrcode(text, where, width, height) { + if (typeof(text) == 'undefined') { + text = window.location.href; + } + else { + //null value + if (isEmptyObject(text)) { + text = window.location.href; + } + } + + if (typeof(where) == 'undefined') { + where = $("#qrcode_container_image").get(0); + } + else if (typeof(where) == 'string') { + where = $(where).get(0); + } + + if (typeof(where) == 'undefined') { + where = $("#qrcode_container_image").get(0); + } + else if (typeof(where) == 'string') { + where = $(where).get(0); + } + + if (typeof(width) == 'undefined') { + width = 256; + } + else { + if (typeof(width) == 'object') + //null value + if (isEmptyObject(width)) { + width = 256; + } + } + + if (typeof(height) == 'undefined') { + height = 256; + } + else { + if (typeof(height) == 'object') + //null value + if (isEmptyObject(height)) { + height = 256; + } + } + + $(where).empty(); + + var qrcode = new QRCode(where, { + text: text, + width: width, + height: height, + colorDark : "#3B6941", + colorLight : "#ffffff", + correctLevel : QRCode.CorrectLevel.M + }); +} + +function show_dialog_qrcode(dialog, text, where, width, height) { + if (typeof(dialog) == 'undefined') { + dialog = "#qrcode_container"; + } + else { + if (typeof(dialog) == 'object') + //null value + if (isEmptyObject(dialog)) { + dialog = "#qrcode_container"; + } + } + + if (typeof(where) == 'undefined') { + where = $("#qrcode_container_image").get(0); + } + else if (typeof(where) == 'string') { + where = $(where).get(0); + } + + if (typeof(width) == 'undefined') { + width = 256; + } + else { + if (typeof(width) == 'object') + //null value + if (isEmptyObject(width)) { + width = 256; + } + } + + if (typeof(height) == 'undefined') { + height = 256; + } + else { + if (typeof(height) == 'object') + //null value + if (isEmptyObject(height)) { + height = 256; + } + } + + paint_qrcode(text, where, 256, 256) + + $(dialog).dialog( "open" ); +} \ No newline at end of file diff --git a/pandora_console/include/javascript/qrcode.js b/pandora_console/include/javascript/qrcode.js new file mode 100755 index 0000000000..c1217a383b --- /dev/null +++ b/pandora_console/include/javascript/qrcode.js @@ -0,0 +1,609 @@ +/** + * @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; + 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.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(row), "y": String(col)}); + 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) { + _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); + } + + 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/pandora_console/operation/visual_console/public_console.php b/pandora_console/operation/visual_console/public_console.php index 77b9e971ee..fd3e5f9a0e 100644 --- a/pandora_console/operation/visual_console/public_console.php +++ b/pandora_console/operation/visual_console/public_console.php @@ -90,6 +90,9 @@ $table->data[0][0] = __('Autorefresh time'); $table->data[0][1] = html_print_select ($values, 'refr', $refr, '', 'N/A', 0, true, false, false); $table->data[0][2] = html_print_submit_button (__('Refresh'), '', false, 'class="sub next"', true); $table->data[0][2] .= html_print_input_hidden ('vc_refr', $config["vc_refr"], true); +$table->data[0][3] .= '' . + '' . + ''; echo '
 
'; @@ -99,6 +102,10 @@ if ($refr > 0) { echo '
 
'; +echo ""; + echo ''; html_print_input_hidden ('pure', $config["pure"]); html_print_input_hidden ('id', $id_layout); @@ -118,6 +125,13 @@ ui_require_javascript_file ('pandora_visual_console');