Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
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']; |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:09:02
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/language/lang_english In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/modules/mx_phpbb3blocks/language/lang_english Modified Files: lang_admin.php lang_main.php Log Message: new Mx_BBcode merged in one backend file Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/language/lang_english/lang_main.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_main.php 4 Feb 2008 16:53:57 -0000 1.2 --- lang_main.php 4 Oct 2008 07:04:38 -0000 1.3 *************** *** 56,59 **** --- 56,66 ---- $lang['Disk_usage'] = 'Disk Usage'; + //Activity stats block + $lang['USERS_24HOUR_TOTAL'] = '%d Users active over the last 24 hours'; + $lang['24HOUR_TOPICS'] = 'New Topics <strong>%d</strong>'; + $lang['24HOUR_POSTS'] = 'New Posts <strong>%d</strong>'; + $lang['24HOUR_USERS'] = 'New users <strong>%d</strong>'; + $lang['24HOUR_STATS'] = 'Activity over the last 24 hours'; + // // That's all Folks! Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/language/lang_english/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin.php 4 Feb 2008 16:53:57 -0000 1.2 --- lang_admin.php 4 Oct 2008 07:04:38 -0000 1.3 *************** *** 65,68 **** --- 65,69 ---- $lang['announce_display_global'] = "Display Global Announcements in this Block"; $lang['announce_forum'] = "Source Forums"; + $lang['announce_truncate'] = "Truncate Announce Length"; $lang['announce_forum_explain'] = "- You may make multiple selections. For example, hold down the CTRL button on your keyboard while clicking extra selections.<br />* If nothing is selected, all authorized forums will be visible"; |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:07:37
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_romanian In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/includes/shared/phpbb2/language/lang_romanian Modified Files: lang_admin.php lang_main.php Log Message: new Mx_BBcode merged in one backend file Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_romanian/lang_main.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_main.php 30 Jul 2008 13:47:57 -0000 1.4 --- lang_main.php 4 Oct 2008 07:04:25 -0000 1.5 *************** *** 2,6 **** // Romanian phpBB online community - Versiune actualizata pentru PhpBB 2.0.20 /*************************************************************************** ! * lang_main.php [românã] * ------------------- * begin : Ian 14 2003 --- 2,6 ---- // Romanian phpBB online community - Versiune actualizata pentru PhpBB 2.0.20 /*************************************************************************** ! * lang_main.php [românÄ] * ------------------- [...1716 lines suppressed...] ! $lang['Draft_posting']="FÄ acest mesaj draft"; ! $lang['Draft_on']="Mesaj Ãn ConstrucÅ£ie !"; $lang['Drafted_posts']="Draft-urile tale"; *************** *** 1042,1047 **** //==== $lang['BBCode_box_hidden'] = 'Ascuns'; ! $lang['BBcode_box_view'] = 'Click sã vezi conþinutul'; ! $lang['BBcode_box_hide'] = 'Click sã acunzi conþinutul'; $lang['bbcode_help']['GVideo'] = 'GVideo: [GVideo]GVideo URL[/GVideo]'; $lang['GVideo_link'] = 'Link'; --- 1042,1047 ---- //==== $lang['BBCode_box_hidden'] = 'Ascuns'; ! $lang['BBcode_box_view'] = 'Click sÄ vezi conÅ£inutul'; ! $lang['BBcode_box_hide'] = 'Click sÄ acunzi conÅ£inutul'; $lang['bbcode_help']['GVideo'] = 'GVideo: [GVideo]GVideo URL[/GVideo]'; $lang['GVideo_link'] = 'Link'; Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/language/lang_romanian/lang_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_admin.php 30 Jul 2008 13:47:57 -0000 1.3 --- lang_admin.php 4 Oct 2008 07:04:25 -0000 1.4 *************** *** 2,6 **** // Romanian phpBB online community - Versiune actualizata pentru PhpBB 2.0.20 /*************************************************************************** ! * lang_admin.php [românã] * ------------------- * begin : Sep 7 2002 --- 2,6 ---- // Romanian phpBB online community - Versiune actualizata pentru PhpBB 2.0.20 /*************************************************************************** ! * lang_admin.php [românÄ] * ------------------- [...1419 lines suppressed...] // Version Check // ! $lang['Version_up_to_date'] = 'Forumul dumneavoastrÄ foloseÅte ultima versiune phpBB. Nu sunt actualizÄri disponibile pentru versiunea dumneavoastrÄ.'; ! $lang['Version_not_up_to_date'] = 'Forumul dumneavoastrÄ pare sÄ <b>nu</b> fie actualizat. Noile versiuni sunt disponibile la adresa <a href="http://www.phpbb.com/downloads.php" target="_new">http://www.phpbb.com/downloads.php</a>.'; ! $lang['Latest_version_info'] = 'Cea mai nouÄ versiune este <b>phpBB %s</b>.'; ! $lang['Current_version_info'] = 'FolosiÅ£i <b>phpBB %s</b>.'; ! $lang['Connect_socket_error'] = 'Nu am putut deschide conexiunea cu serverul phpBB, eroarea raportatÄ este:<br />%s'; ! $lang['Socket_functions_disabled'] = 'Nu am putut folosi funcÅ£iile socket.'; ! $lang['Mailing_list_subscribe_reminder'] = 'Pentru cele mai noi informaÅ£ii despre phpBB, <a href="http://www.phpbb.com/support/" target="_new">vÄ puteÅ£i înscrie la serviciul de Åtiri</a>.'; ! $lang['Version_information'] = 'InformaÅ£ii despre versiuni'; // // Login attempts configuration // ! $lang['Max_login_attempts'] = 'Permite încercÄri de autentificare'; ! $lang['Max_login_attempts_explain'] = 'NumÄrul de încercÄri de autentificare permise.'; ! $lang['Login_reset_time'] = 'Timpul necesar reautentificÄrii'; ! $lang['Login_reset_time_explain'] = 'NumÄrul de minute pe care un user trebuie sÄ-l aÅtepte pentru a i se permite sÄ se autentifice din nou, dupÄ depÄÅirea numÄrului de încercÄri de autentificare permise.'; // Start add - Bin Mod |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:07:37
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/includes/sessions/phpbb2 Modified Files: core.php login.php Added Files: bbcode.php Log Message: new Mx_BBcode merged in one backend file Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** core.php 30 Sep 2008 07:04:40 -0000 1.17 --- core.php 4 Oct 2008 07:04:25 -0000 1.18 *************** *** 23,31 **** // - // Now load some bbcodes, to be extended for this backend (see below) - // - include_once($mx_root_path . 'includes/mx_functions_bbcode.' . $phpEx); // BBCode associated functions - - // // Finally, load some backend specific functions // --- 23,26 ---- *************** *** 568,572 **** function page_header($mode = false) { ! global $db, $mx_root_path, $phpbb_root_path, $userdata, $mx_user, $lang, $images, $phpEx, $board_config, $gen_simple_header, $layouttemplate, $mx_page; switch ($mode) --- 563,568 ---- function page_header($mode = false) { ! global $db, $mx_root_path, $phpbb_root_path, $userdata, $mx_user, $lang, $images, $phpEx; ! global $phpBB2, $board_config, $gen_simple_header, $layouttemplate, $mx_page; switch ($mode) *************** *** 862,1001 **** } ! /** ! * MXP BBcodes ! * @package MX-Publisher ! */ ! class mx_bbcode extends bbcode_base ! { ! var $smiley_path_url = ''; ! var $smiley_root_path = ''; ! ! var $smiley_url = 'smile_url'; ! var $smiley_id = 'smilies_id'; ! var $emotion = 'emoticon'; ! ! function mx_bbcode() ! { ! global $phpbb_root_path; ! ! $this->smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed ! $this->smiley_root_path = $phpbb_root_path; //same here ! } ! ! /** ! * Generate smilies. ! * ! * Hacking generate_smilies from phpbb/includes/functions_post(ing).php ! * ! * @param string $mode ! * @param integer $page_id ! * ! * Fill smiley templates (or just the variables) with smilies, either in a window or inline ! */ ! function generate_smilies($mode, $forum_id) ! { ! global $mx_page, $board_config, $template, $mx_root_path, $phpbb_root_path, $phpEx; ! global $db, $lang, $images, $theme; ! global $user_ip, $session_length, $starttime; ! global $userdata, $phpbb_auth, $mx_user; ! ! $inline_columns = 4; ! $inline_rows = 5; ! $window_columns = 8; ! ! if ($mode == 'window') ! { ! $mx_user->init($user_ip, PAGE_INDEX); ! ! $gen_simple_header = TRUE; ! $page_title = $lang['Emoticons']; ! ! include($mx_root_path . 'includes/page_header.'.$phpEx); ! ! $template->set_filenames(array( ! 'smiliesbody' => 'posting_smilies.tpl') ! ); ! } ! ! $sql = "SELECT emoticon, code, smile_url ! FROM " . SMILIES_TABLE . " ! ORDER BY smilies_id"; ! if ($result = $db->sql_query($sql)) ! { ! $num_smilies = 0; ! $rowset = array(); ! while ($row = $db->sql_fetchrow($result)) ! { ! if (empty($rowset[$row['smile_url']])) ! { ! $rowset[$row['smile_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code'])); ! $rowset[$row['smile_url']]['emoticon'] = $row['emoticon']; ! $num_smilies++; ! } ! } ! ! if ($num_smilies) ! { ! $smilies_count = ($mode == 'inline') ? min(19, $num_smilies) : $num_smilies; ! $smilies_split_row = ($mode == 'inline') ? $inline_columns - 1 : $window_columns - 1; ! ! $s_colspan = 0; ! $row = 0; ! $col = 0; ! ! while (list($smile_url, $data) = @each($rowset)) ! { ! if (!$col) ! { ! $template->assign_block_vars('smilies_row', array()); ! } ! ! $template->assign_block_vars('smilies_row.smilies_col', array( ! 'SMILEY_CODE' => $data['code'], ! 'SMILEY_IMG' => $this->smiley_path_url . $board_config['smilies_path'] . '/' . $smile_url, ! 'SMILEY_DESC' => $data['emoticon']) ! ); ! ! $s_colspan = max($s_colspan, $col + 1); ! ! if ($col == $smilies_split_row) ! { ! if ($mode == 'inline' && $row == $inline_rows - 1) ! { ! break; ! } ! $col = 0; ! $row++; ! } ! else ! { ! $col++; ! } ! } ! ! if ($mode == 'inline' && $num_smilies > $inline_rows * $inline_columns) ! { ! $template->assign_block_vars('switch_smilies_extra', array()); ! ! $template->assign_vars(array( ! 'L_MORE_SMILIES' => $lang['More_emoticons'], ! 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", "mode=smilies")) ! ); ! } ! ! $template->assign_vars(array( ! 'L_EMOTICONS' => $lang['Emoticons'], ! 'L_CLOSE_WINDOW' => $lang['Close_window'], ! 'S_SMILIES_COLSPAN' => $s_colspan) ! ); ! } ! } ! ! if ($mode == 'window') ! { ! $template->pparse('smiliesbody'); ! include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } ! } ! } ?> \ No newline at end of file --- 858,864 ---- } ! // ! // Now load some bbcodes, to be extended for this backend (see below) ! // ! include_once($mx_root_path . 'includes/sessions/phpbb2/bbcode.' . $phpEx); // BBCode associated functions ?> \ No newline at end of file --- NEW FILE: bbcode.php --- <?php /** * * @package Functions_phpBB * @version $Id: bbcode.php,v 1.1 2008/10/04 07:04:25 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')) { exit; } // // Here comes a mxp version of original phpbb2 bbcode.php // Last in file are the mxp wrapper functions [...987 lines suppressed...] 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", "mode=smilies")) ); } $template->assign_vars(array( 'L_EMOTICONS' => $lang['Emoticons'], 'L_CLOSE_WINDOW' => $lang['Close_window'], 'S_SMILIES_COLSPAN' => $s_colspan) ); } } if ($mode == 'window') { $template->pparse('smiliesbody'); include($mx_root_path . 'includes/page_tail.'.$phpEx); } } } ?> |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:07:22
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/modules/mx_phpbb3blocks/includes Modified Files: mx_functions_display.php Added Files: mx_functions_activity.php Log Message: new Mx_BBcode merged in one backend file --- NEW FILE: mx_functions_activity.php --- <?php /** * * @package MX-Publisher Module - mx_phpbb3blocks * @author Highway of Life ( David Lewis ) http://startrekguide.com * @version $Id: mx_functions_activity.php,v 1.1 2008/10/04 07:04:38 orynider Exp $ * @copyright (c) 2008 Star Trek Guide Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** * @ignore */ if (!defined('IN_PORTAL')) { exit(); } /** * Display extra stats, activity over the last 24 hours for new users, posts and topics. * * @return bool */ function mx_activity_block() { global $template, $mx_user, $lang; //$mx_user->add_lang('mods/activity_stats'); // if the user is a bot, we wonât even process this function... if ($mx_user->data['is_bot']) { return false; } // obtain user activity data $active_users = mx_obtain_active_user_data(); // obtain posts/topics/new users activity $activity = mx_obtain_activity_data(); // 24 hour users online list, assign to the template block: lastvisit foreach ($active_users as $row) { $template->assign_block_vars('lastvisit', array( 'USERNAME_FULL' => mx_get_username_string((($row['user_type'] == USER_IGNORE) ? 'no_profile' : 'full'), $row['user_id'], $row['username'], $row['user_colour']), )); } // assign the stats to the template. $template->assign_vars(array( 'USERS_24HOUR_TOTAL' => sprintf($lang['USERS_24HOUR_TOTAL'], sizeof($active_users)), '24HOUR_TOPICS' => sprintf($lang['24HOUR_TOPICS'], $activity['topics']), '24HOUR_POSTS' => sprintf($lang['24HOUR_POSTS'], $activity['posts']), '24HOUR_USERS' => sprintf($lang['24HOUR_USERS'], $activity['users']), )); return true; } /** * Obtain an array of active users over the last 24 hours. * * @return array */ function mx_obtain_active_user_data() { global $mx_cache; if (($active_users = $mx_cache->get('_active_users')) === false) { global $db; $active_users = array(); // grab a list of users who are currently online // and users who have visited in the last 24 hours $sql_ary = array( 'SELECT' => 'u.user_id, u.user_colour, u.username, u.user_type', 'FROM' => array(USERS_TABLE => 'u'), 'LEFT_JOIN' => array( array( 'FROM' => array(SESSIONS_TABLE => 's'), 'ON' => 's.session_user_id = u.user_id', ), ), 'WHERE' => 'u.user_lastvisit > ' . (time() - 86400) . ' OR s.session_user_id <> ' . ANONYMOUS, 'GROUP_BY' => 'u.user_id', 'ORDER_BY' => 'u.username', ); $result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); while ($row = $db->sql_fetchrow($result)) { $active_users[$row['user_id']] = array( 'user_id' => $row['user_id'], 'user_type' => $row['user_type'], 'username' => $row['username'], 'user_colour' => $row['user_colour'], ); } $db->sql_freeresult($result); // cache this data for 1 hour, this improves performance $mx_cache->put('_active_users', $active_users, 3600); } return $active_users; } /** * obtained cached 24 hour activity data * * @return array */ function mx_obtain_activity_data() { global $mx_cache; if (($activity = $mx_cache->get('_activity_mod')) === false) { global $db; // set interval to 24 hours ago $interval = time() - 86400; $activity = array(); // total new posts in the last 24 hours $sql = 'SELECT COUNT(post_id) AS new_posts FROM ' . POSTS_TABLE . ' WHERE post_time > ' . $interval; $result = $db->sql_query($sql); $activity['posts'] = $db->sql_fetchfield('new_posts'); $db->sql_freeresult($result); // total new topics in the last 24 hours $sql = 'SELECT COUNT(topic_id) AS new_topics FROM ' . TOPICS_TABLE . ' WHERE topic_time > ' . $interval; $result = $db->sql_query($sql); $activity['topics'] = $db->sql_fetchfield('new_topics'); $db->sql_freeresult($result); // total new users in the last 24 hours, counts inactive users as well $sql = 'SELECT COUNT(user_id) AS new_users FROM ' . USERS_TABLE . ' WHERE user_regdate > ' . $interval; $result = $db->sql_query($sql); $activity['users'] = $db->sql_fetchfield('new_users'); $db->sql_freeresult($result); // cache this data for 1 hour, this improves performance $mx_cache->put('_activity_mod', $activity, 3600); } return $activity; } ?> |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:07:02
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/language/lang_greek In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/modules/mx_phpbb3blocks/language/lang_greek Modified Files: lang_admin.php Log Message: new Mx_BBcode merged in one backend file Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/language/lang_greek/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 7 Sep 2008 18:53:57 -0000 1.1 --- lang_admin.php 4 Oct 2008 07:04:38 -0000 1.2 *************** *** 65,68 **** --- 65,69 ---- $lang['announce_display_global'] = "Î Ïοβολή ÎÎµÎ½Î¹ÎºÎ®Ï ÎνακοίνÏÏÎ·Ï Ïε Î±Ï ÏÏ Ïο Block"; $lang['announce_forum'] = "ΠληÏοÏοÏÎ¯ÎµÏ Forums"; + $lang['announce_truncate'] = "Truncate Announce Length"; $lang['announce_forum_explain'] = "- ÎÏοÏείÏε να κάνεÏε ÏολλαÏλÎÏ ÎµÏιλογÎÏ. ΠαÏαδείγμαÏÎ¿Ï ÏάÏιν, κÏαÏήÏÏε ÏαÏημÎνο Ïο ÎºÎ¿Ï Î¼Ïί CTRL ÏÏο ÏληκÏÏολÏγιο ÏÎ±Ï ÏαÏÏνÏÎ±Ï ÏÎ¹Ï ÏÏÏÏθεÏÎµÏ ÎµÏιλογÎÏ.<br />* Îάν δεν εÏιλÎξεÏε, Ïλα Ïα ÎµÎ¾Î¿Ï ÏιοδοÏημÎνα forums θα είναι οÏαÏά"; |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:06:57
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/modules/mx_coreblocks Modified Files: mx_includex.php mx_online.php mx_search.php mx_site_log.php Log Message: new Mx_BBcode merged in one backend file Index: mx_includex.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mx_includex.php 9 Feb 2008 12:48:51 -0000 1.14 --- mx_includex.php 4 Oct 2008 07:04:38 -0000 1.15 *************** *** 22,30 **** $iframe_mode = $mx_block->get_parameters( 'x_mode' ); ! $x_mode = ( $iframe_mode == 'x_listen' && $mx_request_vars->get('x_mode', MX_TYPE_NO_TAGS, $iframe_mode) ); ! $x_1 = ( $iframe_mode == 'x_listen' && $mx_request_vars->get('x_1', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_1'))); ! $x_2 = ( $iframe_mode == 'x_listen' && $mx_request_vars->get('x_2', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_2'))); ! $x_3 = ( $iframe_mode == 'x_listen' && $mx_request_vars->get('x_3', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_3'))); // --- 22,30 ---- $iframe_mode = $mx_block->get_parameters( 'x_mode' ); ! $x_mode = ( ($iframe_mode == 'x_listen') ? $mx_request_vars->get('x_mode', MX_TYPE_NO_TAGS, $iframe_mode) : $iframe_mode ); ! $x_1 = ( $iframe_mode == 'x_listen' ? $mx_request_vars->get('x_1', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_1')) : $mx_block->get_parameters( 'x_1' )); ! $x_2 = ( $iframe_mode == 'x_listen' ? $mx_request_vars->get('x_2', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_2')) : $mx_block->get_parameters( 'x_2' )); ! $x_3 = ( $iframe_mode == 'x_listen' ? $mx_request_vars->get('x_3', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_3')) : $mx_block->get_parameters( 'x_3' )); // |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:05:57
|
Update of /cvsroot/mxbb/core/includes/db In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/includes/db Modified Files: dbal.php mysql.php Log Message: new Mx_BBcode merged in one backend file Index: dbal.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/dbal.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dbal.php 30 Sep 2008 07:04:35 -0000 1.11 --- dbal.php 4 Oct 2008 07:04:24 -0000 1.12 *************** *** 34,41 **** var $html_hold = ''; var $sql_report = ''; ! var $mx_cache_num_queries = 0; var $persistency = false; ! var $mx_user = ''; var $server = ''; var $dbname = ''; --- 34,41 ---- var $html_hold = ''; var $sql_report = ''; ! var $cache_num_queries = 0; var $persistency = false; ! var $user = ''; var $server = ''; var $dbname = ''; *************** *** 83,87 **** * Doing some validation here. */ ! function sql_query_limit($query, $total, $offset = 0, $mx_cache_ttl = 0) { if (empty($query)) --- 83,87 ---- * Doing some validation here. */ ! function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) { if (empty($query)) *************** *** 94,98 **** $offset = ($offset < 0) ? 0 : $offset; ! return $this->_sql_query_limit($query, $total, $offset, $mx_cache_ttl); } --- 94,98 ---- $offset = ($offset < 0) ? 0 : $offset; ! return $this->_sql_query_limit($query, $total, $offset, $cache_ttl); } *************** *** 415,441 **** function sql_error($sql = '') { ! global $mx_auth, $mx_user, $board_config; ! global $phpBB3; ! ! // Set var to retrieve errored status ! $this->sql_error_triggered = true; ! $this->sql_error_sql = $sql; ! $this->sql_error_returned = $this->_sql_error(); if (!$this->return_on_error) { ! $message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']'; // Show complete SQL error and path to administrators only ! // Additionally show complete error on installation or if extended debug mode is enabled ! // The DEBUG_EXTRA constant is for development only! ! if ((isset($mx_auth) && $mx_auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA')) { // Print out a nice backtrace... ! $backtrace = $phpBB3->get_backtrace(); ! $message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : ''; ! $message .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : ''; $message .= '<br />'; } --- 415,434 ---- function sql_error($sql = '') { ! global $mx_user; ! $error = $this->_sql_error(); if (!$this->return_on_error) { ! $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . $error['message'] . ' [' . $error['code'] . ']'; // Show complete SQL error and path to administrators only ! if ($mx_user->is_admin) { // Print out a nice backtrace... ! //$backtrace = get_backtrace(); ! $message .= ($sql) ? '<br /><br /><u>SQL</u><br /><br />' . $sql : ''; ! //$message .= ($backtrace) ? '<br /><br /><u>BACKTRACE</u><br />' . $backtrace : ''; $message .= '<br />'; } *************** *** 444,461 **** // If error occurs in initiating the session we need to use a pre-defined language string // This could happen if the connection could not be established for example (then we are not able to grab the default language) ! if (!isset($mx_user->lang['SQL_ERROR_OCCURRED'])) { ! $message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.'; } else { ! if (!empty($board_config['board_contact'])) ! { ! $message .= '<br /><br />' . sprintf($mx_user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($board_config['board_contact']) . '">', '</a>'); ! } ! else ! { ! $message .= '<br /><br />' . sprintf($mx_user->lang['SQL_ERROR_OCCURRED'], '', ''); ! } } } --- 437,447 ---- // If error occurs in initiating the session we need to use a pre-defined language string // This could happen if the connection could not be established for example (then we are not able to grab the default language) ! if (!isset($mx_user->_lang['An_error_occured'])) { ! $message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persist.'; } else { ! $message .= '<br /><br />' . $mx_user->_lang['An_error_occured']; } } *************** *** 466,487 **** } - if (strlen($message) > 1024) - { - // We need to define $msg_long_text here to circumvent text stripping. - global $msg_long_text; - $msg_long_text = $message; - - trigger_error(false, E_USER_ERROR); - } - - trigger_error($message, E_USER_ERROR); - } - - if ($this->transaction) - { - $this->sql_transaction('rollback'); } ! return $this->sql_error_returned; } --- 452,458 ---- } } ! return $error; } *************** *** 491,495 **** function sql_report($mode, $query = '') { ! global $mx_cache, $mx_starttime, $phpbb_root_path, $mx_user, $mx_root_path; if (empty($_GET['explain'])) --- 462,466 ---- function sql_report($mode, $query = '') { ! global $mx_cache, $mx_starttime, $phpbb_root_path, $user; if (empty($_GET['explain'])) *************** *** 502,506 **** $query = $this->query_hold; } ! switch ($mode) { --- 473,477 ---- $query = $this->query_hold; } ! switch ($mode) { *************** *** 515,560 **** $totaltime = $mtime[0] + $mtime[1] - $mx_starttime; ! echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr"> ! <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> ! <meta http-equiv="Content-Style-Type" content="text/css" /> ! <meta http-equiv="imagetoolbar" content="no" /> ! <title>SQL Report</title> ! <link href="' . $mx_root_path . 'templates/prosilver/admin/admin.css" rel="stylesheet" type="text/css" media="screen" /> ! </head> ! <body id="errorpage"> ! <div id="wrap"> ! <div id="page-header"> ! <a href="' . build_url('explain') . '">Return to previous page</a> ! </div> ! <div id="page-body"> ! <div id="acp"> ! <div class="panel"> ! <span class="corners-top"><span></span></span> ! <div id="content"> ! <h1>SQL Report</h1> ! <br /> ! <p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p> ! ! <p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p> ! ! <br /><br /> ! ' . $this->sql_report . ' ! </div> ! <span class="corners-bottom"><span></span></span> ! </div> ! </div> ! </div> ! <div id="page-footer"> ! Powered by phpBB © 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a> ! </div> ! </div> ! </body> ! </html>'; ! ! exit_handler(); ! break; case 'stop': --- 486,528 ---- $totaltime = $mtime[0] + $mtime[1] - $mx_starttime; ! echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'; ! echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">'; ! echo '<head>'; ! echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'; ! echo '<title>SQL Report</title>'; ! echo '<link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />'; ! echo '<link href="' . $phpbb_root_path . 'adm/style/sql_report.css" rel="stylesheet" type="text/css" media="screen" />'; ! echo '</head>'; ! echo '<body id="errorpage">'; ! echo '<div id="wrap">'; ! echo ' <div id="page-header">'; ! echo ' <a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '">Return to previous page</a>'; ! echo ' </div>'; ! echo ' <div id="page-body">'; ! echo ' <div class="panel">'; ! echo ' <span class="corners-top"><span></span></span>'; ! echo ' <div id="content">'; ! echo ' <h1>SQL Report</h1>'; ! echo ' <table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr> ! <td height="40" align="center" valign="middle"><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries} queries" . (($this->cache_num_queries) ? " + {$this->cache_num_queries} " . (($this->cache_num_queries == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></td> ! </tr><tr> ! <td align="center" nowrap="nowrap">Time spent on MySQL queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></td> ! </tr></table> ! <table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr> ! <td>' . $this->sql_report . '</td> ! </tr></table>'; ! echo ' </div>'; ! echo ' <span class="corners-bottom"><span></span></span>'; ! echo ' </div>'; ! echo ' </div>'; ! echo ' <div id="page-footer">'; ! echo ' Powered by phpBB © ' . date('Y') . ' <a href="http://www.phpbb.com/">phpBB Group</a>'; ! echo ' </div>'; ! echo '</div>'; ! echo '</body>'; ! echo '</html>'; ! exit; ! break; case 'stop': *************** *** 563,583 **** $this->sql_report .= ' ! <table cellspacing="1"> ! <thead> <tr> ! <th>Query #' . $this->num_queries['total'] . '</th> </tr> - </thead> - <tbody> <tr> ! <td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td> </tr> ! </tbody> ! </table> ! ! ' . $this->html_hold . ' ! ! <p style="text-align: center;"> '; --- 531,545 ---- $this->sql_report .= ' + <hr width="100%"/><br /> ! <table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"> <tr> ! <th>Query #' . $this->num_queries . '</th> </tr> <tr> ! <td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td> </tr> ! </table> ' . $this->html_hold . ' ! <p align="center"> '; *************** *** 593,600 **** { $error = $this->sql_error(); ! $this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); } ! $this->sql_report .= '</p><br /><br />'; $this->sql_time += $endtime - $this->curtime; --- 555,562 ---- { $error = $this->sql_error(); ! $this->sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); } ! $this->sql_report .= '</p>'; $this->sql_time += $endtime - $this->curtime; *************** *** 604,608 **** $this->query_hold = $query; $this->html_hold = ''; ! $this->_sql_report($mode, $query); --- 566,570 ---- $this->query_hold = $query; $this->html_hold = ''; ! $this->_sql_report($mode, $query); *************** *** 611,628 **** break; ! case 'add_select_row': $html_table = func_get_arg(2); $row = func_get_arg(3); ! if (!$html_table && sizeof($row)) { $html_table = true; ! $this->html_hold .= '<table cellspacing="1"><tr>'; ! foreach (array_keys($row) as $val) { ! $this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : ' ') . '</th>'; } $this->html_hold .= '</tr>'; --- 573,590 ---- break; ! case 'add_select_row': $html_table = func_get_arg(2); $row = func_get_arg(3); ! if (!$html_table && sizeof($row)) { $html_table = true; ! $this->html_hold .= '<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"><tr>'; ! foreach (array_keys($row) as $val) { ! $this->html_hold .= '<th nowrap="nowrap">' . (($val) ? ucwords(str_replace('_', ' ', $val)) : ' ') . '</th>'; } $this->html_hold .= '</tr>'; *************** *** 637,641 **** } $this->html_hold .= '</tr>'; ! return $html_table; --- 599,603 ---- } $this->html_hold .= '</tr>'; ! return $html_table; *************** *** 646,649 **** --- 608,613 ---- $this->_sql_report($mode, $query); + $this->cache_num_queries++; + break; *************** *** 657,664 **** $color = ($time_db > $time_cache) ? 'green' : 'red'; ! $this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>'; ! $this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>'; ! $this->sql_report .= '<p style="text-align: center;">'; ! $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $mx_starttime) . 's | After: ' . sprintf('%.5f', $endtime - $mx_starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />'; // Pad the start time to not interfere with page timing --- 621,626 ---- $color = ($time_db > $time_cache) ? 'green' : 'red'; ! $this->sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query results obtained from the cache</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table><p align="center">'; ! $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $mx_starttime) . 's | After: ' . sprintf('%.5f', $endtime - $mx_starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p>'; // Pad the start time to not interfere with page timing *************** *** 668,672 **** default: ! $this->_sql_report($mode, $query); --- 630,634 ---- default: ! $this->_sql_report($mode, $query); |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:05:43
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/modules/mx_phpbb3blocks/templates/_core Added Files: mx_activity_stats.html Log Message: new Mx_BBcode merged in one backend file --- NEW FILE: mx_activity_stats.html --- <!-- IF S_DISPLAY_ONLINE_LIST --> <br clear="all" /> <table class="tablebg" width="100%" cellspacing="1"> <tr> <td class="cat" colspan="2"><!-- IF U_VIEWONLINE --><h4><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h4><!-- ELSE --><h4>{L_WHO_IS_ONLINE}</h4><!-- ENDIF --></td> </tr> <tr> <!-- IF LEGEND --> <td class="row1" rowspan="3" align="center" valign="middle"><img src="{ONLINE_IMG}" alt="{L_WHO_IS_ONLINE}" /></td> <!-- ELSE --> <td class="row1" align="center" valign="middle"><img src="{ONLINE_IMG}" alt="{L_WHO_IS_ONLINE}" /></td> <!-- ENDIF --> <td class="row1" width="100%"><span class="genmed">{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /><br />{LOGGED_IN_USER_LIST}</span></td> </tr> <!-- IF not S_IS_BOT --> <tr> <td class="row1">{USERS_24HOUR_TOTAL}: <!-- BEGIN lastvisit -->{lastvisit.USERNAME_FULL}<!-- IF not lastvisit.S_LAST_ROW -->, <!-- ENDIF --><!-- END lastvisit --></td> </tr> <!-- ENDIF --> <!-- IF LEGEND --> <tr> <td class="row1"><b class="gensmall">{L_LEGEND} :: {LEGEND}</b></td> </tr> <!-- ENDIF --> </table> <!-- ENDIF --> <!-- IF S_DISPLAY_BIRTHDAY_LIST --> <br clear="all" /> <table class="tablebg" width="100%" cellspacing="1"> <tr> <td class="cat" colspan="2"><h4>{L_BIRTHDAYS}</h4></td> </tr> <tr> <td class="row1" align="center" valign="middle"><img src="{ONLINE_IMG}" alt="{L_BIRTHDAYS}" /></td> <td class="row1" width="100%"><p class="genmed"><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <b>{BIRTHDAY_LIST}</b><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p></td> </tr> </table> <!-- ENDIF --> <br clear="all" /> <br clear="all" /> <table class="tablebg" width="100%" cellspacing="1"> <tr> <td class="cat" colspan="2"><h4>{L_STATISTICS}</h4></td> </tr> <tr> <td class="row1"><img src="{ONLINE_IMG}" alt="{L_STATISTICS}" /></td> <td class="row1" width="100%" valign="middle"><p class="genmed">{TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}</p></td> </tr> </table> <!-- IF not S_IS_BOT --> <br clear="all" /> <table class="tablebg" width="100%" cellspacing="1"> <tr> <td class="cat" colspan="2"><h4>{L_24HOUR_STATS}</h4></td> </tr> <tr> <td class="row1"><img src="{ONLINE_IMG}" alt="{L_STATISTICS}" /></td> <td class="row1" width="100%" valign="middle"><p class="genmed">{24HOUR_POSTS} | {24HOUR_TOPICS} | {24HOUR_USERS}</p></td> </tr> </table> <!-- ENDIF --> |
|
From: FlorinCB <ory...@us...> - 2008-10-04 07:05:42
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/prosilver In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30073/modules/mx_phpbb3blocks/templates/prosilver Added Files: mx_activity_stats.html Log Message: new Mx_BBcode merged in one backend file --- NEW FILE: mx_activity_stats.html --- <!-- IF S_DISPLAY_ONLINE_LIST --> <!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF --> <p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST} <!-- IF not S_IS_BOT --><br /><br /> {USERS_24HOUR_TOTAL}: <!-- BEGIN lastvisit -->{lastvisit.USERNAME_FULL}<!-- IF not lastvisit.S_LAST_ROW -->, <!-- ENDIF --><!-- END lastvisit --> <!-- ENDIF --> <!-- IF LEGEND --><br /><em>{L_LEGEND}: {LEGEND}</em><!-- ENDIF --></p> <!-- ENDIF --> <!-- IF S_DISPLAY_BIRTHDAY_LIST and BIRTHDAY_LIST --> <h3>{L_BIRTHDAYS}</h3> <p><!-- IF BIRTHDAY_LIST -->{L_CONGRATULATIONS}: <strong>{BIRTHDAY_LIST}</strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p> <!-- ENDIF --> <!-- IF NEWEST_USER --> <h3>{L_STATISTICS}</h3> <p>{TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER}</p> <!-- IF not S_IS_BOT --> <h3 id="24hour_stats">{L_24HOUR_STATS}</h3> <p>{24HOUR_POSTS} • {24HOUR_TOPICS} • {24HOUR_USERS}</p> <!-- ENDIF --> <!-- ENDIF --> |
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/includes Modified Files: mx_functions.php mx_functions_core.php mx_functions_style.php mx_functions_tools.php page_header.php page_tail.php Log Message: rewrite for php4 and php6 issues Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** page_tail.php 11 Jul 2008 22:00:17 -0000 1.40 --- page_tail.php 30 Sep 2008 07:04:38 -0000 1.41 *************** *** 48,52 **** $editor_name_tmp = mx_get_userdata($mx_page->last_updated_by); $editor_name = $editor_name_tmp['username']; ! $edit_time = phpBB2::create_date( $board_config['default_dateformat'], $mx_page->last_updated, $board_config['board_timezone'] ); $template->assign_block_vars('page_last_updated', array( --- 48,52 ---- $editor_name_tmp = mx_get_userdata($mx_page->last_updated_by); $editor_name = $editor_name_tmp['username']; ! $edit_time = $phpBB2->create_date( $board_config['default_dateformat'], $mx_page->last_updated, $board_config['board_timezone'] ); $template->assign_block_vars('page_last_updated', array( Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** mx_functions_core.php 24 Sep 2008 14:26:07 -0000 1.105 --- mx_functions_core.php 30 Sep 2008 07:04:37 -0000 1.106 *************** *** 2061,2065 **** $editor_name_tmp = mx_get_userdata($this->editor_id); $editor_name = $editor_name_tmp['username']; ! $edit_time = phpBB2::create_date( $board_config['default_dateformat'], $this->block_time, $board_config['board_timezone'] ); $layouttemplate->assign_block_vars('layout_column.blocks.block_stats', array( --- 2061,2065 ---- $editor_name_tmp = mx_get_userdata($this->editor_id); $editor_name = $editor_name_tmp['username']; ! $edit_time = $phpBB2->create_date( $board_config['default_dateformat'], $this->block_time, $board_config['board_timezone'] ); $layouttemplate->assign_block_vars('layout_column.blocks.block_stats', array( Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** mx_functions_tools.php 27 Sep 2008 18:55:26 -0000 1.43 --- mx_functions_tools.php 30 Sep 2008 07:04:37 -0000 1.44 *************** *** 104,108 **** $this->highlight = urlencode($_GET['highlight']); ! $this->highlight_match = phpBB2::phpbb_rtrim($this->highlight_match, "\\"); } --- 104,108 ---- $this->highlight = urlencode($_GET['highlight']); ! $this->highlight_match = $phpBB2->phpbb_rtrim($this->highlight_match, "\\"); } *************** *** 334,338 **** if (!empty($username)) { ! $username = phpBB2::phpbb_clean_username($username); if (!$userdata['session_logged_in'] || ($userdata['session_logged_in'] && $username != $userdata['username'])) --- 334,338 ---- if (!empty($username)) { ! $username = $phpBB2->phpbb_clean_username($username); if (!$userdata['session_logged_in'] || ($userdata['session_logged_in'] && $username != $userdata['username'])) *************** *** 1625,1634 **** if( !function_exists('prepare_message') ) { ! mx_cache::load_file('functions_post', 'phpbb2'); } if( !function_exists('add_search_words') ) { ! mx_cache::load_file('functions_search', 'phpbb2'); } --- 1625,1634 ---- if( !function_exists('prepare_message') ) { ! $mx_backend->load_file('functions_post', 'phpbb2'); } if( !function_exists('add_search_words') ) { ! $mx_backend->load_file('functions_search', 'phpbb2'); } *************** *** 3144,3148 **** $username = addslashes(unprepare_message(trim($user_name))); ! $username = phpBB2::phpbb_clean_username( $username ); // --- 3144,3148 ---- $username = addslashes(unprepare_message(trim($user_name))); ! $username = $phpBB2->phpbb_clean_username( $username ); // *************** *** 3825,3829 **** while ( $this->comments_row = $db->sql_fetchrow( $result ) ) { ! $time = phpBB2::create_date( $board_config['default_dateformat'], $this->comments_row['comments_time'], $board_config['board_timezone'] ); // --- 3825,3829 ---- while ( $this->comments_row = $db->sql_fetchrow( $result ) ) { ! $time = $phpBB2->create_date( $board_config['default_dateformat'], $this->comments_row['comments_time'], $board_config['board_timezone'] ); // *************** *** 3966,3970 **** $num_of_replies = intval( $this->total_comments ); ! //$pagination = phpBB2::generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start ) . ' '; $pagination = mx_generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start, true, true, true, false ) . ' '; if ($num_of_replies > 0) --- 3966,3970 ---- $num_of_replies = intval( $this->total_comments ); ! //$pagination = $phpBB2->generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start ) . ' '; $pagination = mx_generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start, true, true, true, false ) . ' '; if ($num_of_replies > 0) *************** *** 4050,4057 **** $poster_id = $this->comments_row['user_id']; $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $this->comments_row['username']; ! $time = phpBB2::create_date( $board_config['default_dateformat'], $this->comments_row['post_time'], $board_config['board_timezone'] ); $poster_posts = ( $this->comments_row['user_id'] != ANONYMOUS ) ? $lang['Posts'] . ': ' . $this->comments_row['user_posts'] : ''; $poster_from = ( $this->comments_row['user_from'] && $this->comments_row['user_id'] != ANONYMOUS ) ? $lang['Location'] . ': ' . $this->comments_row['user_from'] : ''; ! $poster_joined = ( $this->comments_row['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ': ' . phpBB2::create_date( $lang['DATE_FORMAT'], $this->comments_row['user_regdate'], $board_config['board_timezone'] ) : ''; // --- 4050,4057 ---- $poster_id = $this->comments_row['user_id']; $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $this->comments_row['username']; ! $time = $phpBB2->create_date( $board_config['default_dateformat'], $this->comments_row['post_time'], $board_config['board_timezone'] ); $poster_posts = ( $this->comments_row['user_id'] != ANONYMOUS ) ? $lang['Posts'] . ': ' . $this->comments_row['user_posts'] : ''; $poster_from = ( $this->comments_row['user_from'] && $this->comments_row['user_id'] != ANONYMOUS ) ? $lang['Location'] . ': ' . $this->comments_row['user_from'] : ''; ! $poster_joined = ( $this->comments_row['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ': ' . $phpBB2->create_date( $lang['DATE_FORMAT'], $this->comments_row['user_regdate'], $board_config['board_timezone'] ) : ''; // *************** *** 4104,4108 **** $l_edit_time_total = ( $this->comments_row['post_edit_count'] == 1 ) ? $lang['Edited_time_total'] : $lang['Edited_times_total']; ! $l_edited_by = '<br /><br />' . sprintf( $l_edit_time_total, $poster, phpBB2::create_date( $board_config['default_dateformat'], $this->comments_row['post_edit_time'], $board_config['board_timezone'] ), $this->comments_row['post_edit_count'] ); } else --- 4104,4108 ---- $l_edit_time_total = ( $this->comments_row['post_edit_count'] == 1 ) ? $lang['Edited_time_total'] : $lang['Edited_times_total']; ! $l_edited_by = '<br /><br />' . sprintf( $l_edit_time_total, $poster, $phpBB2->create_date( $board_config['default_dateformat'], $this->comments_row['post_edit_time'], $board_config['board_timezone'] ), $this->comments_row['post_edit_count'] ); } else *************** *** 4209,4213 **** $num_of_replies = intval( $this->total_comments ); ! $pagination = phpBB2::generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) --- 4209,4213 ---- $num_of_replies = intval( $this->total_comments ); ! $pagination = $phpBB2->generate_pagination( $this->u_pagination($page_num), $num_of_replies, $this->pagination_num, $this->start ) . ' '; if ($num_of_replies > 0) Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** page_header.php 7 Sep 2008 20:57:33 -0000 1.61 --- page_header.php 30 Sep 2008 07:04:38 -0000 1.62 *************** *** 191,196 **** 'SITE_DESCRIPTION' => $board_config['site_desc'], 'PAGE_TITLE' => $mx_page->page_title, ! 'CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], phpBB2::create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_USERNAME' => $lang['Username'], --- 191,196 ---- 'SITE_DESCRIPTION' => $board_config['site_desc'], 'PAGE_TITLE' => $mx_page->page_title, ! 'CURRENT_TIME' => sprintf($lang['Current_time'], $phpBB2->create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], $phpBB2->create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_USERNAME' => $lang['Username'], Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** mx_functions_style.php 6 Sep 2008 17:46:40 -0000 1.93 --- mx_functions_style.php 30 Sep 2008 07:04:37 -0000 1.94 *************** *** 573,577 **** global $userdata, $board_config, $portal_config, $theme, $images; global $template, $lang, $phpEx, $phpbb_root_path, $mx_root_path, $db; ! global $nav_links; // --- 573,577 ---- global $userdata, $board_config, $portal_config, $theme, $images; global $template, $lang, $phpEx, $phpbb_root_path, $mx_root_path, $db; ! global $nav_links, $phpBB2; // *************** *** 579,584 **** // $board_config['phpbb_lang'] = $board_config['default_lang']; // Handy switch ! $this->lang['default_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($this->decode_lang($board_config['default_lang']))), "'"); ! $this->data['user_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($this->decode_lang($this->data['user_lang']))), "'"); if ( $this->data['session_logged_in'] ) --- 579,584 ---- // $board_config['phpbb_lang'] = $board_config['default_lang']; // Handy switch ! $this->lang['default_lang'] = $phpBB2->phpbb_ltrim(basename($phpBB2->phpbb_rtrim($this->decode_lang($board_config['default_lang']))), "'"); ! $this->data['user_lang'] = $phpBB2->phpbb_ltrim(basename($phpBB2->phpbb_rtrim($this->decode_lang($this->data['user_lang']))), "'"); if ( $this->data['session_logged_in'] ) *************** *** 603,607 **** // Now, $this->lang['default_lang'] is populated, but do we have a mathing MX-Publisher lang file installed? // ! if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->lang['default_lang'] . '/lang_main.'.$phpEx)) ) { // --- 603,607 ---- // Now, $this->lang['default_lang'] is populated, but do we have a mathing MX-Publisher lang file installed? // ! if ( !file_exists(@$phpBB2->phpbb_realpath($mx_root_path . 'language/lang_' . $this->lang['default_lang'] . '/lang_main.'.$phpEx)) ) { // *************** *** 610,614 **** $this->lang['default_lang'] = 'english'; ! if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->lang['default_lang'] . '/lang_main.'.$phpEx)) ) { mx_message_die(CRITICAL_ERROR, 'Could not locate valid language pack: ' . $mx_root_path . 'language/lang_' . $this->lang['default_lang'] . '/lang_main.'.$phpEx); --- 610,614 ---- $this->lang['default_lang'] = 'english'; ! if ( !file_exists(@$phpBB2->phpbb_realpath($mx_root_path . 'language/lang_' . $this->lang['default_lang'] . '/lang_main.'.$phpEx)) ) { mx_message_die(CRITICAL_ERROR, 'Could not locate valid language pack: ' . $mx_root_path . 'language/lang_' . $this->lang['default_lang'] . '/lang_main.'.$phpEx); Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** mx_functions.php 27 Sep 2008 18:55:23 -0000 1.93 --- mx_functions.php 30 Sep 2008 07:04:36 -0000 1.94 *************** *** 36,40 **** { global $db, $layouttemplate, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images, $mx_root_path, $module_root_path; ! global $userdata, $user_ip, $session_length, $mx_backend; global $mx_starttime, $mx_page, $mx_block, $mx_user, $mx_request_vars, $mx_cache, $tplEx; --- 36,40 ---- { global $db, $layouttemplate, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images, $mx_root_path, $module_root_path; ! global $userdata, $user_ip, $session_length, $mx_backend, $phpBB2; global $mx_starttime, $mx_page, $mx_block, $mx_user, $mx_request_vars, $mx_cache, $tplEx; *************** *** 761,765 **** if (!is_numeric($user) || $force_str) { ! $user = phpBB2::phpbb_clean_username($user); } else --- 761,765 ---- if (!is_numeric($user) || $force_str) { ! $user = $phpBB2->phpbb_clean_username($user); } else *************** *** 801,805 **** while ( $file = readdir($dir) ) { ! if (preg_match('#^lang_#i', $file) && !is_file(@phpBB2::phpbb_realpath($mx_root_path . $dirname . '/' . $file)) && !is_link(@phpBB2::phpbb_realpath($mx_root_path . $dirname . '/' . $file))) { $filename = trim(str_replace("lang_", "", $file)); --- 801,805 ---- while ( $file = readdir($dir) ) { ! if (preg_match('#^lang_#i', $file) && !is_file(@$phpBB2->phpbb_realpath($mx_root_path . $dirname . '/' . $file)) && !is_link(@$phpBB2->phpbb_realpath($mx_root_path . $dirname . '/' . $file))) { $filename = trim(str_replace("lang_", "", $file)); |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:07:20
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/includes/sessions/phpbb3 Modified Files: login.php session.php Log Message: rewrite for php4 and php6 issues Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/login.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** login.php 9 Feb 2008 12:41:11 -0000 1.5 --- login.php 30 Sep 2008 07:04:40 -0000 1.6 *************** *** 17,21 **** if($mx_request_vars->is_request('login') && ($userdata['user_id'] == ANONYMOUS || $mx_request_vars->is_post('admin')) ) { ! $username = $mx_request_vars->is_post('username') ? phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : ''; $password = $mx_request_vars->post('password', MX_TYPE_NO_TAGS); --- 17,21 ---- if($mx_request_vars->is_request('login') && ($userdata['user_id'] == ANONYMOUS || $mx_request_vars->is_post('admin')) ) { ! $username = $mx_request_vars->is_post('username') ? $phpBB2->phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : ''; $password = $mx_request_vars->post('password', MX_TYPE_NO_TAGS); *************** *** 63,67 **** $password_new_format = ''; ! phpBB3::set_var($password_new_format, stripslashes($password_old_format), 'string'); //mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", $password_new_format, ''); --- 63,67 ---- $password_new_format = ''; ! $phpBB3->set_var($password_new_format, stripslashes($password_old_format), 'string'); //mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", $password_new_format, ''); *************** *** 78,82 **** if (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password']) { ! $hash = phpBB3::phpbb_hash($password_new_format); // Update the password in the users table to the new format and remove user_pass_convert flag --- 78,82 ---- if (md5($password_old_format) == $row['user_password'] || md5(utf8_to_cp1252($password_old_format)) == $row['user_password']) { ! $hash = $phpBB3->phpbb_hash($password_new_format); // Update the password in the users table to the new format and remove user_pass_convert flag *************** *** 113,117 **** $password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format; $password_new_format = ''; ! phpBB3::set_var($password_new_format, stripslashes($password_old_format), 'string'); //mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", $password_new_format, ''); --- 113,117 ---- $password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format; $password_new_format = ''; ! $phpBB3->set_var($password_new_format, stripslashes($password_old_format), 'string'); //mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", $password_new_format, ''); *************** *** 125,129 **** // cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding ! if (md5($password_old_format) == $row['user_password'] || md5($password) == $row['user_password'] || phpBB3::phpbb_check_hash($password, $row['user_password'])) { $autologin = $mx_request_vars->is_post('autologin'); --- 125,129 ---- // cp1252 is phpBB2's default encoding, characters outside ASCII range might work when converted into that encoding ! if (md5($password_old_format) == $row['user_password'] || md5($password) == $row['user_password'] || $phpBB3->phpbb_check_hash($password, $row['user_password'])) { $autologin = $mx_request_vars->is_post('autologin'); *************** *** 175,179 **** } // Check password ... ! if (!$row['user_pass_convert'] && phpBB3::phpbb_check_hash($password, $row['user_password'])) { if ($row['user_login_attempts'] != 0) --- 175,179 ---- } // Check password ... ! if (!$row['user_pass_convert'] && $phpBB3->phpbb_check_hash($password, $row['user_password'])) { if ($row['user_login_attempts'] != 0) Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** session.php 4 Sep 2008 00:39:17 -0000 1.30 --- session.php 30 Sep 2008 07:04:41 -0000 1.31 *************** *** 129,132 **** --- 129,133 ---- function extract_current_page($root_path) { + global $phpBB2; $page_array = array(); *************** *** 165,170 **** // current directory within the phpBB root (for example: adm) ! $root_dirs = explode('/', str_replace('\\', '/', phpBB2::phpbb_realpath($root_path))); ! $page_dirs = explode('/', str_replace('\\', '/', phpBB2::phpbb_realpath('./'))); $intersection = array_intersect_assoc($root_dirs, $page_dirs); --- 166,171 ---- // current directory within the phpBB root (for example: adm) ! $root_dirs = explode('/', str_replace('\\', '/', $phpBB2->phpbb_realpath($root_path))); ! $page_dirs = explode('/', str_replace('\\', '/', $phpBB2->phpbb_realpath('./'))); $intersection = array_intersect_assoc($root_dirs, $page_dirs); *************** *** 228,232 **** function session_begin($update_session_page = true) { ! global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $board_config, $phpbb_root_path; // Give us some basic information --- 229,233 ---- function session_begin($update_session_page = true) { ! global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $board_config, $phpbb_root_path, $phpBB3; // Give us some basic information *************** *** 269,275 **** if (isset($_COOKIE[$board_config['cookie_name'] . '_sid']) || isset($_COOKIE[$board_config['cookie_name'] . '_u'])) { ! $this->cookie_data['u'] = phpBB3::request_var($board_config['cookie_name'] . '_u', 0, false, true); ! $this->cookie_data['k'] = phpBB3::request_var($board_config['cookie_name'] . '_k', '', false, true); ! $this->session_id = phpBB3::request_var($board_config['cookie_name'] . '_sid', '', false, true); // original code: $SID = (defined('NEED_SID')) ? 'sid=' . $this->session_id : 'sid='; --- 270,276 ---- if (isset($_COOKIE[$board_config['cookie_name'] . '_sid']) || isset($_COOKIE[$board_config['cookie_name'] . '_u'])) { ! $this->cookie_data['u'] = $phpBB3->request_var($board_config['cookie_name'] . '_u', 0, false, true); ! $this->cookie_data['k'] = $phpBB3->request_var($board_config['cookie_name'] . '_k', '', false, true); ! $this->session_id = $phpBB3->request_var($board_config['cookie_name'] . '_sid', '', false, true); // original code: $SID = (defined('NEED_SID')) ? 'sid=' . $this->session_id : 'sid='; *************** *** 279,283 **** if (empty($this->session_id)) { ! $this->session_id = $_SID = phpBB3::request_var('sid', ''); $SID = 'sid=' . $this->session_id; $this->cookie_data = array('u' => 0, 'k' => ''); --- 280,284 ---- if (empty($this->session_id)) { ! $this->session_id = $_SID = $phpBB3->request_var('sid', ''); $SID = 'sid=' . $this->session_id; $this->cookie_data = array('u' => 0, 'k' => ''); *************** *** 286,290 **** else { ! $this->session_id = $_SID = phpBB3::request_var('sid', ''); $SID = 'sid=' . $this->session_id; } --- 287,291 ---- else { ! $this->session_id = $_SID = $phpBB3->request_var('sid', ''); $SID = 'sid=' . $this->session_id; } *************** *** 417,421 **** if (defined('DEBUG_EXTRA') && $this->data['user_id'] != ANONYMOUS) { ! add_log('critical', 'LOG_IP_BROWSER_FORWARDED_CHECK', $u_ip, $s_ip, $u_browser, $s_browser, htmlspecialchars($u_forwarded_for), htmlspecialchars($s_forwarded_for)); } } --- 418,422 ---- if (defined('DEBUG_EXTRA') && $this->data['user_id'] != ANONYMOUS) { ! mx_add_log('critical', 'LOG_IP_BROWSER_FORWARDED_CHECK', $u_ip, $s_ip, $u_browser, $s_browser, htmlspecialchars($u_forwarded_for), htmlspecialchars($s_forwarded_for)); } } *************** *** 439,442 **** --- 440,444 ---- { global $SID, $_SID, $db, $board_config, $cache, $phpbb_root_path, $phpEx; + global $phpBB3; $this->data = array(); *************** *** 711,715 **** } ! $this->session_id = $this->data['session_id'] = md5(phpBB3::unique_id()); $sql_ary['session_id'] = (string) $this->session_id; --- 713,717 ---- } ! $this->session_id = $this->data['session_id'] = md5($phpBB3->unique_id()); $sql_ary['session_id'] = (string) $this->session_id; *************** *** 1202,1206 **** function set_login_key($user_id = false, $key = false, $user_ip = false) { ! global $board_config, $db; $user_id = ($user_id === false) ? $this->data['user_id'] : $user_id; --- 1204,1208 ---- function set_login_key($user_id = false, $key = false, $user_ip = false) { ! global $board_config, $db, $phpBB3; $user_id = ($user_id === false) ? $this->data['user_id'] : $user_id; *************** *** 1208,1212 **** $key = ($key === false) ? (($this->cookie_data['k']) ? $this->cookie_data['k'] : false) : $key; ! $key_id = phpBB3::unique_id(hexdec(substr($this->session_id, 0, 8))); $sql_ary = array( --- 1210,1214 ---- $key = ($key === false) ? (($this->cookie_data['k']) ? $this->cookie_data['k'] : false) : $key; ! $key_id = $phpBB3->unique_id(hexdec(substr($this->session_id, 0, 8))); $sql_ary = array( *************** *** 1338,1342 **** { global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache; ! global $mx_request_vars, $portal_config, $mx_backend; //added for mxp if (!empty($_GET['style']) && $phpbb_auth->acl_get('a_styles')) --- 1340,1344 ---- { global $db, $template, $board_config, $userdata, $phpbb_auth, $phpEx, $phpbb_root_path, $mx_root_path, $mx_cache; ! global $mx_request_vars, $portal_config, $mx_backend, $phpBB3; //added for mxp if (!empty($_GET['style']) && $phpbb_auth->acl_get('a_styles')) *************** *** 1344,1348 **** global $SID, $_EXTRA_URL; ! $style = phpBB3::request_var('style', 0); $SID .= '&style=' . $style; $_EXTRA_URL = array('style=' . $style); --- 1346,1350 ---- global $SID, $_EXTRA_URL; ! $style = $phpBB3->request_var('style', 0); $SID .= '&style=' . $style; $_EXTRA_URL = array('style=' . $style); *************** *** 1502,1506 **** if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg")) { ! $cfg_data_imageset_data = phpBB3::parse_cfg_file("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"); foreach ($cfg_data_imageset_data as $image_name => $value) { --- 1504,1508 ---- if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg")) { ! $cfg_data_imageset_data = $phpBB3->parse_cfg_file("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"); foreach ($cfg_data_imageset_data as $image_name => $value) { |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:06:37
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/modules/mx_phpbb3blocks/includes Modified Files: mx_functions_display.php Log Message: rewrite for php4 and php6 issues Index: mx_functions_display.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/includes/mx_functions_display.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_functions_display.php 7 Sep 2008 02:32:55 -0000 1.6 --- mx_functions_display.php 30 Sep 2008 07:04:52 -0000 1.7 *************** *** 33,37 **** global $db, $phpbb_auth, $mx_user, $template; global $phpbb_root_path, $phpEx, $board_config; ! global $mx_request_vars; $forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array(); --- 33,37 ---- global $db, $phpbb_auth, $mx_user, $template; global $phpbb_root_path, $phpEx, $board_config; ! global $mx_request_vars, $phpBB3; $forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array(); *************** *** 428,432 **** 'FORUM_IMAGE' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $mx_user->lang[$folder_alt] . '" />' : '', 'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', ! 'LAST_POST_SUBJECT' => phpBB3::censor_text($last_post_subject), 'LAST_POST_TIME' => $last_post_time, 'LAST_POSTER' => mx_get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), --- 428,432 ---- 'FORUM_IMAGE' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $mx_user->lang[$folder_alt] . '" />' : '', 'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '', ! 'LAST_POST_SUBJECT' => $phpBB3->censor_text($last_post_subject), 'LAST_POST_TIME' => $last_post_time, 'LAST_POSTER' => mx_get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), *************** *** 888,892 **** { global $phpbb_auth, $template, $db, $mx_user; ! global $phpbb_root_path, $phpEx; // Do not display user activity for users having more than 5000 posts... --- 888,892 ---- { global $phpbb_auth, $template, $db, $mx_user; ! global $phpbb_root_path, $phpEx, $phpBB3; // Do not display user activity for users having more than 5000 posts... *************** *** 983,987 **** 'ACTIVE_FORUM_POSTS' => ($active_f_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_f_count), 'ACTIVE_FORUM_PCT' => sprintf($l_active_pct, $active_f_pct), ! 'ACTIVE_TOPIC' => phpBB3::censor_text($active_t_name), 'ACTIVE_TOPIC_POSTS' => ($active_t_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_t_count), 'ACTIVE_TOPIC_PCT' => sprintf($l_active_pct, $active_t_pct), --- 983,987 ---- 'ACTIVE_FORUM_POSTS' => ($active_f_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_f_count), 'ACTIVE_FORUM_PCT' => sprintf($l_active_pct, $active_f_pct), ! 'ACTIVE_TOPIC' => $phpBB3->censor_text($active_t_name), 'ACTIVE_TOPIC_POSTS' => ($active_t_count == 1) ? sprintf($mx_user->lang['USER_POST'], 1) : sprintf($mx_user->lang['USER_POSTS'], $active_t_count), 'ACTIVE_TOPIC_PCT' => sprintf($l_active_pct, $active_t_pct), |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:06:33
|
Update of /cvsroot/mxbb/core/modules/mx_shared/ErrorHandler In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/modules/mx_shared/ErrorHandler Modified Files: Handler.php error.tpl Log Message: rewrite for php4 and php6 issues Index: error.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_shared/ErrorHandler/error.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** error.tpl 5 Apr 2006 21:05:28 -0000 1.1 --- error.tpl 30 Sep 2008 07:04:53 -0000 1.2 *************** *** 1,4 **** <?php ! $showSourceUri = 'http://localhost/modules/ErrorHandler/showSource.php'; $showSourcePrev = 10; $showSourceNext = 10; --- 1,4 ---- <?php ! $showSourceUri = 'http://localhost/modules/mx_shared/ErrorHandler/showSource.php'; $showSourcePrev = 10; $showSourceNext = 10; Index: Handler.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_shared/ErrorHandler/Handler.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Handler.php 6 Aug 2007 21:11:57 -0000 1.3 --- Handler.php 30 Sep 2008 07:04:53 -0000 1.4 *************** *** 14,18 **** * @package ErrorHandler */ ! class ErrorHandler { /** --- 14,19 ---- * @package ErrorHandler */ ! class ErrorHandler ! { /** *************** *** 20,24 **** * @access public */ ! function ErrorHandler() { @ini_set('docref_root', null); @ini_set('docref_ext', null); --- 21,26 ---- * @access public */ ! function ErrorHandler() ! { @ini_set('docref_root', null); @ini_set('docref_ext', null); *************** *** 33,48 **** * @access public */ ! function raiseError($errNo, $errMsg, $file, $line) { global $mx_user; ! if (! ($errNo & error_reporting())) { return; } ! while (ob_get_level()) { ob_end_clean(); } ! ! $errType = array ( 1 => "Php Error", 2 => "Php Warning", --- 35,55 ---- * @access public */ ! function raiseError($errNo, $errMsg, $file, $line) ! { global $mx_user; ! if ( !($errNo & error_reporting())) ! { return; } ! while (ob_get_level()) ! { ob_end_clean(); } ! ! // figure out the error level ! $errType = array( ! 0 => "Unknown PHP Error", 1 => "Php Error", 2 => "Php Warning", *************** *** 55,65 **** 256 => "Php User Error", 512 => "Php User Warning", ! 1024 => "Php User Notice" ); ! $info = array(); ! if (($errNo & E_USER_ERROR) && is_array($arr = @unserialize($errMsg))) { ! foreach ($arr as $k => $v) { $info[$k] = $v; } --- 62,75 ---- 256 => "Php User Error", 512 => "Php User Warning", ! 1024 => "Php User Notice", ! 2048 => 'PHP Strict', ); ! $info = array(); ! if (($errNo & E_USER_ERROR) && is_array($arr = @unserialize($errMsg))) ! { ! foreach ($arr as $k => $v) ! { $info[$k] = $v; } *************** *** 68,72 **** $trace = array(); ! if (function_exists('debug_backtrace')) { $trace = debug_backtrace(); array_shift($trace); --- 78,83 ---- $trace = array(); ! if (function_exists('debug_backtrace')) ! { $trace = debug_backtrace(); array_shift($trace); |
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/includes/shared/phpbb3/includes Modified Files: functions.php functions_admin.php functions_hook.php functions_module.php functions_posting.php message_parser.php Log Message: rewrite for php4 and php6 issues Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** functions.php 10 Jul 2008 23:02:06 -0000 1.21 --- functions.php 30 Sep 2008 07:04:43 -0000 1.22 *************** *** 30,845 **** class phpBB3_top { ! ! ! /** ! * set_var ! * ! * Set variable, used by {@link request_var the request_var function} ! * ! * @access private [...2027 lines suppressed...] --- 4476,4481 ---- if ($total_online_users > $board_config['record_online_users']) { ! $phpBB3->set_config('record_online_users', $total_online_users, true); ! $phpBB3->set_config('record_online_date', time(), true); } *************** *** 4748,4752 **** $template->display('body'); ! self::garbage_collection(); exit; --- 4751,4755 ---- $template->display('body'); ! $phpBB3->garbage_collection(); exit; Index: message_parser.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/message_parser.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** message_parser.php 7 Sep 2008 18:53:53 -0000 1.6 --- message_parser.php 30 Sep 2008 07:04:44 -0000 1.7 *************** *** 1034,1038 **** { // Init BBCode UID ! $this->bbcode_uid = substr(base_convert(phpBB3::unique_id(), 16, 36), 0, BBCODE_UID_LEN); if ($message) --- 1034,1038 ---- { // Init BBCode UID ! $this->bbcode_uid = substr(base_convert($phpBB3->unique_id(), 16, 36), 0, BBCODE_UID_LEN); if ($message) *************** *** 1129,1133 **** if ($allow_magic_url) { ! $this->magic_url(phpBB3::generate_board_url()); if ($board_config['max_' . $mode . '_urls']) --- 1129,1133 ---- if ($allow_magic_url) { ! $this->magic_url($phpBB3->generate_board_url()); if ($board_config['max_' . $mode . '_urls']) *************** *** 1211,1215 **** } ! ($custom_bbcode_uid) ? phpBB3::decode_message($this->message, $custom_bbcode_uid) : phpBB3::decode_message($this->message, $this->bbcode_uid); if (!$update_this_message) --- 1211,1215 ---- } ! ($custom_bbcode_uid) ? $phpBB3->decode_message($this->message, $custom_bbcode_uid) : $phpBB3->decode_message($this->message, $this->bbcode_uid); if (!$update_this_message) *************** *** 1232,1236 **** { // We use the global make_clickable function ! $this->message = phpBB3::make_clickable($this->message, $server_url); } --- 1232,1236 ---- { // We use the global make_clickable function ! $this->message = $phpBB3->make_clickable($this->message, $server_url); } *************** *** 1319,1323 **** $num_attachments = sizeof($this->attachment_data); ! $this->filename_data['filecomment'] = utf8_normalize_nfc(phpBB3::request_var('filecomment', '', true)); $upload_file = (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none' && trim($_FILES[$form_name]['name'])) ? true : false; --- 1319,1323 ---- $num_attachments = sizeof($this->attachment_data); ! $this->filename_data['filecomment'] = utf8_normalize_nfc($phpBB3->request_var('filecomment', '', true)); $upload_file = (isset($_FILES[$form_name]) && $_FILES[$form_name]['name'] != 'none' && trim($_FILES[$form_name]['name'])) ? true : false; *************** *** 1326,1330 **** // First of all adjust comments if changed ! $actual_comment_list = utf8_normalize_nfc(phpBB3::request_var('comment_list', array(''), true)); foreach ($actual_comment_list as $comment_key => $comment) --- 1326,1330 ---- // First of all adjust comments if changed ! $actual_comment_list = utf8_normalize_nfc($phpBB3->request_var('comment_list', array(''), true)); foreach ($actual_comment_list as $comment_key => $comment) *************** *** 1406,1410 **** include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); ! $index = array_keys(phpBB3::request_var('delete_file', array(0 => 0))); $index = (!empty($index)) ? $index[0] : false; --- 1406,1410 ---- include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); ! $index = array_keys($phpBB3->request_var('delete_file', array(0 => 0))); $index = (!empty($index)) ? $index[0] : false; *************** *** 1504,1508 **** global $mx_user, $db, $phpbb_root_path, $phpEx, $board_config; ! $this->filename_data['filecomment'] = utf8_normalize_nfc(phpBB3::request_var('filecomment', '', true)); $attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array(); $this->attachment_data = array(); --- 1504,1508 ---- global $mx_user, $db, $phpbb_root_path, $phpEx, $board_config; ! $this->filename_data['filecomment'] = utf8_normalize_nfc($phpBB3->request_var('filecomment', '', true)); $attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array(); $this->attachment_data = array(); Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** functions_hook.php 10 Jul 2008 23:02:07 -0000 1.18 --- functions_hook.php 30 Sep 2008 07:04:44 -0000 1.19 *************** *** 165,169 **** '#([ \t\n])define#si' => '\1@define', '#display\(\'body\'\);#si' => "display('panel');", ! '#(garbage_collection|exit_handler)\(\);#si' => 'phpBB3::\1();', //'#\$template->#si' => '$mx_acp->template->', '#adm_page_footer\(\);#si' => '$mx_acp->_template_assign_vars();$template->pparse(\'panel\');', --- 165,169 ---- '#([ \t\n])define#si' => '\1@define', '#display\(\'body\'\);#si' => "display('panel');", ! '#(garbage_collection|exit_handler)\(\);#si' => '$phpBB3->\1();', //'#\$template->#si' => '$mx_acp->template->', '#adm_page_footer\(\);#si' => '$mx_acp->_template_assign_vars();$template->pparse(\'panel\');', Index: functions_module.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_module.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** functions_module.php 10 Jul 2008 23:02:07 -0000 1.20 --- functions_module.php 30 Sep 2008 07:04:44 -0000 1.21 *************** *** 361,368 **** $this->active_module = false; ! if (phpBB3::request_var('icat', '')) { $icat = $id; ! $id = phpBB3::request_var('icat', ''); } --- 361,368 ---- $this->active_module = false; ! if ($phpBB3->request_var('icat', '')) { $icat = $id; ! $id = $phpBB3->request_var('icat', ''); } *************** *** 437,442 **** } $mx_acp->template->assign_vars', ! '#(' . $FUNCTION_REPLACE . ')\(#si' => 'phpBB3::\1(', ! "#'(" . $FUNCTION_REPLACE . ")'#si" => "'phpBB3::\\1'" ); --- 437,442 ---- } $mx_acp->template->assign_vars', ! '#(' . $FUNCTION_REPLACE . ')\(#si' => '$phpBB3->\1(', ! "#'(" . $FUNCTION_REPLACE . ")'#si" => "'$phpBB3->\\1'" ); *************** *** 448,455 **** $modulecode = str_replace('auth_admin', 'phpbb_auth_admin', $modulecode); $modulecode = str_replace('include_once($phpbb_root_path . \'includes/acp/auth.\' . $phpEx);', 'mx_cache::load_file(\'acp/auth\', \'phpbb3\');', $modulecode); ! $modulecode = str_replace('function phpBB3::', 'function phpbb3_', $modulecode); ! $modulecode = preg_replace( '/function ([^(]*)?phpBB3::([^(]*)\(/si', 'function \1\2(', $modulecode); ! $modulecode = str_replace('$this->phpBB3::', '$this->', $modulecode); $includes_cnt = preg_match_all( '#(include|require)(_once)?\(([^)]*)\);#si', $modulecode, $includes_match); $modulecode = preg_replace( '#(include|require)(_once)?\(([^)]*)\);#si', '// MXP INCLUDE CODE \0', $modulecode); --- 448,455 ---- $modulecode = str_replace('auth_admin', 'phpbb_auth_admin', $modulecode); $modulecode = str_replace('include_once($phpbb_root_path . \'includes/acp/auth.\' . $phpEx);', 'mx_cache::load_file(\'acp/auth\', \'phpbb3\');', $modulecode); ! $modulecode = str_replace('function $phpBB3->', 'function phpbb3_', $modulecode); ! $modulecode = preg_replace( '/function ([^(]*)?$phpBB3->([^(]*)\(/si', 'function \1\2(', $modulecode); ! $modulecode = str_replace('$this->$phpBB3->', '$this->', $modulecode); $includes_cnt = preg_match_all( '#(include|require)(_once)?\(([^)]*)\);#si', $modulecode, $includes_match); $modulecode = preg_replace( '#(include|require)(_once)?\(([^)]*)\);#si', '// MXP INCLUDE CODE \0', $modulecode); *************** *** 500,504 **** $module_path = $phpbb_root_path . 'includes/' . $this->p_class; ! $icat = phpBB3::request_var('icat', ''); if ($this->active_module === false) --- 500,504 ---- $module_path = $phpbb_root_path . 'includes/' . $this->p_class; ! $icat = $phpBB3->request_var('icat', ''); if ($this->active_module === false) Index: functions_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_admin.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** functions_admin.php 15 Jun 2008 21:01:41 -0000 1.4 --- functions_admin.php 30 Sep 2008 07:04:43 -0000 1.5 *************** *** 2448,2456 **** if (defined('IN_ADMIN')) { ! $log[$i]['action'] = phpBB3::bbcode_nl2br($log[$i]['action']); } else { ! $log[$i]['action'] = phpBB3::bbcode_nl2br(censor_text($log[$i]['action'])); } } --- 2448,2456 ---- if (defined('IN_ADMIN')) { ! $log[$i]['action'] = $phpBB3->bbcode_nl2br($log[$i]['action']); } else { ! $log[$i]['action'] = $phpBB3->bbcode_nl2br(censor_text($log[$i]['action'])); } } Index: functions_posting.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_posting.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** functions_posting.php 7 Sep 2008 02:16:48 -0000 1.6 --- functions_posting.php 30 Sep 2008 07:04:44 -0000 1.7 *************** *** 1029,1033 **** $poster_id = $row['user_id']; $post_subject = $row['post_subject']; ! $message = phpBB3::censor_text($row['post_text']); $decoded_message = false; --- 1029,1033 ---- $poster_id = $row['user_id']; $post_subject = $row['post_subject']; ! $message = $phpBB3->censor_text($row['post_text']); $decoded_message = false; *************** *** 1036,1042 **** { $decoded_message = $message; ! phpBB3::decode_message($decoded_message, $row['bbcode_uid']); ! $decoded_message = phpBB3::censor_text($decoded_message); $decoded_message = str_replace("\n", "<br />", $decoded_message); } --- 1036,1042 ---- { $decoded_message = $message; ! $phpBB3->decode_message($decoded_message, $row['bbcode_uid']); ! $decoded_message = $phpBB3->censor_text($decoded_message); $decoded_message = str_replace("\n", "<br />", $decoded_message); } *************** *** 1049,1053 **** $message = str_replace("\n", '<br />', $message); ! $message = phpBB3::smiley_text($message, !$row['enable_smilies']); if (!empty($attachments[$row['post_id']])) --- 1049,1053 ---- $message = str_replace("\n", '<br />', $message); ! $message = $phpBB3->smiley_text($message, !$row['enable_smilies']); if (!empty($attachments[$row['post_id']])) *************** *** 1057,1067 **** } ! $post_subject = phpBB3::censor_text($post_subject); $template->assign_block_vars($mode . '_row', array( ! 'POST_AUTHOR_FULL' => phpBB3::get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), ! 'POST_AUTHOR_COLOUR' => phpBB3::get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), ! 'POST_AUTHOR' => phpBB3::get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), ! 'U_POST_AUTHOR' => phpBB3::get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, --- 1057,1067 ---- } ! $post_subject = $phpBB3->censor_text($post_subject); $template->assign_block_vars($mode . '_row', array( ! 'POST_AUTHOR_FULL' => $phpBB3->get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), ! 'POST_AUTHOR_COLOUR' => $phpBB3->get_username_string('colour', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), ! 'POST_AUTHOR' => $phpBB3->get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), ! 'U_POST_AUTHOR' => $phpBB3->get_username_string('profile', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false, *************** *** 1075,1079 **** 'U_MINI_POST' => mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], 'U_MCP_DETAILS' => ($phpbb_auth->acl_get('m_info', $forum_id)) ? mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $mx_user->session_id) : '', ! 'POSTER_QUOTE' => ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) ? addslashes(phpBB3::get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') ); --- 1075,1079 ---- 'U_MINI_POST' => mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['post_id']) . '#p' . $row['post_id'], 'U_MCP_DETAILS' => ($phpbb_auth->acl_get('m_info', $forum_id)) ? mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=post_details&f=' . $forum_id . '&p=' . $row['post_id'], true, $mx_user->session_id) : '', ! 'POSTER_QUOTE' => ($show_quote_button && $phpbb_auth->acl_get('f_reply', $forum_id)) ? addslashes($phpBB3->get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['post_username'])) : '') ); *************** *** 1121,1125 **** $topic_title = ($topic_notification) ? $topic_title : $subject; ! $topic_title = phpBB3::censor_text($topic_title); // Get banned User ID's --- 1121,1125 ---- $topic_title = ($topic_notification) ? $topic_title : $subject; ! $topic_title = $phpBB3->censor_text($topic_title); // Get banned User ID's *************** *** 2309,2313 **** // Delete draft if post was loaded... ! $draft_id = phpBB3::request_var('draft_loaded', 0); if ($draft_id) { --- 2309,2313 ---- // Delete draft if post was loaded... ! $draft_id = $phpBB3->request_var('draft_loaded', 0); if ($draft_id) { |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:06:25
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/modules/mx_phpbb2blocks Modified Files: mx_announce.php mx_forum.php mx_last_msg.php mx_statistics.php Log Message: rewrite for php4 and php6 issues Index: mx_statistics.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_statistics.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_statistics.php 21 Jun 2008 22:21:14 -0000 1.7 --- mx_statistics.php 30 Sep 2008 07:04:52 -0000 1.8 *************** *** 164,168 **** $firstcount = $user_data[0]['user_posts']; ! $get_db_stats = phpBB2::get_db_stat( 'postcount' ); for( $i = 0; $i < $user_count; $i++ ) --- 164,168 ---- $firstcount = $user_data[0]['user_posts']; ! $get_db_stats = $phpBB2->get_db_stat( 'postcount' ); for( $i = 0; $i < $user_count; $i++ ) *************** *** 248,255 **** // $total_posts = $get_db_stats; //Already queried above ! $total_users = phpBB2::get_db_stat('usercount'); ! $total_topics = phpBB2::get_db_stat('topiccount'); ! $start_date = phpBB2::create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; --- 248,255 ---- // $total_posts = $get_db_stats; //Already queried above ! $total_users = $phpBB2->get_db_stat('usercount'); ! $total_topics = $phpBB2->get_db_stat('topiccount'); ! $start_date = $phpBB2->create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; *************** *** 406,410 **** // Newest user data // ! $newest_userdata = phpBB2::get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; --- 406,410 ---- // Newest user data // ! $newest_userdata = $phpBB2->get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; *************** *** 432,441 **** } $row = $db->sql_fetchrow($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? phpBB2::create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $row = $db->sql_fetchrow($result); $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, phpBB2::create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf('<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">' . $newest_user . '</a>'), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); // --- 432,441 ---- } $row = $db->sql_fetchrow($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? $phpBB2->create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $row = $db->sql_fetchrow($result); $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, $phpBB2->create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf('<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">' . $newest_user . '</a>'), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); // Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mx_last_msg.php 2 Jul 2008 22:02:16 -0000 1.11 --- mx_last_msg.php 30 Sep 2008 07:04:51 -0000 1.12 *************** *** 351,355 **** if ( $display_date == "TRUE" ) { ! $message_date = phpBB2::create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); } else --- 351,355 ---- if ( $display_date == "TRUE" ) { ! $message_date = $phpBB2->create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); } else Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_announce.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mx_announce.php 13 Jul 2008 19:31:27 -0000 1.10 --- mx_announce.php 30 Sep 2008 07:04:51 -0000 1.11 *************** *** 143,147 **** $poster_id = $postrow[$i]['user_id']; $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $postrow[$i]['username']; ! $post_date = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']); $title = $postrow[$i]['topic_title']; --- 143,147 ---- $poster_id = $postrow[$i]['user_id']; $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $postrow[$i]['username']; ! $post_date = $phpBB2->create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']); $title = $postrow[$i]['topic_title']; *************** *** 303,308 **** $replies = $postrow[$i]['topic_replies']; $views = $postrow[$i]['topic_views']; ! $first_post_time = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['topic_time'], $board_config['board_timezone']); ! $last_post_time = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['last_post_time'], $board_config['board_timezone']); $last_post_author = ( $postrow[$i]['id2'] == ANONYMOUS ) ? ( ( $postrow[$i]['post_username2'] != '' ) ? $postrow[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$i]['id2']) . '">' . $postrow[$i]['user2'] . '</a>'; --- 303,308 ---- $replies = $postrow[$i]['topic_replies']; $views = $postrow[$i]['topic_views']; ! $first_post_time = $phpBB2->create_date($board_config['default_dateformat'], $postrow[$i]['topic_time'], $board_config['board_timezone']); ! $last_post_time = $phpBB2->create_date($board_config['default_dateformat'], $postrow[$i]['last_post_time'], $board_config['board_timezone']); $last_post_author = ( $postrow[$i]['id2'] == ANONYMOUS ) ? ( ( $postrow[$i]['post_username2'] != '' ) ? $postrow[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$i]['id2']) . '">' . $postrow[$i]['user2'] . '</a>'; Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_forum.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_forum.php 9 Feb 2008 19:47:17 -0000 1.8 --- mx_forum.php 30 Sep 2008 07:04:51 -0000 1.9 *************** *** 73,79 **** // /* ! $total_posts = phpBB2::get_db_stat('postcount'); ! $total_users = phpBB2::get_db_stat('usercount'); ! $newest_userdata = phpBB2::get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; --- 73,79 ---- // /* ! $total_posts = $phpBB2->get_db_stat('postcount'); ! $total_users = $phpBB2->get_db_stat('usercount'); ! $newest_userdata = $phpBB2->get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; *************** *** 413,417 **** if ( $forum_data[$j]['forum_last_post_id'] ) { ! $last_post_time = phpBB2::create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']); $last_post = $last_post_time . '<br />'; --- 413,417 ---- if ( $forum_data[$j]['forum_last_post_id'] ) { ! $last_post_time = $phpBB2->create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']); $last_post = $last_post_time . '<br />'; |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:06:24
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/includes/shared/phpbb2/includes Modified Files: emailer.php functions.php functions_post.php functions_selects.php functions_validate.php Log Message: rewrite for php4 and php6 issues Index: functions_validate.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/functions_validate.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions_validate.php 9 Sep 2007 16:51:51 -0000 1.1 --- functions_validate.php 30 Sep 2008 07:04:43 -0000 1.2 *************** *** 32,36 **** // Remove doubled up spaces $username = preg_replace('#\s+#', ' ', trim($username)); ! $username = phpBB2::phpbb_clean_username($username); $sql = "SELECT username --- 32,36 ---- // Remove doubled up spaces $username = preg_replace('#\s+#', ' ', trim($username)); ! $username = $phpBB2->phpbb_clean_username($username); $sql = "SELECT username Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions.php 15 Jun 2008 09:15:45 -0000 1.3 --- functions.php 30 Sep 2008 07:04:42 -0000 1.4 *************** *** 27,490 **** class phpBB2 { ! function get_db_stat($mode) ! { ! global $db; ! ! switch( $mode ) { ! case 'usercount': [...1844 lines suppressed...] ! $server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : ''; ! $script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path'])); ! $script_name = ($script_name == '') ? $script_name : '/' . $script_name; ! $url = preg_replace('#^\/?(.*?)\/?$#', '/\1', trim($url)); ! // Redirect via an HTML form for PITA webservers ! if (@preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE'))) { ! header('Refresh: 0; URL=' . $server_protocol . $server_name . $server_port . $script_name . $url); ! echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta http-equiv="refresh" content="0; url=' . $server_protocol . $server_name . $server_port . $script_name . $url . '"><title>Redirect</title></head><body><div align="center">If your browser does not support meta redirection please click <a href="' . $server_protocol . $server_name . $server_port . $script_name . $url . '">HERE</a> to be redirected</div></body></html>'; ! exit; } ! // Behave as per HTTP/1.1 spec for others ! header('Location: ' . $server_protocol . $server_name . $server_port . $script_name . $url); exit; } } ?> \ No newline at end of file Index: functions_selects.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/functions_selects.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** functions_selects.php 9 Sep 2007 16:51:51 -0000 1.1 --- functions_selects.php 30 Sep 2008 07:04:42 -0000 1.2 *************** *** 34,38 **** while ( $file = readdir($dir) ) { ! if (preg_match('#^lang_#i', $file) && !is_file(@phpBB2::phpbb_realpath($phpbb_root_path . $dirname . '/' . $file)) && !is_link(@phpBB2::phpbb_realpath($phpbb_root_path . $dirname . '/' . $file))) { $filename = trim(str_replace("lang_", "", $file)); --- 34,38 ---- while ( $file = readdir($dir) ) { ! if (preg_match('#^lang_#i', $file) && !is_file(@$phpBB2->phpbb_realpath($phpbb_root_path . $dirname . '/' . $file)) && !is_link(@$phpBB2->phpbb_realpath($phpbb_root_path . $dirname . '/' . $file))) { $filename = trim(str_replace("lang_", "", $file)); Index: functions_post.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/functions_post.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions_post.php 24 Sep 2008 14:50:50 -0000 1.3 --- functions_post.php 30 Sep 2008 07:04:42 -0000 1.4 *************** *** 633,637 **** $orig_word = array(); $replacement_word = array(); ! phpBB2::obtain_word_list($orig_word, $replacement_word); $emailer->from($board_config['board_email']); --- 633,637 ---- $orig_word = array(); $replacement_word = array(); ! $phpBB2->obtain_word_list($orig_word, $replacement_word); $emailer->from($board_config['board_email']); Index: emailer.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/emailer.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** emailer.php 9 Sep 2007 16:51:51 -0000 1.1 --- emailer.php 30 Sep 2008 07:04:41 -0000 1.2 *************** *** 103,111 **** $tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; ! if (!@file_exists(@phpBB2::phpbb_realpath($tpl_file))) { $tpl_file = $phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; ! if (!@file_exists(@phpBB2::phpbb_realpath($tpl_file))) { mx_message_die(GENERAL_ERROR, 'Could not find email template file :: ' . $template_file, '', __LINE__, __FILE__); --- 103,111 ---- $tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; ! if (!@file_exists(@$phpBB2->phpbb_realpath($tpl_file))) { $tpl_file = $phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; ! if (!@file_exists(@$phpBB2->phpbb_realpath($tpl_file))) { mx_message_die(GENERAL_ERROR, 'Could not find email template file :: ' . $template_file, '', __LINE__, __FILE__); *************** *** 358,362 **** function encode_file($sourcefile) { ! if (is_readable(phpBB2::phpbb_realpath($sourcefile))) { $fd = fopen($sourcefile, "r"); --- 358,362 ---- function encode_file($sourcefile) { ! if (is_readable($phpBB2->phpbb_realpath($sourcefile))) { $fd = fopen($sourcefile, "r"); |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:06:18
|
Update of /cvsroot/mxbb/core/modules/mx_users/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/modules/mx_users/admin Modified Files: admin_groupcp.php admin_prune_user_posts.php admin_prune_users.php admin_userlist.php admin_users.php Log Message: rewrite for php4 and php6 issues Index: admin_groupcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_groupcp.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_groupcp.php 14 Jun 2008 19:17:56 -0000 1.5 --- admin_groupcp.php 30 Sep 2008 07:04:54 -0000 1.6 *************** *** 55,59 **** $from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' '; ! $joined = phpBB2::create_date($date_format, $row['user_regdate'], $board_config['board_timezone']); $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; --- 55,59 ---- $from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' '; ! $joined = $phpBB2->create_date($date_format, $row['user_regdate'], $board_config['board_timezone']); $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; *************** *** 492,496 **** if ($mx_request_vars->is_post('add')) { ! $username = $mx_request_vars->is_post('username') ? phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : ''; $sql = "SELECT * --- 492,496 ---- if ($mx_request_vars->is_post('add')) { ! $username = $mx_request_vars->is_post('username') ? $phpBB2->phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)) : ''; $sql = "SELECT * *************** *** 1083,1087 **** $template->assign_vars(array( ! 'PAGINATION' => phpBB2::generate_pagination("admin_groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id", $members_count, $board_config['topics_per_page'], $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), $current_page ), --- 1083,1087 ---- $template->assign_vars(array( ! 'PAGINATION' => $phpBB2->generate_pagination("admin_groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id", $members_count, $board_config['topics_per_page'], $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), $current_page ), Index: admin_prune_users.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_users.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_prune_users.php 9 Feb 2008 21:14:27 -0000 1.3 --- admin_prune_users.php 30 Sep 2008 07:04:54 -0000 1.4 *************** *** 234,239 **** $user_id = $inactive_users[$i]['user_id']; $username = $inactive_users[$i]['username']; ! $user_lastvisit = ( !$inactive_users[$i]['user_lastvisit'] ) ? $lang['Never'] : phpBB2::create_date($board_config['default_dateformat'], $inactive_users[$i]['user_lastvisit'], $board_config['board_timezone']); ! $user_regdate = ( !$inactive_users[$i]['user_regdate'] ) ? $lang['Never'] : phpBB2::create_date($board_config['default_dateformat'], $inactive_users[$i]['user_regdate'], $board_config['board_timezone']); $user_active = ( !$inactive_users[$i]['user_active'] ) ? $lang['No'] : $lang['Yes']; $user_posts = $inactive_users[$i]['user_posts']; --- 234,239 ---- $user_id = $inactive_users[$i]['user_id']; $username = $inactive_users[$i]['username']; ! $user_lastvisit = ( !$inactive_users[$i]['user_lastvisit'] ) ? $lang['Never'] : $phpBB2->create_date($board_config['default_dateformat'], $inactive_users[$i]['user_lastvisit'], $board_config['board_timezone']); ! $user_regdate = ( !$inactive_users[$i]['user_regdate'] ) ? $lang['Never'] : $phpBB2->create_date($board_config['default_dateformat'], $inactive_users[$i]['user_regdate'], $board_config['board_timezone']); $user_active = ( !$inactive_users[$i]['user_active'] ) ? $lang['No'] : $lang['Yes']; $user_posts = $inactive_users[$i]['user_posts']; Index: admin_prune_user_posts.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_prune_user_posts.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_prune_user_posts.php 15 Jul 2008 22:05:25 -0000 1.4 --- admin_prune_user_posts.php 30 Sep 2008 07:04:54 -0000 1.5 *************** *** 437,441 **** { // Encode the ip into hexademicals ! $ip = phpBB2::encode_ip($prune_ip); // Because we will be deleting based on IP's, we will store the encoded IP alone --- 437,441 ---- { // Encode the ip into hexademicals ! $ip = $phpBB2->encode_ip($prune_ip); // Because we will be deleting based on IP's, we will store the encoded IP alone *************** *** 460,474 **** case 4: // We will encode the ip into hexademical quads ! $users[]['user_ip'] = phpBB2::encode_ip($ip_split[0].".".$ip_split[1].".".$ip_split[2].".255"); break; // xxx.xxx.* case 3: // We will encode the ip into hexademical quads again.. ! $users[]['user_ip'] = phpBB2::encode_ip($ip_split[0].".".$ip_split[1].".255.255"); break; // xxx.* case 2: // We will encode the ip into hexademical quads again again.... ! $users[]['user_ip'] = phpBB2::encode_ip($ip_split[0].".255.255.255"); break; } --- 460,474 ---- case 4: // We will encode the ip into hexademical quads ! $users[]['user_ip'] = $phpBB2->encode_ip($ip_split[0].".".$ip_split[1].".".$ip_split[2].".255"); break; // xxx.xxx.* case 3: // We will encode the ip into hexademical quads again.. ! $users[]['user_ip'] = $phpBB2->encode_ip($ip_split[0].".".$ip_split[1].".255.255"); break; // xxx.* case 2: // We will encode the ip into hexademical quads again again.... ! $users[]['user_ip'] = $phpBB2->encode_ip($ip_split[0].".255.255.255"); break; } *************** *** 494,498 **** { // let's put it in the big array.. ! $users[]['user_ip'] = phpBB2::encode_ip($start_range[0].".".$start_range[1].".".$start_range[2].".".$i); } } --- 494,498 ---- { // let's put it in the big array.. ! $users[]['user_ip'] = $phpBB2->encode_ip($start_range[0].".".$start_range[1].".".$start_range[2].".".$i); } } Index: admin_users.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_users.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_users.php 15 Jul 2008 22:05:25 -0000 1.8 --- admin_users.php 30 Sep 2008 07:04:55 -0000 1.9 *************** *** 272,276 **** } ! $username = phpBB2::phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)); $email = $mx_request_vars->post('email', MX_TYPE_NO_TAGS); --- 272,276 ---- } ! $username = $phpBB2->phpbb_clean_username($mx_request_vars->post('username', MX_TYPE_NO_TAGS)); $email = $mx_request_vars->post('email', MX_TYPE_NO_TAGS); Index: admin_userlist.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_userlist.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_userlist.php 9 Feb 2008 12:51:07 -0000 1.3 --- admin_userlist.php 30 Sep 2008 07:04:55 -0000 1.4 *************** *** 953,958 **** 'I_AVATAR' => $avatar_img, ! 'JOINED' => phpBB2::create_date('d M Y', $row['user_regdate'], $board_config['board_timezone']), ! 'LAST_ACTIVITY' => ( !empty($row['user_session_time']) ) ? phpBB2::create_date('d M Y', $row['user_session_time'], $board_config['board_timezone']) : $lang['Never'], 'POSTS' => ( $row['user_posts'] ) ? $row['user_posts'] : 0, --- 953,958 ---- 'I_AVATAR' => $avatar_img, ! 'JOINED' => $phpBB2->create_date('d M Y', $row['user_regdate'], $board_config['board_timezone']), ! 'LAST_ACTIVITY' => ( !empty($row['user_session_time']) ) ? $phpBB2->create_date('d M Y', $row['user_session_time'], $board_config['board_timezone']) : $lang['Never'], 'POSTS' => ( $row['user_posts'] ) ? $row['user_posts'] : 0, *************** *** 1047,1051 **** $total_members = $total['total']; ! $pagination = phpBB2::generate_pagination($module_root_path . "admin/admin_userlist.$phpEx?sort=$sort&order=$sort_order&show=$show" . ( ( isset($alphanum) ) ? "&alphanum=$alphanum" : '' ), $total_members, $show, $start); } --- 1047,1051 ---- $total_members = $total['total']; ! $pagination = $phpBB2->generate_pagination($module_root_path . "admin/admin_userlist.$phpEx?sort=$sort&order=$sort_order&show=$show" . ( ( isset($alphanum) ) ? "&alphanum=$alphanum" : '' ), $total_members, $show, $start); } |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:06:14
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/modules/mx_phpbb3blocks Modified Files: mx_last_msg.php mx_statistics.php mx_viewforum.php Log Message: rewrite for php4 and php6 issues Index: mx_viewforum.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/mx_viewforum.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_viewforum.php 12 Jul 2008 20:24:33 -0000 1.4 --- mx_viewforum.php 30 Sep 2008 07:04:53 -0000 1.5 *************** *** 609,613 **** 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'FIRST_POST_TIME' => $mx_user->format_date($row['topic_time']), ! 'LAST_POST_SUBJECT' => phpBB3::censor_text($row['topic_last_post_subject']), 'LAST_POST_TIME' => $mx_user->format_date($row['topic_last_post_time']), 'LAST_VIEW_TIME' => $mx_user->format_date($row['topic_last_view_time']), --- 609,613 ---- 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'FIRST_POST_TIME' => $mx_user->format_date($row['topic_time']), ! 'LAST_POST_SUBJECT' => $phpBB3->censor_text($row['topic_last_post_subject']), 'LAST_POST_TIME' => $mx_user->format_date($row['topic_last_post_time']), 'LAST_VIEW_TIME' => $mx_user->format_date($row['topic_last_view_time']), *************** *** 619,623 **** 'REPLIES' => $replies, 'VIEWS' => $row['topic_views'], ! 'TOPIC_TITLE' => phpBB3::censor_text($row['topic_title']), 'TOPIC_TYPE' => $topic_type, --- 619,623 ---- 'REPLIES' => $replies, 'VIEWS' => $row['topic_views'], ! 'TOPIC_TITLE' => $phpBB3->censor_text($row['topic_title']), 'TOPIC_TYPE' => $topic_type, Index: mx_statistics.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/mx_statistics.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_statistics.php 27 Aug 2008 13:43:10 -0000 1.3 --- mx_statistics.php 30 Sep 2008 07:04:53 -0000 1.4 *************** *** 167,171 **** $firstcount = $user_data[0]['user_posts']; ! $get_db_stats = phpBB2::get_db_stat( 'postcount' ); for( $i = 0; $i < $user_count; $i++ ) --- 167,171 ---- $firstcount = $user_data[0]['user_posts']; ! $get_db_stats = $phpBB2->get_db_stat( 'postcount' ); for( $i = 0; $i < $user_count; $i++ ) *************** *** 255,262 **** // $total_posts = $get_db_stats; //Already queried above ! $total_users = phpBB2::get_db_stat('usercount'); ! $total_topics = phpBB2::get_db_stat('topiccount'); ! $start_date = phpBB2::create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; --- 255,262 ---- // $total_posts = $get_db_stats; //Already queried above ! $total_users = $phpBB2->get_db_stat('usercount'); ! $total_topics = $phpBB2->get_db_stat('topiccount'); ! $start_date = $phpBB2->create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; *************** *** 414,418 **** // Newest user data // ! $newest_userdata = phpBB2::get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; --- 414,418 ---- // Newest user data // ! $newest_userdata = $phpBB2->get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; *************** *** 444,453 **** $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? phpBB2::create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, phpBB2::create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf($newest_user_profile), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); // --- 444,453 ---- $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? $phpBB2->create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, $phpBB2->create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf($newest_user_profile), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); // Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/mx_last_msg.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_last_msg.php 20 Jul 2008 23:34:14 -0000 1.3 --- mx_last_msg.php 30 Sep 2008 07:04:52 -0000 1.4 *************** *** 387,391 **** if ($display_date == "TRUE") { ! //$message_date = phpBB2::create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); $message_date = $mx_user->format_date($postrow[$row_count]['post_time']); $topic_date = $mx_user->format_date($postrow[$row_count]['topic_time']); --- 387,391 ---- if ($display_date == "TRUE") { ! //$message_date = $phpBB2->create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); $message_date = $mx_user->format_date($postrow[$row_count]['post_time']); $topic_date = $mx_user->format_date($postrow[$row_count]['topic_time']); |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:06:10
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/modules/mx_coreblocks Modified Files: mx_online.php mx_search.php mx_site_log.php Log Message: rewrite for php4 and php6 issues Index: mx_site_log.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mx_site_log.php 9 Feb 2008 12:48:51 -0000 1.19 --- mx_site_log.php 30 Sep 2008 07:04:49 -0000 1.20 *************** *** 245,249 **** } ! $edit_time = !empty($searchdata['block_time']) ? phpBB2::create_date($board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) : ''; $block_editor = '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">'; --- 245,249 ---- } ! $edit_time = !empty($searchdata['block_time']) ? $phpBB2->create_date($board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) : ''; $block_editor = '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">'; Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mx_online.php 27 Aug 2008 13:43:10 -0000 1.27 --- mx_online.php 30 Sep 2008 07:04:48 -0000 1.28 *************** *** 269,275 **** // removing them // ! $total_posts = phpBB2::get_db_stat('postcount'); ! $total_users = phpBB2::get_db_stat('usercount'); ! $newest_userdata = phpBB2::get_db_stat('newestuser'); $newest_username = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_username'] : $newest_userdata['username']; $newest_uid = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_user_id'] : $newest_userdata['user_id']; --- 269,275 ---- // removing them // ! $total_posts = $phpBB2->get_db_stat('postcount'); ! $total_users = $phpBB2->get_db_stat('usercount'); ! $newest_userdata = $phpBB2->get_db_stat('newestuser'); $newest_username = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_username'] : $newest_userdata['username']; $newest_uid = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_user_id'] : $newest_userdata['user_id']; *************** *** 440,444 **** 'TOTAL_USERS_ONLINE' => $l_online_users, 'LOGGED_IN_USER_LIST' => $online_userlist, ! 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], phpBB2::create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], 'ONLINE_LEGEND' => $legend, --- 440,444 ---- 'TOTAL_USERS_ONLINE' => $l_online_users, 'LOGGED_IN_USER_LIST' => $online_userlist, ! 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], $phpBB2->create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], 'ONLINE_LEGEND' => $legend, Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** mx_search.php 15 Jul 2008 22:04:36 -0000 1.29 --- mx_search.php 30 Sep 2008 07:04:48 -0000 1.30 *************** *** 446,450 **** } ! $edit_time = !empty($searchdata['block_time']) ? '(' . phpBB2::create_date($board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) . ')' : ''; $block_editor = '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">'; --- 446,450 ---- } ! $edit_time = !empty($searchdata['block_time']) ? '(' . $phpBB2->create_date($board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) . ')' : ''; $block_editor = '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">'; *************** *** 477,481 **** $template->assign_vars( array( ! 'PAGINATION' => phpBB2::generate_pagination( $base_url, $total_match_count, $per_page, $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page ) ), --- 477,481 ---- $template->assign_vars( array( ! 'PAGINATION' => $phpBB2->generate_pagination( $base_url, $total_match_count, $per_page, $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page ) ), |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:05:59
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/install Modified Files: mx_install.php Log Message: rewrite for php4 and php6 issues Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** mx_install.php 24 Sep 2008 15:37:06 -0000 1.112 --- mx_install.php 30 Sep 2008 07:04:45 -0000 1.113 *************** *** 34,37 **** --- 34,38 ---- $mx_portal_name = 'MX-Publisher Modular System'; $mx_portal_version = '3.0.0-b3'; + $mx_php_version = '5.1.2'; $mx_portal_copy = '<b>MX-Publisher Modular System!</b> <br /><br/> MX-Publisher is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001 (originally named MX-Publisher). <br /><br />Authors: The MX-Publisher Development Team. <br />Please visit <a href="http://www.mx-publisher.com/">www.mx-publisher.com</a> for further information.'; *************** *** 40,44 **** // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '3.0.4'); define('INSTALLER_NAME', 'MX-Publisher-IWizard'); --- 41,45 ---- // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '3.0.3'); define('INSTALLER_NAME', 'MX-Publisher-IWizard'); *************** *** 67,71 **** $mx_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); ! $tplEx = 'tpl'; // // FYI: --- 68,72 ---- $mx_root_path = '../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); ! $tplEx = @file_exists($mx_root_path.'install/templates/mx_install_header.html') ? 'html' : 'tpl'; // // FYI: *************** *** 75,79 **** @ini_set( 'display_errors', '1' ); error_reporting(E_ALL ^ E_NOTICE); ! error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables //include($mx_root_path . "modules/mx_shared/ErrorHandler/prepend.$phpEx"); // For nice error output --- 76,80 ---- @ini_set( 'display_errors', '1' ); error_reporting(E_ALL ^ E_NOTICE); ! //error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables //include($mx_root_path . "modules/mx_shared/ErrorHandler/prepend.$phpEx"); // For nice error output *************** *** 351,355 **** 'COMMENTS' => 'mx_remove_remarks' ), - //This is when the user installed phpBB3 with mysql 6.x if not he can use mysqli 'mysql6' => array( 'LABEL' => 'MySQL 6.x', --- 352,355 ---- *************** *** 602,611 **** case 'phpbb2': ! $tplEx = $tplEx ? $tplEx : 'tpl'; break; case 'phpbb3': ! $tplEx = $tplEx ? $tplEx : 'html'; break; } --- 602,611 ---- case 'phpbb2': ! //$tplEx = 'tpl'; break; case 'phpbb3': ! //$tplEx = 'html'; break; } |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:05:55
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/install/includes Modified Files: functions_install.php Log Message: rewrite for php4 and php6 issues Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** functions_install.php 17 Sep 2008 08:24:23 -0000 1.19 --- functions_install.php 30 Sep 2008 07:04:45 -0000 1.20 *************** *** 315,324 **** function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, $prefix_may_exist = false, $load_dbal = true, $unicode_check = true) { ! global $phpbb_root_path, $phpEx, $config, $lang; if ($load_dbal) { // Include the DB layer ! require_once($mx_root_path . 'includes/db/' . $dbms['DRIVER'] . '.' . $phpEx); } --- 315,334 ---- function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost, $dbuser, $dbpasswd, $dbname, $dbport, $prefix_may_exist = false, $load_dbal = true, $unicode_check = true) { ! global $phpbb_root_path, $phpEx, $config, $lang; $mx_php_version; if ($load_dbal) { // Include the DB layer ! // If we are on PHP < 5.0.0 we need to force include or we get a blank page ! if (version_compare(PHP_VERSION, '5.0.0', '<')) ! { ! global $mx_php_version; ! ! $dbms = 'mysqli' ? 'mysql4' : $dbms; //this version of php does not have mysqli extension and my crash the installer if finds a forum using this ! ! print("This version of php is not supported, returned: " . PHP_VERSION . "<br />Please upgrade at least to $mx_php_version.<br />"); ! ! } ! require_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class } *************** *** 857,860 **** --- 867,876 ---- install_die(GENERAL_ERROR, 'Configuration file ' . $config . ' couldn\'t be opened.'); } + + // If we are on PHP < 5.0.0 we need to force include or we get a blank page + if (version_compare(PHP_VERSION, '5.0.0', '<')) + { + $dbms = str_replace('mysqli', 'mysql4', $dbms); //this version of php does not have mysqli extension and my crash the installer if finds a forum using this + } return array( *************** *** 877,881 **** install_die(GENERAL_ERROR, 'Configuration file ' . $config . ' couldn\'t be opened.'); } ! return array( 'dbms' => $dbms, --- 893,897 ---- install_die(GENERAL_ERROR, 'Configuration file ' . $config . ' couldn\'t be opened.'); } ! return array( 'dbms' => $dbms, *************** *** 924,928 **** { global $mx_root_path, $phpEx; ! if( !defined('BEGIN_TRANSACTION') ) { --- 940,944 ---- { global $mx_root_path, $phpEx; ! if( !defined('BEGIN_TRANSACTION') ) { *************** *** 939,951 **** // If we are on PHP < 5.0.0 we need to force include or we get a blank page ! if (phpversion() < '5.0.0-dev') ! { ! print("This version of php is not supported, returned: " . phpversion() . '<br />Please upgrade at least to 5.1.2.'); ! require_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class ! } ! else ! { ! require_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class } if(!$db->db_connect_id) { --- 955,967 ---- // If we are on PHP < 5.0.0 we need to force include or we get a blank page ! if (version_compare(PHP_VERSION, '5.0.0', '<')) ! { ! $dbms = str_replace('mysqli', 'mysql4', $dbms); //this version of php does not have mysqli extension and my crash the installer if finds a forum using this } + + // Load dbal and initiate class + //Apache 2.0.x and php < 5.2.5 combination will crash here this is fixed by upgrading to php 5.2.6 or Apache 2.2.x + require_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); + if(!$db->db_connect_id) { *************** *** 953,959 **** @define('SQL_LAYER', $dbms); $sql_db = 'dbal_' . $dbms; ! $db = new $sql_db(); ! if(!is_object($db)) { --- 969,975 ---- @define('SQL_LAYER', $dbms); $sql_db = 'dbal_' . $dbms; ! $db = new $sql_db(); ! if(!is_object($db)) { |
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/install/schemas Modified Files: mysql_41_schema_install.sql mysql_schema_install.sql mysql_schema_install_2.9.2.sql mysql_schema_upgrade_to_2.9.1.sql Added Files: mysql_3_schema_install.sql Log Message: rewrite for php4 and php6 issues Index: mysql_schema_install_2.9.2.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install_2.9.2.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mysql_schema_install_2.9.2.sql 8 Sep 2008 19:08:24 -0000 1.2 --- mysql_schema_install_2.9.2.sql 30 Sep 2008 07:04:47 -0000 1.3 *************** *** 802,811 **** # -- Themes ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (5, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (6, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); # -------------------------------------------------------- --- 802,813 ---- # -- Themes ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mx_prosilver', 'mx_prosilver', 'mx_prosilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (5, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (6, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (7, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); ! # -------------------------------------------------------- --- NEW FILE: mysql_3_schema_install.sql --- # MySQL-Front Dump 2.4 # # Host: localhost Database: MX-Publisher #-------------------------------------------------------- # # Table structure for table 'mx_table_block' # DROP TABLE IF EXISTS `mx_table_block`; CREATE TABLE `mx_table_block` ( `block_id` smallint(5) unsigned NOT NULL auto_increment, `block_title` varchar(150), `block_desc` text, `function_id` smallint(5) unsigned, `auth_view` tinyint(2) NOT NULL DEFAULT '0', `auth_edit` tinyint(2) NOT NULL DEFAULT '0', `auth_delete` tinyint(2) NOT NULL DEFAULT '0', `auth_view_group` varchar(255) NOT NULL DEFAULT '0', `auth_edit_group` varchar(255) NOT NULL DEFAULT '0', `auth_delete_group` varchar(255) NOT NULL DEFAULT '0', `auth_moderator_group` varchar(255) NOT NULL DEFAULT '0', `show_title` tinyint(2) unsigned NOT NULL DEFAULT '1', `show_block` tinyint(2) unsigned NOT NULL DEFAULT '1', `show_stats` tinyint(2) unsigned NOT NULL DEFAULT '0', `block_time` varchar(255) NOT NULL DEFAULT '', `block_editor_id` mediumint(8) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`block_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_block' # INSERT INTO `mx_table_block` VALUES("1", "Demo Page 3", "Demo", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202765204", "2"); INSERT INTO `mx_table_block` VALUES("2", "Split Block", "This is a Demo Block", "11", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("3", "Site Log", "This is a Demo Block", "10", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("4", "Demo page", "SubBlocks", "3", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202761342", "2"); INSERT INTO `mx_table_block` VALUES("7", "Language Select", "This is a Demo Block", "6", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("8", "Navigation Menu", "This is a vertical Navigation Menu Demo Block", "51", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("9", "Demo Page 5 - Custom", "Demo", "22", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202761540", "2"); INSERT INTO `mx_table_block` VALUES("10", "Demo Page 4 - wysiwyg", "Demo", "23", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1202761496", "2"); INSERT INTO `mx_table_block` VALUES("13", "Login", "This is a Demo Block", "7", "9", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("14", "Theme Select", "This is a Demo Block", "12", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("15", "Site Search", "Site Search", "15", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("19", "Who is Online?", "This is a Demo Block", "13", "5", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202763740", "2"); INSERT INTO `mx_table_block` VALUES("21", "Google", "This is a Demo Block", "4", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("32", "Demo page", "", "51", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202761705", "2"); INSERT INTO `mx_table_block` VALUES("27", "IncludeX", "This is a Demo Block", "5", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); INSERT INTO `mx_table_block` VALUES("28", "Welcome", "This is the welcome block", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202766730", "2"); INSERT INTO `mx_table_block` VALUES("29", "Demo Page 1", "Demo", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202765153", "2"); INSERT INTO `mx_table_block` VALUES("30", "Demo Page 2", "Demo", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202765190", "2"); INSERT INTO `mx_table_block` VALUES("31", "Page Navigation", "This is a page navigation menu", "52", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1202598000", "2"); # # Table structure for table 'mx_table_block_system_parameter' # DROP TABLE IF EXISTS `mx_table_block_system_parameter`; CREATE TABLE `mx_table_block_system_parameter` ( `block_id` smallint(5) unsigned NOT NULL default '0', `parameter_id` smallint(5) unsigned NOT NULL default '0', `parameter_value` mediumtext, `parameter_opt` text, `sub_id` int(255) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`,`parameter_id`,`sub_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_block_system_parameter' # INSERT INTO `mx_table_block_system_parameter` VALUES("1", "15", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas malesuada semper ante. Aliquam orci ipsum, aliquam sodales, dictum id, tincidunt non, elit. Proin tincidunt felis id urna. Praesent in erat. Nunc at arcu et nisi tempor interdum. Quisque enim. Nunc et lorem. Ut tortor. Suspendisse potenti. Nam egestas orci at mi. Sed pulvinar est sit amet ante. Mauris pharetra mollis risus. Donec accumsan fermentum leo.\r\n\r\nSuspendisse potenti. Quisque tincidunt, mi viverra semper iaculis, nisl metus vehicula libero, eget tincidunt est massa ac purus. Aenean a justo. Sed ultrices, mi vitae hendrerit suscipit, mauris velit rutrum lectus, eget pharetra metus ipsum in purus. Sed placerat ornare nulla. Nullam vel leo non nulla fermentum varius. Integer nec pede a velit tempor aliquam. Sed eu neque in eros scelerisque eleifend. Vivamus id urna. Pellentesque nec nulla. Fusce et sapien. Nulla venenatis imperdiet ligula. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Proin vel nunc eu leo malesuada congue. Praesent faucibus. Vivamus quis sapien in dolor gravida vehicula.", "46dd886e9d", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("2", "60", "16,13,9", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("2", "61", "33%, 33%,*", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("2", "62", "4", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("3", "91", "3 months", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("3", "92", "5", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("4", "80", "29", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("8", "66", "", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("8", "93", "", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("8", "63", "Vertical", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("32", "93", "", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("32", "66", "", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("31", "100", "", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("31", "101", "", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("31", "102", "Overall_navigation", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "50", "This is basically a [i:021a122fa6]standard[/i:021a122fa6] TextBlock, but you may configure settings for bbcodes, html and smilies for [i:021a122fa6]this[/i:021a122fa6] block.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)", "021a122fa6", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "51", "none", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "52", "TRUE", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "53", "TRUE", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "56", "TRUE", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "54", "TRUE", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "57", "TRUE", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "55", "b,i,u,img", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("10", "16", "<table width=\"100%\" cellpadding=\"2\" border=\"0\"><tbody><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Mon</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- MĹNDAG -->Busy with <em>this and that</em></span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row1\"><span class=\"genmed\"><strong>Tue</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TISDAG-->Not so busy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Wen</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- ONSDAG-->Very busy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row1\"><span class=\"genmed\"><strong>Thu</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TORSDAG-->Lazy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Fri</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- FREDAG-->Resting...</span></td></tr></tbody></table><p>This basic table structure is a nice demonstration in which the wysiwyg editor comes in handy!</p><p>Try it out! <br />(to edit use the top right edit button)</p><p>Note: The wysiwyg editor is a 3rd party product (tinyMCE), and must be installed separately. Visit <a target=\"_blank\" href=\"http://www.moxiecode.com\">Moxiecode Systems AB</a> to get the software and place the \'tinymce\' folder in the root/modules/mx_shared directory. </p>", "0", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("32", "63", "Vertical", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("27", "70", "x_iframe", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("27", "71", "/docs", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("27", "72", "325", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("27", "73", "", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("28", "15", "[b:787bdbfe25]MX-Publisher[/b:787bdbfe25] is a fully modular CMS, featuring dynamic pages, blocks, styles, and more (eg modules) by means of a powerful yet flexible AdminCP. It works standalone or with phpBB2/phpBB3 by using integrated features and functions. MX-Publisher currently supports the mySQL and postgreSQL databases. MX-Publisher is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001.\r\n\r\n[i:787bdbfe25]Welcome, and thanks for using MX-Publisher![/i:787bdbfe25]", "787bdbfe25", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("29", "15", "On this page we [i:6d09b58ee2]demonstrate[/i:6d09b58ee2] how subpages are easily created, using the CORE dynamic block and the user navigation block. Create new textblocks in the adminCP, and add them in the navigation menu. Have fun!\r\n\r\nLorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas malesuada semper ante. Aliquam orci ipsum, aliquam sodales, dictum id, tincidunt non, elit. Proin tincidunt felis id urna. Praesent in erat. Nunc at arcu et nisi tempor interdum. Quisque enim. Nunc et lorem. Ut tortor. Suspendisse potenti. Nam egestas orci at mi. Sed pulvinar est sit amet ante. Mauris pharetra mollis risus. Donec accumsan fermentum leo.", "6d09b58ee2", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("30", "15", "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas malesuada semper ante. Aliquam orci ipsum, aliquam sodales, dictum id, tincidunt non, elit. Proin tincidunt felis id urna. Praesent in erat. Nunc at arcu et nisi tempor interdum. Quisque enim. Nunc et lorem. Ut tortor. Suspendisse potenti. Nam egestas orci at mi. Sed pulvinar est sit amet ante. Mauris pharetra mollis risus. Donec accumsan fermentum leo.\r\n\r\nSuspendisse potenti. Quisque tincidunt, mi viverra semper iaculis, nisl metus vehicula libero, eget tincidunt est massa ac purus. Aenean a justo. Sed ultrices, mi vitae hendrerit suscipit, mauris velit rutrum lectus, eget pharetra metus ipsum in purus. Sed placerat ornare nulla. Nullam vel leo non nulla fermentum varius. Integer nec pede a velit tempor aliquam. Sed eu neque in eros scelerisque eleifend. Vivamus id urna. Pellentesque nec nulla. Fusce et sapien. Nulla venenatis imperdiet ligula. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Proin vel nunc eu leo malesuada congue. Praesent faucibus. Vivamus quis sapien in dolor gravida vehicula.", "61fc3afdd8", "0"); # # Table structure for table 'mx_table_column' # DROP TABLE IF EXISTS `mx_table_column`; CREATE TABLE `mx_table_column` ( `column_id` smallint(5) unsigned NOT NULL auto_increment, `column_title` varchar(100), `column_order` smallint(5) unsigned NOT NULL DEFAULT '0', `bbcode_uid` varchar(10), `column_size` varchar(5) DEFAULT '100%', `page_id` smallint(5) NOT NULL DEFAULT '0', PRIMARY KEY (`column_id`), KEY cat_order (`column_order`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_column' # INSERT INTO `mx_table_column` VALUES("2", "Main", "35", NULL, "100%", "1"); INSERT INTO `mx_table_column` VALUES("6", "Main", "50", NULL, "100%", "3"); INSERT INTO `mx_table_column` VALUES("5", "Left", "40", NULL, "200", "3"); INSERT INTO `mx_table_column` VALUES("1", "Left", "25", NULL, "200", "1"); INSERT INTO `mx_table_column` VALUES("10", "Main", "50", NULL, "100%", "5"); INSERT INTO `mx_table_column` VALUES("9", "Left", "40", NULL, "200", "5"); # # Table structure for table 'mx_table_column_block' # DROP TABLE IF EXISTS `mx_table_column_block`; CREATE TABLE `mx_table_column_block` ( `column_id` smallint(5) NOT NULL DEFAULT '0', `block_id` smallint(5) NOT NULL DEFAULT '0', `block_order` smallint(5) NOT NULL DEFAULT '0', PRIMARY KEY (`column_id`,`block_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_column_block' # INSERT INTO `mx_table_column_block` VALUES("2", "19", "20"); INSERT INTO `mx_table_column_block` VALUES("2", "28", "10"); INSERT INTO `mx_table_column_block` VALUES("1", "8", "10"); INSERT INTO `mx_table_column_block` VALUES("9", "21", "10"); INSERT INTO `mx_table_column_block` VALUES("6", "4", "20"); INSERT INTO `mx_table_column_block` VALUES("5", "32", "10"); INSERT INTO `mx_table_column_block` VALUES("10", "15", "10"); # # Table structure for table 'mx_table_column_templates' # DROP TABLE IF EXISTS `mx_table_column_templates`; CREATE TABLE `mx_table_column_templates` ( `column_template_id` smallint(5) unsigned NOT NULL auto_increment, `column_title` varchar(100) DEFAULT '0', `column_order` smallint(5) unsigned NOT NULL DEFAULT '0', `column_size` varchar(5) DEFAULT '0', `page_template_id` smallint(5) NOT NULL DEFAULT '0', PRIMARY KEY (`column_template_id`), KEY cat_order (`column_order`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_column_templates' # INSERT INTO `mx_table_column_templates` VALUES("1", "Left", "40", "200", "2"); INSERT INTO `mx_table_column_templates` VALUES("2", "Main", "50", "100%", "2"); INSERT INTO `mx_table_column_templates` VALUES("3", "Main", "10", "100%", "3"); INSERT INTO `mx_table_column_templates` VALUES("4", "Right", "20", "200", "3"); INSERT INTO `mx_table_column_templates` VALUES("5", "Left", "10", "180", "4"); INSERT INTO `mx_table_column_templates` VALUES("6", "Middle", "20", "100%", "4"); INSERT INTO `mx_table_column_templates` VALUES("7", "Right", "30", "180", "4"); # # Table structure for table 'mx_table_function' # DROP TABLE IF EXISTS `mx_table_function`; CREATE TABLE `mx_table_function` ( `function_id` smallint(5) unsigned NOT NULL auto_increment, `module_id` smallint(5) unsigned NOT NULL DEFAULT '0', `function_name` varchar(150), `function_desc` text, `function_file` varchar(255), `function_admin` varchar(255), PRIMARY KEY (`function_id`), KEY module_id (`module_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_function' # INSERT INTO `mx_table_function` VALUES("51", "50", "User Navigation", "Advanced menus", "mx_menu_nav.php", ""); INSERT INTO `mx_table_function` VALUES("52", "50", "Page Navigation", "Standard Page Menus", "mx_site_nav.php", ""); INSERT INTO `mx_table_function` VALUES("6", "10", "Language Select", "Quick Language Select Block", "mx_language.php", ""); INSERT INTO `mx_table_function` VALUES("7", "10", "Login", "Login Block", "mx_login.php", ""); INSERT INTO `mx_table_function` VALUES("12", "10", "Style Select", "Quick Style Select Block", "mx_theme.php", ""); INSERT INTO `mx_table_function` VALUES("4", "10", "Google Search", "Simple Google Search Block", "mx_google.php", ""); INSERT INTO `mx_table_function` VALUES("13", "10", "Who is Online", "Who is Online Block", "mx_online.php", ""); INSERT INTO `mx_table_function` VALUES("11", "10", "Split Block", "Split columns, put blocks side by side", "mx_multiple_blocks.php", ""); INSERT INTO `mx_table_function` VALUES("24", "20", "TextBlock (phpBB)", "BBcodes, html and smilies - phpBB style", "mx_textblock_bbcode.php", ""); INSERT INTO `mx_table_function` VALUES("23", "20", "TextBlock (HTML/WYSIWYG)", "User friendly textblocks", "mx_textblock_html.php", ""); INSERT INTO `mx_table_function` VALUES("22", "20", "TextBlock (Customized)", "Textblock, featuring block defined settings", "mx_textblock_multi.php", ""); INSERT INTO `mx_table_function` VALUES("5", "10", "IncludeX", "Include Whatever", "mx_includex.php", ""); INSERT INTO `mx_table_function` VALUES("3", "10", "DynamicBlock", "SubBlocks on the same page", "mx_dynamic.php", ""); INSERT INTO `mx_table_function` VALUES("10", "10", "Site Log", "Admin Site Log monitor", "mx_site_log.php", ""); INSERT INTO `mx_table_function` VALUES("15", "10", "Site Search", "Textblock Search Block", "mx_search.php", ""); # # Table structure for table 'mx_table_menu_categories' # DROP TABLE IF EXISTS `mx_table_menu_categories`; CREATE TABLE `mx_table_menu_categories` ( `block_id` smallint(5) unsigned NOT NULL default '1', `cat_id` mediumint(8) unsigned NOT NULL auto_increment, `cat_title` varchar(100), `cat_order` mediumint(8) unsigned NOT NULL DEFAULT '0', `bbcode_uid` varchar(10), `cat_desc` text, `cat_show` tinyint(1) unsigned NOT NULL DEFAULT '0', `cat_url` smallint(5) unsigned DEFAULT '0', `cat_target` tinyint(2) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`cat_id`), KEY cat_order (`cat_order`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_menu_categories' # INSERT INTO `mx_table_menu_categories` VALUES("8", "1", "Resources", "20", "c1affc0aaa", "", "0", "0", "0"); INSERT INTO `mx_table_menu_categories` VALUES("8", "3", "Home", "10", "eab7a16ce5", "", "1", "1", "0"); INSERT INTO `mx_table_menu_categories` VALUES("32", "7", "Demo", "10", "", "", "1", "0", "0"); # # Table structure for table 'mx_table_menu_nav' # DROP TABLE IF EXISTS `mx_table_menu_nav`; CREATE TABLE `mx_table_menu_nav` ( `menu_id` smallint(5) unsigned NOT NULL auto_increment, `cat_id` mediumint(8) unsigned NOT NULL DEFAULT '0', `menu_name` varchar(150), `menu_desc` text, `menu_links` varchar(255), `auth_view` tinyint(2) NOT NULL DEFAULT '0', `menu_order` smallint(5) unsigned DEFAULT '0', `bbcode_uid` varchar(10), `menu_icon` varchar(255), `menu_alt_icon` varchar(255), `menu_alt_icon_hot` varchar(255), `function_id` smallint(5) unsigned DEFAULT '0', `block_id` smallint(8) NOT NULL DEFAULT '0', `page_id` smallint(5) unsigned DEFAULT '0', `auth_view_group` smallint(5) NOT NULL DEFAULT '0', `link_target` tinyint(2) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`menu_id`), KEY cat_id (`cat_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_menu_nav' # INSERT INTO `mx_table_menu_nav` VALUES("5", "1", "phpBB Home", "", "http://www.phpbb.com", "0", "20", "a9ff189bf5", "icon_info.gif", "", "", "0", "0", "0", "0", "1"); INSERT INTO `mx_table_menu_nav` VALUES("16", "7", "Page 1", "", "", "0", "10", "", "icon_home.gif", "", "", "0", "0", "3", "0", "0"); INSERT INTO `mx_table_menu_nav` VALUES("4", "1", "MX-Publisher Home", "", "http://www.mx-publisher.com", "0", "10", "1f171544ea", "icon_info.gif", "", "", "0", "0", "0", "0", "1"); INSERT INTO `mx_table_menu_nav` VALUES("6", "1", "Demo Page", "On this page we demonstrate a basic subpage setup with textblocks.", "", "0", "30", "", "icon_message.gif", "", "", "0", "0", "3", "0", "0"); INSERT INTO `mx_table_menu_nav` VALUES("1", "3", "Welcome to MXP", "Back to home", "", "0", "10", "", "", "", "", "0", "0", "1", "0", "0"); INSERT INTO `mx_table_menu_nav` VALUES("17", "7", "Page 2", "", "", "0", "20", "", "icon_dot.gif", "", "", "0", "30", "3", "0", "0"); INSERT INTO `mx_table_menu_nav` VALUES("18", "7", "Page 3", "", "", "0", "30", "", "icon_dot.gif", "", "", "0", "1", "3", "0", "0"); INSERT INTO `mx_table_menu_nav` VALUES("19", "7", "WYSIWYG", "", "", "0", "40", "", "icon_dot.gif", "", "", "0", "10", "3", "0", "0"); INSERT INTO `mx_table_menu_nav` VALUES("20", "7", "CUSTOM", "", "", "0", "50", "", "icon_dot.gif", "", "", "0", "9", "3", "0", "0"); # # Table structure for table 'mx_table_module' # DROP TABLE IF EXISTS `mx_table_module`; CREATE TABLE `mx_table_module` ( `module_id` smallint(5) unsigned NOT NULL auto_increment, `module_name` varchar(150), `module_path` varchar(255), `module_desc` text, `module_include_admin` char(1) DEFAULT '0', `module_version` varchar(255), `module_copy` text, PRIMARY KEY (`module_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_module' # INSERT INTO `mx_table_module` VALUES("10", "Core Blocks", "modules/mx_coreblocks/", "MX-Publisher Core Blocks", "", "MX-Publisher Core Module", "Original mxBB <i>Core Blocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">The MX-Publisher Development Team</a>"); INSERT INTO `mx_table_module` VALUES("20", "Textblocks", "modules/mx_textblocks/", "MX-Publisher Textblocks", "", "MX-Publisher Core Module", "Original mxBB <i>Textblocks</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">Jon</a>"); INSERT INTO `mx_table_module` VALUES("40", "Users and Groups", "modules/mx_users/", "MX-Publisher Users and Groups", "1", "MX-Publisher Core Module", "Based on original phpBB <i>Admin Tool MODs</i> by Adam Alkins, Omar Ramadan & wGEric :: Adapted for MX-Publisher by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">Jon</a>"); INSERT INTO `mx_table_module` VALUES("50", "Navigation Menu", "modules/mx_navmenu/", "MX-Publisher Site Navigation", "", "MX-Publisher Core Module", "Original mxBB <i>Navigation Menu</i> module by <a href=\"http://www.mx-publisher.com\" target=\"_blank\">Jon</a>"); # # Table structure for table 'mx_table_page' # DROP TABLE IF EXISTS `mx_table_page`; CREATE TABLE `mx_table_page` ( `page_id` smallint(5) NOT NULL auto_increment, `page_name` varchar(255), `page_desc` varchar(255), `page_parent` int(50) DEFAULT '0', `parents_data` mediumtext NOT NULL, `page_order` smallint(5) DEFAULT '0', `page_icon` varchar(255), `page_alt_icon` varchar(255), `menu_icon` varchar(255), `menu_alt_icon` varchar(255), `menu_alt_icon_hot` varchar(255), `menu_active` tinyint(2) DEFAULT '1', `auth_view` tinyint(2) NOT NULL DEFAULT '0', `auth_view_group` varchar(255) NOT NULL DEFAULT '0', `auth_moderator_group` varchar(255) NOT NULL DEFAULT '0', `default_style` smallint(5) NOT NULL DEFAULT '-1', `override_user_style` smallint(2) NOT NULL DEFAULT '-1', `page_header` varchar(255) DEFAULT '', `page_footer` varchar(255) DEFAULT '', `page_main_layout` varchar(255) DEFAULT '', `navigation_block` smallint(5) unsigned NOT NULL DEFAULT '0', `ip_filter` varchar(255) NOT NULL DEFAULT '', `phpbb_stats` tinyint(2) NOT NULL DEFAULT '-1', PRIMARY KEY (`page_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_page' # INSERT INTO `mx_table_page` VALUES("1", "Home", "This is the startpage", "0", "", "10", "icon_home.gif", "", "none", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); INSERT INTO `mx_table_page` VALUES("3", "Demo Page", "Block Demos", "0", "", "30", "icon_docs.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); INSERT INTO `mx_table_page` VALUES("5", "Site Search", "Site Search page", "0", "", "50", "icon_search.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); # # Table structure for table 'mx_table_page_templates' # DROP TABLE IF EXISTS `mx_table_page_templates`; CREATE TABLE `mx_table_page_templates` ( `page_template_id` smallint(3) unsigned NOT NULL auto_increment, `template_name` varchar(255) NOT NULL default '', PRIMARY KEY (`page_template_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_page_templates' # INSERT INTO `mx_table_page_templates` VALUES("1", "NONE"); INSERT INTO `mx_table_page_templates` VALUES("2", "Two-Columns left"); INSERT INTO `mx_table_page_templates` VALUES("3", "Two-Columns right"); INSERT INTO `mx_table_page_templates` VALUES("4", "Three-Columns"); # # Table structure for table 'mx_table_parameter' # DROP TABLE IF EXISTS `mx_table_parameter`; CREATE TABLE `mx_table_parameter` ( `parameter_id` smallint(5) unsigned NOT NULL auto_increment, `function_id` smallint(5) unsigned NOT NULL DEFAULT '0', `parameter_name` varchar(150), `parameter_type` varchar(30), `parameter_default` varchar(150), `parameter_function` varchar(255), `parameter_auth` tinyint(2) NOT NULL DEFAULT '0', `parameter_order` smallint(5) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`parameter_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Dumping data for table 'mx_table_parameter' # INSERT INTO `mx_table_parameter` VALUES("15", "24", "Text", "phpBBTextBlock", "Insert your text here", "", "0", "0"); INSERT INTO `mx_table_parameter` VALUES("16", "23", "Html", "WysiwygTextBlock", "Entre your Html code here", "", "0", "0"); INSERT INTO `mx_table_parameter` VALUES("50", "22", "Text", "CustomizedTextBlock", "Enter your block text here", "", "0", "0"); INSERT INTO `mx_table_parameter` VALUES("51", "22", "text_style", "Text", "none", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("52", "22", "block_style", "Boolean", "TRUE", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("53", "22", "title_style", "Boolean", "TRUE", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("91", "10", "log_filter_date", "Menu_single_select", "1 month", "a:12:{i:0;s:8:\"no limit\";i:1;s:5:\"1 day\";i:2;s:6:\"2 days\";i:3;s:6:\"3 days\";i:4;s:6:\"1 week\";i:5;s:7:\"2 weeks\";i:6;s:7:\"3 weeks\";i:7;s:7:\"1 month\";i:8;s:8:\"2 months\";i:9;s:8:\"3 months\";i:10;s:8:\"6 months\";i:11;s:6:\"1 year\";}", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("60", "11", "block_ids", "Function", "1,2,3", "get_list_multiple( \"{parameter_id}[]\", BLOCK_TABLE, \'block_id\', \'block_title\', \"{parameter_value}\", TRUE, \'block_desc\')", "0", "0"); INSERT INTO `mx_table_parameter` VALUES("61", "11", "block_sizes", "Text", "20%,30%,*", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("62", "11", "space_between", "Number", "4", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("80", "3", "default_block_id", "Function", "0", "get_list_formatted(\"block_list\",\"{parameter_value}\",\"{parameter_id}[]\")", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("70", "5", "x_mode", "Menu_single_select", "x_iframe", "a:6:{i:0;s:8:\"x_listen\";i:1;s:8:\"x_iframe\";i:2;s:10:\"x_textfile\";i:3;s:12:\"x_multimedia\";i:4;s:5:\"x_pic\";i:5;s:8:\"x_format\";}", "0", "0"); INSERT INTO `mx_table_parameter` VALUES("71", "5", "x_1", "Text", "/docs", "", "0", "0"); INSERT INTO `mx_table_parameter` VALUES("72", "5", "x_2", "Text", "325", "", "0", "0"); INSERT INTO `mx_table_parameter` VALUES("73", "5", "x_3", "Text", "", "", "0", "0"); INSERT INTO `mx_table_parameter` VALUES("66", "51", "Nav menu", "nav_menu", "", "", "0", "10"); INSERT INTO `mx_table_parameter` VALUES("93", "51", "menu_custom_tpl", "Text", "", "", "1", "20"); INSERT INTO `mx_table_parameter` VALUES("63", "51", "menu_display_mode", "Radio_single_select", "Vertical", "a:3:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";i:2;s:18:\"Overall_navigation\";}", "1", "30"); INSERT INTO `mx_table_parameter` VALUES("100", "52", "Site menu", "site_menu", "", "", "0", "10"); INSERT INTO `mx_table_parameter` VALUES("101", "52", "menu_custom_tpl", "Text", "", "", "1", "20"); INSERT INTO `mx_table_parameter` VALUES("102", "52", "menu_display_mode", "Radio_single_select", "Overall_navigation", "a:3:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";i:2;s:18:\"Overall_navigation\";}", "1", "30"); INSERT INTO `mx_table_parameter` VALUES("92", "10", "numOfEvents", "Number", "5", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("57", "22", "allow_smilies", "Boolean", "TRUE", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("54", "22", "allow_html", "Boolean", "TRUE", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("56", "22", "allow_bbcode", "Boolean", "TRUE", "", "1", "0"); INSERT INTO `mx_table_parameter` VALUES("55", "22", "html_tags", "Text", "b,i,u", "", "1", "0"); # # Table structure for table 'mx_table_portal' # DROP TABLE IF EXISTS `mx_table_portal`; CREATE TABLE `mx_table_portal` ( `portal_id` smallint(2) unsigned NOT NULL auto_increment, `portal_name` varchar(255) NOT NULL DEFAULT 'yourdomain.com', `portal_desc` varchar(255) NOT NULL DEFAULT 'A _little_ text to describe your site', `portal_status` smallint(2) unsigned NOT NULL DEFAULT '1', `disabled_message` varchar(255) NOT NULL DEFAULT 'We are currently upgrading this site with latest MX-Publisher software.', `server_name` varchar(255) NOT NULL DEFAULT 'www.myserver.tld', `script_path` varchar(255) NOT NULL DEFAULT '/', `script_protocol` varchar(255) NOT NULL DEFAULT 'http://', `server_port` varchar(255) NOT NULL DEFAULT '80', `default_dateformat` varchar(255) NOT NULL DEFAULT 'D M d, Y g:i a', `board_timezone` smallint(2) NOT NULL DEFAULT '0', `gzip_compress` smallint(2) unsigned NOT NULL DEFAULT '0', `mx_use_cache` smallint(2) unsigned NOT NULL DEFAULT '1', `mod_rewrite` smallint(2) unsigned NOT NULL DEFAULT '0', `cookie_domain` varchar(255) NOT NULL DEFAULT '', `cookie_name` varchar(255) NOT NULL DEFAULT 'mxbb30x', `cookie_path` varchar(255) NOT NULL DEFAULT '/', `cookie_secure` smallint(2) unsigned NOT NULL DEFAULT '0', `session_length` varchar(255) NOT NULL DEFAULT '3600', `allow_autologin` smallint(2) unsigned NOT NULL DEFAULT '1', `max_autologin_time` smallint(2) NOT NULL DEFAULT '0', `max_login_attempts` smallint(2) NOT NULL DEFAULT '5', `login_reset_time` varchar(255) NOT NULL DEFAULT '30', `default_lang` varchar(255) NOT NULL DEFAULT 'english', `default_style` smallint(5) NOT NULL DEFAULT '-1', `override_user_style` smallint(2) unsigned NOT NULL DEFAULT '1', `default_admin_style` smallint(5) NOT NULL DEFAULT '-1', `overall_header` varchar(255) NOT NULL DEFAULT 'overall_header_navigation.tpl', `overall_footer` varchar(255) NOT NULL DEFAULT 'overall_footer.tpl', `main_layout` varchar(255) NOT NULL DEFAULT 'mx_main_layout.tpl', `navigation_block` smallint(5) unsigned NOT NULL DEFAULT '31', `top_phpbb_links` smallint(2) unsigned NOT NULL DEFAULT '0', `allow_html` smallint(2) unsigned NOT NULL DEFAULT '1', `allow_html_tags` varchar(255) NOT NULL DEFAULT 'b,i,u,pre', `allow_bbcode` smallint(2) unsigned NOT NULL DEFAULT '1', `allow_smilies` smallint(2) unsigned NOT NULL DEFAULT '1', `smilies_path` varchar(255) NOT NULL DEFAULT 'images/smiles', `board_email` varchar(255) NOT NULL DEFAULT 'you...@yo...', `board_email_sig` varchar(255) NOT NULL DEFAULT 'Thanks, the MX-Publisher Team', `smtp_delivery` smallint(2) unsigned NOT NULL DEFAULT '0', `smtp_host` varchar(255) NOT NULL DEFAULT '', `smtp_username` varchar(255) NOT NULL DEFAULT '', `smtp_password` varchar(255) NOT NULL DEFAULT '', `smtp_auth_method` varchar(255) NOT NULL DEFAULT '', `portal_version` varchar(255) NOT NULL DEFAULT '', `portal_recached` varchar(255) NOT NULL DEFAULT '', `portal_backend` varchar(255) NOT NULL DEFAULT 'internal', `portal_backend_path` varchar(255) NOT NULL DEFAULT '', `portal_startdate` varchar(255) NOT NULL DEFAULT '0', `rand_seed` varchar(255) NOT NULL DEFAULT '0', `record_online_users` varchar(255) NOT NULL DEFAULT '0', `record_online_date` varchar(255) NOT NULL DEFAULT '0', PRIMARY KEY (`portal_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Table structure for table 'mx_table_search_results' # DROP TABLE IF EXISTS `mx_table_search_results`; CREATE TABLE `mx_table_search_results` ( `search_id` int(11) unsigned NOT NULL default '0', `session_id` varchar(32) NOT NULL default '', `search_array` text NOT NULL, PRIMARY KEY (`search_id`), KEY `session_id` (`session_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Table structure for table 'mx_table_wordlist' # DROP TABLE IF EXISTS `mx_table_wordlist`; CREATE TABLE `mx_table_wordlist` ( `word_text` varchar(50) binary NOT NULL default '', `word_id` mediumint(8) unsigned NOT NULL auto_increment, `word_common` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`word_text`), KEY `word_id` (`word_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Table structure for table 'mx_table_wordmatch' # DROP TABLE IF EXISTS `mx_table_wordmatch`; CREATE TABLE `mx_table_wordmatch` ( `block_id` mediumint(8) unsigned NOT NULL default '0', `word_id` mediumint(8) unsigned NOT NULL default '0', `title_match` tinyint(1) NOT NULL default '0', KEY `block_id` (`block_id`), KEY `word_id` (`word_id`) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Table structure for table 'mx_table_user_group' # DROP TABLE IF EXISTS `mx_table_user_group`; CREATE TABLE `mx_table_user_group` ( group_id mediumint(8) DEFAULT '0' NOT NULL, user_id mediumint(8) DEFAULT '0' NOT NULL, user_pending tinyint(1), KEY group_id (group_id), KEY user_id (user_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # # Table structure for table 'mx_table_groups' # DROP TABLE IF EXISTS `mx_table_groups`; CREATE TABLE `mx_table_groups` ( group_id mediumint(8) NOT NULL auto_increment, group_type tinyint(4) DEFAULT '1' NOT NULL, group_name varchar(40) NOT NULL, group_description varchar(255) NOT NULL, group_moderator mediumint(8) DEFAULT '0' NOT NULL, group_single_user tinyint(1) DEFAULT '1' NOT NULL, PRIMARY KEY (group_id), KEY group_single_user (group_single_user) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # -------------------------------------------------------- # # Table structure for table 'mx_table_sessions' # # Note that if you\'re running 3.23.x you may want to make # this table a type HEAP. This type of table is stored # within system memory and therefore for big busy boards # is likely to be noticeably faster than continually # writing to disk ... # DROP TABLE IF EXISTS `mx_table_sessions`; CREATE TABLE `mx_table_sessions` ( session_id char(32) DEFAULT '' NOT NULL, session_user_id mediumint(8) DEFAULT '0' NOT NULL, session_start int(11) DEFAULT '0' NOT NULL, session_time int(11) DEFAULT '0' NOT NULL, session_ip char(8) DEFAULT '0' NOT NULL, session_page int(11) DEFAULT '0' NOT NULL, session_logged_in tinyint(1) DEFAULT '0' NOT NULL, session_admin tinyint(2) DEFAULT '0' NOT NULL, PRIMARY KEY (session_id), KEY session_user_id (session_user_id), KEY session_id_ip_user_id (session_id, session_ip, session_user_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # -------------------------------------------------------- # # Table structure for table `mx_table_sessions_keys` # DROP TABLE IF EXISTS `mx_table_sessions_keys`; CREATE TABLE `mx_table_sessions_keys` ( key_id varchar(32) DEFAULT '0' NOT NULL, user_id mediumint(8) DEFAULT '0' NOT NULL, last_ip varchar(8) DEFAULT '0' NOT NULL, last_login int(11) DEFAULT '0' NOT NULL, PRIMARY KEY (key_id, user_id), KEY last_login (last_login) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # -------------------------------------------------------- # # Table structure for table 'mx_table_users' # DROP TABLE IF EXISTS `mx_table_users`; CREATE TABLE `mx_table_users` ( user_id mediumint(8) NOT NULL, user_active tinyint(1) DEFAULT '1', username varchar(25) NOT NULL, user_password varchar(32) NOT NULL, user_session_time int(11) DEFAULT '0' NOT NULL, user_session_page smallint(5) DEFAULT '0' NOT NULL, user_lastvisit int(11) DEFAULT '0' NOT NULL, user_regdate int(11) DEFAULT '0' NOT NULL, user_level tinyint(4) DEFAULT '0', user_login_tries smallint(5) UNSIGNED DEFAULT '0' NOT NULL, user_last_login_try int(11) DEFAULT '0' NOT NULL, user_email varchar(255), PRIMARY KEY (user_id), KEY user_session_time (user_session_time) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # -- Users INSERT INTO `mx_table_users` (user_id, username, user_level, user_regdate, user_password, user_email, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', 0); # -- username: admin password: admin (change this or remove it once everything is working!) INSERT INTO `mx_table_users` (user_id, username, user_level, user_regdate, user_password, user_email, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'ad...@yo...', 1); # -- Groups INSERT INTO `mx_table_groups` (group_id, group_name, group_description, group_single_user) VALUES (1, 'Anonymous', 'Personal User', 1); INSERT INTO `mx_table_groups` (group_id, group_name, group_description, group_single_user) VALUES (2, 'Admin', 'Personal User', 1); # -- User -> Group INSERT INTO `mx_table_user_group` (group_id, user_id, user_pending) VALUES (1, -1, 0); INSERT INTO `mx_table_user_group` (group_id, user_id, user_pending) VALUES (2, 2, 0); # -------------------------------------------------------- # # Table structure for table 'mx_table_themes' # DROP TABLE IF EXISTS `mx_table_themes`; CREATE TABLE `mx_table_themes` ( themes_id mediumint(8) UNSIGNED NOT NULL auto_increment, template_name varchar(30) NOT NULL default '', style_name varchar(30) NOT NULL default '', head_stylesheet varchar(100) default NULL, portal_backend varchar(30) NOT NULL default '', PRIMARY KEY (themes_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (5, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (6, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); # -------------------------------------------------------- # # Table structure for table 'mx_table_smilies' # DROP TABLE IF EXISTS `mx_table_smilies`; CREATE TABLE `mx_table_smilies` ( smilies_id smallint(5) UNSIGNED NOT NULL auto_increment, code varchar(50), smile_url varchar(100), emoticon varchar(75), PRIMARY KEY (smilies_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; # -- Smilies INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 1, ':D', 'icon_biggrin.gif', 'Very Happy'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 2, ':-D', 'icon_biggrin.gif', 'Very Happy'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 3, ':grin:', 'icon_biggrin.gif', 'Very Happy'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 4, ':)', 'icon_smile.gif', 'Smile'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 5, ':-)', 'icon_smile.gif', 'Smile'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 6, ':smile:', 'icon_smile.gif', 'Smile'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 7, ':(', 'icon_sad.gif', 'Sad'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 8, ':-(', 'icon_sad.gif', 'Sad'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 9, ':sad:', 'icon_sad.gif', 'Sad'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 10, ':o', 'icon_surprised.gif', 'Surprised'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 11, ':-o', 'icon_surprised.gif', 'Surprised'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 12, ':eek:', 'icon_surprised.gif', 'Surprised'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 13, ':shock:', 'icon_eek.gif', 'Shocked'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 14, ':?', 'icon_confused.gif', 'Confused'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 15, ':-?', 'icon_confused.gif', 'Confused'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 16, ':???:', 'icon_confused.gif', 'Confused'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 17, '8)', 'icon_cool.gif', 'Cool'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 18, '8-)', 'icon_cool.gif', 'Cool'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 19, ':cool:', 'icon_cool.gif', 'Cool'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 20, ':lol:', 'icon_lol.gif', 'Laughing'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 21, ':x', 'icon_mad.gif', 'Mad'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 22, ':-x', 'icon_mad.gif', 'Mad'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 23, ':mad:', 'icon_mad.gif', 'Mad'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 24, ':P', 'icon_razz.gif', 'Razz'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 25, ':-P', 'icon_razz.gif', 'Razz'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 26, ':razz:', 'icon_razz.gif', 'Razz'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 27, ':oops:', 'icon_redface.gif', 'Embarassed'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 28, ':cry:', 'icon_cry.gif', 'Crying or Very sad'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 29, ':evil:', 'icon_evil.gif', 'Evil or Very Mad'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 30, ':twisted:', 'icon_twisted.gif', 'Twisted Evil'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 31, ':roll:', 'icon_rolleyes.gif', 'Rolling Eyes'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 32, ':wink:', 'icon_wink.gif', 'Wink'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 33, ';)', 'icon_wink.gif', 'Wink'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 34, ';-)', 'icon_wink.gif', 'Wink'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 35, ':!:', 'icon_exclaim.gif', 'Exclamation'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 36, ':?:', 'icon_question.gif', 'Question'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 37, ':idea:', 'icon_idea.gif', 'Idea'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 38, ':arrow:', 'icon_arrow.gif', 'Arrow'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 39, ':|', 'icon_neutral.gif', 'Neutral'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 40, ':-|', 'icon_neutral.gif', 'Neutral'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 41, ':neutral:', 'icon_neutral.gif', 'Neutral'); INSERT INTO `mx_table_smilies` (smilies_id, code, smile_url, emoticon) VALUES ( 42, ':mrgreen:', 'icon_mrgreen.gif', 'Mr. Green'); # -------------------------------------------------------- # # Table structure for table 'mx_table_words' # DROP TABLE IF EXISTS `mx_table_words`; CREATE TABLE `mx_table_words` ( word_id mediumint(8) UNSIGNED NOT NULL auto_increment, word char(100) NOT NULL, replacement char(100) NOT NULL, PRIMARY KEY (word_id) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; Index: mysql_schema_upgrade_to_2.9.1.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_upgrade_to_2.9.1.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mysql_schema_upgrade_to_2.9.1.sql 9 Sep 2007 16:49:08 -0000 1.1 --- mysql_schema_upgrade_to_2.9.1.sql 30 Sep 2008 07:04:47 -0000 1.2 *************** *** 13,19 **** # -- Themes ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); ! INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); --- 13,22 ---- # -- Themes ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mx_prosilver', 'mx_prosilver', 'mx_prosilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (5, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (6, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (7, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** mysql_schema_install.sql 8 Sep 2008 19:08:24 -0000 1.57 --- mysql_schema_install.sql 30 Sep 2008 07:04:46 -0000 1.58 *************** *** 27,31 **** `block_editor_id` mediumint(8) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`block_id`) ! ) TYPE=MyISAM; --- 27,31 ---- `block_editor_id` mediumint(8) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`block_id`) ! ); *************** *** 63,71 **** `block_id` smallint(5) unsigned NOT NULL default '0', `parameter_id` smallint(5) unsigned NOT NULL default '0', ! `parameter_value` text, `parameter_opt` text, `sub_id` int(255) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`,`parameter_id`,`sub_id`) ! ) TYPE=MyISAM; --- 63,71 ---- `block_id` smallint(5) unsigned NOT NULL default '0', `parameter_id` smallint(5) unsigned NOT NULL default '0', ! `parameter_value` mediumtext, `parameter_opt` text, `sub_id` int(255) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`,`parameter_id`,`sub_id`) ! ); *************** *** 97,101 **** INSERT INTO `mx_table_block_system_parameter` VALUES("9", "57", "TRUE", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "55", "b,i,u,img", "", "0"); ! INSERT INTO `mx_table_block_system_parameter` VALUES("10", "16", "<table width=\"100%\" cellpadding=\"2\" border=\"0\"><tbody><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Mon</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- MÅNDAG -->Busy with <em>this and that</em></span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row1\"><span class=\"genmed\"><strong>Tue</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TISDAG-->Not so busy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Wen</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- ONSDAG-->Very busy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row1\"><span class=\"genmed\"><strong>Thu</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TORSDAG-->Lazy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Fri</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- FREDAG-->Resting...</span></td></tr></tbody></table><p>This basic table structure is a nice demonstration in which the wysiwyg editor comes in handy!</p><p>Try it out! <br />(to edit use the top right edit button)</p><p>Note: The wysiwyg editor is a 3rd party product (tinyMCE), and must be installed separately. Visit <a target=\"_blank\" href=\"http://www.moxiecode.com\">Moxiecode Systems AB</a> to get the software and place the \'tinymce\' folder in the root/modules/mx_shared directory. </p>", "0", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("32", "63", "Vertical", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("27", "70", "x_iframe", "", "0"); --- 97,101 ---- INSERT INTO `mx_table_block_system_parameter` VALUES("9", "57", "TRUE", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("9", "55", "b,i,u,img", "", "0"); ! INSERT INTO `mx_table_block_system_parameter` VALUES("10", "16", "<table width=\"100%\" cellpadding=\"2\" border=\"0\"><tbody><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Mon</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- MĹNDAG -->Busy with <em>this and that</em></span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row1\"><span class=\"genmed\"><strong>Tue</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TISDAG-->Not so busy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Wen</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- ONSDAG-->Very busy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row1\"><span class=\"genmed\"><strong>Thu</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TORSDAG-->Lazy</span></td></tr><tr><td valign=\"top\" align=\"left\" class=\"row2\"><span class=\"genmed\"><strong>Fri</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- FREDAG-->Resting...</span></td></tr></tbody></table><p>This basic table structure is a nice demonstration in which the wysiwyg editor comes in handy!</p><p>Try it out! <br />(to edit use the top right edit button)</p><p>Note: The wysiwyg editor is a 3rd party product (tinyMCE), and must be installed separately. Visit <a target=\"_blank\" href=\"http://www.moxiecode.com\">Moxiecode Systems AB</a> to get the software and place the \'tinymce\' folder in the root/modules/mx_shared directory. </p>", "0", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("32", "63", "Vertical", "", "0"); INSERT INTO `mx_table_block_system_parameter` VALUES("27", "70", "x_iframe", "", "0"); *************** *** 122,126 **** PRIMARY KEY (`column_id`), KEY cat_order (`column_order`) ! ) TYPE=MyISAM; --- 122,126 ---- PRIMARY KEY (`column_id`), KEY cat_order (`column_order`) ! ); *************** *** 147,151 **** `block_order` smallint(5) NOT NULL DEFAULT '0', PRIMARY KEY (`column_id`,`block_id`) ! ) TYPE=MyISAM; --- 147,151 ---- `block_order` smallint(5) NOT NULL DEFAULT '0', PRIMARY KEY (`column_id`,`block_id`) ! ); *************** *** 176,180 **** PRIMARY KEY (`column_template_id`), KEY cat_order (`column_order`) ! ) TYPE=MyISAM; --- 176,180 ---- PRIMARY KEY (`column_template_id`), KEY cat_order (`column_order`) ! ); *************** *** 206,210 **** PRIMARY KEY (`function_id`), KEY module_id (`module_id`) ! ) TYPE=MyISAM; --- 206,210 ---- PRIMARY KEY (`function_id`), KEY module_id (`module_id`) ! ); *************** *** 247,251 **** PRIMARY KEY (`cat_id`), KEY cat_order (`cat_order`) ! ) TYPE=MyISAM; --- 247,251 ---- PRIMARY KEY (`cat_id`), KEY cat_order (`cat_order`) ! ); *************** *** 283,287 **** PRIMARY KEY (`menu_id`), KEY cat_id (`cat_id`) ! ) TYPE=MyISAM; --- 283,287 ---- PRIMARY KEY (`menu_id`), KEY cat_id (`cat_id`) ! ); *************** *** 315,319 **** `module_copy` text, PRIMARY KEY (`module_id`) ! ) TYPE=MyISAM; --- 315,319 ---- `module_copy` text, PRIMARY KEY (`module_id`) ! ); *************** *** 338,342 **** `page_desc` varchar(255), `page_parent` int(50) DEFAULT '0', ! `parents_data` mediumblob NOT NULL, `page_order` smallint(5) DEFAULT '0', `page_icon` varchar(255), --- 338,342 ---- `page_desc` varchar(255), `page_parent` int(50) DEFAULT '0', ! `parents_data` mediumtext NOT NULL, `page_order` smallint(5) DEFAULT '0', `page_icon` varchar(255), *************** *** 358,362 **** `phpbb_stats` tinyint(2) NOT NULL DEFAULT '-1', PRIMARY KEY (`page_id`) ! ) TYPE=MyISAM; --- 358,362 ---- `phpbb_stats` tinyint(2) NOT NULL DEFAULT '-1', PRIMARY KEY (`page_id`) ! ); *************** *** 379,383 **** `template_name` varchar(255) NOT NULL default '', PRIMARY KEY (`page_template_id`) ! ) TYPE=MyISAM; --- 379,383 ---- `template_name` varchar(255) NOT NULL default '', PRIMARY KEY (`page_template_id`) ! ); *************** *** 407,411 **** `parameter_order` smallint(5) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`parameter_id`) ! ) TYPE=MyISAM; --- 407,411 ---- `parameter_order` smallint(5) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`parameter_id`) ! ); *************** *** 501,505 **** `record_online_date` varchar(255) NOT NULL DEFAULT '0', PRIMARY KEY (`portal_id`) ! ) TYPE=MyISAM; --- 501,505 ---- `record_online_date` varchar(255) NOT NULL DEFAULT '0', PRIMARY KEY (`portal_id`) ! ); *************** *** 515,519 **** PRIMARY KEY (`search_id`), KEY `session_id` (`session_id`) ! ) TYPE=MyISAM; --- 515,519 ---- PRIMARY KEY (`search_id`), KEY `session_id` (`session_id`) ! ); *************** *** 529,533 **** PRIMARY KEY (`word_text`), KEY `word_id` (`word_id`) ! ) TYPE=MyISAM; --- 529,533 ---- PRIMARY KEY (`word_text`), KEY `word_id` (`word_id`) ! ); *************** *** 543,547 **** KEY `block_id` (`block_id`), KEY `word_id` (`word_id`) ! ) TYPE=MyISAM; --- 543,547 ---- KEY `block_id` (`block_id`), KEY `word_id` (`word_id`) ! ); *************** *** 678,687 **** ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO `m... [truncated message content] |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:05:39
|
Update of /cvsroot/mxbb/core/includes/db In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/includes/db Modified Files: dbal.php mysql.php Log Message: rewrite for php4 and php6 issues Index: mysql.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/mysql.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mysql.php 19 Aug 2008 02:46:22 -0000 1.19 --- mysql.php 30 Sep 2008 07:04:36 -0000 1.20 *************** *** 52,56 **** $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); ! if ($this->db_connect_id && $this->dbname != '') { --- 52,56 ---- $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); ! if ($this->db_connect_id && $this->dbname != '') { *************** *** 59,63 **** // Determine what version we are using and if it natively supports UNICODE $this->mysql_version = mysql_get_server_info($this->db_connect_id); ! if (version_compare($this->mysql_version, '4.1.3', '>=')) { --- 59,63 ---- // Determine what version we are using and if it natively supports UNICODE $this->mysql_version = mysql_get_server_info($this->db_connect_id); ! if (version_compare($this->mysql_version, '4.1.3', '>=')) { *************** *** 100,105 **** } } ! ! return $this->sql_error(''); } --- 100,104 ---- } } ! return $this->sql_error(); } Index: dbal.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/db/dbal.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** dbal.php 16 Feb 2008 22:15:56 -0000 1.10 --- dbal.php 30 Sep 2008 07:04:35 -0000 1.11 *************** *** 34,41 **** var $html_hold = ''; var $sql_report = ''; ! var $cache_num_queries = 0; var $persistency = false; ! var $user = ''; var $server = ''; var $dbname = ''; --- 34,41 ---- var $html_hold = ''; var $sql_report = ''; ! var $mx_cache_num_queries = 0; var $persistency = false; ! var $mx_user = ''; var $server = ''; var $dbname = ''; *************** *** 83,87 **** * Doing some validation here. */ ! function sql_query_limit($query, $total, $offset = 0, $cache_ttl = 0) { if (empty($query)) --- 83,87 ---- * Doing some validation here. */ ! function sql_query_limit($query, $total, $offset = 0, $mx_cache_ttl = 0) { if (empty($query)) *************** *** 94,98 **** $offset = ($offset < 0) ? 0 : $offset; ! return $this->_sql_query_limit($query, $total, $offset, $cache_ttl); } --- 94,98 ---- $offset = ($offset < 0) ? 0 : $offset; ! return $this->_sql_query_limit($query, $total, $offset, $mx_cache_ttl); } *************** *** 415,434 **** function sql_error($sql = '') { ! global $mx_user; ! $error = $this->_sql_error(); if (!$this->return_on_error) { ! $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . $error['message'] . ' [' . $error['code'] . ']'; // Show complete SQL error and path to administrators only ! if ($mx_user->is_admin) { // Print out a nice backtrace... ! //$backtrace = get_backtrace(); ! $message .= ($sql) ? '<br /><br /><u>SQL</u><br /><br />' . $sql : ''; ! //$message .= ($backtrace) ? '<br /><br /><u>BACKTRACE</u><br />' . $backtrace : ''; $message .= '<br />'; } --- 415,441 ---- function sql_error($sql = '') { ! global $mx_auth, $mx_user, $board_config; ! global $phpBB3; ! // Set var to retrieve errored status ! $this->sql_error_triggered = true; ! $this->sql_error_sql = $sql; ! ! $this->sql_error_returned = $this->_sql_error(); if (!$this->return_on_error) { ! $message = 'SQL ERROR [ ' . $this->sql_layer . ' ]<br /><br />' . $this->sql_error_returned['message'] . ' [' . $this->sql_error_returned['code'] . ']'; // Show complete SQL error and path to administrators only ! // Additionally show complete error on installation or if extended debug mode is enabled ! // The DEBUG_EXTRA constant is for development only! ! if ((isset($mx_auth) && $mx_auth->acl_get('a_')) || defined('IN_INSTALL') || defined('DEBUG_EXTRA')) { // Print out a nice backtrace... ! $backtrace = $phpBB3->get_backtrace(); ! $message .= ($sql) ? '<br /><br />SQL<br /><br />' . htmlspecialchars($sql) : ''; ! $message .= ($backtrace) ? '<br /><br />BACKTRACE<br />' . $backtrace : ''; $message .= '<br />'; } *************** *** 437,447 **** // If error occurs in initiating the session we need to use a pre-defined language string // This could happen if the connection could not be established for example (then we are not able to grab the default language) ! if (!isset($mx_user->_lang['An_error_occured'])) { ! $message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persist.'; } else { ! $message .= '<br /><br />' . $mx_user->_lang['An_error_occured']; } } --- 444,461 ---- // If error occurs in initiating the session we need to use a pre-defined language string // This could happen if the connection could not be established for example (then we are not able to grab the default language) ! if (!isset($mx_user->lang['SQL_ERROR_OCCURRED'])) { ! $message .= '<br /><br />An sql error occurred while fetching this page. Please contact an administrator if this problem persists.'; } else { ! if (!empty($board_config['board_contact'])) ! { ! $message .= '<br /><br />' . sprintf($mx_user->lang['SQL_ERROR_OCCURRED'], '<a href="mailto:' . htmlspecialchars($board_config['board_contact']) . '">', '</a>'); ! } ! else ! { ! $message .= '<br /><br />' . sprintf($mx_user->lang['SQL_ERROR_OCCURRED'], '', ''); ! } } } *************** *** 452,458 **** } } ! return $error; } --- 466,487 ---- } + if (strlen($message) > 1024) + { + // We need to define $msg_long_text here to circumvent text stripping. + global $msg_long_text; + $msg_long_text = $message; + + trigger_error(false, E_USER_ERROR); + } + + trigger_error($message, E_USER_ERROR); } ! if ($this->transaction) ! { ! $this->sql_transaction('rollback'); ! } ! ! return $this->sql_error_returned; } *************** *** 462,466 **** function sql_report($mode, $query = '') { ! global $mx_cache, $mx_starttime, $phpbb_root_path, $user; if (empty($_GET['explain'])) --- 491,495 ---- function sql_report($mode, $query = '') { ! global $mx_cache, $mx_starttime, $phpbb_root_path, $mx_user, $mx_root_path; if (empty($_GET['explain'])) *************** *** 473,477 **** $query = $this->query_hold; } ! switch ($mode) { --- 502,506 ---- $query = $this->query_hold; } ! switch ($mode) { *************** *** 486,528 **** $totaltime = $mtime[0] + $mtime[1] - $mx_starttime; ! echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'; ! echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">'; ! echo '<head>'; ! echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'; ! echo '<title>SQL Report</title>'; ! echo '<link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />'; ! echo '<link href="' . $phpbb_root_path . 'adm/style/sql_report.css" rel="stylesheet" type="text/css" media="screen" />'; ! echo '</head>'; ! echo '<body id="errorpage">'; ! echo '<div id="wrap">'; ! echo ' <div id="page-header">'; ! echo ' <a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '">Return to previous page</a>'; ! echo ' </div>'; ! echo ' <div id="page-body">'; ! echo ' <div class="panel">'; ! echo ' <span class="corners-top"><span></span></span>'; ! echo ' <div id="content">'; ! echo ' <h1>SQL Report</h1>'; ! echo ' <table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr> ! <td height="40" align="center" valign="middle"><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries} queries" . (($this->cache_num_queries) ? " + {$this->cache_num_queries} " . (($this->cache_num_queries == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></td> ! </tr><tr> ! <td align="center" nowrap="nowrap">Time spent on MySQL queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></td> ! </tr></table> ! <table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr> ! <td>' . $this->sql_report . '</td> ! </tr></table>'; ! echo ' </div>'; ! echo ' <span class="corners-bottom"><span></span></span>'; ! echo ' </div>'; ! echo ' </div>'; ! echo ' <div id="page-footer">'; ! echo ' Powered by phpBB © ' . date('Y') . ' <a href="http://www.phpbb.com/">phpBB Group</a>'; ! echo ' </div>'; ! echo '</div>'; ! echo '</body>'; ! echo '</html>'; ! exit; ! break; case 'stop': --- 515,560 ---- $totaltime = $mtime[0] + $mtime[1] - $mx_starttime; ! echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr"> ! <head> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> ! <meta http-equiv="Content-Style-Type" content="text/css" /> ! <meta http-equiv="imagetoolbar" content="no" /> ! <title>SQL Report</title> ! <link href="' . $mx_root_path . 'templates/prosilver/admin/admin.css" rel="stylesheet" type="text/css" media="screen" /> ! </head> ! <body id="errorpage"> ! <div id="wrap"> ! <div id="page-header"> ! <a href="' . build_url('explain') . '">Return to previous page</a> ! </div> ! <div id="page-body"> ! <div id="acp"> ! <div class="panel"> ! <span class="corners-top"><span></span></span> ! <div id="content"> ! <h1>SQL Report</h1> ! <br /> ! <p><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries['normal']} queries" . (($this->num_queries['cached']) ? " + {$this->num_queries['cached']} " . (($this->num_queries['cached'] == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></p> ! <p>Time spent on ' . $this->sql_layer . ' queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p> ! ! <br /><br /> ! ' . $this->sql_report . ' ! </div> ! <span class="corners-bottom"><span></span></span> ! </div> ! </div> ! </div> ! <div id="page-footer"> ! Powered by phpBB © 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a> ! </div> ! </div> ! </body> ! </html>'; ! ! exit_handler(); ! ! break; case 'stop': *************** *** 531,545 **** $this->sql_report .= ' - <hr width="100%"/><br /> ! <table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"> <tr> ! <th>Query #' . $this->num_queries . '</th> </tr> <tr> ! <td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td> </tr> ! </table> ' . $this->html_hold . ' ! <p align="center"> '; --- 563,583 ---- $this->sql_report .= ' ! <table cellspacing="1"> ! <thead> <tr> ! <th>Query #' . $this->num_queries['total'] . '</th> </tr> + </thead> + <tbody> <tr> ! <td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td> </tr> ! </tbody> ! </table> ! ! ' . $this->html_hold . ' ! ! <p style="text-align: center;"> '; *************** *** 555,562 **** { $error = $this->sql_error(); ! $this->sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); } ! $this->sql_report .= '</p>'; $this->sql_time += $endtime - $this->curtime; --- 593,600 ---- { $error = $this->sql_error(); ! $this->sql_report .= '<b style="color: red">FAILED</b> - ' . $this->sql_layer . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); } ! $this->sql_report .= '</p><br /><br />'; $this->sql_time += $endtime - $this->curtime; *************** *** 566,570 **** $this->query_hold = $query; $this->html_hold = ''; ! $this->_sql_report($mode, $query); --- 604,608 ---- $this->query_hold = $query; $this->html_hold = ''; ! $this->_sql_report($mode, $query); *************** *** 573,590 **** break; ! case 'add_select_row': $html_table = func_get_arg(2); $row = func_get_arg(3); ! if (!$html_table && sizeof($row)) { $html_table = true; ! $this->html_hold .= '<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"><tr>'; ! foreach (array_keys($row) as $val) { ! $this->html_hold .= '<th nowrap="nowrap">' . (($val) ? ucwords(str_replace('_', ' ', $val)) : ' ') . '</th>'; } $this->html_hold .= '</tr>'; --- 611,628 ---- break; ! case 'add_select_row': $html_table = func_get_arg(2); $row = func_get_arg(3); ! if (!$html_table && sizeof($row)) { $html_table = true; ! $this->html_hold .= '<table cellspacing="1"><tr>'; ! foreach (array_keys($row) as $val) { ! $this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : ' ') . '</th>'; } $this->html_hold .= '</tr>'; *************** *** 599,603 **** } $this->html_hold .= '</tr>'; ! return $html_table; --- 637,641 ---- } $this->html_hold .= '</tr>'; ! return $html_table; *************** *** 608,613 **** $this->_sql_report($mode, $query); - $this->cache_num_queries++; - break; --- 646,649 ---- *************** *** 621,626 **** $color = ($time_db > $time_cache) ? 'green' : 'red'; ! $this->sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query results obtained from the cache</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table><p align="center">'; ! $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $mx_starttime) . 's | After: ' . sprintf('%.5f', $endtime - $mx_starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p>'; // Pad the start time to not interfere with page timing --- 657,664 ---- $color = ($time_db > $time_cache) ? 'green' : 'red'; ! $this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>'; ! $this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>'; ! $this->sql_report .= '<p style="text-align: center;">'; ! $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $mx_starttime) . 's | After: ' . sprintf('%.5f', $endtime - $mx_starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />'; // Pad the start time to not interfere with page timing *************** *** 630,634 **** default: ! $this->_sql_report($mode, $query); --- 668,672 ---- default: ! $this->_sql_report($mode, $query); |
|
From: FlorinCB <ory...@us...> - 2008-09-30 07:05:38
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26368/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: rewrite for php4 and php6 issues Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mx_module_defs.php 19 Sep 2008 06:04:55 -0000 1.38 --- mx_module_defs.php 30 Sep 2008 07:04:50 -0000 1.39 *************** *** 289,293 **** 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'U_PORTAL_ROOT_PATH' => PORTAL_URL, // DIV Templates. Images from root template folder. phpbb3::prosilver template 'L_CREATE_MENU' => $lang['Create_menu'], --- 289,293 ---- 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'U_PORTAL_ROOT_PATH' => PORTAL_URL, // DIV Templates. Images from root template folder. $phpBB3->prosilver template 'L_CREATE_MENU' => $lang['Create_menu'], |
2 messages has been excluded from this view by a project administrator.
