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

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

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index dc3cc18f02b75490e36addab5969f6a0b84905dc..a13bbaf73243ebc10448c32ed1010025f6cff07f 100644 (file)
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -40,7 +40,7 @@
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);

-} elseif ((!EXT_IS_ACTIVE('user')) || (GET_EXT_VERSION('user') == "")) {
+} elseif ((!EXT_IS_ACTIVE('user')) || (GET_EXT_VERSION('user') == '')) {

        // Missing extension!
        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'user'));
        return;
        // Missing extension!
        addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'user'));
        return;


@@ -52,7 +52,7 @@ ADD_DESCR('admin', __FILE__);
 // Init title with "all accounts"
 $listHeader = getMessage('ADMIN_ALL_ACCOUNTS');
 if (REQUEST_ISSET_GET(('status'))) {
 // Init title with "all accounts"
 $listHeader = getMessage('ADMIN_ALL_ACCOUNTS');
 if (REQUEST_ISSET_GET(('status'))) {

-       // Set title according to the "status"
+       // Set title according to the 'status'

        $listHeader = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(REQUEST_GET(('status')))));
 } elseif (REQUEST_ISSET_GET(('mode'))) {
        // Set title according to the "mode"
        $listHeader = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(REQUEST_GET(('status')))));
 } elseif (REQUEST_ISSET_GET(('mode'))) {
        // Set title according to the "mode"


@@ -129,29 +129,29 @@ LIMIT 1",
                // Is this above zero?
                if ($stamp > 0) {
                        // Then use it
                // Is this above zero?
                if ($stamp > 0) {
                        // Then use it

-                       define('_BIRTHDAY', MAKE_DATETIME($stamp, "3"));
+                       define('_BIRTHDAY', generateDateTime($stamp, "3"));

                } else {
                        // Zero or below so set zero!
                } else {
                        // Zero or below so set zero!

-                       define('_BIRTHDAY', MAKE_DATETIME(0, "3"));
+                       define('_BIRTHDAY', generateDateTime(0, "3"));

                }
 
                // Prepare data for template
                define('_REFS' , $REFS);
                define('_CATS' , $CATS);
                define('_LINKS', $LINKS);
                }
 
                // Prepare data for template
                define('_REFS' , $REFS);
                define('_CATS' , $CATS);
                define('_LINKS', $LINKS);

-               define('_ADMIN_LINKS', MEMBER_ACTION_LINKS($uid, $DATA['status']));
-               $DATA['gender']            = TRANSLATE_GENDER($DATA['gender']);
-               $DATA['email_link']        = CREATE_EMAIL_LINK($DATA['email'], "user_data");
-               $DATA['status']            = TRANSLATE_STATUS($DATA['status']);
-               $DATA['last_online']       = MAKE_DATETIME($DATA['last_online'], "0");
-               $DATA['used_points']       = TRANSLATE_COMMA($DATA['used_points']);
-               if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $base."&amp;what=email_details&amp;uid=".$uid."\">".TRANSLATE_COMMA($DATA['emails_sent'])."</a>]";
-               $DATA['joined']            = MAKE_DATETIME($DATA['joined'], "0");
-               $DATA['last_update']       = MAKE_DATETIME($DATA['last_update'], "0");
-               $DATA['last_profile_sent'] = MAKE_DATETIME($DATA['last_profile_sent'], "0");
-               $DATA['total']             = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "points"));
-               $DATA['locked']            = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
-               $DATA['lock_timestamp']    = MAKE_DATETIME($DATA['lock_timestamp'], "2");
+               define('_ADMIN_LINKS', generateMemberAdminActionLinks($uid, $DATA['status']));
+               $DATA['gender']            = translateGender($DATA['gender']);
+               $DATA['email_link']        = generateMemberEmailLink($DATA['email'], "user_data");
+               $DATA['status']            = translateUserStatus($DATA['status']);
+               $DATA['last_online']       = generateDateTime($DATA['last_online'], '0');
+               $DATA['used_points']       = translateComma($DATA['used_points']);
+               if ($DATA['emails_sent'] > 0) $DATA['emails_sent'] = $base."&amp;what=email_details&amp;uid=".$uid."\">".translateComma($DATA['emails_sent'])."</a>]";
+               $DATA['joined']            = generateDateTime($DATA['joined'], '0');
+               $DATA['last_update']       = generateDateTime($DATA['last_update'], '0');
+               $DATA['last_profile_sent'] = generateDateTime($DATA['last_profile_sent'], '0');
+               $DATA['total']             = translateComma(GET_TOTAL_DATA($uid, "user_points", "points"));
+               $DATA['locked']            = translateComma(GET_TOTAL_DATA($uid, "user_points", "locked_points"));
+               $DATA['lock_timestamp']    = generateDateTime($DATA['lock_timestamp'], "2");

 
                // Is the lock reason not set?
                if (!isset($DATA['lock_reason'])) $DATA['lock_reason'] = '---';
 
                // Is the lock reason not set?
                if (!isset($DATA['lock_reason'])) $DATA['lock_reason'] = '---';


