File renamed to naming convention, ext-repair continued:
[mailer.git] / inc / modules / admin / what-list_user.php
index c7a54704936c9baba8e6c7404b894f6434cec969..0c861764522ffd981c4a34001ed85d600346c553 100644 (file)
@@ -43,44 +43,23 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) {
-       // Missing extension!
-       displayMessage(generateExtensionInactiveNotInstalledMessage('user'));
-       return;
-} // END - if
-
 // Init variables
 $MORE = '';
 $colspan = 4;
 
-// Add nickname if extension is found&active
-// @TODO Rewrite these if-blocks in a filter
-if (isExtensionActive('nickname')) {
-       // Add nickname
-       $MORE .= ", `nickname`";
-} else {
-       $MORE .= ", `userid`";
-}
-
-// Add random confirmed if extension version matches
-if (isExtensionInstalledAndNewer('user', '0.3.4')) {
-       // Add it...
-       $MORE .= ", `rand_confirmed`";
-
-       // Add lock reason?
-       if (isExtensionInstalledAndNewer('user', '0.3.5')) {
-               // Add them...
-               $MORE .= ", `lock_reason`, UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`";
-       } // END - if
+// Add lock reason?
+if (isExtensionInstalledAndNewer('user', '0.3.5')) {
+       // Add them...
+       $MORE .= ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
 } // END - if
 
 // Is the extension 'country' installed?
 if (isExtensionActive('country')) {
        // Add country code
-       $MORE .= ", `country_code`";
+       $MORE .= ', `country_code`';
 } else {
        // Add direct value
-       $MORE .= ", `country`";
+       $MORE .= ', `country`';
 }
 
 // Init unset data
@@ -97,7 +76,7 @@ if (isGetRequestParameterSet('userid')) {
 
        // Does the account exists?
        $result_user = SQL_QUERY_ESC("SELECT
-       `userid`, `gender`, `surname`, `family`, `street_nr`, `zip`, `city`, `country`, `email`, `birth_day`, `birth_month`, `birth_year`, `max_mails`, `receive_mails`, `refid`, `status`, `REMOTE_ADDR`, `last_online`, `last_module`, `ref_clicks`, `total_logins`, `used_points`, `emails_sent`, `joined`, `last_update`, `last_profile_sent`, `notified`, `ref_payout`, `emails_received`, `mails_confirmed`".$MORE."
+       `userid`, `country`, `email`, `birth_day`, `birth_month`, `birth_year`, `last_online`, `used_points`, `emails_sent`, `joined`, `last_update`, `last_profile_sent`, `notified`, `emails_received`, `mails_confirmed`".$MORE."
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -111,13 +90,12 @@ LIMIT 1",
                $content  = SQL_FETCHARRAY($result_user);
 
                // Get count/sum of refs, selected categories, unconfirmed mails
-               $content['refs']  = countSumTotalData($userid, 'refsystem' , 'counter');
-               $content['cats']  = countSumTotalData($userid, 'user_cats' , 'id', 'userid', true);
-               $content['links'] = countSumTotalData($userid, 'user_links', 'id', 'userid', true);
+               $content['refs']  = countSumTotalData($userid, 'refsystem', 'counter');
+               $content['cats']  = countSumTotalData($userid, 'user_cats', 'id', 'userid', true);
+               $content['links'] = getTotalUnconfirmedMails($userid);
 
                // Add links to the numbers
                if ($content['links'] > 0) $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $userid . '%}">' . $content['links'] . '</a>]';
-               if (isValidUserId($content['refid'])) $content['refid'] = $base . '&amp;what=list_user&amp;userid=' . $content['refid'] . '%}">'.$content['refid'] . '</a>]';
                if ($content['refs']  > 0) $content['refs']  = $base . '&amp;what=list_refs&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['refs'] . '%}</a>]';
                if ($content['cats']  > 0) $content['cats']  = $base . '&amp;what=list_cats&amp;userid=' . $userid . '%}">{%pipe,translateComma=' . $content['cats'] . '%}</a>]';
 
@@ -127,33 +105,37 @@ LIMIT 1",
                // Is this above zero?
                if ($stamp > 0) {
                        // Then use it
-                       $content['birthday'] = generateDateTime($stamp, 3);
+                       $content['birthday'] = generateDateTime($stamp, '3');
                } else {
                        // Zero or below so set zero!
-                       $content['birthday'] = generateDateTime(0, 3);
+                       $content['birthday'] = generateDateTime(0, '3');
                }
 
                // Prepare data for template
                $content['email_link']        = generateEmailLink($content['email'], 'user_data');
-               $content['last_online']       = generateDateTime($content['last_online'], 0);
-               $content['joined']            = generateDateTime($content['joined'], 0);
-               $content['last_update']       = generateDateTime($content['last_update'], 0);
-               $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], 0);
+               $content['last_online']       = generateDateTime($content['last_online'], '0');
+               $content['joined']            = generateDateTime($content['joined'], '0');
+               $content['last_update']       = generateDateTime($content['last_update'], '0');
+               $content['last_profile_sent'] = generateDateTime($content['last_profile_sent'], '0');
                $content['total_points']      = getTotalPoints($content['userid']);
