X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-beg2.php;h=9f265539f9d9ada84c192f7743983ae32419bba8;hp=1061adf2c8b36e257d8e34d83127a02bf0c41ab1;hb=af7e2ca186ae88d343f90bcb753645ab4847f227;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index 1061adf2c8..9f265539f9 100644
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('beg')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('beg'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}');
 	return;
 } // END - if
 
@@ -54,14 +54,14 @@ if ((!isExtensionActive('beg')) && (!isAdmin())) {
 $lastOnline = '%s';
 $ONLINE = '';
 
-if (isExtensionActive('autopurge')) {
+if ((isExtensionActive('autopurge')) && (isBegActiveEnabled()) && ((getApInactiveSince() > 0))) {
 	// Use last online timestamp to keep inactive members away from here
-	$lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
+	$lastOnline   = ' AND (UNIX_TIMESTAMP() - `last_online`) >= {?ap_inactive_since?}';
 } // END - if
 
 // Let's check if there are some points left we can pay...
 $result = SQL_QUERY_ESC("SELECT
-	`userid`, `beg_points` AS points, `last_online`
+	`userid`, `beg_points`, `last_online`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -84,12 +84,8 @@ if (!SQL_HASZERONUMS($result)) {
 	$count = 1;
 	while ($content = SQL_FETCHARRAY($result)) {
 		// Prepare data for the template
-		$content = array(
-			'cnt'         => $count,
-			'userid'      => $content['userid'],
-			'points'      => $content['points'],
-			'last_online' => generateDateTime($content['last_online'], 2),
-		);
+		$content['count']       = $count;
+		$content['last_online'] = generateDateTime($content['last_online'], '2');
 
 		// Load row template
 		$OUT .= loadTemplate('member_list_beg_row', true, $content);
@@ -98,7 +94,7 @@ if (!SQL_HASZERONUMS($result)) {
 		$count++;
 	} // END - while
 } else {
-	// No one is interested in our "active rallye" ! :-(
+	// No one is interested in our "begging rallye" ! :-(
 	$OUT = loadTemplate('member_beg_404', true);
 }