From d59191de3d082411dda06fcaad51534898c946f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20DELSOL?= Date: Sat, 24 Aug 2013 09:47:20 +0200 Subject: [PATCH 1/3] Adding copy of gallery-base64-min.js Since the file http://yui.yahooapis.com/gallery-2009.12.08-22/build/gallery-base64/gallery-base64-min.js is not reachable from http protocal, we have to host it ourself so we can provide it on https protocal --- .../design/standard/javascript/yui-gallery-base64-min.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/ezcomments_extension/ezextension/ezcomments/design/standard/javascript/yui-gallery-base64-min.js diff --git a/packages/ezcomments_extension/ezextension/ezcomments/design/standard/javascript/yui-gallery-base64-min.js b/packages/ezcomments_extension/ezextension/ezcomments/design/standard/javascript/yui-gallery-base64-min.js new file mode 100644 index 0000000..143a766 --- /dev/null +++ b/packages/ezcomments_extension/ezextension/ezcomments/design/standard/javascript/yui-gallery-base64-min.js @@ -0,0 +1 @@ +YUI.add("gallery-base64",function(B){var A="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";B.Base64={decode:function(H){H=H.replace(/\s/g,"");if(!(/^[a-z0-9\+\/\s]+\={0,2}$/i.test(H))||H.length%4>0){throw new Error("Not a base64-encoded string.");}var G,E,F,D=0,C=[];H=H.replace(/\=/g,"");while(D>4));break;case 2:C.push(String.fromCharCode((E&15)<<4|G>>2));break;case 3:C.push(String.fromCharCode((E&3)<<6|G));break;}E=G;D++;}return C.join("");},encode:function(H){if(/([^\u0000-\u00ff])/.test(H)){throw new Error("Can't base64 encode non-ASCII characters.");}var E=0,G,F,D,C=[];while(E>2));break;case 1:C.push(A.charAt((F&3)<<4|(G>>4)));break;case 2:C.push(A.charAt((F&15)<<2|(G>>6)));C.push(A.charAt(G&63));break;}F=G;E++;}if(D==0){C.push(A.charAt((F&3)<<4));C.push("==");}else{if(D==1){C.push(A.charAt((F&15)<<2));C.push("=");}}return C.join("");}};},"gallery-2009.12.08-22"); From 935c9530dcdfc018d758ff7a61342f8a80a3663c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20DELSOL?= Date: Sat, 24 Aug 2013 09:48:29 +0200 Subject: [PATCH 2/3] Load gallery-base64-min.js on https If the current website protocol is https, then we load the local file instead of the remote file as it can be loaded on https. --- .../ezcomments/design/standard/javascript/ezcomments.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ezcomments_extension/ezextension/ezcomments/design/standard/javascript/ezcomments.js b/packages/ezcomments_extension/ezextension/ezcomments/design/standard/javascript/ezcomments.js index b8250a2..c8f1c58 100644 --- a/packages/ezcomments_extension/ezextension/ezcomments/design/standard/javascript/ezcomments.js +++ b/packages/ezcomments_extension/ezextension/ezcomments/design/standard/javascript/ezcomments.js @@ -70,7 +70,7 @@ var eZComments = function() { ret.init = function() { YUI3_config.modules = { 'gallery-base64': { - fullpath: 'http://yui.yahooapis.com/gallery-2009.12.08-22/build/gallery-base64/gallery-base64-min.js' + fullpath: location.protocol.indexOf('https')>=0?(location.protocol+'//'+location.hostname+'/extension/ezcomments/design/standard/javascript/yui-gallery-base64-min.js'):'http://yui.yahooapis.com/gallery-2009.12.08-22/build/gallery-base64/gallery-base64-min.js' } } var ins = YUI(YUI3_config).use('node','event','cookie','json-parse','io-form','io-ez','gallery-base64',yCallback); From 5bd67d878d15c96122835822179ab5b00952cac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20DELSOL?= Date: Tue, 27 Aug 2013 22:19:39 +0200 Subject: [PATCH 3/3] Update ezcomfunctioncollection.php cs: should be space between the end paragraphs --- .../ezextension/ezcomments/classes/ezcomfunctioncollection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ezcomments_extension/ezextension/ezcomments/classes/ezcomfunctioncollection.php b/packages/ezcomments_extension/ezextension/ezcomments/classes/ezcomfunctioncollection.php index d3a7e1f..aba7fae 100644 --- a/packages/ezcomments_extension/ezextension/ezcomments/classes/ezcomfunctioncollection.php +++ b/packages/ezcomments_extension/ezextension/ezcomments/classes/ezcomfunctioncollection.php @@ -86,7 +86,7 @@ public static function fetchRecaptchaHTML() { $useSSL = true; } - return array( 'result' => recaptcha_get_html( $publicKey , null, $useSSL )); + return array( 'result' => recaptcha_get_html( $publicKey , null, $useSSL ) ); } }