'what','action','module' and 'output_mode' wrapped into functions (WARNUNG: Code...

[mailer.git] / inc / modules / member / what-nickname.php

diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index b3530da502a4af6917abbfdc9f429f5d4713ae73..7a61a8951c56447d9aefde9127cd9635ac7b003c 100644 (file)
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -38,20 +38,20 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $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);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL("modules.php?module=index");
-} elseif ((!EXT_IS_ACTIVE("nickname")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "nickname");
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('nickname')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('nickname'));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 $isValid = false;
 
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Nickname was submitted so let's check if it is not already in use
        if (REQUEST_ISSET_POST(('nickname'))) {
                // Check if nickname is valid
@@ -66,11 +66,11 @@ if (IS_FORM_SENT()) {
 if ($isValid === true) {
        // Look for nickname in database (we only need just one entry so don't worry about the "LIMIT 1" !
        $result = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND userid != '%s' LIMIT 1",
-               array(REQUEST_POST('nickname'), getUserId()), __FILE__, __LINE__);
+       array(REQUEST_POST('nickname'), getUserId()), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 0) {
                // Nickname not in use, so set it now
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nickname='%s' WHERE userid=%s LIMIT 1",
-                       array(REQUEST_POST('nickname'), getUserId()), __FILE__, __LINE__);
+               array(REQUEST_POST('nickname'), getUserId()), __FILE__, __LINE__);
                $content = getMessage('NICKNAME_SAVED');
        } else {
                // Free result
@@ -81,14 +81,14 @@ if ($isValid === true) {
        }
 
        // Load template
-       LOAD_TEMPLATE("admin_settings_saved", false, $content);
+       LOAD_TEMPLATE('admin_settings_saved', false, $content);
 } else {
        // Load current nickname
        define('__NICKNAME', NICKNAME_GET_NICK(getUserId()));
 
        // Do we have already submit the form?
        if (REQUEST_ISSET_POST(('nickname'))) {
-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"member_failed\">{--NICKNAME_IS_INVALID--}</div");
+               LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"member_failed\">{--NICKNAME_IS_INVALID--}</div");
        } // END - if
 
        // Load Template