From 61d56ae8cab14abe747b678aa3e44a5de3759898 Mon Sep 17 00:00:00 2001 From: Jackk Goh Date: Sat, 24 Mar 2018 09:52:30 +0800 Subject: [PATCH 1/2] change drift code --- .htaccess | 8 +++---- assets/global/scripts/app.js | 21 +++++++++-------- assets/modul-js/forgot-password.js | 38 +++++++++++++++--------------- assets/modul-js/login.js | 38 +++++++++++++++--------------- assets/modul-js/login.min.js | 20 ++++++++-------- assets/modul-js/register.js | 38 +++++++++++++++--------------- assets/modul-js/reset-password.js | 38 +++++++++++++++--------------- includes/tpl/head.php | 38 +++++++++++++++--------------- 8 files changed, 119 insertions(+), 120 deletions(-) diff --git a/.htaccess b/.htaccess index 608709a..afd1ee9 100644 --- a/.htaccess +++ b/.htaccess @@ -1,13 +1,11 @@ -RewriteEngine On + RewriteEngine On RewriteBase / RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{HTTPS} off RewriteRule ^ index.php [L] RewriteRule ^(.*)/$ $1 [R=301,L] - RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] + RewriteCond %{HTTPS} off + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L] SetOutputFilter DEFLATE - - \ No newline at end of file diff --git a/assets/global/scripts/app.js b/assets/global/scripts/app.js index 437a5ef..8eca261 100755 --- a/assets/global/scripts/app.js +++ b/assets/global/scripts/app.js @@ -11,25 +11,26 @@ /* Drift */ !function() { -var t; -if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, -t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], -t.factory = function(e) { + var t; + if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, + t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], + t.factory = function(e) { return function() { - var n; - return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; + var n; + return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; }; -}, t.methods.forEach(function(e) { + }, t.methods.forEach(function(e) { t[e] = t.factory(e); -}), t.load = function(t) { + }), t.load = function(t) { var e, n, o, i; e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); -}); + }); }(); drift.SNIPPET_VERSION = '0.3.1'; -drift.load('bua4t3vtn9g5'); +drift.load('c9twm4i9hgxa'); + diff --git a/assets/modul-js/forgot-password.js b/assets/modul-js/forgot-password.js index e22564a..283665c 100755 --- a/assets/modul-js/forgot-password.js +++ b/assets/modul-js/forgot-password.js @@ -11,25 +11,25 @@ /* Drift */ !function() { -var t; -if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, -t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], -t.factory = function(e) { - return function() { - var n; - return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; - }; -}, t.methods.forEach(function(e) { - t[e] = t.factory(e); -}), t.load = function(t) { - var e, n, o, i; - e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), - o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", - n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); -}); -}(); -drift.SNIPPET_VERSION = '0.3.1'; -drift.load('bua4t3vtn9g5'); + var t; + if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, + t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], + t.factory = function(e) { + return function() { + var n; + return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; + }; + }, t.methods.forEach(function(e) { + t[e] = t.factory(e); + }), t.load = function(t) { + var e, n, o, i; + e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), + o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", + n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); + }); + }(); + drift.SNIPPET_VERSION = '0.3.1'; + drift.load('c9twm4i9hgxa'); var Script = function () { diff --git a/assets/modul-js/login.js b/assets/modul-js/login.js index 4e57c87..9a932fc 100755 --- a/assets/modul-js/login.js +++ b/assets/modul-js/login.js @@ -11,25 +11,25 @@ /* Drift */ !function() { -var t; -if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, -t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], -t.factory = function(e) { - return function() { - var n; - return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; - }; -}, t.methods.forEach(function(e) { - t[e] = t.factory(e); -}), t.load = function(t) { - var e, n, o, i; - e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), - o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", - n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); -}); -}(); -drift.SNIPPET_VERSION = '0.3.1'; -drift.load('bua4t3vtn9g5'); + var t; + if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, + t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], + t.factory = function(e) { + return function() { + var n; + return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; + }; + }, t.methods.forEach(function(e) { + t[e] = t.factory(e); + }), t.load = function(t) { + var e, n, o, i; + e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), + o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", + n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); + }); + }(); + drift.SNIPPET_VERSION = '0.3.1'; + drift.load('c9twm4i9hgxa'); $(document).ready(function () { $("#uname").keydown(function (e) { if(e.which == 13) $('#login').trigger('click'); }); diff --git a/assets/modul-js/login.min.js b/assets/modul-js/login.min.js index 6022d8d..0e15070 100755 --- a/assets/modul-js/login.min.js +++ b/assets/modul-js/login.min.js @@ -5,18 +5,18 @@ $(document).ready(function(){$("#uname").keydown(function(n){13==n.which&&$("#lo if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], t.factory = function(e) { - return function() { + return function() { var n; return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; - }; + }; }, t.methods.forEach(function(e) { - t[e] = t.factory(e); + t[e] = t.factory(e); }), t.load = function(t) { - var e, n, o, i; - e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), - o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", - n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); + var e, n, o, i; + e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), + o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", + n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); }); - }(); - drift.SNIPPET_VERSION = '0.3.1'; - drift.load('bua4t3vtn9g5'); \ No newline at end of file + }(); + drift.SNIPPET_VERSION = '0.3.1'; + drift.load('c9twm4i9hgxa'); \ No newline at end of file diff --git a/assets/modul-js/register.js b/assets/modul-js/register.js index 6ae4a4b..dcc7f48 100755 --- a/assets/modul-js/register.js +++ b/assets/modul-js/register.js @@ -11,25 +11,25 @@ /* Drift */ !function() { -var t; -if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, -t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], -t.factory = function(e) { - return function() { - var n; - return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; - }; -}, t.methods.forEach(function(e) { - t[e] = t.factory(e); -}), t.load = function(t) { - var e, n, o, i; - e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), - o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", - n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); -}); -}(); -drift.SNIPPET_VERSION = '0.3.1'; -drift.load('bua4t3vtn9g5'); + var t; + if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, + t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], + t.factory = function(e) { + return function() { + var n; + return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; + }; + }, t.methods.forEach(function(e) { + t[e] = t.factory(e); + }), t.load = function(t) { + var e, n, o, i; + e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), + o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", + n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); + }); + }(); + drift.SNIPPET_VERSION = '0.3.1'; + drift.load('c9twm4i9hgxa'); var Script = function () { diff --git a/assets/modul-js/reset-password.js b/assets/modul-js/reset-password.js index be6cf27..b3ededc 100644 --- a/assets/modul-js/reset-password.js +++ b/assets/modul-js/reset-password.js @@ -11,25 +11,25 @@ /* Drift */ !function() { -var t; -if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, -t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], -t.factory = function(e) { - return function() { - var n; - return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; - }; -}, t.methods.forEach(function(e) { - t[e] = t.factory(e); -}), t.load = function(t) { - var e, n, o, i; - e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), - o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", - n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); -}); -}(); -drift.SNIPPET_VERSION = '0.3.1'; -drift.load('bua4t3vtn9g5'); + var t; + if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, + t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], + t.factory = function(e) { + return function() { + var n; + return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; + }; + }, t.methods.forEach(function(e) { + t[e] = t.factory(e); + }), t.load = function(t) { + var e, n, o, i; + e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), + o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", + n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); + }); + }(); + drift.SNIPPET_VERSION = '0.3.1'; + drift.load('c9twm4i9hgxa'); $.urlParam = function(name){ var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href); diff --git a/includes/tpl/head.php b/includes/tpl/head.php index 9824996..3b954b3 100755 --- a/includes/tpl/head.php +++ b/includes/tpl/head.php @@ -61,25 +61,25 @@ License: You must have a valid license purchased only from themeforest(the above /* Drift */ !function() { - var t; - if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, - t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], - t.factory = function(e) { - return function() { - var n; - return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; - }; - }, t.methods.forEach(function(e) { - t[e] = t.factory(e); - }), t.load = function(t) { - var e, n, o, i; - e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), - o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", - n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); - }); - }(); - drift.SNIPPET_VERSION = '0.3.1'; - drift.load('bua4t3vtn9g5'); + var t; + if (t = window.driftt = window.drift = window.driftt || [], !t.init) return t.invoked ? void (window.console && console.error && console.error("Drift snippet included twice.")) : (t.invoked = !0, + t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], + t.factory = function(e) { + return function() { + var n; + return n = Array.prototype.slice.call(arguments), n.unshift(e), t.push(n), t; + }; + }, t.methods.forEach(function(e) { + t[e] = t.factory(e); + }), t.load = function(t) { + var e, n, o, i; + e = 3e5, i = Math.ceil(new Date() / e) * e, o = document.createElement("script"), + o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + i + "/" + t + ".js", + n = document.getElementsByTagName("script")[0], n.parentNode.insertBefore(o, n); + }); + }(); + drift.SNIPPET_VERSION = '0.3.1'; + drift.load('c9twm4i9hgxa'); From fa49b34cfc744d38ec192b853a3890026b533d10 Mon Sep 17 00:00:00 2001 From: Jackk Goh Date: Sat, 24 Mar 2018 09:57:55 +0800 Subject: [PATCH 2/2] changed spacing on .htaccess --- .htaccess | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.htaccess b/.htaccess index afd1ee9..97c6a4d 100644 --- a/.htaccess +++ b/.htaccess @@ -3,9 +3,9 @@ RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^ index.php [L] RewriteRule ^(.*)/$ $1 [R=301,L] - RewriteCond %{HTTPS} off - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L] +RewriteCond %{HTTPS} off +RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L] - - SetOutputFilter DEFLATE + + SetOutputFilter DEFLATE \ No newline at end of file