Renamed script to baseUrl to make it more clear

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

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 667017a36de03590d0849b1699de6b782b1ff0c7..252a22e156282d5469b9288d3b80831f7834d2dd 100644 (file)
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * 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 *
@@ -43,10 +41,10 @@ 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'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('mailid'));
        return;
 } // END - if
 
@@ -65,22 +63,20 @@ if (isGetRequestParameterSet('userid')) {
                                array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
                }
 
-               // Get number of rows from the query
-               $nums = SQL_NUMROWS($result);
-
-               if ($nums > 0) {
+               // Do we have some entries?
+               if (!SQL_HASZERONUMS($result)) {
                        // Some unconfirmed mails left
-                       if (getRequestParameter('del') == "all") {
+                       if (getRequestParameter('delete') == "all") {
                                // Delete all unconfirmed mails by this user
                                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `userid`=%s LIMIT %s",
-                                       array(bigintval(getRequestParameter('userid')), $nums), __FILE__, __LINE__);
+                                       array(bigintval(getRequestParameter('userid')), SQL_NUMROWS($result)), __FILE__, __LINE__);
 
                                // Prepare mail and send it away
-                               $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
-                               sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJECT--}', $message);
+                               $message = loadEmailTemplate('admin-del_links', SQL_NUMROWS($result), bigintval(getRequestParameter('userid')));
+                               sendEmail(getUserData('email'), '{--ADMIN_DELETE_LINK_SUBJECT--}', $message);
 
                                // Display message
-                               loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
+                               displayMessage('{--ADMIN_LINKS_DELETED--}');
                        } else {
                                // Init variables
                                $OUT = '';
@@ -88,11 +84,11 @@ if (isGetRequestParameterSet('userid')) {
                                // List all unconfirmed mails
                                // @TODO Find a way to rewrite this. See some lines above for different queries
                                while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
-                                       // Initializes some variables
+                                       // Initializes all variables
                                        $cat = '';
                                        $DATA = '';
-                                       $PROBLEM = '{--GENERAL_MAIL_PROBLEM--}';
-                                       $result_data = false; // Closes Bug #58
+                                       $PROBLEM = '{--ADMIN_GENERAL_MAIL_PROBLEM--}';
+                                       $result_data = false;
 
                                        // Load data from stats table...
                                        // @TODO Rewrite this to includes/filter
@@ -117,8 +113,9 @@ if (isGetRequestParameterSet('userid')) {
                                                        break;
                                        } // END - switch
 
+                                       // Do we have an entry?
                                        if (SQL_NUMROWS($result_data) == 1) {
-                                               // Mail was found!
+                                               // Mail was found
                                                $content = SQL_FETCHARRAY($result_data);
 
                                                // Fix empty subject
@@ -148,27 +145,27 @@ if (isGetRequestParameterSet('userid')) {
                                        SQL_FREERESULT($result_data);
                                } // END - while
 
-                               // Free memory
-                               SQL_FREERESULT($result);
-
                                // Remember list in constant for the template
                                $content['surname'] = getUserData('surname');
                                $content['family']  = getUserData('family');
                                $content['email']   = '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . getUserData('email') . '</a>';
                                $content['rows']    = $OUT;
-                               $content['nums']    = $nums;
+                               $content['nums']    = SQL_NUMROWS($result);
                                $content['userid']  = bigintval(getRequestParameter('userid'));
 
+                               // Free memory
+                               SQL_FREERESULT($result);
+
                                // Load final template
                                loadTemplate('admin_list_links', false, $content);
                        }
                } else {
                        // No mails left to confirm
-                       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
+                       displayMessage(getMaskedMessage('ADMIN_MEMBER_LINKS', bigintval(getRequestParameter('userid'))));
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               displayMessage(getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
        }
 } else {
        // Output selection form with all confirmed user accounts listed