@@ -169,18 +169,18 @@ LIMIT 1",
                // Is the user extension newer?
                if (GET_EXT_VERSION('user') >= '0.3.4') {
                        // Then "translate" the number
                // Is the user extension newer?
                if (GET_EXT_VERSION('user') >= '0.3.4') {
                        // Then "translate" the number

-                       $DATA['rand_confirmed'] = TRANSLATE_COMMA($DATA['rand_confirmed']);
+                       $DATA['rand_confirmed'] = translateComma($DATA['rand_confirmed']);

                } // END - if
 
                // Clickrate
                $DATA['click_rate'] = 0;
                if ($DATA['emails_received'] > 0) {
                } // END - if
 
                // Clickrate
                $DATA['click_rate'] = 0;
                if ($DATA['emails_received'] > 0) {

-                       $DATA['click_rate'] = TRANSLATE_COMMA($DATA['mails_confirmed'] / $DATA['emails_received'] * 100);
+                       $DATA['click_rate'] = translateComma($DATA['mails_confirmed'] / $DATA['emails_received'] * 100);

                } // END - if
 
                // "Translate" more data
                } // END - if
 
                // "Translate" more data

-               $DATA['mails_confirmed'] = TRANSLATE_COMMA($DATA['mails_confirmed']);
-               $DATA['emails_received'] = TRANSLATE_COMMA($DATA['emails_received']);
+               $DATA['mails_confirmed'] = translateComma($DATA['mails_confirmed']);
+               $DATA['emails_received'] = translateComma($DATA['emails_received']);

 
                // Is the extension 'country' installed?
                if (EXT_IS_ACTIVE('country')) {
 
                // Is the extension 'country' installed?
                if (EXT_IS_ACTIVE('country')) {


@@ -188,7 +188,7 @@ LIMIT 1",
                        $DATA['country'] = COUNTRY_GENERATE_INFO($DATA['country_code']);
                } elseif ($DATA['country'] == 0) {
                        // Zero ID???
                        $DATA['country'] = COUNTRY_GENERATE_INFO($DATA['country_code']);
                } elseif ($DATA['country'] == 0) {
                        // Zero ID???

-                       $DATA['country'] = "???";
+                       $DATA['country'] = '???';

                }
 
                // Load user-details template
                }
 
                // Load user-details template


