Extension ext-network continued:

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 488e8f6f4f10143a3c88904bf0f365581f068dd8..688640aa4d72d7e521ecf6e93c49d7ed5ee1226b 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
 function alpha ($sortby) {
        $add = '';
        foreach (array('page','offset','mode','status') as $param) {
-               if (isGetRequestParameterSet($param)) {
-                       $add .= '&' . $param . '=' . getRequestParameter($param);
+               if (isGetRequestElementSet($param)) {
+                       $add .= '&' . $param . '=' . getRequestElement($param);
                } // END - if
        } // END - foreach
 
@@ -54,7 +54,7 @@ function alpha ($sortby) {
        $num = count($alphabet) - 1;
        $OUT = '';
        while (list($counter, $ltr) = each($alphabet)) {
-               if (getRequestParameter('letter') == $ltr) {
+               if (getRequestElement('letter') == $ltr) {
                        // Current letter is letter from URL
                        $OUT .= '<strong>' . $ltr . '</strong>';
                } else {
@@ -84,16 +84,16 @@ function alpha ($sortby) {
 // Add links for sorting
 function addSortLinks ($letter, $sortby) {
        $OUT = '';
-       if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
-       if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 0);
+       if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0);
+       if (!isGetRequestElementSet('page'))   setGetRequestElement('page'  , 0);
 
        // Add page and offset
-       $add = '&amp;page=' . getRequestParameter('page') . '&amp;offset=' . getRequestParameter('offset');
+       $add = '&amp;page=' . getRequestElement('page') . '&amp;offset=' . getRequestElement('offset');
 
        // Add status/ mode
        foreach (array('mode','status') as $param) {
-               if (isGetRequestParameterSet($param)) {
-                       $add .= '&amp;' . $param . '=' . getRequestParameter($param);
+               if (isGetRequestElementSet($param)) {
+                       $add .= '&amp;' . $param . '=' . getRequestElement($param);
                } // END - if
        } // END - foreach
 
@@ -142,29 +142,29 @@ function addPageNavigation ($numPages) {
        if ($numPages > 1) {
                // Create navigation links for every page
                for ($page = 1; $page <= $numPages; $page++) {
-                       if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+                       if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
                                $OUT .= '<strong>-';
                        } else {
-                               if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
-                               if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
+                               if (!isGetRequestElementSet('letter')) setGetRequestElement('letter', '');
+                               if (!isGetRequestElementSet('sortby')) setGetRequestElement('sortby', 'userid');
 
                                // Base link
                                $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
                                // Add status/mode
                                foreach (array('mode','status') as $param) {
-                                       if (isGetRequestParameterSet($param)) {
-                                               $OUT .= '&amp;' . $param . '=' . getRequestParameter($param);
+                                       if (isGetRequestElementSet($param)) {
+                                               $OUT .= '&amp;' . $param . '=' . getRequestElement($param);
                                        } // END - if
                                } // END - foreach
 
                                // Letter and so on
-                               $OUT .= '&amp;letter=' . getRequestParameter('letter') . '&amp;sortby=' . getRequestParameter('sortby') . '&amp;page=' . $page . '&amp;offset=' . getConfig('user_limit') . '%}">';
+                               $OUT .= '&amp;letter=' . getRequestElement('letter') . '&amp;sortby=' . getRequestElement('sortby') . '&amp;page=' . $page . '&amp;offset=' . getConfig('user_limit') . '%}">';
                        }
 
                        $OUT .= $page;
 
-                       if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+                       if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
                                $OUT .= '-</strong>';
                        } else  {
                                $OUT .= '</a>';
@@ -192,16 +192,22 @@ function generateUserEmailLink ($email, $mod = 'admin') {
        $locked = " AND `status`='CONFIRMED'";
 
        // But admins shall always see it
-       if (isAdmin()) $locked = '';
+       if (isAdmin()) {
+               $locked = '';
+       } // END - if
 
+       // Search for the email address
        $result = SQL_QUERY_ESC("SELECT
        `userid`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `email`='%s'" . $locked."
+       '%s' REGEXP `email`
+       " . $locked . "
 LIMIT 1",
                array($email), __FUNCTION__, __LINE__);
+
+       // Do we have an entry?
        if (SQL_NUMROWS($result) == 1) {
                // Load userid
                list($userid) = SQL_FETCHROW($result);
@@ -333,7 +339,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
 
                                        // Subtract login bonus from userid's account or jackpot
                                        if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD')) {
-                                               handleBonusPoints('login_bonus');
+                                               handleBonusPoints('login_bonus', $userid);
                                        } // END - if
                                } // END - if
                        } // END - if
@@ -477,7 +483,7 @@ function getEpocheTimeFromUserStats ($statsType, $statsData, $userid = NULL) {
        $data['inserted'] = '0';
 
        // User id set?
-       if ((isMemberIdSet()) && ($userid == '0')) {
+       if ((isMemberIdSet()) && (is_null($userid))) {
                $userid = getMemberId();
        } // END - if
 
@@ -609,7 +615,7 @@ LIMIT 1",
                                                        array(bigintval($refid)), __FILE__, __LINE__);
 
                                                // Subtract points from system
-                                               handleBonusPoints(getConfig('bonus_ref'));
+                                               handleBonusPoints(getConfig('bonus_ref'), $refid);
                                        } // END - if
 
                                        // Add one-time referal bonus over referal system or directly
@@ -759,12 +765,12 @@ function doTemplateAdminListUserTitle ($template, $clear = false) {
        $code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
 
        // Do we have a 'status' or 'mode' set?
-       if (isGetRequestParameterSet('status')) {
+       if (isGetRequestElementSet('status')) {
                // Set title according to the 'status'
-               $code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestParameter('status')));
-       } elseif (isGetRequestParameterSet('mode')) {
+               $code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestElement('status')));
+       } elseif (isGetRequestElementSet('mode')) {
                // Set title according to the "mode"
-               $code = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestParameter('mode')));
+               $code = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestElement('mode')));
        }
 
        // Return the code