X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fextensions%2Fext-rallye.php;h=6b2fb3bdf00f5c8b3a040e23f7aac624cfc7edc7;hb=675778ff98b75b6c5071e2709c2d6b0af86cf79d;hp=75c56d7d75154f6fbcfa8b9452743867e8cfbb63;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git
diff --git a/inc/extensions/ext-rallye.php b/inc/extensions/ext-rallye.php
index 75c56d7d75..6b2fb3bdf0 100644
--- a/inc/extensions/ext-rallye.php
+++ b/inc/extensions/ext-rallye.php
@@ -1,7 +1,7 @@
templates/de/emails/member/member_rallye_notify.tpl folgende zwei Zeilen ein:
@@ -311,7 +312,7 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu
addExtensionUpdateDependency('sql_patches');
// Register filter
- registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, getExtensionDryRun());
+ registerFilter('extra_autopurge', 'RALLYE_EXTRA_AUTOPURGE', false, true, isExtensionDryRun());
// Update notes (these will be set as task text!)
setExtensionUpdateNotes("Filter hinzugefügt und ist von sql_patches abhängig.");
@@ -328,21 +329,21 @@ Zudem sollten Sie mindestens folgende Templates (in templates/".getLangu
case 'init': // Do stuff when extension is initialized
// Do stuff only when not in CSS mode
// @TODO Move this code into rallye_functions.php
- if (getOutputMode() != 1) {
+ if (!isCssOutputMode()) {
// Get total member count
- $total = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+ $total = getTotalConfirmedUser();
// Add more data on higher versions
$ADD1 = ''; $ADD2 = ''; $OR = '';
- if (getExtensionVersion('rallye') >= '0.2.0') {
+ if (isExtensionInstalledAndNewer('rallye', '0.2.0')) {
$ADD1 = ", `min_users`, `min_prices`";
- $ADD2 = ", d.min_users, d.min_prices";
- $OR = " OR (d.min_users <= ".$total." AND d.min_users > 0)";
+ $ADD2 = ", d.`min_users`, d.`min_prices`";
+ $OR = " OR (d.`min_users` <= " . $total . " AND d.`min_users` > 0)";
} // END - if
// Check for new started but not notified rallyes
$result = SQL_QUERY("SELECT SQL_SMALL_RESULT
- `id`, `title`, `start_time`, `end_time`, `send_notify`".$ADD1."
+ `id`, `title`, `start_time`, `end_time`, `send_notify`" . $ADD1 . "
FROM
`{?_MYSQL_PREFIX?}_rallye_data`
WHERE
@@ -362,14 +363,14 @@ LIMIT 1", __FILE__, __LINE__);
// Check for expired rallyes
$result = SQL_QUERY("SELECT SQL_SMALL_RESULT
- d.id, d.title, d.start_time, d.end_time, d.send_notify".$ADD2."
+ d.`id`, d.`title`, d.`start_time`, d.`end_time`, d.`send_notify`" . $ADD2 . "
FROM
`{?_MYSQL_PREFIX?}_rallye_data` AS d
WHERE
- d.is_active='Y' AND
- d.notified='Y' AND
- d.expired='N' AND
- (d.end_time <= UNIX_TIMESTAMP()".$OR.")
+ d.`is_active`='Y' AND
+ d.`notified`='Y' AND
+ d.`expired`='N' AND
+ (d.`end_time` <= UNIX_TIMESTAMP()".$OR.")
LIMIT 1", __FILE__, __LINE__);
if ((SQL_NUMROWS($result) == 1) && (isExtensionActive('autopurge'))) {
// End rallye here...
@@ -382,7 +383,7 @@ LIMIT 1", __FILE__, __LINE__);
break;
default: // Unknown extension mode
- DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown extension mode %s detected.", getExtensionMode()));
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown extension mode %s in extension %s detected.", getExtensionMode(), getCurrentExtensionName()));
break;
} // END - switch