Commit 0f4d899c authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4980 (Fix incorrect internal links)

parent e6bd58cb

adminzone/pages/modules/admin_lookup.php

+3 −3
Original line number Diff line number Diff line
@@ -249,13 +249,13 @@ class Module_admin_lookup 
            $submitter_ban_link = null;

            if (addon_installed('securitylogging')) {

                if (((get_forum_type() == 'cns') && (!is_guest($id))) && ($id != get_member())) {

                    $member_ban_link = do_template('ACTIONLOGS_TOGGLE_LINK', array('_GUID' => '840c361ab217959f8b85141497e6e6a6', 'URL' => build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_member_ban', 'id' => $id, 'redirect' => get_self_url(true)), get_module_zone('admin_actionlog'))));

                    $member_ban_link = do_template('ACTIONLOGS_TOGGLE_LINK', array('_GUID' => '840c361ab217959f8b85141497e6e6a6', 'URL' => build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_member_ban', 'id' => $id, 'redirect' => get_self_url(true)), get_module_zone('admin_ip_ban'))));

                }

                if (($ip != '') && ($ip != get_ip_address()) && ($ip != cms_srv('SERVER_ADDR'))) {

                    $ip_ban_link = do_template('ACTIONLOGS_TOGGLE_LINK', array('_GUID' => '76979d80cdd7d3e664c9a4ec04419bc6', 'URL' => build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_ip_ban', 'id' => $ip), get_module_zone('admin_actionlog'))));

                    $ip_ban_link = do_template('ACTIONLOGS_TOGGLE_LINK', array('_GUID' => '76979d80cdd7d3e664c9a4ec04419bc6', 'URL' => build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_ip_ban', 'id' => $ip), get_module_zone('admin_ip_ban'))));

                }

                if ((!is_guest($id)) && ($id != get_member())) {

                    $submitter_ban_link = do_template('ACTIONLOGS_TOGGLE_LINK', array('_GUID' => '03834262af908bf78c4eef69e78c8cff', 'URL' => build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_submitter_ban', 'id' => $id, 'redirect' => get_self_url(true)), get_module_zone('admin_actionlog'))));

                    $submitter_ban_link = do_template('ACTIONLOGS_TOGGLE_LINK', array('_GUID' => '03834262af908bf78c4eef69e78c8cff', 'URL' => build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_submitter_ban', 'id' => $id, 'redirect' => get_self_url(true)), get_module_zone('admin_ip_ban'))));

                }

            }

adminzone/pages/modules/admin_security.php

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ class Module_admin_security 
        $fields = new Tempcode();

        foreach ($rows as $row) {

            $time = get_timezoned_date($row['date_and_time']);

            $lookup_url = build_url(array('page' => 'admin_lookup', 'param' => $row['ip']), '_SELF');

            $lookup_url = build_url(array('page' => 'admin_lookup', 'param' => $row['ip']), get_module_zone('admin_lookup'));

            $fields->attach(results_entry(array($row['failed_account'], $time, hyperlink($lookup_url, $row['ip'], false, true)), true));

        }

        $failed_logins = results_table(do_lang_tempcode('FAILED_LOGINS'), $start, 'failed_start', $max, 'failed_max', $max_rows, $fields_title, $fields, $sortables, $_sortable, $sort_order, 'failed_sort', new Tempcode());
@@ -265,8 +265,8 @@ class Module_admin_security 
        $row = $this->row;

        $time = $this->time;



        $lookup_url = build_url(array('page' => 'admin_lookup', 'param' => $row['ip']), '_SELF');

        $member_url = build_url(array('page' => 'admin_lookup', 'param' => $row['member_id']), '_SELF');

        $lookup_url = build_url(array('page' => 'admin_lookup', 'param' => $row['ip']), get_module_zone('admin_lookup'));

        $member_url = build_url(array('page' => 'admin_lookup', 'param' => $row['member_id']), get_module_zone('admin_lookup'));

        $reason = do_lang($row['reason'], $row['reason_param_a'], $row['reason_param_b']);



        $post = with_whitespace(unixify_line_format($row['data_post']));

sources/chat.php

+2 −2
Original line number Diff line number Diff line
@@ -471,9 +471,9 @@ function _chat_messages_script_ajax($room_id, $backlog = false, $message_id = nu 


        if ((addon_installed('actionlog')) && (has_actual_page_access(get_member(), 'admin_actionlog')) && (preg_match('#[:\.]#', $_message['ip_address']) != 0)) {

            if (is_guest($_message['member_id'])) {

                $ban_url = build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_ip_ban', 'id' => $_message['ip_address']), get_module_zone('admin_actionlog'));

                $ban_url = build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_ip_ban', 'id' => $_message['ip_address']), get_module_zone('admin_ip_ban'));

            } else {

                $ban_url = build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_submitter_ban', 'id' => $_message['member_id']), get_module_zone('admin_actionlog'));

                $ban_url = build_url(array('page' => 'admin_ip_ban', 'type' => 'toggle_submitter_ban', 'id' => $_message['member_id']), get_module_zone('admin_ip_ban'));

            }

        } else {

            $ban_url = new Tempcode();

sources/hooks/systems/commandr_commands/whois.php

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ class Hook_commandr_command_whois 
            $ip_list = new Tempcode();

            foreach ($rows as $row) {

                $date = get_timezoned_date($row['date_and_time']);

                $lookup_url = build_url(array('page' => '_SELF', 'param' => $row['ip']), '_SELF');

                $lookup_url = build_url(array('page' => 'admin_lookup', 'param' => $row['ip']), get_module_zone('admin_lookup'));

                $ip_list->attach(do_template('LOOKUP_IP_LIST_ENTRY', array('_GUID' => '01e74a2a146dab9a407b23c40f4555ad', 'LOOKUP_URL' => $lookup_url, 'DATE' => $date, '_DATE' => strval($row['date_and_time']), 'IP' => $row['ip'], 'BANNED' => in_array($row['ip'], $all_banned))));

            }

sources_custom/hooks/modules/members/customers.php

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class Hook_members_customers 


        require_lang('customers');

        return array(

            array('views', do_lang_tempcode('GIVE_CREDITS'), build_url(array('page' => 'admin_ecommerce_logs', 'type' => 'trigger', 'member_id' => $member_id), get_module_zone('admin_ecommerce')), 'menu/_generic_spare/1'),

            array('views', do_lang_tempcode('GIVE_CREDITS'), build_url(array('page' => 'admin_ecommerce_logs', 'type' => 'trigger', 'member_id' => $member_id), get_module_zone('admin_ecommerce_logs')), 'menu/_generic_spare/1'),

            array('views', do_lang_tempcode('CHARGE_CUSTOMER'), build_url(array('page' => 'admin_customers', 'type' => 'charge', 'username' => $GLOBALS['FORUM_DRIVER']->get_username($member_id)), get_module_zone('admin_customers')), 'menu/_generic_spare/2'),

        );

    }