Changeset 2852700

Timestamp:

01/23/2023 05:24:00 AM (3 years ago)

Author:

majick

Message:

1.0.7 trunk commit

Location:

teleporter/trunk

Files:

• js/teleporter.dev.js (modified) (3 diffs)
• js/teleporter.js (modified) (3 diffs)
• js/teleporter.min.js (modified) (1 diff)
• loader.php (modified) (9 diffs)
• readme.txt (modified) (5 diffs)
• teleporter.php (modified) (15 diffs)
• wordquest.php (modified) (96 diffs)

teleporter/trunk/js/teleporter.dev.js

@@ -5 +5 @@
 /* --- Set Default Settings --- */
 /* 1.0.0: added pageload timeout setting */
-var teleporter = {debug: false, fadetime: 2000, timeout: 10000, ignore: ['no-transition','no-teleporter'], dynamic: [], iframe: 'teleporter-iframe', loading: 'teleporter-loading', 'siteurl': ''};
+/* 1.0.6: added existing definition check */
+if (typeof teleporter == 'undefined') {
+    var teleporter = {debug: false, fadetime: 2000, timeout: 10000, ignore: ['.no-transition','.no-teleporter'], dynamic: [], iframe: 'teleporter-iframe', loading: 'teleporter-loading', 'siteurl': ''};
+}
 
 /* --- Set Initial Variables --- */
@@ -436 +439 @@
 
     /* check against ignore classes */
-    if (!skip && teleporter.ignore.length && (typeof el.classList != 'undefined') && el.classList.length) {
+    if (!skip && teleporter.ignore.length) {
         for (i in teleporter.ignore) {
-            if (el.classList.contains(teleporter.ignore[i])) {skip = true;}
+            if (el.matches(teleporter.ignore[i])) {skip = true;}
         }
     }
@@ -530 +533 @@
 /* --- Add Dynamic Link Clicks --- */
 /* 1.0.4: added event delegation clicks for dynamic link classes */
+/* 1.0.6: allow for any selectors not just classes */
 function teleporter_dynamic_link_clicks() {
     if (!teleporter.dynamic.length) {return;}
-    var dynamic_classes = '';
+    var dynamic_selectors = '';
     for (i = 0; i < teleporter.dynamic.length; i++) {
-        if (dynamic_classes != '') {dynamic_classes += ', ';}
-        dynamic_classes += '.'+teleporter.dynamic[i];
-    }
-    if (teleporter.debug) {console.log('Dynamic Classes: '+dynamic_classes);}
-    jQuery('a').on('click', dynamic_classes, function(e) {
+        if (dynamic_selectors != '') {dynamic_selectors += ', ';}
+        dynamic_selectors += teleporter.dynamic[i];
+    }
+    if (teleporter.debug) {console.log('Dynamic Selectors: '+dynamic_selectors);}
+    jQuery('a').on('click', dynamic_selectors, function(e) {
         e.stopImmediatePropagation();
         e.preventDefault();

teleporter/trunk/js/teleporter.js

@@ -1 @@
-var teleporter = {debug: false, fadetime: 2000, timeout: 10000, ignore: ['no-transition','no-teleporter'], dynamic: [], iframe: 'teleporter-iframe', loading: 'teleporter-loading', 'siteurl': ''};
+if (typeof teleporter == 'undefined') {
+    var teleporter = {debug: false, fadetime: 2000, timeout: 10000, ignore: ['.no-transition','.no-teleporter'], dynamic: [], iframe: 'teleporter-iframe', loading: 'teleporter-loading', 'siteurl': ''};
+}
 var t_topwin; t_topwin = teleporter_top_window();
 if (typeof t_topwin.t_loading == 'undefined') {t_topwin.t_loading = false;}
@@ -300 +302 @@
         if ((u.indexOf(a) === 0) || (u.indexOf(b) === 0)) {skip = false;}
     }
-    if (!skip && teleporter.ignore.length && (typeof el.classList != 'undefined') && el.classList.length) {
+    if (!skip && teleporter.ignore.length) {
         for (i in teleporter.ignore) {
-            if (el.classList.contains(teleporter.ignore[i])) {skip = true;}
+            if (el.matches(teleporter.ignore[i])) {skip = true;}
         }
     }
@@ -364 +366 @@
 function teleporter_dynamic_link_clicks() {
     if (!teleporter.dynamic.length) {return;}
-    var dynamic_classes = '';
+    var dynamic_selectors = '';
     for (i = 0; i < teleporter.dynamic.length; i++) {
-        if (dynamic_classes != '') {dynamic_classes += ', ';}
-        dynamic_classes += '.'+teleporter.dynamic[i];
-    }
-    if (teleporter.debug) {console.log('Dynamic Classes: '+dynamic_classes);}
-    jQuery('a').on('click', dynamic_classes, function(e) {
+        if (dynamic_selectors != '') {dynamic_selectors += ', ';}
+        dynamic_selectors += teleporter.dynamic[i];
+    }
+    if (teleporter.debug) {console.log('Dynamic Selectors: '+dynamic_selectors);}
+    jQuery('a').on('click', dynamic_selectors, function(e) {
         e.stopImmediatePropagation();
         e.preventDefault();

teleporter/trunk/js/teleporter.min.js

@@ -1 @@
-var teleporter = {debug: false, fadetime: 2000, timeout: 10000, ignore: ['no-transition','no-teleporter'], dynamic: [], iframe: 'teleporter-iframe', loading: 'teleporter-loading', 'siteurl': ''};  var t_topwin; t_topwin = teleporter_top_window();  if (typeof t_topwin.t_loading == 'undefined') {t_topwin.t_loading = false;}  if (typeof t_topwin.t_loaded == 'undefined') {t_topwin.t_loaded = false;}  if (typeof t_topwin.t_pushing == 'undefined') {t_topwin.t_pushing = false;}  if (typeof t_topwin.t_initialurl == 'undefined') {t_topwin.t_initialurl = window.location.href;}  if (typeof t_topwin.t_poppedstate == 'undefined') {  if  (typeof t_topwin.History == 'function') {t_topwin.t_poppedstate = t_topwin.History.getState();}  else {t_topwin.t_poppedstate = ('state' in t_topwin.history && t_topwin.history.state !== null);}  }  function teleporter_transition_page(link) {  if ((typeof History != 'function') && !window.history) {return true;}  if (typeof t_topwin.stateurls !== 'undefined') {  stateurls = t_topwin.stateurls;  for (i in stateurls) {  if (stateurls[i] == link.href) {  if (i == t_topwin.currentstate) {return false;}  teleporter_switch_state(i);  title = t_topwin.statetitles[i];  var obj = {id: i, title: title, url: link.href};  t_topwin.t_pushing = true;  if (typeof t_topwin.History == 'function') {t_topwin.History.replaceState(obj, title, link.href);}  else if (t_topwin.history) {t_topwin.history.replaceState(obj, title, link.href);}  t_topwin.t_pushing = false;  t_topwin.currentstate = i;  return false;  }  }  }  iframe = teleporter_add_iframe(link.href);  teleporter_show_loading(link.href);  return false;  }  function teleporter_transition_check(url, win) {  href = null; iframe = null; topdoc = t_topwin.document;  if (t_topwin != win.self) {  iframes = topdoc.getElementsByClassName(teleporter.iframe);  if (!url) {url = win.location.href;}  for (i = 0; i < iframes.length; i++) {  if (url == iframes[i].src) {iframe = iframes[i];}  }  if (!iframe) {  return;  }  if (iframe.src != t_topwin.location.href) {  teleporter_hide_loading();      body = topdoc.getElementsByTagName('body')[0];      if (!t_topwin.bodymargin) {t_topwin.bodymargin = body.style.margin;}      if (!t_topwin.bodypadding) {t_topwin.bodypadding = body.style.padding;}      body.style.margin = '0'; body.style.padding = '0'; body.style.overflow = 'hidden';  if (iframe.style.display != 'block') {  if ((typeof t_topwin.jQuery == 'function') && teleporter.fadetime) {  t_topwin.jQuery(iframe).fadeIn(teleporter.fadetime);  } else {iframe.style.display = 'block';}  }  href = iframe.src;      }  } else {href = win.location.href;}  if (href) {  stateid = teleporter_push_state(href, win);  if (iframe) {iframe.setAttribute('id', teleporter.iframe+'-'+stateid);}  }  }  function teleporter_push_state(href, win) {  titletag = win.document.getElementsByTagName('title');  if (titletag.length) {title = titletag[0].innerHTML;} else {title = '';}  if (typeof t_topwin.statecount === 'undefined') {  t_topwin.statecount = 0; t_topwin.windowstateid = 0; stateid = 0;  stateurls = []; stateurls[0] = href; t_topwin.stateurls = stateurls;  statetitles = []; statetitles[0] = title; t_topwin.statetitles = statetitles;  } else {  t_topwin.statecount++; stateid = t_topwin.statecount;  if ((t_topwin != win.self) && (typeof win.windowstateid == 'undefined') ) {  win.windowstateid = stateid;  t_topwin.stateurls[stateid] = href;  t_topwin.statetitles[stateid] = title;  }  }  var obj = {id: stateid, title: title, url: href};  t_topwin.t_pushing = true;  if (typeof t_topwin.History == 'function') {t_topwin.History.pushState(obj, title, href);}  else if (t_topwin.history) {t_topwin.history.pushState(obj, title, href);}  t_topwin.t_pushing = false;  teleporter_custom_event('teleporter-state-pushed', obj);  t_topwin.currentstate = stateid;  t_topwin.t_loaded = t_topwin.t_loading; t_topwin.t_loading = false;  return stateid;  }  function teleporter_show_loading(href) {  t_topwin.t_loading = href;  setTimeout(function() {  if (!t_topwin.t_loading) {return;}  href = t_topwin.t_loading;  console.log('Page load timeout reached. Displaying URL: '+href);  iframes = t_topwin.document.getElementsByClassName(teleporter.iframe);   for (i = 0; i < iframes.length; i++) {   if (href == iframes[i].src) {iframe = iframes[i];}  }  if (!iframe) {return;}  win = iframe.contentWindow;  teleporter_transition_check(href, win);  }, teleporter.timeout);  if (!teleporter.loading) {return;}  topdoc = t_topwin.document;  topdoc.getElementsByTagName('body')[0].classList.add('teleporter-loading');  topdoc.getElementById(teleporter.loading).className = 'reset';  setTimeout(function() {topdoc.getElementById(teleporter.loading).className = 'loading';}, 250);  iframes = topdoc.getElementsByClassName(teleporter.iframe);  for (i = 0; i < iframes.length; i++) {  doc = iframes[i].contentDocument || iframes[i].contentWindow.document;  if (doc.getElementById(teleporter.loading)) {doc.getElementById(teleporter.loading).className = 'reset';}  }  setTimeout(function() {  for (i = 0; i < iframes.length; i++) {  doc = iframes[i].contentDocument || iframes[i].contentWindow.document;  body = doc.getElementsByTagName('body')[0];  if (body) {body.classList.add('teleporter-loading');}  if (doc.getElementById(teleporter.loading)) {doc.getElementById(teleporter.loading).className = 'loading';}  }  }, 250);  }  function teleporter_hide_loading() {  if (!teleporter.loading) {return;}  topdoc = t_topwin.document;  topdoc.getElementById(teleporter.loading).className = '';  topdoc.getElementsByTagName('body')[0].classList.remove('teleporter-loading');  iframes = topdoc.getElementsByClassName(teleporter.iframe);  for (i = 0; i < iframes.length; i++) {  doc = iframes[i].contentDocument || iframes[i].contentWindow.document;  body = doc.getElementsByTagName('body')[0];  if (body) {body.classList.remove('teleporter-loading');}  if (doc.getElementById(teleporter.loading)) {doc.getElementById(teleporter.loading).className = '';}  }  }  function teleporter_add_popstate_checker() {  if (typeof window.History == 'function') {  (function(window,undefined) {  History.Adapter.bind(window, 'statechange', function (event) {  teleporter_custom_event('teleporter-popstate-event', {event: event});  teleporter_popstate_checker(event);  });  })(window);  } else {  window.addEventListener('popstate', function(event) {  teleporter_custom_event('teleporter-popstate-event', {event: event});  teleporter_popstate_checker(event);  }, false );  }  }  function teleporter_popstate_checker(event) {  t_topwin.initialpop = !t_topwin.t_poppedstate && (window.location.href == t_topwin.t_initialurl);  t_topwin.t_poppedstate = true; if (t_topwin.initialpop) {return;}  if (t_topwin.t_pushing) {return;}  if ((typeof t_topwin.backclicked != 'undefined') && t_topwin.backclicked) {  t_topwin.backclicked = false; return;  }  stateid = null;  if (event.state) {console.log('Event State'); console.log(event);}  if  (typeof t_topwin.History != 'undefined') {  state = t_topwin.History.getState();  if (state.data.id) {stateid = state.data.id;}  else {  for (i = 0; i < t_topwin.stateurls.length; i++) {  if (stateurls[i] == state.url) {stateid = i;}  }  }  } else if (t_topwin.history) {  if (event.state) {state = event.state; stateid = state.id;}  else if (t_topwin.history.state) {state = t_topwin.history.state; stateid = state.id;}  else {return true;}  } else {return true;}  if ((stateid === null) || (t_topwin.stateurls == 'undefined') || (state.url != t_topwin.stateurls[stateid])) {  if (state.url == t_topwin.t_initialurl) {  t_topwin.backclicked = true;  if (typeof t_topwin.History == 'function') {t_topwin.History.back();}  else if (t_topwin.history) {history.back();}  } else {  teleporter_transition_page({href: state.url});  }  return;  }  if (event.preventDefault) {event.preventDefault();}  if (event.stopImmediatePropagation) {event.stopImmediatePropagation();}  teleporter_switch_state(stateid);  }  function teleporter_switch_state(stateid) {  if (typeof t_topwin.windowstateid == 'undefined') {return;}  if (typeof t_topwin.currentstate != 'undefined') {currentstate = t_topwin.currentstate;}  else {currentstate = 0; t_topwin.currentstate = 0;}  if (stateid == currentstate) {return;}  teleporter_custom_event('teleporter-switch-state', {stateid: stateid});  iframes = t_topwin.document.getElementsByClassName(teleporter.iframe);  iframe = false;  for (i = 0; i < iframes.length; i++) {  if (iframes[i].id == teleporter.iframe+'-'+stateid) {  iframe = iframes[i]; j = i;  }  }  if (t_topwin.windowstateid == stateid) {  body = t_topwin.document.getElementsByTagName('body')[0];  body.style.margin = t_topwin.bodymargin;  body.style.padding = t_topwin.bodypadding;  body.style.overflow = 'scroll';  for (i = 0; i < iframes.length; i++) {  if (iframes[i].style.display != 'none') {  if ((typeof jQuery == 'function') && teleporter.fadetime) {  jQuery(iframes[i]).fadeOut(teleporter.fadetime);  } else {iframes[i].style.display = 'none';}  }  }  t_topwin.currentstate = 0;  } else if (iframe) {  body = t_topwin.document.getElementsByTagName('body')[0];  body.style.margin = '0'; body.style.padding = '0'; body.style.overflow = 'hidden';  for (i = 0; i < iframes.length; i++) {  if ((i != j) && (iframes[i].style.display != 'none')) {  if ((typeof jQuery == 'function') && teleporter.fadetime) {  jQuery(iframes[i]).fadeOut(teleporter.fadetime);  } else {iframes[i].style.display = 'none';}  }  }  if ((typeof jQuery == 'function') && teleporter.fadetime) {  jQuery(iframe).fadeIn(teleporter.fadetime);  } else {iframe.style.display = 'block';}  }  t_topwin.document.title = t_topwin.statetitles[stateid];  t_topwin.currentstate = stateid;  teleporter_custom_event('teleporter-transitioned', {stateid: stateid});  }  function teleporter_add_iframe(src) {  iframe = document.createElement('iframe');  iframe.setAttribute('class', teleporter.iframe);  iframe.setAttribute('name', teleporter.iframe);  iframe.setAttribute('src', src);  iframe.setAttribute('width', '100%');  iframe.setAttribute('height', '100%');  iframe.setAttribute('frameborder', '0');  iframe.setAttribute('scrolling', 'auto');  iframe.setAttribute('allowfullscreen', 'true');  iframe.setAttribute('style', 'display:none;');  t_topwin.document.getElementsByTagName('body')[0].appendChild(iframe);  return iframe;  }  function teleporter_skip_link(el) {  if (el.getAttribute('teleporter') == '1') {return true;}  if ((typeof el.href == 'undefined') || (el.href == '')) {return true;}  if ((typeof el.target != 'undefined') && (el.target != null) && (el.target != '_self') && (el.target != '')) {return true;}  if ((typeof el.onclick != 'undefined') && (el.onclick != null) && (el.onclick != '')) {return true;}  u = el.href; skip = true;  if ((u.indexOf('javascript') === 0) || (u.indexOf('mailto') === 0) || (u.indexOf('tel') === 0)) {return true;}  if ((u.indexOf('#') === 0) || (u.indexOf('?') === 0)) {skip = false;}  if ((teleporter.siteurl != '') && (u.indexOf(teleporter.siteurl) === 0)) {skip = false;}  if (el.host == t_topwin.location.host) {  a = t_topwin.location.protocol+'//'+t_topwin.location.host;  b = '//'+t_topwin.location.host;  if ((u.indexOf(a) === 0) || (u.indexOf(b) === 0)) {skip = false;}  }  if (!skip && teleporter.ignore.length && (typeof el.classList != 'undefined') && el.classList.length) {  for (i in teleporter.ignore) {  if (el.classList.contains(teleporter.ignore[i])) {skip = true;}  }  }  if (teleporter.debug) {if (!skip) {console.log('Found internal URL: '+u);} }  return skip;  }  addEventListener('unload', function(event) {  t_topwin.windowstateid = 'undefined';  }, false);  function teleporter_top_window() {  try {test = window.top.location; return window.top;} catch(e) {  return teleporter_get_window_parent(window.self);  }  }  function teleporter_get_window_parent(win) {  parentwindow = false;  try {test = win.parent.location; parentwindow = win.parent;} catch(e) {return false;}  if (parentwindow) {  if (parentwindow == win) {return win;}  maybe = teleporter_get_window_parent(parentwindow);  if (maybe) {return maybe;}  return parentwindow;  }  return win;  }  function teleporter_add_link_events() {  jQuery('a').each(function() {  el = jQuery(this)[0];  skip = teleporter_skip_link(el);  if (!skip) {  ev = jQuery._data(el, 'events');  if (ev && ev.click && teleporter.debug) {console.log(ev.click);}  el.setAttribute('teleporter', '1');  teleporter_add_link_event(el);  }  });  }  function teleporter_add_link_event(el) {  el.addEventListener('click', function(e) {  e.stopImmediatePropagation();  e.preventDefault();  target = jQuery(e.target);  if (target.prop('tagName') != 'a') {target = target.closest('a');}  element = target[0];  return teleporter_transition_page(element);  });  }  function teleporter_add_link_onclicks() {  alinks = document.getElementsByTagName('a');  for (var i = 0; i < alinks.length; i++) {  skip = teleporter_skip_link(alinks[i]);  if (!skip) {  alinks[i].setAttribute('teleporter', '1');  teleporter_add_link_onclick(alinks[i]);  }  }  }  function teleporter_add_link_onclick(el) {  el.setAttribute('onclick', 'return teleporter_transition_page(this);');  }  function teleporter_dynamic_link_clicks() {  if (!teleporter.dynamic.length) {return;}  var dynamic_classes = '';  for (i = 0; i < teleporter.dynamic.length; i++) {  if (dynamic_classes != '') {dynamic_classes += ', ';}  dynamic_classes += '.'+teleporter.dynamic[i];  }  if (teleporter.debug) {console.log('Dynamic Classes: '+dynamic_classes);}  jQuery('a').on('click', dynamic_classes, function(e) {  e.stopImmediatePropagation();  e.preventDefault();  target = jQuery(e.target);  if (target.prop('tagName') != 'a') {target = target.closest('a');}  if (target.getAttribute('teleporter') == '1') {return;}  element = target[0];  skip = teleporter_skip_link(element);  if (!skip) {  if (teleporter.debug) {console.log(target);}  return teleporter_transition_page(element);  }  });  }  if (typeof window.jQuery !== 'undefined') {  jQuery(document).ready(function() {  if (!teleporter.iframe) {return;}  if (parent.document) {document.getElementsByTagName('body')[0].style.overflow = 'scroll';}  teleporter_custom_event('teleporter-check-links', false);  teleporter_add_link_events();  teleporter_dynamic_link_clicks();  teleporter_custom_event('teleporter-links-checked', false);  teleporter_transition_check(false, window);  teleporter_add_popstate_checker();  setTimeout(function() {teleporter_add_link_events();;}, 5000);  });  } else {  (function(funcName, baseObj) {  "use strict"; funcName = funcName || 'documentReady'; baseObj = baseObj || window;  var readyList = []; var readyFired = false; var readyEventHandlersInstalled = false;  function ready() {  if (!readyFired) {  readyFired = true;  for (var i = 0; i < readyList.length; i++) {  readyList[i].fn.call(window, readyList[i].ctx);  }  readyList = [];  }  }  function readyStateChange() {if (document.readyState === "complete") {ready();} }  baseObj[funcName] = function(callback, context) {  if (readyFired) {setTimeout(function() {callback(context);}, 1); return;}  else {readyList.push({fn: callback, ctx: context});}  if (document.readyState === 'complete' || (!document.attachEvent && document.readyState === 'interactive')) {  setTimeout(ready, 1);  } else if (!readyEventHandlersInstalled) {  if (document.addEventListener) {  document.addEventListener('DOMContentLoaded', ready, false);  window.addEventListener('load', ready, false);  } else {  document.attachEvent('onreadystatechange', readyStateChange);  window.attachEvent('onload', ready);  }  readyEventHandlersInstalled = true;  }  }  })('documentReady', window);  window.documentReady(function() {  if (!teleporter.iframe) {return;}  if (parent.document) {document.getElementsByTagName('body')[0].style.overflow = 'scroll';}  teleporter_custom_event('teleporter-check-links', false);  teleporter_add_link_onclicks();  teleporter_custom_event('teleporter-links-checked', false);  teleporter_transition_check(false, window);  teleporter_add_popstate_checker();  setTimeout(function() {teleporter_add_link_onclicks();}, 5000);  });  }  function teleporter_custom_event(name, detail) {  params = {bubbles: false, cancelable: false, detail: detail};  var event = new CustomEvent(name, params); document.dispatchEvent(event);  }  (function () {  if (typeof window.CustomEvent === 'function') {return false;}  function CustomEvent(event, params) {  params = params || {bubbles: false, cancelable: false, detail: undefined};  var evt = document.createEvent('CustomEvent');  evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);  return evt;  }  CustomEvent.prototype = window.Event.prototype;  window.CustomEvent = CustomEvent;  })(); 
+if (typeof teleporter == 'undefined') {  var teleporter = {debug: false, fadetime: 2000, timeout: 10000, ignore: ['.no-transition','.no-teleporter'], dynamic: [], iframe: 'teleporter-iframe', loading: 'teleporter-loading', 'siteurl': ''};  }  var t_topwin; t_topwin = teleporter_top_window();  if (typeof t_topwin.t_loading == 'undefined') {t_topwin.t_loading = false;}  if (typeof t_topwin.t_loaded == 'undefined') {t_topwin.t_loaded = false;}  if (typeof t_topwin.t_pushing == 'undefined') {t_topwin.t_pushing = false;}  if (typeof t_topwin.t_initialurl == 'undefined') {t_topwin.t_initialurl = window.location.href;}  if (typeof t_topwin.t_poppedstate == 'undefined') {  if  (typeof t_topwin.History == 'function') {t_topwin.t_poppedstate = t_topwin.History.getState();}  else {t_topwin.t_poppedstate = ('state' in t_topwin.history && t_topwin.history.state !== null);}  }  function teleporter_transition_page(link) {  if ((typeof History != 'function') && !window.history) {return true;}  if (typeof t_topwin.stateurls !== 'undefined') {  stateurls = t_topwin.stateurls;  for (i in stateurls) {  if (stateurls[i] == link.href) {  if (i == t_topwin.currentstate) {return false;}  teleporter_switch_state(i);  title = t_topwin.statetitles[i];  var obj = {id: i, title: title, url: link.href};  t_topwin.t_pushing = true;  if (typeof t_topwin.History == 'function') {t_topwin.History.replaceState(obj, title, link.href);}  else if (t_topwin.history) {t_topwin.history.replaceState(obj, title, link.href);}  t_topwin.t_pushing = false;  t_topwin.currentstate = i;  return false;  }  }  }  iframe = teleporter_add_iframe(link.href);  teleporter_show_loading(link.href);  return false;  }  function teleporter_transition_check(url, win) {  href = null; iframe = null; topdoc = t_topwin.document;  if (t_topwin != win.self) {  iframes = topdoc.getElementsByClassName(teleporter.iframe);  if (!url) {url = win.location.href;}  for (i = 0; i < iframes.length; i++) {  if (url == iframes[i].src) {iframe = iframes[i];}  }  if (!iframe) {  return;  }  if (iframe.src != t_topwin.location.href) {  teleporter_hide_loading();      body = topdoc.getElementsByTagName('body')[0];      if (!t_topwin.bodymargin) {t_topwin.bodymargin = body.style.margin;}      if (!t_topwin.bodypadding) {t_topwin.bodypadding = body.style.padding;}      body.style.margin = '0'; body.style.padding = '0'; body.style.overflow = 'hidden';  if (iframe.style.display != 'block') {  if ((typeof t_topwin.jQuery == 'function') && teleporter.fadetime) {  t_topwin.jQuery(iframe).fadeIn(teleporter.fadetime);  } else {iframe.style.display = 'block';}  }  href = iframe.src;      }  } else {href = win.location.href;}  if (href) {  stateid = teleporter_push_state(href, win);  if (iframe) {iframe.setAttribute('id', teleporter.iframe+'-'+stateid);}  }  }  function teleporter_push_state(href, win) {  titletag = win.document.getElementsByTagName('title');  if (titletag.length) {title = titletag[0].innerHTML;} else {title = '';}  if (typeof t_topwin.statecount === 'undefined') {  t_topwin.statecount = 0; t_topwin.windowstateid = 0; stateid = 0;  stateurls = []; stateurls[0] = href; t_topwin.stateurls = stateurls;  statetitles = []; statetitles[0] = title; t_topwin.statetitles = statetitles;  } else {  t_topwin.statecount++; stateid = t_topwin.statecount;  if ((t_topwin != win.self) && (typeof win.windowstateid == 'undefined') ) {  win.windowstateid = stateid;  t_topwin.stateurls[stateid] = href;  t_topwin.statetitles[stateid] = title;  }  }  var obj = {id: stateid, title: title, url: href};  t_topwin.t_pushing = true;  if (typeof t_topwin.History == 'function') {t_topwin.History.pushState(obj, title, href);}  else if (t_topwin.history) {t_topwin.history.pushState(obj, title, href);}  t_topwin.t_pushing = false;  teleporter_custom_event('teleporter-state-pushed', obj);  t_topwin.currentstate = stateid;  t_topwin.t_loaded = t_topwin.t_loading; t_topwin.t_loading = false;  return stateid;  }  function teleporter_show_loading(href) {  t_topwin.t_loading = href;  setTimeout(function() {  if (!t_topwin.t_loading) {return;}  href = t_topwin.t_loading;  console.log('Page load timeout reached. Displaying URL: '+href);  iframes = t_topwin.document.getElementsByClassName(teleporter.iframe);   for (i = 0; i < iframes.length; i++) {   if (href == iframes[i].src) {iframe = iframes[i];}  }  if (!iframe) {return;}  win = iframe.contentWindow;  teleporter_transition_check(href, win);  }, teleporter.timeout);  if (!teleporter.loading) {return;}  topdoc = t_topwin.document;  topdoc.getElementsByTagName('body')[0].classList.add('teleporter-loading');  topdoc.getElementById(teleporter.loading).className = 'reset';  setTimeout(function() {topdoc.getElementById(teleporter.loading).className = 'loading';}, 250);  iframes = topdoc.getElementsByClassName(teleporter.iframe);  for (i = 0; i < iframes.length; i++) {  doc = iframes[i].contentDocument || iframes[i].contentWindow.document;  if (doc.getElementById(teleporter.loading)) {doc.getElementById(teleporter.loading).className = 'reset';}  }  setTimeout(function() {  for (i = 0; i < iframes.length; i++) {  doc = iframes[i].contentDocument || iframes[i].contentWindow.document;  body = doc.getElementsByTagName('body')[0];  if (body) {body.classList.add('teleporter-loading');}  if (doc.getElementById(teleporter.loading)) {doc.getElementById(teleporter.loading).className = 'loading';}  }  }, 250);  }  function teleporter_hide_loading() {  if (!teleporter.loading) {return;}  topdoc = t_topwin.document;  topdoc.getElementById(teleporter.loading).className = '';  topdoc.getElementsByTagName('body')[0].classList.remove('teleporter-loading');  iframes = topdoc.getElementsByClassName(teleporter.iframe);  for (i = 0; i < iframes.length; i++) {  doc = iframes[i].contentDocument || iframes[i].contentWindow.document;  body = doc.getElementsByTagName('body')[0];  if (body) {body.classList.remove('teleporter-loading');}  if (doc.getElementById(teleporter.loading)) {doc.getElementById(teleporter.loading).className = '';}  }  }  function teleporter_add_popstate_checker() {  if (typeof window.History == 'function') {  (function(window,undefined) {  History.Adapter.bind(window, 'statechange', function (event) {  teleporter_custom_event('teleporter-popstate-event', {event: event});  teleporter_popstate_checker(event);  });  })(window);  } else {  window.addEventListener('popstate', function(event) {  teleporter_custom_event('teleporter-popstate-event', {event: event});  teleporter_popstate_checker(event);  }, false );  }  }  function teleporter_popstate_checker(event) {  t_topwin.initialpop = !t_topwin.t_poppedstate && (window.location.href == t_topwin.t_initialurl);  t_topwin.t_poppedstate = true; if (t_topwin.initialpop) {return;}  if (t_topwin.t_pushing) {return;}  if ((typeof t_topwin.backclicked != 'undefined') && t_topwin.backclicked) {  t_topwin.backclicked = false; return;  }  stateid = null;  if (event.state) {console.log('Event State'); console.log(event);}  if  (typeof t_topwin.History != 'undefined') {  state = t_topwin.History.getState();  if (state.data.id) {stateid = state.data.id;}  else {  for (i = 0; i < t_topwin.stateurls.length; i++) {  if (stateurls[i] == state.url) {stateid = i;}  }  }  } else if (t_topwin.history) {  if (event.state) {state = event.state; stateid = state.id;}  else if (t_topwin.history.state) {state = t_topwin.history.state; stateid = state.id;}  else {return true;}  } else {return true;}  if ((stateid === null) || (t_topwin.stateurls == 'undefined') || (state.url != t_topwin.stateurls[stateid])) {  if (state.url == t_topwin.t_initialurl) {  t_topwin.backclicked = true;  if (typeof t_topwin.History == 'function') {t_topwin.History.back();}  else if (t_topwin.history) {history.back();}  } else {  teleporter_transition_page({href: state.url});  }  return;  }  if (event.preventDefault) {event.preventDefault();}  if (event.stopImmediatePropagation) {event.stopImmediatePropagation();}  teleporter_switch_state(stateid);  }  function teleporter_switch_state(stateid) {  if (typeof t_topwin.windowstateid == 'undefined') {return;}  if (typeof t_topwin.currentstate != 'undefined') {currentstate = t_topwin.currentstate;}  else {currentstate = 0; t_topwin.currentstate = 0;}  if (stateid == currentstate) {return;}  teleporter_custom_event('teleporter-switch-state', {stateid: stateid});  iframes = t_topwin.document.getElementsByClassName(teleporter.iframe);  iframe = false;  for (i = 0; i < iframes.length; i++) {  if (iframes[i].id == teleporter.iframe+'-'+stateid) {  iframe = iframes[i]; j = i;  }  }  if (t_topwin.windowstateid == stateid) {  body = t_topwin.document.getElementsByTagName('body')[0];  body.style.margin = t_topwin.bodymargin;  body.style.padding = t_topwin.bodypadding;  body.style.overflow = 'scroll';  for (i = 0; i < iframes.length; i++) {  if (iframes[i].style.display != 'none') {  if ((typeof jQuery == 'function') && teleporter.fadetime) {  jQuery(iframes[i]).fadeOut(teleporter.fadetime);  } else {iframes[i].style.display = 'none';}  }  }  t_topwin.currentstate = 0;  } else if (iframe) {  body = t_topwin.document.getElementsByTagName('body')[0];  body.style.margin = '0'; body.style.padding = '0'; body.style.overflow = 'hidden';  for (i = 0; i < iframes.length; i++) {  if ((i != j) && (iframes[i].style.display != 'none')) {  if ((typeof jQuery == 'function') && teleporter.fadetime) {  jQuery(iframes[i]).fadeOut(teleporter.fadetime);  } else {iframes[i].style.display = 'none';}  }  }  if ((typeof jQuery == 'function') && teleporter.fadetime) {  jQuery(iframe).fadeIn(teleporter.fadetime);  } else {iframe.style.display = 'block';}  }  t_topwin.document.title = t_topwin.statetitles[stateid];  t_topwin.currentstate = stateid;  teleporter_custom_event('teleporter-transitioned', {stateid: stateid});  }  function teleporter_add_iframe(src) {  iframe = document.createElement('iframe');  iframe.setAttribute('class', teleporter.iframe);  iframe.setAttribute('name', teleporter.iframe);  iframe.setAttribute('src', src);  iframe.setAttribute('width', '100%');  iframe.setAttribute('height', '100%');  iframe.setAttribute('frameborder', '0');  iframe.setAttribute('scrolling', 'auto');  iframe.setAttribute('allowfullscreen', 'true');  iframe.setAttribute('style', 'display:none;');  t_topwin.document.getElementsByTagName('body')[0].appendChild(iframe);  return iframe;  }  function teleporter_skip_link(el) {  if (el.getAttribute('teleporter') == '1') {return true;}  if ((typeof el.href == 'undefined') || (el.href == '')) {return true;}  if ((typeof el.target != 'undefined') && (el.target != null) && (el.target != '_self') && (el.target != '')) {return true;}  if ((typeof el.onclick != 'undefined') && (el.onclick != null) && (el.onclick != '')) {return true;}  u = el.href; skip = true;  if ((u.indexOf('javascript') === 0) || (u.indexOf('mailto') === 0) || (u.indexOf('tel') === 0)) {return true;}  if ((u.indexOf('#') === 0) || (u.indexOf('?') === 0)) {skip = false;}  if ((teleporter.siteurl != '') && (u.indexOf(teleporter.siteurl) === 0)) {skip = false;}  if (el.host == t_topwin.location.host) {  a = t_topwin.location.protocol+'//'+t_topwin.location.host;  b = '//'+t_topwin.location.host;  if ((u.indexOf(a) === 0) || (u.indexOf(b) === 0)) {skip = false;}  }  if (!skip && teleporter.ignore.length) {  for (i in teleporter.ignore) {  if (el.matches(teleporter.ignore[i])) {skip = true;}  }  }  if (teleporter.debug) {if (!skip) {console.log('Found internal URL: '+u);} }  return skip;  }  addEventListener('unload', function(event) {  t_topwin.windowstateid = 'undefined';  }, false);  function teleporter_top_window() {  try {test = window.top.location; return window.top;} catch(e) {  return teleporter_get_window_parent(window.self);  }  }  function teleporter_get_window_parent(win) {  parentwindow = false;  try {test = win.parent.location; parentwindow = win.parent;} catch(e) {return false;}  if (parentwindow) {  if (parentwindow == win) {return win;}  maybe = teleporter_get_window_parent(parentwindow);  if (maybe) {return maybe;}  return parentwindow;  }  return win;  }  function teleporter_add_link_events() {  jQuery('a').each(function() {  el = jQuery(this)[0];  skip = teleporter_skip_link(el);  if (!skip) {  ev = jQuery._data(el, 'events');  if (ev && ev.click && teleporter.debug) {console.log(ev.click);}  el.setAttribute('teleporter', '1');  teleporter_add_link_event(el);  }  });  }  function teleporter_add_link_event(el) {  el.addEventListener('click', function(e) {  e.stopImmediatePropagation();  e.preventDefault();  target = jQuery(e.target);  if (target.prop('tagName') != 'a') {target = target.closest('a');}  element = target[0];  return teleporter_transition_page(element);  });  }  function teleporter_add_link_onclicks() {  alinks = document.getElementsByTagName('a');  for (var i = 0; i < alinks.length; i++) {  skip = teleporter_skip_link(alinks[i]);  if (!skip) {  alinks[i].setAttribute('teleporter', '1');  teleporter_add_link_onclick(alinks[i]);  }  }  }  function teleporter_add_link_onclick(el) {  el.setAttribute('onclick', 'return teleporter_transition_page(this);');  }  function teleporter_dynamic_link_clicks() {  if (!teleporter.dynamic.length) {return;}  var dynamic_selectors = '';  for (i = 0; i < teleporter.dynamic.length; i++) {  if (dynamic_selectors != '') {dynamic_selectors += ', ';}  dynamic_selectors += teleporter.dynamic[i];  }  if (teleporter.debug) {console.log('Dynamic Selectors: '+dynamic_selectors);}  jQuery('a').on('click', dynamic_selectors, function(e) {  e.stopImmediatePropagation();  e.preventDefault();  target = jQuery(e.target);  if (target.prop('tagName') != 'a') {target = target.closest('a');}  if (target.getAttribute('teleporter') == '1') {return;}  element = target[0];  skip = teleporter_skip_link(element);  if (!skip) {  if (teleporter.debug) {console.log(target);}  return teleporter_transition_page(element);  }  });  }  if (typeof window.jQuery !== 'undefined') {  jQuery(document).ready(function() {  if (!teleporter.iframe) {return;}  if (parent.document) {document.getElementsByTagName('body')[0].style.overflow = 'scroll';}  teleporter_custom_event('teleporter-check-links', false);  teleporter_add_link_events();  teleporter_dynamic_link_clicks();  teleporter_custom_event('teleporter-links-checked', false);  teleporter_transition_check(false, window);  teleporter_add_popstate_checker();  setTimeout(function() {teleporter_add_link_events();;}, 5000);  });  } else {  (function(funcName, baseObj) {  "use strict"; funcName = funcName || 'documentReady'; baseObj = baseObj || window;  var readyList = []; var readyFired = false; var readyEventHandlersInstalled = false;  function ready() {  if (!readyFired) {  readyFired = true;  for (var i = 0; i < readyList.length; i++) {  readyList[i].fn.call(window, readyList[i].ctx);  }  readyList = [];  }  }  function readyStateChange() {if (document.readyState === "complete") {ready();} }  baseObj[funcName] = function(callback, context) {  if (readyFired) {setTimeout(function() {callback(context);}, 1); return;}  else {readyList.push({fn: callback, ctx: context});}  if (document.readyState === 'complete' || (!document.attachEvent && document.readyState === 'interactive')) {  setTimeout(ready, 1);  } else if (!readyEventHandlersInstalled) {  if (document.addEventListener) {  document.addEventListener('DOMContentLoaded', ready, false);  window.addEventListener('load', ready, false);  } else {  document.attachEvent('onreadystatechange', readyStateChange);  window.attachEvent('onload', ready);  }  readyEventHandlersInstalled = true;  }  }  })('documentReady', window);  window.documentReady(function() {  if (!teleporter.iframe) {return;}  if (parent.document) {document.getElementsByTagName('body')[0].style.overflow = 'scroll';}  teleporter_custom_event('teleporter-check-links', false);  teleporter_add_link_onclicks();  teleporter_custom_event('teleporter-links-checked', false);  teleporter_transition_check(false, window);  teleporter_add_popstate_checker();  setTimeout(function() {teleporter_add_link_onclicks();}, 5000);  });  }  function teleporter_custom_event(name, detail) {  params = {bubbles: false, cancelable: false, detail: detail};  var event = new CustomEvent(name, params); document.dispatchEvent(event);  }  (function () {  if (typeof window.CustomEvent === 'function') {return false;}  function CustomEvent(event, params) {  params = params || {bubbles: false, cancelable: false, detail: undefined};  var evt = document.createEvent('CustomEvent');  evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);  return evt;  }  CustomEvent.prototype = window.Event.prototype;  window.CustomEvent = CustomEvent;  })(); 

teleporter/trunk/loader.php

@@ -6 +6 @@
 //
 // --------------
-// Version: 1.2.8
+// Version: 1.2.9
 // --------------
 // Note: Changelog and structure at end of file.
@@ -2974 +2974 @@
                         echo "  document.getElementById('settings-action').value = 'reset';" . PHP_EOL;
                         echo "  document.getElementById('settings-form').submit();" . PHP_EOL;
-                        echo "});" . PHP_EOL;
-                        // echo "}" . PHP_EOL;
+                        echo "});" . "\n";
+                        // echo "}" . "\n";
 
                     } elseif ( 'number_step' == $script ) {
@@ -2988 +2988 @@
                             if ((max !== false) && (newvalue > parseInt(max))) {newvalue = max;}
                             document.getElementById(id).value = newvalue;
-                        }" . PHP_EOL; */
+                        }" . "\n"; */
                         // 1.2.5: replace with jQuery click function to remove onclick attributes
+                        // 1.2.9: fix for possible empty value converting to NaN
                         echo "jQuery('.number-button').on('click', function() {
                             if (jQuery(this).hasClass('number-up-button')) {multiplier = 1;}
@@ -2996 +2997 @@
                             data = jQuery('#'+idref).attr('data').split(',');
                             min = data[0]; max = data[1]; step = data[2];
-                            value = parseInt(jQuery('#'+idref).val());
+                            value = jQuery('#'+idref).val();
+                            if (value == '') {value = 0;} else {value = parseInt(value);}               
                             newvalue = value + (multiplier * parseInt(step));
                             if ((min !== false) && (newvalue < parseInt(min))) {newvalue = min;}
                             if ((max !== false) && (newvalue > parseInt(max))) {newvalue = max;}
                             jQuery('#'+idref).val(newvalue);
-                        });" . PHP_EOL;
+                        });" . "\n";
 
                     } elseif ( 'media_functions' == $script ) {
@@ -3052 +3054 @@
                             });
 
