Deprecated 'replacer' removed. Now we use EL code instead (there are a lot example...

[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 f9cc421aa6cbbd0827a9e0563852ef072c71906c..a68fe3b08b67fcfb3ca507fef399c7d4b58e2e0d 100644 (file)
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.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 (!isExtensionActive('mailid')) {
        loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mailid'));
@@ -136,26 +134,26 @@ 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 ($content = SQL_FETCHARRAY($result)) {
+                       while ($row = SQL_FETCHARRAY($result)) {
                                // User data found? We can take any field of u.
-                               if (!is_null($content['status'])) {
+                               if (!is_null($row['status'])) {
                                        // Prepare data for the row template
-                                       $content = array(
-                                               'userid' => $content['userid'],
+                                       $row = array(
+                                               'userid' => $row['userid'],
                                                'link'   => $LINK,
                                                'id'     => $ID,
-                                               'email'  => '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . translateGender($content['gender']) . ' ' . $content['surname'] . ' ' . $content['family'] . '</a>',
-                                               'status' => $content['status'],
+                                               'email'  => '<a href="' . generateEmailLink($row['email'], 'user_data') . '">' . translateGender($row['gender']) . ' ' . $row['surname'] . ' ' . $row['family'] . '</a>',
+                                               'status' => $row['status'],
                                        );
 
                                        // Load row template and switch colors
-                                       $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $content);
+                                       $OUT .= loadTemplate('admin_list_unconfirmed_row', true, $row);
                                } else {
                                        // No user data found
-                                       $OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $content);
+                                       $OUT .= loadTemplate('admin_list_unconfirmed_row_404', true, $row);
                                }
                        } // END - while
 
@@ -167,6 +165,7 @@ LIMIT %s",
                }
 
                // Prepare content
+               $content                = $poolData;
                $content['unconfirmed'] = SQL_NUMROWS($result);
                $content['timestamp']   = generateDateTime($poolData['timestamp'], 2);
                $content['rows']        = $OUT;