From 0c5f5279a6e9665f717c0beb6dcc93f1e7b4fc8a Mon Sep 17 00:00:00 2001 From: YJSoft Date: Sat, 17 Jan 2015 20:50:38 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#1111=20=EC=82=AC=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EC=9E=A0=EA=B8=88=20=EC=82=AC=EC=9A=A9=EC=8B=9C=20=EB=8C=80?= =?UTF-8?q?=EC=8B=9C=EB=B3=B4=EB=93=9C=EC=97=90=20=EA=B2=BD=EA=B3=A0=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 사이트 잠금을 해둔 것을 잊어 버리는 것을 방지 겸 reminder. --- modules/admin/admin.admin.view.php | 3 +++ modules/admin/lang/lang.xml | 7 +++++++ modules/admin/tpl/index.html | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 4c9baaa6ee..7d6b7a800e 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -248,6 +248,9 @@ function makeGnbUrl($module = 'admin') */ function dispAdminIndex() { + $db_info = Context::getDBInfo(); + Context::set('db_info',$db_info); + // Get statistics $args = new stdClass(); $args->date = date("Ymd000000", $_SERVER['REQUEST_TIME'] - 60 * 60 * 24); diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml index aad7294c44..ed6277a3b9 100644 --- a/modules/admin/lang/lang.xml +++ b/modules/admin/lang/lang.xml @@ -1606,4 +1606,11 @@ + + + + + + + diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html index 15f754e499..04c73e0a33 100644 --- a/modules/admin/tpl/index.html +++ b/modules/admin/tpl/index.html @@ -19,6 +19,11 @@

{$lang->checkBrowserIE8}

{$XE_VALIDATOR_MESSAGE}

+
+

{$lang->sitelock_in_use}

+

{$lang->about_sitelock_in_use}

