Commit 21027100 authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Implemented MANTIS-5902 (Allow credits that do not affect life-time points;... 

Implemented MANTIS-5902 (Allow credits that do not affect life-time points; rename life-time points)
parent 68702954

adminzone/pages/modules/admin_cns_forums.php

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ class Module_admin_cns_forums extends Standard_crud_module 
            $x_labels[] = integer_format($i);

        }



        $text->attach(graph_line_chart($datasets, $x_labels, 'life-time points', 'voting power', [], [], null, '300px'));

        $text->attach(graph_line_chart($datasets, $x_labels, 'rank points', 'voting power', [], [], null, '300px'));



        return do_template('FORM_SCREEN', [

            '_GUID' => '1eadb98e94da438f95bddb9886f43cab',

adminzone/pages/modules/admin_cns_members.php

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ class Module_admin_cns_members 
            $rows = $GLOBALS['FORUM_DB']->query($sql, 500, $start);

            foreach ($rows as $row) {

                if (addon_installed('points') && ($max_points > 0)) {

                    if (points_lifetime($row['id']) > $max_points) {

                    if (points_rank($row['id']) > $max_points) {

                        continue;

                    }

                }

adminzone/pages/modules/admin_points.php

+6 −2
Original line number Diff line number Diff line
@@ -329,12 +329,13 @@ class Module_admin_points 
        if ($has_gift_points !== null) {

            $map[] = do_lang_tempcode('GIFT_POINTS');

        }

        $map = array_merge($map, [do_lang_tempcode('POINTS'), do_lang_tempcode('SENDER'), do_lang_tempcode('RECIPIENT'), do_lang_tempcode('REASON'), do_lang_tempcode('STATUS'), do_lang_tempcode('ACTIONS')]);

        $map = array_merge($map, [do_lang_tempcode('POINTS'), do_lang_tempcode('_RANK_POINTS'), do_lang_tempcode('SENDER'), do_lang_tempcode('RECIPIENT'), do_lang_tempcode('REASON'), do_lang_tempcode('STATUS'), do_lang_tempcode('ACTIONS')]);

        $header_row = results_header_row($map, $sortables, 'ledger_sort', $sortable . ' ' . $sort_order);

        foreach ($rows as $myrow) {

            $date = get_timezoned_date_time($myrow['date_and_time'], false);

            $reason = get_translated_tempcode('points_ledger', $myrow, 'reason');

            $_date = hyperlink(build_url(['page' => '_SELF', 'type' => 'view', 'id' => $myrow['id']], '_SELF'), $date, false, true);

            $is_ranked = ($myrow['is_ranked'] == 1) ? do_lang_tempcode('YES') : do_lang_tempcode('NO');



            if (is_guest($myrow['receiving_member'])) {

                $to = do_lang_tempcode('USER_SYSTEM');
@@ -399,7 +400,7 @@ class Module_admin_points 
            } else {

                $status = do_lang_tempcode('LEDGER_STATUS_SHORT_B_' . strval($myrow['status']));

            }

            $map = array_merge($map, [integer_format($myrow['amount_points']), $from, $to, $reason, $status, $actions]);

            $map = array_merge($map, [integer_format($myrow['amount_points']), $is_ranked, $from, $to, $reason, $status, $actions]);



            $result_entries->attach(results_entry($map, true));

        }
@@ -620,6 +621,8 @@ class Module_admin_points 
        $to_name = is_guest($row['receiving_member']) ? do_lang('SYSTEM') : $GLOBALS['FORUM_DRIVER']->get_username($row['receiving_member'], true);

        $_to_name = (is_guest($row['receiving_member'])) ? make_string_tempcode(escape_html($to_name)) : hyperlink(points_url($row['receiving_member']), escape_html($to_name), false, false, do_lang_tempcode('VIEW_POINTS'));



        $is_ranked = ($row['is_ranked'] == 1) ? do_lang_tempcode('YES') : do_lang_tempcode('NO');



        // Mask sender if we do not have permission to trace anonymous transactions

        if (($row['anonymous'] == 1) && (!has_privilege($member_id_viewing, 'trace_anonymous_points_transactions'))) {

            $_from_name = do_lang_tempcode('ANONYMOUS');
@@ -657,6 +660,7 @@ class Module_admin_points 
            'STATUS' => $status,

            'POINTS' => integer_format($row['amount_points']),

            'GIFT_POINTS' => integer_format($row['amount_gift_points']),

            '_RANK_POINTS' => $is_ranked,

            'FROM' => $_from_name,

            'TO' => $_to_name,

            'REASON' => $reason,

lang/EN/cns.ini

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ PROMOTION_FROM=Promotion from 
PROMOTION_TARGET=Promotion target

DESCRIPTION_PROMOTION_TARGET=Upon reaching the promotion point threshold, members of this usergroup are automatically promoted to the usergroup name specified in this field (unless the specified usergroup has the “Promotions require manual approval” setting enabled in which promotions will require manual approval by the leader or a staff member).

PROMOTION_THRESHOLD=Promotion point threshold

DESCRIPTION_PROMOTION_THRESHOLD=The number of life-time points before a member is promoted to the target usergroup.

DESCRIPTION_PROMOTION_THRESHOLD=The number of rank points before a member is promoted to the target usergroup.

PROMOTION_APPROVAL=Promotions require manual approval

DESCRIPTION_PROMOTION_APPROVAL=When ticked (checked), members being promoted to this usergroup through ranking will require manual approval by the usergroup leader or someone with the “Control usergroups that member is not leader of” privilege. When unticked (unchecked), members will be automatically promoted (added) to this usergroup.

DESCRIPTION_GROUP_TITLE=This sets the title for member's who are primarily in this usergroup and don't have their own custom title.
@@ -806,7 +806,7 @@ NO_INBOX=Nobody has messaged you yet 
MEMBER_ADDED_TO_GROUP=Member added to usergroup

MEMBER_REMOVED_FROM_GROUP=Member removed from usergroup

MEMBER_PRIMARY_GROUP_CHANGED=Member primary usergroup changed

LIFETIME_POINTS=Life-time point earnings; {1} {1|point|points} available to spend

RANK_POINTS=Rank points; {1} {1|point|points} in the balance to spend

EXCEEDED_TIME_LIMIT=You can only perform this action within {1} of making the post.

TIME_LEFT_TO_EDIT_POST=You have {1} left to edit this post.

TOPIC_HAS_WHISPER_TO_YOU=You are about to post a public reply in this topic, unless you fill the &ldquo;Whisper&rdquo; field in. You have already been whispered to in this topic by <strong>{1}</strong>. If you intended to make a reply to them, put &ldquo;{1}&rdquo; in the &ldquo;Whisper&rdquo; field, or go back and reply via the quote button under their post to you.

lang/EN/cns_lurkers.ini

+2 −2
Original line number Diff line number Diff line 
[strings]

CHOOSE_DELURK_CRITERIA=Choose the criteria that defines which members to delete. Set blank or 0 any criteria you do not wish to use. The criteria you set will be remembered the next time you load this screen. When proceeding, you will be asked to confirm who to delete.

DELURK_MAX_POSTS=Maximum forum posts

DELURK_MAX_POINTS=Maximum life-time points

DELURK_MAX_POINTS=Maximum rank points

DELURK_MAX_LOGGED_ACTIONS=Maximum logged actions

DELURK_MIN_DAYS_SINCE_LOGIN=Minimum days since last visit

DELURK_MIN_DAYS_SINCE_JOIN=Minimum days since joining

DELURK_NON_CONFIRMED=Non-confirmed only

DELURK_MAX_POSTS_DESCRIPTION=Deleted members must not have made more than this many forum posts.

DELURK_MAX_POINTS_DESCRIPTION=Deleted members must not have earned more than this many points in their life-time.

DELURK_MAX_POINTS_DESCRIPTION=Deleted members must not have more than this many rank points.

DELURK_MAX_LOGGED_ACTIONS_DESCRIPTION=Deleted members must not have more than this many entries in the action log (submissions, edits, deletions, etc, carried out on this website).

DELURK_MIN_DAYS_SINCE_LOGIN_DESCRIPTION=Deleted members must not have visited the website for at least this many days.

DELURK_MIN_DAYS_SINCE_JOIN_DESCRIPTION=Deleted members must have joined the website at least this many days ago.