-unsetGetRequestParameter('DOUBLER_UID');
-unsetPostRequestParameter('DOUBLER_UID');
-setSession('DOUBLER_UID', '');
-if (empty($GLOBALS['doubler_userid'])) $GLOBALS['doubler_userid'] = '0';
+unsetGetRequestElement('DOUBLER_USERID');
+unsetPostRequestElement('DOUBLER_USERID');
+setSession('DOUBLER_USERID', '');
+if (empty($GLOBALS['local_doubler_userid'])) $GLOBALS['local_doubler_userid'] = '0';
+
+// Init additional WHERE statement
+$whereStatement = ' ';
+
+// Is ext-holiday installed?
+// @TODO Rewrite these if() blocks to a filter
+if (isExtensionActive('holiday')) {
+ // Exclude those as well
+ $whereStatement .= " AND `d`.`holiday_active`='N'";
+} // END - if