@@ -295,14 +295,14 @@ LIMIT 1",
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Set refid link
                $OUT = ''; $SW = 2;
                while ($content = SQL_FETCHARRAY($result)) {
                        // Set refid link

-                       if ($content['refid'] > 0) $content['refid'] = ADMIN_USER_PROFILE_LINK($content['refid']);
+                       if ($content['refid'] > 0) $content['refid'] = generateUserProfileLink($content['refid']);

 
                        // Get number of unconfirmed mails
                        $LINKS = GET_TOTAL_DATA($content['userid'], "user_links", "id", 'userid', true);
 
                        // Get number of unconfirmed mails
                        $LINKS = GET_TOTAL_DATA($content['userid'], "user_links", "id", 'userid', true);

-                       if ($LINKS > 0) $LINKS = $base."&amp;what=list_links&amp;uid=".$content['userid']."\">".TRANSLATE_COMMA($LINKS)."</a>]";
+                       if ($LINKS > 0) $LINKS = $base."&amp;what=list_links&amp;uid=".$content['userid']."\">".translateComma($LINKS)."</a>]";

 
                        // Set link to sent mails if present
 
                        // Set link to sent mails if present

-                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $base."&amp;what=email_details&amp;uid=".$content['userid']."\">".TRANSLATE_COMMA($content['emails_sent'])."</a>]";
+                       if ($content['emails_sent'] > 0) $content['emails_sent'] = $base."&amp;what=email_details&amp;uid=".$content['userid']."\">".translateComma($content['emails_sent'])."</a>]";

 
                        // Add nickname
                        if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = '---';
 
                        // Add nickname
                        if (empty($content['nickname']) || $content['nickname'] == $content['userid']) $content['nickname'] = '---';


@@ -318,17 +318,17 @@ LIMIT 1",
 
                        // Transfer data to array
                        $content['sw']     = $SW;
 
                        // Transfer data to array
                        $content['sw']     = $SW;

-                       $content['uid']    = ADMIN_USER_PROFILE_LINK($content['userid']);
-                       $content['gender'] = TRANSLATE_GENDER($content['gender']);
-                       $content['email']  = "[<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['email']."</a>]";
+                       $content['uid']    = generateUserProfileLink($content['userid']);
+                       $content['gender'] = translateGender($content['gender']);
+                       $content['email']  = "[<a href=\"".generateMemberEmailLink($content['email'], "user_data")."\">".$content['email']."</a>]";

                        $content['addr']   = $content['REMOTE_ADDR'];
                        $content['links']  = $LINKS;
                        $content['addr']   = $content['REMOTE_ADDR'];
                        $content['links']  = $LINKS;

-                       $content['alinks'] = MEMBER_ACTION_LINKS($content['userid'], $content['status']);
-                       $content['points'] = TRANSLATE_COMMA($pointsTotal);
-                       $content['rate']   = TRANSLATE_COMMA($clickRate);
-                       $content['locked'] = TRANSLATE_COMMA(GET_TOTAL_DATA($content['userid'], "user_points", "locked_points"));
-                       $content['lock_timestamp'] = MAKE_DATETIME($content['lock_timestamp'], "2");
-                       $content['status'] = TRANSLATE_STATUS($content['status']);
+                       $content['alinks'] = generateMemberAdminActionLinks($content['userid'], $content['status']);
+                       $content['points'] = translateComma($pointsTotal);
+                       $content['rate']   = translateComma($clickRate);
+                       $content['locked'] = translateComma(GET_TOTAL_DATA($content['userid'], "user_points", "locked_points"));
+                       $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], "2");
+                       $content['status'] = translateUserStatus($content['status']);

 
                        // Is the lock reason not set?
                        if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';
 
                        // Is the lock reason not set?
                        if (!isset($content['lock_reason'])) $content['lock_reason'] = '---';


@@ -338,9 +338,9 @@ LIMIT 1",
                        if (EXT_IS_ACTIVE('country')) {
                                // Then overwrite country information
                                $content['country'] = COUNTRY_GENERATE_INFO($content['country_code']);
                        if (EXT_IS_ACTIVE('country')) {
                                // Then overwrite country information
                                $content['country'] = COUNTRY_GENERATE_INFO($content['country_code']);

-                       } elseif ($content['country'] == "") {
+                       } elseif ($content['country'] == '') {

                                // Zero ID???
                                // Zero ID???

-                               $content['country'] = "???";
+                               $content['country'] = '???';

                        }
 
                        // Load row template and switch colors
                        }
 
                        // Load row template and switch colors