-                        });" . PHP_EOL;
+                        });" . "\n";
 
                     } elseif ( 'colorpicker_init' == $script ) {
 
                         // --- initialize color pickers ---
-                        echo "jQuery(document).ready(function(){" . PHP_EOL;
-                        echo "  if (jQuery('.color-picker').length) {jQuery('.color-picker').wpColorPicker();}" . PHP_EOL;
-                        echo "});" . PHP_EOL;
+                        echo "jQuery(document).ready(function(){" . "\n";
+                        echo "  if (jQuery('.color-picker').length) {jQuery('.color-picker').wpColorPicker();}" . "\n";
+                        echo "});" . "\n";
 
                     }
@@ -3083 +3085 @@
 
             // --- page styles ---
-            $styles[] = '#wrapbox {margin-right: 20px;}';
+            // 1.2.9: add padding to bottom of settings form
+            $styles[] = '#wrapbox {margin-right: 20px; padding-bottom: 20px;}';
 
             // --- plugin header styles ---
@@ -3118 +3121 @@
             $styles[] = '.settings-input input.setting-textarea {width:100%;}';
             $styles[] = '.settings-input select.setting-select {min-width:100px; max-width:100%;}';
-
+            
             // --- toggle input styles ---
             // Ref: https://www.w3schools.com/howto/howto_css_switch.asp
@@ -3469 +3472 @@
 // =========
 
+// == 1.2.9 ==
+// - fix empty number field converting to NaN value
+// - add bottom padding to settings form wrap box
+
 // == 1.2.8 ==
 // - fix saving non-alpha colours in coloralpha fields
@@ -3619 +3626 @@
 // == 0.9.0 ==
 // - Development Version
-

teleporter/trunk/readme.txt

@@ -4 +4 @@
 Tags: transition, page transition, single page application, ajax page load
 Requires at least: 4.0.0
-Tested up to: 6.1
-Stable tag: 1.0.5
+Tested up to: 6.1.1
+Stable tag: 1.0.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -27 +27 @@
 = How do I get started?
 
-Once you have activated the plugin, any internal links on your site will automatically be loaded via page transitions. See the next question for what links are affected.
+Once you have activated the plugin, any internal links on your site will automatically be loaded via page transitions. Visit the plugin settings page to modify the default plugin behaviour.
+
+= How does it work? =
+
+Teleporter loads new content in iframes within the existing window, then uses the Browser History API to keep track of the content that is loaded. It then monitors the `onpopstate` event so that browser forward and back buttons continue to load the desired content, with the added ability to fade between them.
 
 = Which links are affected? =
@@ -34 +38 @@
 
 1. Does not have a target attribute set.
-2. Does not have an onclick attribute already set.
-3. Does not have a class of `no-transition` or `no-teleporter`.
-4. Does not have an URL starting with `#` or `?`
-5. Does not have an URL starting with Site URL.
+2. Does not have an onclick attribute already explicitly set.
+3. Does not have a class of `no-transition` or `no-teleporter` (or other specified classes.)
+4. Does not have an URL starting with `#` or `?` or `mailto:` or `tel:`
+5. Does not have an URL starting with the current Site URL.
 6. Does not have an URL with a hostname matching the current page.
 7. Does not have an URL containing `/wp-admin/` or `wp-login.php`.
@@ -43 +47 @@
 This is a comprehensive attempt to match and transition between internal links only. (If you think there is something missing here please open a Github issue.)
 
-= How is dynamic link content handled? =
+= How are dynamic links handled? =
 
 As of 1.0.4, Teleporter will also handle dynamic link content. That is, links added to the page later. Simply specify the classes of these links on the plugin settings page, and they are then handled with click event delegation (instead of being directly adding to the `a` link.) So for example, if you have a mobile menu that creates links upon expanding it with a `.mobile-link` class, you can add `mobile-link` in the plugin settings. When the mobile menu link is clicked, Teleporter will transition the page as normal. This makes it possible to use Teleporter with frontend builder or frameworks that add their content with javascript.
 
-= How does it work? =
-
-Teleporter loads new content in iframes within the existing window, then uses the Browser History API to keep track of the content that is loaded. It then monitors the `onpopstate` event so that browser forward and back buttons continue to load the desired content, with the added ability to fade between them.
+Similarly, if there are links that you wish to force to not transition for some reason, you can use the setting for ignore link classes in the same way. And, if you need to use selectors other than classes for these links, you can use the filters `teleporter_dynamic_selectors` and `teleporter_ignore_selectors` to add those respectively also.
 
 = Will it break other scripts? =
@@ -68 +70 @@
 
 == Changelog ==
+
+= 1.0.7 =
+* Updated: Plugin Panel (1.2.9)
+* Updated: WordQuest Library (1.8.2)
+* Fixed: add extra onclick function for iPhone event bubbling
+* Improved: added checks to not load for admin/previews/editing modes
+
+= 1.0.6 =
+* Added: filter to allow for non-class ignore/dynamic selectors
+* Fixed: dynamic link event bubbling on iPhone (via cursor:pointer)
+* Fixed: method of adding of comment-reply-link ignore class
 
 = 1.0.5 =

teleporter/trunk/teleporter.php

@@ -3 +3 @@
 /*
 Plugin Name: Teleporter
-Plugin URI: http://wordquest.org/plugins/teleporter/
+Plugin URI: https://wordquest.org/plugins/teleporter/
 Author: Tony Hayes
 Description: Seamless fading Page Transitions via the Browser History API
-Version: 1.0.5
-Author URI: http://wordquest.org
+Version: 1.0.6
+Author URI: https://wordquest.org
 GitHub Plugin URI: majick777/teleporter
 */
@@ -31 +31 @@
 // - Enqueue Teleporter Scripts
 // - Localize Script Settings
+// - Dynamic Link iPhone Fix
 // - Add History API Support
 // - Add Teleporter Styles
@@ -144 +145 @@
         if ( file_exists( $wqhelper ) ) {
             include $wqhelper;
-            global $wordquestplugins; $slug = $args['slug'];
+            global $wordquestplugins;
+            $slug = $args['slug'];
             $wordquestplugins[$slug] = $args;
         }
@@ -333 +335 @@
 // ------------------
 
+// -----------------------------
+// Check if Admin or Editor Mode
+// -----------------------------
+function teleporter_is_admin_or_editor() {
+
+    // -- admin or preview ---
+    if ( is_admin() ) {
+        return true;
+    }
+    // --- customizer preview or page preview ---
+    if ( is_customize_preview() || isset( $_REQUEST['preview_id'] ) ) {
+        return true;
+    }
+    // --- block editor ---
+    if ( function_exists( 'get_current_screen' ) ) {
+        $current_screen = get_current_screen();
+        if ( method_exists( $current_screen, 'is_block_editor' ) && $current_screen->is_block_editor() ) {
+            return true;
+        }
+    }
+    // --- gutenberg plugin ---
+    if ( function_exists( 'is_gutenberg_page' ) && is_gutenberg_page() ) {
+        return true;
+    }
+    // --- elementor ---
+    if ( ( isset( $_REQUEST['action'] ) && ( 'elementor' == $_REQUEST['action'] ) ) || isset( $_REQUEST['elementor-preview'] ) ) {
+        return true;
+    }
+    // --- beaver builder ---
+    if ( isset( $_REQUEST['fl_builder'] ) || isset( $_REQUEST['fl_builder_preview'] ) ) {
+        return true;
+    }
+    
+    return false;
+}
+
 // --------------------------
 // Enqueue Teleporter Scripts
@@ -338 +376 @@
 add_action( 'wp_enqueue_scripts', 'teleporter_enqueue_scripts' );
 function teleporter_enqueue_scripts() {
+
+    // 1.0.7: added double checks to bug out in admin/editing modes
+    if ( teleporter_is_admin_or_editor() ) {
+        return;
+    }
 
     // --- check settings ---
@@ -373 +416 @@
     if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
         $suffix = '';
-    } elseif ( 'yes' == $teleporter_debug ) {
-        $suffix = '';
     } elseif ( isset( $_REQUEST['teleporter-debug'] ) ) {
         if ( '1' == $_REQUEST['teleporter-debug'] ) {
@@ -383 +424 @@
             $suffix = '.dev';
         }
+    } elseif ( 'yes' == $teleporter_debug ) {
+        $suffix = '';
     } else {
         $suffix = '.min';
@@ -390 +433 @@
     wp_enqueue_script( 'teleporter', $teleporter_url, array( 'jquery' ), $version, false );
 
-    if ( isset( $_REQUEST['teleporter-debug'] ) && ( '1' == $_REQUEST['teleporter-debug'] ) ) {
+    if ( $teleporter_debug || isset( $_REQUEST['teleporter-debug'] ) ) {
         echo '<span style="display:none;">Teleporter Script Enqueued: ' . $teleporter_url . '</span>';
     }
@@ -448 +491 @@
                 $ignore .= ',';
             }
-            $ignore .= "'" . esc_js( trim( $ignore_class ) ) . "'";
+            $ignore .= "'." . esc_js( trim( $ignore_class ) ) . "'";
+        }
+    }
+    // 1.0.6: add filter for other more specific (not just class) selectors
+    $ignore_selectors = apply_filters( 'teleporter_ignore_selectors', '' );
+    if ( $ignore_selectors && is_string( $ignore_selectors ) ) {
+        if ( strstr( $ignore_selectors, ',' ) ) {
+            $ignore_selectors = explode( ',', $ignore_selectors );
+        } else {
+            $ignore_selectors = array( $ignore_selectors );
+        }
+    }
+    if ( is_array( $ignore_selectors ) && ( count( $ignore_selectors ) > 0 ) ) {
+        foreach ( $ignore_selectors as $ignore_selector ) {
+            if ( strlen( $ignore ) > 1 ) {
+                $ignore .= ',';
+            }
+            $ignore .= "'" . esc_js( trim( $ignore_selector ) ) . "'";
         }
     }
@@ -465 +525 @@
         }
     }
-    if ( is_array( $dynamic_classes ) && !empty( $dynamic_classes ) && ( count( $dynamic_classes ) > 0 ) ) {
-        foreach ( $dynamic_classes as $i => $dynamic_class ) {
-            if ( $i > 0 ) {
+    if ( is_array( $dynamic_classes ) && ( count( $dynamic_classes ) > 0 ) ) {
+        foreach ( $dynamic_classes as $dynamic_class ) {
+            if ( strlen( $dynamic ) > 1 ) {
                 $dynamic .= ',';
             }
-            $dynamic .= "'" . esc_js( trim( $dynamic_class ) ) . "'";
+            $dynamic .= "'." . esc_js( trim( $dynamic_class ) ) . "'";
+        }
+    }
+    // 1.0.6: add filter for other more specific (not just class) selectors
+    $dynamic_selectors = apply_filters( 'teleporter_dynamic_selectors', '' );
+    if ( $dynamic_selectors && is_string( $dynamic_selectors ) ) {
+        if ( strstr( $dynamic_selectors, ',' ) ) {
+            $dynamic_selectors = explode( ',', $dynamic_selectors );
+        } else {
+            $dynamic_selectors = array( $dynamic_selectors );
+        }
+    }
+    if ( is_array( $dynamic_selectors ) && ( count( $dynamic_selectors ) > 0 ) ) {
+        foreach ( $dynamic_selectors as $dynamic_selector ) {
+            if ( strlen( $dynamic ) > 1 ) {
+                $dynamic .= ',';
+            }
+            $dynamic .= "'" . esc_js( trim( $dynamic_selector ) ) . "'";
         }
     }
@@ -559 +636 @@
     wp_add_inline_script( 'teleporter', $js );
 
+    // 1.0.6: added to fix dunamic links on iphones
+    if ( is_array( $dynamic_classes ) && !empty( $dynamic_classes ) && ( count( $dynamic_classes ) > 0 ) ) {
+        add_action( 'wp_footer', 'teleporter_dynamic_link_iphone_fix' );
+    }
+
+}
+
+// -----------------------
+// Dynamic Link iPhone Fix
+// -----------------------
+// 1.0.6: added for iPhone Safari click event bubbling
+function teleporter_dynamic_link_iphone_fix() {
+
+    $dynamic_classes = teleporter_get_setting( 'dynamic_link_classes' );
+    $dynamic_classes = apply_filters( 'teleporter_dynamic_classes', $dynamic_classes );
+    $dynamic = '';
+    if ( $dynamic_classes && is_string( $dynamic_classes ) ) {
+        if ( strstr( $dynamic_classes, ',' ) ) {
+            $dynamic_classes = explode( ',', $dynamic_classes );
+        } else {
+            $dynamic_classes = array( $dynamic_classes );
+        }
+    }
+    echo '<style>';
+    if ( is_array( $dynamic_classes ) && !empty( $dynamic_classes ) && ( count( $dynamic_classes ) > 0 ) ) {
+        // ref: https://gravitydept.com/blog/js-click-event-bubbling-on-ios
+        foreach ( $dynamic_classes as $i => $dynamic_class ) {
+            if ( $i > 0 ) {
+                echo ',';
+            }
+            echo '.' . esc_html( trim( $dynamic_class ) );
+        }
+        echo ', ';
+    }
+    // 1.0.7: add is-ios class selector in any case
+    echo '.is-ios * {cursor: pointer;}</style>' . "\n";
+
+    // 1.0.7: detect iOS and add onclick function to body children
+    // (an onclick function may be needed 'between body and element')
+    // ref: https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html
+    echo "<script>jQuery(document).ready(function() {
+        isIOS = ['iPhone Simulator','iPad Simulator','iPod Simulator','iPhone','iPad','iPod'].includes(navigator.platform);
+        if (isIOS) {
+            document.querySelector('html').classList.add('is-ios');
+            jQuery('body').children().each(function() {
+                if (!jQuery(this).is('[onclick],script,style,link')) {jQuery(this).attr('onclick','function(){}');}
+            });
+        }
+    });</script>" . "\n";
 }
 
@@ -567 +693 @@
 add_filter( 'teleporter_ignore_classes', 'teleporter_ignore_comment_reply_link_classes' );
 function teleporter_ignore_comment_reply_link_classes( $classes ) {
-    if ( !is_array( $classes ) ) {
-        $classes = array();
-    }
-    $classes[] = 'comment-reply-link';
+
+    // 1.0.6: allow for array or string value
+    if ( is_array( $classes ) ) {
+        $classes[] = 'comment-reply-link';
+    } elseif ( '' != $classes ) {
+        $classes .= ',comment-reply-link';
+    } else {
+        $classes = 'comment-reply-link';
+    }
+    
     return $classes;
 }
@@ -816 +948 @@
 newlinka = document.createElement('a');
 newlinka.innerHTML = 'JS Added Link A';
-newlinka.href = 'somepage.php';
+newlinka.href = '?page=a';
 newlinka.onclick = function() {alert("JS Added Link A"); return false;};
 document.getElementById('links').appendChild(newlinka);
@@ -823 +955 @@
 document.getElementById('links').appendChild(bra);
 document.getElementById('links').appendChild(brb);
+
 newlinkb = document.createElement('a');
-newlinkb.innerHTML = 'JS Added Link B';
-newlinkb.setAttribute('href', 'somepage.php');
-newlinkb.setAttribute('onclick', 'alert("JS Added Link B"); return false;');
+newlinkb.innerHTML = 'Add JS Link';
+newlinkb.setAttribute('href', 'javascript:void(0);');
+newlinkb.setAttribute('onclick', 'teleporter_add_dynamic_link(); return false;');
 document.getElementById('links').appendChild(newlinkb);
 brc = document.createElement('br');
@@ -833 +966 @@
 document.getElementById('links').appendChild(brd);
 
-/* Add jQuery Links */
-if (typeof jQuery !== 'undefined') {
-
+/* Add Dynamic Links */
+function teleporter_add_dynamic_link() {
+    newlink = document.createElement('a');
+    newlink.innerHTML = 'Dynamically Added Link';
+    newlink.href = '?page=a';
+    newlink.setAttribute('class', 'dynamic-link');
+    document.getElementById('links').appendChild(newlink);
+    br = document.createElement('br');
+    document.getElementById('links').appendChild(br);
 }
 </script>

teleporter/trunk/wordquest.php

@@ -5 +5 @@
 // ===============================
 
-$wordquestversion = '1.7.7';
+$wordquestversion = '1.8.2';
 
 // === Notes ===
@@ -57 +57 @@
     'wpm'   => 'https://wpmedic.tech',
     'prn'   => 'https://pluginreview.net',
-    'bio'   => 'https://bioship.space'
+    'bio'   => 'https://bioship.space',
 );
 
@@ -89 +89 @@
 // ------------------------------------------
 // 1.5.0: use admin_init not plugins_loaded so as to be usable by themes
-if ( !has_action( 'admin_init', 'wqhelper_admin_loader', 1 ) ) {
+// 1.8.0: remove unnecessary third parameter
+if ( !has_action( 'admin_init', 'wqhelper_admin_loader' ) ) {
     add_action( 'admin_init', 'wqhelper_admin_loader', 1 );
 }
-if ( !function_exists('wqhelper_admin_loader' ) ) {
+if ( !function_exists( 'wqhelper_admin_loader' ) ) {
  function wqhelper_admin_loader() {
-    global $wqdebug;
+    global $wqdebug;
 
     // --- maybe set debug mode ---
     // 1.6.6: check debug switch here so we can check permissions
-    if ( current_user_can('manage_options' ) ) {
-        if ( isset( $_REQUEST['wqdebug'] ) ) {
-            if ( in_array( $_REQUEST['wqdebug'], array( '1', 'yes' ) ) ) {
-                $wqdebug = true;
-            }
-        }
+    if ( current_user_can( 'manage_options' ) ) {
+        // 1.8.1: use sanitize_text_field on request variable
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if ( isset( $_REQUEST['wqdebug'] ) && in_array( sanitize_title( $_REQUEST['wqdebug'] ), array( '1', 'yes' ) ) ) {
+            $wqdebug = true;
+        }
     }
 
     // --- maybe remove old action ---
-    // 1.6.0: maybe remove the pre 1.6.0 loader action
-    if ( has_action('admin_init', 'wordquest_admin_load' ) ) {
-        remove_action( 'admin_init', 'wordquest_admin_load' );
-    }
+    // 1.6.0: maybe remove the pre 1.6.0 loader action
+    if ( has_action( 'admin_init', 'wordquest_admin_load' ) ) {
+        remove_action( 'admin_init', 'wordquest_admin_load' );
+    }
 
     // --- set helper version to use ---
-    // 1.6.0: new globals used for new method
-    global $wordquesthelper, $wordquesthelpers;
-    $wordquesthelper = max( $wordquesthelpers );
-    if ( $wqdebug ) {
-        echo "<!-- WQ Helper Versions: " . print_r( $wordquesthelpers, true ) . " -->";
-        echo "<!-- Latest Version: " . esc_html( $wordquesthelper ) . " -->";
-    }
+    // 1.6.0: new globals used for new method
+    global $wordquesthelper, $wordquesthelpers;
+    $wordquesthelper = max( $wordquesthelpers );
+    if ( $wqdebug ) {
+        // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+        echo "<!-- WQ Helper Versions: " . esc_html( print_r( $wordquesthelpers, true ) ) . " -->";
+        echo "<!-- Latest Version: " . esc_html( $wordquesthelper ) . " -->";
+    }
 
     // --- load callable functions ---
@@ -125 +127 @@
     global $wqcaller, $wqfunctions;
     $functionname = 'wqhelper_caller_';
-    $func = $functionname . $wordquesthelper;
-    if ( $wqdebug ) {
-        echo "<!-- Caller Name: " . esc_html( $func ) . " -->";
-    }
+    $func = $functionname . $wordquesthelper;
+    if ( $wqdebug ) {
+        echo "<!-- Caller Name: " . esc_html( $func ) . " -->";
+    }
 
     // --- set callable functions ---
@@ -137 +139 @@
     }
     if ( $wqdebug ) {
-        echo "<!-- Caller Object: "; var_dump( $wqcaller ); echo " -->";
+        // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+        echo "<!-- Caller Object: " . esc_html( print_r( $wqcaller, true ) ) . " -->";
     }
 
     // --- load admin notices ---
-    // 1.5.0: set up any admin notices via helper version
-    // 1.6.0: ...use caller function directly for this
-    $adminnotices = 'wqhelper_admin_notices';
-    if ( is_callable( $wqcaller ) ) {
-        $wqcaller( $adminnotices );
-    } elseif ( function_exists( $adminnotices ) ) {
-        call_user_func( $adminnotices );
-    }
-
+    // 1.5.0: set up any admin notices via helper version
+    // 1.6.0: ...use caller function directly for this
+    $adminnotices = 'wqhelper_admin_notices';
+    if ( is_callable( $wqcaller ) ) {
+        $wqcaller( $adminnotices );
+    } elseif ( function_exists( $adminnotices ) ) {
+        call_user_func( $adminnotices );
+    }
  }
 }
@@ -164 +166 @@
             $wqcaller = function( $function, $args = null ) {
                 global $wordquesthelper, $wqfunctions;
-                $func = $function . '_' . $wordquesthelper;
-                // echo "<!-- Called Function: ".$func." -->";
+                    $func = $function . '_' . $wordquesthelper;
+                    // echo "<!-- Called Function: ".$func." -->";
                 if ( is_callable( $wqfunctions[$func] ) ) {
                     return $wqfunctions[$func]( $args );
@@ -171 +173 @@
                     return call_user_func( $func, $args );
                 }
+                // 1.8.0: added missing return null statement
+                return null;
             };
         }
@@ -235 +239 @@
  function wqhelper_translate( $string ) {
      return $GLOBALS['wqcaller']( __FUNCTION__, $string );
-    }
+ }
 }
 
@@ -259 +263 @@
 if ( !function_exists( 'wqhelper_sidebar_patreon_button' ) ) {
  function wqhelper_sidebar_patreon_button( $args = null ) {
-    return $GLOBALS['wqcaller']( __FUNCTION__, $args );
+    return $GLOBALS['wqcaller']( __FUNCTION__, $args );
  }
 }
@@ -297 +301 @@
 // - wqhelper_process_rss_feed
 // - wqhelper_load_category_feed
+// - wqhelper_get_feed_ad
 
 // --- add dashboard feed widget ---
@@ -331 +336 @@
 if ( !function_exists( 'wqhelper_load_category_feed' ) ) {
  function wqhelper_load_category_feed( $args = null ) {
-    // 1.7.7: simplified admin condition logic
+    // 1.7.7: simplified admin condition logic
     if ( is_admin() ) {
         return $GLOBALS['wqcaller']( __FUNCTION__, $args );
     }
+    // 1.8.0: added missing empty return
+    return '';
+ }
+}
+// --- get feed ad ---
+// 1.8.0: added feed ad wrapper function
+if ( !function_exists( 'wqhelper_get_feed_ad' ) ) {
+ function wqhelper_get_feed_ad( $args = null ) {
+    return $GLOBALS['wqcaller']( __FUNCTION__, $args );
  }
 }
@@ -352 +366 @@
  function wqhelper_admin_styles( $args = null ) {
     remove_action( 'admin_footer', 'wordquest_admin_styles' );
-    return $GLOBALS['wqcaller']( __FUNCTION__, $args );
+    return $GLOBALS['wqcaller']( __FUNCTION__, $args );
  }
 }
@@ -365 +379 @@
  function wqhelper_admin_scripts( $args = null ) {
     remove_action( 'admin_footer', 'wordquest_admin_scripts' );
-    return $GLOBALS['wqcaller']( __FUNCTION__, $args );
+    return $GLOBALS['wqcaller']( __FUNCTION__, $args );
  }
 }
@@ -403 +417 @@
 // 1.6.0: ! NOTE ! caller exception ! use matching form version function here just in case...
 if ( !has_action( 'wp_ajax_wqhelper_update_sidebar_boxes', 'wqhelper_update_sidebar_boxes' ) ) {
-    add_action( 'wp_ajax_wqhelper_update_sidebar_boxes', 'wqhelper_update_sidebar_boxes' );
-}
-if ( !function_exists('wqhelper_update_sidebar_boxes' ) ) {
+    add_action( 'wp_ajax_wqhelper_update_sidebar_boxes', 'wqhelper_update_sidebar_boxes' );
+}
+if ( !function_exists( 'wqhelper_update_sidebar_boxes' ) ) {
  function wqhelper_update_sidebar_boxes() {
 
     // --- get helper version ---
-    if ( !isset( $_POST['wqhv'] ) ) {
-        return;
-    } else {
-        $wqhv = $_POST['wqhv'];
-    }
-    // 1.6.6: added sanitization of version value
-    if ( !is_numeric( $wqhv ) || ( strlen( $wqhv ) !== 3 ) ) {
-        return;
-    }
+    // phpcs:ignore WordPress.Security.NonceVerification.Missing
+    if ( !isset( $_POST['wqhv'] ) ) {
+        return;
+    } else {
+        // 1.8.1: sanitize to integer and cast to string
+        // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        $wqhv = (string) absint( $_POST['wqhv'] );
+    }
+    // 1.6.6: added sanitization of version value
+    // 1.8.1: simplified to check for 3 digits only
+    if ( strlen( $wqhv ) !== 3 ) {
+        return;
+    }
 
     // --- set matching function version ---
-    $func = 'wqhelper_update_sidebar_options_' . $wqhv;
+    $func = 'wqhelper_update_sidebar_options_' . $wqhv;
 
     // --- call function ---
-    // 1.6.5: fix to function call method
-    global $wqfunctions;
-    if ( is_callable( $wqfunctions[$func] ) ) {
-        $wqfunctions[$func]();
-    } elseif ( function_exists( $func ) ) {
-        call_user_func( $func );
-    }
+    // 1.6.5: fix to function call method
+    global $wqfunctions;
+    if ( is_callable( $wqfunctions[$func] ) ) {
+        $wqfunctions[$func]();
+    } elseif ( function_exists( $func ) ) {
+        call_user_func( $func );
+    }
  }
 }
@@ -455 +473 @@
             return bioship_translate( $string );
         }
-        if ( function_exists('translate' ) ) {
-            return translate( $string, 'default' );
+        if ( function_exists( 'translate' ) ) {
+            // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
+            return translate( (string) $string, 'default' );
         }
         return $string;
@@ -470 +489 @@
     $wqfunctions[$funcname] = function() {
 
-    // 1.7.7: bug out if using Adminsanity Notices box
-    if ( defined( 'ADMINSANITY_LOAD_NOTICES' ) && ADMINSANITY_LOAD_NOTICES ) {
+    // 1.7.7: bug out if already using AdminSanity Notices box
+    // 1.7.8: replace with better check for AdminSanity Notices box
+    global $adminsanity;
+    if ( isset( $adminsanity ) && isset( $adminsanity['load'] ) && $adminsanity['load']['notices'] ) {
         return;
     }
@@ -487 +508 @@
 
     // --- toggle notice box script ---
-    echo "<script>function togglenoticebox() {divid = 'adminnoticewrap';
+    echo "<script>function wq_togglenoticebox() {divid = 'adminnoticewrap';
     if (document.getElementById(divid).style.display == '') {
         document.getElementById(divid).style.display = 'none'; document.getElementById('adminnoticearrow').innerHTML = '&#9662;';}
@@ -496 +517 @@
 
     // --- output notice box ---
-    $adminnotices = ''; // $adminnotices = '('.$notices.')';
     echo '<div style="width:680px" id="adminnoticebox" class="postbox">';
-    echo '<h3 class="hndle" style="margin:7px 14px;font-size:12pt;" onclick="togglenoticebox();">';
+    echo '<h3 class="hndle" style="margin:7px 14px;font-size:12pt;" onclick="wq_togglenoticebox();">';
     echo '<span id="adminnoticearrow">&#9662;</span> &nbsp; ';
-    echo wqhelper_translate( 'Admin Notices' );
-    echo $adminnotices . '</span></h3>';
-    echo '<div id="adminnoticewrap" style="display:none";><h2></h2></div></div>';
-
-    // echo '<div style="width:75%" id="adminnoticebox" class="postbox">';
-    // echo '<h3 class="hndle" style="margin-left:20px;" onclick="togglenoticebox();"><span>&#9660; ';
-    // echo wqhelper_translate('Admin Notices');
-    // echo ' ('.$adminnotices.')</span></h3>';
-    // echo '<div id="adminnoticewrap" style="display:none";><h2></h2></div></div>';
+    echo esc_html( wqhelper_translate( 'Admin Notices' ) );
+    echo '</span></h3><div id="adminnoticewrap" style="display:none;"><h2></h2></div></div>';
 
  };
@@ -521 +534 @@
 if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
     $wqfunctions[$funcname] = function() {
-    global $wordquestplugins;
-    foreach ( $wordquestplugins as $pluginslug => $wqplugin ) {
+
+    global $wordquestplugins;
+    foreach ( $wordquestplugins as $pluginslug => $wqplugin ) {
 
         // --- check current user capabilities ---
@@ -529 +543 @@
         if ( current_user_can( 'manage_options' )
             || ( ( 'bioship' == $pluginslug ) && current_user_can( 'install_themes' ) )
-            || ( ( 'bioship' != $pluginslug ) && current_user_can( 'install_plugins') ) ) {
+            || ( ( 'bioship' != $pluginslug ) && current_user_can( 'install_plugins' ) ) ) {
                 $shownotice = true;
         }
@@ -561 +575 @@
                 // --- check usage length ---
                 $reminder = false;
-                $installtime = @strtotime( $sidebaroptions['installdate'] );
+                $installtime = strtotime( $sidebaroptions['installdate'] );
                 $timesince = time() - $installtime;
                 $dayssince = floor( $timesince / ( 24 * 60 * 60 ) );
@@ -584 +598 @@
 
                 if ( $reminder ) {
-                    // --- add an admin reminder notice ---
-                    global $wqreminder;
-                    $wqreminder[$pluginslug] = $wqplugin;
-                    $wqreminder[$pluginslug]['days'] = $dayssince;
-                    $wqreminder[$pluginslug]['notice'] = $reminder;
-                    add_action( 'admin_notices', 'wqhelper_reminder_notice' );
-                }
-            } else {
-                $sidebaroptions['installdate'] = date( 'Y-m-d' );
-                update_option( $prefix . '_sidebar_options', $sidebaroptions );
-            }
-        }
-    }
+                    // --- add an admin reminder notice ---
+                    global $wqreminder;
+                    $wqreminder[$pluginslug] = $wqplugin;
+                    $wqreminder[$pluginslug]['days'] = $dayssince;
+                    $wqreminder[$pluginslug]['notice'] = $reminder;
+                    add_action( 'admin_notices', 'wqhelper_reminder_notice' );
+                }
+            } else {
+                $sidebaroptions['installdate'] = date( 'Y-m-d' );
+                update_option( $prefix . '_sidebar_options', $sidebaroptions );
+            }
+        }
+    }
  };
 }