-               $content['locked_points']     = countSumTotalData($userid, 'user_points', 'locked_points') + countSumTotalData($userid, 'user_points', 'locked_order_points');
-               $content['own_points']        = countSumTotalData($userid, 'user_points', 'points') + countSumTotalData($userid, 'user_points', 'order_points');
-               $content['lock_timestamp']    = generateDateTime($content['lock_timestamp'], 2);
-               $content['nickname']          = '{--EXT_NICKNAME_404--}';
+               $content['locked_points']     = countSumTotalData($content['userid'], 'user_points', 'locked_points') + countSumTotalData($content['userid'], 'user_points', 'locked_order_points');
+
+               // Prepare array for filter
+               $data = array(
+                       'userid' => $content['userid'],
+                       'points' => 0
+               );
+
+               // Run the filter chain
+               $data = runFilterChain('get_own_points', $data);
+
+               // Add more data
+               $content['own_points']     = $data['points'];
+               $content['lock_timestamp'] = generateDateTime($content['lock_timestamp'], 2);
 
                // Link to email_details if some are sent
                if ($content['emails_sent'] > 0) {
-                       $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $userid . '%}">}{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
-               } // END - if
-
-               // Nickname inclusion?
-               // @TODO Rewrite these to filters
-               if (isExtensionInstalled('nickname')) {
-                       $content['nickname'] = getNickname($content['userid']);
+                       $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
                } // END - if
 
                // Clickrate
@@ -178,7 +160,7 @@ LIMIT 1",
                loadTemplate('admin_user_details', false, $content);
        } else {
                // Account does not exist!
-               displayMessage(getMaskedMessage('ADMIN_MEMBER_404', $userid));
+               displayMessage('{%message,ADMIN_MEMBER_404=' . $userid . '%}');
        }
 
        // Free the result
@@ -206,21 +188,31 @@ LIMIT 1",
                        case 'norefs': // Users w/o refs
                                if (!empty($whereStatement)) {
                                        // Add AND statement
-                                       $whereStatement .= " AND `refid`=0";
+                                       $whereStatement .= ' AND (`refid`=0 OR `refid` IS NULL)';
+                               } else {
+                                       // Add WHERE statement
+                                       $whereStatement = ' WHERE (`refid`=0 OR `refid` IS NULL)';
+                               }
+                               break;
+
+                       case 'random_refid': // Users available for random referal id
+                               if (!empty($whereStatement)) {
+                                       // Add AND statement
+                                       $whereStatement .= ' AND `rand_confirmed` >= {?user_min_confirmed?}';
                                } else {
                                        // Add WHERE statement
-                                       $whereStatement = " WHERE `refid`=0";
+                                       $whereStatement = ' WHERE `rand_confirmed` >= {?user_min_confirmed?}';
                                }
                                break;
 
                        default: // Invalid list mode
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode')));
+                               debug_report_bug(__FILE__, __LINE__, sprintf("Invalid list mode %s detected.", getRequestParameter('mode')));
                                break;
                } // END - switch
        } // END - if
 
        // Generate master query string
-       $sql = sprintf("SELECT `userid`, `gender`, `surname`, `family`, `email`, `REMOTE_ADDR`, `refid`, `status`, `emails_sent`, `mails_confirmed`, `emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC",
+       $sql = sprintf("SELECT `userid`, `email`, `emails_sent`, `mails_confirmed`, `emails_received`" . $MORE . " FROM `{?_MYSQL_PREFIX?}_user_data`" . $whereStatement . " ORDER BY `%s` ASC",
                getRequestParameter('sortby')
        );
 
@@ -273,7 +265,7 @@ LIMIT 1",
                        $content = merge_array($content, $templateContent);
 
                        // Get number of unconfirmed mails
-                       $content['links'] = countSumTotalData($content['userid'], 'user_links', 'id', 'userid', true);
+                       $content['links'] = getTotalUnconfirmedMails($content['userid']);
                        if ($content['links'] > 0) {
                                $content['links'] = $base . '&amp;what=list_links&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['links'] . '%}</a>]';
                        } // END - if
@@ -283,16 +275,10 @@ LIMIT 1",
                                $content['emails_sent'] = $base . '&amp;what=email_details&amp;userid=' . $content['userid'] . '%}">{%pipe,translateComma=' . $content['emails_sent'] . '%}</a>]';
                        } // END - if
 
-                       // Add nickname
-                       $content['nickname'] = '{--EXT_NICKNAME_404--}';
-                       if (isExtensionInstalled('nickname')) {
-                               $content['nickname'] = getNickname($content['userid']);
-                       } // END - if
-
-                       // Clickrate
-                       $content['rate'] = '0';
+                       // Click rate
+                       $content['click_rate'] = '0';
                        if ($content['emails_received'] > 0) {
-                               $content['rate'] = $content['mails_confirmed'] / $content['emails_received'] * 100;
+                               $content['click_rate'] = $content['mails_confirmed'] / $content['emails_received'] * 100;
                        } // END - if
 
                        // Transfer data to array