A lot rewrites from double-quote to single-quote, some fixes for extension handling...

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

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index e897ad539b7f607617caeec14701226070d52737..4c2f95a026b4ea73edd8c5c325a4bfac293b3833 100644 (file)
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -41,16 +41,16 @@ if (!defined('__SECURITY')) {
        $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("mydata")) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "mydata");
+       LOAD_URL('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('mydata')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'mydata');
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
-define('UID_VALUE', getUserId()); $URL = "";
+define('UID_VALUE', getUserId()); $URL = '';
 
 // Detect what the member wants to do
 $MODE = "show"; // Show his data
@@ -61,7 +61,7 @@ if (REQUEST_ISSET_POST(('notify'))) $MODE = "notify"; // Switch off notification
 switch ($MODE)
 {
 case "show": // Show his data
-       if (EXT_IS_ACTIVE("country", true)) {
+       if (EXT_IS_ACTIVE('country', true)) {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
                $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                 array(UID_VALUE), __FILE__, __LINE__);
@@ -94,7 +94,7 @@ case "show": // Show his data
                default  : define('DOB', $DATA[8]."-".$DATA[7]."-".$DATA[9]); break;
        }
 
-       if (EXT_IS_ACTIVE("country")) {
+       if (EXT_IS_ACTIVE('country')) {
                // Load country's description and code
                $DATA[3] = COUNTRY_GENERATE_INFO($DATA[3]);
        }
@@ -104,7 +104,7 @@ case "show": // Show his data
        break;
 
 case "edit": // Edit data
-       if (EXT_IS_ACTIVE("country", true)) {
+       if (EXT_IS_ACTIVE('country', true)) {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
                $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update
 FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
@@ -131,23 +131,23 @@ FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                {
                case "M":
                        define('M_DEFAULT', " selected=\"selected\"");
-                       define('F_DEFAULT', "");
-                       define('C_DEFAULT', "");
+                       define('F_DEFAULT', '');
+                       define('C_DEFAULT', '');
                        break;
 
                case "F":
-                       define('M_DEFAULT', "");
+                       define('M_DEFAULT', '');
                        define('F_DEFAULT', " selected=\"selected\"");
-                       define('C_DEFAULT', "");
+                       define('C_DEFAULT', '');
                        break;
 
                case "C":
-                       define('M_DEFAULT', "");
-                       define('F_DEFAULT', "");
+                       define('M_DEFAULT', '');
+                       define('F_DEFAULT', '');
                        define('C_DEFAULT', " selected=\"selected\"");
                        break;
                }
-               $DOB = "";
+               $DOB = '';
                switch (GET_LANGUAGE())
                {
                case "de": // German date format
@@ -166,13 +166,13 @@ FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                }
 
                define('DOB', $DOB);
-               define('MAX_REC_LIST', ADD_MAX_RECEIVE_LIST("member", $DATA[11], true));
+               define('MAX_REC_LIST', ADD_MAX_RECEIVE_LIST('member', $DATA[11], true));
 
-               if (EXT_IS_ACTIVE("country")) {
+               if (EXT_IS_ACTIVE('country')) {
                        // Generate selection box
                        $OUT  = "<select name=\"country_code\" class=\"member_select\" size=\"1\">\n";
                        $whereStatement = "WHERE is_active='Y'";
-                       if (IS_ADMIN()) $whereStatement = "";
+                       if (IS_ADMIN()) $whereStatement = '';
                        $OUT .= ADD_OPTION_LINES("countries", "id", "descr", $DATA[3], "code", $whereStatement);
                        $OUT .= "</select>";
                        define('__COUNTRY_CONTENT', $OUT);
@@ -201,26 +201,26 @@ case "save": // Save entered data
                LOAD_TEMPLATE("member_mydata_locked");
        } elseif (!VALIDATE_EMAIL(REQUEST_POST('addy'))) {
                // Invalid email address!
-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
        } else {
                // Generate hash
                $hash = generateHash(REQUEST_POST('pass1'), substr($DATA[1], 0, -40));
                if ((($hash == $DATA[1]) || (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) && (REQUEST_ISSET_POST(('pass1')))) {
                        // Only on simple changes normal mode is active = no email or password changed
-                       $MODE = "normal"; $AND = "";
+                       $MODE = 'normal'; $AND = '';
 
                        // Did the user changed the password?
-                       if ($hash != $DATA[1]) { $AND = ", password='".$hash."'"; $MODE = "pass"; }
+                       if ($hash != $DATA[1]) { $AND = ", password='".$hash."'"; $MODE = 'pass'; }
 
                        // Or did he changed his password?
                        if (REQUEST_POST('addy') != $DATA[0]) {
                                // Jupp
-                               if ($MODE == "normal") { $MODE = "email"; } else { $MODE .= ";email"; }
+                               if ($MODE == 'normal') { $MODE = 'email'; } else { $MODE .= ";email"; }
                                REQUEST_SET_POST('old_addy', $DATA[0]);
                        }
 
                        // Update member's profile
-                       if (EXT_IS_ACTIVE("country")) {
+                       if (EXT_IS_ACTIVE('country')) {
                                // New way
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET
 gender='%s', surname='%s', family='%s',
@@ -281,13 +281,13 @@ array(
                        }
 
                        // Get all modes ...
-                       $modes = explode(";", $MODE);
+                       $modes = explode(';', $MODE);
 
                        // ... and run them through
-                       SEND_MODE_MAILS ("mydata", $modes);
+                       SEND_MODE_MAILS ('mydata', $modes);
                } else {
                        // Entered wrong pass for updating profile
-                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEBER_UPDATE_PWD_WRONG'));
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG'));
                }
        }
        break;
@@ -295,7 +295,7 @@ array(
 case "notify": // Switch off notfication
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET notified='N', last_update=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
                array(getUserId()), __FILE__, __LINE__);
-       $URL = "modules.php?module=login&amp;what=welcome&amp;msg=".urlencode(getMessage('PROFILE_UPDATED'));
+       $URL = 'modules.php?module=login&amp;what=welcome&amp;msg=' . urlencode(getMessage('PROFILE_UPDATED'));
        break;
 }