New naming convention applied to many functions, see #118 for details

[mailer.git] / inc / modules / sponsor / account.php

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 463c9743bdba7b27a3dc3a135e908527e403574a..cb46839d0a31873e14dc3e0bd80e98ef86a7b62c 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Der Sponsor kann sein Account verwalten          *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $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                  *
@@ -32,10 +37,10 @@
 
 // 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 ((!EXT_IS_ACTIVE("sponsor"))
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "sponsor");
+} elseif ((!EXT_IS_ACTIVE('sponsor'))
+       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'sponsor'));
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
@@ -49,38 +54,38 @@ gender, surname, family, street_nr1, street_nr2, zip, city, country,
 phone, fax, cell, email, url,
 status, receive_warnings
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
-WHERE id='%s' AND password='%s' LIMIT 1",
-       array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
+WHERE `id`='%s' AND password='%s' LIMIT 1",
+       array(bigintval(getSession('sponsorid')), getSession('sponsorpass')), __FILE__, __LINE__);
 
 // Entry found?
 if (SQL_NUMROWS($result) == 1) {
        // Load sponsor data
        $content = SQL_FETCHARRAY($result);
-       if ($content['status'] == "CONFIRMED") {
+       if ($content['status'] == 'CONFIRMED') {
                // Check if form was submitted or not
                if (IS_FORM_SENT()) {
                        // Check passwords
                        if (!REQUEST_ISSET_POST(('pass_old'))) {
                                // No current password entered
-                               $MSG = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
-                       } elseif (md5(REQUEST_POST('pass_old')) != get_session('sponsorpass')) {
+                               $message = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
+                       } elseif (md5(REQUEST_POST('pass_old')) != getSession('sponsorpass')) {
                                // Entered password didn't match password in DB
-                               $MSG = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
+                               $message = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
                        } elseif ((REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2'))) && (REQUEST_POST('pass1') != REQUEST_POST('pass2'))) {
                                // Both new passwords did not match
-                               $MSG = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
+                               $message = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
                        } elseif ((!REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2')))) {
                                // No password one entered
-                               $MSG = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
+                               $message = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
                        } elseif ((REQUEST_ISSET_POST(('pass1'))) && (!REQUEST_ISSET_POST(('pass2')))) {
                                // No password two entered
-                               $MSG = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
+                               $message = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
                        } elseif ((REQUEST_ISSET_POST(('pass1'))) && (strlen(REQUEST_POST('pass1')) < getConfig('pass_len'))) {
                                // Too short password
-                               $MSG = sprintf(getMessage('SPONSOR_PASSWORD_TOO_SHORT'), getConfig('pass_len'));
+                               $message = sprintf(getMessage('SPONSOR_PASSWORD_TOO_SHORT'), getConfig('pass_len'));
                        } else {
                                // Default is we don't want to change password!
-                               $PASS_AND = ""; $PASS_DATA = "";
+                               $PASS_AND = ''; $PASS_DATA = '';
 
                                // Check if we want to change password or not
                                if ((REQUEST_POST('pass1') == REQUEST_POST('pass2')) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') != REQUEST_POST('pass_old'))) {
@@ -101,36 +106,36 @@ if (SQL_NUMROWS($result) == 1) {
                                REQUEST_SET_POST('last_change', "UNIX_TIMESTAMP()");
 
                                // Save data
-                               $MSG = SPONSOR_SAVE_DATA(REQUEST_POST_ARRAY(), $content);
+                               $message = SPONSOR_SAVE_DATA(REQUEST_POST_ARRAY(), $content);
                        }
 
-                       if (!empty($MSG)) {
+                       if (!empty($message)) {
                                // Output message
-                               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, $MSG);
+                               $OUT = LOAD_TEMPLATE('admin_settings_saved', true, $message);
                        } else {
                                // No message generated
-                               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
+                               $OUT = LOAD_TEMPLATE('admin_settings_saved', true, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
                        }
                } else {
                        // Check for gender selection
                        switch ($content['gender'])
                        {
                        case "M": // Male
-                               define('__GENDER_M', " selected=\"selected\"");
-                               define('__GENDER_F', "");
-                               define('__GENDER_C', "");
+                               define('__GENDER_M', ' selected="selected"');
+                               define('__GENDER_F', '');
+                               define('__GENDER_C', '');
                                break;
 
                        case "F": // Female
-                               define('__GENDER_M', "");
-                               define('__GENDER_F', " selected=\"selected\"");
-                               define('__GENDER_C', "");
+                               define('__GENDER_M', '');
+                               define('__GENDER_F', ' selected="selected"');
+                               define('__GENDER_C', '');
                                break;
 
                        case "C": // Company
-                               define('__GENDER_M', "");
-                               define('__GENDER_F', "");
-                               define('__GENDER_C', " selected=\"selected\"");
+                               define('__GENDER_M', '');
+                               define('__GENDER_F', '');
+                               define('__GENDER_C', ' selected="selected"');
                                break;
                        }
 
@@ -139,12 +144,12 @@ if (SQL_NUMROWS($result) == 1) {
                }
        } else {
                // Locked or so?
-               $STATUS = SPONSOR_TRANSLATE_STATUS($content['status']);
-               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_ACCOUNT_FAILED_1.$STATUS.SPONSOR_ACCOUNT_FAILED_2);
+               $STATUS = sponsorTranslateUserStatus($content['status']);
+               $OUT = LOAD_TEMPLATE('admin_settings_saved', true, sprintf(getMessage('SPONSOR_ACCOUNT_FAILED'), $STATUS));
        }
 } else {
        // Sponsor account not found!
-       $OUT = LOAD_TEMPLATE("admin_settings_saved", true, sprintf(getMessage('SPONSOR_ACCOUNT_404'), get_session('sponsorid')));
+       $OUT = LOAD_TEMPLATE('admin_settings_saved', true, sprintf(getMessage('SPONSOR_ACCOUNT_404'), getSession('sponsorid')));
 }
 
 // Free memory