More fixes for constants

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

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 31f0ba36093d58579892969fa10643c1e61148ec..6275cc15b0a9b8579c1e02702fc5bbf3b8667d28 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mitglieder loeschen                              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,12 +38,12 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Display only title when no form was submitted
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // User exists..
 if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('reason'))))) {
@@ -53,15 +58,15 @@ if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('re
                DELETE_USER_ACCOUNT(REQUEST_GET('uid'), REQUEST_POST('reason'));
 
                // Output message
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_DEL_COMPLETED'));
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_DEL_COMPLETED'));
        } else {
                // Account does not exists!
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
+               LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
        }
 } elseif (REQUEST_ISSET_POST(('no'))) {
        // Do not delete him...
-       LOAD_URL("modules.php?module=admin&amp;what=list_user&amp;uid=".REQUEST_GET('uid'));
-} elseif (!REQUEST_ISSET_GET(('uid'))) {
+       LOAD_URL(ADMIN_CREATE_USERID_LINK(REQUEST_GET('uid')));
+} elseif (!REQUEST_ISSET_GET('uid')) {
        // Output selection form with all confirmed user accounts listed
        ADD_MEMBER_SELECTION_BOX();
 } else {
@@ -73,17 +78,21 @@ if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('re
                list ($email, $sname, $fname) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
-               // Transfer data to constants for the template
-               define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
-               define('__SNAME', $sname);
-               define('__FNAME', $fname);
-               define('__UID'  , REQUEST_GET('uid'));
+               // Prepare content
+               $content = array(
+                       'email'   => CREATE_EMAIL_LINK($email, "user_data"),
+                       'surname' => $sname,
+                       'family'  => $fname,
+                       'header'  => sprintf(getMessage('ADMIN_HEADER_DEL_ACCOUNT'), REQUEST_GET('uid')),
+                       'text'    => sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), REQUEST_GET('uid')),
+                       'userid'  => REQUEST_GET('uid')
+               );
 
                // Display form
-               LOAD_TEMPLATE("admin_del_user");
+               LOAD_TEMPLATE("admin_del_user", false, $content);
        } else {
                // Account does not exists!
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
+               LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
        }
 }