Menu
▾
▴
[mxbb-commits] core/modules/mx_phpbb3blocks mx_activity_stats.php, NONE, 1.1 mx_announce.php, 1.2, 1.3 mx_last_msg.php, 1.4, 1.5 mx_statistics.php, 1.4, 1.5 mx_viewforum.php, 1.5, 1.6 phpbb3blocks.pak, 1.5, 1.6
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/modules/mx_phpbb3blocks Modified Files: mx_announce.php mx_last_msg.php mx_statistics.php mx_viewforum.php phpbb3blocks.pak Added Files: mx_activity_stats.php Log Message: new Mx_BBcode merged in one backend file Index: phpbb3blocks.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/phpbb3blocks.pak,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** phpbb3blocks.pak 27 Aug 2008 05:17:37 -0000 1.5 --- phpbb3blocks.pak 4 Oct 2008 07:04:38 -0000 1.6 *************** *** 13,16 **** --- 13,17 ---- parameter=+:2=+:2=+:announce_nbr_days=+:Number=+:14=+:=+:0=+:0 parameter=+:2=+:11=+:announce_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0 + parameter=+:2=+:12=+:announce_truncate=+:Number=+:16777215=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - phpBB Announcements=+:Demo block=+:2=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 *************** *** 35,42 **** parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:phpBB Index=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 - function=+:0=+:0=+:0=+:endoflist=+:0=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:30=+:41=+:Statistics=+:Site Statistics Function=+:mx_statistics.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - Statistics=+:Demo block=+:41=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 36,46 ---- parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:phpBB Index=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:53=+:41=+:Statistics=+:Site Statistics Function=+:mx_statistics.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - Statistics=+:Demo block=+:41=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:53=+:42=+:Activity Stats=+:Activity Stats Block=+:mx_activity_stats.php=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Activity Stats=+:Demo block=+:42=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 \ No newline at end of file --- NEW FILE: mx_activity_stats.php --- <?php /** * * @package MX-Publisher Module - mx_phpbb3blocks * @version $Id: mx_activity_stats.php,v 1.1 2008/10/04 07:04:38 orynider Exp $ * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com * */ if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); } // // Read Block Settings // $title = $mx_block->block_info['block_title']; $show_title = $mx_block->block_info['show_title']; /** * @ignore */ // =================================================== // Include the constants file // =================================================== include_once( $module_root_path . 'includes/phpbb3blocks_constants.' . $phpEx ); include_once( $module_root_path . 'includes/mx_functions_display.' . $phpEx ); include_once( $module_root_path . 'includes/mx_functions_activity.' . $phpEx ); // ================================================================================ // The following code is based on includes/page_header.php (phpBB 2.0.14) // ================================================================================ $l_timezone = explode('.', $board_config['board_timezone']); $l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; // // Start session management // //$mx_user->session_begin(); //$mx_user->init($user_ip, PAGE_INDEX); $phpbb_auth->acl($mx_user->data); // Do only once, in user_init // Move later $mx_user->setup('viewforum'); // // End session management // //$auth_data_sql_msg = $phpbb_auth->get_auth_forum(); //die(var_export($auth_data_sql_msg)); //die('s'.var_export($phpbb_auth->acl_getf('f_list', true))); mx_display_forums('', $board_config['load_moderators']); // Set some stats, get posts count from forums data if we... hum... retrieve all forums data $total_posts = $board_config['num_posts']; $total_topics = $board_config['num_topics']; $total_users = $board_config['num_users']; $l_total_user_s = ($total_users == 0) ? 'TOTAL_USERS_ZERO' : 'TOTAL_USERS_OTHER'; $l_total_post_s = ($total_posts == 0) ? 'TOTAL_POSTS_ZERO' : 'TOTAL_POSTS_OTHER'; $l_total_topic_s = ($total_topics == 0) ? 'TOTAL_TOPICS_ZERO' : 'TOTAL_TOPICS_OTHER'; // Grab group details for legend display if ($phpbb_auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) { $sql = 'SELECT group_id, group_name, group_colour, group_type FROM ' . GROUPS_TABLE . ' WHERE group_legend = 1 ORDER BY group_name ASC'; } else { $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type FROM ' . GROUPS_TABLE . ' g LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON ( g.group_id = ug.group_id AND ug.user_id = ' . $mx_user->data['user_id'] . ' AND ug.user_pending = 0 ) WHERE g.group_legend = 1 AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $mx_user->data['user_id'] . ') ORDER BY g.group_name ASC'; } $result = $db->sql_query($sql); $legend = ''; while ($row = $db->sql_fetchrow($result)) { $colour_text = ($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . '"' : ''; if ($row['group_name'] == 'BOTS') { $legend .= (($legend != '') ? ', ' : '') . '<span' . $colour_text . '>' . $mx_user->lang['G_BOTS'] . '</span>'; } else { $legend .= (($legend != '') ? ', ' : '') . '<a' . $colour_text . ' href="' . mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']) . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $mx_user->lang['G_' . $row['group_name']] : $row['group_name']) . '</a>'; } } $db->sql_freeresult($result); // Generate birthday list if required ... $birthday_list = ''; if ($board_config['load_birthdays'] && $board_config['allow_birthdays']) { $now = getdate(time() + $mx_user->timezone + $mx_user->dst - date('Z')); $sql = 'SELECT user_id, username, user_colour, user_birthday FROM ' . USERS_TABLE . " WHERE user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) { $birthday_list .= (($birthday_list != '') ? ', ' : '') . mx_get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); if ($age = (int) substr($row['user_birthday'], -4)) { $birthday_list .= ' (' . ($now['year'] - $age) . ')'; } } $db->sql_freeresult($result); } $template->set_filenames(array( 'block_forum' => 'mx_activity_stats.html') ); // Assign index specific vars $template->assign_vars(array( 'SHOW_TITLE' => $show_title, 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'TOTAL_POSTS' => sprintf($mx_user->lang[$l_total_post_s], $total_posts), 'TOTAL_TOPICS' => sprintf($mx_user->lang[$l_total_topic_s], $total_topics), 'TOTAL_USERS' => sprintf($mx_user->lang[$l_total_user_s], $total_users), //'NEWEST_USER' => sprintf($mx_user->lang['NEWEST_USER'], mx_get_username_string('full', $board_config['newest_user_id'], $board_config['newest_username'], $board_config['newest_user_colour'])), 'NEWEST_USER' => sprintf('Newest User', mx_get_username_string('full', $board_config['newest_user_id'], $board_config['newest_username'], $board_config['newest_user_colour'])), 'LEGEND' => $legend, 'BIRTHDAY_LIST' => $birthday_list, 'FORUM_IMG' => $mx_user->img('forum_read', 'NO_NEW_POSTS'), 'FORUM_NEW_IMG' => $mx_user->img('forum_unread', 'NEW_POSTS'), 'FORUM_LOCKED_IMG' => $mx_user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'), 'FORUM_NEW_LOCKED_IMG' => $mx_user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'), 'S_LOGIN_ACTION' => mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), 'S_DISPLAY_BIRTHDAY_LIST' => ($board_config['load_birthdays']) ? true : false, 'U_MARK_FORUMS' => ($mx_user->data['is_registered'] || $board_config['load_anon_lastread']) ? mx3_append_sid("{$phpbb_root_path}index.$phpEx", 'mark=forums') : '', 'U_MCP' => ($phpbb_auth->acl_get('m_') || $phpbb_auth->acl_getf_global('m_')) ? mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=front', true, $mx_user->session_id) : '') ); mx_activity_block(); $template->pparse('block_forum'); ?> Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/mx_announce.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_announce.php 13 Jul 2008 19:31:27 -0000 1.2 --- mx_announce.php 4 Oct 2008 07:04:38 -0000 1.3 *************** *** 19,22 **** --- 19,24 ---- // =================================================== include_once($module_root_path . 'includes/phpbb3blocks_constants.' . $phpEx); + include_once($mx_root_path . 'includes/mx_functions_tools.' . $phpEx); + $mx_text_formatting = new mx_text_formatting(); // *************** *** 25,42 **** $title = $mx_block->block_info['block_title']; ! $announce_nbr_display = $mx_block->get_parameters( 'announce_nbr_display' ); ! $announce_nbr_days = $mx_block->get_parameters( 'announce_nbr_days' ); ! $announce_display_global = $mx_block->get_parameters( 'announce_display_global' ); ! $announce_display = $mx_block->get_parameters( 'announce_display' ); ! $announce_display_sticky = $mx_block->get_parameters( 'announce_display_sticky' ); ! $announce_display_normal = $mx_block->get_parameters( 'announce_display_normal' ); ! $announce_img_global = $mx_block->get_parameters( 'announce_img_global' ); ! $announce_img = $mx_block->get_parameters( 'announce_img' ); ! $announce_img_sticky = $mx_block->get_parameters( 'announce_img_sticky' ); ! $announce_img_normal = $mx_block->get_parameters( 'announce_img_normal' ); ! $announce_forum = $mx_block->get_parameters( 'announce_forum' ); if ( empty($announce_nbr_display) ) $announce_nbr_display = 10; if ( empty($announce_nbr_days) ) $announce_nbr_days = 365; // --- 27,46 ---- $title = $mx_block->block_info['block_title']; ! $announce_nbr_display = $mx_block->get_parameters('announce_nbr_display'); ! $announce_nbr_days = $mx_block->get_parameters('announce_nbr_days'); ! $announce_display_global = $mx_block->get_parameters('announce_display_global'); ! $announce_display = $mx_block->get_parameters('announce_display'); ! $announce_display_sticky = $mx_block->get_parameters('announce_display_sticky'); ! $announce_display_normal = $mx_block->get_parameters('announce_display_normal'); ! $announce_img_global = $mx_block->get_parameters('announce_img_global'); ! $announce_img = $mx_block->get_parameters('announce_img'); ! $announce_img_sticky = $mx_block->get_parameters('announce_img_sticky'); ! $announce_img_normal = $mx_block->get_parameters('announce_img_normal'); ! $announce_forum = $mx_block->get_parameters('announce_forum'); ! $announce_truncate = $mx_block->get_parameters('announce_truncate'); if ( empty($announce_nbr_display) ) $announce_nbr_display = 10; if ( empty($announce_nbr_days) ) $announce_nbr_days = 365; + if ( empty($announce_truncate) ) $announce_truncate = 16777215; // *************** *** 153,158 **** $message = $postrow[$i]['post_text']; $bbcode_uid = $postrow[$i]['bbcode_uid']; ! $message = $mx_bbcode->decode($message, $bbcode_uid ); $topic_title = ( count($orig_word) ) ? preg_replace($orig_word, $replacement_word, $postrow[$i]['topic_title']) : $postrow[$i]['topic_title']; $replies = $postrow[$i]['topic_replies']; --- 157,168 ---- $message = $postrow[$i]['post_text']; $bbcode_uid = $postrow[$i]['bbcode_uid']; ! ! $bbcode_bitfield = $postrow[$i]['bbcode_bitfield']; ! ! ! $message = $mx_bbcode->decode($message, $bbcode_uid, true, $bbcode_bitfield); ! $message = $mx_text_formatting->truncate_text($message, $announce_truncate, true); + $topic_title = ( count($orig_word) ) ? preg_replace($orig_word, $replacement_word, $postrow[$i]['topic_title']) : $postrow[$i]['topic_title']; $replies = $postrow[$i]['topic_replies']; |
