Several code-cleanups:

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

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index ee9be41504806da93ff773b61211cd89a3ff17b6..420a0852c41cbb42d6ceec3076a51158223770f1 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (!isExtensionActive('mailid')) {
        loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
@@ -51,6 +51,9 @@ if (!isExtensionActive('mailid')) {
 // Don't load the admin_list_unconfirmed template by default
 $listed = false;
 
+// Init query
+$sql = '';
+
 // List confirmation links from normal or bonus mails
 if (isGetRequestParameterSet('mid')) {
        // SQL query for mail data
@@ -72,7 +75,7 @@ LIMIT 1",
        $col = 'stats_id'; $type = 'NORMAL'; $ID = '-1';
 
        // Load admin_list_unconfirmed template
-       $listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
+       $listed = true; $DATA = getRequestParameter('mid'); $mailType = 'mailid';
 } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
        // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}');
 
@@ -91,25 +94,31 @@ LIMIT 1",
        $col = 'bonus_id'; $type = 'BONUS'; $ID = getRequestParameter('bid');
 
        // Load admin_list_unconfirmed template
-       $listed = true; $DATA = $ID; $LINK = 'bonusid';
+       $listed = true; $DATA = $ID; $mailType = 'bonusid';
 } else {
        // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus
        loadTemplate('admin_settings_saved', false, '{--ADMIN_CALL_NOT_DIRECTLY--}');
 }
 
 // Shall I display links or not?
-if ($listed === true) {
+if (($listed === true) && (!empty($sql))) {
        // Load mail data
        $result_master = SQL_QUERY($sql, __FILE__, __LINE__);
 
        // Do we have an entry?
        if (SQL_NUMROWS($result_master) == 1) {
-               // Mail order / bonus mail found!
+               // Mail order / bonus mail found
                $poolData = SQL_FETCHARRAY($result_master);
 
-               // Transfer data to constants for the template
-               if (($poolData['id'] > 0) && ($ID == '-1')) $ID = $poolData['id'];
-               if ($col == 'bonus_id') $poolData['sender'] = '0';
+               // If there is a pool id and $ID is not set, we take it
+               if (($poolData['id'] > 0) && ($ID == '-1')) {
+                       $ID = $poolData['id'];
+               } // END - if
+
+               // Bonus mails do always have a sender 'NULL'
+               if ($col == 'bonus_id') {
+                       $poolData['sender'] = null;
+               } // END - if
 
                // Load unconfirmed mail links. Hmmm, this select query is pretty cool
                // but it does only show unconfirmed mail links from existing user
@@ -134,7 +143,7 @@ LIMIT %s",
                        ),__FILE__, __LINE__);
 
                // Do we have entries?
-               if (SQL_NUMROWS($result) > 0) {
+               if (!SQL_HASZERONUMS($result)) {
                        // At least one link left to confirm
                        $OUT = '';
                        while ($row = SQL_FETCHARRAY($result)) {
@@ -143,7 +152,7 @@ LIMIT %s",
                                        // Prepare data for the row template
                                        $row = array(
                                                'userid' => $row['userid'],
-                                               'link'   => $LINK,
+                                               'link'   => $mailType,
                                                'id'     => $ID,
                                                'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">' . translateGender($row['gender']) . ' ' . $row['surname'] . ' ' . $row['family'] . '</a>',
                                                'status' => $row['status'],