X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=beg.php;h=57b930c8d9fc4869b1b720f163def020db07383d;hb=6adf9546c2bdd2ff125671025a4ea714691743c4;hp=59d3572d675a507f0c501e34cd4cf57280a49b9f;hpb=9f6c30cc0e06098171d773d671292081ecee3d29;p=mailer.git diff --git a/beg.php b/beg.php index 59d3572d67..57b930c8d9 100644 --- a/beg.php +++ b/beg.php @@ -1,7 +1,7 @@ 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) { + if (((SQL_HASZERONUMS($result)) || (isAdmin())) && ($points > 0) && (!isMember()) && (getConfig('beg_pay_mode') == 'NONE')) { // Admin is testing? if (!isAdmin()) { @@ -129,18 +130,18 @@ if (isGetRequestElementSet('userid')) { // Add points to user or begging rallye account if (addPointsBeg(getUserData('userid'), $points)) { // Set 'done' message - $content['message'] = loadTemplate('beg_done', true); + $content['message'] = loadTemplate('beg_done', true, $content); } else { // Error! - $content['message'] = loadTemplate('beg_failed', true); + $content['message'] = loadTemplate('beg_failed', true, $content); } } else { // Error! - $content['message'] = loadTemplate('beg_failed', true); + $content['message'] = loadTemplate('beg_failed', true, $content); } } elseif (isMember()) { // Logged in user found! - $content['message'] = loadTemplate('beg_login', true); + $content['message'] = loadTemplate('beg_login', true, $content); } elseif (getConfig('beg_pay_mode') != 'NONE') { // Other pay-mode active! // Prepare content for template $content = array( @@ -185,9 +186,9 @@ if (isGetRequestElementSet('userid')) { } elseif ((getUserData('status') != 'CONFIRMED') && (getUserData('status') != 'failed')) { // Maybe locked/unconfirmed account? $errorCode = generateErrorCodeFromUserStatus(); - } elseif ((getUserData('userid') == 0) || (getUserData('status') == 'failed')) { + } elseif ((getUserData('userid') == '0') || (getUserData('status') == 'failed')) { // Inalid or locked account, so let's find out - if (fetchUserData(getRequestElement('userid'), 'nickname')) { + if (fetchUserData(getRequestParameter('userid'), 'nickname')) { // Locked account $errorCode = getCode('ACCOUNT_LOCKED'); } else {