@@ -614 +628 @@
 
             // --- reminder wrapper ---
-            echo "<div class='updated notice is-dismissable' id='" . esc_attr( $pluginslug ) . "-reminder-notice' style='font-size:16px; line-height:24px; margin:0;'>";
-
-            echo wqhelper_translate( "You've been enjoying" ) . ' ';
-            echo $wqreminder[$pluginslug]['title'] . ' ' . wqhelper_translate( 'for' ) . ' ';
-            echo $wqreminder[$pluginslug]['days'] . ' ' . wqhelper_translate( 'days' ) . '. ';
-            echo wqhelper_translate( "If you like it, here's some ways you can help make it better" ) . ':<br>';
+            echo '<div class="updated notice is-dismissable" id="' . esc_attr( $pluginslug ) . '-reminder-notice" style="font-size:16px; line-height:24px; margin:0;">';
+
+            echo esc_html( wqhelper_translate( "You've been enjoying" ) ) . ' ';
+            echo esc_html( $wqreminder[$pluginslug]['title'] ) . ' ' . esc_html( wqhelper_translate( 'for' ) ) . ' ';
+            echo esc_html( $wqreminder[$pluginslug]['days'] ) . ' ' . esc_html( wqhelper_translate( 'days' ) ) . '. ';
+            echo esc_html( wqhelper_translate( "If you like it, here's some ways you can help make it better" ) ) . ':<br>';
 
             // Action Links Table
@@ -659 +673 @@
                             if ( 'bioship' == $pluginslug ) {
                                 // theme rate link --
-                                echo '<a class="notice-link" href="' . esc_url( $wqurls['wp'] ) . '/support/theme/' . $pluginslug . '/reviews/#new-post" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Rate this Theme' ) ) . '</a>';
+                                $rateurl = $wqurls['wp'] . '/support/theme/' . $pluginslug . '/reviews/#new-post';
+                                echo '<a class="notice-link" href="' . esc_url( $rateurl ) . '" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Rate this Theme' ) ) . '</a>';
                             } else {
                                 // --- plugin rate link ---
-                                echo '<a class="notice-link" href="' . esc_url( $wqurls['wp'] ) . '/support/plugin/' . $pluginslug . '/reviews/#new-post" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Rate this Plugin' ) ) . '</a>';
+                                $rateurl = $wqurls['wp'] . '/support/plugin/' . $pluginslug . '/reviews/#new-post';
+                                echo '<a class="notice-link" href="' . esc_url( $rateurl ) . '" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Rate this Plugin' ) ) . '</a>';
                             }
                         echo '</li>';
@@ -678 +694 @@
                             echo '<a class="notice-link" href="' . esc_url( $wqurls['bio'] ) . '#share" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Share this Theme' ) ) . '</a>';
                         } else {
-                            echo '<a class="notice-link" href="' . esc_url( $wqurls['wq'] ) . '/plugins/' . $pluginslug . '/#share" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Share this Plugin' ) ) . '</a>';
+                            $shareurl = $wqurls['wq'] . '/plugins/' . $pluginslug . '/#share';
+                            echo '<a class="notice-link" href="' . esc_url( $shareurl ) . '" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Share this Plugin' ) ) . '</a>';
                         }
                     echo '</li>';
@@ -687 +704 @@
                     echo '<li>';
                         echo '<span style="color:#00E;" class="dashicons dashicons-email-alt"></span> ';
-                        echo '<a class="notice-link" href="' . esc_url( $wqurls['wq'] ) . '/support/' . $pluginslug . '" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Provide Feedback' ) ) . '</a>';
+                        $supporturl = $wqurls['wq'] . '/support/' . $pluginslug;
+                        echo '<a class="notice-link" href="' . esc_url( $supporturl ) . '" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Provide Feedback' ) ) . '</a>';
                     echo "</li>";
 
@@ -699 +717 @@
                         $upgradeurl = admin_url( 'admin.php' ) . '?page=' . $wqreminder['slug'] . '-pricing';
                         echo '<li><a href="' . esc_url( $upgradeurl ) . '">';
-                            echo '<b>&rarr; ' . wqhelper_translate( 'Go PRO' ) .'</b>';
+                            echo '<b>&rarr; ' . esc_html( wqhelper_translate( 'Go PRO' ) ) . '</b>';
                         echo '</a></li>';
                     }
@@ -710 +728 @@
                 echo '<a href="' . esc_url( $dismisslink ) . '" target="wqdismissframe" style="text-decoration:none;" title="' . esc_attr( wqhelper_translate( 'Dismiss this Notice' ) ) . '">';
                 echo '<div class="dashicons dashicons-dismiss" style="font-size:16px;"></div></a>';
-                
+
             echo '</td></tr></table></div>';
-        }
-
-        // --- notice styles ---
-        // 1.7.5: added notice styling
-        echo "<style>#wq-reminders ul {list-style:none; padding:0; margin:0;}
+        }
+
+        // --- notice styles ---
+        // 1.7.5: added notice styling
+        echo "<style>#wq-reminders ul {list-style:none; padding:0; margin:0;}
         #wq-reminders ul li {display:inline-block; margin-left:15px;}
         #wq-reminders span.dashicons {display:inline; font-size:16px; color:#00E; vertical-align:middle;}
         .notice-link {text-decoration:none;} .notice-link:hover {text-decoration:underline;}</style>";
 
-        // --- notice dismissal iframe ---
-        echo '<iframe style="display:none;" src="javascript:void(0);" name="wqdismissframe" id="wqdimissframe"></iframe>';
+        // --- notice dismissal iframe ---
+        echo '<iframe style="display:none;" src="javascript:void(0);" name="wqdismissframe" id="wqdimissframe"></iframe>';
     };
 }
@@ -730 +748 @@
 // -----------------------
 $funcname = 'wqhelper_reminder_dismiss_' . $wqhv;
