Renamed function so it might be more understandable

[mailer.git] / inc / modules / admin / what-list_payouts.php

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index da518d24747f2f018ef84bfdb31d29d75f28884a..ed47e59ea6f151740b1f31e2f49f88ee8571a895 100644 (file)
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (isGetRequestParameterSet('pid')) {
        // First let's get the member's id
@@ -53,22 +51,22 @@ if (isGetRequestParameterSet('pid')) {
        SQL_FREERESULT($result);
 
        // Obtain some data
-       if (!isGetRequestParameterSet('task') && (!empty($userid)) && ($userid > 0)) {
+       if (!isGetRequestParameterSet('task') && (!empty($userid)) && (isValidUserId($userid))) {
                // Get task id from database
                $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_task_system` WHERE `userid`=%s AND `task_type`='PAYOUT_REQUEST' AND `task_created`=%s LIMIT 1",
                        array(bigintval($userid), bigintval($tstamp)), __FILE__, __LINE__);
-               list($task) = SQL_FETCHROW($result);
+               list($taskId) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
-               if (empty($task)) $task = '0';
+               if (empty($taskId)) $taskId = '0';
        } elseif ((empty($userid)) || ($userid == '0')) {
                // Cannot obtain member id!
                loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
        } else {
                // Get task id from URL
-               $task = getRequestParameter('task');
+               $taskId = getRequestParameter('task');
        }
 
-       if ((!empty($task)) && (!empty($userid)) && ($userid > 0)) {
+       if ((!empty($taskId)) && (!empty($userid)) && (isValidUserId($userid))) {
                // Load user's data
                if (!fetchUserData($userid)) {
                        // Abort here because it is not valid!
@@ -117,7 +115,7 @@ LIMIT 1",
                                                                $data['from_pass'] = base64_encode($data['from_pass']);
                                                                $tpass = base64_encode($tpass);
                                                                break;
-                                               }
+                                               } // END - switch
 
                                                // Transfer variables...
                                                $reason = encodeString(getMessage('ADMIN_PAYOUT_REASON'), false);
@@ -131,8 +129,8 @@ LIMIT 1",
 
                                        if ($ret[0] == $data['engine_ret_ok']) {
                                                // Clear task
-                                               if ($task > 0) {
-                                                       runFilterChain('solve_task', $task);
+                                               if ($taskId > 0) {
+                                                       runFilterChain('solve_task', $taskId);
                                                }
 
                                                // Clear payout request
@@ -160,12 +158,12 @@ LIMIT 1",
                                        }
                                } else {
                                        // Cannot load payout id
-                                       loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}</div>');
+                                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}');
                                }
                        } else {
                                // Prepare content
                                $content = array(
-                                       'task' => $task,
+                                       'task' => $taskId,
                                        'pid'  => bigintval(getRequestParameter('pid')),
                                        'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . translateGender(getUserData('gender')) . ' ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
                                );
@@ -176,9 +174,9 @@ LIMIT 1",
                } elseif ((getRequestParameter('do') == 'reject') && (getUserData('email') != '')) {
                        // Ok, now we can output the form or execute rejecting
                        if (isFormSent()) {
-                               if ($task > 0) {
+                               if ($taskId > 0) {
                                        // Clear task
-                                       runFilterChain('solve_task', $task);
+                                       runFilterChain('solve_task', $taskId);
                                } // END - if
 
                                // Clear payout request
@@ -196,7 +194,7 @@ LIMIT 1",
                        } else {
                                // Prepare content
                                $content = array(
-                                       'task' => $task,
+                                       'task' => $taskId,
                                        'pid'  => bigintval(getRequestParameter('pid')),
                                        'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . translateGender(getUserData('gender')) . ' ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
                                );
@@ -208,7 +206,7 @@ LIMIT 1",
                        // Cannot load user data
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
                }
-       } elseif ((empty($task)) || ($task == '0')) {
+       } elseif ((empty($taskId)) || ($taskId == '0')) {
                // Failed loading task id
                loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
        }
@@ -243,7 +241,6 @@ ORDER BY
                        } else {
                                // Translate status
                                $content['status'] = translatePayoutStatus($content['status']);
-                               $content['status'] = '<div class="admin_failed">' . $content['status'] . '</div>';
                        }
 
                        // Nothing entered must be secured in member/what-payputs.php !