outputHtml();
}
-// Prepares an SQL statement part for HTML mail and/or holiday dependency
-function FILTER_HTML_INCLUDE_USERS ($mode) {
- // Exclude no users by default
- $MORE = '';
-
- // HTML mail?
- if ($mode == 'html') {
- $MORE = " AND `html`='Y'";
- } // END - if
-
- if (isExtensionInstalledAndNewer('holiday', '0.1.3')) {
- // Add something for the holiday extension
- $MORE .= " AND `holiday_active`='N'";
- } // END - if
-
- // Return result
- return $MORE;
-}
-
// Filter for determining what/action/module
function FILTER_DETERMINE_WHAT_ACTION () {
// In installation phase we don't have what/action
setConfigEntry('secret_key', '');
// File hash was generated so we can also file the secret file... hopefully.
- $hashFile = sprintf('%s%s.%s.cache', getPath(), getCachePath(), getFileHash());
+ $hashFile = getGenericHashFileName();
// Read key from secret file
if ((getFileHash() == '') || (getMasterSalt() == '') || (getPassScramble() == '') || (!isFileReadable($hashFile))) {
loadIncludeOnce('inc/gen_sql_patches.php');
// Generate file name again
- $hashFile = sprintf('%s%s.%s.cache', getPath(), getCachePath(), getFileHash());
+ $hashFile = getGenericHashFileName();
} // END - if
// Test again