-if ( !isset( $wqfunctions[$funcname]) || !is_callable( $wqfunctions[$funcname] ) ) {
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
     $wqfunctions[$funcname] = function() {
 
         // --- check conditions ---
-        $pluginslug = $_REQUEST['slug'];
-        $notice = $_REQUEST['notice'];
-        if ( ( '30' != $notice ) && ( '90' != $notice ) && ( '365' != $notice ) ) {
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $pluginslug = sanitize_title( $_REQUEST['slug'] );
+        // 1.8.1: sanitize to integer and validate against array
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $notice = absint( $_REQUEST['notice'] );
+        if ( !in_array( $notice, array( 30, 90, 365 ) ) ) {
             return;
         }
@@ -780 +801 @@
         // 1.5.0: get plugin info (maximum twice daily)
         $plugininfo = get_transient( 'wordquest_plugin_info' );
-        
+
         // clear transient when debugging
         if ( $wqdebug ) {
             $plugininfo = '';
-        } 
+        }
 
         // --- maybe get plugin info now ---
@@ -791 +812 @@
             $args = array( 'timeout' => 15 );
             $plugininfo = wp_remote_get( $pluginsurl, $args );
-            if ( !is_wp_error($plugininfo ) ) {
+            if ( !is_wp_error( $plugininfo ) ) {
                 $plugininfo = $plugininfo['body'];
                 $dataend = "*****END DATA*****";
@@ -798 +819 @@
                     $plugininfo = substr( $plugininfo, 0, $pos );
                     $plugininfo = json_decode( $plugininfo, true );
-                    set_transient( 'wordquest_plugin_info', $plugininfo, (12*60*60 ) );
+                    set_transient( 'wordquest_plugin_info', $plugininfo, ( 12 * 60 * 60 ) );
                 } else {
                     $plugininfo = '';
@@ -808 +829 @@
 
         if ( $wqdebug ) {
-            echo "<!-- Plugin Info: "; print_r( $plugininfo ); echo " -->";
+            // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+            echo "<!-- Plugin Info: " . esc_html( print_r( $plugininfo ) ) . " -->";
         }
         return $plugininfo;
@@ -817 +839 @@
 // Version Specific Admin Page
 // ---------------------------
-$funcname = 'wqhelper_admin_page_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_admin_page_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
     $wqfunctions[$funcname] = function() {
 
@@ -829 +851 @@
 
     // --- toggle metabox script ---
-    echo "<script>function togglemetabox(divid) {
-        var divid = divid+'-inside';
+    echo "<script>function wq_togglemetabox(divid) {
+        divid += '-inside';
         if (document.getElementById(divid).style.display == '') {
             document.getElementById(divid).style.display = 'none';
@@ -855 +877 @@
         'wporgslug' => false,
     );
-    $args = array('wordquest', 'special');
-    wqhelper_sidebar_floatbox($args);
+    $args = array( 'wordquest', 'special' );
+    wqhelper_sidebar_floatbox( $args );
 
     // --- load sticky kit on sidebar ---
     // 1.6.5: replace floatmenu with stickykit
-    echo wqhelper_sidebar_stickykitscript();
-    echo '<style>#floatdiv {float:right;} #wpcontent, #wpfooter {margin-left:150px !important;}</style>';
-    echo '<script>jQuery("#floatdiv").stick_in_parent();</script>';
-    unset($wordquestplugins['wordquest']);
+    // 1.8.1: use new echo argument on stickykit function
+    wqhelper_sidebar_stickykitscript( true );
+    echo "<style>#floatdiv {float:right;} #wpcontent, #wpfooter {margin-left:150px !important;}</style>";
+    echo "<script>jQuery('#floatdiv').stick_in_parent();</script>";
+    unset( $wordquestplugins['wordquest'] );
 
     // echo wqhelper_sidebar_floatmenuscript();
@@ -880 +903 @@
 
     // --- Admin Page Title ---
-    $wordquesticon = plugins_url('images/wordquest.png', __FILE__);
+    $wordquesticon = plugins_url( 'images/wordquest.png', __FILE__ );
     echo '<style>.wqlink {text-decoration:none;} .wqlink:hover {text-decoration:underline;}</style>';
-    echo '<table><tr><td width="20"></td><td><img src="'.$wordquesticon.'"></td><td width="20"></td>';
-    echo '<td><div id="page-title"><a href="'.$wqurls['wq'].'" target=_blank><h2>WordQuest Alliance</h2></a></div></td>';
-    echo '<td width="30"></td><td><h4>&rarr; <a href="'.$wqurls['wq'].'/register/" class="wqlink" target=_blank>'.wqhelper_translate('Join').'</a></h4></td>';
-    echo '<td> / </td><td><h4><a href="'.$wqurls['wq'].'/login/"  class="wqlink" target=_blank>'.wqhelper_translate('Login').'</a></h4></td>';
-    echo '<td width="20"></td><td><h4>&rarr; <a href="'.$wqurls['wq'].'/solutions/"  class="wqlink" target=_blank>'.wqhelper_translate('Solutions').'</a></h4></td>';
-    echo '<td width="20"></td><td><h4>&rarr; <a href="'.$wqurls['wq'].'/contribute/"  class="wqlink" target=_blank>'.wqhelper_translate('Contribute').'</a></h4></td>';
+    echo '<table><tr>';
+        echo '<td width="20"></td>';
+        echo '<td><img src="' . esc_url( $wordquesticon ) . '" alt="' . esc_attr( wqhelper_translate( 'WordQuest icon' ) ) . '"></td>';
+        echo '<td width="20"></td>';
+        echo '<td><div id="page-title"><a href="' . esc_url( $wqurls['wq'] ) . '" target="_blank"><h2>WordQuest Alliance</h2></a></div></td>';
+        echo '<td width="30"></td>';
+        echo '<td><h4>&rarr; <a href="' . esc_url( $wqurls['wq'] ) . '/register/" class="wqlink" target="_blank">' . esc_html( wqhelper_translate( 'Join' ) ) . '</a></h4></td>';
+        echo '<td> / </td>';
+        echo '<td><h4><a href="' . esc_url( $wqurls['wq'] ) . '/login/" class="wqlink" target="_blank">' . esc_html( wqhelper_translate( 'Login' ) ) . '</a></h4></td>';
+        echo '<td width="20"></td>';
+        echo '<td><h4>&rarr; <a href="' . esc_url( $wqurls['wq'] ) . '/solutions/" class="wqlink" target="_blank">' . esc_html( wqhelper_translate( 'Solutions' ) ) . '</a></h4></td>';
+        echo '<td width="20"></td>';
+        echo '<td><h4>&rarr; <a href="' . esc_url( $wqurls['wq'] ) . '/contribute/" class="wqlink" target="_blank">' . esc_html( wqhelper_translate( 'Contribute' ) ) . '</a></h4></td>';
     echo '</tr></table>';
 
     // --- Output Plugins Column ---
-    wqhelper_admin_plugins_column(null);
+    wqhelper_admin_plugins_column( null );
 
     // --- Output Feeds Column ---
-    wqhelper_admin_feeds_column(null);
+    wqhelper_admin_feeds_column( null );
 
     // --- Wordquest Sidebar 'plugin' box ---
-    function wq_sidebar_plugin_footer() {
-        global $wqurls;
-        $iconurl = plugins_url('images/wordquest.png', __FILE__);
-        echo '<div id="pluginfooter"><div class="stuffbox" style="width:250px;background-color:#ffffff;"><h3>Source Info</h3><div class="inside">';
-        echo "<center><table><tr>";
-        echo "<td><a href='".$wqurls['wq']."' target='_blank'><img src='".$iconurl."' border=0></a></td></td>";
-        echo "<td width='14'></td>";
-        echo "<td><a href='".$wqurls['wq']."' target='_blank'>WordQuest Alliance</a><br>";
-        echo "<a href='".$wqurls['wq']."/plugins/' target='_blank'><b>&rarr; WordQuest Plugins</b></a><br>";
-        echo "<a href='".$wqurls['prn']."/directory/' target='_blank'>&rarr; Plugin Directory</a></td>";
-        echo "</tr></table></center>";
-        echo '</div></div></div>';
+    if ( !function_exists( 'wq_sidebar_plugin_footer' ) ) {
+        function wq_sidebar_plugin_footer() {
+            global $wqurls;
+            $iconurl = plugins_url( 'images/wordquest.png', __FILE__ );
+            echo '<div id="pluginfooter"><div class="stuffbox" style="width:250px;background-color:#ffffff;"><h3>' . esc_html( wqhelper_translate( 'Source Info' ) ) . '</h3><div class="inside">';
+            echo '<center><table><tr>';
+                echo '<td><a href="' . esc_url( $wqurls['wq'] ) . '" target="_blank"><img src="' . esc_url( $iconurl ) . '" alt="' . esc_attr( wqhelper_translate( 'WordQuest Icon' ) ) . ' "border="0"></a></td>';
+                echo '<td width="14"></td>';
+                echo '<td><a href="' . esc_url( $wqurls['wq'] ) . '" target="_blank">WordQuest Alliance</a><br>';
+                echo '<a href="' . esc_url( $wqurls['wq'] ) . '/plugins/" target="_blank"><b>&rarr; WordQuest Plugins</b></a><br>';
+                echo '<a href="' . esc_url( $wqurls['prn'] ) . '/directory/" target="_blank">&rarr; Plugin Directory</a></td>';
+                echo '</tr></table></center>';
+            echo '</div></div></div>';
+        }
     }
 
@@ -923 +955 @@
 // Version Specific Plugins Column
 // -------------------------------
-$funcname = 'wqhelper_admin_plugins_column_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
-    $wqfunctions[$funcname] = function($args) {
+$funcname = 'wqhelper_admin_plugins_column_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+    $wqfunctions[$funcname] = function( $args ) {
 
     global $wordquesthelper, $wordquestplugins, $wqurls, $wqdebug;
@@ -932 +964 @@
     // 1.6.6: check if current WQ plugins are all installed via WordPress.Org
     // (if so, only provide option to install other WQ plugins in repository)
-    global $wordpressorgonly; $wordpressorgonly = true;
-    foreach ($wordquestplugins as $pluginslug => $plugin) {
-        // if this is false, it was from wordquest not wordpress
-        if (!$plugin['wporg']) {$wordpressorgonly = false;}
+    global $wq_wordpress_org;
+    $wq_wordpress_org = true;
+    foreach ( $wordquestplugins as $pluginslug => $plugin ) {
+        // - if this is false, it was from WordQuest not WordPress -
+        if ( !$plugin['wporg'] ) {
+            $wq_wordpress_org = false;
+        }
     }
 
@@ -942 +977 @@
     // TODO: test all options here more thoroughly..?
     echo "<script>
-    function dopluginaction(pluginslug) {
-        var selectelement = document.getElementById(pluginslug+'-action');
-        var actionvalue = selectelement.options[selectelement.selectedIndex].value;
-        var linkel = document.getElementById(pluginslug+'-link');
-        var adminpageurl = '".admin_url('admin.php')."';
+    function wq_plugin_action(pluginslug) {
+        selectelement = document.getElementById(pluginslug+'-action');
+        actionvalue = selectelement.options[selectelement.selectedIndex].value;
+        linkel = document.getElementById(pluginslug+'-link');
+        adminpageurl = '" . esc_url( admin_url( 'admin.php' ) ) . "';
+        wqurl = '" . esc_url( $wqurls['wq'] ) . "';
         if (actionvalue == 'settings') {linkel.target = '_self'; linkel.href = adminpageurl+'?page='+pluginslug;}
         if (actionvalue == 'update') {linkel.target = '_self'; linkel.href = document.getElementById(pluginslug+'-update-link').value;}
@@ -952 +988 @@
         if (actionvalue == 'install') {linkel.target = '_self'; linkel.href = document.getElementById(pluginslug+'-install-link').value;}
         if (actionvalue == 'support') {linkel.target = '_blank'; linkel.href = adminpageurl+'?page='+pluginslug+'-wp-support-forum';}
-        if (actionvalue == 'donate') {linkel.target = '_blank'; linkel.href = '".$wqurls['wq']."/contribute/?plugin='+pluginslug;}
-        if (actionvalue == 'testimonial') {linkel.target = '_blank'; linkel.href = '".$wqurls['wq']."/contribute/?tab=testimonial';}
-        if (actionvalue == 'rate') {linkel = '_blank'; linkel.href = '".$wqurls['wp']."/plugins/'+pluginslug+'/reviews/#new-post';}
-        if (actionvalue == 'development') {linkel.target = '_blank'; linkel.href= '".$wqurls['wq']."/contribute/?tab=development';}
+        if (actionvalue == 'donate') {linkel.target = '_blank'; linkel.href = wqurl+'/contribute/?plugin='+pluginslug;}
+        if (actionvalue == 'testimonial') {linkel.target = '_blank'; linkel.href = wqurl+'/contribute/?tab=testimonial';}
+        if (actionvalue == 'rate') {linkel.target = '_blank'; linkel.href = '" . esc_url( $wqurls['wp'] ) . "/plugins/'+pluginslug+'/reviews/#new-post';}
+        if (actionvalue == 'development') {linkel.target = '_blank'; linkel.href= wqurl+'/contribute/?tab=development';}
         if (actionvalue == 'contact') {linkel.target = '_self'; linkel.href = adminpageurl+'?page='+pluginslug+'-contact';}
-        if (actionvalue == 'home') {linkel.target = '_blank'; linkel.href = '".$wqurls['wq']."/plugins/'+pluginslug+'/';}
+        if (actionvalue == 'home') {linkel.target = '_blank'; linkel.href = wqurl+'/plugins/'+pluginslug+'/';}
         if (actionvalue == 'upgrade') {linkel.target = '_self'; linkel.href = adminpageurl+'?page='+pluginslug+'-pricing';}
         if (actionvalue == 'account') {linkel.target = '_self'; linkel.href = adminpageurl+'?page='+pluginslug+'-account';}
@@ -966 +1002 @@
 
     // --- Get Installed and Active Plugin Slugs ---
-    $i = 0; foreach ($wordquestplugins as $pluginslug => $values) {$pluginslugs[$i] = $pluginslug; $i++;}
+    $i = 0;
+    $pluginslugs = array();
+    foreach ( $wordquestplugins as $pluginslug => $values ) {
+        $pluginslugs[$i] = $pluginslug;
+        $i++;
+    }
     // if ($wqdebug) {echo "<!-- Active Wordquest Plugins: "; print_r($pluginslugs); echo " -->";}
 
     // --- Get All Installed Plugins Info ---
-    $i = 0; $installedplugins = get_plugins();
-    foreach ($installedplugins as $pluginfile => $values) {$installedslugs[$i] = sanitize_title($values['Name']); $i++;}
+    $i = 0;
+    $installedplugins = get_plugins();
+    $installedslugs = array();
+    foreach ( $installedplugins as $pluginfile => $values ) {
+        $installedslugs[$i] = sanitize_title( $values['Name'] );
+        $i++;
+    }
     // if ($wqdebug) {echo "<!-- Installed Plugins: "; print_r($installedplugins); echo " -->";}
     // if ($wqdebug) {echo "<!-- Installed Plugin Slugs: "; print_r($installedslugs); echo " -->";}
@@ -978 +1024 @@
     // ----------------------
     // 1.6.6: define empty pluginupdates array
-    $i = 0; $updateplugins = get_site_transient('update_plugins'); $pluginupdates = array();
+    $i = 0;
+    $updateplugins = get_site_transient( 'update_plugins' );
+    $pluginupdates = array();
     // 1.7.3: adde property exists check
-    if (property_exists($updateplugins, 'response')) {
-        foreach ($updateplugins->response as $pluginfile => $values) {$pluginupdates[$i] = $values->slug; $i++;}
+    if ( property_exists( $updateplugins, 'response' ) ) {
+        foreach ( $updateplugins->response as $pluginfile => $values ) {
+            $pluginupdates[$i] = $values->slug;
+            $i++;
+        }
     }
     // if ($wqdebug) {echo "<!-- Plugin Updates: "; print_r($updateplugins); echo " -->";}
@@ -990 +1041 @@
 
     // process plugin info
-    $i = 0; $wqplugins = $wqpluginslugs = array();
-    if (is_array($plugininfo)) {
-        foreach ($plugininfo as $plugin) {
-            // print_r($plugin); // debug point
-            if (isset($plugin['slug'])) {
-                $wqpluginslugs[$i] = $pluginslug = $plugin['slug']; $i++;
-                if (isset($plugin['title'])) {$wqplugins[$pluginslug]['title'] = $plugin['title'];}
-                if (isset($plugin['home'])) {$wqplugins[$pluginslug]['home'] = $plugin['home'];}
-                if (isset($plugin['description'])) {$wqplugins[$pluginslug]['description'] = $plugin['description'];}
-                if (isset($plugin['icon'])) {$wqplugins[$pluginslug]['icon'] = $plugin['icon'];}
-                if (isset($plugin['paidplans'])) {$wqplugins[$pluginslug]['paidplans'] = $plugin['paidplans'];}
-                if (isset($plugin['package'])) {$wqplugins[$pluginslug]['package'] = $plugin['package'];}
-
-                if (isset($plugin['tags'])) {$wqplugins[$pluginslug]['tags'] = $plugin['tags'];}
-                if (isset($plugin['cats'])) {$wqplugins[$pluginslug]['cats'] = $plugin['cats'];}
+    $i = 0;
+    $wqplugins = $wqpluginslugs = array();
+    if ( is_array( $plugininfo ) ) {
+        foreach ( $plugininfo as $plugin ) {
+            // print_r( $plugin ); // debug point
+            if ( isset( $plugin['slug'] ) ) {
+                $wqpluginslugs[$i] = $pluginslug = $plugin['slug'];
+                $i++;
+                if ( isset( $plugin['title'] ) ) {
+                    $wqplugins[$pluginslug]['title'] = $plugin['title'];
+                }
+                if ( isset( $plugin['home'] ) ) {
+                    $wqplugins[$pluginslug]['home'] = $plugin['home'];
+                }
+                if ( isset( $plugin['description'] ) ) {
+                    $wqplugins[$pluginslug]['description'] = $plugin['description'];
+                }
+                if ( isset( $plugin['icon'] ) ) {
+                    $wqplugins[$pluginslug]['icon'] = $plugin['icon'];
+                }
+                if ( isset( $plugin['paidplans'] ) ) {
+                    $wqplugins[$pluginslug]['paidplans'] = $plugin['paidplans'];
+                }
+                if ( isset( $plugin['package'] ) ) {
+                    $wqplugins[$pluginslug]['package'] = $plugin['package'];
+                }
+
+                if ( isset( $plugin['tags'] ) ) {
+                    $wqplugins[$pluginslug]['tags'] = $plugin['tags'];
+                }
+                if ( isset( $plugin['cats'] ) ) {
+                    $wqplugins[$pluginslug]['cats'] = $plugin['cats'];
+                }
 
                 // 1.6.5: check release date and status
-                if (isset($plugin['releasedate'])) {$wqplugins[$pluginslug]['releasedate'] = $plugin['releasedate'];}
-                if (isset($plugin['releasestatus'])) {$wqplugins[$pluginslug]['releasestatus'] = $plugin['releasestatus'];}
-                else {$wqplugins[$pluginslug]['releasestatus'] = 'Upcoming';}
+                if ( isset( $plugin['releasedate'] ) ) {
+                    $wqplugins[$pluginslug]['releasedate'] = $plugin['releasedate'];
+                }
+                if ( isset( $plugin['releasestatus'] ) ) {
+                    $wqplugins[$pluginslug]['releasestatus'] = $plugin['releasestatus'];
+                } else {
+                    $wqplugins[$pluginslug]['releasestatus'] = 'Upcoming';
+                }
 
                 // 1.6.6: check for wordpress.org slug
-                if (isset($plugin['wporgslug'])) {$wqplugins[$pluginslug]['wporgslug'] = $plugin['wporgslug'];}
-                else {$wpplugins[$pluginslug]['wporgslug'] = false;}
-
-                if (in_array($pluginslug, $installedslugs)) {$wqplugins[$pluginslug]['installed'] = 'yes';}
-                else {$wqplugins[$pluginslug]['installed'] = 'no';}
+                if ( isset( $plugin['wporgslug'] ) ) {
+                    $wqplugins[$pluginslug]['wporgslug'] = $plugin['wporgslug'];
+                } else {
+                    $wpplugins[$pluginslug]['wporgslug'] = false;
+                }
+
+                if ( in_array( $pluginslug, $installedslugs ) ) {
+                    $wqplugins[$pluginslug]['installed'] = 'yes';
+                } else {
+                    $wqplugins[$pluginslug]['installed'] = 'no';
+                }
 
                 // --- get latest plugin release ---
-                if (isset($plugin['latestrelease']) && ($plugin['latestrelease'] == 'yes')) {
+                if ( isset( $plugin['latestrelease'] ) && ( 'yes' == $plugin['latestrelease'] ) ) {
                     $wqplugins[$pluginslug]['latestrelease'] = 'yes';
                     $latestrelease = $wqplugins[$pluginslug];
@@ -1027 +1107 @@
                 // --- get next plugin release ---
                 // 1.6.5: check for next plugin release also
-                if (isset($plugin['nextrelease']) && ($plugin['nextrelease'] == 'yes')) {
+                if ( isset( $plugin['nextrelease'] ) && ( 'yes' == $plugin['nextrelease'] ) ) {
                     $wqplugins[$pluginslug]['nextrelease'] = 'yes';
                     $nextrelease = $wqplugins[$pluginslug];
@@ -1036 +1116 @@
     }
     // if ($wqdebug) {echo "<!-- WQ Plugin Slugs: "; print_r($wqpluginslugs); echo " -->";}
-    if ($wqdebug) {echo "<!-- WQ Plugins: "; print_r($wqplugins); echo " -->";}
+    if ( $wqdebug ) {
+        // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+        echo "<!-- WQ Plugins: " . esc_html( print_r( $wqplugins ) ) . " -->";
+    }
 
     // --- maybe set Plugin Release Info ---
     global $wqreleases;
-    if (isset($latestrelease)) {$wqreleases['latest'] = $latestrelease;}
-    if (isset($nextrelease)) {$wqreleases['next'] = $nextrelease;}
+    if ( isset( $latestrelease ) ) {
+        $wqreleases['latest'] = $latestrelease;
+    }
+    if ( isset( $nextrelease ) ) {
+        $wqreleases['next'] = $nextrelease;
+    }
 
     // --- get Installed Wordquest Plugin Data ---
-    $plugins = array(); $inactiveplugins = array();
+    $plugins = $inactiveplugins = $pluginfiles = $inactiveversions = array();
     $i = $j = 0;
-    foreach ($installedplugins as $pluginfile => $values) {
-
-        $pluginslug = sanitize_title($values['Name']);
+    foreach ( $installedplugins as $pluginfile => $values ) {
+
+        $pluginslug = sanitize_title( $values['Name'] );
         $pluginfiles[$pluginslug] = $pluginfile;
         // echo '***'.$pluginslug.'***'; // debug point
-        if (in_array($pluginslug, $wqpluginslugs) || in_array($pluginslug, $pluginslugs)) {
+        if ( in_array( $pluginslug, $wqpluginslugs ) || in_array( $pluginslug, $pluginslugs ) ) {
 
             // --- set plugin data ---
@@ -1061 +1148 @@
 
             // --- check for matching plugin update ---
-            if (in_array($pluginslug, $pluginupdates)) {$plugins[$i]['update'] = 'yes';}
-            else {$plugins[$i]['update'] = 'no';}
+            if ( in_array( $pluginslug, $pluginupdates ) ) {
+                $plugins[$i]['update'] = 'yes';
+            } else {
+                $plugins[$i]['update'] = 'no';
+            }
 
             // --- filter out to get inactive plugins ---
-            if (!in_array($pluginslug, $pluginslugs)) {
-                $inactiveplugins[$j] = $pluginslug; $j++;
+            if ( !in_array( $pluginslug, $pluginslugs ) ) {
                 $inactiveversions[$pluginslug] = $values['Version'];
+                $inactiveplugins[$j] = $pluginslug;
+                $j++;
             }
             $i++;
@@ -1076 +1167 @@
 
     // --- check if BioShip Theme installed ---
-    $themes = wp_get_themes(); $bioshipinstalled = false;
-    foreach ($themes as $theme) {if ($theme->stylesheet == 'bioship') {$bioshipinstalled = true;} }
+    $themes = wp_get_themes();
+    $bioshipinstalled = false;
+    foreach ( $themes as $theme ) {
+        // 1.8.0: use public get_stylesheet method
+        if ( 'bioship' == $theme->get_stylesheet() ) {
+            $bioshipinstalled = true;
+        }
+    }
 
     // --- open plugin column ---
@@ -1084 +1181 @@
         // Active Plugin Panel
         // -------------------
-        $boxid = 'wordquestactive'; $boxtitle = wqhelper_translate('Active WordQuest Plugins');
-        echo '<div id="'.$boxid.'" class="postbox">';
-        echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
-        echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;"><table>';
-        foreach ($wordquestplugins as $pluginslug => $plugin) {
-            if ($pluginslug != 'bioship') { // filter out theme here
+        $boxid = 'wordquestactive';
+        $boxtitle = wqhelper_translate( 'Active WordQuest Plugins' );
+        echo '<div id="' . esc_attr( $boxid ) . '" class="postbox">';
+        echo '<h2 class="hndle" onclick="wq_togglemetabox(\'' . esc_attr( $boxid ) . '\');">';
+        echo '<span>' . esc_html( $boxtitle ) . '</span></h2>';
+        echo '<div class="inside" id="' . esc_attr( $boxid ) . '-inside" style="margin-bottom:0;"><table>';
+        foreach ( $wordquestplugins as $pluginslug => $plugin ) {
+            // filter out theme here
+            if ( 'bioship' != $pluginslug ) {
 
                 // --- set update link ---
-                if (in_array($pluginslug, $pluginupdates)) {
-                    $updatelink = admin_url('update.php').'?action=upgrade-plugin&plugin='.$pluginfiles[$pluginslug];
-                    $updatelink = wp_nonce_url($updatelink, 'upgrade-plugin_'.$pluginfiles[$pluginslug]);
-                    echo "<input type='hidden' id='".$pluginslug."-update-link' value='".$updatelink."'>";
+                if ( in_array( $pluginslug, $pluginupdates ) ) {
+                    $updatelink = admin_url( 'update.php' ) . '?action=upgrade-plugin&plugin=' . $pluginfiles[$pluginslug];
+                    $updatelink = wp_nonce_url( $updatelink, 'upgrade-plugin_' . $pluginfiles[$pluginslug] );
+                    echo '<input type="hidden" id="' . esc_attr( $pluginslug ) . '-update-link" value="' . esc_url( $updatelink ) . '">';
                 }
 
                 // --- linked title and version ---
-                echo "<tr><td><a href='".$wqurls['wq']."/plugins/".$pluginslug."' class='pluginlink' target=_blank>";
-                echo $plugin['title']."</a></td><td width='20'></td>";
-                echo "<td>".$plugin['version']."</td><td width='20'></td>";
+                echo '<tr><td>';
+                    echo '<a href="' . esc_url( $wqurls['wq'] ) . '/plugins/' . esc_attr( $pluginslug ) . '" class="pluginlink" target="_blank">';
+                    echo esc_html( $plugin['title'] ) . '</a>';
+                echo '</td><td width="20"></td><td>';
+                    echo esc_html( $plugin['version'] );
+                echo '</td><td width="20"></td>';
 
                 // --- update / settings options ---
-                echo "<td><select name='".$pluginslug."-action' id='".$pluginslug."-action' style='font-size:8pt;'>";
-                if (in_array($pluginslug, $pluginupdates)) {
-                    echo "<option value='update' selected='selected'>".wqhelper_translate('Update')."</option>";
-                    echo "<option value='settings'>".wqhelper_translate('Settings')."</option>";
-                } else {echo "<option value='settings' selected='selected'>".wqhelper_translate('Settings')."</option>";}
+                echo '<td><select name="' . esc_attr( $pluginslug ) . '-action" id="' . esc_attr( $pluginslug ) . '-action" style="font-size:8pt;">';
+                if ( in_array( $pluginslug, $pluginupdates ) ) {
+                    echo '<option value="update" selected="selected">' . esc_html( wqhelper_translate( 'Update' ) ) . '</option>';
+                    echo '<option value="settings">' . esc_html( wqhelper_translate( 'Settings' ) ) . '</option>';
+                } else {
+                    echo '<option value="settings" selected="selected">' . esc_html( wqhelper_translate( 'Settings' ) ) . '</option>';
+                }
 
                 // --- donate / testimonial / support / development options ---
-                echo "<option value='donate'>".wqhelper_translate('Donate')."</option>";
-                // echo "<option value='testimonial'>".wqhelper_translate('Testimonial')."</option>";
-                echo "<option value='support'>".wqhelper_translate('Support')."</option>";
-                echo "<option value='development'>".wqhelper_translate('Development')."</option>";
-                if (isset($plugin['wporgslug'])) {echo "<option value='Rate'>".wqhelper_translate('Rate')."</option>";}
+                echo '<option value="donate">' . esc_html( wqhelper_translate( 'Donate' ) ) . '</option>';
+                // echo '<option value="testimonial">' . esc_html( wqhelper_translate( 'Testimonial' ) . '</option>';
+                echo '<option value="support">' . esc_html( wqhelper_translate( 'Support' ) ) . '</option>';
+                echo '<option value="development">' . esc_html( wqhelper_translate( 'Development' ) ) . '</option>';
+                if ( isset( $plugin['wporgslug'] ) ) {
+                    echo '<option value="Rate">' . esc_html( wqhelper_translate( 'Rate' ) ) . '</option>';
+                }
 
                 // --- check for Pro Plan availability ---
@@ -1121 +1228 @@
                 // TODO: check for Pro add-ons ?
                 // if ($plugin['plan'] == 'premium') {echo "<option value='contact'>".wqhelper_translate('Contact')."</option>";}
-                if (isset($wordquestplugins[$pluginslug]['hasplans']) && $wordquestplugins[$pluginslug]['hasplans']) {
+                if ( isset( $wordquestplugins[$pluginslug]['hasplans'] ) && $wordquestplugins[$pluginslug]['hasplans'] ) {
                     // 1.7.7: add isset check for plugin plan for back-compat
                     if ( !isset( $plugin['plan'] ) || ( 'premium' != $plugin['plan'] ) ) {
-                        echo "<option style='font-weight:bold;' value='upgrade'>".wqhelper_translate('Go PRO!')."</option>";
+                        echo '<option style="font-weight:bold;" value="upgrade">' . esc_html( wqhelper_translate( 'Go PRO' ) ) . '</option>';
                     } else {
-                        echo "<option value='account'>".wqhelper_translate('Account')."</option>";
+                        echo '<option value="account">' . esc_html( wqhelper_translate( 'Account' ) ) . '</option>';
                     }
                 }
 
-                // --- close select ---
-                echo "</select></td><td width='20'></td>";
+                // --- close action select ---
+                echo '</select></td><td width="20"></td>';
 
                 // --- do selected action button ---
-                echo "<td><a href='javascript:void(0);' target=_blank id='".$pluginslug."-link' onclick='dopluginaction(\"".$pluginslug."\");'>";
-                echo "<input class='button-secondary' type='button' value='".wqhelper_translate('Go')."'></a></td></tr>";
+                echo '<td>';
+                    echo '<a href="javascript:void(0);" target="_blank" id="' . esc_attr( $pluginslug ) . '-link" onclick="wq_plugin_action(\'' . esc_attr( $pluginslug ) . '\');">';
+                    echo '<input class="button-secondary" type="button" value="' . esc_attr( wqhelper_translate( 'Go' ) ) . '"></a>';
+                echo '</td></tr>';
             }
         }
@@ -1142 +1251 @@
         // Inactive Plugin Panel
         // ---------------------
-        if (count($inactiveplugins) > 0) {
-            $boxid = 'wordquestinactive'; $boxtitle = wqhelper_translate('Inactive WordQuest Plugins');
-            echo '<div id="'.$boxid.'" class="postbox">';
-            echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
-            echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;"><table>';
-            foreach ($inactiveplugins as $inactiveplugin) {
+        if ( count( $inactiveplugins ) > 0 ) {
+            $boxid = 'wordquestinactive';
+            $boxtitle = wqhelper_translate( 'Inactive WordQuest Plugins' );
+            echo '<div id="' . esc_attr( $boxid ) . '" class="postbox">';
+            echo '<h2 class="hndle" onclick="wq_togglemetabox(\'' . esc_attr( $boxid ) . '\');">';
+            echo '<span>' . esc_html( $boxtitle ) . '</span></h2>';
+            echo '<div class="inside" id="' . esc_attr( $boxid ) . '-inside" style="margin-bottom:0;"><table>';
+            foreach ( $inactiveplugins as $inactiveplugin ) {
 
                 // --- set activate link ---
-                $activatelink = admin_url('plugins.php').'?action=activate&plugin='.$pluginfiles[$inactiveplugin];
-                $activatelink = wp_nonce_url($activatelink, 'activate-plugin_'.$pluginfiles[$inactiveplugin]);
-                echo "<input type='hidden' id='".$inactiveplugin."-activate-link' value='".$activatelink."'>";
+                $activatelink = admin_url( 'plugins.php' ) . '?action=activate&plugin=' . $pluginfiles[$inactiveplugin];
+                $activatelink = wp_nonce_url( $activatelink, 'activate-plugin_' . $pluginfiles[$inactiveplugin] );
+                echo "<input type='hidden' id='" . esc_attr( $inactiveplugin ) . "-activate-link' value='" . esc_url( $activatelink ) . "'>";
 
                 // --- set update link ---
-                if (in_array($inactiveplugin, $pluginupdates)) {
-                    $updatelink = admin_url('update.php').'?action=upgrade-plugin&plugin='.$pluginfiles[$inactiveplugin];
-                    $updatelink = wp_nonce_url($updatelink, 'upgrade-plugin_'.$pluginfiles[$inactiveplugins]);
-                    echo "<input type='hidden' id='".$inactiveplugin."-update-link' value='".$updatelink."'>";
+                if ( in_array( $inactiveplugin, $pluginupdates ) ) {
+                    $updatelink = admin_url( 'update.php' ) . '?action=upgrade-plugin&plugin=' . $pluginfiles[$inactiveplugin];
+                    // 1.8.0: fix to incorrect plural key usage, should be singular
+                    $updatelink = wp_nonce_url( $updatelink, 'upgrade-plugin_' . $pluginfiles[$inactiveplugin] );
+                    echo "<input type='hidden' id='" . esc_attr( $inactiveplugin ) . "-update-link' value='" . esc_url( $updatelink ) . "'>";
                 }
 
                 // --- linked title and version ---
-                echo "<tr><td><a href='".$wqplugins[$inactiveplugin]['home']."' class='pluginlink' target=_blank>";
-                echo $wqplugins[$inactiveplugin]['title']."</a></td><td width='20'></td>";
-                echo "<td>".$inactiveversions[$inactiveplugin]."</td><td width='20'></td>";
+                echo '<tr><td>';
+                    echo '<a href="' . esc_url( $wqplugins[$inactiveplugin]['home'] ) . '" class="pluginlink" target="_blank">';
+                    echo esc_html( $wqplugins[$inactiveplugin]['title'] ) . '</a>';
+                echo '</td><td width="20"></td><td>';
+                    echo esc_html( $inactiveversions[$inactiveplugin] );
+                echo '</td><td width="20"></td>';
 
                 // --- select plugin action ---
-                echo "<td><select name='".$inactiveplugin."-action' id='".$inactiveplugin."-action' style='font-size:8pt;'>";
-                if (in_array($inactiveplugin, $pluginupdates)) {
-                    echo "<option value='update' selected='selected'>".wqhelper_translate('Update')."</option>";
-                    echo "<option value='activate'>".wqhelper_translate('Activate')."</option>";
-                } else {echo "<option value='activate' selected='selected'>".wqhelper_translate('Activate')."</option>";}
-                echo "</select></td><td width='20'></td>";
+                echo '<td><select name="' . esc_attr( $inactiveplugin ) . '-action" id="' . esc_attr( $inactiveplugin ) . '-action" style="font-size:8pt;">';
+                if ( in_array( $inactiveplugin, $pluginupdates ) ) {
+                    echo '<option value="update" selected="selected">' . esc_html( wqhelper_translate( 'Update' ) ) . '</option>';
+                    echo '<option value="activate">' . esc_html( wqhelper_translate( 'Activate' ) ) . '</option>';
+                } else {
+                    echo '<option value="activate" selected="selected">' . esc_html( wqhelper_translate( 'Activate' ) ) . '</option>';
+                }
+                echo '</select></td><td width="20"></td>';
 
                 // --- plugin action button ---
-                echo "<td><a href='javascript:void(0);' target=_blank id='".$inactiveplugin."-link' onclick='dopluginaction(\"".$inactiveplugin."\");'>";
-                echo "<input class='button-secondary' type='button' value='".wqhelper_translate('Go')."'></a></td>";
-                echo "</tr>";
+                echo '<td>';
+                    echo '<a href="javascript:void(0);" target="_blank" id="' . esc_attr( $inactiveplugin ) . '-link" onclick="wq_plugin_action(\'' . esc_attr( $inactiveplugin ) . '\');">';
+                    echo '<input class="button-secondary" type="button" value="' . esc_html( wqhelper_translate( 'Go' ) ) . '"></a>';
+                echo '</td></tr>';
             }
             echo '</table></div></div>';
@@ -1183 +1301 @@
 
         $releasedplugins = $unreleasedplugins = array();
-        if ( count($wqplugins) > count($wordquestplugins) ) {
-            foreach ($wqplugins as $pluginslug => $wqplugin) {
-                if (!in_array($pluginslug, $installedslugs) && !in_array($pluginslug, $inactiveplugins)) {
-                    if ($wqplugin['releasestatus'] == 'Released') {$releasedplugins[$pluginslug] = $wqplugin;}
-                    else {
-                        $releasetime = strtotime($wqplugin['releasedate']);
+        if ( count( $wqplugins ) > count( $wordquestplugins ) ) {
+            foreach ( $wqplugins as $pluginslug => $wqplugin ) {
+                if ( !in_array( $pluginslug, $installedslugs ) && !in_array( $pluginslug, $inactiveplugins ) ) {
+                    if ( 'Released' == $wqplugin['releasestatus'] ) {
+                        $releasedplugins[$pluginslug] = $wqplugin;
+                    } else {
+                        $releasetime = strtotime( $wqplugin['releasedate'] );
                         $wqplugin['slug'] = $pluginslug;
                         $unreleasedplugins[$releasetime] = $wqplugin;
@@ -1198 +1317 @@
         // Available Plugin Panel
         // ----------------------
-        if (count($releasedplugins) > 0) {
-            if ($wqdebug) {echo "<!-- Released Plugins: "; print_r($releasedplugins); echo " -->";}
-            $boxid = 'wordquestavailable'; $boxtitle = wqhelper_translate('Available WordQuest Plugins');
-            echo '<div id="'.$boxid.'" class="postbox">';
-            echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
-            echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;"><table>';
-
-            foreach ($releasedplugins as $pluginslug => $wqplugin) {
+        if ( count( $releasedplugins ) > 0 ) {
+
+            if ( $wqdebug ) {
+                // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+                echo "<!-- Released Plugins: " . esc_html( print_r( $releasedplugins, true ) ) . " -->";
+            }
+
+            $boxid = 'wordquestavailable';
+            $boxtitle = wqhelper_translate( 'Available WordQuest Plugins' );
+            echo '<div id="' . esc_attr( $boxid ) . '" class="postbox">';
+            echo '<h2 class="hndle" onclick="wq_togglemetabox(\'' . esc_attr( $boxid ) . '\');">';
+            echo '<span>' . esc_html( $boxtitle ) . '</span></h2>';
+            echo '<div class="inside" id="' . esc_attr( $boxid ) . '-inside" style="margin-bottom:0;"><table>';
+
+            foreach ( $releasedplugins as $pluginslug => $wqplugin ) {
 
                 // --- set install plugin link ---
                 // 1.6.5: add separate install link URL for each plugin for nonce checking
                 // 1.6.6: use wordpress.org link if all plugins are from wordpress.org
-                if ($wordpressorgonly && $wqplugin['wporgslug']) {
-                    $installlink = self_admin_url('update.php')."?action=install-plugin&plugin=".$wqplugin['wporgslug'];
-                    $installlink = wp_nonce_url($installlink, 'install-plugin_'.$wqplugin['wporgslug']);
-                    echo "<input type='hidden' name='".$pluginslug."-install-link' value='".$installlink."'>";
-                } elseif (!$wordpressorgonly && is_array($wqplugin['package'])) {
-                    $installlink = admin_url('update.php')."?action=wordquest_plugin_install&plugin=".$pluginslug;
-                    $installlink = wp_nonce_url($installlink, 'plugin-upload');
-                    echo "<input type='hidden' name='".$pluginslug."-install-link' value='".$installlink."'>";
+                if ( $wq_wordpress_org && $wqplugin['wporgslug'] ) {
+                    $installlink = self_admin_url( 'update.php' ) . '?action=install-plugin&plugin=' . $wqplugin['wporgslug'];
+                    $installlink = wp_nonce_url( $installlink, 'install-plugin_' . $wqplugin['wporgslug'] );
+                    echo '<input type="hidden" name="' . esc_attr( $pluginslug ) . '-install-link" value="' . esc_url( $installlink ) . '">';
+                } elseif ( !$wq_wordpress_org && is_array( $wqplugin['package'] ) ) {
+                    $installlink = admin_url( 'update.php' ) . '?action=wordquest_plugin_install&plugin=' . $pluginslug;
+                    $installlink = wp_nonce_url( $installlink, 'plugin-upload' );
+                    echo '<input type="hidden" name="' . esc_attr( $pluginslug ) . '-install-link" value="' . esc_url( $installlink ) . '">';
                 }
 
                 // --- linked plugin title ---
-                echo "<tr><td><a href='".$wqplugin['home']."' class='pluginlink' target=_blank>";
-                echo $wqplugin['title']."</a></td><td width='20'></td>";
-                // echo "<td>".$wqplugin['version']."</td><td width='20'></td>";
+                echo '<tr><td>';
+                    echo '<a href="' . esc_url( $wqplugin['home'] ) . '" class="pluginlink" target="_blank">';
+                    echo esc_html( $wqplugin['title'] ) . '</a>';
+                echo '</td><td width="20"></td>';
+                // echo '<td>' . esc_html( $wqplugin['version'] ) . '</td><td width="20"></td>';
 
                 // --- plugin action select ---
-                echo "<td><select name='".$pluginslug."-action' id='".$pluginslug."-action' style='font-size:8pt;'>";
+                echo '<td><select name="' . esc_attr( $pluginslug ) . '-action" id="' . esc_attr( $pluginslug ) . '-action" style="font-size:8pt;">';
 
                 // 1.6.6: check if only wp.org plugins installable
-                if ($wordpressorgonly && $wqplugin['wporgslug']) {
+                if ( $wq_wordpress_org && $wqplugin['wporgslug'] ) {
                     // --- has a wordpress.org slug so installable from repository ---
-                    echo "<option value='install' selected='selected'>".wqhelper_translate('Install Now')."</option>";
-                    echo "<option value='home'>".wqhelper_translate('Plugin Home')."</option>";
-                } elseif (!$wordpressorgonly && is_array($wqplugin['package'])) {
+                    echo '<option value="install" selected="selected">' . esc_html( wqhelper_translate( 'Install Now' ) ) . '</option>';
+                } elseif ( !$wq_wordpress_org && is_array( $wqplugin['package'] ) ) {
                     // --- not all plugins are from wordpress.org, use the install package ---
-                    echo "<option value='install' selected='selected'>".wqhelper_translate('Install Now')."</option>";
-                    echo "<option value='home'>".wqhelper_translate('Plugin Home')."</option>";
+                    echo '<option value="install" selected="selected">' . esc_html( wqhelper_translate( 'Install Now' ) ) . '</option>';
                 } else {
                     // oops, installation package currently unavailable (404)
-                    echo "<option value='home' selected='selected'>".wqhelper_translate('Plugin Home')."</option>";
-                }
+                    echo '';
+                }
+                echo '<option value="home" selected="selected">' . esc_html( wqhelper_translate( 'Plugin Home' ) ) . '</option>';
                 echo "</select></td><td width='20'></td>";
 
                 // --- plugin action button ---
-                echo "<td><a href='javascript:void(0);' target=_blank id='".$pluginslug."-link' onclick='dopluginaction(\"".$pluginslug."\");'>";
-                echo "<input class='button-secondary' type='button' value='".wqhelper_translate('Go')."'></a></td></tr>";
-            }
-            echo "</table></div></div>";
+                echo '<td>';
+                    echo '<a href="javascript:void(0);" target="_blank" id="' . esc_attr( $pluginslug ) . '-link" onclick="wq_plugin_action(\'' . esc_attr( $pluginslug ) . '\');">';
+                    echo '<input class="button-secondary" type="button" value="' . esc_attr( wqhelper_translate( 'Go' ) ) . '"></a>';
+                echo '</td></tr>';
+            }
+            echo '</table></div></div>';
         }
 
         // Upcoming Plugin Panel
         // ---------------------
-        if (count($unreleasedplugins) > 0) {
-            ksort($unreleasedplugins);
-            if ($wqdebug) {echo "<!-- Unreleased Plugins: "; print_r($unreleasedplugins); echo " -->";}
-            $boxid = 'wordquestupcoming'; $boxtitle = wqhelper_translate('Upcoming WordQuest Plugins');
-            echo '<div id="'.$boxid.'" class="postbox">';
-            echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
-            echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;"><table>';
-            foreach ($unreleasedplugins as $releasetime => $wqplugin) {
+        if ( count( $unreleasedplugins ) > 0 ) {
+            ksort( $unreleasedplugins );
+            if ( $wqdebug ) {
+                // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+                echo "<!-- Unreleased Plugins: " . esc_html( print_r( $unreleasedplugins, true ) ) . " -->";
+            }
+
+            $boxid = 'wordquestupcoming';
+            $boxtitle = wqhelper_translate( 'Upcoming WordQuest Plugins' );
+            echo '<div id="' . esc_attr( $boxid ) . '" class="postbox">';
+            echo '<h2 class="hndle" onclick="wq_togglemetabox(\'' . esc_attr( $boxid ) . '\');">';
+            echo '<span>' . esc_html( $boxtitle ) . '</span></h2>';
+            echo '<div class="inside" id="' . esc_attr( $boxid ) . '-inside" style="margin-bottom:0;"><table>';
+            foreach ( $unreleasedplugins as $releasetime => $wqplugin ) {
                 // $pluginslug = $wqplugin['slug'];
-                echo "<tr><td><a href='".$wqplugin['home']."' class='pluginlink' target=_blank>";
-                echo $wqplugin['title']."</a></td>";
-                echo "<td><span style='font-size:9pt;'>";
-                echo wqhelper_translate('Expected').': '.date('jS F Y', $releasetime);
-                echo "</span></td></tr>";
-            }
-            echo "</table></div></div>";
+                echo '<tr><td>';
+                    echo '<a href="' . esc_url( $wqplugin['home'] ) . '" class="pluginlink" target="_blank">';
+                    echo esc_html( $wqplugin['title'] ) . '</a>';
+                echo '</td><td>';
+                    echo '<span style="font-size:9pt;">';
+                    echo esc_html( wqhelper_translate( 'Expected' ) ) . ': ' . esc_html( date( 'jS F Y', $releasetime ) );
+                    echo '</span>';
+                echo '</td></tr>';
+            }
+            echo '</table></div></div>';
         }
 
         // BioShip Theme Panel
         // -------------------
-        $boxid = 'bioship'; $boxtitle = wqhelper_translate('BioShip Theme Framework');
-        echo '<div id="'.$boxid.'" class="postbox">';
-        echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
-        echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;"><table><tr><td><center>';
-
-        if ($bioshipinstalled) {
+        $boxid = 'bioship';
+        $boxtitle = wqhelper_translate( 'BioShip Theme Framework' );
+        echo '<div id="' . esc_attr( $boxid ) . '" class="postbox">';
+        echo '<h2 class="hndle" onclick="wq_togglemetabox(\'' . esc_attr( $boxid ) . '\');">';
+        echo '<span>' . esc_html( $boxtitle ) . '</span></h2>';
+        echo '<div class="inside" id="' . esc_attr( $boxid ) . '-inside" style="margin-bottom:0;">';
+        echo '<table><tr><td><center>';
+
+        if ( $bioshipinstalled ) {
 
             // --- check if BioShip Theme is active ---
             $theme = wp_get_theme();
-            if ($theme->stylesheet == 'bioship') {
-
-                echo wqhelper_translate('Sweet! You are using').' <b>';
-                echo wqhelper_translate('BioShip Theme Framework').'</b>.<br>';
-                echo wqhelper_translate('Great choice!').' ';
+            // 1.8.0: use public get_stylesheet method
+            if ( 'bioship' == $theme->get_stylesheet() ) {
+
+                echo esc_html( wqhelper_translate( 'Sweet! You are using' ) ) . ' <b>';
+                echo esc_html( wqhelper_translate( 'BioShip Theme Framework' ) ) . '</b>.<br>';
+                echo esc_html( wqhelper_translate( 'Great choice!' ) ) . ' ';
 
                 // 1.6.7: added BioShip Theme Options link here
-                if (THEMETITAN) {$optionsurl = admin_url('admin.php').'?page=bioship-options';}
-                elseif (THEMEOPT) {$optionsurl = admin_url('admin.php').'?page=options-framework';}
-                else {$optionsurl = admin_url('customize.php');}
-                echo '<a href="'.$optionsurl.'">'.wqhelper_translate('Theme Options').'</a>';
-
-            } elseif (is_child_theme() && ($theme->template == 'bioship')) {
-
-                echo wqhelper_translate('Groovy. You are using').' <b>';
-                echo wqhelper_translate('BioShip Framework').'</b>!<br>';
-                echo wqhelper_translate('Your Child Theme is').' <b>'.$theme->Name.'</b><br><br>';
+                if ( THEMETITAN ) {
+                    $optionsurl = admin_url( 'admin.php' ) . '?page=bioship-options';
+                } elseif ( THEMEOPT ) {
+                    $optionsurl = admin_url( 'admin.php' ) . '?page=options-framework';
+                } else {
+                    $optionsurl = admin_url( 'customize.php' );
+                }
+                echo '<a href="' . esc_url( $optionsurl ) . '">' . esc_html( wqhelper_translate( 'Theme Options' ) ) . '</a>';
+
+            } elseif ( is_child_theme() && ( 'bioship' == $theme->get_template() ) ) {
+                // 1.8.0: use public get_template method
+
+                echo esc_html( wqhelper_translate( 'Groovy. You are using' ) ) . ' <b>';
+                echo esc_html( wqhelper_translate( 'BioShip Framework' ) ) . '</b>!<br>';
+                echo esc_html( wqhelper_translate( 'Your Child Theme is' ) ) . ' <b>' . esc_html( $theme->Name ) . '</b><br><br>';
 
                 // 1.6.7: add Child Theme Options link here
-                if (THEMETITAN) {$optionsurl = admin_url('admin.php').'?page=bioship-options';}
-                elseif (THEMEOPT) {$optionsurl = admin_url('admin.php').'?page=options-framework';}
-                else {$optionsurl = admin_url('customize.php');}
-                echo '<a href="'.$optionsurl.'">'.wqhelper_translate('Theme Options').'</a>';
+                if ( THEMETITAN ) {
+                    $optionsurl = admin_url( 'admin.php' ) . '?page=bioship-options';
+                } elseif ( THEMEOPT ) {
+                    $optionsurl = admin_url( 'admin.php' ) . '?page=options-framework';
+                } else {
+                    $optionsurl = admin_url( 'customize.php' );
+                }
+                echo '<a href="' . esc_url( $optionsurl ) . '">' . esc_html( wqhelper_translate( 'Theme Options' ) ) . '</a>';
 
             } else {
 
-                echo wqhelper_translate('Looks like you have BioShip installed!').'<br>';
-                echo '...'.wqhelper_translate('but it is not yet your active theme.').'<br><br>';
+                echo esc_html( wqhelper_translate( 'Looks like you have BioShip installed!' ) ) . '<br>';
+                echo '...' . esc_html( wqhelper_translate( 'but it is not yet your active theme.' ) ) . '<br><br>';
 
                 // --- BioShip Theme activation link ---
-                $activatelink = admin_url('themes.php').'?action=activate&stylesheet=bioship';
-                $activatelink = wp_nonce_url($activatelink, 'switch-theme_bioship');
-                echo '<a href="'.$activatelink.'">'.wqhelper_translate('Click here to activate it now').'</a>.<br><br>';
-
-                // Check for Theme Test Drive
-                echo "<div id='testdriveoptions'>";
-                if (function_exists('themedrive_determine_theme')) {
+                $activatelink = admin_url( 'themes.php' ) . '?action=activate&stylesheet=bioship';
+                $activatelink = wp_nonce_url( $activatelink, 'switch-theme_bioship' );
+                echo '<a href="' . esc_url( $activatelink ) . '">' . esc_html( wqhelper_translate( 'Click here to activate it now' ) ) . '</a>.<br><br>';
+
+                // --- Check for Theme Test Drive ---
+                echo '<div id="testdriveoptions">';
+                if ( function_exists( 'themedrive_determine_theme' ) ) {
 
                     // TODO: a better check here? this actually makes no sense
-                    if (class_exists('TitanFramework')) {
-                        $testdrivelink = admin_url('admin.php').'?page=bioship-options&theme=bioship';
-                    } elseif (function_exists('OptionsFramework_Init')) {
-                        $testdrivelink = admin_url('themes.php').'?page=options-framework&theme=bioship';
-                    } else {$testdrivelink = admin_url('customize.php').'?theme=bioship';}
-                    echo wqhelper_translate('or').', <a href="'.$testdrivelink.'">';
-                    echo wqhelper_translate('take it for a Theme Test Drive').'</a>.';
-
-                } elseif (in_array('theme-test-drive', $installedplugins)) {
+                    // ...as should be using an options page redirect link instead
+                    if ( class_exists( 'TitanFramework' ) ) {
+                        $testdrivelink = admin_url( 'admin.php' ) . '?page=bioship-options&theme=bioship';
+                    } elseif ( function_exists( 'OptionsFramework_Init' ) ) {
+                        $testdrivelink = admin_url( 'themes.php' ) . '?page=options-framework&theme=bioship';
+                    } else {
+                        $testdrivelink = admin_url( 'customize.php' ) . '?theme=bioship';
+                    }
+                    echo esc_html( wqhelper_translate( 'or' ) ) . ', <a href="' . esc_url( $testdrivelink ) . '">';
+                    echo esc_html( wqhelper_translate( 'take it for a Theme Test Drive' ) ) . '</a>.';
+
+                } elseif ( in_array( 'theme-test-drive', $installedplugins ) ) {
 
                     // --- Theme Test Drive plugin activation link ---
-                    $activatelink = admin_url('plugins.php').'?action=activate&plugin='.urlencode('theme-test-drive/themedrive.php');
-                    $activatelink = wp_nonce_url($activatelink,'activate-plugin_theme-test-drive/themedrive.php');
-                    echo wqhelper_translate('or').', <a href="'.$activatelink.'">';
-                    echo wqhelper_translate('activate Theme Test Drive plugin').'</a><br>';
-                    echo wqhelper_translate('to test BioShip without affecting your current site.');
+                    $activatelink = admin_url( 'plugins.php' ) . '?action=activate&plugin=' . rawurlencode( 'theme-test-drive/themedrive.php' );
+                    $activatelink = wp_nonce_url( $activatelink, 'activate-plugin_theme-test-drive/themedrive.php' );
+                    echo esc_html( wqhelper_translate( 'or' ) ) . ', <a href="' . esc_url( $activatelink ) . '">';
+                    echo esc_html( wqhelper_translate( 'activate Theme Test Drive plugin' ) ) . '</a><br>';
+                    echo esc_html( wqhelper_translate( 'to test BioShip without affecting your current site.' ) );
 
                 } else {
 
                     // --- Theme Test Drive plugin installation link ---
-                    $installlink = admin_url('update.php').'?action=install-plugin&plugin=theme-test-drive';
-                    $installlink = wp_nonce_url($installlink, 'install-plugin');
-                    echo wqhelper_translate('or').', <a href="'.$installlink.'">';
-                    echo wqhelper_translate('install Theme Test Drive plugin').'</a><br>';
-                    echo wqhelper_translate('to test BioShip without affecting your current site.');
-
-                }
-                echo "</div>";
-            }
-
-        } else {
-
-            echo wqhelper_translate('Also from').' <b>WordQuest Alliance</b>, '.wqhelper_translate('check out the').'<br>';
-            echo "<a href='".$wqurls['bio']."' target=_blank><b>BioShip Theme Framework</b></a><br>";
-            echo wqhelper_translate('A highly flexible and responsive starter theme').'<br>'.wqhelper_translate('for users, designers and developers.');
-
-        }
-
-        if ( ($theme->template == 'bioship') || ($theme->stylesheet == 'bioship') ) {
-            // 1.7.3: addded missing function prefix
-            if (function_exists('bioship_admin_theme_updates_available')) {
-                $themeupdates = bioship_admin_theme_updates_available();
-                if ($themeupdates != '') {
-                    echo '<div class="update-nag" style="padding:3px 10px;margin:0 0 10px 0;text-align:center;">'.$themeupdates.'</div></font><br>';
-                }
-            }
-
-            // TODO: future link for rating BioShip on wordpress.org theme repository ?
-            // $ratelink = 'https://wordpress.org/support/theme/bioship/reviews/#new-post';
-            // echo '<br><a href="'.$ratelink.'" target=_blank>'.wqhelper_translate('Rate BioShip on WordPress.Org').'</a><br>';
+                    $installlink = admin_url( 'update.php' ) . '?action=install-plugin&plugin=theme-test-drive';
+                    $installlink = wp_nonce_url( $installlink, 'install-plugin' );
+                    echo esc_html( wqhelper_translate( 'or' ) ) . ', <a href="' . esc_url( $installlink ) . '">';
+                    echo esc_html( wqhelper_translate( 'install Theme Test Drive plugin' ) ) . '</a><br>';
+                    echo esc_html( wqhelper_translate( 'to test BioShip without affecting your current site.' ) );
+
+                }
+                echo '</div>';
+            }
+
+        } else {
+
+            // --- BioShip not installed, just provide a link ---
+            echo esc_html( wqhelper_translate( 'Also from' ) ) . ' <b>WordQuest Alliance</b>, ' . esc_html( wqhelper_translate( 'check out the' ) ) . '<br>';
+            echo '<a href="' . esc_url( $wqurls['bio'] ) . '" target="_blank"><b>BioShip Theme Framework</b></a><br>';
+            echo esc_html( wqhelper_translate( 'A highly flexible and responsive starter theme' ) ) . '<br>';
+            echo esc_html( wqhelper_translate( 'for users, designers and developers.' ) );
+
+        }
+
+        // 1.8.0: added missing bioship installed check
+        if ( $bioshipinstalled && isset( $theme ) && is_object( $theme ) ) {
+            if ( ( 'bioship' == $theme->get_template() ) || ( 'bioship' == $theme->get_stylesheet() ) ) {
+                // 1.8.0: use public get_template and get_stylesheet methods
+                // 1.7.3: addded missing function prefix
+                if ( function_exists( 'bioship_admin_theme_updates_available' ) ) {
+                    $themeupdates = bioship_admin_theme_updates_available();
+                    if ( '' != $themeupdates ) {
+                        echo '<div class="update-nag" style="padding:3px 10px;margin:0 0 10px 0;text-align:center;">';
+                        echo wp_kses_post( $themeupdates );
+                        echo '</div></font><br>';
+                    }
+                }
+
+                // TODO: future link for rating BioShip on wordpress.org theme repository ?
+                // $ratelink = 'https://wordpress.org/support/theme/bioship/reviews/#new-post';
+                // echo '<br><a href="' . esc_url( $ratelink ) . '" target="_blank">' . esc_html( wqhelper_translate( 'Rate BioShip on WordPress.Org' ) ) . '</a><br>';
+            }
         }
 
@@ -1376 +1538 @@
         // (only displays if Bioship theme is active)
         // 1.7.3: added missing bioship function prefix
-        if (function_exists('bioship_muscle_bioship_dashboard_feed_widget')) {
+        if ( function_exists( 'bioship_muscle_bioship_dashboard_feed_widget' ) ) {
             // $boxid = 'bioshipfeed'; $boxtitle = wphelper_translate('BioShip News');
             // echo '<div id="'.$boxid.'" class="postbox">';
-            // echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
+            // echo '<h2 class="hndle" onclick="wq_togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
             // echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;">';
-                bioship_muscle_bioship_dashboard_feed_widget(false);
+                bioship_muscle_bioship_dashboard_feed_widget( false );
             // echo '</div></div>';
         }
@@ -1388 +1550 @@
         echo '</div></div>';
 
-    // end column
+    // --- end column ---
     echo '</div>';
  };
@@ -1396 +1558 @@
 // Version Specific Feed Column
 // ----------------------------
-$funcname = 'wqhelper_admin_feeds_column_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
- $wqfunctions[$funcname] = function($args) {
+$funcname = 'wqhelper_admin_feeds_column_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $args ) {
+
+    // 1.8.0: set missing global
+    global $wqurls;
 
     // --- open feeds column ---
@@ -1405 +1570 @@
         // Latest / Next Release
         // ---------------------
-        global $wqreleases; $latestrelease = $nextrelease = '';
-        if (isset($wqreleases['latest'])) {$latestrelease = $wqreleases['latest'];}
-        if (isset($wqreleases['next'])) {$nextrelease = $wqreleases['next'];}
-
-        if (isset($latestrelease) && is_array($latestrelease)) {
-            if ($latestrelease['installed'] == 'no') {
-                $release = $latestrelease; $boxid = 'wordquestlatest'; $boxtitle = wqhelper_translate('Latest Release');
-            } else {$release = $nextrelease; $boxid = 'wordquestupcoming'; $boxtitle = wqhelper_translate('Upcoming Release');}
-        } elseif (isset($nextrelease) && is_array($nextrelease)) {
-            $release = $nextrelease; $boxid = 'wordquestupcoming'; $boxtitle = wqhelper_translate('Upcoming Release');
-        }
-
-        if (isset($release) && is_array($release)) {
-
-            echo '<div id="'.$boxid.'" class="postbox">';
-            echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
-            echo '<div class="inside" id="'.$boxid.'-inside"><table>';
-            echo "<table><tr><td align='center'><img src='".$release['icon']."' width='100' height='100'><br>";
-            echo "<a href='".$latestrelease['home']."' target=_blank><b>".$release['title']."</b></a></td><td width='10'></td>";
-            echo "<td><span style='font-size:9pt;'>".$release['description']."</span><br><br>";
-
-            if (isset($release['package']) && is_array($release['package'])) {
-                // 1.6.6: check for wordpress.org only installs
-                global $wordpressorgonly; $installlink = false;
-                if ($wordpressorgonly && $release['wporgslug']) {
-                    $installlink = self_admin_url('update.php')."?action=install-plugin&plugin=".$release['wporgslug'];
-                    $installlink = wp_nonce_url($installlink, 'install-plugin_'.$release['wporgslug']);
-                } else {
-                    $installlink = admin_url('update.php')."?action=wordquest_plugin_install&plugin=".$release['slug'];
-                    $installlink = wp_nonce_url($installlink, 'plugin-upload');
-                }
-
-                if ($installlink) {
-                    echo "<input type='hidden' name='".$release['slug']."-install-link' value='".$installlink."'>";
-                    echo "<center><a href='".$installlink."' class='button-primary'>".wqhelper_translate('Install Now')."</a></center>";
-                } else {
-                    $pluginlink = $wqurls['wq'].'/plugins/'.$release['slug'];
-                    echo "<center><a href='".$pluginlink."' class='button-primary' target=_blank>&rarr; ".wqhelper_translate('Plugin Home')."</a></center>";
-                }
-            } else {echo "<center>".wqhelper_translate('Expected').": ".date('jS F Y',strtotime($release['releasedate']));}
-            echo "</td></tr></table>";
+        global $wqreleases;
+        $latestrelease = $nextrelease = '';
+        if ( isset( $wqreleases['latest'] ) ) {
+            $latestrelease = $wqreleases['latest'];
+        }
+        if ( isset( $wqreleases['next'] ) ) {
+            $nextrelease = $wqreleases['next'];
+        }
+
+        if ( isset( $latestrelease ) && is_array( $latestrelease ) ) {
+            if ( 'no' == $latestrelease['installed'] ) {
+                $release = $latestrelease;
+                $boxid = 'wordquestlatest';
+                $boxtitle = wqhelper_translate( 'Latest Release' );
+            } else {
+                $release = $nextrelease;
+                $boxid = 'wordquestupcoming';
+                $boxtitle = wqhelper_translate( 'Upcoming Release' );
+            }
+        } elseif ( isset( $nextrelease ) && is_array( $nextrelease ) ) {
+            $release = $nextrelease;
+            $boxid = 'wordquestupcoming';
+            $boxtitle = wqhelper_translate( 'Upcoming Release' );
+        }
+
+        if ( isset( $release ) && is_array( $release ) ) {
+
+            echo '<div id="' . esc_attr( $boxid ) . '" class="postbox">';
+            echo '<h2 class="hndle" onclick="wq_togglemetabox(\'' . esc_attr( $boxid ) . '\');">';
+            echo '<span>' . esc_html( $boxtitle ) . '</span></h2>';
+            echo '<div class="inside" id="' . esc_attr( $boxid ) . '-inside"><table>';
+
+                echo '<table><tr><td align="center">';
+                    echo '<img src="' . esc_url( $release['icon'] ) . '" width="100" height="100" alt="' . esc_attr( wqhelper_translate( 'Latest Release Icon' ) ) . '"><br>';
+                    echo '<a href="' . esc_url( $latestrelease['home'] ) . '" target="_blank"><b>' . esc_html( $release['title'] ) . '</b></a>';
+                echo '</td><td width="10"></td><td>';
+                    echo '<span style="font-size:9pt;">' . esc_html( $release['description'] ) . '</span><br><br>';
+
+                    if ( isset( $release['package'] ) && is_array( $release['package'] ) ) {
+                        // 1.6.6: check for wordpress.org only installs
+                        global $wq_wordpress_org;
+                        $installlink = false;
+                        if ( $wq_wordpress_org && $release['wporgslug'] ) {
+                            $installlink = self_admin_url( 'update.php' ) . '?action=install-plugin&plugin=' . $release['wporgslug'];
+                            $installlink = wp_nonce_url( $installlink, 'install-plugin_' . $release['wporgslug'] );
+                        } else {
+                            $installlink = admin_url( 'update.php' ) . '?action=wordquest_plugin_install&plugin=' . $release['slug'];
+                            $installlink = wp_nonce_url( $installlink, 'plugin-upload' );
+                        }
+
+                        if ( $installlink ) {
+                            echo '<input type="hidden" name="' . esc_attr( $release['slug'] ) . '-install-link" value="' . esc_url( $installlink ) . '">';
+                            echo '<center><a href="' . esc_url( $installlink ) . '" class="button-primary">' . esc_html( wqhelper_translate( 'Install Now' ) ) . '</a></center>';
+                        } else {
+                            $pluginlink = $wqurls['wq'] . '/plugins/' . $release['slug'];
+                            echo '<center><a href="' . esc_url( $pluginlink ) . '" class="button-primary" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Plugin Home' ) ) . '</a></center>';
+                        }
+                    } else {
+                        echo '<center>' . esc_html( wqhelper_translate( 'Expected' ) ) . ': ' . esc_html( date( 'jS F Y', strtotime( $release['releasedate'] ) ) );
+                    }
+                echo '</td></tr></table>';
             echo '</table></div></div>';
         }
@@ -1451 +1636 @@
         // WordQuest Feed
         // --------------
-        $boxid = 'wordquestfeed'; $boxtitle = wqhelper_translate('WordQuest News');
-        if (function_exists('wqhelper_dashboard_feed_widget')) {
-            echo '<div id="'.$boxid.'" class="postbox">';
-            echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
-            echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;">';
+        $boxid = 'wordquestfeed';
+        $boxtitle = wqhelper_translate( 'WordQuest News' );
+        if ( function_exists( 'wqhelper_dashboard_feed_widget' ) ) {
+            echo '<div id="' . esc_attr( $boxid ) . '" class="postbox">';
+            echo '<h2 class="hndle" onclick="wq_togglemetabox(\'' . esc_attr( $boxid ) . '\');">';
+            echo '<span>' . esc_html( $boxtitle ) . '</span></h2>';
+            echo '<div class="inside" id="' . esc_attr( $boxid ) . '-inside" style="margin-bottom:0;">';
                 wqhelper_dashboard_feed_widget();
             echo '</div></div>';
@@ -1462 +1649 @@
         // Editors Picks
         // -------------
-        $boxid = 'recommendations'; $boxtitle = wqhelper_translate('Editor Picks');
+        $boxid = 'recommendations';
+        $boxtitle = wqhelper_translate( 'Editor Picks' );
         // TODO: Recommended Plugins via Plugin Review?
         // echo '<div id="'.$boxid.'" class="postbox">';
-        // echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
+        // echo '<h2 class="hndle" onclick="wq_togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
         // echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;"><table>';
         //  echo "Recommended Plugins...";
@@ -1473 +1661 @@
         // PluginReview Feed
         // -----------------
-        $boxid = 'pluginreviewfeed'; $boxtitle = wqhelper_translate('Plugin Reviews');
-        if (function_exists('wqhelper_pluginreview_feed_widget')) {
-            echo '<div id="'.$boxid.'" class="postbox">';
-            echo '<h2 class="hndle" onclick="togglemetabox(\''.$boxid.'\');"><span>'.$boxtitle.'</span></h2>';
-            echo '<div class="inside" id="'.$boxid.'-inside" style="margin-bottom:0;">';
+        $boxid = 'pluginreviewfeed';
+        $boxtitle = wqhelper_translate( 'Plugin Reviews' );
+        if ( function_exists( 'wqhelper_pluginreview_feed_widget' ) ) {
+            echo '<div id="' . esc_attr( $boxid ) . '" class="postbox">';
+            echo '<h2 class="hndle" onclick="wq_togglemetabox(\'' . esc_attr( $boxid ) . '\');">';
+            echo '<span>' . esc_html( $boxtitle ) . '</span></h2>';
+            echo '<div class="inside" id="' . esc_attr( $boxid ) . '-inside" style="margin-bottom:0;">';
                 wqhelper_pluginreview_feed_widget();
             echo '</div></div>';
@@ -1483 +1673 @@
 
     // --- close column ---
-    echo "</div>";
+    echo '</div>';
 
     // --- enqueue feed javascript ---
-    if (!has_action('admin_footer', 'wqhelper_dashboard_feed_javascript')) {
-        add_action('admin_footer', 'wqhelper_dashboard_feed_javascript');
+    if ( !has_action( 'admin_footer', 'wqhelper_dashboard_feed_javascript' ) ) {
+        add_action( 'admin_footer', 'wqhelper_dashboard_feed_javascript' );
     }
 
@@ -1496 +1686 @@
 // Version Specific Admin Styles
 // -----------------------------
-$funcname = 'wqhelper_admin_styles_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_admin_styles_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
 
     // --- hide Wordquest plugin freemius submenu items if top level admin menu not open ---
     echo "<style>#toplevel_page_wordquest a.wp-first-item:after {content: ' Alliance';}
-        #toplevel_page_wordquest.wp-not-current-submenu .fs-submenu-item
-            {display: none; line-height: 0px; height: 0px;}
-    #toplevel_page_wordquest li.wp-first-item {margin-bottom: 5px; margin-left: -10px;}
-    span.fs-submenu-item.fs-sub {display: none;}
-        .current span.fs-submenu-item.fs-sub {display: block;}
-        #wpfooter {display:none !important;}
-    </style>";
+    #toplevel_page_wordquest.wp-not-current-submenu .fs-submenu-item {display: none; line-height: 0px; height: 0px;}
+    #toplevel_page_wordquest li.wp-first-item {margin-bottom: 5px; margin-left: -10px;}
+    span.fs-submenu-item.fs-sub {display: none;}
+    .current span.fs-submenu-item.fs-sub {display: block;}
+    #wpfooter {display:none !important;}</style>";
  };
 }
@@ -1515 +1703 @@
 // Version Specific Admin Script
 // -----------------------------
-$funcname = 'wqhelper_admin_scripts_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_admin_scripts_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
 
-    // --- wordquest admin submenu icon and styling fixes ---
+    // --- wordquest admin submenu icon and styling fixes ---
+    // 1.7.9: change margin-left to padding-left on link
+    // 1.7.9: added margin left and top to icon
+    // 1.8.0: fix insertBefore(this) to insertBefore(jQuery(this))
     echo "<script>function wordquestsubmenufix(slug,iconurl,current) {
         jQuery('li a').each(function() {
@@ -1525 +1716 @@
             if (position > -1) {
                 linkref = this.href.substr(position);
-                jQuery(this).css('margin-left','10px');
+                jQuery(this).css('padding-left','10px');
                 if (linkref == 'admin.php?page='+slug) {
-                    jQuery('<img src=\"'+iconurl+'\" style=\"float:left;\">').insertBefore(this);
+                    jQuery('<img src=\"'+iconurl+'\" style=\"float:left;margin-left:3px;margin-top:3px;\">').insertBefore(jQuery(this));
                     jQuery(this).css('margin-top','-3px');
                 } else {if (current == 1) {
@@ -1546 +1737 @@
 // --------------------------
 // 1.6.5: hook to update.php update-custom_{ACTION} where ACTION = 'wordquest_plugin_install'
-add_action('update-custom_wordquest_plugin_install', 'wqhelper_install_plugin');
-
-$funcname = 'wqhelper_install_plugin_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+add_action( 'update-custom_wordquest_plugin_install', 'wqhelper_install_plugin' );
+
+$funcname = 'wqhelper_install_plugin_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
 
@@ -1555 +1746 @@
 
     // --- check permissions and nonce ---
-    if (!current_user_can('upload_plugins')) {
-        wp_die( wqhelper_translate('Sorry, you are not allowed to install plugins on this site.') );
-    }
-    check_admin_referer('plugin-upload');
+    if ( !current_user_can( 'upload_plugins' ) ) {
+        wp_die( esc_html( wqhelper_translate( 'Sorry, you are not allowed to install plugins on this site.' ) ) );
+    }
+    check_admin_referer( 'plugin-upload' );
 
     // --- get the package info from download server ---
-    if (!isset($_REQUEST['plugin'])) {wp_die( wqhelper_translate('Error: No Plugin specified.') );}
-    $pluginslug = $_REQUEST['plugin'];
+    if ( !isset( $_REQUEST['plugin'] ) ) {
+        wp_die( esc_html( wqhelper_translate( 'Error: No Plugin specified.' ) ) );
+    }
     // 1.5.9: sanitize plugin slug
-    $pluginslug = sanitize_title($pluginslug);
-    if ($pluginslug == '') {wp_dir( wqhelper_translate('Error: Invalid Plugin slug specified.') );}
+    // 1.8.1: combined sanitize_title on same line
+    $pluginslug = sanitize_title( $_REQUEST['plugin'] );
+    if ( '' == $pluginslug ) {
+        wp_die( esc_html( wqhelper_translate( 'Error: Invalid Plugin slug specified.' ) ) );
+    }
 
     // --- get the plugin package data ---
-    $url = $wqurls['wq'].'/downloads/?action=get_metadata&slug='.$pluginslug;
-    $response = wp_remote_get($url, array('timeout' => 30));
-    if (!is_wp_error($response)) {
-        if ($response['response']['code'] == '404') {
+    $url = $wqurls['wq'] . '/downloads/?action=get_metadata&slug=' . $pluginslug;
+    $response = wp_remote_get( $url, array( 'timeout' => 30 ) );
+    if ( !is_wp_error( $response ) ) {
+        if ( '404' == $response['response']['code'] ) {
             // --- on failure try to get package info from stored transient data ---
-            $plugininfo = get_transient('wordquest_plugin_info');
-            if (is_array($pluginfo)) {
-                foreach ($plugininfo as $plugin) {
-                    if ($plugin['slug'] == $pluginslug) {$pluginpackage = $plugin['package'];}
-                }
-            }
-        } else {$pluginpackage = json_decode($response['body'], true);}
-    }
-
-    if (!isset($pluginpackage)) {
-        if (is_ssl()) {$tryagainurl = 'https://';} else {$tryagainurl = 'http://';}
-        $tryagainurl .= $_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'].'?'.$_SERVER['QUERY_STRING'];
-        $message = wqhelper_translate('Failed to retrieve download package information.');
-        $message .= ' <a href="'.$tryagainurl.'">'.wqhelper_translate('Click here to try again.').'</a>';
-        wp_die($message);
-    }
-
-    // 1.6.5: pass the package download URL to Wordpress to do the rest
+            $plugininfo = get_transient( 'wordquest_plugin_info' );
+            // 1.8.0: fix to variable typo pluginfo
+            if ( is_array( $plugininfo ) ) {
+                foreach ( $plugininfo as $plugin ) {
+                    if ( $plugin['slug'] == $pluginslug ) {
+                        $pluginpackage = $plugin['package'];
+                    }
+                }
+            }
+        } else {
+            $pluginpackage = json_decode( $response['body'], true );
+        }
+    }
+
+    if ( !isset( $pluginpackage ) ) {
+        $protocol = is_ssl() ? 'https://' : 'http://';
+        // 1.8.2: add sanitize_text_field to $_SERVER['HTTP_HOST']
+        $tryagainurl = $protocol . sanitize_text_field( $_SERVER['HTTP_HOST'] ) . $_SERVER['PHP_SELF'] . '?' . $_SERVER['QUERY_STRING'];
+        $message = esc_html( wqhelper_translate( 'Failed to retrieve download package information.' ) );
+        $message .= ' <a href="' . esc_url( $tryagainurl ) . '">';
+        $message .= esc_html( wqhelper_translate( 'Click here to try again.' ) ) . '</a>';
+        // 1.8.1: use wp_kses_post on message
+        wp_die( wp_kses_post( $message ) );
+    }
+
+    // 1.6.5: pass the package download URL to WordPress to do the rest
 
     // --- set the Plugin_Installer_Skin arguments ---
     $url = $pluginpackage['download_url'];
-    $title = sprintf( wqhelper_translate('Installing Plugin from URL: %s'), esc_html($url) );
+    $title = sprintf( wqhelper_translate( 'Installing Plugin from URL: %s' ), esc_html( $url ) );
     $nonce = 'plugin-upload';
     $type = 'web';
-    $args = compact('type', 'title', 'nonce', 'url');
+    // 1.8.0: disuse compact function
+    // $args = compact( 'type', 'title', 'nonce', 'url' );
+    $args = array(
+        'type' => 'web',
+        'title' => $title,
+        'nonce' => 'plugin-upload',
+        'url' => $url,
+    );
 
     // --- custom Plugin_Upgrader (via /wp-admin/upgrade.php) ---
-    $title = wqhelper_translage('Upload Plugin');
-    $parent_file = 'plugins.php'; $submenu_file = 'plugin-install.php';
-    require_once(ABSPATH . 'wp-admin/admin-header.php');
+    // 1.8.0: fix to function typo wqhelper_translate
+    $title = wqhelper_translate( 'Upload Plugin' );
+    $parent_file = 'plugins.php';
+    $submenu_file = 'plugin-install.php';
+    require_once ABSPATH . 'wp-admin/admin-header.php';
     $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( $args ) );
-    $result = $upgrader->install($url);
-    include(ABSPATH . 'wp-admin/admin-footer.php');
+    $result = $upgrader->install( $url );
+    include ABSPATH . 'wp-admin/admin-footer.php';
 
  };
@@ -1618 +1830 @@
 // Main Floatbox Function
 // ----------------------
-$funcname = 'wqhelper_sidebar_floatbox_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
- $wqfunctions[$funcname] = function($args) {
+$funcname = 'wqhelper_sidebar_floatbox_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $args ) {
 
     global $wqdebug, $wqurls;
-    if ($wqdebug) {echo "<!-- Sidebar Args: "; print_r($args); echo " -->";}
-
-    if (count($args) == 7) {
+    if ( $wqdebug ) {
+        // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+        echo "<!-- Sidebar Args: " . esc_html( print_r( $args, true ) ) . " -->";
+    }
+
+    if ( count( $args ) == 7 ) {
+
         // --- the old way, sending all args individually ---
-        $prefix = $args[0]; $pluginslug = $args[1]; $freepremium = $args[2];
-        $wporgslug = $args[3]; $savebutton = $args[4];
-        $plugintitle = $args[5]; $pluginversion = $args[6];
+        $prefix = $args[0];
+        $pluginslug = $slug = $args[1];
+        $freepremium = $args[2];
+        $wporgslug = $args[3];
+        $savebutton = $args[4];
+        $plugintitle = $args[5];
+        $pluginversion = $args[6];
+
     } else {
+
         // --- the new way, just sending two args ---
         $pluginslug = $slug = $args[0];
@@ -1641 +1863 @@
         $prefix = $wordquestplugins[$slug]['settings'];
         // 1.7.7: added isset check for plan key for back-compat
-        if (isset($wordquestplugins[$slug]['plan'])) {
+        if ( isset( $wordquestplugins[$slug]['plan'] ) ) {
             $freepremium = $wordquestplugins[$slug]['plan'];
         } else {
@@ -1648 +1870 @@
         $wporg = $wordquestplugins[$slug]['wporg'];
 
-        if (isset($wordquestplugins[$slug]['wporgslug'])) {
+        if ( isset( $wordquestplugins[$slug]['wporgslug'] ) ) {
             $wporgslug = $wordquestplugins[$slug]['wporgslug'];
-        } else {$wporgslug = '';}
-
-        // --- get donate link ---
-        // 1.7.4: get donate link and set author
-        // 1.7.6: fix to check if donate key is defined
+        } else {
+            $wporgslug = '';
+        }
+
+        // --- get donate link ---
+        // 1.7.4: get donate link and set author
+        // 1.7.6: fix to check if donate key is defined
         $author = 'wordquest';
-        if (isset($wordquestplugins[$slug]['donate'])) {
-            $donatelink = $wordquestplugins[$slug]['donate'];
-            echo "<!-- Donate Link: ".$donatelink." -->";
-            if (strstr($donatelink, 'wpmedic')) {$author = 'wpmedic';}
-        }
-
-        if ($wqdebug) {echo "<!-- Sidebar Plugin Info: "; print_r($wordquestplugins[$slug]); echo "-->";}
+        if ( isset( $wordquestplugins[$slug]['donate'] ) ) {
+                $donatelink = $wordquestplugins[$slug]['donate'];
+            if ( strstr( $donatelink, 'wpmedic' ) ) {
+                $author = 'wpmedic';
+            }
+        }
+
+        if ( $wqdebug ) {
+            echo "<!-- Sidebar Plugin Info: " . esc_html( $wordquestplugins[$slug] ) . "-->";
+        }
+    }
+
+    // --- set which boxes to show ---
+    $boxes = array( 'donate', 'subscribe', 'recommend' ); // 'report', 'testimonials'
+    $boxes = apply_filters( $prefix . '_display_sidebar_boxes', $boxes );
+    if ( $wqdebug ) {
+        // phpcs:ignore WordPress.PHP.DevelopmentFunctions
+        echo "<!-- Sidebar Boxes: " . esc_html( print_r( $boxes, true ) ) . " -->";
     }
 
     // 1.5.0: get/convert to single array of plugin sidebar options
     // 1.6.0: fix to sidebar options variable
-    $sidebaroptions = get_option($prefix.'_sidebar_options');
-    if ( ($sidebaroptions == '') || !is_array($sidebaroptions) ) {
-        $sidebaroptions['installdate'] = date('Y-m-d');
-        $sidebaroptions['adsboxoff'] = get_option($prefix.'_ads_box_off');
-        $sidebaroptions['donationboxoff'] = get_option($prefix.'_donation_box_off');
-        $sidebaroptions['reportboxoff'] = get_option($prefix.'_report_box_off');
-        delete_option($prefix.'_ads_box_off'); delete_option($prefix.'_donation_box_off'); delete_option($prefix.'_report_box_off');
-        add_option($prefix.'_sidebar_options', $sidebaroptions);
+    $sidebaroptions = get_option( $prefix . '_sidebar_options' );
+    if ( !$sidebaroptions || ( '' == $sidebaroptions ) || !is_array( $sidebaroptions ) ) {
+        $sidebaroptions = array(
+            'installdate'       => date( 'Y-m-d' ),
+            'adsboxoff'     => get_option( $prefix . '_ads_box_off' ),
+            'donationboxoff'    => get_option( $prefix . '_donation_box_off' ),
+            'reportboxoff'      => get_option( $prefix . '_report_box_off' ),
+            'subscribeboxoff'   => '',
+            // 'testimonialboxoff'  => '',
+        );
+        delete_option( $prefix . '_ads_box_off' );
+        delete_option( $prefix . '_donation_box_off' );
+        delete_option( $prefix . '_report_box_off' );
+        update_option( $prefix . '_sidebar_options', $sidebaroptions );
     }
     // 1.6.9: fix to possible undefined keys
-    if (!isset($sidebaroptions['installdate'])) {$sidebaroptions['installdate'] = date('Y-m-d');}
-    if (!isset($sidebaroptions['adsboxoff'])) {$sidebaroptions['adsboxoff'] = '';}
-    if (!isset($sidebaroptions['donationboxoff'])) {$sidebaroptions['donationboxoff'] = '';}
-    if (!isset($sidebaroptions['reportboxoff'])) {$sidebaroptions['reportboxoff'] = '';}
+    $changed = false;
+    if ( !isset( $sidebaroptions['installdate'] ) ) {
+        $sidebaroptions['installdate'] = date( 'Y-m-d' );
+        $changed = true;
+    }
+    if ( !isset( $sidebaroptions['donationboxoff'] ) ) {
+        $sidebaroptions['donationboxoff'] = '';
+        $changed = true;
+    }
+    if ( !isset( $sidebaroptions['subscribeboxoff'] ) ) {
+        $sidebaroptions['subscribeboxoff'] = '';
+        $changed = true;
+    }
+    // if ( !isset( $sidebaroptions['testimonialboxoff' ) ) {
+    //  $sidebaroptions['testimonialboxoff'] = '';
+    //  $changed = true;
+    // }
+    if ( !isset( $sidebaroptions['reportboxoff'] ) ) {
+        $sidebaroptions['reportboxoff'] = '';
+        $changed = true;
+    }
+    if ( !isset( $sidebaroptions['adsboxoff'] ) ) {
+        $sidebaroptions['adsboxoff'] = '';
+        $changed = true;
+    }
+    update_option( $prefix, '_sidebar_options', $sidebaroptions );
 
     // --- sidebar scripts ---
-    echo "<script language='javascript' type='text/javascript'>
-    function hidesidebarsaved() {document.getElementById('sidebarsaved').style.display = 'none';}
-    function doshowhidediv(divname) {
+    // 1.7.8: fix to sticky kit recalc function check (sticky_in_parent)
+    echo "<script>
+    function wq_hide_sidebar_saved() {document.getElementById('sidebarsaved').style.display = 'none';}
+    function wq_showhide_div(divname) {
         if (document.getElementById(divname).style.display == 'none') {document.getElementById(divname).style.display = '';}
         else {document.getElementById(divname).style.display = 'none';}
-        if (typeof sticky_in_parent === 'function') {jQuery(document.body).trigger('sticky_kit:recalc');}
+        if (typeof stick_in_parent === 'function') {jQuery(document.body).trigger('sticky_kit:recalc');}
     }</script>";
 
@@ -1700 +1964 @@
     // --- open sidebar div --
     echo '<div id="floatdiv" class="floatbox">';
-    if ($wqdebug) {echo '<!-- WQ Helper Loaded From: '.dirname(__FILE__).' -->';}
+    if ( $wqdebug ) {
+        echo '<!-- WQ Helper Loaded From: ' . esc_html( dirname( __FILE__ ) ) . ' -->';
+    }
 
     // --- call (optional) Plugin Sidebar Header ---
-    $funcname = $prefix.'_sidebar_plugin_header';
-    if (function_exists($funcname)) {call_user_func($funcname);}
+    $funcname = $prefix . '_sidebar_plugin_header';
+    if ( function_exists( $funcname ) ) {
+        call_user_func( $funcname );
+    }
 
     // Save Settings Button
     // --------------------
-    if ($savebutton != 'replace') {
+    if ( 'replace' != $savebutton ) {
 
         echo '<div id="savechanges"><div class="stuffbox" style="width:250px;background-color:#ffffff;">';
-        echo '<h3>'.wqhelper_translate('Update Settings').'</h3><div class="inside"><center>';
-
-        if ($savebutton == 'yes') {
-            $buttonoutput = "<script>function sidebarsavepluginsettings() {jQuery('#plugin-settings-save').trigger('click');}</script>";
-            $buttonoutput .= "<table><tr>";
-            $buttonoutput .= "<td align='center'><input id='sidebarsavebutton' onclick='sidebarsavepluginsettings();' type='button' class='button-primary' value='Save Settings'></td>";
-            $buttonoutput .= "<td width='30'></td>";
-            $buttonoutput .= "<td><div style='line-height:1em;'><font style='font-size:8pt;'><a href='javascript:void(0);' style='text-decoration:none;' onclick='doshowhidediv(\"sidebarsettings\");hidesidebarsaved();'>".wqhelper_translate('Sidebar')."<br>";
-            $buttonoutput .= wqhelper_translate('Options')."</a></font></div></td>";
-            $buttonoutput .= "</tr></table>";
-            $buttonoutput = apply_filters('wordquest_sidebar_save_button', $buttonoutput);
-            echo $buttonoutput;
-        }   elseif ($savebutton == 'no') {echo "";}
-        else {echo "<div style='line-height:1em;text-align:center;'><font style='font-size:8pt;'><a href='javascript:void(0);' style='text-decoration:none;' onclick='doshowhidediv(\"sidebarsettings\");hidesidebarsaved();'>".wqhelper_translate('Sidebar Options')."</a></font></div>";}
+        echo '<h3>' . esc_html( wqhelper_translate( 'Update Settings' ) ) . '</h3>';
+        echo '<div class="inside"><center>';
+
+        $savebuttontrigger = $sidebaroptionsbutton = false;
+        if ( 'yes' == $savebutton ) {
+
+            $savebuttontrigger = $sidebaroptionsbutton = true;
+
+            // --- set button output ---
+            // 1.8.1: remove onclick attributes from buttons to script
+            $button = '<table><tr>';
+                $button .= '<td align="center">';
+                    $button .= '<input id="sidebarsavebutton" type="button" class="button-primary" value="Save Settings">';
+                $button .= '</td><td width="30"></td><td>';
+                    $button .= '<div style="line-height:1em;"><font style="font-size:8pt;"><a href="javascript:void(0);" id="sidebaroptionsbutton" style="text-decoration:none;">' . esc_html( wqhelper_translate( 'Sidebar' ) ) . '<br>';
+                    $button .= esc_html( wqhelper_translate( 'Options' ) ) . '</a></font></div>';
+                $button .= '</td>';
+            $button .= '</tr></table>';
+            $button = apply_filters( 'wordquest_sidebar_save_button', $button, $pluginslug );
+            // 1.8.1: use wp_kses_post on button
+            echo wp_kses_post( $button );
+
+        } elseif ( 'no' == $savebutton ) {
+
+            echo '';
+
+        } else {
+
+            // --- show sidebar save options only ---
+            $sidebaroptionsbutton = true;
+            echo '<div style="line-height:1em;text-align:center;">';
+                echo '<font style="font-size:8pt;"><a href="javascript:void(0);" id="sidebaroptionsbutton" style="text-decoration:none;">' . esc_html( wqhelper_translate( 'Sidebar Options' ) ) . '</a></font>';
+            echo '</div>';
+
+        }
+
+        if ( $savebuttontrigger || $sidebaroptionsbutton ) {
+            // 1.8.1: output script function directly
+            // echo "<script>function wq_sidebar_save_settings() {jQuery('#plugin-settings-save').trigger('click');}</script>";
+            echo "<script>";
+                if ( $savebuttontrigger ) {
+                    echo "jQuery('#sidebarsavebutton').on('click', function() {" . PHP_EOL;
+                    echo "  jQuery('#plugin-settings-save').trigger('click');" . PHP_EOL;
+                    echo "});" . PHP_EOL;
+                }
+                if ( $sidebaroptionsbutton ) {
+                    echo "jQuery('#sidebaroptionsbutton').on('click', function() {" . PHP_EOL;
+                    echo "wq_showhide_div('sidebarsettings'); wq_hide_sidebar_saved();" . PHP_EOL;
+                    echo "});" . PHP_EOL;
+                }
+            echo "</script>";
+        }
 
         // --- sidebar settings box ---
-        echo "<div id='sidebarsettings' style='display:none;'><br>";
-
+        echo '<div id="sidebarsettings" style="display:none;"><br>';
+
+            // 1.6.0: added version matching form field
+            // 1.6.5: added nonce field
             global $wordquesthelper;
-            echo "<form action='".admin_url('admin-ajax.php')."' target='savesidebar' method='post'>";
-            // 1.6.5: added nonce field
-            wp_nonce_field($prefix.'_sidebar');
-            echo "<input type='hidden' name='action' value='wqhelper_update_sidebar_boxes'>";
-            // 1.6.0: added version matching form field
-            echo "<input type='hidden' name='wqhv' value='".$wordquesthelper."'>";
-            echo "<input type='hidden' name='sidebarprefix' value='".$prefix."'>";
-            echo "<table><tr><td align='center'>";
-            echo "<b>".wqhelper_translate('I rock! I have made a donation.')."</b><br>(".wqhelper_translate('hides donation box').")</td><td width='10'></td>";
-            echo "<td align='center'><input type='checkbox' name='".$prefix."_donation_box_off' value='checked'";
-            if ($sidebaroptions['donationboxoff'] == 'checked') {echo " checked>";} else {echo ">";}
-            echo "</td></tr>";
-
-            echo "<tr><td align='center'>";
-            echo "<b>".wqhelper_translate("I've got your report, you")."<br>".wqhelper_translate('can stop bugging me now.')." :-)</b><br>(".wqhelper_translate('hides report box').")</td><td width='10'></td>";
-            echo "<td align='center'><input type='checkbox' name='".$prefix."_report_box_off' value='checked'";
-            if ($sidebaroptions['reportboxoff'] == 'checked') {echo " checked>";} else {echo ">";}
-            echo "</td></tr>";
-
-            echo "<tr><td align='center'>";
-            echo "<b>".wqhelper_translate('My site is so awesome it')."<br>"._("doesn't need any more quality")."<br>".wqhelper_translate('plugin recommendations').".</b><br>(".wqhelper_translate('hides sidebar ads.').")</td><td width='10'></td>";
-            echo "<td align='center'><input type='checkbox' name='".$prefix."_ads_box_off' value='checked'";
-            // 1.6.5: fix to undefined index warning
-            if ($sidebaroptions['adsboxoff'] == 'checked') {echo " checked>";} else {echo ">";}
-            echo "</td></tr></table><br>";
-
-            echo "<center><input type='submit' class='button-secondary' value='".wqhelper_translate('Save Sidebar Options')."'></center></form><br>";
-            echo "<iframe src='javascript:void(0);' name='savesidebar' id='savesidebar' width='200' height='200' style='display:none;'></iframe>";
-
-            echo "<div id='sidebarsaved' style='display:none;'>";
-            echo "<table style='background-color: lightYellow; border-style:solid; border-width:1px; border-color: #E6DB55; text-align:center;'>";
-            echo "<tr><td><div class='message' style='margin:0.25em;'><font style='font-weight:bold;'>";
-            echo wqhelper_translate('Sidebar Options Saved.')."</font></div></td></tr></table></div>";
-
-        echo "</div></center>";
+            echo '<form action="' . esc_url( admin_url( 'admin-ajax.php' ) ) . '" target="savesidebar" method="post">';
+            wp_nonce_field( $prefix . '_sidebar' );
+            echo '<input type="hidden" name="action" value="wqhelper_update_sidebar_boxes">';
+            echo '<input type="hidden" name="wqhv" value="' . esc_attr( $wordquesthelper ) . '">';
+            echo '<input type="hidden" name="sidebarprefix" value="' . esc_attr( $prefix ) . '">';
+
+            // --- donation box option ---
+            if ( in_array( 'donate', $boxes ) ) {
+                echo '<table><tr><td align="center">';
+                    echo '<b>' . esc_html( wqhelper_translate( 'Hide Support Offer' ) ) . '</b></td>';
+                echo '<td width="10"></td><td align="center">';
+                    echo '<input type="checkbox" name="' . esc_attr( $prefix ) . '_donation_box_off" value="checked"';
+                    if ( 'checked' == $sidebaroptions['donationboxoff'] ) {
+                        echo ' checked="checked">';
+                    }
+                    echo '>';
+                echo '</td></tr>';
+            }
+
+            // --- report box option ---
+            if ( in_array( 'report', $boxes ) ) {
+                echo '<tr><td align="center">';
+                    echo '<b>' . esc_html( wqhelper_translate( 'Hide Report Offer' ) ) . '</b>';
+                echo '</td><td width="10"></td><td align="center">';
+                    echo '<input type="checkbox" name="' . esc_attr( $prefix ) . '_report_box_off" value="checked"';
+                    if ( 'checked' == $sidebaroptions['reportboxoff'] ) {
+                        echo ' checked="checked">';
+                    }
+                    echo '>';
+                echo '</td></tr>';
+            }
+
+            // --- subscribe box option ---
+            if ( in_array( 'subscribe', $boxes ) ) {
+                echo '<tr><td align="center">';
+                    echo '<b>' . esc_html( wqhelper_translate( 'Hide Subscribe Offer' ) ) . '</b>';
+                echo '</td><td width="10"></td><td align="center">';
+                    echo '<input type="checkbox" name="' . esc_attr( $prefix ) . '_subscribe_box_off" value="checked"';
+                    if ( 'checked' == $sidebaroptions['subscribeboxoff'] ) {
+                        echo ' checked="checked">';
+                    }
+                    echo '>';
+                echo '</td></tr>';
+            }
+
+            // --- ads box option ---
+            if ( in_array( 'recommend', $boxes ) ) {
+                echo '<tr><td align="center">';
+                    echo '<b>' . esc_html( wqhelper_translate( 'Hide Recommendations' ) ) . '</b>';
+                    echo '</td><td width="10"></td><td align="center">';
+                echo '<input type="checkbox" name="' . esc_attr( $prefix ) . '_ads_box_off" value="checked"';
+                    // 1.6.5: fix to undefined index warning
+                    if ( 'checked' == $sidebaroptions['adsboxoff'] ) {
+                        echo ' checked="checked">';
+                    }
+                    echo '>';
+                echo '</td></tr>';
+            }
+
+            echo '</table><br>';
+
+            // --- save sidebar options button ---
+            echo '<center><input type="submit" class="button-secondary" value="' . esc_attr( wqhelper_translate( 'Save Sidebar Options' ) ) . '"></center></form><br>';
+            echo '<iframe src="javascript:void(0);" name="savesidebar" id="savesidebar" width="200" height="200" style="display:none;"></iframe>';
+
+            // --- sidebar options saved message ---
+            echo '<div id="sidebarsaved" style="display:none;">';
+            echo '<table style="background-color: lightYellow; border-style:solid; border-width:1px; border-color: #E6DB55; text-align:center;">';
+            echo '<tr><td><div class="message" style="margin:0.25em;"><font style="font-weight:bold;">';
+            echo esc_html( wqhelper_translate( 'Sidebar Options Saved.' ) ) . '</font></div></td></tr></table></div>';
+
+        echo '</div></center>';
 
         echo '</div></div></div>';
@@ -1771 +2116 @@
     // Donation Box
     // ------------
-    // TODO: Go Pro Link if has Pro plans ?
-    $args = array($prefix, $pluginslug);
-    if ($sidebaroptions['donationboxoff'] == 'checked') {$hide = " style='display:none;'>";} else {echo $hide = '';}
-    echo '<div id="donate"'.$hide.'>';
-
-    if ($freepremium == 'free') {
-
-        echo '<div class="stuffbox" style="width:250px;background-color:#ffffff;">';
-
-        // --- box title ---
-        // 1.7.4: different title for patreon/paypal
-        // 1.7.6: fix to check if donate link defined
-        $boxtitle = wqhelper_translate('Support Subscription');
-        if (isset($donatelink) && strstr($donatelink, 'patreon')) {
-            $boxtitle = wqhelper_translate('Become a Supporter');
-        }
-        echo '<h3>'.$boxtitle.'</h3><div class="inside">';
-
-        // --- maybe call special top ---
-        if (function_exists($prefix.'_donations_special_top')) {
-            $funcname = $prefix.'_donations_special_top';
-            call_user_func($funcname);
-        }
-
-        // --- patreon support or paypal donations ---
-        // 1.7.4: different title for patreon/paypal
-        // 1.7.6: fix to check if donate link is defined
-        if (isset($donatelink) && strstr($donatelink, 'patreon')) {
-            wqhelper_sidebar_patreon_button($args);
-        } else {wqhelper_sidebar_paypal_donations($args);}
-
-        // --- call donations special bottom ---
-        if (function_exists($prefix.'_donations_special_bottom')) {
-            $funcname = $prefix.'_donations_special_bottom';
-            call_user_func($funcname);
-        }
+    // 1.7.8: check if donation box is on
+    $args = array( $prefix, $pluginslug );
+    if ( in_array( 'donate', $boxes ) ) {
+
+        // --- open donate box ---
+        echo '<div id="donate-box" class="sidebar-box"';
+        if ( 'checked' == $sidebaroptions['donationboxoff'] ) {
+            echo ' style="display:none;">';
+        }
+        echo '>';
+
+        if ( 'free' == $freepremium ) {
+
+            echo '<div class="stuffbox" style="width:250px;background-color:#ffffff;">';
+
+            // --- box title ---
+            // 1.7.4: different title for patreon/paypal
+            // 1.7.6: fix to check if donate link defined
+            $boxtitle = wqhelper_translate( 'Support Subscription' );
+            if ( isset( $donatelink ) && strstr( $donatelink, 'patreon' ) ) {
+                $boxtitle = wqhelper_translate( 'Become a Supporter' );
+            }
+            echo '<h3>' . esc_html( $boxtitle ) . '</h3><div class="inside">';
+
+            // --- maybe call special top ---
+            if ( function_exists( $prefix . '_donations_special_top' ) ) {
+                $funcname = $prefix . '_donations_special_top';
+                call_user_func( $funcname );
+            }
+
+            // --- patreon support or paypal donations ---
+            // 1.7.4: different title for patreon/paypal
+            // 1.7.6: fix to check if donate link is defined
+            if ( isset( $donatelink ) && strstr( $donatelink, 'patreon' ) ) {
+                wqhelper_sidebar_patreon_button( $args );
+            } else {
+                wqhelper_sidebar_paypal_donations( $args );
+            }
+
+            // --- call donations special bottom ---
+            if ( function_exists( $prefix . '_donations_special_bottom' ) ) {
+                $funcname = $prefix . '_donations_special_bottom';
+                call_user_func( $funcname );
+            }
+
+            // 1.7.2: remove rate link from sidebar (now in plugin header)
+            // TODO: maybe re-add theme rating when in repository ?
+            // if ($wporgslug != '') {
+                // echo "<a href='".$wqurls['wp']."/plugins/'".$wporgslug."'/reviews/#new-post' target='_blank'>";
+                // echo "&#9733; ".wqhelper_translate('Rate this Plugin on Wordpress.Org')."</a></center>";
+            // } elseif ($pluginslug == 'bioship') {
+                // 1.5.0: add star rating for theme
+                // echo "<a href='".$wqurls['wp']."/support/theme/bioship/reviews/#new-post' target='_blank'>";
+                // echo "&#9733; ".wqhelper_translate('Rate this Theme on Wordpress.Org')."</a></center>";
+            // }
+
+            echo '</div></div>';
+
+        } elseif ( 'premium' == $freepremium ) {
+
+            // TODO: Go Pro Link if has Pro plans ?
+            echo '';
+
+        }
+
+        // --- close donate box
+        echo '</div>';
+    }
+
+    // Subscriber Form Box
+    // -------------------
+    // 1.7.8: added subscriber form box
+    if ( in_array( 'subscribe', $boxes ) ) {
+
+        // --- open donate box ---
+        echo '<div id="subscribe-box" class="sidebar-box"';
+        if ( 'checked' == $sidebaroptions['subscribeboxoff'] ) {
+            echo ' style="display:none;">';
+        }
+        echo '>';
+
+        // --- output subscribe box ---
+        $funcname = $prefix . '_sidebar_subscribe_box';
+        if ( function_exists( $funcname ) ) {
+            call_user_func( $funcname );
+        } else {
+
+            // --- populated form for current user ---
+            global $current_user;
+            $current_user = wp_get_current_user();
+            $useremail = $current_user->user_email;
+            if ( strstr( $useremail, '@localhost' ) ) {
+                $useremail = '';
+            }
+            $userid = $current_user->ID;
+            $userdata = get_userdata( $userid );
+            $username = $userdata->first_name;
+            $lastname = $userdata->last_name;
+            if ( '' != $lastname ) {
+                $username .= ' ' . $lastname;
+            }
+            $timestamp = time();
+
+            // --- set report image URL ---
+            if ( 'bioship' == $pluginslug ) {
+                $image = get_template_directory_uri() . '/images/bioship.png';
+                $image_alt = wqhelper_translate( 'BioShip Theme Icon' );
+                $action_url = $wqurls['bio'];
+                $leadin = wqhelper_translate( 'Subscribe to BioShip Updates' );
+                $headline = wqhelper_translate( 'and New Feature Releases' );
+                $button = wqhelper_translate( 'Subscribe' );
+            } elseif ( 'wordquest' == $author ) {
+                $image = plugins_url( 'images/wordquest.png', __FILE__ );
+                $image_alt = wqhelper_translate( 'WordQuest Icon' );
+                $action_url = $wqurls['wq'];
+                $leadin = wqhelper_translate( 'Join WordQuest for Updates' );
+                $headline = wqhelper_translate( 'and New Plugin Releases' );
+                $button = wqhelper_translate( 'Join' );
+            } elseif ( 'wpmedic' == $author ) {
+                $image = plugins_url( 'images/wpmedic.png', __FILE__ );
+                $image_alt = wqhelper_translate( 'WP Medic Icon' );
+                $action_url = $wqurls['wpm'];
+                $leadin = wqhelper_translate( 'Join WP Medic for Updates' );
+                $headline = wqhelper_translate( 'and New Tool Releases' );
+                $button = wqhelper_translate( 'Join' );
+            }
+
+            echo '<div class="stuffbox" style="width:250px;background-color:#ffffff;">';
+            echo '<h3>' . esc_html( wqhelper_translate( 'Stay Up to Date' ) ) . '</h3>';
+            echo '<div class="inside"><center>';
+                echo '<table cellpadding="0" cellspacing="0"><tr><td align="center">';
+                    echo '<img src="' . esc_url( $image ) . '" alt="' . esc_attr( wqhelper_translate( $image_alt ) ) . '"><br>';
+                echo '</td><td width="7"></td><td align="center">';
+                    echo '<b><font style="color:#0000EE;font-size:11px;">' . esc_html( $leadin ) . '</font><br>';
+                    echo '<font style="color:#EE0000;font-size:13px;">' . esc_html( $headline ) . '</font></b><br>';
+                    echo '<form style="margin-top:7px;" action="' . esc_url( $action_url ) . '/" target="_blank" method="get">';
+                    echo '<input type="hidden" name="visitor-vortex" value="join">';
+                    echo '<input type="hidden" name="timestamp" value="' . esc_attr( $timestamp ) . '">';
+                    echo '<input type="hidden" name="source" value="' . esc_attr( $pluginslug ) . '-sidebar">';
+                    echo '<input placeholder="' . esc_attr( wqhelper_translate( 'Your Email' ) ) . '..." type="text" style="width:140px;font-size:12px;" name="subemail" value="' . esc_attr( $useremail ) . '"><br>';
+                    echo '<table><tr><td>';
+                        echo '<input placeholder="' . esc_attr( wqhelper_translate( 'Your Name' ) ) . '..." type="text" style="width:90px;font-size:12px;margin-top:5px;" name="subname" value="' . esc_attr( $username ) . '">';
+                    echo '</td><td>';
+                        echo '<input type="submit" class="button-primary" value="' . esc_attr( $button ) . '">';
+                    echo '</td></tr></table>';
+                echo '</td></tr></table></form>';
+            echo '</center></div></div>';
+        }
+
+        // --- close subscribe box ---
+        echo '</div>';
+    }
+
+    // Testimonials Form Box
+    // ---------------------
+    if ( in_array( 'testimonial', $boxes ) ) {
+
+        // --- open donate box ---
+        echo '<div id="testimonial"';
+        if ( 'checked' == $sidebaroptions['testimonialboxoff'] ) {
+            echo ' style="display:none;">';
+        }
+        echo '>';
 
         // 1.7.2: remove testimonial box from sidebar
-        // wqhelper_sidebar_testimonial_box($args);
-
-        // 1.7.2: remove rate link from sidebar (now in plugin header)
-        // TODO: re-add theme rating when in repository ?
-        // if ($wporgslug != '') {
-            // echo "<a href='".$wqurls['wp']."/plugins/'".$wporgslug."'/reviews/#new-post' target='_blank'>";
-            // echo "&#9733; ".wqhelper_translate('Rate this Plugin on Wordpress.Org')."</a></center>";
-        // } elseif ($pluginslug == 'bioship') {
-            // 1.5.0: add star rating for theme
-            // echo "<a href='".$wqurls['wp']."/support/theme/bioship/reviews/#new-post' target='_blank'>";
-            // echo "&#9733; ".wqhelper_translate('Rate this Theme on Wordpress.Org')."</a></center>";
-        // }
-
-        echo '</div></div>';
-
-    } elseif ($freepremium == 'premium') {
-
-        // 1.7.3: temp: remove other testimonial box also
-        // echo '<div class="stuffbox" style="width:250px;background-color:#ffffff;">';
-        // echo '<h3>'.wqhelper_translate('Testimonials').'</h3><div class="inside">';
-        //  wqhelper_sidebar_testimonial_box($args);
-        // echo '</div></div>';
-
-    }
-    echo '</div>';
-
-    // Bonus Subscription Form
-    // -----------------------
+        // wqhelper_sidebar_testimonial_box( $args );
+
+        echo '</div>';
+    }
+
+    // Bonus Report Subscription Form
+    // ------------------------------
     // 1.7.2: allow for bonus offer box override
-    $funcname = $prefix.'_sidebar_bonus_offer';
-    if (function_exists($funcname)) {call_user_func($funcname);}
-    else {
-
-        // --- populated form for current user ---
-        global $current_user; $current_user = wp_get_current_user();
-        $useremail = $current_user->user_email;
-        if (strstr($useremail, '@localhost')) {$useremail = '';}
-        $userid = $current_user->ID; $userdata = get_userdata($userid);
-        $username = $userdata->first_name; $lastname = $userdata->last_name;
-        if ($lastname != '') {$username .= ' '.$lastname;}
-
-        // --- set report image URL ---
-        if ($pluginslug == 'bioship') {$reportimage = get_template_directory_uri().'/images/rv-report.jpg';}
-        else {$reportimage = plugins_url('images/rv-report.jpg', __FILE__);}
-
-        echo '<div id="bonusoffer"';
-        if (get_option($prefix.'_report_box_off') == 'checked') {echo " style='display:none;'>";} else {echo ">";}
-        echo '<div class="stuffbox" style="width:250px;background-color:#ffffff;">';
-        echo '<h3>'.wqhelper_translate('Bonus Offer').'</h3><div class="inside">';
-        echo "<center><table cellpadding='0' cellspacing='0'><tr><td align='center'><img src='".$reportimage."' width='60' height='80'><br>";
-        echo "<font style='font-size:6pt;'><a href='".$wqurls['prn']."/return-visitors-report/' target=_blank>".wqhelper_translate('learn more')."...</a></font></td><td width='7'></td>";
-        echo "<td align='center'><b><font style='color:#ee0000;font-size:9pt;'>Maximize Sales Conversions:</font><br><font style='color:#0000ee;font-size:10pt;'>The Return Visitors Report</font></b><br>";
-        echo "<form style='margin-top:7px;' action='".$wqurls['prn']."/?visitorfunnel=join' target='_blank' method='post'>";
-        echo "<input type='hidden' name='source' value='".$pluginslug."-sidebar'>";
-        echo "<input placeholder='".wqhelper_translate('Your Email')."...' type='text' style='width:150px;font-size:9pt;' name='subemail' value='".$useremail."'><br>";
-        echo "<table><tr><td><input placeholder='".wqhelper_translate('Your Name')."...' type='text' style='width:90px;font-size:9pt;' name='subname' value='".$username."'></td>";
-        echo "<td><input type='submit' class='button-secondary' value='".wqhelper_translate('Get it!')."'></td></tr></table>";
-        echo "</td></tr></table></form></center>";
-        echo '</div></div></div>';
+    if ( in_array( 'report', $boxes ) ) {
+
+        echo '<div id="report-box"';
+        if ( 'checked' == $sidebaroptions['reportboxoff'] ) {
+            echo ' style="display:none;">';
+        }
+        echo '>';
+
+        $funcname = $prefix . '_sidebar_bonus_offer';
+        if ( function_exists( $funcname ) ) {
+            call_user_func( $funcname );
+        } else {
+
+            // --- populated form for current user ---
+            global $current_user;
+            $current_user = wp_get_current_user();
+            $useremail = $current_user->user_email;
+            if ( strstr( $useremail, '@localhost' ) ) {
+                $useremail = '';
+            }
+            $userid = $current_user->ID;
+            $userdata = get_userdata( $userid );
+            $username = $userdata->first_name;
+            $lastname = $userdata->last_name;
+            if ( '' != $lastname ) {
+                $username .= ' ' . $lastname;
+            }
+
+            // --- set report image URL ---
+            if ( 'bioship' == $pluginslug ) {
+                $reportimage = get_template_directory_uri() . '/images/rv-report.jpg';
+            } else {
+                $reportimage = plugins_url( 'images/rv-report.jpg', __FILE__ );
+            }
+
+            echo '<div class="stuffbox" style="width:250px;background-color:#ffffff;">';
+            echo '<h3>' . esc_html( wqhelper_translate( 'Bonus Offer' ) ) . '</h3>';
+            echo '<div class="inside"><center>';
+                echo '<table cellpadding="0" cellspacing="0"><tr><td align="center">';
+                    echo '<img src="' . esc_url( $reportimage ) . '" width="60" height="80" alt="' . esc_attr( wqhelper_translate( 'Report Image' ) ) . '"><br>';
+                    echo '<font style="font-size:6pt;"><a href="' . esc_url( $wqurls['prn'] ) . '/return-visitors-report/" target="_blank">' . esc_html( wqhelper_translate( 'learn more' ) ) . '...</a></font>';
+                echo '</td><td width="7"></td><td align="center">';
+                    echo '<b><font style="color:#ee0000;font-size:9pt;">Maximize Sales Conversions:</font><br>';
+                    echo '<font style="color:#0000ee;font-size:10pt;">The Return Visitors Report</font></b><br>';
+                    echo '<form style="margin-top:7px;" action="' . esc_url( $wqurls['prn'] ) . '" target="_blank" method="post">';
+                    echo '<input type="hidden" name="visitor-vortex" value="join">';
+                    echo '<input type="hidden" name="source" value="' . esc_attr( $pluginslug ) . '-sidebar">';
+                    echo '<input placeholder="' . esc_attr( wqhelper_translate( 'Your Email' ) ) . '..." type="text" style="width:150px;font-size:9pt;" name="subemail" value="' . esc_attr( $useremail ) . '"><br>';
+                    echo '<table><tr><td>';
+                        echo '<input placeholder="' . esc_attr( wqhelper_translate( 'Your Name' ) ) . '..." type="text" style="width:90px;font-size:9pt;" name="subname" value="' . esc_attr( $username ) . '">';
+                    echo '</td><td>';
+                        echo '<input type="submit" class="button-secondary" value="' . esc_attr( wqhelper_translate( 'Get it!' ) ) . '">';
+                    echo '</td></tr></table>';
+                echo '</td></tr></table></form>';
+            echo '</center></div></div>';
+        }
+        echo '</div>';
     }
 
     // PluginReview.Net Plugin Recommendations
     // ---------------------------------------
-    if ($sidebaroptions['adsboxoff'] != 'checked') {
+    if ( in_array( 'recommend', $boxes ) ) {
+
+        echo '<div id="recommend-box"';
+        if ( 'checked' == $sidebaroptions['adsboxoff'] ) {
+            echo ' style="display:none;"';
+        }
+        echo '>';
+
         // 1.7.2: allow for recommendation box override
-        $funcname = $prefix.'_sidebar_plugin_recommendation';
-        if (function_exists($funcname)) {call_user_func($funcname);}
-        else {
-            echo '<div id="pluginads">';
-            echo '<div class="stuffbox" style="width:250px;">';
-            echo '<h3>'.wqhelper_translate('Recommended').'</h3><div class="inside">';
-            echo "<script language='javascript' src='".$wqurls['prn']."/recommends/?s=yes&a=majick&c=".$pluginslug."&t=sidebar'></script>";
-            echo '</div></div></div>';
-        }
+        $funcname = $prefix . '_sidebar_plugin_recommendation';
+        if ( function_exists( $funcname ) ) {
+            call_user_func( $funcname );
+        } else {
+            // 1.8.0: check for contents before box output
+            $feedad = wqhelper_get_feed_ad( $pluginslug );
+            if ( $feedad ) {
+                echo '<div class="stuffbox" style="width:250px;">';
+                echo '<h3>' . esc_html( wqhelper_translate( 'Recommended' ) ) . '</h3>';
+                echo '<div class="inside">';
+                if ( 'checked' != $sidebaroptions['adsboxoff'] ) {
+                    // 1.8.0: replaced script with RSS feed ad
+                    // echo '<script src="' . esc_url( $wqurls['prn'] ) . '/recommends/?s=yes&a=majick&c=' . esc_attr( $pluginslug ) . '&t=sidebar"></script>';
+                    // 1.8.1: use wp_kses_post on feed ad
+                    echo wp_kses_post( $feedad );
+                }
+                // 1.8.2: fix to move close divs back inside condition
+                echo '</div></div>';
+            }
+        }
+
+        echo '</div>';
     }
 
     // Call Plugin Footer Function
     // ---------------------------
-    $funcname = $prefix.'_sidebar_plugin_footer';
-    if (function_exists($funcname)) {call_user_func($funcname);}
-    else {
+    $funcname = $prefix . '_sidebar_plugin_footer';
+    echo '<div id="pluginfooter">';
+    if ( function_exists( $funcname ) ) {
+        call_user_func( $funcname );
+    } else {
 
         // Default Sidebar Plugin Footer
-        // -----------------------------
-
-        // 1.7.4: link display depending on author
-        if ($author == 'wpmedic') {
-            $authordisplay = 'WP Medic';
-            $authorurl = $wqurls['wpm'];
-            $wqanchor = wqhelper_translate('WordQuest Plugins');
-            $pluginurl = $wqurls['wpm'].'/'.$pluginslug."/";
-        } else {
-            $authordisplay = 'WordQuest Alliance';
-            $authorurl = $wqurls['wq'];
-            $wqanchor = wqhelper_translate('More Cool Plugins');
-            $pluginurl = $wqurls['wq'].'/plugins/'.$pluginslug."/";
-        }
+        // -----------------------------
+
+        // 1.7.4: link display depending on author
+        $wqanchor = wqhelper_translate( 'WordQuest Plugins' );
+        $wpmanchor = wqhelper_translate( 'WP Medic Tools' );
+        if ( 'wordquest' == $author ) {
+           $authordisplay = 'WordQuest Alliance';
+           $authorurl = $wqurls['wq'];
+           $wqanchor = wqhelper_translate( 'More WordQuest Plugins' );
+           $pluginurl = $wqurls['wq'] . '/plugins/' . $pluginslug . '/';
+        } elseif ( 'wpmedic' == $author ) {
+           $authordisplay = 'WP Medic';
+           $authorurl = $wqurls['wpm'];
+           $wpmanchor = wqhelper_translate( 'More WP Medic Tools' );
+           $pluginurl = $wqurls['wpm'] . '/' . $pluginslug . '/';
+        }
+        // $wqlink = '<a href="' . esc_url( $wqurls['wq'] ) . '/plugins/" target="_blank"><b>&rarr; ' . esc_html( $wqanchor ) . '</b></a><br>';
+        // $wpmlink = '<a href="' . esc_url( $wqurls['wpm'] ) . '" target="_blank"><b>&rarr; ' . esc_html( $wpmanchor ) . '</b></a><br>';
 
         // --- set values for theme or plugin ---
-        if ($pluginslug == 'bioship') {
-            $iconurl = get_template_directory_uri().'/images/'.$author.'.png';
+        $footertitle = wqhelper_translate( 'Plugin Info' );
+        $bioanchor = wqhelper_translate( 'BioShip Framework' );
+        if ( 'bioship' == $pluginslug ) {
+            // $iconurl = get_template_directory_uri() . '/images/' . $author . '.png';
             $pluginurl = $wqurls['bio'];
-            $pluginfootertitle = wqhelper_translate('Theme Info');
-        } else {
-            $iconurl = plugins_url('images/'.$author.'.png', __FILE__);
-            $pluginfootertitle = wqhelper_translate('Plugin Info');
-            $bioanchor = wqhelper_translate('BioShip Framework');
-        }
-
-        // --- output plugin footer ---
-        echo '<div id="pluginfooter"><div class="stuffbox" style="width:250px;background-color:#ffffff;"><h3>'.$pluginfootertitle.'</h3><div class="inside">';
-        echo "<center><table><tr>";
-        echo "<td><a href='".$wqurls['wq']."/' target='_blank'><img src='".$iconurl."' border=0></a></td></td>";
-        echo "<td width='14'></td>";
-        echo "<td><a href='".$pluginurl."' target='_blank'>".$plugintitle."</a> <i>v".$pluginversion."</i><br>";
-        echo "by <a href='".$authorurl."/' target='_blank'>".$authordisplay."</a><br>";
-        echo "<a href='".$wqurls['wq']."/plugins/' target='_blank'><b>&rarr; ".$wqanchor."</b></a><br>";
-        if ($pluginslug != 'bioship') {
-            echo "<a href='".$wqurls['bio']."' target='_blank'>&rarr; ".$bioanchor."</a></td>";
-        }
-        // echo "<a href='".$wqurls['prn']."/directory/' target='_blank'>&rarr; ".wqhelper_translate('Plugin Directory')."</a></td>";
-        echo "</tr></table></center>";
-        echo '</div></div></div>';
-    }
+            $footertitle = wqhelper_translate( 'Theme Info' );
+        } // else {
+            // $iconurl = plugins_url( 'images/' . $author . '.png', __FILE__ );
+        // }
+
+        // --- output plugin footer ---
+        echo '<div class="stuffbox" style="width:250px;background-color:#ffffff;">';
+        echo '<h3>' . esc_html( $footertitle ) . '</h3><div class="inside"><center>';
+        // echo '<table><tr><td>';
+            // echo '<a href="' . esc_url( $wqurls['wq'] ) . '" target="_blank"><img src="' . esc_url( $iconurl ) . '" border="0"></a>';
+            // echo '</td><td width="14"></td><td>';
+
+            echo '<table><tr><td>';
+                echo '<a href="' . esc_url( $pluginurl ) . '" target="_blank">' . esc_html( $plugintitle ) . '</a> &nbsp; <i>v' . esc_html( $pluginversion ) . '</i><br>';
+                echo esc_html( wqhelper_translate( 'by' ) ) . ' <a href="' . esc_url( $authorurl ) . '" target="_blank">' . esc_html( $authordisplay ) . '</a><br><br></center>';
+
+                // 1.8.1: output links direct instead of storing
+                if ( 'wpmedic' == $author ) {
+                    echo '<a href="' . esc_url( $wqurls['wpm'] ) . '" target="_blank"><b>&rarr; ' . esc_html( $wpmanchor ) . '</b></a><br>';
+                    echo '<a href="' . esc_url( $wqurls['wq'] ) . '/plugins/" target="_blank"><b>&rarr; ' . esc_html( $wqanchor ) . '</b></a><br>';
+                } else {
+                    echo '<a href="' . esc_url( $wqurls['wq'] ) . '/plugins/" target="_blank"><b>&rarr; ' . esc_html( $wqanchor ) . '</b></a><br>';
+                    echo '<a href="' . esc_url( $wqurls['wpm'] ) . '" target="_blank"><b>&rarr; ' . esc_html( $wpmanchor ) . '</b></a><br>';
+                }
+                if ( 'bioship' != $pluginslug ) {
+                    echo '<a href="' . esc_url( $wqurls['bio'] ) . '" target="_blank"><b>&rarr; ' . esc_html( $bioanchor ) . '</a></b><br>';
+                }
+                echo '<a href="' . esc_url( $wqurls['prn'] ) . '/directory/" target="_blank"><b>&rarr; ' . esc_html( wqhelper_translate( 'Sorted Plugin Directory' ) ) . '</b></a>';
+            echo '</td></tr></table>';
+
+        // echo '</td>';
+        // echo '</tr></table>';
+        echo '</div></div>';
+    }
+    echo '</div>';
 
     // --- close sidebar float div ---
@@ -1944 +2463 @@
 // ------------------------
 // 1.7.4: added Patreon Supporter Button
-$funcname = 'wqhelper_sidebar_patreon_button_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
- $wqfunctions[$funcname] = function($args) {
+$funcname = 'wqhelper_sidebar_patreon_button_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $args ) {
 
     global $wordquestplugins;
-    $prefix = $args[0]; $pluginslug = $args[1];
-    $settings = $wordquestplugins[$pluginslug];
-    $donatelink = apply_filters('wqhelper_donate_link', $settings['donate'], $pluginslug);
-    $message = apply_filters('wqhelper_donate_message', $settings['donatetext'], $pluginslug);
-
-    // --- set button image URL ---
-    if ($pluginslug == 'bioship') {$imageurl = get_template_directory_uri().'/images/patreon-button.jpg';}
-    else {
-        // 1.7.5: check/fix for Patreon button URL (cross-versions)
-        if (file_exists(dirname(__FILE__).'/images/patreon-button.jpg')) {
-            $imageurl = plugins_url('images/patreon-button.jpg', __FILE__);
-        } else {
-            // --- try to reliably get actual plugin path/URL ---
-            $realslug = sanitize_title($wordquestplugins[$pluginslug]['title']);
-            if (file_exists(WP_PLUGIN_DIR.'/'.$realslug.'/images/patreon-button.jpg')) {
-                $imageurl = WP_PLUGIN_URL.'/'.$realslug.'/images/patreon-button.jpg';
-            }
-        }
-    }
-    $imageurl = apply_filters('wqhelper_donate_image', $imageurl, $pluginslug);
-
-    // --- output Patreon button ---
-    echo "<center><div class='supporter-message'>".$message."</div>".PHP_EOL;
-    echo "<a href='".$donatelink."' target=_blank>";
-        if ($imageurl) {echo "<img id='patreon-button' src='".$imageurl."'>";}
-        else {echo __('Become a Patron','forcefield');}
-    echo "</a><center>".PHP_EOL;
-
-    // --- image hover styling ---
-    echo "<style>.supporter-message {font-size:15px; margin-bottom:5px;}
-    #patreon-button {opacity: 0.9;} #patreon-button:hover {opacity: 1;}</style>".PHP_EOL;
+    $prefix = $args[0];
+    $pluginslug = $args[1];
+    $settings = $wordquestplugins[$pluginslug];
+    $donatelink = apply_filters( 'wqhelper_donate_link', $settings['donate'], $pluginslug );
+    $message = apply_filters( 'wqhelper_donate_message', $settings['donatetext'], $pluginslug );
+
+    // --- set button image URL ---
+    if ( 'bioship' == $pluginslug ) {
+        $imageurl = get_template_directory_uri() . '/images/patreon-button.jpg';
+    } else {
+        // 1.7.5: check/fix for Patreon button URL (cross-versions)
+        if ( file_exists( dirname( __FILE__ ) . '/images/patreon-button.jpg' ) ) {
+            $imageurl = plugins_url( 'images/patreon-button.jpg', __FILE__ );
+        } else {
+            // --- try to reliably get actual plugin path/URL ---
+            $realslug = sanitize_title( $wordquestplugins[$pluginslug]['title'] );
+            if ( file_exists( WP_PLUGIN_DIR . '/' . $realslug . '/images/patreon-button.jpg' ) ) {
+                $imageurl = WP_PLUGIN_URL . '/' . $realslug . '/images/patreon-button.jpg';
+            }
+        }
+    }
+    $imageurl = apply_filters( 'wqhelper_donate_image', $imageurl, $pluginslug );
+
+    // --- output Patreon button ---
+    echo '<center><div class="supporter-message">' . esc_html( $message ) . '</div>';
+    echo '<a href="' . esc_url( $donatelink ) . '" target="_blank">';
+    if ( $imageurl ) {
+        echo '<img id="patreon-button" src="' . esc_url( $imageurl ) . '">';
+    } else {
+        echo esc_html( wqhelper_translate( 'Become a Patron' ) );
+    }
+    echo '</a><center>';
+
+    // --- image hover styling ---
+    echo '<style>.supporter-message {font-size:15px; margin-bottom:5px;}
+    #patreon-button {opacity: 0.9;} #patreon-button:hover {opacity: 1;}</style>';
 
  };
@@ -1987 +2511 @@
 // Paypal Donations
 // ----------------
-$funcname = 'wqhelper_sidebar_paypal_donations_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
- $wqfunctions[$funcname] = function($args) {
+$funcname = 'wqhelper_sidebar_paypal_donations_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $args ) {
 
     global $wqurls;
-    $prefix = $args[0]; $pluginslug = $args[1];
-
-    // --- make display name from the plugin slug ---
-    if (strstr($pluginslug, '-')) {
-        $parts = explode('-', $pluginslug);
+    $prefix = $args[0];
+    $pluginslug = $args[1];
+
+    // --- make display name from the plugin slug ---
+    if ( strstr( $pluginslug, '-' ) ) {
+        $parts = explode( '-', $pluginslug );
         $i = 0;
-        foreach ($parts as $part) {
-            if ($part == 'wp') {$parts[$i] = 'WP';}
-            else {$parts[$i] = strtoupper(substr($part, 0, 1)).substr($part, 1, (strlen($part)-1));}
+        foreach ( $parts as $part ) {
+            if ( 'wp' == $part ) {
+                $parts[$i] = 'WP';
+            } else {
+                $parts[$i] = strtoupper( substr( $part, 0, 1 ) ) . substr( $part, 1, ( strlen( $part ) - 1 ) );
+            }
             $i++;
         }
-        $pluginname = implode(' ', $parts);
+        $pluginname = implode( ' ', $parts );
     } else {
-        $pluginname = strtoupper(substr($pluginslug, 0, 1)).substr($pluginslug, 1, (strlen($pluginslug)-1));
+        $pluginname = strtoupper( substr( $pluginslug, 0, 1 ) ) . substr( $pluginslug, 1, ( strlen( $pluginslug ) - 1 ) );
     }
 
     // --- donations scripts ---
-    echo "<script language='javascript' type='text/javascript'>
-    function showrecurringform() {
+    echo "<script>
+    function wq_show_recurring_form() {
         document.getElementById('recurradio').checked = true;
         document.getElementById('onetimedonation').style.display = 'none';
         document.getElementById('recurringdonation').style.display = '';
     }
-    function showonetimeform() {
+    function wq_show_one_time_form() {
         document.getElementById('onetimeradio').checked = true;
         document.getElementById('recurringdonation').style.display = 'none';
         document.getElementById('onetimedonation').style.display = '';
     }
-    function switchperiodoptions() {
-        var selectelement = document.getElementById('recurperiod');
-        var recurperiod = selectelement.options[selectelement.selectedIndex].value;
+    function wq_switch_period_options() {
+        selectelement = document.getElementById('recurperiod');
+        recurperiod = selectelement.options[selectelement.selectedIndex].value;
         if ( (recurperiod == 'Weekly') || (recurperiod == 'W') ) {
             document.getElementById('periodoptions').innerHTML = document.getElementById('weeklyamounts').innerHTML;
-            var monthlyselected = document.getElementById('monthlyselected').value;
-            var weeklyselected = monthlyselected++;
-            var selectelement = document.getElementById('periodoptions');
+            monthlyselected = document.getElementById('monthlyselected').value;
+            weeklyselected = monthlyselected++;
+            selectelement = document.getElementById('periodoptions');
             selectelement.selectedIndex = weeklyselected;
         }
         if ( (recurperiod == 'Monthly') || (recurperiod == 'M') ) {
             document.getElementById('periodoptions').innerHTML = document.getElementById('monthlyamounts').innerHTML;
-            var weeklyselected = document.getElementById('weeklyselected').value;
-            var monthlyselected = weeklyselected--;
-            var selectelement = document.getElementById('periodoptions')
+            weeklyselected = document.getElementById('weeklyselected').value;
+            monthlyselected = weeklyselected--;
+            selectelement = document.getElementById('periodoptions');
             selectelement.selectedIndex = monthlyselected;
         }
     }
-    function storeamount() {
-        var selectelement = document.getElementById('recurperiod');
-        var recurperiod = selectelement.options[selectelement.selectedIndex].value;
-        var selectelement = document.getElementById('periodoptions');
-        var selected = selectelement.selectedIndex;
+    function wq_store_amount() {
+        selectelement = document.getElementById('recurperiod');
+        recurperiod = selectelement.options[selectelement.selectedIndex].value;
+        selectelement = document.getElementById('periodoptions');
+        selected = selectelement.selectedIndex;
         if ( (recurperiod == 'Weekly') || (recurperiod == 'W') ) {
             document.getElementById('weeklyselected').value = selected;
@@ -2049 +2577 @@
             document.getElementById('monthlyselected').value = selected;
         }
-    }
-    </script>";
+    }</script>";
 
     // --- set Paypal notification URL ---
-    $notifyurl = $wqurls['wq'].'/?estore_pp_ipn=process';
+    $notifyurl = $wqurls['wq'] . '/?estore_pp_ipn=process';
     $sandbox = ''; // $sandbox = 'sandbox.';
 
     // --- recurring / one-time switcher ---
-    echo "<center><table cellpadding='0' cellspacing='0'><tr><td>";
-    echo "<input name='donatetype' id='recurradio' type='radio' onclick='showrecurringform();' checked> <a href='javascript:void(0);' onclick='showrecurringform();' style='text-decoration:none;'>".wqhelper_translate('Supporter')."</a> ";
-    echo "</td><td width='10'></td><td>";
-    echo "<input name='donatetype' id='onetimeradio' type='radio' onclick='showonetimeform();'> <a href-'javascript:void(0);' onclick='showonetimeform();' style='text-decoration:none;'>".wqhelper_translate('One Time')."</a>";
-    echo "</td></tr></table></center>";
+    echo '<center><table cellpadding="0" cellspacing="0"><tr><td>';
+        echo '<input name="donatetype" id="recurradio" type="radio" onclick="wq_show_recurring_form();" checked="checked">';
+        echo ' <a href="javascript:void(0);" onclick="wq_show_recurring_form();" style="text-decoration:none;">' . esc_html( wqhelper_translate( 'Supporter' ) ) . '</a> ';
+    echo '</td><td width="10"></td><td>';
+        echo '<input name="donatetype" id="onetimeradio" type="radio" onclick="wq_show_one_time_form();"> ';
+        echo '<a href="javascript:void(0);" onclick="wq_show_one_time_form();" style="text-decoration:none;">' . esc_html( wqhelper_translate( 'One Time' ) ) . '</a>';
+    echo '</td></tr></table></center>';
 
     // --- set weekly amount options ---
     // 1.5.0: added weekly amounts
-    echo '<div style="display:none;"><input type="hidden" id="weeklyselected" value="3">
-    <select name="wp_eStore_subscribe" id="weeklyamounts" style="font-size:8pt;" size="1">
-    <optgroup label="'.wqhelper_translate('Supporter Amount').'">
-    <option value="1">'.wqhelper_translate('Copper').': $1 </option>
-    <option value="3">'.wqhelper_translate('Bronze').': $2</option>
-    <option value="5">'.wqhelper_translate('Silver').': $4</option>
-    <option value="7">'.wqhelper_translate('Gold').': $5</option>
-    <option value="9">'.wqhelper_translate('Platinum').': $7.50</option>
-    <option value="11">'.wqhelper_translate('Titanium').': $10</option>
-    <option value="13">'.wqhelper_translate('Star Ruby').': $12.50</option>
-    <option value="15">'.wqhelper_translate('Star Topaz').': $15</option>
-    <option value="17">'.wqhelper_translate('Star Emerald').': $17.50</option>
-    <option value="19">'.wqhelper_translate('Star Sapphire').': $20</option>
-    <option value="21">'.wqhelper_translate('Star Diamond').': $25</option>
-    </select></div>';
+    echo '<div style="display:none;">';
+    echo '<input type="hidden" id="weeklyselected" value="3">';
+    echo '<select name="wp_eStore_subscribe" id="weeklyamounts" style="font-size:8pt;" size="1">';
+    echo '<optgroup label="' . esc_attr( wqhelper_translate( 'Supporter Amount' ) ) . '">';
+    echo '<option value="1">' . esc_html( wqhelper_translate( 'Copper' ) ) . ': $1 </option>';
+    echo '<option value="3">' . esc_html( wqhelper_translate( 'Bronze' ) ) . ': $2</option>';
+    echo '<option value="5">' . esc_html( wqhelper_translate( 'Silver' ) ) . ': $4</option>';
+    echo '<option value="7" selected="selected">' . esc_html( wqhelper_translate( 'Gold' ) ) . ': $5</option>';
+    echo '<option value="9">' . esc_html( wqhelper_translate( 'Platinum' ) ) . ': $7.50</option>';
+    echo '<option value="11">' . esc_html( wqhelper_translate( 'Titanium' ) ) . ': $10</option>';
+    echo '<option value="13">' . esc_html( wqhelper_translate( 'Star Ruby' ) ) . ': $12.50</option>';
+    echo '<option value="15">' . esc_html( wqhelper_translate( 'Star Topaz' ) ) . ': $15</option>';
+    echo '<option value="17">' . esc_html( wqhelper_translate( 'Star Emerald' ) ) . ': $17.50</option>';
+    echo '<option value="19">' . esc_html( wqhelper_translate( 'Star Sapphire' ) ) . ': $20</option>';
+    echo '<option value="21">' . esc_html( wqhelper_translate( 'Star Diamond' ) ) . ': $25</option>';
+    echo '</select></div>';
 
     // --- set monthly amount options ---
     // 1.5.0: added monthly amounts
-    echo '<div style="display:none;"><input type="hidden" id="monthlyselected" value="3">
-    <select name="wp_eStore_subscribe" id="monthlyamounts" style="font-size:8pt;" size="1">
-    <optgroup label="'.wqhelper_translate('Supporter Amount').'">
-    <option value="2">'.wqhelper_translate('Copper').': $5</option>
-    <option value="4">'.wqhelper_translate('Bronze').': $10</option>
-    <option value="6">'.wqhelper_translate('Silver').': $15</option>
-    <option value="9" selected="selected">'.wqhelper_translate('Gold').': $20</option>
-    <option value="10">'.wqhelper_translate('Platinum').': $30</option>
-    <option value="12">'.wqhelper_translate('Titanium').': $40</option>
-    <option value="14">'.wqhelper_translate('Star Ruby').': $50</option>
-    <option value="16">'.wqhelper_translate('Star Topaz').': $60</option>
-    <option value="18">'.wqhelper_translate('Star Emerald').': $70</option>
-    <option value="20">'.wqhelper_translate('Star Sapphire').': $80</option>
-    <option value="22">'.wqhelper_translate('Star Diamond').': $100</option>
-    </select></div>';
+    echo '<div style="display:none;">';
+    echo '<input type="hidden" id="monthlyselected" value="3">';
+    echo '<select name="wp_eStore_subscribe" id="monthlyamounts" style="font-size:8pt;" size="1">';
+    echo '<optgroup label="' . esc_attr( wqhelper_translate( 'Supporter Amount' ) ) . '">';
+    echo '<option value="2">' . esc_html( wqhelper_translate( 'Copper' ) ) . ': $5</option>';
+    echo '<option value="4">' . esc_html( wqhelper_translate( 'Bronze' ) ) . ': $10</option>';
+    echo '<option value="6">' . esc_html( wqhelper_translate( 'Silver' ) ) . ': $15</option>';
+    echo '<option value="9" selected="selected">' . esc_html( wqhelper_translate( 'Gold' ) ) . ': $20</option>';
+    echo '<option value="10">' . esc_html( wqhelper_translate( 'Platinum' ) ) . ': $30</option>';
+    echo '<option value="12">' . esc_html( wqhelper_translate( 'Titanium' ) ) . ': $40</option>';
+    echo '<option value="14">' . esc_html( wqhelper_translate( 'Star Ruby' ) ) . ': $50</option>';
+    echo '<option value="16">' . esc_html( wqhelper_translate( 'Star Topaz' ) ) . ': $60</option>';
+    echo '<option value="18">' . esc_html( wqhelper_translate( 'Star Emerald' ) ) . ': $70</option>';
+    echo '<option value="20">' . esc_html( wqhelper_translate( 'Star Sapphire' ) ) . ': $80</option>';
+    echo '<option value="22">' . esc_html( wqhelper_translate( 'Star Diamond' ) ) . ': $100</option>';
+    echo '</select></div>';
 
     // note: eStore recurring subscription form
@@ -2103 +2634 @@
 
     // --- set donate image URL ---
-    if ($pluginslug == 'bioship') {$donateimage = get_template_directory_uri().'/images/pp-donate.jpg';}
-    else {$donateimage = plugins_url('/images/pp-donate.jpg', __FILE__);}
+    if ( 'bioship' == $pluginslug ) {
+        $donateimage = get_template_directory_uri() . '/images/pp-donate.jpg';
+    } else {
+        $donateimage = plugins_url( '/images/pp-donate.jpg', __FILE__ );
+    }
 
     // --- recurring donation form ---
-    echo '
-        <center><form id="recurringdonation" method="GET" action="'.$wqurls['wq'].'" target="_blank">
-        <input type="hidden" name="c_input" value="'.$pluginslug.'">
-        <select name="wp_eStore_subscribe" style="font-size:10pt;" size="1" id="periodoptions" onchange="storeamount();">
-        <optgroup label="'.wqhelper_translate('Supporter Amount').'">
-        <option value="1">'.wqhelper_translate('Copper').': $1 </option>
-        <option value="3">'.wqhelper_translate('Bronze').': $2</option>
-        <option value="5">'.wqhelper_translate('Silver').': $4</option>
-        <option value="7" selected="selected">'.wqhelper_translate('Gold').': $5</option>
-        <option value="9">'.wqhelper_translate('Platinum').': $7.50</option>
-        <option value="11">'.wqhelper_translate('Titanium').': $10</option>
-        <option value="13">'.wqhelper_translate('Ruby').': $12.50</option>
-        <option value="15">'.wqhelper_translate('Topaz').': $15</option>
-        <option value="17">'.wqhelper_translate('Emerald').': $17.50</option>
-        <option value="19">'.wqhelper_translate('Sapphire').': $20</option>
-        <option value="21">'.wqhelper_translate('Diamond').': $25</option>
-        </select>
-        </td><td width="5"></td><td>
-        <select name="t3" style="font-size:10pt;" id="recurperiod" onchange="switchperiodoptions()">
-        <option selected="selected" value="W">'.wqhelper_translate('Weekly').'</option>
-        <option value-"M">'.wqhelper_translate('Monthly').'</option>
-        </select></tr></table>
-        <input type="image" src="'.$donateimage.'" border="0" name="I1">
-        </center></form>';
+    echo '<center><form id="recurringdonation" method="GET" action="' . esc_url( $wqurls['wq'] ) . '" target="_blank">';
+        echo '<input type="hidden" name="c_input" value="' . esc_attr( $pluginslug ) . '">';
+        echo '<select name="wp_eStore_subscribe" style="font-size:10pt;" size="1" id="periodoptions" onchange="wq_store_amount();">';
+        echo '<optgroup label="' . esc_attr( wqhelper_translate( 'Supporter Amount' ) ) . '">';
+        echo '<option value="1">' . esc_html( wqhelper_translate( 'Copper' ) ) . ': $1 </option>';
+        echo '<option value="3">' . esc_html( wqhelper_translate( 'Bronze' ) ) . ': $2</option>';
+        echo '<option value="5">' . esc_html( wqhelper_translate( 'Silver' ) ) . ': $4</option>';
+        echo '<option value="7" selected="selected">' . esc_html( wqhelper_translate( 'Gold' ) ) . ': $5</option>';
+        echo '<option value="9">' . esc_html( wqhelper_translate( 'Platinum' ) ) . ': $7.50</option>';
+        echo '<option value="11">' . esc_html( wqhelper_translate( 'Titanium' ) ) . ': $10</option>';
+        echo '<option value="13">' . esc_html( wqhelper_translate( 'Ruby' ) ) . ': $12.50</option>';
+        echo '<option value="15">' . esc_html( wqhelper_translate( 'Topaz' ) ) . ': $15</option>';
+        echo '<option value="17">' . esc_html( wqhelper_translate( 'Emerald' ) ) . ': $17.50</option>';
+        echo '<option value="19">' . esc_html( wqhelper_translate( 'Sapphire' ) ) . ': $20</option>';
+        echo '<option value="21">' . esc_html( wqhelper_translate( 'Diamond' ) ) . ': $25</option>';
+        echo '</select>';
+
+    echo '</td><td width="5"></td><td>';
+    echo '<select name="t3" style="font-size:10pt;" id="recurperiod" onchange="wq_switch_period_options()">';
+    echo '<option selected="selected" value="W">' . esc_html( wqhelper_translate( 'Weekly' ) ) . '</option>';
+    echo '<option value="M">' . esc_html( wqhelper_translate( 'Monthly' ) ) . '</option>';
+    echo '</select></tr></table>';
+
+    echo '<input type="image" src="' . esc_url( $donateimage ) . '" border="0" name="I1">';
+    echo '</center></form>';
 
     /// --- one time donation form ---
     // $wqurls['wq'].'/?wp_eStore_donation=23&var1_price=AMOUNT&c_input='.$pluginslug;
-    echo '
-    <center><form id="onetimedonation" style="display:none;" method="GET" action="'.$wqurls['wq'].'" target="_blank">
-        <input type="hidden" name="wp_eStore_donation" value="23">
-        <input type="hidden" name="c_input" value="'.$pluginslug.'">
-        <select name="var1_price" style="font-size:10pt;" size="1">
-        <option selected value="">'.wqhelper_translate('Select Gift Amount').'</option>
-        <option value="5">$5 - '.wqhelper_translate('Buy me a Cuppa').'</option>
-        <option value="10">$10 - '.wqhelper_translate('Log a Feature Request').'</option>
-        <option value="20">$20 - '.wqhelper_translate('Support a Minor Bugfix').'</option>
-        <option value="50">$50 - '.wqhelper_translate('Support a Minor Update').'</option>
-        <option value="100">$100 - '.wqhelper_translate('Support a Major Bugfix/Update').'</option>
-        <option value="250">$250 - '.wqhelper_translate('Support a Minor Feature').'</option>
-        <option value="500">$500 - '.wqhelper_translate('Support a Major Feature').'</option>
-        <option value="1000">$1000 - '.wqhelper_translate('Support a New Module').'</option>
-        <option value="2000">$1000 - '.wqhelper_translate('Support a New Plugin').'</option>
-        <option value="">'.wqhelper_translate('Be Unique: Enter Custom Amount').'</option>
-        </select>
-        <input type="image" src="'.$donateimage.'" border="0" name="I1">
-        </center></form>
-    ';
+    echo '<center><form id="onetimedonation" style="display:none;" method="GET" action="' . esc_url( $wqurls['wq'] ) . '" target="_blank">';
+        echo '<input type="hidden" name="wp_eStore_donation" value="23">';
+        echo '<input type="hidden" name="c_input" value="' . esc_attr( $pluginslug ) . '">';
+        echo '<select name="var1_price" style="font-size:10pt;" size="1">';
+            echo '<option selected value="">' . esc_html( wqhelper_translate( 'Select Gift Amount' ) ) . '</option>';
+            echo '<option value="5">$5 - ' . esc_html( wqhelper_translate( 'Buy me a Cuppa' ) ) . '</option>';
+            echo '<option value="10">$10 - ' . esc_html( wqhelper_translate( 'Log a Feature Request' ) ) . '</option>';
+            echo '<option value="20">$20 - ' . esc_html( wqhelper_translate( 'Support a Minor Bugfix' ) ) . '</option>';
+            echo '<option value="50">$50 - ' . esc_html( wqhelper_translate( 'Support a Minor Update' ) ) . '</option>';
+            echo '<option value="100">$100 - ' . esc_html( wqhelper_translate( 'Support a Major Update' ) ) . '</option>';
+            echo '<option value="250">$250 - ' . esc_html( wqhelper_translate( 'Support a Minor Feature' ) ) . '</option>';
+            echo '<option value="500">$500 - ' . esc_html( wqhelper_translate( 'Support a Major Feature' ) ) . '</option>';
+            echo '<option value="1000">$1000 - ' . esc_html( wqhelper_translate( 'Support a New Module' ) ) . '</option>';
+            echo '<option value="2000">$1000 - ' . esc_html( wqhelper_translate( 'Support a New Plugin' ) ) . '</option>';
+            echo '<option value="">' . esc_html( wqhelper_translate( 'Be Unique: Enter Custom Amount' ) ) . '</option>';
+        echo '</select>';
+        echo '<input type="image" src="' . esc_url( $donateimage ) . '" border="0" name="I1">';
+    echo '</center></form>';
 
  };
@@ -2161 +2694 @@
 // Testimonial Box
 // ---------------
-$funcname = 'wqhelper_sidebar_testimonial_box_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
- $wqfunctions[$funcname] = function($args) {
-
-    global $wqurls, $current_user; $current_user = wp_get_current_user();
+$funcname = 'wqhelper_sidebar_testimonial_box_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $args ) {
+
+    global $wqurls, $current_user;
+    $current_user = wp_get_current_user();
     $useremail = $current_user->user_email;
-    if (strstr($useremail, '@localhost')) {$useremail = '';}
-    $userid = $current_user->ID; $userdata = get_userdata($userid);
-    $username = $userdata->first_name; $lastname = $userdata->last_name;
-    if ($lastname != '') {$username .= ' '.$lastname;}
-
-    $prefix = $args[0]; $pluginslug = $args[1];
-    $pluginslug = str_replace('-', '', $pluginslug);
+    if ( strstr( $useremail, '@localhost' ) ) {
+        $useremail = '';
+    }
+    $userid = $current_user->ID;
+    $userdata = get_userdata( $userid );
+    $username = $userdata->first_name;
+    $lastname = $userdata->last_name;
+    if ( '' != $lastname ) {
+        $username .= ' ' . $lastname;
+    }
+
+    $prefix = $args[0];
+    $pluginslug = $args[1];
+    $pluginslug = str_replace( '-', '', $pluginslug );
 
     // --- testimonial script ---
     echo "<script>
-    function showhidetestimonialbox() {
+    function wq_showhide_testimonial_box() {
         if (document.getElementById('sendtestimonial').style.display == '') {
             document.getElementById('sendtestimonial').style.display = 'none';
-        }
-        else {
+        } else {
             document.getElementById('sendtestimonial').style.display = '';
             document.getElementById('testimonialbox').style.display = 'none';
         }
     }
-    function submittestimonial() {
+    function wq_submit_testimonial() {
         document.getElementById('testimonialbox').style.display='';
         document.getElementById('sendtestimonial').style.display='none';
@@ -2192 +2732 @@
 
     // --- testimonial form ---
-    echo "<center><a href='javascript:void(0);' onclick='showhidetestimonialbox();'>".wqhelper_translate('Send me a thank you or testimonial.')."</a><br>";
-    echo "<div id='sendtestimonial' style='display:none;' align='center'>";
-    echo "<center><form action='".$wqurls['wq']."' method='post' target='testimonialbox' onsubmit='submittestimonial();'>";
-    echo "<b>".wqhelper_translate('Your Testimonial').":</b><br>";
-    echo "<textarea rows='5' cols='25' name='message'></textarea><br>";
-    echo "<label for='testimonial_sender'>".wqhelper_translate('Your Name').":</label> ";
-    echo "<input type='text' placeholder='".wqhelper_translate('Your Name')."... (".wqhelper_translate('optional').")' style='width:200px;' name='testimonial_sender' value='".$username."'><br>";
-    echo "<input type='text' placeholder='".wqhelper_translate('Your Website')."... (".wqhelper_translate('optional').")' style='width:200px;' name='testimonial_website' value=''><br>";
-    echo "<input type='hidden' name='sending_plugin_testimonial' value='yes'>";
-    echo "<input type='hidden' name='for_plugin' value='".$pluginslug."'>";
-    echo "<input type='submit' class='button-secondary' value='".wqhelper_translate('Send Testimonial')."'>";
-    echo "</form>";
-    echo "</div>";
-    echo "<iframe name='testimonialbox' id='testimonialbox' frameborder='0' src='javascript:void(0);' style='display:none;' width='250' height='50' scrolling='no'></iframe>";
+    echo '<center><a href="javascript:void(0);" onclick="wq_showhide_testimonial_box();">' . esc_html( wqhelper_translate( 'Send me a thank you or testimonial.' ) ) . '</a><br>';
+    echo '<div id="sendtestimonial" style="display:none;" align="center"><center>';
+        echo '<form action="' . esc_url( $wqurls['wq'] ) . '" method="post" target="testimonialbox" onsubmit="wq_submit_testimonial();">';
+        echo '<b>' . esc_html( wqhelper_translate( 'Your Testimonial' ) ) . ':</b><br>';
+        echo '<textarea rows="5" cols="25" name="message"></textarea><br>';
+        echo '<label for="testimonial_sender">' . esc_html( wqhelper_translate( 'Your Name' ) ) . ':</label> ';
+        echo '<input type="text" style="width:200px;" name="testimonial_sender" id="testimonial_sender" value="' . esc_attr( $username ) . '"><br>';
+        echo '<input type="text" placeholder="' . esc_attr( wqhelper_translate( 'Your Website' ) ) . '... (' . esc_html( wqhelper_translate( 'optional' ) ) . ')" style="width:200px;" name="testimonial_website" value=""><br>';
+        echo '<input type="hidden" name="sending_plugin_testimonial" value="yes">';
+        echo '<input type="hidden" name="for_plugin" value="' . esc_attr( $pluginslug ) . '">';
+        echo '<input type="submit" class="button-secondary" value="' . esc_attr( wqhelper_translate( 'Send Testimonial' ) ) . '">';
+    echo '</form></center></div>';
+    echo '<iframe name="testimonialbox" id="testimonialbox" frameborder="0" src="javascript:void(0);" style="display:none;" width="250" height="50" scrolling="no"></iframe>';
  };
 }
@@ -2213 +2752 @@
 // ---------------------
 // !! caller exception !! uses form matching version function
-$funcname = 'wqhelper_update_sidebar_options_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_update_sidebar_options_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
 
-    $pre = $_REQUEST['sidebarprefix'];
-    if (current_user_can('manage_options')) {
+    // 1.7.8: fix sidebar option saveing variable pre to prefix
+    // 1.8.1: use sanitize_title on request variable
+    // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+    $prefix = sanitize_title( $_REQUEST['sidebarprefix'] );
+    if ( current_user_can( 'manage_options' ) ) {
 
         // 1.6.5: check nonce field
-        check_admin_referer($prefix.'_sidebar');
+        check_admin_referer( $prefix . '_sidebar' );
 
         // 1.5.0: convert to single array of plugin sidebar options
-        $sidebaroptions = get_option($prefix.'_sidebar_options');
-        if (!$sidebaroptions) {$sidebaroptions = array('installdate' => date('Y-m-d'));}
-        $sidebaroptions['adsboxoff'] = $sidebaroptions['donationboxoff'] = $sidebaroptions['reportboxoff'] = '';
-        if (isset($_POST[$prefix.'_ads_box_off']) && ($_POST[$prefix.'_ads_box_off'] == 'checked')) {$sidebaroptions['adsboxoff'] = 'checked';}
-        if (isset($_POST[$prefix.'_donation_box_off']) && ($_POST[$prefix.'_donation_box_off'] == 'checked')) {$sidebaroptions['donationboxoff'] = 'checked';}
-        if (isset($_POST[$prefix.'_report_box_off']) && ($_POST[$prefix.'_report_box_off'] == 'checked')) {$sidebaroptions['reportboxoff'] = 'checked';}
-        update_option($prefix.'_sidebar_options', $sidebaroptions);
+        $sidebaroptions = get_option( $prefix . '_sidebar_options' );
+        if ( !$sidebaroptions ) {
+            $sidebaroptions = array(
+                'installdate' => date( 'Y-m-d' ),
+            );
+        }
+        $sidebaroptions['adsboxoff'] = $sidebaroptions['subscribeboxoff'] = $sidebaroptions['donationboxoff'] = $sidebaroptions['reportboxoff'] = '';
+
+        // 1.8.0: reduce code by looping box options
+        $options = array(
+            '_donation_box_off' => 'donationboxoff',
+            // '_testimonial_box_off' => 'testimonialboxoff',
+            '_subscribe_box_off' => 'subscribeboxoff',
+            '_report_box_off' => 'reportboxoff',
+            '_ads_box_off' => 'adsboxoff',
+        );
+        foreach ( $options as $key => $option ) {
+            // phpcs:ignore WordPress.Security.NonceValidation.Recommended
+            if ( isset( $_POST[$prefix . $key] ) && ( 'checked' == sanitize_title( $_POST[$prefix . $key] ) ) ) {
+                $sidebaroptions[$option] = 'checked';
+            }
+        }
+        update_option( $prefix . '_sidebar_options', $sidebaroptions );
         // print_r($sidebaroptions); // debug point
 
         // --- javascript response callbacks ---
-        echo "<script>";
-        echo PHP_EOL."if (parent.document.getElementById('donate')) {";
-        if ($sidebaroptions['donationboxoff'] == 'checked') {echo "parent.document.getElementById('donate').style.display = 'none';}";}
-        else {echo "parent.document.getElementById('donate').style.display = '';}";}
-        echo PHP_EOL."if (parent.document.getElementById('bonusoffer')) {";
-        if ($sidebaroptions['reportboxoff'] == 'checked') {echo "parent.document.getElementById('bonusoffer').style.display = 'none';}";}
-        else {echo "parent.document.getElementById('bonusoffer').style.display = '';}";}
-        echo PHP_EOL."if (parent.document.getElementById('pluginads')) {";
-        if ($sidebaroptions['adsboxoff'] == 'checked') {echo "parent.document.getElementById('pluginads').style.display = 'none';}";}
-        else {echo "parent.document.getElementById('pluginads').style.display = '';}";}
-        echo PHP_EOL."parent.document.getElementById('sidebarsaved').style.display = ''; ";
-        echo PHP_EOL."parent.document.getElementById('sidebarsettings').style.display = 'none'; ";
+        // 1.8.0: reduce code by looping box options
+        $boxes = array(
+            'donationboxoff' => 'donate-box',
+            'subscribeboxoff' => 'subscribe-box',
+            'reportboxoff' => 'report-box',
+            'adsboxoff' => 'recommend-box',
+        );
+        echo "<script>" . PHP_EOL;
+        foreach ( $boxes as $key => $id ) {
+            echo "if (parent.document.getElementById('" . esc_js( $id ) . "')) {";
+            if ( 'checked' == $sidebaroptions[$key] ) {
+                echo "parent.document.getElementById('" . esc_js( $id ) . "').style.display = 'none';}";
+            } else {
+                echo "parent.document.getElementById('" . esc_js( $id ) . "').style.display = '';}";
+            }
+            echo PHP_EOL;
+        }
+
+        echo PHP_EOL . "parent.document.getElementById('sidebarsaved').style.display = ''; ";
+        echo PHP_EOL . "parent.document.getElementById('sidebarsettings').style.display = 'none'; ";
         echo "</script>";
 
         // --- maybe call Special Update Options ---
-        $funcname = $prefix.'_update_sidebar_options_special';
-        if (function_exists($funcname)) {call_user_func($funcname);}
+        $funcname = $prefix . '_update_sidebar_options_special';
+        if ( function_exists( $funcname ) ) {
+            call_user_func( $funcname );
+        }
     }
 
@@ -2260 +2828 @@
 // Sticky Kit Javascript
 // ---------------------
-$funcname = 'wqhelper_sidebar_stickykitscript_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
- $wqfunctions[$funcname] = function() {
-return '<script>/* Sticky-kit v1.1.2 | WTFPL | Leaf Corcoran 2015 | http://leafo.net */
+// 1.8.1: added echo argument to function
+$funcname = 'wqhelper_sidebar_stickykitscript_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $echo = false ) {
+
+    // 1.8.1: added for backwards compatibility
+    if ( !$echo ) {
+        ob_start();
+    }
+
+    echo '<script>/* Sticky-kit v1.1.2 | WTFPL | Leaf Corcoran 2015 | http://leafo.net */
 (function(){var b,f;b=this.jQuery||window.jQuery;f=b(window);b.fn.stick_in_parent=function(d){var A,w,J,n,B,K,p,q,k,E,t;null==d&&(d={});t=d.sticky_class;B=d.inner_scrolling;E=d.recalc_every;k=d.parent;q=d.offset_top;p=d.spacer;w=d.bottoming;null==q&&(q=0);null==k&&(k=void 0);null==B&&(B=!0);null==t&&(t="is_stuck");A=b(document);null==w&&(w=!0);J=function(a,d,n,C,F,u,r,G){var v,H,m,D,I,c,g,x,y,z,h,l;if(!a.data("sticky_kit")){a.data("sticky_kit",!0);I=A.height();g=a.parent();null!=k&&(g=g.closest(k));
 if(!g.length)throw"failed to find stick parent";v=m=!1;(h=null!=p?p&&a.closest(p):b("<div />"))&&h.css("position",a.css("position"));x=function(){var c,f,e;if(!G&&(I=A.height(),c=parseInt(g.css("border-top-width"),10),f=parseInt(g.css("padding-top"),10),d=parseInt(g.css("padding-bottom"),10),n=g.offset().top+c+f,C=g.height(),m&&(v=m=!1,null==p&&(a.insertAfter(h),h.detach()),a.css({position:"",top:"",width:"",bottom:""}).removeClass(t),e=!0),F=a.offset().top-(parseInt(a.css("margin-top"),10)||0)-q,
@@ -2270 +2845 @@
 a.css({position:"absolute",bottom:d,top:"auto"}).trigger("sticky_kit:bottom")},y=function(){x();return l()},H=function(){G=!0;f.off("touchmove",l);f.off("scroll",l);f.off("resize",y);b(document.body).off("sticky_kit:recalc",y);a.off("sticky_kit:detach",H);a.removeData("sticky_kit");a.css({position:"",bottom:"",top:"",width:""});g.position("position","");if(m)return null==p&&("left"!==r&&"right"!==r||a.insertAfter(h),h.remove()),a.removeClass(t)},f.on("touchmove",l),f.on("scroll",l),f.on("resize",
 y),b(document.body).on("sticky_kit:recalc",y),a.on("sticky_kit:detach",H),setTimeout(l,0)}};n=0;for(K=this.length;n<K;n++)d=this[n],J(b(d));return this}}).call(this);</script>';
+
+    // 1.8.1 added for backwards compatibility
+    if ( !$echo ) {
+        $stickykit = ob_get_contents();
+        ob_end_clean();
+        return $stickykit;
+    }
  };
 } // '
@@ -2276 +2858 @@
 // Float Menu Javascript
 // ---------------------
-$funcname = 'wqhelper_sidebar_floatmenuscript_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
- $wqfunctions[$funcname] = function() {
-
-    return "
+// 1.8.1: added echo argument to function
+$funcname = 'wqhelper_sidebar_floatmenuscript_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $echo = false ) {
+
+    // 1.8.1: added for backwards compatibility
+    if ( !$echo ) {
+        ob_start();
+    }
+
+    echo "
     <style>.floatbox {position:absolute;width:250px;top:30px;right:15px;z-index:100;}</style>
 
-    <script language='javascript' type='text/javascript'>
+    <script>
     /* Script by: www.jtricks.com
      * Version: 1.8 (20111103)
@@ -2507 +3095 @@
     }
     </script>";
+
+    // 1.8.1: added for backwards compatibility
+    if ( !$echo ) {
+        $floatbox = ob_get_contents();
+        ob_end_clean();
+        return $floatbox;
+    }
  };
 }
@@ -2518 +3113 @@
 // Add the Dashboard Feed Widget
 // -----------------------------
+// 1.7.8: simplify dashboard detection
 $requesturi = $_SERVER['REQUEST_URI'];
-if ( (preg_match('|index.php|i', $requesturi))
-  || (substr($requesturi, -(strlen('/wp-admin/'))) == '/wp-admin/')
-  || (substr($requesturi, -(strlen('/wp-admin/network'))) == '/wp-admin/network/') ) {
-    if (!has_action('wp_dashboard_setup', 'wqhelper_add_dashboard_feed_widget')) {
-        add_action('wp_dashboard_setup', 'wqhelper_add_dashboard_feed_widget');
+if ( ( preg_match( '|index.php|i', $requesturi ) )
+    || ( stristr( $requesturi, '/wp-admin/' ) )
+    || ( stristr( $requesturi, '/wp-admin/network/' ) ) ) {
+    if ( !has_action( 'wp_dashboard_setup', 'wqhelper_add_dashboard_feed_widget' ) ) {
+        add_action( 'wp_dashboard_setup', 'wqhelper_add_dashboard_feed_widget' );
     }
 }
@@ -2530 +3126 @@
 // Load the Dashboard Feeds
 // ------------------------
-$funcname = 'wqhelper_add_dashboard_feed_widget_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_add_dashboard_feed_widget_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
 
     global $wp_meta_boxes, $current_user;
-    if (current_user_can('manage_options') || current_user_can('install_plugins')) {
+    if ( current_user_can( 'manage_options' ) || current_user_can( 'install_plugins' ) ) {
 
         // --- check if already loaded ---
         // 1.6.1: fix to undefined index warning
         $wordquestloaded = $pluginreviewloaded = false;
-        foreach (array_keys($wp_meta_boxes['dashboard']['normal']['core']) as $name) {
-            if ($name == 'wordquest') {$wordquestloaded = true;}
-            if ($name == 'pluginreview') {$pluginreviewloaded = true;}
+        foreach ( array_keys( $wp_meta_boxes['dashboard']['normal']['core'] ) as $name ) {
+            if ( 'wordquest' == $name ) {
+                $wordquestloaded = true;
+            }
+            if ( 'pluginreview' == $name ) {
+                $pluginreviewloaded = true;
+            }
         }
 
         // --- maybe add wordquest feed widget
-        if (!$wordquestloaded) {
-            wp_add_dashboard_widget('wordquest', 'WordQuest Alliance', 'wqhelper_dashboard_feed_widget');
+        if ( !$wordquestloaded ) {
+            wp_add_dashboard_widget( 'wordquest', 'WordQuest Alliance', 'wqhelper_dashboard_feed_widget' );
         }
 
         // --- maybe add plugin review feed widget ---
-        if (!$pluginreviewloaded) {
-            wp_add_dashboard_widget('pluginreview', 'Plugin Review Network', 'wqhelper_pluginreview_feed_widget');
+        if ( !$pluginreviewloaded ) {
+            wp_add_dashboard_widget( 'pluginreview', 'Plugin Review Network', 'wqhelper_pluginreview_feed_widget' );
         }
 
         // --- enqueue dashboard feed javascript ---
-        if (!has_action('admin_footer', 'wqhelper_dashboard_feed_javascript')) {
-            add_action('admin_footer', 'wqhelper_dashboard_feed_javascript');
+        if ( !has_action( 'admin_footer', 'wqhelper_dashboard_feed_javascript' ) ) {
+            add_action( 'admin_footer', 'wqhelper_dashboard_feed_javascript' );
         }
     }
@@ -2566 +3166 @@
 // WordQuest Dashboard Feed Javascript
 // -----------------------------------
-$funcname = 'wqhelper_dashboard_feed_javascript_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_dashboard_feed_javascript_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
-    echo "<script>
-    function doloadfeedcat(namespace,siteurl) {
-        var selectelement = document.getElementById(namespace+'catselector');
-        var catslug = selectelement.options[selectelement.selectedIndex].value;
-        var siteurl = encodeURIComponent(siteurl);
-        document.getElementById('feedcatloader').src='admin-ajax.php?action=wqhelper_load_feed_category&category='+catslug+'&namespace='+namespace+'&siteurl='+siteurl;
+    // 1.8.0: added get admin AJAX URL
+    $adminajax = admin_url( 'admin-ajax.php' );
+    // 1.8.0: removed siteurl from function for security
+    echo "<script>function wq_load_feed_cat(site) {
+        selectelement = document.getElementById(site+'catselector');
+        catslug = selectelement.options[selectelement.selectedIndex].value;
+        url = '" . esc_url( $adminajax ) . "?action=wqhelper_load_feed_category&category='+catslug+'&site='+site;
+        document.getElementById('feedcatloader').src = url;
+        
     }</script>";
-    echo "<iframe src='javascript:void(0);' id='feedcatloader' style='display:none;'></iframe>";
+    echo '<iframe src="javascript:void(0);" id="feedcatloader" style="display:none;"></iframe>';
  };
 }
@@ -2583 +3186 @@
 // WordQuest Dashboard Feed Widget
 // -------------------------------
-$funcname = 'wqhelper_dashboard_feed_widget_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_dashboard_feed_widget_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
 
@@ -2591 +3194 @@
     global $wqdebug, $wqreleases, $wqurls;
     $latestrelease = $nextrelease = '';
-    if (isset($wqreleases)) {
-        if (isset($wqreleases['latest'])) {$latestrelease = $wqreleases['latest'];}
-        if (isset($wqreleases['next'])) {$nextrelease = $wqreleases['next'];}
+
+    if ( isset( $wqreleases ) ) {
+        if ( isset( $wqreleases['latest'] ) ) {
+            $latestrelease = $wqreleases['latest'];
+        }
+        if ( isset( $wqreleases['next'] ) ) {
+            $nextrelease = $wqreleases['next'];
+        }
     } else {
         $pluginsinfo = wqhelper_get_plugin_info();
-        if (is_array($pluginsinfo)) {
-            foreach ($pluginsinfo as $plugin) {
-                if (isset($plugin['slug'])) {
-                    if ( (isset($plugin['latestrelease']) && ($plugin['latestrelease'] == 'yes'))
-                      || (isset($plugin['nextrelease']) && ($plugin['nextrelease'] == 'yes')) ) {
-                        $plugininfo = $plugin; $plugins = get_plugins(); $plugininfo['installed'] = 'no';
-                        foreach ($plugins as $pluginfile => $values) {
-                            if ($plugininfo['slug'] == sanitize_title($values['Name'])) {$plugininfo['installed'] = 'yes';}
+        if ( is_array( $pluginsinfo ) ) {
+            foreach ( $pluginsinfo as $plugin ) {
+                if ( isset( $plugin['slug'] ) ) {
+                    if ( ( isset( $plugin['latestrelease'] ) && ( 'yes' == $plugin['latestrelease'] ) )
+                      || ( isset( $plugin['nextrelease'] ) && ( 'yes' == $plugin['nextrelease'] ) ) ) {
+                        $plugininfo = $plugin;
+                        $plugins = get_plugins();
+                        $plugininfo['installed'] = 'no';
+                        foreach ( $plugins as $pluginfile => $values ) {
+                            if ( sanitize_title( $values['Name'] ) == $plugininfo['slug'] ) {
+                                $plugininfo['installed'] = 'yes';
+                            }
                         }
                     }
-                    if (isset($plugin['latestrelease']) && ($plugin['latestrelease'] == 'yes')) {$latestrelease = $plugininfo;}
-                    if (isset($plugin['nextrelease']) && ($plugin['nextrelease'] == 'yes')) {$nextrelease = $plugininfo;}
-                }
-            }
-        }
-    }
-    // echo "<!-- Latest Release: "; print_r($latestrelease); echo " -->";
-    // echo "<!-- Next Release: "; print_r($nextrelease); echo " -->";
+                    if ( isset( $plugin['latestrelease'] ) && ( 'yes' == $plugin['latestrelease'] ) ) {
+                        $latestrelease = $plugininfo;
+                    }
+                    if ( isset( $plugin['nextrelease'] ) && ( 'yes' == $plugin['nextrelease'] ) ) {
+                        $nextrelease = $plugininfo;
+                    }
+                }
+            }
+        }
+    }
+    // echo "<!-- Latest Release: " . print_r( $latestrelease, true ) . " -->";
+    // echo "<!-- Next Release: " . print_r( $nextrelease, true ) . " -->";
 
     // maybe Display Latest Release Info
     // ---------------------------------
-    if (isset($_REQUEST['page']) && ($_REQUEST['page'] == 'wordquest')) {
+    // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+    if ( isset( $_REQUEST['page'] ) && ( 'wordquest' == sanitize_title( $_REQUEST['page'] ) ) ) {
+
         // --- do not duplicate here as already output for wordquest page ---
-    } elseif (isset($latestrelease) && is_array($latestrelease) && ($latestrelease['installed'] == 'no')) {
-
-        echo "<b>".wqhelper_translate('Latest Plugin Release')."</b><br>";
-        echo "<table><tr><td align='center'><img src='".$latestrelease['icon']."' width='75' height='75'><br>";
-        echo "<a href='".$latestrelease['home']."' target=_blank><b>".$latestrelease['title']."</b></a></td>";
-        echo "<td width='10'></td><td><span style='font-size:9pt;'>".$latestrelease['description']."</span><br><br>";
-
-        if (isset($latestrelease['package']) && is_array($latestrelease['package'])) {
-
-            // 1.6.6: check for wordpress.org only installs
-            global $wordpressorgonly; $installlink = false;
-            if ($wordpressorgonly && $wqplugin['wporgslug']) {
-                $installlink = self_admin_url('update.php')."?action=install-plugin&plugin=".$latestrelease['wporgslug'];
-                $installlink = wp_nonce_url($installlink, 'install-plugin_'.$latestrelease['wporgslug']);
-            } else {
-                admin_url('update.php').'?action=wordquest_plugin_install&plugin='.$latestrelease['slug'];
-                $installlink = wp_nonce_url($installlink, 'plugin-upload');
-            }
-            if ($installlink) {
-                echo "<input type='hidden' name='".$latestrelease['slug']."-install-link' value='".$installlink."'>";
-                echo "<center><a href='".$installlink."' class='button-primary'>".wqhelper_translate('Install Now')."</a></center>";
-            } else {
-                $pluginlink = $wqurls['wq'].'/plugins/'.$latestrelease['slug'];
-                echo "<center><a href='".$pluginlink."' class='button-primary' target=_blank>&rarr; ".wqhelper_translate('Plugin Home')."</a></center>";
-            }
-        }
-        echo "</td></tr></table><br>";
-
-    } elseif (isset($nextrelease) && is_array($nextrelease)) {
-
-        echo "<b>".wqhelper_translate('Upcoming Plugin Release')."</b><br>";
-        echo "<table><tr><td align='center'><img src='".$nextrelease['icon']."' width='75' height='75'><br>";
-        echo "<a href='".$nextrelease['home']."' target=_blank><b>".$nextrelease['title']."</b></a></td>";
-        echo "<td width='10'></td><td><span style='font-size:9pt;'>".$nextrelease['description']."</span><br><br>";
-        $releasetime = strtotime($nextrelease['releasedate']);
-        echo "<center><span style='font-size:9pt;'>".wqhelper_translate('Expected').": ".date('jS F Y', $releasetime)."</span></center>";
-        echo "</td></tr></table><br>";
+        echo '';
+
+    } elseif ( isset( $latestrelease ) && is_array( $latestrelease ) && ( 'no' == $latestrelease['installed'] ) ) {
+
+        echo '<b>' . esc_html( wqhelper_translate( 'Latest Plugin Release' ) ) . '</b><br>';
+        echo '<table><tr><td align="center">';
+            echo '<img src="' . esc_url( $latestrelease['icon'] ) . '" width="75" height="75" alt="' . esc_attr( wqhelper_translate( 'Latest Release Icon' ) ) . '"><br>';
+            echo '<a href="' . esc_url( $latestrelease['home'] ) . '" target="_blank"><b>' . esc_html( $latestrelease['title'] ) . '</b></a>';
+        echo '</td><td width="10"></td><td>';
+            echo '<span style="font-size:9pt;">' . esc_html( $latestrelease['description'] ) . '</span><br><br>';
+
+            if ( isset( $latestrelease['package'] ) && is_array( $latestrelease['package'] ) ) {
+
+                // 1.6.6: check for wordpress.org only installs
+                global $wq_wordpress_org;
+                $installlink = false;
+                // 1.8.0: fix to variable typo (wqplugin)
+                if ( $wq_wordpress_org && $latestrelease['wporgslug'] ) {
+                    $installlink = self_admin_url( 'update.php' ) . '?action=install-plugin&plugin=' . $latestrelease['wporgslug'];
+                    $installlink = wp_nonce_url( $installlink, 'install-plugin_' . $latestrelease['wporgslug'] );
+                } else {
+                    // 1.8.0: fix to missing left hand side variable installlink
+                    $installlink = admin_url( 'update.php' ) . '?action=wordquest_plugin_install&plugin=' . $latestrelease['slug'];
+                    $installlink = wp_nonce_url( $installlink, 'plugin-upload' );
+                }
+                if ( $installlink ) {
+                    echo '<input type="hidden" name="' . esc_attr( $latestrelease['slug'] ) . '-install-link" value="' . esc_url( $installlink ) . '">';
+                    echo '<center><a href="' . esc_url( $installlink ) . '" class="button-primary">' . esc_html( wqhelper_translate( 'Install Now' ) ) . '</a></center>';
+                } else {
+                    $pluginlink = $wqurls['wq'] . '/plugins/' . $latestrelease['slug'];
+                    echo '<center><a href="' . esc_url( $pluginlink ) . '" class="button-primary" target="_blank">&rarr; ' . esc_html( wqhelper_translate( 'Plugin Home' ) ) . '</a></center>';
+                }
+            }
+
+        echo '</td></tr></table><br>';
+
+    } elseif ( isset( $nextrelease ) && is_array( $nextrelease ) ) {
+
+        echo '<b>' . esc_html( wqhelper_translate( 'Upcoming Plugin Release' ) ) . '</b><br>';
+        echo '<table><tr><td align="center">';
+            echo '<img src="' . esc_url( $nextrelease['icon'] ) . '" width="75" height="75"alt="' . esc_attr( wqhelper_translate( 'Next Release Icon' ) ) . '"><br>';
+            echo '<a href="' . esc_url( $nextrelease['home'] ) . '" target="_blank"><b>' . esc_html( $nextrelease['title'] ) . '</b></a>';
+        echo '</td><td width="10"></td><td><span style="font-size:9pt;">' . esc_html( $nextrelease['description'] ) . '</span><br><br>';
+        $releasetime = strtotime( $nextrelease['releasedate'] );
+        echo '<center><span style="font-size:9pt;">' . esc_html( wqhelper_translate( 'Expected' ) ) . ': ' . esc_html( date( 'jS F Y', $releasetime ) ) . '</span></center>';
+        echo '</td></tr></table><br>';
 
     }
@@ -2664 +3291 @@
     // WordQuest Posts Feed
     // --------------------
-    $rssurl = $wqurls['wq']."/category/guides/feed/";
-    if ($wqdebug) {$feed = ''; delete_transient('wordquest_guides_feed');}
-    else {$feed = trim(get_transient('wordquest_guides_feed'));}
+    $rssurl = $wqurls['wq'] . '/category/guides/feed/';
+    if ( $wqdebug ) {
+        $feed = '';
+        delete_transient( 'wordquest_guides_feed' );
+    } else {
+        $feed = trim( get_transient( 'wordquest_guides_feed' ) );
+    }
 
     // --- fetch posts feed ---
-    if (!$feed || ($feed == '')) {
-        $rssfeed = fetch_feed($rssurl); $feeditems = 4;
-        $args = array($rssfeed, $feeditems);
-        $feed = wqhelper_process_rss_feed($args);
-        if ($feed != '') {set_transient('wordquest_guides_feed', $feed, (24*60*60));}
+    if ( !$feed || ( '' == $feed ) ) {
+        $rssfeed = fetch_feed( $rssurl );
+        $feeditems = 4;
+        $args = array( $rssfeed, $feeditems );
+        $feed = wqhelper_process_rss_feed( $args );
+        if ( '' != $feed ) {
+            set_transient( 'wordquest_guides_feed', $feed, ( 24 * 60 * 60 ) );
+        }
     }
 
     // --- WordQuest Guides ----
-    echo "<div id='wordquestguides'>";
-    echo "<div style='float:right;'>&rarr;<a href='".$wqurls['wq']."/category/guides/' class='feedlink' target=_blank> ".wqhelper_translate('More')."...</a></div>";
-    echo "<b><a href='".$wqurls['wq']."/category/guides/' class='feedlink' target=_blank>".wqhelper_translate('Latest WordQuest Guides')."</a></b><br>";
-    if ($feed != '') {echo $feed;} else {echo wqhelper_translate('Feed Currently Unavailable.'); delete_transient('wordquest_guides_feed');}
-    echo "</div>";
+    echo '<div id="wordquestguides">';
+    echo '<div style="float:right;">&rarr;<a href="' . esc_url( $wqurls['wq'] ) . '/category/guides/" class="feedlink" target="_blank"> ' . esc_html( wqhelper_translate( 'More' ) ) . '...</a></div>';
+    echo '<b><a href="' . esc_url( $wqurls['wq'] ) . '/category/guides/" class="feedlink" target="_blank">' . esc_html( wqhelper_translate( 'Latest WordQuest Guides' ) ) . '</a></b><br>';
+    if ( '' != $feed ) {
+        // 1.8.1: use wp_kses_post on feed output
+        echo wp_kses_post( $feed );
+    } else {
+        echo esc_html( wqhelper_translate( 'Feed Currently Unavailable.' ) );
+        delete_transient( 'wordquest_guides_feed' );
+    }
+    echo '</div>';
 
     // WordQuest Solutions Feed
     // ------------------------
-    $rssurl = $wqurls['wq']."/quest/feed/";
-    if ($wqdebug) {$feed = ''; delete_transient('wordquest_quest_feed');}
-    else {$feed = trim(get_transient('wordquest_quest_feed'));}
+    $rssurl = $wqurls['wq'] . '/quest/feed/';
+    if ( $wqdebug ) {
+        $feed = '';
+        delete_transient( 'wordquest_quest_feed' );
+    } else {
+        $feed = trim( get_transient( 'wordquest_quest_feed' ) );
+    }
 
     // --- fetch solutions feed ---
-    if (!$feed || ($feed == '')) {
-        $rssfeed = fetch_feed($rssurl); $feeditems = 4;
-        $args = array($rssfeed, $feeditems);
-        $feed = wqhelper_process_rss_feed($args);
-        if ($feed != '') {set_transient('wordquest_quest_feed', $feed, (24*60*60));}
+    if ( !$feed || ( '' != $feed ) ) {
+        $rssfeed = fetch_feed( $rssurl );
+        $feeditems = 4;
+        $args = array( $rssfeed, $feeditems );
+        $feed = wqhelper_process_rss_feed( $args );
+        if ( '' != $feed ) {
+            set_transient( 'wordquest_quest_feed', $feed, ( 24 * 60 * 60 ) );
+        }
     }
 
     // --- output solutions feed ---
-    echo "<div id='wordquestsolutions'>";
-    echo "<div style='float:right;'>&rarr;<a href='".$wqurls['wq']."/solutions/' class='feedlink' target=_blank> ".wqhelper_translate('More')."...</a></div>";
-    echo "<b><a href='".$wqurls['wq']."/solutions/' class='feedlink' target=_blank>".wqhelper_translate('Latest Solution Quests')."</a></b>";
-    if ($feed != '') {echo $feed;} else {echo wqhelper_translate('Feed Currently Unavailable.'); delete_transient('wordquest_quest_feed');}
-    echo "</div>";
+    echo '<div id="wordquestsolutions">';
+    echo '<div style="float:right;">&rarr;<a href="' . esc_url( $wqurls['wq'] ) . '/solutions/" class="feedlink" target="_blank"> ' . esc_html( wqhelper_translate( 'More' ) ) . '...</a></div>';
+    echo '<b><a href="' . esc_url( $wqurls['wq'] ) . '/solutions/" class="feedlink" target="_blank">' . esc_html( wqhelper_translate( 'Latest Solution Quests' ) ) . '</a></b><br>';
+    if ( '' != $feed ) {
+        // 1.8.1: use wp_kses_post on feed output
+        echo wp_kses_post( $feed );
+    } else {
+        echo esc_html( wqhelper_translate( 'Feed Currently Unavailable.' ) );
+        delete_transient( 'wordquest_quest_feed' );
+    }
+    echo '</div>';
 
     return;
 
-    // --------------------------
-    // currently not implented...
-
+    // -----------------------
     // Category Feed Selection
     // -----------------------
-    $pluginsurl = $wqurls['wq']."/?get_post_categories=yes";
-
-    if ($wqdebug) {$categorylist = ''; delete_transient('wordquest_feed_cats');}
-    else {$categorylist = trim(get_transient('wordquest_feed_cats'));}
-
-    if (!$categorylist || ($categorylist == '')) {
-        $args = array('timeout' => 10);
-        $getcategorylist = wp_remote_get($pluginsurl, $args);
-        if (!is_wp_error($getcategorylist)) {
+    // [currently not implented...]
+
+    /* $pluginsurl = $wqurls['wq'] . '/?get_post_categories=yes';
+
+    if ( $wqdebug ) {
+        $categorylist = '';
+        delete_transient( 'wordquest_feed_cats' );
+    } else {
+        $categorylist = trim( get_transient( 'wordquest_feed_cats' ) );
+    }
+
+    if ( !$categorylist || ( '' == $categorylist ) ) {
+        $args = array( 'timeout' => 10 );
+        $getcategorylist = wp_remote_get( $pluginsurl, $args );
+        if ( !is_wp_error( $getcategorylist ) ) {
             $categorylist = $getcategorylist['body'];
-            if ($categorylist) {set_transient('wordquest_feed_cats', $categorylist, (24*60*60));}
-        }
-    }
-
-    if (strstr($categorylist, "::::")) {
-        $categories = explode("::::", $categorylist);
-        if (count($categories) > 0) {
+            if ( $categorylist ) {
+                set_transient( 'wordquest_feed_cats', $categorylist, ( 24 * 60 * 60 ) );
+            }
+        }
+    }
+
+    if ( strstr( $categorylist, '::::' ) ) {
+        $categories = explode( '::::', $categorylist );
+        if ( count( $categories ) > 0 ) {
             $i = 0;
-            foreach ($categories as $category) {
-                $catinfo = explode("::", $category);
+            foreach ( $categories as $category ) {
+                $catinfo = explode( '::', $category );
                 $cats[$i]['name'] = $catinfo[0];
                 $cats[$i]['slug'] = $catinfo[1];
@@ -2737 +3396 @@
             }
 
-            if (count($cats) > 0) {
-                echo "<table><tr><td><b>".wqhelper_translate('Category').":</b></td>";
-                echo "<td width='7'></td>";
-                echo "<td><select id='wqcatselector' onchange='doloadfeedcat(\"wq\",\"".$wqurls['wq']."\");'>";
-                // echo "<option value='news' selected='selected'>WordQuest News</option>";
-                foreach ($cats as $cat) {
-                    echo "<option value='".$cat['slug']."'";
-                        if ($cat['slug'] == 'news') {echo " selected='selected'";}
-                    echo ">".$cat['name']." (".$cat['count'].")</option>";
-                }
-                echo "</select></td></tr></table>";
-                echo "<div id='wqfeeddisplay'></div>";
-            }
-        }
-    }
+            if ( count( $cats ) > 0 ) {
+                echo '<table><tr><td>';
+                    echo '<b>' . esc_html( wqhelper_translate( 'Category' ) ) . ':</b>';
+                    echo '</td><td width="7"></td><td>';
+                        echo '<select id="wqcatselector" onchange="wq_load_feed_cat(\'wq\',\'' . esc_url( $wqurls['wq'] ) . '\');">';
+                // echo '<option value="news" selected="selected">WordQuest News</option>';
+                foreach ( $cats as $cat ) {
+                    echo '<option value="' . esc_attr( $cat['slug'] ) . '"';
+                    if ( 'news' == $cat['slug'] ) {
+                        echo " selected='selected'";
+                    }
+                    echo '>' . esc_html( $cat['name'] ) . ' (' . esc_html( $cat['count'] ) . ')</option>';
+                }
+                echo '</select></td></tr></table>';
+                echo '<div id="wqfeeddisplay"></div>';
+            }
+        }
+    } */
  };
 }
@@ -2758 +3420 @@
 // Plugin Review Network Feed Widget
 // ---------------------------------
-$funcname = 'wqhelper_pluginreview_feed_widget_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_pluginreview_feed_widget_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
 
@@ -2768 +3430 @@
     // -------------------
     global $wqdebug, $wqurls;
-    $rssurl = $wqurls['prn']."/feed/";
-    if ($wqdebug) {$feed = ''; delete_transient('pluginreview_newest_feed');}
-    else {$feed = trim(get_transient('pluginreview_newest_feed'));}
+    $rssurl = $wqurls['prn'] . '/feed/';
+    if ( $wqdebug ) {
+        $feed = '';
+        delete_transient( 'pluginreview_newest_feed' );
+    } else {
+        $feed = trim( get_transient( 'pluginreview_newest_feed' ) );
+    }
 
     // --- fetch new plugins feed ---
-    if (!$feed || ($feed == '')) {
-        $rssfeed = fetch_feed($rssurl); $feeditems = 4;
-        $args = array($rssfeed, $feeditems);
-        $feed = wqhelper_process_rss_feed($args);
-        if ($feed != '') {set_transient('pluginreview_newest_feed', $feed, (24*60*60));}
-    }
-
-    echo "<center><b><a href='".$wqurls['prn']."/directory/' class='feedlink' style='font-size:11pt;' target=_blank>";
-    echo wqhelper_translate('NEW', 'bioship').' '.wqhelper_translate('Plugin Directory')." - ".wqhelper_translate('by Category')."!</a></b></center><br>";
-    echo "<div id='pluginslatest'>";
+    if ( !$feed || ( '' == $feed ) ) {
+        $rssfeed = fetch_feed( $rssurl );
+        $feeditems = 4;
+        $args = array( $rssfeed, $feeditems );
+        $feed = wqhelper_process_rss_feed( $args );
+        if ( '' != $feed ) {
+            set_transient( 'pluginreview_newest_feed', $feed, ( 24 * 60 * 60 ) );
+        }
+    }
+
+    echo '<center><b><a href="' . esc_url( $wqurls['prn'] ) . '/directory/" class="feedlink" style="font-size:11pt;" target="_blank">';
+    echo esc_html( wqhelper_translate( 'NEW' ) ) . ' ';
+    echo esc_html( wqhelper_translate( 'Plugin Directory' ) ) . ' - ';
+    echo esc_html( wqhelper_translate( 'by Category' ) ) . '!</a></b></center><br>';
+    echo '<div id="pluginslatest">';
 
     // --- ouput latest plugins feed ---
-    echo "<div style='float:right;'>&rarr;<a href='".$wqurls['prn']."/directory/latest/' class='feedlink' target=_blank> ".wqhelper_translate('More')."...</a></div>";
-    if ($feed != '') {echo "<b>".wqhelper_translate('Latest Plugin Releases')."</b><br>".$feed;}
-    else {echo wqhelper_translate('Feed Currently Unavailable'); delete_transient('prn_feed');}
-    echo "</div>";
+    echo '<div style="float:right;">&rarr;<a href="' . esc_url( $wqurls['prn'] ) . '/directory/latest/" class="feedlink" target="_blank"> ' . esc_html( wqhelper_translate( 'More' ) ) . '...</a></div>';
+    if ( '' != $feed ) {
+        echo '<b>' . esc_html( wqhelper_translate( 'Latest Plugin Releases' ) ) . '</b><br>';
+        // 1.8.1: use wp_kses_post on feed output
+        echo wp_kses_post( $feed );
+    } else {
+        echo esc_html( wqhelper_translate( 'Feed Currently Unavailable' ) );
+        delete_transient( 'prn_feed' );
+    }
+    echo '</div>';
 
     // Recently Updated Feed
     // ---------------------
-    $rssurl = $wqurls['prn']."/feed/?orderby=modified";
-    if ($wqdebug) {$feed = ''; delete_transient('pluginreview_updated_feed');}
-    else {$feed = trim(get_transient('pluginreview_updated_feed'));}
+    $rssurl = $wqurls['prn'] . '/feed/?orderby=modified';
+    if ( $wqdebug ) {
+        $feed = '';
+        delete_transient( 'pluginreview_updated_feed' );
+    } else {
+        $feed = trim( get_transient( 'pluginreview_updated_feed' ) );
+    }
 
     // --- fetch recently updated feed ---
-    if (!$feed || ($feed == '')) {
-        $rssfeed = fetch_feed($rssurl); $feeditems = 4;
-        $args = array($rssfeed, $feeditems);
-        $feed = wqhelper_process_rss_feed($args);
-        if ($feed != '') {set_transient('pluginreview_updated_feed', $feed, (24*60*60));}
+    if ( !$feed || ( '' == $feed ) ) {
+        $rssfeed = fetch_feed( $rssurl );
+        $feeditems = 4;
+        $args = array( $rssfeed, $feeditems );
+        $feed = wqhelper_process_rss_feed( $args );
+        if ( '' != $feed ) {
+            set_transient( 'pluginreview_updated_feed', $feed, ( 24 * 60 * 60 ) );
+        }
     }
 
     // --- output recently updated feed ---
-    echo "<div id='pluginsupdated'>";
-    echo "<div style='float:right;'>&rarr;<a href='".$wqurls['prn']."/directory/updated/' class='feedlink' target=_blank> ".wqhelper_translate('More')."...</a></div>";
-    if ($feed != '') {echo "<b>".wqhelper_translate('Recently Updated Plugins')."</b><br>".$feed;}
-    else {echo wqhelper_translate('Feed Currently Unavailable'); delete_transient('prn_feed');}
-    echo "</div>";
+    echo '<div id="pluginsupdated">';
+    echo '<div style="float:right;">&rarr;<a href="' . esc_url( $wqurls['prn'] ) . '/directory/updated/" class="feedlink" target="_blank"> ' . esc_html( wqhelper_translate( 'More' ) ) . '...</a></div>';
+    if ( '' != $feed ) {
+        echo '<b>' . esc_html( wqhelper_translate( 'Recently Updated Plugins' ) ) . '</b><br>';
+        // 1.8.1: use wp_kses_post on feed output
+        echo wp_kses_post( $feed );
+    } else {
+        echo esc_html( wqhelper_translate( 'Feed Currently Unavailable' ) );
+        delete_transient( 'prn_feed' );
+    }
+    echo '</div>';
 
     return;
 
-    // --------------------------
-    // currently not implented...
-
+    // -----------------------
     // Category Feed Selection
     // -----------------------
-    $categoryurl = $wqurls['prn']."/?get_review_categories=yes";
+    // [currently not implented...]
+
+    /* $categoryurl = $wqurls['prn'] . '/?get_review_categories=yes';
 
     // refresh once a day only to limit downloads
-    if ($wqdebug) {$categorylist = ''; delete_transient('prn_feed_cats');}
-    else {$categorylist = trim(get_transient('prn_feed_cats'));}
-
-    if (!$categorylist || ($categorylist == '')) {
-        $args = array('timeout' => 10);
-        $getcategorylist = wp_remote_get($categoryurl, $args);
-        if (!is_wp_error($getcategorylist)) {
+    if ( $wqdebug ) {
+        $categorylist = '';
+        delete_transient('prn_feed_cats');
+    } else {
+        $categorylist = trim( get_transient( 'prn_feed_cats' ) );
+    }
+
+    if ( !$categorylist || ( '' == $categorylist ) ) {
+        $args = array( 'timeout' => 10 );
+        $getcategorylist = wp_remote_get( $categoryurl, $args );
+        if ( !is_wp_error( $getcategorylist ) ) {
             $categorylist = $getcategorylist['body'];
-            if ($categorylist) {set_transient('prn_feed_cats', $categorylist, (24*60*60));}
-        }
-    }
-
-    if (strstr($categorylist, "::::")) {
-        $categories = explode("::::", $categorylist);
-        if (count($categories) > 0) {
+            if ( $categorylist ) {
+                set_transient( 'prn_feed_cats', $categorylist, ( 24 * 60 * 60 ) );
+            }
+        }
+    }
+
+    if ( strstr( $categorylist, '::::' ) ) {
+        $categories = explode( '::::', $categorylist );
+        if ( count( $categories) > 0 ) {
             $i = 0;
-            foreach ($categories as $category) {
-                $catinfo = explode("::", $category);
+            foreach ( $categories as $category ) {
+                $catinfo = explode( '::', $category);
                 $cats[$i]['name'] = $catinfo[0];
                 $cats[$i]['slug'] = $catinfo[1];
@@ -2845 +3541 @@
             }
 
-            if (count($cats) > 0) {
-                echo "<table><tr><td><b>".wqhelper_translate('Category').":</b></td>";
-                echo "<td width='7'></td>";
-                echo "<td><select id='prncatselector' onchange='doloadfeedcat(\"prn\",\"".$wqurls['prn']."\");'>";
-                // echo "<option value='reviews' selected='selected'>".wqhelper_translate('Plugin Reviews')."</option>";
-                foreach ($cats as $cat) {
-                    echo "<option value='".$cat['slug']."'";
-                        if ($cat['slug'] == 'reviews') {echo " selected='selected'";}
-                    echo ">".$cat['name']." (".$cat['count'].")</option>";
-                }
-                echo "</select></td></tr></table>";
-                echo "<div id='prnfeeddisplay'></div>";
-            }
-        }
-    }
+            if ( count( $cats ) > 0 ) {
+                echo '<table><tr><td>';
+                    echo '<b>' . esc_html( wqhelper_translate( 'Category' ) ) . ':</b>';
+                echo '</td><td width="7"></td><td>';
+                    echo "<select id='prncatselector' onchange='wq_load_feed_cat(\"prn\",\"".$wqurls['prn']."\");'>";
+                    // echo "<option value='reviews' selected='selected'>".wqhelper_translate('Plugin Reviews')."</option>";
+                    foreach ( $cats as $cat ) {
+                        echo '<option value="' . esc_attr( $cat['slug'] ) . '"';
+                        if ( 'reviews' == $cat['slug'] ) {
+                            echo ' selected="selected"';
+                        }
+                        echo '>' . esc_html( $cat['name'] ) . ' (' . esc_html( $cat['count'] ) . ')</option>';
+                    }
+                    echo '</select>';
+                echo '</td></tr></table>';
+                echo '<div id="prnfeeddisplay"></div>';
+            }
+        }
+    } */
  };
 }
@@ -2866 +3566 @@
 // Load a Category Feed
 // --------------------
-$funcname = 'wqhelper_load_feed_category_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
+$funcname = 'wqhelper_load_feed_category_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
  $wqfunctions[$funcname] = function() {
 
-    $namespace = $_GET['namespace'];
-    $baseurl = $_GET['siteurl'];
-    $catslug = $_GET['category'];
-
-    $categoryurl = $baseurl."/category/".$catslug."/feed/";
-    $morelink = "<div align='right'>&rarr; <a href='".$baseurl."/category/".$catslug."/' style='feedlink' target=_blank> More...</a></div>";
+    global $wqurls;
+    // 1.8.0: remove siteurl usage and validate site key instead
+    // 1.8.1: use sanitize_title on request value
+    // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+    $site = sanitize_title( $_GET['site'] );
+    if ( !array_key_exists( $site, $wqurls ) ) {
+        return;
+    }
+    $baseurl = $wqurls[$site];
+
+    // 1.8.0: use sanitize_title_ on category slug
+    // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+    $catslug = sanitize_title( $_GET['category'] );
+    $categoryurl = $baseurl . '/category/' . $catslug . '/feed/';
+
+    // 1.8.0: set separate URL and use esc_url
+    $moreurl = $baseurl . '/category/' . $catslug . '/';
+    $morelink = '<div align="right">&rarr; <a href="' . esc_url( $moreurl ) . '" style="feedlink" target="_blank"> ' . esc_html( wqhelper_translate( 'More' ) ) . '...</a></div>';
 
     // --- fetch the category feed ---
-    $categoryrss = @fetch_feed($categoryurl); $feeditems = 10;
+    $categoryrss = fetch_feed( $categoryurl );
+    $feeditems = 10;
 
     // --- Process the Category Feed ---
-    $args = array($categoryrss, $feeditems);
-    $categoryfeed = wqhelper_process_rss_feed($args);
-    if ($categoryfeed != '') {$categoryfeed .= $morelink;}
+    $args = array( $categoryrss, $feeditems );
+    $categoryfeed = wqhelper_process_rss_feed( $args );
+    if ( '' != $categoryfeed ) {
+        $categoryfeed .= $morelink;
+    }
 
     // --- send back to parent window ---
-    echo '<script language="javascript" type="text/javascript">
-    var categoryfeed = "'.$categoryfeed.'";
-    parent.document.getElementById("'.$namespace.'feeddisplay").innerHTML = categoryfeed;
-    </script>';
+    // 1.8.0: added missing esc_js wrappers on variables
+    echo "<script>categoryfeed = '" . esc_js( $categoryfeed ) . "';
+    parent.document.getElementById('" . esc_js( site ) . "feeddisplay').innerHTML = categoryfeed;
+    </script>";
 
     exit;
@@ -2898 +3613 @@
 // Process RSS Feed
 // ----------------
-$funcname = 'wqhelper_process_rss_feed_'.$wqhv;
-if (!isset($wqfunctions[$funcname]) || !is_callable($wqfunctions[$funcname])) {
- $wqfunctions[$funcname] = function($args) {
-
-    $rss = $args[0]; $feeditems = $args[1]; $processed = '';
-    if (is_wp_error($rss)) {return '';}
-
-    $maxitems = $rss->get_item_quantity($feeditems);
-    $rssitems = $rss->get_items(0, $maxitems);
-
-    if ($maxitems == 0) {$processed = '';}
-    else {
+$funcname = 'wqhelper_process_rss_feed_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $args ) {
+
+    $rss = $args[0];
+    $feeditems = $args[1];
+    $processed = '';
+    if ( is_wp_error( $rss ) ) {
+        return '';
+    }
+
+    $maxitems = $rss->get_item_quantity( $feeditems );
+    $rssitems = $rss->get_items( 0, $maxitems );
+
+    if ( 0 == $maxitems ) {
+        $processed = '';
+    } else {
         // --- create feed list item display ---
-        $processed = "<ul style='list-style:none;margin:0;text-align:left;'>";
-        foreach ($rssitems as $item) {
-            $processed .= "<li>&rarr; <a href='".esc_url($item->get_permalink())."' class='feedlink' target='_blank' ";
-            $processed .= "title='Posted ".$item->get_date('j F Y | g:i a')."'>";
-            $processed .= esc_html($item->get_title())."</a></li>";
-        }
-        $processed .= "</ul>";
+        $processed = '<ul style="list-style:none;margin:0;text-align:left;">';
+        foreach ( $rssitems as $item ) {
+            $processed .= '<li>&rarr; <a href="' . esc_url( $item->get_permalink() ) . '" class="feedlink" target="_blank"';
+            $processed .= ' title="Posted ' . esc_attr( $item->get_date( 'j F Y | g:i a' ) ) . '">';
+            $processed .= esc_html( $item->get_title() ) . '</a></li>';
+        }
+        $processed .= '</ul>';
     }
     return $processed;
@@ -2923 +3643 @@
 }
 
+// -----------
+// Get Feed Ad
+// -----------
+// 1.8.0: get ad via feed
+$funcname = 'wqhelper_get_feed_ad_' . $wqhv;
+if ( !isset( $wqfunctions[$funcname] ) || !is_callable( $wqfunctions[$funcname] ) ) {
+ $wqfunctions[$funcname] = function( $pluginslug ) {
+
+    global $wqurls;
+    $feedurl = $wqurls['prn'] . '/recommends/?s=1&f=1&c=' . esc_attr( $pluginslug ) . '&t=sidebar';
+    add_filter( 'wp_feed_cache_transient_lifetime', 'wqhelper_ad_feed_interval' );
+    $rss = fetch_feed( $feedurl );
+    remove_filter( 'wp_feed_cache_transient_lifetime', 'wqhelper_ad_feed_interval' );
+    if ( !$rss || is_wp_error( $rss ) ) {
+        return '';
+    }
+    $rssitems = $rss->get_items( 0, 1 );
+    $item = $rssitems[0];
+    return $item->get_content();
+ };
+}
+
+// ----------------------
+// Ad Feed Cache Interval
+// ----------------------
+// 1.8.0: added for ad feed interval
+if ( !function_exists( 'wqhelper_ad_feed_interval' ) ) {
+ function wqhelper_ad_feed_interval( $seconds ) {
+    // --- change feed interval ---
+    return 300;
+ }
+}
+
+
 // --- manual function list debug point ---
-// add_action('plugins_loaded', function() {
-//  echo "<!-- WQ Helper Functions: ".print_r($wqfunctions,true)." -->;
+// add_action( 'plugins_loaded', function() {
+//  echo "<!-- WQ Helper Functions: " . print_r( $wqfunctions, true ) . " -->";
 // });
 
@@ -2932 +3686 @@
 // === Changelog ===
 // -----------------
+
+// = 1.8.2 =
+// - fix to floatbox divs condition when no recommendation
+// - sanitize HTTP_HOST server global key
+
+// = 1.8.1 =
+// - improved output escaping and sanitization
+
+// = 1.8.0 =
+// - Fix WordPress Coding Standards sniffs
+// - Change from script ads to feed ads
+
+// = 1.7.9 =
+// - fix to Admin submenu icon styles
+
+// = 1.7.8 =
+// - WordPress Coding Standards redux
+// - added output escaping sanitization
+// - fix to sidebar option saving variable
+// - prefix javascript functions
 
 // = 1.7.7 =