Menu
▾
▴
[mxbb-commits] mx_blogs Weblogs.pak, 1.1, 1.2 weblog.php, 1.2, 1.3 weblog_allentries.php, 1.1, 1.2 weblog_config.php, 1.2, 1.3 weblog_entry.php, 1.1, 1.2 weblog_posting.php, 1.1, 1.2 weblog_rss.php, 1.1, 1.2 weblogs.php, 1.3, 1.4
Update of /cvsroot/mxbb/mx_blogs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23056 Modified Files: Weblogs.pak weblog.php weblog_allentries.php weblog_config.php weblog_entry.php weblog_posting.php weblog_rss.php weblogs.php Log Message: finished porting this to 2.8.1 here porting should continue :D Index: weblog_posting.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_posting.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblog_posting.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_posting.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 32,36 **** include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } ! $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; if (!defined('PHPBB_URL')) { --- 32,36 ---- include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } ! //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; if (!defined('PHPBB_URL')) { *************** *** 1112,1116 **** if ( $smilies_on ) { ! $preview_message = smilies_pass($preview_message); } } --- 1112,1116 ---- if ( $smilies_on ) { ! $preview_message = mx_smilies_pass($preview_message); } } *************** *** 1330,1334 **** if ( $entry_data['enable_smilies'] ) { ! $entry_message = smilies_pass($entry_message); } } --- 1330,1334 ---- if ( $entry_data['enable_smilies'] ) { ! $entry_message = mx_smilies_pass($entry_message); } } *************** *** 1424,1428 **** if ( $reply_data[$i]['enable_smilies'] ) { ! $reply_message = smilies_pass($reply_message); } } --- 1424,1428 ---- if ( $reply_data[$i]['enable_smilies'] ) { ! $reply_message = mx_smilies_pass($reply_message); } } Index: weblog_entry.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_entry.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblog_entry.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_entry.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 22,32 **** define('IN_PHPBB', true); define('IN_PORTAL', true); - //$phpbb_root_path = './'; $mx_root_path = '../../'; $module_root_path = './'; - //include($phpbb_root_path . 'extension.inc'); - //include($phpbb_root_path . 'common.'.$phpEx); - //include($phpbb_root_path . 'includes/bbcode.'.$phpEx); - //include($mx_root_path . 'extension.inc'); $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); --- 22,27 ---- *************** *** 35,47 **** // Start session management // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! init_userprefs($userdata); // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'. $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; // // Start initial var setup --- 30,41 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; // // Start initial var setup *************** *** 403,408 **** if ( $entry_data['enable_smilies'] ) { ! ! $message = smilies_pass($message); } } --- 397,401 ---- if ( $entry_data['enable_smilies'] ) { ! $message = mx_smilies_pass($message); } } *************** *** 849,858 **** if ( $reply_data[$i]['user_allowsmile'] && $user_sig != '' ) { ! $user_sig = smilies_pass($user_sig); } if ( $reply_data[$i]['enable_smilies'] ) { ! $message = smilies_pass($message); } } --- 842,851 ---- if ( $reply_data[$i]['user_allowsmile'] && $user_sig != '' ) { ! $user_sig = mx_smilies_pass($user_sig); } if ( $reply_data[$i]['enable_smilies'] ) { ! $message = mx_smilies_pass($message); } } Index: weblog_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_config.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weblog_config.php 28 Jun 2007 18:04:21 -0000 1.2 --- weblog_config.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 20,57 **** ***************************************************************************/ ! define('IN_PHPBB', true); ! //$phpbb_root_path = './'; ! //include($phpbb_root_path . 'extension.inc'); ! //include($phpbb_root_path . 'common.'.$phpEx); ! //include($phpbb_root_path . 'includes/bbcode.'.$phpEx); ! //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.'.$phpEx); if (!function_exists('prepare_message')) { ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } if (!function_exists('smilies_pass')) { ! include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); } ! // ! // Start session management ! // ! //$userdata = session_pagestart($user_ip, PAGE_INDEX); ! //init_userprefs($userdata); ! $mx_user->init($user_ip, PAGE_INDEX); ! // ! // End session management ! // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); - // - // Include the Header - // - $page_title = $lang['Weblog_CP']; - include($mx_root_path . 'includes/page_header.'.$phpEx); // Check to see if the user is allowed to have a weblog. --- 20,52 ---- ***************************************************************************/ ! // ! // ERROR HANDLING ! // ! //error_reporting( E_ALL ); ! @ini_set( 'display_errors', '1' ); ! ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! die("Hacking attempt"); ! } ! else ! { ! define( 'MXBB_MODULE', true ); ! ! $is_block = TRUE; ! } ! if (!function_exists('prepare_message')) { ! @include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } if (!function_exists('smilies_pass')) { ! @include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); } ! ! //include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); // Check to see if the user is allowed to have a weblog. *************** *** 154,158 **** $template->set_filenames(array( ! "body" => $module_root_path . "templates/subSilver/weblog_cp_body.tpl") ); --- 149,153 ---- $template->set_filenames(array( ! "body" => "weblog_cp_body.tpl") ); *************** *** 167,174 **** if ( !$weblog_exists ) { ! $template_dir = get_template_dir ( $template_data[0]['template_id'] ); // if ( @file_exists($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) ! if ( @file_exists($module_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) { // include($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg"); --- 162,169 ---- if ( !$weblog_exists ) { ! $template_dir = get_template_dir($template_data[0]['template_id']); // if ( @file_exists($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) ! if ( @file_exists($module_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) { // include($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg"); *************** *** 261,265 **** $custom_block = ( isset($HTTP_POST_VARS['custom_block']) ) ? trim($HTTP_POST_VARS['custom_block']) : $custom_block; ! $template_dir = get_template_dir ( $weblog_template ); // --- 256,260 ---- $custom_block = ( isset($HTTP_POST_VARS['custom_block']) ) ? trim($HTTP_POST_VARS['custom_block']) : $custom_block; ! $template_dir = get_template_dir( $weblog_template ); // *************** *** 327,334 **** if ( !empty($error_msg) ) { ! mx_message_die (GENERAL_ERROR, $lang['Errors_occured'] . $error_msg); } ! $template_dir = get_template_dir ($weblog_template); if ( isset($HTTP_POST_VARS['create']) ) --- 322,329 ---- if ( !empty($error_msg) ) { ! mx_message_die(GENERAL_ERROR, $lang['Errors_occured'] . $error_msg); } ! $template_dir = get_template_dir($weblog_template); if ( isset($HTTP_POST_VARS['create']) ) *************** *** 530,534 **** ! $message = sprintf($lang['Weblog_created'], '<a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog.$phpEx?" . POST_WEBLOG_URL . "=" . ($maximum+1)) . '">', '</a>', '<a href="' . append_sid($mx_root_path . "index$phpEx?page=" . $weblog_config['mx_weblog_config_page']) . '">', '</a>'); } else --- 525,529 ---- ! $message = sprintf($lang['Weblog_created'], '<a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog.$phpEx?" . POST_WEBLOG_URL . "=" . ($maximum+1)) . '">', '</a>', '<a href="' . append_sid($mx_root_path . "index.$phpEx?page=" . $weblog_config['mx_weblog_config_page']) . '">', '</a>'); } else *************** *** 904,908 **** 'L_TITLE' => $lang['Title'], 'L_SHOW_ENABLE_SHOUTBOX' => $lang['Show_enable_shoutbox'], ! 'L_SHOW_ENABLE_CATEGORYBOX' => $lang['Show_enable_categorybox'], 'L_SHOUTBOX_DESC' => $lang['Shoutbox_desc'], 'L_ASCENDING' => $lang['Sort_Ascending'], --- 899,903 ---- 'L_TITLE' => $lang['Title'], 'L_SHOW_ENABLE_SHOUTBOX' => $lang['Show_enable_shoutbox'], ! 'L_SHOW_ENABLE_CATEGORYBOX' => $lang['Show_enable_categorybox'], 'L_SHOUTBOX_DESC' => $lang['Shoutbox_desc'], 'L_ASCENDING' => $lang['Sort_Ascending'], *************** *** 978,983 **** 'SHOW_SHOUTBOX_YES' => ( $weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', 'SHOW_SHOUTBOX_NO' => ( !$weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_YES' => ( $weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_NO' => ( !$weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', 'REPLY_IN_POPUP_YES' => ( $weblog_data['reply_in_popup'] ) ? ' checked="checked"' : '', --- 973,978 ---- 'SHOW_SHOUTBOX_YES' => ( $weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', 'SHOW_SHOUTBOX_NO' => ( !$weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_YES' => ( $weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_NO' => ( !$weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', 'REPLY_IN_POPUP_YES' => ( $weblog_data['reply_in_popup'] ) ? ' checked="checked"' : '', *************** *** 985,994 **** 'SHOUTBOX_DESC' => ( $weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', 'SHOUTBOX_ASC' => ( !$weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', ! 'PREVIEW_IMG' => ( $weblog_exists ) ? $mx_root_path . 'modules/mx_blogs/weblogs/templates/' . get_template_dir ($template_id) . '/preview_img.gif' : 'weblogs/templates/' . $template_data[0]['template_dir'] . '/preview_img.gif', 'DELETE_NAME' => ( $weblog_data['deleted'] ) ? 'undelete' : 'delete', 'L_DELETE_WEBLOG' => ( $weblog_data['deleted'] ) ? $lang['Weblog_undelete'] : $lang['Weblog_delete'], ! 'MX_ROOT' => $mx_root_path, 'MOOD_SET_PREVIEW' => $preview_mood, 'SWITCH_RADIO' => ( $userdata['user_allowadvweblog'] ) ? '<input type="radio" id="action_switch_mode" name="weblog_action" value="2" />' : '', --- 980,989 ---- 'SHOUTBOX_DESC' => ( $weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', 'SHOUTBOX_ASC' => ( !$weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', ! 'PREVIEW_IMG' => $module_root_path . 'weblogs/templates/' . get_template_dir($template_data[0]['template_id']) . '/preview_img.gif', 'DELETE_NAME' => ( $weblog_data['deleted'] ) ? 'undelete' : 'delete', 'L_DELETE_WEBLOG' => ( $weblog_data['deleted'] ) ? $lang['Weblog_undelete'] : $lang['Weblog_delete'], ! 'MX_ROOT' => $mx_root_path, 'MOOD_SET_PREVIEW' => $preview_mood, 'SWITCH_RADIO' => ( $userdata['user_allowadvweblog'] ) ? '<input type="radio" id="action_switch_mode" name="weblog_action" value="2" />' : '', *************** *** 1003,1014 **** ); - $template->pparse("body"); - $template->assign_vars(array( 'L_POWERED_BY' => sprintf($lang['Weblog_powered_by'], WEBLOGS_MOD_VERSION)) ); ! //include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ! include($mx_root_path . 'includes/page_tail.'.$phpEx); ?> --- 998,1008 ---- ); $template->assign_vars(array( 'L_POWERED_BY' => sprintf($lang['Weblog_powered_by'], WEBLOGS_MOD_VERSION)) ); ! $template->pparse("body"); ! ! //include($mx_root_path . 'includes/page_tail.'.$phpEx); ?> Index: weblogs.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblogs.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** weblogs.php 28 Jun 2007 18:04:21 -0000 1.3 --- weblogs.php 31 Jan 2008 03:36:34 -0000 1.4 *************** *** 10,44 **** ***************************************************************************/ ! define('IN_PHPBB', true); ! define('IN_PORTAL', true); ! //$phpbb_root_path = './'; ! //include($phpbb_root_path . 'extension.inc'); ! //include($phpbb_root_path . 'common.'.$phpEx); ! //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.'.$phpEx); ! ! if( is_object($mx_block)) { ! $is_block = TRUE; } ! // ! // Start session management ! // ! //$userdata = session_pagestart($user_ip, PAGE_INDEX); ! //init_userprefs($userdata); ! ! $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); - include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); - // // Begin initial var setup --- 10,32 ---- ***************************************************************************/ + // + // ERROR HANDLING + // + //error_reporting( E_ALL ); + @ini_set( 'display_errors', '1' ); ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { ! die("Hacking attempt"); } + else + { + define( 'MXBB_MODULE', true ); ! $is_block = TRUE; ! } include($module_root_path . 'includes/weblogs_common.'.$phpEx); // // Begin initial var setup *************** *** 93,107 **** // - // End initial var setup - // - - // - // Start page proper - // - $page_title = $lang['Weblog_index']; - - include($mx_root_path . 'includes/page_header.'.$phpEx); - - // // Get the moods data // --- 81,84 ---- *************** *** 165,169 **** { $template->set_filenames(array( ! 'user' =>$module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 142,146 ---- { $template->set_filenames(array( ! 'user' => 'weblog_faceplate_body.tpl') ); } *************** *** 183,187 **** // Otherwise show a default face image. $template->set_filenames(array( ! 'user' => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 160,164 ---- // Otherwise show a default face image. $template->set_filenames(array( ! 'user' => 'weblog_faceplate_body.tpl') ); } *************** *** 189,193 **** else { ! $template_dir = get_template_dir ($user_weblog_data['template_id']); $template->set_filenames(array( --- 166,170 ---- else { ! $template_dir = get_template_dir($user_weblog_data['template_id']); $template->set_filenames(array( *************** *** 263,267 **** $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="' . $phpbb_root_path . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; --- 240,244 ---- $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; *************** *** 430,434 **** { $template->set_filenames(array( ! 'top' => $module_root_path . 'templates/subSilver/weblog_index_top.tpl') ); } --- 407,411 ---- { $template->set_filenames(array( ! 'top' => 'weblog_index_top.tpl') ); } *************** *** 436,440 **** { $template->set_filenames(array( ! 'top' => $module_root_path . 'templates/subSilver/weblog_index_top_small.tpl') ); } --- 413,417 ---- { $template->set_filenames(array( ! 'top' => 'weblog_index_top_small.tpl') ); } *************** *** 498,502 **** { $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_small_body.tpl') ); } --- 475,479 ---- { $template->set_filenames(array( ! $i => 'weblog_faceplate_small_body.tpl') ); } *************** *** 504,508 **** { $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 481,485 ---- { $template->set_filenames(array( ! $i => 'weblog_faceplate_body.tpl') ); } *************** *** 522,526 **** // Otherwise use a default faceplate. $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 499,503 ---- // Otherwise use a default faceplate. $template->set_filenames(array( ! $i => 'weblog_faceplate_body.tpl') ); } *************** *** 587,591 **** $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="'. $phpbb_root_path . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; --- 564,568 ---- $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="'. $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; *************** *** 678,682 **** $template->set_filenames(array( ! 'bottom' => $module_root_path . 'templates/subSilver/weblog_index_bottom.tpl') ); --- 655,659 ---- $template->set_filenames(array( ! 'bottom' => 'weblog_index_bottom.tpl') ); *************** *** 690,695 **** $template->pparse('bottom'); - //echo $mx_root_path ; - include($mx_root_path . 'includes/page_tail.'.$phpEx); - ?> --- 667,669 ---- Index: weblog.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weblog.php 20 Jun 2007 19:18:50 -0000 1.2 --- weblog.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 49,57 **** // End session management // - //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); - include($module_root_path . 'includes/weblogs_constants.'. $phpEx); - include($module_root_path . 'includes/weblogs_common.'.$phpEx); - $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; --- 49,55 ---- // End session management // + include($module_root_path . 'includes/weblogs_common.'.$phpEx); + //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; *************** *** 723,727 **** if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = smilies_pass($entry_data[$i]['entry_text']); } } --- 721,725 ---- if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = mx_smilies_pass($entry_data[$i]['entry_text']); } } *************** *** 1040,1044 **** if ( $board_config['allow_smilies'] ) { ! $message = smilies_pass($message); } --- 1038,1042 ---- if ( $board_config['allow_smilies'] ) { ! $message = mx_smilies_pass($message); } Index: weblog_allentries.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_allentries.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblog_allentries.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_allentries.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 35,46 **** //$userdata = session_pagestart($user_ip, PAGE_INDEX); //init_userprefs($userdata); - $mx_user->init($user_ip, PAGE_INDEX); - // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'. $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); --- 35,44 ---- //$userdata = session_pagestart($user_ip, PAGE_INDEX); //init_userprefs($userdata); $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); *************** *** 85,94 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain weblog information.", "", __LINE__, __FILE__, $sql); } } else { ! message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } --- 83,92 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain weblog information.", "", __LINE__, __FILE__, $sql); } } else { ! mx_message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } *************** *** 103,112 **** else { ! message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } if ( $weblog_data['deleted'] ) { ! message_die(GENERAL_ERROR, sprintf($lang['Weblog_deactivated'], $weblog_data['weblog_name'])); } --- 101,110 ---- else { ! mx_message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } if ( $weblog_data['deleted'] ) { ! mx_message_die(GENERAL_ERROR, sprintf($lang['Weblog_deactivated'], $weblog_data['weblog_name'])); } *************** *** 118,122 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't get weblog owner information.", "", __LINE__, __FILE__, $sql); } --- 116,120 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get weblog owner information.", "", __LINE__, __FILE__, $sql); } *************** *** 162,166 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain limited entries count information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 160,164 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain limited entries count information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 202,206 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't get template directory information.", "", __LINE__, __FILE__, $sql); } --- 200,204 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get template directory information.", "", __LINE__, __FILE__, $sql); } *************** *** 274,278 **** if(!($result = $db->sql_query($sql))) { ! message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } --- 272,276 ---- if(!($result = $db->sql_query($sql))) { ! mx_message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } *************** *** 296,300 **** if(!($result = $db->sql_query($sql))) { ! message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } --- 294,298 ---- if(!($result = $db->sql_query($sql))) { ! mx_message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } *************** *** 313,317 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain mood data from database", "", __LINE__, __FILE__, $sql); } $mood_data = $db->sql_fetchrowset($result); --- 311,315 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain mood data from database", "", __LINE__, __FILE__, $sql); } $mood_data = $db->sql_fetchrowset($result); *************** *** 325,329 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); --- 323,327 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); Index: weblog_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_rss.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblog_rss.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_rss.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 32,48 **** // - // Get all the data - // - - // // Start session management // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! init_userprefs($userdata); // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); --- 32,42 ---- // // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); *************** *** 215,219 **** if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = smilies_pass($entry_data[$i]['entry_text']); } --- 209,213 ---- if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = mx_smilies_pass($entry_data[$i]['entry_text']); } Index: Weblogs.pak =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/Weblogs.pak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Weblogs.pak 7 Jun 2007 22:01:31 -0000 1.1 --- Weblogs.pak 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 1,5 **** ! module=+:71=+:MX Weblog=+:modules/mx_blogs/=+:Mx Weblog=+:1 ! function=+:71=+:57=+:Weblog List=+:Weblog List Block=+:weblogs.php=+: ! block=+:55=+:Weblog List=+:=+:57=+:0=+:0=+:0 ! function=+:71=+:59=+:Weblog Config=+:Weblog Config Block=+:weblog_config.php=+: ! block=+:54=+:Weblog Config=+:=+:59=+:0=+:0=+:0 --- 1,10 ---- ! module=+:87=+:MX Weblog=+:modules/mx_blogs/=+:Mx Weblog=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:87=+:96=+:Weblog List=+:Weblog List Block=+:weblogs.php=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Weblog List=+:Demo block=+:96=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:87=+:97=+:Weblog Config=+:Weblog Config Block=+:weblog_config.php=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Weblog Config=+:Demo block=+:97=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 \ No newline at end of file |