+
+
From 8fac041af6af296125206ff7d7db586d9fbd0ab3 Mon Sep 17 00:00:00 2001 From: bnu Date: Wed, 21 Jan 2015 13:17:56 +0900 Subject: [PATCH 2/4] =?UTF-8?q?jshint=20=EC=84=A4=EC=A0=95=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .jshintignore | 9 +++++++ .jshintrc | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ Gruntfile.js | 9 ------- 3 files changed, 77 insertions(+), 9 deletions(-) create mode 100644 .jshintignore create mode 100644 .jshintrc diff --git a/.jshintignore b/.jshintignore new file mode 100644 index 0000000000..5f00d3da39 --- /dev/null +++ b/.jshintignore @@ -0,0 +1,9 @@ +common/js/jquery*.js +common/js/modernizr.js +common/js/xe.js +common/js/x.js +common/js/*.min.js +common/js/unittest/* +common/js/plugins/* +common/js/foggyLayer.js +common/js/html5.js diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000000..ae1b55f2c0 --- /dev/null +++ b/.jshintrc @@ -0,0 +1,68 @@ +{ + "globalstrict": false, + "undef": false, + "eqeqeq": false, + "browser": true, + "devel": true, + "jquery": true, + "evil": true, + "globals": { + "window": true, + "current_url": true, + "exec_json": true, + "exec_xml": true, + "procFilter": true, + "xe": true, + "request_uri": true, + "xAddEventListener": false, + "xResizeEvent": false, + "xScrollEvent": false, + "xAppendChild": false, + "xClientHeight": false, + "xClientWidth": false, + "xCreateElement": false, + "xDef": false, + "xDeleteCookie": false, + "xDisplay": false, + "xEvent": false, + "xFirstChild": false, + "xGetBodyWidth": false, + "xGetBodyHeight": false, + "xGetComputedStyle": false, + "xGetCookie": false, + "xGetElementById": false, + "xGetElementsByAttribute": false, + "xGetElementsByClassName": false, + "xGetElementsByTagName": false, + "xGetURLArguments": false, + "xHeight": false, + "xHex": false, + "xHide": false, + "xInnerHtml": false, + "xLeft": false, + "xMoveTo": false, + "xName": false, + "xNextSib": false, + "xNum": false, + "xOffsetLeft": false, + "xOffsetTop": false, + "xPad": false, + "xPageX": false, + "xPageY": false, + "xParent": false, + "xPreventDefault": false, + "xPrevSib": false, + "xRemoveEventListener": false, + "xResizeTo": false, + "xScrollLeft": false, + "xScrollTop": false, + "xSetCookie": false, + "xShow": false, + "xStr": false, + "xTop": false, + "xVisibility": false, + "xWidth": false, + "xZIndex": false, + "xStopPropagation": false + } +} diff --git a/Gruntfile.js b/Gruntfile.js index 9b9f7a5025..2adb308a01 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -172,15 +172,6 @@ module.exports = function(grunt) { 'modules/widget/tpl/js/*.js', ], options : { - globalstrict: false, - undef : false, - eqeqeq: false, - browser : true, - globals: { - "jQuery" : true, - "console" : true, - "window" : true - }, ignores : [ '**/jquery*.js', '**/swfupload.js', From b3e9e782012c38b2922007735ad47ba5e88cac58 Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Fri, 23 Jan 2015 12:32:08 +0900 Subject: [PATCH 3/4] Update Extravar.class.php --- classes/extravar/Extravar.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php index 93ea4427d2..ed15074c58 100644 --- a/classes/extravar/Extravar.class.php +++ b/classes/extravar/Extravar.class.php @@ -297,7 +297,7 @@ function getValueHTML() return ($value) ? sprintf('%s', $value, $value) : ""; case 'tel' : - return sprintf('%s - %s - %s', $value[0], $value[1], $value[2]); + return sprintf('%s-%s-%s', $value[0], $value[1], $value[2]); case 'textarea' : return nl2br($value); From c174a68f58607e52192f40a98929e22b9ef8d7c2 Mon Sep 17 00:00:00 2001 From: khongchi Date: Wed, 28 Jan 2015 16:01:43 +0900 Subject: [PATCH 4/4] #1208 remove gravatar from oembed provider --- addons/oembed/jquery.oembed.js | 140 --------------------------------- 1 file changed, 140 deletions(-) diff --git a/addons/oembed/jquery.oembed.js b/addons/oembed/jquery.oembed.js index 41f9d45096..dd17f48412 100755 --- a/addons/oembed/jquery.oembed.js +++ b/addons/oembed/jquery.oembed.js @@ -781,12 +781,6 @@ from: 'htmlstring' } }), - new $.fn.oembed.OEmbedProvider("gravtar", "photo", ["mailto:.+"], null, { - templateRegex: /mailto:([^\/]+).*/, - template: function (wm, email) { - return 'on Gravtar'; - } - }), //Rich new $.fn.oembed.OEmbedProvider("twitter", "rich", ["twitter.com/.+"], "https://api.twitter.com/1/statuses/oembed.json"), @@ -1062,137 +1056,3 @@ }) ]; })(jQuery); - -//This is needed for gravatar :( -String.prototype.md5 = function () { - var a = function (a, b) { - var c = (a & 65535) + (b & 65535); - var d = (a >> 16) + (b >> 16) + (c >> 16); - return d << 16 | c & 65535 - }; - var b = function (a, b) { - return a << b | a >>> 32 - b - }; - var c = function (c, d, e, f, g, h) { - return a(b(a(a(d, c), a(f, h)), g), e) - }; - var d = function (a, b, d, e, f, g, h) { - return c(b & d | ~b & e, a, b, f, g, h) - }; - var e = function (a, b, d, e, f, g, h) { - return c(b & e | d & ~e, a, b, f, g, h) - }; - var f = function (a, b, d, e, f, g, h) { - return c(b ^ d ^ e, a, b, f, g, h) - }; - var g = function (a, b, d, e, f, g, h) { - return c(d ^ (b | ~e), a, b, f, g, h) - }; - var h = function (b) { - var c, h, i, j, k, l = b.length; - var m = 1732584193; - var n = -271733879; - var o = -1732584194; - var p = 271733878; - for(k = 0; k < l; k += 16) { - c = m; - h = n; - i = o; - j = p; - m = d(m, n, o, p, b[k + 0], 7, -680876936); - p = d(p, m, n, o, b[k + 1], 12, -389564586); - o = d(o, p, m, n, b[k + 2], 17, 606105819); - n = d(n, o, p, m, b[k + 3], 22, -1044525330); - m = d(m, n, o, p, b[k + 4], 7, -176418897); - p = d(p, m, n, o, b[k + 5], 12, 1200080426); - o = d(o, p, m, n, b[k + 6], 17, -1473231341); - n = d(n, o, p, m, b[k + 7], 22, -45705983); - m = d(m, n, o, p, b[k + 8], 7, 1770035416); - p = d(p, m, n, o, b[k + 9], 12, -1958414417); - o = d(o, p, m, n, b[k + 10], 17, -42063); - n = d(n, o, p, m, b[k + 11], 22, -1990404162); - m = d(m, n, o, p, b[k + 12], 7, 1804603682); - p = d(p, m, n, o, b[k + 13], 12, -40341101); - o = d(o, p, m, n, b[k + 14], 17, -1502002290); - n = d(n, o, p, m, b[k + 15], 22, 1236535329); - m = e(m, n, o, p, b[k + 1], 5, -165796510); - p = e(p, m, n, o, b[k + 6], 9, -1069501632); - o = e(o, p, m, n, b[k + 11], 14, 643717713); - n = e(n, o, p, m, b[k + 0], 20, -373897302); - m = e(m, n, o, p, b[k + 5], 5, -701558691); - p = e(p, m, n, o, b[k + 10], 9, 38016083); - o = e(o, p, m, n, b[k + 15], 14, -660478335); - n = e(n, o, p, m, b[k + 4], 20, -405537848); - m = e(m, n, o, p, b[k + 9], 5, 568446438); - p = e(p, m, n, o, b[k + 14], 9, -1019803690); - o = e(o, p, m, n, b[k + 3], 14, -187363961); - n = e(n, o, p, m, b[k + 8], 20, 1163531501); - m = e(m, n, o, p, b[k + 13], 5, -1444681467); - p = e(p, m, n, o, b[k + 2], 9, -51403784); - o = e(o, p, m, n, b[k + 7], 14, 1735328473); - n = e(n, o, p, m, b[k + 12], 20, -1926607734); - m = f(m, n, o, p, b[k + 5], 4, -378558); - p = f(p, m, n, o, b[k + 8], 11, -2022574463); - o = f(o, p, m, n, b[k + 11], 16, 1839030562); - n = f(n, o, p, m, b[k + 14], 23, -35309556); - m = f(m, n, o, p, b[k + 1], 4, -1530992060); - p = f(p, m, n, o, b[k + 4], 11, 1272893353); - o = f(o, p, m, n, b[k + 7], 16, -155497632); - n = f(n, o, p, m, b[k + 10], 23, -1094730640); - m = f(m, n, o, p, b[k + 13], 4, 681279174); - p = f(p, m, n, o, b[k + 0], 11, -358537222); - o = f(o, p, m, n, b[k + 3], 16, -722521979); - n = f(n, o, p, m, b[k + 6], 23, 76029189); - m = f(m, n, o, p, b[k + 9], 4, -640364487); - p = f(p, m, n, o, b[k + 12], 11, -421815835); - o = f(o, p, m, n, b[k + 15], 16, 530742520); - n = f(n, o, p, m, b[k + 2], 23, -995338651); - m = g(m, n, o, p, b[k + 0], 6, -198630844); - p = g(p, m, n, o, b[k + 7], 10, 1126891415); - o = g(o, p, m, n, b[k + 14], 15, -1416354905); - n = g(n, o, p, m, b[k + 5], 21, -57434055); - m = g(m, n, o, p, b[k + 12], 6, 1700485571); - p = g(p, m, n, o, b[k + 3], 10, -1894986606); - o = g(o, p, m, n, b[k + 10], 15, -1051523); - n = g(n, o, p, m, b[k + 1], 21, -2054922799); - m = g(m, n, o, p, b[k + 8], 6, 1873313359); - p = g(p, m, n, o, b[k + 15], 10, -30611744); - o = g(o, p, m, n, b[k + 6], 15, -1560198380); - n = g(n, o, p, m, b[k + 13], 21, 1309151649); - m = g(m, n, o, p, b[k + 4], 6, -145523070); - p = g(p, m, n, o, b[k + 11], 10, -1120210379); - o = g(o, p, m, n, b[k + 2], 15, 718787259); - n = g(n, o, p, m, b[k + 9], 21, -343485551); - m = a(m, c); - n = a(n, h); - o = a(o, i); - p = a(p, j) - } - return [m, n, o, p] - }; - var i = function (a) { - var b = "0123456789abcdef", - c = "", - d, e = a.length * 4; - for(d = 0; d < e; d++) { - c += b.charAt(a[d >> 2] >> d % 4 * 8 + 4 & 15) + b.charAt(a[d >> 2] >> d % 4 * 8 & 15) - } - return c - }; - var j = function (a) { - var b = (a.length + 8 >> 6) + 1; - var c = [], - d, e = b * 16, - f, g = a.length; - for(d = 0; d < e; d++) { - c.push(0) - } - for(f = 0; f < g; f++) { - c[f >> 2] |= (a.charCodeAt(f) & 255) << f % 4 * 8 - } - c[f >> 2] |= 128 << f % 4 * 8; - c[b * 16 - 2] = g * 8; - return c - }; - return i(h(j(this))) -}