No more SSL here

[mailer.git] / beg.php

diff --git a/beg.php b/beg.php
index 81cb992df91506515a35ccca35dc888c2177bb46..2d52ee717b264ad6df19a45f218e8f41cbd096d6 100644 (file)
--- a/beg.php
+++ b/beg.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bettel-Link fuer Mitglieder                      *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -79,7 +74,7 @@ if (isGetRequestElementSet('userid')) {
        $status = 'failed';
 
        // Check if account was found
-       if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED')) {
+       if ((isValidUserData()) && (getUserData('status') == 'CONFIRMED')) {
                /*
                 * Multiply configured values with 100000 and divide with 100000 so we can also handle small values
                 * If we need more number behind the decimal dot then we just need to increase all these three
@@ -109,7 +104,7 @@ if (isGetRequestElementSet('userid')) {
 
                // Entry not found, points set and not logged in?
                //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'SQL_HASZERONUMS()=' . intval(SQL_HASZERONUMS($result)) . ',isAdmin()=' . intval(isAdmin()) . ',points=' . $points . ',isMember()=' . intval(isMember()) . ',getBegPayMode()=' . getBegPayMode());
-               if ((ifSqlHasZeroNums($result)) && ($points > 0) && (getBegPayMode() == 'NONE') && ((!isMember()) || (isAdmin()))) {
+               if ((ifSqlHasZeroNumRows($result)) && ($points > 0) && (getBegPayMode() == 'NONE') && ((!isMember()) || (isAdmin()))) {
                        // Default is result from isAdmin(), mostly false
                        $isPayed = isAdmin();
 
@@ -162,7 +157,7 @@ if (isGetRequestElementSet('userid')) {
                sqlFreeResult($result);
 
                // Include header
-               loadIncludeOnce('inc/header.php');
+               loadPageHeader();
 
                // Load final template
                loadTemplate('beg_link', FALSE, $content);
@@ -182,7 +177,7 @@ if (isGetRequestElementSet('userid')) {
                }
 
                // Include footer
-               loadIncludeOnce('inc/footer.php');
+               loadPageFooter();
        } elseif ((getUserData('status') != 'CONFIRMED') && (getUserData('status') != 'failed')) {
                // Maybe locked/unconfirmed account?
                $errorCode = generateErrorCodeFromUserStatus();