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
|
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-25 02:52:24
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26951/includes Modified Files: page_header.php page_tail.php Log Message: Security updates round... most code implemented from phpBB 2.0.18. Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** page_header.php 2 Oct 2005 21:24:30 -0000 1.25 --- page_header.php 25 Nov 2005 02:52:16 -0000 1.26 *************** *** 513,516 **** --- 513,525 ---- { $layouttemplate->assign_block_vars('switch_user_logged_out', array()); + + // + // Allow autologin? + // + if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] ) + { + $layouttemplate->assign_block_vars('switch_allow_autologin', array()); + $layouttemplate->assign_block_vars('switch_user_logged_out.switch_allow_autologin', array()); + } } else Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** page_tail.php 1 Oct 2005 14:10:45 -0000 1.17 --- page_tail.php 25 Nov 2005 02:52:16 -0000 1.18 *************** *** 24,27 **** --- 24,29 ---- } + global $do_gzip_compress; + // // Show the overall footer. *************** *** 62,66 **** 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', ! 'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '', 'ADMIN_LINK' => $admin_link) ); --- 64,68 ---- 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', ! 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), 'ADMIN_LINK' => $admin_link) ); |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-25 02:52:24
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26951 Modified Files: common.php login.php Log Message: Security updates round... most code implemented from phpBB 2.0.18. Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** login.php 1 Oct 2005 14:10:44 -0000 1.12 --- login.php 25 Nov 2005 02:52:16 -0000 1.13 *************** *** 129,133 **** } else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) ! { if( $userdata['session_logged_in'] ) { --- 129,139 ---- } else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) ! { ! // session id check ! if ($sid == '' || $sid != $userdata['session_id']) ! { ! mx_message_die(GENERAL_ERROR, 'Invalid_session'); ! } ! if( $userdata['session_logged_in'] ) { *************** *** 167,170 **** --- 173,178 ---- ); + $forward_page = ''; + if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) ) { *************** *** 178,183 **** if(count($forward_match) > 1) { - $forward_page = ''; - for($i = 1; $i < count($forward_match); $i++) { --- 186,189 ---- *************** *** 199,206 **** } } - else - { - $forward_page = ''; - } $username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : ''; --- 205,208 ---- *************** *** 209,213 **** $s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '<input type="hidden" name="admin" value="1" />' : ''; ! make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx, $forum_id); $layouttemplate->assign_vars(array( 'USERNAME' => $username, --- 211,215 ---- $s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '<input type="hidden" name="admin" value="1" />' : ''; ! make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx); $layouttemplate->assign_vars(array( 'USERNAME' => $username, Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** common.php 15 Oct 2005 22:12:17 -0000 1.41 --- common.php 25 Nov 2005 02:52:16 -0000 1.42 *************** *** 27,41 **** // ================================================================================ ! // The following code is based on common.php from phpBB 2.0.14 // ================================================================================ - // error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables set_magic_quotes_runtime(0); // Disable magic_quotes_runtime ! // The following code (unsetting globals) was contributed by Matt Kavanagh // PHP5 with register_long_arrays off? ! if (!isset($HTTP_POST_VARS) && isset($_POST)) { $HTTP_POST_VARS = $_POST; --- 27,41 ---- // ================================================================================ ! // The following code is based on common.php from phpBB 2.0.18 // ================================================================================ error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables set_magic_quotes_runtime(0); // Disable magic_quotes_runtime ! // The following code (unsetting globals) ! // Thanks to Matt Kavanagh and Stefan Esser for providing feedback as well as patch files // PHP5 with register_long_arrays off? ! if (@phpversion() >= '5.0.0' && (!ini_get('register_long_arrays') || @ini_get('register_long_arrays') == '0' || strtolower(@ini_get('register_long_arrays')) == 'off')) { $HTTP_POST_VARS = $_POST; *************** *** 53,82 **** } ! if (@phpversion() < '4.0.0') { ! // PHP3 path; in PHP3, globals are _always_ registered ! ! // We 'flip' the array of variables to test like this so that ! // we can validate later with isset($test[$var]) (no in_array()) ! $test = array('HTTP_GET_VARS' => NULL, 'HTTP_POST_VARS' => NULL, 'HTTP_COOKIE_VARS' => NULL, 'HTTP_SERVER_VARS' => NULL, 'HTTP_ENV_VARS' => NULL, 'HTTP_POST_FILES' => NULL, 'phpEx' => NULL, 'phpbb_root_path' => NULL); ! //+MOD: Added by mxBB ! $test['mx_root_path'] = NULL; ! //-MOD: Added by mxBB ! // Loop through each input array ! @reset($test); ! while (list($input,) = @each($test)) ! { ! while (list($var,) = @each($$input)) ! { ! // Validate the variable to be unset ! if (!isset($test[$var]) && $var != 'test' && $var != 'input') ! { ! unset($$var); ! } ! } ! } } ! else if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path --- 53,69 ---- } ! // Protect against GLOBALS tricks ! if (isset($HTTP_POST_VARS['GLOBALS']) || isset($HTTP_POST_FILES['GLOBALS']) || isset($HTTP_GET_VARS['GLOBALS']) || isset($HTTP_COOKIE_VARS['GLOBALS'])) { ! die("Hacking attempt"); ! } ! // Protect against HTTP_SESSION_VARS tricks ! if (isset($HTTP_SESSION_VARS) && !is_array($HTTP_SESSION_VARS)) ! { ! die("Hacking attempt"); } ! ! if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path *************** *** 89,93 **** // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. ! if (!isset($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = array(); --- 76,80 ---- // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. ! if (!isset($HTTP_SESSION_VARS) || !is_array($HTTP_SESSION_VARS)) { $HTTP_SESSION_VARS = array(); *************** *** 100,104 **** unset($input['input']); unset($input['not_unset']); ! while (list($var,) = @each($input)) { --- 87,91 ---- unset($input['input']); unset($input['not_unset']); ! while (list($var,) = @each($input)) { *************** *** 108,112 **** } } ! unset($input); } --- 95,99 ---- } } ! unset($input); } *************** *** 198,202 **** if( !defined('MX_INSTALLED') ) { ! header("Location: install/mx_install.$phpEx"); exit; } --- 185,189 ---- if( !defined('MX_INSTALLED') ) { ! header("Location: " . $mx_root_path . "install/mx_install.$phpEx"); exit; } *************** *** 209,212 **** --- 196,201 ---- include_once($phpbb_root_path . 'includes/functions.' . $phpEx); include_once($phpbb_root_path . 'includes/db.' . $phpEx); + // We do not need this any longer, unset for safety purposes + unset($dbpasswd); include_once($phpbb_root_path . 'includes/functions_selects.' . $phpEx); include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-25 02:52:24
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26951/admin Modified Files: page_footer_admin.php Log Message: Security updates round... most code implemented from phpBB 2.0.18. Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_footer_admin.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** page_footer_admin.php 1 Oct 2005 14:10:44 -0000 1.8 --- page_footer_admin.php 25 Nov 2005 02:52:16 -0000 1.9 *************** *** 24,27 **** --- 24,29 ---- } + global $do_gzip_compress; + // // Show the overall footer. *************** *** 42,46 **** 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', ! 'TRANSLATION_INFO' => isset($lang['TRANSLATION_INFO']) ? $lang['TRANSLATION_INFO'] : '', 'EXECUTION_STATS' => $execution_stats) ); --- 44,48 ---- 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', ! 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), 'EXECUTION_STATS' => $execution_stats) ); |
|
From: Jon O. <jon...@us...> - 2005-11-03 12:19:20
|
Update of /cvsroot/mxbb/mx_kb/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31959/modules/mx_kb/admin Added Files: admin_kb_settings.php Log Message: --- NEW FILE: admin_kb_settings.php --- <?php /** ------------------------------------------------------------------------ * Subject : mxBB - a fully modular portal and CMS (for phpBB) * Author : Jon Ohlsson and the mxBB Team * Credits : The phpBB Group & Marc Morisette, wGeric * Copyright : (C) 2002-2005 mxBB Portal * Email : jo...@mx... * Project site : www.mxbb-portal.com * ------------------------------------------------------------------------- * * $Id: admin_kb_settings.php,v 1.1 2005/11/03 12:18:59 jonohlsson Exp $ */ /** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ if ( file_exists( './../viewtopic.php' ) ) { define( 'IN_PHPBB', 1 ); define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; require( $phpbb_root_path . 'extension.inc' ); if ( !empty( $setmodules ) ) { include_once( $phpbb_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['1_Configuration'] = $file; return; } require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include( $phpbb_root_path . 'kb/kb_common.' . $phpEx ); } else { define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', true ); if ( !empty( $setmodules ) ) { $mx_root_path = './../'; $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['1_Configuration'] = 'modules/mx_kb/admin/' . $file; return; } $mx_root_path = './../../../'; $module_root_path = './../'; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include( $module_root_path . 'kb/kb_common.' . $phpEx ); } // // Pull all config data // $sql = "SELECT * FROM " . KB_CONFIG_TABLE; if ( !$result = $db->sql_query( $sql ) ) { mx_message_die( CRITICAL_ERROR, "Could not query knowledge base configuration information", "", __LINE__, __FILE__, $sql ); } else { while ( $row = $db->sql_fetchrow( $result ) ) { $config_name = $row['config_name']; $config_value = $row['config_value']; $default_config[$config_name] = $config_value; $new[$config_name] = ( isset( $HTTP_POST_VARS[$config_name] ) ) ? $HTTP_POST_VARS[$config_name] : $default_config[$config_name]; if ( isset( $HTTP_POST_VARS['submit'] ) ) { $sql = "UPDATE " . KB_CONFIG_TABLE . " SET config_value = '" . str_replace( "\'", "''", $new[$config_name] ) . "' WHERE config_name = '$config_name'"; if ( !$db->sql_query( $sql ) ) { mx_message_die( GENERAL_ERROR, "Failed to update general configuration for $config_name", "", __LINE__, __FILE__, $sql ); } } } if ( isset( $HTTP_POST_VARS['submit'] ) ) { $message = $lang['KB_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_kb_config'], "<a href=\"" . append_sid( "admin_kb_config.$phpEx?mode=config" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } } $new_yes = ( $new['allow_new'] ) ? "checked=\"checked\"" : ""; $new_no = ( !$new['allow_new'] ) ? "checked=\"checked\"" : ""; $allow_html_yes = ( $new['allow_html'] ) ? "checked=\"checked\"" : ""; $allow_html_no = ( !$new['allow_html'] ) ? "checked=\"checked\"" : ""; $allow_bbcode_yes = ( $new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; $allow_bbcode_no = ( !$new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; $allow_smilies_yes = ( $new['allow_smilies'] ) ? "checked=\"checked\"" : ""; $allow_smilies_no = ( !$new['allow_smilies'] ) ? "checked=\"checked\"" : ""; $formatting_fixup_yes = ( $new['formatting_fixup'] ) ? "checked=\"checked\"" : ""; $formatting_fixup_no = ( !$new['formatting_fixup'] ) ? "checked=\"checked\"" : ""; $wysiwyg_yes = ( $new['wysiwyg'] ) ? "checked=\"checked\"" : ""; $wysiwyg_no = ( !$new['wysiwyg'] ) ? "checked=\"checked\"" : ""; $kb_allowed_html_tags = $new['allowed_html_tags']; $wysiwyg_path = $new['wysiwyg_path']; $pretext_show = ( $new['show_pretext'] ) ? "checked=\"checked\"" : ""; $pretext_hide = ( !$new['show_pretext'] ) ? "checked=\"checked\"" : ""; $pt_header = $new['pt_header']; $pt_body = $new['pt_body']; $notify_none = ( $new['notify'] == 0 ) ? "checked=\"checked\"" : ""; $notify_pm = ( $new['notify'] == 1 ) ? "checked=\"checked\"" : ""; $notify_email = ( $new['notify'] == 2 ) ? "checked=\"checked\"" : ""; $admin_id = $new['admin_id']; $use_comments_yes = ( $new['use_comments'] ) ? "checked=\"checked\"" : ""; $use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : ""; $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : ""; $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : ""; // Added by Haplo $comments_show_yes = ( $new['comments_show'] ) ? "checked=\"checked\"" : ""; $comments_show_no = ( !$new['comments_show'] ) ? "checked=\"checked\"" : ""; $bump_post_yes = ( $new['bump_post'] ) ? "checked=\"checked\"" : ""; $bump_post_no = ( !$new['bump_post'] ) ? "checked=\"checked\"" : ""; $stats_list_yes = ( $new['stats_list'] ) ? "checked=\"checked\"" : ""; $stats_list_no = ( !$new['stats_list'] ) ? "checked=\"checked\"" : ""; $header_banner_yes = ( $new['header_banner'] ) ? "checked=\"checked\"" : ""; $header_banner_no = ( !$new['header_banner'] ) ? "checked=\"checked\"" : ""; $use_ratings_yes = ( $new['use_ratings'] ) ? "checked=\"checked\"" : ""; $use_ratings_no = ( !$new['use_ratings'] ) ? "checked=\"checked\"" : ""; $votes_check_ip_yes = ( $new['votes_check_ip'] ) ? "checked=\"checked\"" : ""; $votes_check_ip_no = ( !$new['votes_check_ip'] ) ? "checked=\"checked\"" : ""; $votes_check_userid_yes = ( $new['votes_check_userid'] ) ? "checked=\"checked\"" : ""; $votes_check_userid_no = ( !$new['votes_check_userid'] ) ? "checked=\"checked\"" : ""; $article_pag = $new['art_pagination']; $comments_pag = $new['comments_pagination']; $news_sort_options = array(); $news_sort_options = array( "Latest", "Creation", "Id", "Userrank", "Alphabetic" ); $news_sort_list = '<select name="news_sort">'; for( $j = 0; $j < count( $news_sort_options ); $j++ ) { if ( $new['news_sort'] == $news_sort_options[$j] ) { $status = "selected"; } else { $status = ''; } $news_sort_list .= '<option value="' . $news_sort_options[$j] . '" ' . $status . '>' . $news_sort_options[$j] . '</option>'; } $news_sort_list .= '</select>'; $news_sort_par_options = array(); $news_sort_par_options = array( "DESC", "ASC" ); $news_sort_par_list = '<select name="news_sort_par">'; for( $j = 0; $j < count( $news_sort_par_options ); $j++ ) { if ( $new['news_sort_par'] == $news_sort_par_options[$j] ) { $status = "selected"; } else { $status = ''; } $news_sort_par_list .= '<option value="' . $news_sort_par_options[$j] . '" ' . $status . '>' . $news_sort_par_options[$j] . '</option>'; } $news_sort_par_list .= '</select>'; $template->set_filenames( array( "body" => "admin/kb_config_body.tpl" ) ); $template->assign_vars( array( 'S_ACTION' => append_sid( "admin_kb_config.$phpEx?mode=config" ), 'L_SUBMIT' => $lang['Submit'], 'L_RESET' => $lang['Reset'], 'L_YES' => $lang['Yes'], 'L_NO' => $lang['No'], 'L_NONE' => $lang['Acc_None'], 'L_CONFIGURATION_TITLE' => $lang['KB_config_title'], 'L_CONFIGURATION_EXPLAIN' => $lang['KB_config_explain'], 'L_NEW_NAME' => $lang['New_title'], 'L_NEW_EXPLAIN' => $lang['New_explain'], 'S_NEW_YES' => $new_yes, 'S_NEW_NO' => $new_no, 'L_SHOW' => $lang['Show'], 'L_HIDE' => $lang['Hide'], 'L_PRE_TEXT_NAME' => $lang['Pre_text_name'], 'L_PRE_TEXT_HEADER' => $lang['Pre_text_header'], 'L_PRE_TEXT_BODY' => $lang['Pre_text_body'], 'L_PRE_TEXT_EXPLAIN' => $lang['Pre_text_explain'], 'S_SHOW_PRETEXT' => $pretext_show, 'S_HIDE_PRETEXT' => $pretext_hide, 'L_PT_HEADER' => $pt_header, 'L_PT_BODY' => $pt_body, 'L_NOTIFY_NAME' => $lang['Notify_name'], 'L_NOTIFY_EXPLAIN' => $lang['Notify_explain'], 'L_EMAIL' => $lang['Email'], 'L_PM' => $lang['PM'], 'S_NOTIFY_NONE' => $notify_none, 'S_NOTIFY_EMAIL' => $notify_email, 'S_NOTIFY_PM' => $notify_pm, 'L_ADMIN_ID_NAME' => $lang['Admin_id_name'], 'L_ADMIN_ID_EXPLAIN' => $lang['Admin_id_explain'], 'ADMIN_ID' => $admin_id, 'L_USE_COMMENTS' => $lang['Use_comments'], 'L_USE_COMMENTS_EXPLAIN' => $lang['Use_comments_explain'], 'S_USE_COMMENTS_YES' => $use_comments_yes, 'S_USE_COMMENTS_NO' => $use_comments_no, 'L_RATINGS_INFO' => $lang['Rating_info'], 'L_COMMENTS_INFO' => $lang['Comment_info'], 'L_COMMENTS_SHOW' => $lang['Comments_show'], 'L_COMMENTS_SHOW_EXPLAIN' => $lang['Comments_show_explain'], 'S_COMMENTS_SHOW_YES' => $comments_show_yes, 'S_COMMENTS_SHOW_NO' => $comments_show_no, 'L_BUMP_POST' => $lang['Bump_post'], 'L_BUMP_POST_EXPLAIN' => $lang['Bump_post_explain'], 'S_BUMP_POST_YES' => $bump_post_yes, 'S_BUMP_POST_NO' => $bump_post_no, 'L_FORMATTING_FIXUP' => $lang['Formatting_fixup'], 'L_FORMATTING_FIXUP_EXPLAIN' => $lang['Formatting_fixup_explain'], 'S_FORMATTING_FIXUP_YES' => $formatting_fixup_yes, 'S_FORMATTING_FIXUP_NO' => $formatting_fixup_no, 'L_WYSIWYG' => $lang['Wysiwyg'], 'L_WYSIWYG_EXPLAIN' => $lang['Wysiwyg_explain'], 'S_WYSIWYG_YES' => $wysiwyg_yes, 'S_WYSIWYG_NO' => $wysiwyg_no, 'L_WYSIWYG_PATH' => $lang['Wysiwyg_path'], 'L_WYSIWYG_PATH_EXPLAIN' => $lang['Wysiwyg_path_explain'], 'WYSIWYG_PATH' => $wysiwyg_path, 'L_ALLOW_HTML' => $lang['Allow_HTML'], 'L_ALLOW_HTML_EXPLAIN' => $lang['Allow_html_explain'], 'S_ALLOW_HTML_YES' => $allow_html_yes, 'S_ALLOW_HTML_NO' => $allow_html_no, 'L_ALLOW_BBCODE' => $lang['Allow_BBCode'], 'L_ALLOW_BBCODE_EXPLAIN' => $lang['Allow_bbcode_explain'], 'S_ALLOW_BBCODE_YES' => $allow_bbcode_yes, 'S_ALLOW_BBCODE_NO' => $allow_bbcode_no, 'L_ALLOW_SMILIES' => $lang['Allow_smilies'], 'L_ALLOW_SMILIES_EXPLAIN' => $lang['Allow_smilies_explain'], 'S_ALLOW_SMILIES_YES' => $allow_smilies_yes, 'S_ALLOW_SMILIES_NO' => $allow_smilies_no, 'L_ALLOWED_HTML_TAGS' => $lang['Allowed_tags'], 'L_ALLOWED_HTML_TAGS_EXPLAIN' => $lang['Allowed_tags_explain'], 'ALLOWED_HTML_TAGS' => $kb_allowed_html_tags, 'L_STATS_LIST' => $lang['Stats_list'], 'L_STATS_LIST_EXPLAIN' => $lang['Stats_list_explain'], 'S_STATS_LIST_YES' => $stats_list_yes, 'S_STATS_LIST_NO' => $stats_list_no, 'L_HEADER_BANNER' => $lang['Header_banner'], 'L_HEADER_BANNER_EXPLAIN' => $lang['Header_banner_explain'], 'S_HEADER_BANNER_YES' => $header_banner_yes, 'S_HEADER_BANNER_NO' => $header_banner_no, 'L_ANON_NAME' => $lang['Allow_anon_name'], 'L_ANON_EXPLAIN' => $lang['Allow_anon_explain'], 'S_ANON_YES' => $anon_yes, 'S_ANON_NO' => $anon_no, 'L_USE_RATINGS' => $lang['Use_ratings'], 'L_USE_RATINGS_EXPLAIN' => $lang['Use_ratings_explain'], 'S_USE_RATINGS_YES' => $use_ratings_yes, 'S_USE_RATINGS_NO' => $use_ratings_no, 'L_VOTES_CHECK_IP' => $lang['Votes_check_ip'], 'L_VOTES_CHECK_IP_EXPLAIN' => $lang['Votes_check_ip_explain'], 'S_VOTES_CHECK_IP_YES' => $votes_check_ip_yes, 'S_VOTES_CHECK_IP_NO' => $votes_check_ip_no, 'L_VOTES_CHECK_USERID' => $lang['Votes_check_userid'], 'L_VOTES_CHECK_USERID_EXPLAIN' => $lang['Votes_check_userid_explain'], 'S_VOTES_CHECK_USERID_YES' => $votes_check_userid_yes, 'S_VOTES_CHECK_USERID_NO' => $votes_check_userid_no, 'L_ARTICLE_PAG' => $lang['Article_pag'], 'L_ARTICLE_PAG_EXPLAIN' => $lang['Article_pag_explain'], 'ARTICLE_PAG' => $article_pag, 'L_COMMENTS_PAG' => $lang['Comments_pag'], 'L_COMMENTS_PAG_EXPLAIN' => $lang['Comments_pag_explain'], 'COMMENTS_PAG' => $comments_pag, 'L_NEWS_SORT' => $lang['News_sort'], 'L_NEWS_SORT_EXPLAIN' => $lang['News_sort_explain'], 'NEWS_SORT' => $news_sort_list, 'L_NEWS_SORT_PAR' => $lang['News_sort_par'], 'L_NEWS_SORT_PAR_EXPLAIN' => $lang['News_sort_par_explain'], 'NEWS_SORT_PAR' => $news_sort_par_list, 'L_DEL_TOPIC' => $lang['Del_topic'], 'L_DEL_TOPIC_EXPLAIN' => $lang['Del_topic_explain'], 'S_DEL_TOPIC_YES' => $del_topic_yes, 'S_DEL_TOPIC_NO' => $del_topic_no ) ); include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'body' ); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); ?> |
|
From: Jon O. <jon...@us...> - 2005-11-03 12:13:53
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29593/modules/mx_kb/templates/subSilver Modified Files: kb_rate_body.tpl Log Message: i am rewriting this module... Index: kb_rate_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_rate_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_rate_body.tpl 1 May 2005 16:39:23 -0000 1.4 --- kb_rate_body.tpl 3 Nov 2005 12:13:34 -0000 1.5 *************** *** 1,59 **** ! {LOCBAR} ! <br /> ! <!-- BEGIN ip_check --> ! <table width="100%" cellpadding="4" cellspacing="0" class="forumline"> ! <tr> ! <th class="thHead" colspan="2"> {L_RATE}</th> ! </tr> ! ! <tr> ! <td class="cat" colspan="2"> ! <!-- END ip_check --> ! ! <!-- BEGIN do_rate --> ! <table width="100%" cellpadding="4" cellspacing="0" class="forumline"> ! <tr> ! <th class="thHead" colspan="2"> {L_RATE}</th> ! </tr> ! <tr> ! <td class="catBottom" colspan="2"> ! ! <!-- END do_rate --> <!-- BEGIN rate --> <form action="{S_RATE_ACTION}" method="POST"> <table width="100%" cellpadding="4" cellspacing="0" class="forumline"> ! <tr> ! <th colspan="2" class="thHead"> {L_RATE}</th> ! </tr> ! <tr> ! <td class="row1" width="90%"><span class="genmed">{RATEINFO}</span></td> ! <td class="row2"> ! <select size="1" name="rating" class="forminput"> ! <option value="1">{L_R1}</option> ! <option value="2">{L_R2}</option> ! <option value="3">{L_R3}</option> ! <option value="4">{L_R4}</option> ! <option value="5" selected>{L_R5}</option> ! <option value="6">{L_R6}</option> ! <option value="7">{L_R7}</option> ! <option value="8">{L_R8}</option> ! <option value="9">{L_R9}</option> ! <option value="10">{L_R10}</option> ! </select> ! <input type="hidden" name="mode" value="rate"> ! <input type="hidden" name="k" value="{ID}"> ! <input type="hidden" name="rate" value="dorate"> ! </td> ! </tr> ! <tr> ! <td colspan="2" class="catBottom" align="center"><input class="liteoption" type="submit" value="{L_RATE}"> ! <!-- END rate --> ! </td> ! </tr> </table> </form> ! ! </td> ! </tr> ! </table> \ No newline at end of file --- 1,42 ---- ! <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> ! <tr> ! <td align="left" class="nav"> ! <a href="{U_KB}" class="nav">{L_KB}</a> {PATH} ! </td> ! </tr> ! </table> <!-- BEGIN rate --> <form action="{S_RATE_ACTION}" method="POST"> <table width="100%" cellpadding="4" cellspacing="0" class="forumline"> ! <tr> ! <th colspan="2" class="thHead"> {L_RATE}</th> ! </tr> ! <tr> ! <td class="row1" width="90%"><span class="genmed">{RATEINFO}</span></td> ! <td class="row2"> ! <select size="1" name="rating" class="forminput"> ! <option value="1">{L_R1}</option> ! <option value="2">{L_R2}</option> ! <option value="3">{L_R3}</option> ! <option value="4">{L_R4}</option> ! <option value="5" selected>{L_R5}</option> ! <option value="6">{L_R6}</option> ! <option value="7">{L_R7}</option> ! <option value="8">{L_R8}</option> ! <option value="9">{L_R9}</option> ! <option value="10">{L_R10}</option> ! </select> ! <input type="hidden" name="mode" value="rate"> ! <input type="hidden" name="k" value="{ID}"> ! <input type="hidden" name="rate" value="dorate"> ! </td> ! </tr> ! <tr> ! <td colspan="2" class="catBottom" align="center"><input class="liteoption" type="submit" value="{L_RATE}"> ! ! </td> ! </tr> </table> </form> ! <!-- END rate --> |
|
From: Jon O. <jon...@us...> - 2005-11-03 12:13:53
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29593/modules/mx_kb/templates/subSilver/admin Modified Files: kb_art_body.tpl kb_cat_admin_body.tpl kb_cat_del_body.tpl kb_cat_edit_body.tpl kb_config.tpl kb_config_body.tpl kb_field_add.tpl kb_rebuild_search.tpl kb_rebuild_search_progress.tpl kb_select.tpl kb_select_field_delete.tpl kb_select_field_edit.tpl kb_type_body.tpl kb_type_edit_body.tpl Log Message: i am rewriting this module... Index: kb_rebuild_search_progress.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_rebuild_search_progress.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_rebuild_search_progress.tpl 29 Mar 2005 20:02:28 -0000 1.1 --- kb_rebuild_search_progress.tpl 3 Nov 2005 12:13:34 -0000 1.2 *************** *** 1,3 **** - <h1 style="text-align: center;">{PERCENT} %</h1> --- 1,2 ---- Index: kb_art_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_art_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_art_body.tpl 20 Apr 2005 20:48:24 -0000 1.4 --- kb_art_body.tpl 3 Nov 2005 12:13:34 -0000 1.5 *************** *** 1,4 **** - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> - <h1>{L_KB_ART_TITLE}</h1> --- 1,2 ---- Index: kb_cat_edit_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_cat_edit_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb_cat_edit_body.tpl 2 Apr 2005 20:37:03 -0000 1.3 --- kb_cat_edit_body.tpl 3 Nov 2005 12:13:34 -0000 1.4 *************** *** 1,3 **** - <h1>{L_EDIT_TITLE}</h1> --- 1,2 ---- Index: kb_cat_del_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_cat_del_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_cat_del_body.tpl 14 Aug 2003 17:59:40 -0000 1.1 --- kb_cat_del_body.tpl 3 Nov 2005 12:13:34 -0000 1.2 *************** *** 1,3 **** - <h1>{L_DELETE_TITLE}</h1> --- 1,2 ---- Index: kb_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_config_body.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** kb_config_body.tpl 28 Mar 2005 20:22:48 -0000 1.10 --- kb_config_body.tpl 3 Nov 2005 12:13:34 -0000 1.11 *************** *** 1,3 **** - <h1>{L_CONFIGURATION_TITLE}</h1> --- 1,2 ---- *************** *** 129,132 **** </tr> </table> ! </form> ! <br clear="all" /> \ No newline at end of file --- 128,130 ---- </tr> </table> ! </form> \ No newline at end of file Index: kb_select_field_edit.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_select_field_edit.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_select_field_edit.tpl 28 Mar 2005 20:22:48 -0000 1.1 --- kb_select_field_edit.tpl 3 Nov 2005 12:13:34 -0000 1.2 *************** *** 1,3 **** - <h1>{L_FIELD_TITLE}</h1> --- 1,2 ---- Index: kb_rebuild_search.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_rebuild_search.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_rebuild_search.tpl 29 Mar 2005 20:02:13 -0000 1.1 --- kb_rebuild_search.tpl 3 Nov 2005 12:13:34 -0000 1.2 *************** *** 1,3 **** - <h1>{L_REBUILD_SEARCH}</h1> --- 1,2 ---- Index: kb_config.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_config.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kb_config.tpl 1 Feb 2005 20:45:45 -0000 1.2 --- kb_config.tpl 3 Nov 2005 12:13:34 -0000 1.3 *************** *** 1,3 **** - <h1>{L_CONFIGURATION_TITLE}</h1> --- 1,2 ---- Index: kb_type_edit_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_type_edit_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_type_edit_body.tpl 28 Mar 2005 20:22:48 -0000 1.1 --- kb_type_edit_body.tpl 3 Nov 2005 12:13:34 -0000 1.2 *************** *** 1,3 **** - <h1>{L_EDIT_TITLE}</h1> --- 1,2 ---- Index: kb_type_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_type_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb_type_body.tpl 1 May 2005 16:39:23 -0000 1.3 --- kb_type_body.tpl 3 Nov 2005 12:13:34 -0000 1.4 *************** *** 1,4 **** - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> - <h1>{L_KB_TYPE_TITLE}</h1> --- 1,2 ---- Index: kb_cat_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_cat_admin_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_cat_admin_body.tpl 1 May 2005 16:39:23 -0000 1.4 --- kb_cat_admin_body.tpl 3 Nov 2005 12:13:34 -0000 1.5 *************** *** 1,4 **** - <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1"> - <h1>{L_KB_CAT_TITLE}</h1> --- 1,2 ---- Index: kb_field_add.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_field_add.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kb_field_add.tpl 11 Apr 2005 20:07:58 -0000 1.2 --- kb_field_add.tpl 3 Nov 2005 12:13:34 -0000 1.3 *************** *** 1,3 **** - <h1>{L_FIELD_TITLE}</h1> --- 1,2 ---- Index: kb_select.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_select.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_select.tpl 28 Mar 2005 20:22:48 -0000 1.1 --- kb_select.tpl 3 Nov 2005 12:13:34 -0000 1.2 *************** *** 1,3 **** - <h1>{L_FIELD_TITLE}</h1> --- 1,2 ---- Index: kb_select_field_delete.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_select_field_delete.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_select_field_delete.tpl 28 Mar 2005 20:22:48 -0000 1.1 --- kb_select_field_delete.tpl 3 Nov 2005 12:13:34 -0000 1.2 *************** *** 1,3 **** - <h1>{L_FIELD_TITLE}</h1> --- 1,2 ---- |
|
From: Jon O. <jon...@us...> - 2005-11-03 12:13:53
|
Update of /cvsroot/mxbb/mx_kb/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29593/modules/mx_kb/admin Modified Files: admin_kb_art.php admin_kb_auth.php admin_kb_cat.php admin_kb_custom.php admin_kb_rebuild_search.php admin_kb_types.php mx_module_defs.php Removed Files: admin_kb_config.php Log Message: i am rewriting this module... Index: admin_kb_art.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_art.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** admin_kb_art.php 24 Oct 2005 20:15:32 -0000 1.25 --- admin_kb_art.php 3 Nov 2005 12:13:33 -0000 1.26 *************** *** 30,34 **** if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['3_Art_man'] = $file; --- 30,34 ---- if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['3_Art_man'] = $file; *************** *** 39,51 **** include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); - include( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); - include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); } else --- 39,47 ---- include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); + + include( $phpbb_root_path . 'kb/kb_common.' . $phpEx ); } else *************** *** 59,63 **** $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); --- 55,59 ---- $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); *************** *** 73,108 **** require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); - include( $module_root_path . 'includes/kb_constants.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); } ! // Pull all config data ! $sql = "SELECT * ! FROM " . KB_CONFIG_TABLE; ! if ( !$result = $db->sql_query( $sql ) ) ! { ! mx_message_die( CRITICAL_ERROR, "Could not query config information in kb_config", "", __LINE__, __FILE__, $sql ); ! } ! else ! { ! while ( $kb_row = $db->sql_fetchrow( $result ) ) ! { ! $config_name = $kb_row['config_name']; ! $config_value = $kb_row['config_value']; ! $kb_config[$config_name] = $config_value; ! } ! } ! if ( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) ) ! { ! $mode = ( isset( $HTTP_POST_VARS['mode'] ) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; ! } ! else { if ( $approve ) --- 69,84 ---- require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $module_root_path . 'kb/kb_common.' . $phpEx ); } ! $mx_kb->init(); ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); ! $start = $mx_request_vars->request('start', MX_TYPE_INT, 0); ! $article_id = $mx_request_vars->get('a', MX_TYPE_INT, 0); ! if( empty( $mode ) ) { if ( $approve ) *************** *** 124,130 **** } - $start = ( isset( $HTTP_GET_VARS['start'] ) ) ? intval( $HTTP_GET_VARS['start'] ) : 0; - $article_id = intval( $HTTP_GET_VARS['a'] ); - switch ( $mode ) { --- 100,103 ---- *************** *** 144,151 **** $kb_comment = array(); // Populate the kb_comment variable ! $kb_comment = kb_get_data($kb_row, $userdata ); // Compose post header $subject = $lang['KB_comment_prefix'] . $kb_comment['article_title']; $message_temp = kb_compose_comment( $kb_comment ); --- 117,128 ---- $kb_comment = array(); + // // Populate the kb_comment variable ! // ! $kb_comment = $mx_kb->kb_get_data($kb_row, $userdata ); + // // Compose post header + // $subject = $lang['KB_comment_prefix'] . $kb_comment['article_title']; $message_temp = kb_compose_comment( $kb_comment ); *************** *** 154,163 **** --- 131,144 ---- $kb_update_message = $message_temp['update_message']; + // // Insert comment, if not already present + // if ( $kb_config['use_comments'] ) { if ( !$kb_row['topic_id'] ) { + // // Post + // $topic_data = kb_insert_post( $kb_message, $subject, $kb_comment['category_forum_id'], $kb_comment['article_editor_id'], $kb_comment['article_editor'], $kb_comment['article_editor_sig'], $kb_comment['topic_id'], $kb_update_message ); *************** *** 383,398 **** default: // Generate page ! $template->set_filenames( array( 'body' => 'admin/kb_art_body.tpl' ) ); // edited articles ! get_kb_articles( '', 2, 'editrow', $start ); // need to be approved ! get_kb_articles( '', 0, 'notrow', $start ); // Articles that are approved ! $total_articles = get_kb_articles( '', 1, 'approverow', $start, $kb_config['art_pagination'] ); // Pagination $sql_pag = "SELECT count(article_id) AS total FROM " . KB_ARTICLES_TABLE . " --- 364,390 ---- default: + // // Generate page ! // $template->set_filenames( array( 'body' => 'admin/kb_art_body.tpl' ) ); + // // edited articles ! // ! $mx_kb->get_kb_articles( '', 2, 'editrow', $start ); ! ! // // need to be approved ! // ! $mx_kb->get_kb_articles( '', 0, 'notrow', $start ); ! ! // // Articles that are approved ! // ! $total_articles = $mx_kb->get_kb_articles( '', 1, 'approverow', $start, $kb_config['art_pagination'] ); + // // Pagination + // $sql_pag = "SELECT count(article_id) AS total FROM " . KB_ARTICLES_TABLE . " *************** *** 434,446 **** 'L_KB_ART_DESCRIPTION' => $lang['KB_art_description'] ) ); - - - - break; } $template->pparse( 'body' ); - include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 426,434 ---- 'L_KB_ART_DESCRIPTION' => $lang['KB_art_description'] ) ); break; } + include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'body' ); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); Index: admin_kb_rebuild_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_rebuild_search.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_kb_rebuild_search.php 1 Oct 2005 14:13:46 -0000 1.10 --- admin_kb_rebuild_search.php 3 Nov 2005 12:13:33 -0000 1.11 *************** *** 33,37 **** if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['7_Optimize_tables'] = $file; --- 33,37 ---- if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['7_Optimize_tables'] = $file; *************** *** 42,51 **** include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); ! include( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_auth.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_field.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_mx.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); } else --- 42,48 ---- include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); ! include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $phpbb_root_path . 'kb/kb_common.' . $phpEx ); } else *************** *** 59,63 **** $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); --- 56,60 ---- $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); *************** *** 73,83 **** require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); - include( $module_root_path . 'includes/kb_constants.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); } --- 70,76 ---- require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $module_root_path . 'kb/kb_common.' . $phpEx ); } *************** *** 190,199 **** } $template->pparse ('body'); - - // - // Page Footer - // - // include('./page_footer_admin.'.$phpEx); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 183,188 ---- } + include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse ('body'); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); Index: admin_kb_types.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_types.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** admin_kb_types.php 24 Oct 2005 20:15:32 -0000 1.16 --- admin_kb_types.php 3 Nov 2005 12:13:33 -0000 1.17 *************** *** 30,34 **** if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['5_Types_man'] = $file; --- 30,34 ---- if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['5_Types_man'] = $file; *************** *** 39,48 **** include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); ! include( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_auth.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_field.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_mx.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); } else --- 39,45 ---- include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); ! include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $phpbb_root_path . 'kb/kb_common.' . $phpEx ); } else *************** *** 56,60 **** $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); --- 53,57 ---- $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); *************** *** 70,80 **** require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); - include( $module_root_path . 'includes/kb_constants.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); } --- 67,73 ---- require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $module_root_path . 'kb/kb_common.' . $phpEx ); } *************** *** 332,337 **** } $template->pparse( 'body' ); - // include('./page_footer_admin.'.$phpEx); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 325,330 ---- } + include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'body' ); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/mx_module_defs.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_module_defs.php 24 Oct 2005 20:15:32 -0000 1.6 --- mx_module_defs.php 3 Nov 2005 12:13:33 -0000 1.7 *************** *** 94,100 **** $module_root_path = $mx_root_path . $mx_blockcp->module_root_path; ! include_once( $module_root_path . "includes/functions_kb.$phpEx" ); ! include_once( $module_root_path . "includes/kb_constants.$phpEx" ); ! include_once( $module_root_path . "includes/kb_defs.$phpEx" ); $template->set_filenames(array( --- 94,100 ---- $module_root_path = $mx_root_path . $mx_blockcp->module_root_path; ! //include_once( $module_root_path . "kb/includes/functions_kb.$phpEx" ); ! include_once( $module_root_path . "kb/includes/kb_constants.$phpEx" ); ! include_once( $module_root_path . "kb/includes/kb_defs.$phpEx" ); $template->set_filenames(array( Index: admin_kb_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_auth.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_kb_auth.php 1 Oct 2005 14:13:46 -0000 1.10 --- admin_kb_auth.php 3 Nov 2005 12:13:33 -0000 1.11 *************** *** 30,34 **** if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['4_Permissions'] = $file; --- 30,34 ---- if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['4_Permissions'] = $file; *************** *** 39,48 **** include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); ! include( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_auth.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_field.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_kb_mx.' . $phpEx ); ! include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); } else --- 39,46 ---- include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); ! include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $phpbb_root_path . 'kb/kb_common.' . $phpEx ); ! } else *************** *** 56,60 **** $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); --- 54,58 ---- $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); *************** *** 70,87 **** require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); - include( $module_root_path . 'includes/kb_constants.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); } if ( !isset( $HTTP_POST_VARS['submit'] ) ) { ! $s_kb_cat_list = get_kb_cat_list( '', 0, 0, 0, 0, true ); ! $template->set_filenames( array( 'body' => 'admin/kb_cat_select_body.tpl' ) ! ); $template->assign_vars( array( 'L_KB_AUTH_TITLE' => $lang['KB_Auth_Title'], --- 68,85 ---- require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $module_root_path . 'kb/kb_common.' . $phpEx ); } + $mx_kb->init(); + + // + // Start adminCP + // if ( !isset( $HTTP_POST_VARS['submit'] ) ) { ! $s_kb_cat_list = $mx_kb->get_kb_cat_list( '', 0, 0, 0, 0, true ); ! $template->set_filenames( array( 'body' => 'admin/kb_cat_select_body.tpl' ) ); $template->assign_vars( array( 'L_KB_AUTH_TITLE' => $lang['KB_Auth_Title'], *************** *** 93,98 **** ); $template->pparse( 'body' ); - include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); } --- 91,96 ---- ); + include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'body' ); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); } *************** *** 103,108 **** $cat_id = intval( $HTTP_POST_VARS['cat_id'] ); ! $template->set_filenames( array( 'body' => 'admin/kb_cat_auth_body.tpl' ) ! ); $template->assign_vars( array( 'L_ALBUM_AUTH_TITLE' => $lang['Album_Auth_Title'], --- 101,105 ---- $cat_id = intval( $HTTP_POST_VARS['cat_id'] ); ! $template->set_filenames( array( 'body' => 'admin/kb_cat_auth_body.tpl' ) ); $template->assign_vars( array( 'L_ALBUM_AUTH_TITLE' => $lang['Album_Auth_Title'], *************** *** 126,130 **** --- 123,130 ---- ) ); + + // // Get the list of phpBB usergroups + // $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " *************** *** 140,144 **** --- 140,147 ---- $groupdata[] = $kb_row; } + + // // Get info of this cat + // $sql = "SELECT category_id, category_name, auth_view_groups, auth_post_groups, auth_rate_groups, auth_comment_groups, auth_edit_groups, auth_delete_groups, auth_approval_groups, auth_approval_edit_groups, auth_moderator_groups FROM " . KB_CATEGORIES_TABLE . " *************** *** 187,192 **** } $template->pparse( 'body' ); - include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); } --- 190,195 ---- } + include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'body' ); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); } *************** *** 213,216 **** --- 216,220 ---- mx_message_die( GENERAL_ERROR, 'Could not update KB config table', '', __LINE__, __FILE__, $sql ); } + $message = $lang['KB_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_KB_auth'], '<a href="' . append_sid( "admin_kb_auth.$phpEx" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); --- admin_kb_config.php DELETED --- Index: admin_kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_cat.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** admin_kb_cat.php 24 Oct 2005 20:15:32 -0000 1.18 --- admin_kb_cat.php 3 Nov 2005 12:13:33 -0000 1.19 *************** *** 30,34 **** if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['2_Cat_man'] = $file; --- 30,34 ---- if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['2_Cat_man'] = $file; *************** *** 39,48 **** include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); - include( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); } else --- 39,45 ---- include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); + + include( $phpbb_root_path . 'kb/kb_common.' . $phpEx ); } else *************** *** 56,60 **** $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); --- 53,57 ---- $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); *************** *** 70,80 **** require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); - include( $module_root_path . 'includes/kb_constants.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); } --- 67,73 ---- require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $module_root_path . 'kb/kb_common.' . $phpEx ); } *************** *** 94,98 **** if ( $sel_id == 0 ) ! $forumlist .= '<option value="0" selected > Select a Forum !</option>'; while ( $row = $db->sql_fetchrow( $result ) ) --- 87,93 ---- if ( $sel_id == 0 ) ! { ! $forumlist .= '<option value="0" selected > Select a Forum !</option>'; ! } while ( $row = $db->sql_fetchrow( $result ) ) *************** *** 114,123 **** } ! if ( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) ) ! { ! $mode = ( isset( $HTTP_POST_VARS['mode'] ) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; ! } ! else { if ( $create ) --- 109,117 ---- } + $mx_kb->init(); ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); ! ! if ( empty($mode) ) { if ( $create ) *************** *** 147,209 **** $new_cat_name = stripslashes( $HTTP_POST_VARS['new_cat_name'] ); // Generate page ! ! $template->set_filenames( array( 'body' => 'admin/kb_cat_edit_body.tpl' ) ! ); $template->assign_block_vars( 'switch_cat', array() ); ! $template->assign_vars( array( 'L_EDIT_TITLE' => $lang['Create_cat'], ! 'L_EDIT_DESCRIPTION' => $lang['Create_description'], ! 'L_CATEGORY' => $lang['Category'], ! 'L_DESCRIPTION' => $lang['Article_description'], ! 'L_NUMBER_ARTICLES' => $lang['Articles'], ! 'L_CAT_SETTINGS' => $lang['Cat_settings'], ! 'L_CREATE' => $lang['Create'], ! 'L_PARENT' => $lang['Parent'], ! 'L_NONE' => $lang['None'], ! 'PARENT_LIST' => get_kb_cat_list( '', 0, 0, 0, 0, true ), ! 'L_FORUM_ID' => $lang['Forum_id'], ! 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => get_forums( ), ! 'S_ACTION' => append_sid( $module_root_path . "admin/admin_kb_cat.$phpEx?mode=create" ), ! 'CAT_NAME' => $new_cat_name, ! 'DESC' => '', ! 'NUMBER_ARTICLES' => '0', ! // Category permissions ! 'L_CAT_PERMISSIONS' => $lang['Category_Permissions'], ! 'L_VIEW_LEVEL' => $lang['View_level'], ! 'L_UPLOAD_LEVEL' => $lang['Upload_level'], ! 'L_RATE_LEVEL' => $lang['Rate_level'], ! 'L_COMMENT_LEVEL' => $lang['Comment_level'], ! 'L_EDIT_LEVEL' => $lang['Edit_level'], ! 'L_DELETE_LEVEL' => $lang['Delete_level'], ! 'L_APPROVAL_LEVEL' => $lang['Approval_level'], ! 'L_APPROVAL_EDIT_LEVEL' => $lang['Approval_edit_level'], ! 'L_GUEST' => $lang['Forum_ALL'], ! 'L_REG' => $lang['Forum_REG'], ! 'L_PRIVATE' => $lang['Forum_PRIVATE'], ! 'L_MOD' => $lang['Forum_MOD'], ! 'L_ADMIN' => $lang['Forum_ADMIN'], ! 'L_DISABLED' => $lang['Disabled'], ! 'VIEW_GUEST' => 'selected="selected"', ! 'UPLOAD_REG' => 'selected="selected"', ! 'RATE_REG' => 'selected="selected"', ! 'COMMENT_REG' => 'selected="selected"', ! 'EDIT_REG' => 'selected="selected"', ! 'DELETE_MOD' => 'selected="selected"', ! 'APPROVAL_DISABLED' => 'selected="selected"', ! 'S_GUEST' => AUTH_ALL, ! 'S_USER' => AUTH_REG, ! 'S_PRIVATE' => AUTH_ACL, ! 'S_MOD' => AUTH_MOD, ! 'S_ADMIN' => AUTH_ADMIN ! ) ); } else if ( $HTTP_POST_VARS['submit'] ) --- 141,204 ---- $new_cat_name = stripslashes( $HTTP_POST_VARS['new_cat_name'] ); + // // Generate page ! // ! $template->set_filenames( array( 'body' => 'admin/kb_cat_edit_body.tpl' ) ); $template->assign_block_vars( 'switch_cat', array() ); ! $template->assign_vars( array( ! 'L_EDIT_TITLE' => $lang['Create_cat'], ! 'L_EDIT_DESCRIPTION' => $lang['Create_description'], ! 'L_CATEGORY' => $lang['Category'], ! 'L_DESCRIPTION' => $lang['Article_description'], ! 'L_NUMBER_ARTICLES' => $lang['Articles'], ! 'L_CAT_SETTINGS' => $lang['Cat_settings'], ! 'L_CREATE' => $lang['Create'], ! 'L_PARENT' => $lang['Parent'], ! 'L_NONE' => $lang['None'], ! 'PARENT_LIST' => $mx_kb->get_kb_cat_list( '', 0, 0, 0, 0, true ), ! 'L_FORUM_ID' => $lang['Forum_id'], ! 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => get_forums( ), ! 'S_ACTION' => append_sid( $module_root_path . "admin/admin_kb_cat.$phpEx?mode=create" ), ! 'CAT_NAME' => $new_cat_name, ! 'DESC' => '', ! 'NUMBER_ARTICLES' => '0', ! // Category permissions ! 'L_CAT_PERMISSIONS' => $lang['Category_Permissions'], ! 'L_VIEW_LEVEL' => $lang['View_level'], ! 'L_UPLOAD_LEVEL' => $lang['Upload_level'], ! 'L_RATE_LEVEL' => $lang['Rate_level'], ! 'L_COMMENT_LEVEL' => $lang['Comment_level'], ! 'L_EDIT_LEVEL' => $lang['Edit_level'], ! 'L_DELETE_LEVEL' => $lang['Delete_level'], ! 'L_APPROVAL_LEVEL' => $lang['Approval_level'], ! 'L_APPROVAL_EDIT_LEVEL' => $lang['Approval_edit_level'], ! 'L_GUEST' => $lang['Forum_ALL'], ! 'L_REG' => $lang['Forum_REG'], ! 'L_PRIVATE' => $lang['Forum_PRIVATE'], ! 'L_MOD' => $lang['Forum_MOD'], ! 'L_ADMIN' => $lang['Forum_ADMIN'], ! 'L_DISABLED' => $lang['Disabled'], ! 'VIEW_GUEST' => 'selected="selected"', ! 'UPLOAD_REG' => 'selected="selected"', ! 'RATE_REG' => 'selected="selected"', ! 'COMMENT_REG' => 'selected="selected"', ! 'EDIT_REG' => 'selected="selected"', ! 'DELETE_MOD' => 'selected="selected"', ! 'APPROVAL_DISABLED' => 'selected="selected"', ! 'S_GUEST' => AUTH_ALL, ! 'S_USER' => AUTH_REG, ! 'S_PRIVATE' => AUTH_ACL, ! 'S_MOD' => AUTH_MOD, ! 'S_ADMIN' => AUTH_ADMIN ! )); } else if ( $HTTP_POST_VARS['submit'] ) *************** *** 224,227 **** --- 219,223 ---- mx_message_die(GENERAL_MESSAGE , 'Select a Forum'); } + $view_level = intval( $HTTP_POST_VARS['auth_view'] ); $post_level = intval( $HTTP_POST_VARS['auth_post'] ); *************** *** 235,238 **** --- 231,235 ---- $sql = "SELECT MAX(cat_order) AS cat_order FROM " . KB_CATEGORIES_TABLE . " WHERE parent = $parent"; + if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 244,247 **** --- 241,245 ---- mx_message_die( GENERAL_ERROR, 'Could not obtain next type id', '', __LINE__, __FILE__, $sql ); } + $cat_order = $id['cat_order'] + 10; *************** *** 272,275 **** --- 270,274 ---- mx_message_die( GENERAL_ERROR, "Could not obtain category information", '', __LINE__, __FILE__, $sql ); } + if ( $kb_cat = $db->sql_fetchrow( $results ) ) { *************** *** 281,288 **** } // Generate page ! ! $template->set_filenames( array( 'body' => 'admin/kb_cat_edit_body.tpl' ) ! ); $template->assign_block_vars( 'switch_cat', array() ); --- 280,287 ---- } + // // Generate page ! // ! $template->set_filenames( array( 'body' => 'admin/kb_cat_edit_body.tpl' ) ); $template->assign_block_vars( 'switch_cat', array() ); *************** *** 300,304 **** 'L_NONE' => $lang['None'], ! 'PARENT_LIST' => get_kb_cat_list( '', $parent, $parent, true, 0, true ), 'S_ACTION' => append_sid( $module_root_path . "admin/admin_kb_cat.$phpEx?mode=edit" ), --- 299,303 ---- 'L_NONE' => $lang['None'], ! 'PARENT_LIST' => $mx_kb->get_kb_cat_list( '', $parent, $parent, true, 0, true ), 'S_ACTION' => append_sid( $module_root_path . "admin/admin_kb_cat.$phpEx?mode=edit" ), *************** *** 377,381 **** 'S_ADMIN' => AUTH_ADMIN, - 'S_HIDDEN' => '<input type="hidden" name="catid" value="' . $cat_id . '">' ) ); --- 376,379 ---- *************** *** 399,403 **** $approval_edit_level = intval( $HTTP_POST_VARS['auth_approval_edit'] ); - if ( !$cat_name ) { --- 397,400 ---- *************** *** 437,460 **** } // Generate page ! ! $template->set_filenames( array( 'body' => 'admin/kb_cat_del_body.tpl' ) ! ); ! $template->assign_vars( array( 'L_DELETE_TITLE' => $lang['Cat_delete_title'], ! 'L_DELETE_DESCRIPTION' => $lang['Cat_delete_desc'], ! 'L_CAT_DELETE' => $lang['Cat_delete_title'], ! 'L_DELETE_ARTICLES' => $lang['Delete_all_articles'], ! 'L_CAT_NAME' => $lang['Article_category'], ! 'L_MOVE_CONTENTS' => $lang['Move_contents'], ! 'L_DELETE' => $lang['Move_and_Delete'], ! 'S_HIDDEN_FIELDS' => '<input type="hidden" name="catid" value="' . $cat_id . '">', ! 'S_SELECT_TO' => get_kb_cat_list( '', $cat_id, 0, true, 0, true ), ! 'S_ACTION' => append_sid( $module_root_path . "admin/admin_kb_cat.$phpEx?mode=delete" ), ! 'CAT_NAME' => $cat_name ) ! ); } else if ( $HTTP_POST_VARS['submit'] ) --- 434,458 ---- } + // // Generate page ! // ! $template->set_filenames( array( 'body' => 'admin/kb_cat_del_body.tpl' ) ); ! $template->assign_vars( array( ! 'L_DELETE_TITLE' => $lang['Cat_delete_title'], ! 'L_DELETE_DESCRIPTION' => $lang['Cat_delete_desc'], ! 'L_CAT_DELETE' => $lang['Cat_delete_title'], ! 'L_DELETE_ARTICLES' => $lang['Delete_all_articles'], ! 'L_CAT_NAME' => $lang['Article_category'], ! 'L_MOVE_CONTENTS' => $lang['Move_contents'], ! 'L_DELETE' => $lang['Move_and_Delete'], ! 'S_HIDDEN_FIELDS' => '<input type="hidden" name="catid" value="' . $cat_id . '">', ! 'S_SELECT_TO' => $mx_kb->get_kb_cat_list( '', $cat_id, 0, true, 0, true ), ! 'S_ACTION' => append_sid( $module_root_path . "admin/admin_kb_cat.$phpEx?mode=delete" ), ! 'CAT_NAME' => $cat_name ) ! ); } else if ( $HTTP_POST_VARS['submit'] ) *************** *** 628,632 **** --- 626,633 ---- 'S_ACTION' => append_sid( $module_root_path . "admin/admin_kb_cat.$phpEx?mode=create" ) ) ); + + // // get categories + // $sql = "SELECT * FROM " . KB_CATEGORIES_TABLE . " *************** *** 665,687 **** $template->assign_block_vars( 'catrow', array( 'CATEGORY' => $category_link, ! 'CAT_DESCRIPTION' => $category_details, ! 'CAT_ARTICLES' => $category_articles, ! 'U_EDIT' => $edit, ! 'U_DELETE' => $delete, ! 'U_UP' => $up, ! 'U_DOWN' => $down, ! 'ROW_COLOR' => '#' . $row_color, ! 'ROW_CLASS' => $row_class ) ! ); $i++; $ss++; ! $ss = get_kb_cat_subs_admin( $category_id, '1', ' ', $ss ); } break; } $template->pparse( 'body' ); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 666,689 ---- $template->assign_block_vars( 'catrow', array( 'CATEGORY' => $category_link, ! 'CAT_DESCRIPTION' => $category_details, ! 'CAT_ARTICLES' => $category_articles, ! 'U_EDIT' => $edit, ! 'U_DELETE' => $delete, ! 'U_UP' => $up, ! 'U_DOWN' => $down, ! 'ROW_COLOR' => '#' . $row_color, ! 'ROW_CLASS' => $row_class ! )); $i++; $ss++; ! $ss = $mx_kb->get_kb_cat_subs_admin( $category_id, '1', ' ', $ss ); } break; } + include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'body' ); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); Index: admin_kb_custom.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_custom.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_kb_custom.php 1 Oct 2005 14:13:46 -0000 1.10 --- admin_kb_custom.php 3 Nov 2005 12:13:33 -0000 1.11 *************** *** 30,34 **** if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['6_Custom_Field'] = $file; --- 30,34 ---- if ( !empty( $setmodules ) ) { ! include_once( $phpbb_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); $module['KB_title']['6_Custom_Field'] = $file; *************** *** 39,48 **** include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); - include( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); } else --- 39,45 ---- include( $phpbb_root_path . 'config.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_admin.'.$phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); + + include( $phpbb_root_path . 'kb/kb_common.' . $phpEx ); } else *************** *** 56,60 **** $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); --- 53,57 ---- $module_root_path = './../modules/mx_kb/'; require_once( $mx_root_path . 'extension.inc' ); ! include_once( $module_root_path . 'kb/includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); *************** *** 70,80 **** require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); - include( $module_root_path . 'includes/kb_constants.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); } --- 67,73 ---- require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! ! include( $module_root_path . 'kb/kb_common.' . $phpEx ); } *************** *** 300,306 **** } $template->pparse( 'admin' ); - - // MX Module include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 293,298 ---- } + include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'admin' ); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); |
|
From: Jon O. <jon...@us...> - 2005-11-03 12:13:52
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29593/modules/mx_kb Modified Files: kb.php Log Message: i am rewriting this module... Index: kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** kb.php 24 Oct 2005 20:15:33 -0000 1.24 --- kb.php 3 Nov 2005 12:13:34 -0000 1.25 *************** *** 34,51 **** // Start session management - $userdata = session_pagestart( $user_ip, PAGE_KB ); init_userprefs( $userdata ); - // End session management - - include( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); - include( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_auth.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_field.' . $phpEx ); - include( $phpbb_root_path . 'includes/functions_kb_mx.' . $phpEx ); - include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); - include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); } else // --------------------------------------------------------------------------------- mxBB Module MODE --- 34,40 ---- *************** *** 61,68 **** // Start session management - $userdata = session_pagestart( $user_ip, PAGE_INDEX ); mx_init_userprefs( $userdata ); - // End session management --- 50,55 ---- *************** *** 119,123 **** // ! // Read Block Settings // $title = !empty( $mx_block->block_info['block_title'] ) ? $mx_block->block_info['block_title'] : $lang['KB_title']; --- 106,110 ---- // ! // Read Block Settings (default mode) // $title = !empty( $mx_block->block_info['block_title'] ) ? $mx_block->block_info['block_title'] : $lang['KB_title']; *************** *** 125,143 **** $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' ); $is_block = true; global $images; } ! // Extract 'what posts to view info', the cool Array ;) ! $kb_type_select_var = $mx_block->get_parameters( 'kb_type_select' ); ! $kb_type_select_data = ( !empty( $kb_type_select_var ) ) ? unserialize( $kb_type_select_var ) : array(); ! ! include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); ! include( $module_root_path . 'includes/kb_constants.' . $phpEx ); ! include_once( $module_root_path . 'includes/functions_kb.' . $phpEx ); ! include_once( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); ! include_once( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); ! include_once( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); } --- 112,126 ---- $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' ); + // + // Extract 'what posts to view info', the cool Array ;) + // + $kb_type_select_var = $mx_block->get_parameters( 'kb_type_select' ); + $kb_type_select_data = ( !empty( $kb_type_select_var ) ) ? unserialize( $kb_type_select_var ) : array(); + $is_block = true; global $images; } ! } *************** *** 146,158 **** // ------------------------------------------------------------------------------------------------------------------------- ! // Start KB SCRIPT ! ! // Instanciate custom fields ! $kb_custom_field = new kb_custom_field(); ! $kb_custom_field->init(); $show_new = true; ! // page number if ( isset( $HTTP_POST_VARS['page_num'] ) || isset( $HTTP_GET_VARS['page_num'] ) ) --- 129,143 ---- // ------------------------------------------------------------------------------------------------------------------------- ! // =================================================== ! // Include the common file ! // =================================================== ! include_once( $module_root_path . 'kb/kb_common.' . $phpEx ); $show_new = true; ! // =================================================== ! // Get action variable other wise set it to the main ! // =================================================== ! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, 'main'); if ( isset( $HTTP_POST_VARS['page_num'] ) || isset( $HTTP_GET_VARS['page_num'] ) ) *************** *** 176,198 **** } ! // Pull all config data ! ! $sql = "SELECT * ! FROM " . KB_CONFIG_TABLE; ! if ( !$result = $db->sql_query( $sql ) ) ! { ! mx_message_die( CRITICAL_ERROR, "Could not query config information in kb_config", "", __LINE__, __FILE__, $sql ); ! } ! else ! { ! while ( $kb_config_row = $db->sql_fetchrow( $result ) ) ! { ! $config_name = $kb_config_row['config_name']; ! $config_value = $kb_config_row['config_value']; ! $kb_config[$config_name] = $config_value; ! } ! } ! // options $kb_wysiwyg = false; if ( $kb_config['wysiwyg'] ) // Html Textblock --- 161,167 ---- } ! // // options + // $kb_wysiwyg = false; if ( $kb_config['wysiwyg'] ) // Html Textblock *************** *** 214,320 **** } - if ( MXBB_MODULE ) - { - // Newssuite operation mode? - //------------------------------------------------------------------------- - $total_blockk = count( $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['blocks'] ); - - $kb_config['news_operate_mode'] = ''; - for( $blockk = 0; $blockk < $total_blockk; $blockk++ ) - { - if ( $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_source_switch']['parameter_value'] == 'kb' && $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_mode_operate']['parameter_value'] == 'Source' ) - { - $newssuite_select_par = $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_type_select']['parameter_value']; - // Extract 'what posts to view info', the cool Array ;) - $news_type_select_data = array(); - $news_type_select_temp = $newssuite_select_par; - $news_type_select_temp = stripslashes( $news_type_select_temp ); - $news_type_select_data = eval( "return " . $news_type_select_temp . ";" ); - $kb_config['news_operate_mode'] = true; - } - else - { - $kb_config['news_operate_mode'] = ''; - } - } - // ------------------------------------------------------------------------- - } - $is_admin = ( ( $userdata['user_level'] == ADMIN ) && $userdata['session_logged_in'] ) ? true : 0; ! // mode ! if ( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) ) ! { ! $mode = ( isset( $HTTP_POST_VARS['mode'] ) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; ! $mode = ( htmlspecialchars( $mode ) != 'cat' || intval ($HTTP_GET_VARS['cat'] ) != 0 ) ? htmlspecialchars( $mode ) : ''; ! } ! ! if ( isset( $HTTP_POST_VARS['stats'] ) || isset( $HTTP_GET_VARS['stats'] ) ) { ! $stats = ( isset( $HTTP_POST_VARS['stats'] ) ) ? $HTTP_POST_VARS['stats'] : $HTTP_GET_VARS['stats']; ! $stats = htmlspecialchars( $stats ); } ! $reader_mode = false; ! if ( $mode == 'article' ) ! { ! include( $module_root_path . 'includes/kb_article.' . $phpEx ); ! } ! else if ( $mode == 'cat' ) ! { ! include( $module_root_path . 'includes/kb_cat.' . $phpEx ); ! } ! else if ( $mode == 'add' ) ! { ! include( $module_root_path . 'includes/kb_post.' . $phpEx ); ! } ! else if ( $mode == 'search' ) ! { ! include( $module_root_path . 'includes/kb_search.' . $phpEx ); ! } ! else if ( $mode == 'edit' ) ! { ! include( $module_root_path . 'includes/kb_post.' . $phpEx ); ! } ! else if ( $mode == 'rate' ) ! { ! include( $module_root_path . 'includes/kb_rate.' . $phpEx ); ! } ! else if ( $mode == 'stats' ) ! { ! include( $module_root_path . 'includes/kb_stats.' . $phpEx ); ! } ! else if ( $mode == 'moderate' ) { ! include( $module_root_path . 'includes/kb_moderator.' . $phpEx ); } ! else ! { ! // DEFAULT ACTION ! $page_title = $lang['KB_title']; ! if ( !$is_block ) ! { ! include( $mx_root_path . 'includes/page_header.' . $phpEx ); ! } ! // load header ! include ( $module_root_path . "includes/kb_header." . $phpEx ); ! ! $template->set_filenames( array( 'body' => 'kb_index_body.tpl' ) ! ); ! ! $template->assign_vars( array( 'L_CATEGORY' => $lang['Category'], ! 'L_ARTICLES' => $lang['Articles'] ) ! ); ! get_kb_cat_index(); } ! $template->pparse( 'body' ); ! // load footer if ( !$print_version ) { ! include ( $module_root_path . "includes/kb_footer." . $phpEx ); } --- 183,239 ---- } $is_admin = ( ( $userdata['user_level'] == ADMIN ) && $userdata['session_logged_in'] ) ? true : 0; + $reader_mode = false; ! // =================================================== ! // if the database disabled give them a nice message ! // =================================================== ! if ( intval( $kb_config['disable'] ) ) { ! // mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); } ! // =================================================== ! // an array of all expected actions ! // =================================================== ! $actions = array( ! 'article' => 'article', ! 'cat' => 'cat', ! 'add' => 'post', ! 'search' => 'search', ! 'edit' => 'post', ! 'rate' => 'rate', ! 'stats' => 'stats', ! 'moderate' => 'moderator', ! 'main' => 'main' ); ! ! // =================================================== ! // Lets Build the page ! // =================================================== ! if ( !$is_block && !$print_version) { ! include( $mx_root_path . 'includes/page_header.' . $phpEx ); } ! ! $mx_kb->module( $actions[$mode] ); ! $mx_kb->modules[$actions[$mode]]->main( $mode ); ! // ! // load module header ! // ! if ( !$print_version ) ! { ! kb_page_header( $page_title ); } ! $template->pparse( 'body' ); ! // ! // load module footer ! // if ( !$print_version ) { ! kb_page_footer(); } *************** *** 323,326 **** include( $mx_root_path . 'includes/page_tail.' . $phpEx ); } - ?> \ No newline at end of file --- 242,244 ---- |
|
From: Jon O. <jon...@us...> - 2005-11-03 12:13:52
|
Update of /cvsroot/mxbb/mx_kb/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29593/modules/mx_kb/language/lang_english Modified Files: lang_main.php Log Message: i am rewriting this module... Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_main.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_main.php 23 Oct 2005 02:01:52 -0000 1.3 --- lang_main.php 3 Nov 2005 12:13:34 -0000 1.4 *************** *** 18,22 **** * (at your option) any later version. */ ! $lang['KB_title'] = 'Knowledge Base'; $lang['Article'] = 'Article'; --- 18,22 ---- * (at your option) any later version. */ ! $lang['KB_title'] = 'Knowledge Base'; $lang['Article'] = 'Article'; |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-10-30 19:01:44
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27304/modules/mx_coreblocks Modified Files: mx_blockcp.php Log Message: Fixed bug #5 for now... Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_blockcp.php 22 Oct 2005 10:51:02 -0000 1.6 --- mx_blockcp.php 30 Oct 2005 19:01:36 -0000 1.7 *************** *** 185,189 **** $has_dyn_block_id = $dynamic_block_id > 0 ? '&dynamic_block='.$dynamic_block_id : ''; ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&module_id=$module_id&function_id=$function_id&portalpage=$portalpage$has_dyn_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 185,189 ---- $has_dyn_block_id = $dynamic_block_id > 0 ? '&dynamic_block='.$dynamic_block_id : ''; ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid( PORTAL_URL ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&module_id=$module_id&function_id=$function_id&portalpage=$portalpage$has_dyn_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); |
|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-10-29 17:41:00
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1579/admin Modified Files: index.php Log Message: Minor oversight on my part... thanks to selven for the notification and fix regarding this. Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** index.php 24 Oct 2005 00:55:40 -0000 1.16 --- index.php 29 Oct 2005 17:40:53 -0000 1.17 *************** *** 804,808 **** { $phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; ! $phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $phpbb_latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; } } --- 804,808 ---- { $phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; ! $phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; } } |
Update of /cvsroot/mxbb/core/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16105/doc Removed Files: index.html mxdoc1_html_325bec41.png mxdoc1_html_34da6168.png mxdoc1_html_3d772f2d.png mxdoc1_html_4b944d03.png mxdoc1_html_5189f868.png mxdoc1_html_79fc0929.png mxdoc1_html_7a3cbf3e.png mxdoc1_html_a1f3121.png mxdoc1_html_db62c38.png mxdoc1_html_m21a6e4c9.png mxdoc1_html_m4701d175.png mxdoc1_html_m5e02815.png mxdoc1_html_m7647fe38.png mxdoc1_html_m76a37b83.png Log Message: removed docs folder --- mxdoc1_html_db62c38.png DELETED --- --- mxdoc1_html_5189f868.png DELETED --- --- mxdoc1_html_m7647fe38.png DELETED --- --- mxdoc1_html_3d772f2d.png DELETED --- --- index.html DELETED --- --- mxdoc1_html_4b944d03.png DELETED --- --- mxdoc1_html_34da6168.png DELETED --- --- mxdoc1_html_m76a37b83.png DELETED --- --- mxdoc1_html_7a3cbf3e.png DELETED --- --- mxdoc1_html_325bec41.png DELETED --- --- mxdoc1_html_a1f3121.png DELETED --- --- mxdoc1_html_m4701d175.png DELETED --- --- mxdoc1_html_79fc0929.png DELETED --- --- mxdoc1_html_m5e02815.png DELETED --- --- mxdoc1_html_m21a6e4c9.png DELETED --- |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:19:38
|
Update of /cvsroot/mxbb/mx_smartor/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2323/modules/mx_smartor/includes Modified Files: album_cat.php album_cat_sort.php album_comment_delete.php album_personal_cat_admin.php album_upload.php Log Message: replaced all message_die with mx_message_die Index: album_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** album_cat.php 1 Oct 2005 14:17:36 -0000 1.6 --- album_cat.php 24 Oct 2005 20:19:29 -0000 1.7 *************** *** 54,58 **** else { ! message_die( GENERAL_ERROR, 'No categories specified' ); } // --- Album Category Hierarchy : end --- 54,58 ---- else { ! mx_message_die( GENERAL_ERROR, 'No categories specified' ); } // --- Album Category Hierarchy : end *************** *** 67,71 **** else { ! message_die( GENERAL_ERROR, 'No categories specified' ); } // --- Album Category Hierarchy : begin --- 67,71 ---- else { ! mx_message_die( GENERAL_ERROR, 'No categories specified' ); } // --- Album Category Hierarchy : begin Index: album_cat_sort.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_cat_sort.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** album_cat_sort.php 1 Oct 2005 14:17:36 -0000 1.3 --- album_cat_sort.php 24 Oct 2005 20:19:29 -0000 1.4 *************** *** 202,206 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql ); } --- 202,206 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql ); } Index: album_comment_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_comment_delete.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** album_comment_delete.php 1 Oct 2005 14:17:36 -0000 1.4 --- album_comment_delete.php 24 Oct 2005 20:19:29 -0000 1.5 *************** *** 116,120 **** if ( empty( $thispic ) ) { ! message_die( GENERAL_ERROR, $lang['Pic_not_exist'] ); } // ------------------------------------ --- 116,120 ---- if ( empty( $thispic ) ) { ! mx_message_die( GENERAL_ERROR, $lang['Pic_not_exist'] ); } // ------------------------------------ Index: album_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_upload.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** album_upload.php 22 Oct 2005 11:53:36 -0000 1.5 --- album_upload.php 24 Oct 2005 20:19:29 -0000 1.6 *************** *** 70,74 **** if ( !album_validate_jumpbox_selection( $cat_id ) ) { ! message_die( GENERAL_ERROR, $lang['No_valid_category_selected'] ); } --- 70,74 ---- if ( !album_validate_jumpbox_selection( $cat_id ) ) { ! mx_message_die( GENERAL_ERROR, $lang['No_valid_category_selected'] ); } *************** *** 322,326 **** if ( $row['count'] >= $album_config[$check_user_limit] ) { ! message_die( GENERAL_MESSAGE, $lang['User_reached_pics_quota'] ); } --- 322,326 ---- if ( $row['count'] >= $album_config[$check_user_limit] ) { ! mx_message_die( GENERAL_MESSAGE, $lang['User_reached_pics_quota'] ); } *************** *** 347,351 **** if ( ( $row['count'] >= $album_config['personal_gallery_limit'] ) and ( $album_config['personal_gallery_limit'] >= 0 ) ) { ! message_die( GENERAL_MESSAGE, $lang['Album_reached_quota'] ); } --- 347,351 ---- if ( ( $row['count'] >= $album_config['personal_gallery_limit'] ) and ( $album_config['personal_gallery_limit'] >= 0 ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['Album_reached_quota'] ); } Index: album_personal_cat_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_personal_cat_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** album_personal_cat_admin.php 1 Oct 2005 14:17:36 -0000 1.3 --- album_personal_cat_admin.php 24 Oct 2005 20:19:29 -0000 1.4 *************** *** 65,69 **** if ( empty( $username ) ) { ! message_die( GENERAL_MESSAGE, $lang['No_user_id_specified'] ); } // ------------------------------------------------------------------------ --- 65,69 ---- if ( empty( $username ) ) { ! mx_message_die( GENERAL_MESSAGE, $lang['No_user_id_specified'] ); } // ------------------------------------------------------------------------ *************** *** 116,120 **** $message = $lang['No_Personal_Category_admin']; $message .= "<br /><br />" . sprintf( $lang['Click_return_album_index'], "<a href=\"" . append_sid( album_append_uid( this_smartor_mxurl() ) ) . "\">", "</a>" ); ! message_die( GENERAL_MESSAGE, $message ); exit(); // really not needed } --- 116,120 ---- $message = $lang['No_Personal_Category_admin']; $message .= "<br /><br />" . sprintf( $lang['Click_return_album_index'], "<a href=\"" . append_sid( album_append_uid( this_smartor_mxurl() ) ) . "\">", "</a>" ); ! mx_message_die( GENERAL_MESSAGE, $message ); exit(); // really not needed } *************** *** 141,145 **** } ! message_die( GENERAL_MESSAGE, $message ); } // ------------------------------------------------------------------------ --- 141,145 ---- } ! mx_message_die( GENERAL_MESSAGE, $message ); } // ------------------------------------------------------------------------ *************** *** 189,193 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not query number of sub category for user' , '' , __LINE__, __FILE__, $sql ); } --- 189,193 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not query number of sub category for user' , '' , __LINE__, __FILE__, $sql ); } *************** *** 232,241 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql ); } if ( $db->sql_numrows( $result ) == 0 ) { ! message_die( GENERAL_ERROR, 'The requested category is not existed' ); } --- 232,241 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql ); } if ( $db->sql_numrows( $result ) == 0 ) { ! mx_message_die( GENERAL_ERROR, 'The requested category is not existed' ); } *************** *** 345,349 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql ); } --- 345,349 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql ); } *************** *** 363,367 **** if ( $cat_found == false ) { ! message_die( GENERAL_ERROR, 'The requested category is not existed' ); } --- 363,367 ---- if ( $cat_found == false ) { ! mx_message_die( GENERAL_ERROR, 'The requested category is not existed' ); } *************** *** 519,523 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 519,523 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not query Album Categories information', '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 530,534 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not create new Album Category', '', __LINE__, __FILE__, $sql ); } // Return a message... --- 530,534 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not create new Album Category', '', __LINE__, __FILE__, $sql ); } // Return a message... *************** *** 567,571 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not update this Album Category', '', __LINE__, __FILE__, $sql ); } // Return a message... --- 567,571 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not update this Album Category', '', __LINE__, __FILE__, $sql ); } // Return a message... *************** *** 587,591 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not query Album information for existing child categories', '', __LINE__, __FILE__, $sql ); } // the selected category is parent to another...proceed --- 587,591 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not query Album information for existing child categories', '', __LINE__, __FILE__, $sql ); } // the selected category is parent to another...proceed *************** *** 611,615 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not query Album information for existing parent categories', '', __LINE__, __FILE__, $sql ); } --- 611,615 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not query Album information for existing parent categories', '', __LINE__, __FILE__, $sql ); } *************** *** 633,637 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not query Album information', '', __LINE__, __FILE__, $sql ); } $picrow = array(); --- 633,637 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not query Album information', '', __LINE__, __FILE__, $sql ); } $picrow = array(); *************** *** 663,667 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete Ratings information', '', __LINE__, __FILE__, $sql ); } // Delete all related comments --- 663,667 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete Ratings information', '', __LINE__, __FILE__, $sql ); } // Delete all related comments *************** *** 670,674 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete Comments information', '', __LINE__, __FILE__, $sql ); } // Delete pic entries in db --- 670,674 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete Comments information', '', __LINE__, __FILE__, $sql ); } // Delete pic entries in db *************** *** 677,681 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete pic entries in the DB', '', __LINE__, __FILE__, $sql ); } } --- 677,681 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete pic entries in the DB', '', __LINE__, __FILE__, $sql ); } } *************** *** 685,689 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql ); } // Re-order the rest of categories --- 685,689 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql ); } // Re-order the rest of categories *************** *** 700,704 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not update this Category content', '', __LINE__, __FILE__, $sql ); } // This category is now emptied, we can remove it! --- 700,704 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not update this Category content', '', __LINE__, __FILE__, $sql ); } // This category is now emptied, we can remove it! *************** *** 707,711 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql ); } // Re-order the rest of categories --- 707,711 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql ); } // Re-order the rest of categories |
Update of /cvsroot/mxbb/mx_sitestats In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2225/modules/mx_sitestats Modified Files: adminstats.php collector.php db_install.php db_uninstall.php fastestusers.php monthlyposts.php monthlytopics.php monthlyusers.php mostintopics.php sitestaff.php topavatars.php topposters.php topposters_tiny.php topreferers.php topsmilies.php topstarters.php toptopics.php topwords.php usersranks.php Log Message: replaced all message_die with mx_message_die Index: topwords.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/topwords.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topwords.php 23 Oct 2005 18:52:36 -0000 1.2 --- topwords.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 55,59 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve words data", "", __LINE__, __FILE__, $sql ); } $words_data = $db->sql_fetchrowset( $result ); --- 55,59 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve words data", "", __LINE__, __FILE__, $sql ); } $words_data = $db->sql_fetchrowset( $result ); *************** *** 67,71 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve words data", "", __LINE__, __FILE__, $sql ); } $words_count = $db->sql_numrows( $result ); --- 67,71 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve words data", "", __LINE__, __FILE__, $sql ); } $words_count = $db->sql_numrows( $result ); Index: usersranks.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/usersranks.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** usersranks.php 23 Oct 2005 18:52:36 -0000 1.2 --- usersranks.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 56,60 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve ranks data", '', __LINE__, __FILE__, $sql ); } $ranks_count = $db->sql_numrows( $result ); --- 56,60 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve ranks data", '', __LINE__, __FILE__, $sql ); } $ranks_count = $db->sql_numrows( $result ); *************** *** 91,95 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $user_data = $db->sql_fetchrowset( $result ); --- 91,95 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $user_data = $db->sql_fetchrowset( $result ); Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/db_uninstall.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** db_uninstall.php 15 Oct 2005 22:18:27 -0000 1.1 --- db_uninstall.php 24 Oct 2005 20:19:01 -0000 1.2 *************** *** 46,50 **** if ( !defined( 'SITESTATS_COUNTER_TABLE' ) ) { ! message_die( GENERAL_ERROR, "Couldn't load file includes/common.$phpEx", "", __LINE__, __FILE__ ); } // SQL statements to drop module tables... --- 46,50 ---- if ( !defined( 'SITESTATS_COUNTER_TABLE' ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't load file includes/common.$phpEx", "", __LINE__, __FILE__ ); } // SQL statements to drop module tables... Index: topstarters.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/topstarters.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topstarters.php 23 Oct 2005 18:52:36 -0000 1.2 --- topstarters.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 59,63 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $user_count = $db->sql_numrows( $result ); --- 59,63 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $user_count = $db->sql_numrows( $result ); Index: topavatars.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/topavatars.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topavatars.php 23 Oct 2005 18:52:36 -0000 1.2 --- topavatars.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 58,62 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve users data", "", __LINE__, __FILE__, $sql ); } $user_count = $db->sql_numrows( $result ); --- 58,62 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve users data", "", __LINE__, __FILE__, $sql ); } $user_count = $db->sql_numrows( $result ); Index: collector.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/collector.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** collector.php 23 Oct 2005 18:52:36 -0000 1.2 --- collector.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 49,53 **** if ( $userdata['user_level'] == ADMIN ) { ! // message_die(GENERAL_ERROR, "Could not update SiteStats counter information for page: " . $sitestats_counter->page, // "", __LINE__, __FILE__, $sitestats_counter->sql); } --- 49,53 ---- if ( $userdata['user_level'] == ADMIN ) { ! // mx_message_die(GENERAL_ERROR, "Could not update SiteStats counter information for page: " . $sitestats_counter->page, // "", __LINE__, __FILE__, $sitestats_counter->sql); } *************** *** 62,66 **** if ( $userdata['user_level'] == ADMIN ) { ! // message_die(GENERAL_ERROR, "Couldn't insert new referer", "", __LINE__, __FILE__, $sql); } } --- 62,66 ---- if ( $userdata['user_level'] == ADMIN ) { ! // mx_message_die(GENERAL_ERROR, "Couldn't insert new referer", "", __LINE__, __FILE__, $sql); } } Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/db_install.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** db_install.php 15 Oct 2005 22:18:27 -0000 1.1 --- db_install.php 24 Oct 2005 20:19:01 -0000 1.2 *************** *** 49,53 **** if ( !defined( 'SITESTATS_COUNTER_TABLE' ) ) { ! message_die( GENERAL_ERROR, "Couldn't load file includes/common.$phpEx", "", __LINE__, __FILE__ ); } // SQL statements to build required module tables... --- 49,53 ---- if ( !defined( 'SITESTATS_COUNTER_TABLE' ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't load file includes/common.$phpEx", "", __LINE__, __FILE__ ); } // SQL statements to build required module tables... Index: topsmilies.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/topsmilies.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topsmilies.php 23 Oct 2005 18:52:36 -0000 1.2 --- topsmilies.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 105,109 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve smilies data", '', __LINE__, __FILE__, $sql ); } --- 105,109 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve smilies data", '', __LINE__, __FILE__, $sql ); } *************** *** 120,124 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve smilies data", '', __LINE__, __FILE__, $sql ); } $smile_codes = $db->sql_fetchrowset( $result ); --- 120,124 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve smilies data", '', __LINE__, __FILE__, $sql ); } $smile_codes = $db->sql_fetchrowset( $result ); *************** *** 131,135 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve smilies data", '', __LINE__, __FILE__, $sql ); } if ( $smile_pref == 0 ) --- 131,135 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve smilies data", '', __LINE__, __FILE__, $sql ); } if ( $smile_pref == 0 ) Index: monthlytopics.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/monthlytopics.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** monthlytopics.php 23 Oct 2005 18:52:36 -0000 1.2 --- monthlytopics.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 58,62 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve topics data", '', __LINE__, __FILE__, $sql ); } $topics_count = $db->sql_numrows( $result ); --- 58,62 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve topics data", '', __LINE__, __FILE__, $sql ); } $topics_count = $db->sql_numrows( $result ); Index: topposters_tiny.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/topposters_tiny.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topposters_tiny.php 23 Oct 2005 18:52:36 -0000 1.2 --- topposters_tiny.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 57,61 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } --- 57,61 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } Index: fastestusers.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/fastestusers.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fastestusers.php 23 Oct 2005 18:52:36 -0000 1.2 --- fastestusers.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 62,66 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $user_count = $db->sql_numrows( $result ); --- 62,66 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $user_count = $db->sql_numrows( $result ); Index: topposters.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/topposters.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topposters.php 23 Oct 2005 18:52:36 -0000 1.2 --- topposters.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 58,62 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } --- 58,62 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } Index: sitestaff.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/sitestaff.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sitestaff.php 23 Oct 2005 18:52:36 -0000 1.2 --- sitestaff.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 59,63 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query forums.", '', __LINE__, __FILE__, $sql ); } while ( $row = $db->sql_fetchrow( $result ) ) --- 59,63 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query forums.", '', __LINE__, __FILE__, $sql ); } while ( $row = $db->sql_fetchrow( $result ) ) *************** *** 74,78 **** if ( !( $results = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't obtain user information.", '', __LINE__, __FILE__, $sql ); } --- 74,78 ---- if ( !( $results = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't obtain user information.", '', __LINE__, __FILE__, $sql ); } *************** *** 129,133 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Error getting user last post time", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 129,133 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Error getting user last post time", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 149,153 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't obtain ranks information.", '', __LINE__, __FILE__, $sql ); } $ranksrow = array(); --- 149,153 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't obtain ranks information.", '', __LINE__, __FILE__, $sql ); } $ranksrow = array(); Index: monthlyposts.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/monthlyposts.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** monthlyposts.php 23 Oct 2005 18:52:36 -0000 1.2 --- monthlyposts.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 58,62 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve posts data", '', __LINE__, __FILE__, $sql ); } $posts_count = $db->sql_numrows( $result ); --- 58,62 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve posts data", '', __LINE__, __FILE__, $sql ); } $posts_count = $db->sql_numrows( $result ); Index: adminstats.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/adminstats.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** adminstats.php 23 Oct 2005 18:52:36 -0000 1.2 --- adminstats.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 244,248 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 244,248 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 255,259 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve configuration data", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrowset( $result ); --- 255,259 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve configuration data", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrowset( $result ); Index: topreferers.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/topreferers.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** topreferers.php 23 Oct 2005 18:52:36 -0000 1.2 --- topreferers.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 51,55 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve HTTP Referers data", '', __LINE__, __FILE__, $sql ); } $numrows = $db->sql_numrows( $result ); --- 51,55 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve HTTP Referers data", '', __LINE__, __FILE__, $sql ); } $numrows = $db->sql_numrows( $result ); Index: mostintopics.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/mostintopics.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mostintopics.php 23 Oct 2005 18:52:36 -0000 1.2 --- mostintopics.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 62,66 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve topic data", '', __LINE__, __FILE__, $sql ); } $topic_data = $db->sql_fetchrowset( $result ); --- 62,66 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve topic data", '', __LINE__, __FILE__, $sql ); } $topic_data = $db->sql_fetchrowset( $result ); *************** *** 86,90 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve topic data", '', __LINE__, __FILE__, $sql ); } $least_first_place = $topiccount - count( $topic_data ) + 1; --- 86,90 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve topic data", '', __LINE__, __FILE__, $sql ); } $least_first_place = $topiccount - count( $topic_data ) + 1; Index: toptopics.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/toptopics.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** toptopics.php 23 Oct 2005 18:52:36 -0000 1.2 --- toptopics.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 62,66 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn\'t retrieve topic data', '', __LINE__, __FILE__, $sql ); } $topic_count = $db->sql_numrows( $result ); --- 62,66 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t retrieve topic data', '', __LINE__, __FILE__, $sql ); } $topic_count = $db->sql_numrows( $result ); *************** *** 87,91 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn\'t retrieve topic data', '', __LINE__, __FILE__, $sql ); } $topic_count = $db->sql_numrows( $result ); --- 87,91 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn\'t retrieve topic data', '', __LINE__, __FILE__, $sql ); } $topic_count = $db->sql_numrows( $result ); Index: monthlyusers.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/monthlyusers.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** monthlyusers.php 23 Oct 2005 18:52:36 -0000 1.2 --- monthlyusers.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 59,63 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $users_count = $db->sql_numrows( $result ); --- 59,63 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't retrieve users data", '', __LINE__, __FILE__, $sql ); } $users_count = $db->sql_numrows( $result ); |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:19:16
|
Update of /cvsroot/mxbb/mx_sitestats/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2225/modules/mx_sitestats/includes Modified Files: common.php Log Message: replaced all message_die with mx_message_die Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/includes/common.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** common.php 15 Oct 2005 22:18:28 -0000 1.1 --- common.php 24 Oct 2005 20:19:01 -0000 1.2 *************** *** 75,79 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Couldn't query SiteStats config table", "", __LINE__, __FILE__, $sql ); } else --- 75,79 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query SiteStats config table", "", __LINE__, __FILE__, $sql ); } else *************** *** 414,422 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( CRITICAL_ERROR, 'Couldn\'t query database for theme info.' ); } if ( !$row = $db->sql_fetchrow( $result ) ) { ! message_die( CRITICAL_ERROR, 'Couldn\'t get theme data for themes_id=' . $style . '.' ); } --- 414,422 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( CRITICAL_ERROR, 'Couldn\'t query database for theme info.' ); } if ( !$row = $db->sql_fetchrow( $result ) ) { ! mx_message_die( CRITICAL_ERROR, 'Couldn\'t get theme data for themes_id=' . $style . '.' ); } |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:19:10
|
Update of /cvsroot/mxbb/mx_sitestats/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2225/modules/mx_sitestats/admin Modified Files: admin_counter.php admin_referers.php admin_sitestats.php Log Message: replaced all message_die with mx_message_die Index: admin_referers.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/admin/admin_referers.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_referers.php 23 Oct 2005 18:52:36 -0000 1.2 --- admin_referers.php 24 Oct 2005 20:19:01 -0000 1.3 *************** *** 71,75 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't update HTTP Referer (id=" . $id_list[$i] . ") from database", '', __LINE__, __FILE__, $sql ); } } --- 71,75 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't update HTTP Referer (id=" . $id_list[$i] . ") from database", '', __LINE__, __FILE__, $sql ); } } *************** *** 82,86 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't delete HTTP Referer (id=" . $id_list[$i] . ") from database", '', __LINE__, __FILE__, $sql ); } } --- 82,86 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete HTTP Referer (id=" . $id_list[$i] . ") from database", '', __LINE__, __FILE__, $sql ); } } *************** *** 91,95 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't delete HTTP Referers from database", '', __LINE__, __FILE__, $sql ); } } --- 91,95 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete HTTP Referers from database", '', __LINE__, __FILE__, $sql ); } } *************** *** 103,107 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Could not query SiteStats TopReferers block information", "", __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 103,107 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Could not query SiteStats TopReferers block information", "", __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 139,143 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Count", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 139,143 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Count", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 146,150 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Count", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); --- 146,150 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Count", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); *************** *** 173,177 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Information", '', __LINE__, __FILE__, $sql ); } $rowset = $db->sql_fetchrowset( $result ); --- 173,177 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query HTTP Referers Information", '', __LINE__, __FILE__, $sql ); } $rowset = $db->sql_fetchrowset( $result ); Index: admin_sitestats.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/admin/admin_sitestats.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_sitestats.php 15 Oct 2005 22:18:28 -0000 1.1 --- admin_sitestats.php 24 Oct 2005 20:19:01 -0000 1.2 *************** *** 61,65 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't query SiteStats config table", "", __LINE__, __FILE__, $sql ); } while ( $row = $db->sql_fetchrow( $result ) ) --- 61,65 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't query SiteStats config table", "", __LINE__, __FILE__, $sql ); } while ( $row = $db->sql_fetchrow( $result ) ) *************** *** 75,79 **** if ( !$db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Failed to update SiteStats configuration for $config_name", "", __LINE__, __FILE__, $sql ); } } --- 75,79 ---- if ( !$db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Failed to update SiteStats configuration for $config_name", "", __LINE__, __FILE__, $sql ); } } *************** *** 87,91 **** sprintf( $lang['SiteStats_Settings_return'], '<a href="' . append_sid( @basename( __FILE__ ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } --- 87,91 ---- sprintf( $lang['SiteStats_Settings_return'], '<a href="' . append_sid( @basename( __FILE__ ) ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } Index: admin_counter.php =================================================================== RCS file: /cvsroot/mxbb/mx_sitestats/admin/admin_counter.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_counter.php 15 Oct 2005 22:18:28 -0000 1.1 --- admin_counter.php 24 Oct 2005 20:19:01 -0000 1.2 *************** *** 101,105 **** if ( !$sitestats_counter->updateCounter() ) { ! message_die( GENERAL_ERROR, "Couldn't update SiteStats counter for page: " . $sitestats_counter->page, "", __LINE__, __FILE__, $sitestats_counter->sql ); } --- 101,105 ---- if ( !$sitestats_counter->updateCounter() ) { ! mx_message_die( GENERAL_ERROR, "Couldn't update SiteStats counter for page: " . $sitestats_counter->page, "", __LINE__, __FILE__, $sitestats_counter->sql ); } *************** *** 111,115 **** if ( !$sitestats_counter->deleteCounter() ) { ! message_die( GENERAL_ERROR, "Couldn't delete SiteStats counter for page: " . $sitestats_counter->page, "", __LINE__, __FILE__, $sitestats_counter->sql ); } --- 111,115 ---- if ( !$sitestats_counter->deleteCounter() ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete SiteStats counter for page: " . $sitestats_counter->page, "", __LINE__, __FILE__, $sitestats_counter->sql ); } *************** *** 125,129 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Couldn't read counter data", "", __LINE__, __FILE__, $sql ); } $rs_counter = $db->sql_fetchrowset( $result ); --- 125,129 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't read counter data", "", __LINE__, __FILE__, $sql ); } $rs_counter = $db->sql_fetchrowset( $result ); *************** *** 187,191 **** $message = '<br />' . ( empty( $errmsg ) ? ' ' : '<div style="width:80%; padding:10px; border:solid red 1px;">' . $errmsg . '</div>' ) . '<br />' . '<script>function doOnLoad() {document.forms[0].elements[0].focus();} window.onload=doOnLoad;</script>' . '<form method="post" action="' . $my_script_name . '">' . '<table border="0" cellpadding="4" cellspacing="0">' . $s_field_id . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>' . '<input type="text" name="pg" size="100" value="' . $mypg . '" class="post" /></td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>' . '<input type="text" name="ch" size="100" value="' . $mych . '" class="post" /></td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>' . '<input type="text" name="cs" size="100" value="' . $mycs . '" class="post" /></td></tr>' . '</table> <br /> <br />' . $s_hidden_fields . '<input type="submit" name="cancel" value="' . $lang['Cancel'] . '" class="liteoption" /> ' . '<input type="submit" name="submit" value="' . $lang['Submit'] . '" class="liteoption" />' . '</form>'; ! message_die( GENERAL_MESSAGE, $message, $my_script_title ); } --- 187,191 ---- $message = '<br />' . ( empty( $errmsg ) ? ' ' : '<div style="width:80%; padding:10px; border:solid red 1px;">' . $errmsg . '</div>' ) . '<br />' . '<script>function doOnLoad() {document.forms[0].elements[0].focus();} window.onload=doOnLoad;</script>' . '<form method="post" action="' . $my_script_name . '">' . '<table border="0" cellpadding="4" cellspacing="0">' . $s_field_id . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>' . '<input type="text" name="pg" size="100" value="' . $mypg . '" class="post" /></td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>' . '<input type="text" name="ch" size="100" value="' . $mych . '" class="post" /></td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>' . '<input type="text" name="cs" size="100" value="' . $mycs . '" class="post" /></td></tr>' . '</table> <br /> <br />' . $s_hidden_fields . '<input type="submit" name="cancel" value="' . $lang['Cancel'] . '" class="liteoption" /> ' . '<input type="submit" name="submit" value="' . $lang['Submit'] . '" class="liteoption" />' . '</form>'; ! mx_message_die( GENERAL_MESSAGE, $message, $my_script_title ); } *************** *** 201,205 **** $message = '<form method="post" action="' . $my_script_name . '">' . '<table border="0" cellpadding="4" cellspacing="0">' . '<tr><td><b>' . $lang['SiteStats_Counter_id'] . ':</b> </td><td>[ ' . $myid . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>[ ' . $mypg . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>[ ' . $mych . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>[ ' . $mycs . ' ]</td></tr>' . '</table> <br /> <br />' . '<div style="width:80%; padding:10px; border:solid red 1px;">' . $lang['Confirm_delete_counter'] . '<br /> <br />' . $s_hidden_fields . '<input type="submit" name="cancel" value="' . $lang['No'] . '" class="liteoption" /> ' . '<input type="submit" name="submit" value="' . $lang['Yes'] . '" class="liteoption" />' . '</div><br /> ' . '</form>'; ! message_die( GENERAL_MESSAGE, $message, $my_script_title ); } --- 201,205 ---- $message = '<form method="post" action="' . $my_script_name . '">' . '<table border="0" cellpadding="4" cellspacing="0">' . '<tr><td><b>' . $lang['SiteStats_Counter_id'] . ':</b> </td><td>[ ' . $myid . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>[ ' . $mypg . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>[ ' . $mych . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>[ ' . $mycs . ' ]</td></tr>' . '</table> <br /> <br />' . '<div style="width:80%; padding:10px; border:solid red 1px;">' . $lang['Confirm_delete_counter'] . '<br /> <br />' . $s_hidden_fields . '<input type="submit" name="cancel" value="' . $lang['No'] . '" class="liteoption" /> ' . '<input type="submit" name="submit" value="' . $lang['Yes'] . '" class="liteoption" />' . '</div><br /> ' . '</form>'; ! mx_message_die( GENERAL_MESSAGE, $message, $my_script_title ); } *************** *** 218,222 **** $message = '<table border="0" cellpadding="4" cellspacing="0">' . $s_field_id . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>[ ' . $mypg . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>[ ' . intval( $mych ) . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>[ ' . intval( $mycs ) . ' ]</td></tr>' . '</table> <br /> <br />' . '<div style="width:80%; padding:10px; border:solid blue 1px;">' . $lang['Counter_Config_updated'] . '<br /> <br />' . sprintf( $lang['Click_return_Counter_admin'], '<a href="' . append_sid( $my_script_name ) . '">', '</a>' ) . '</div><br /> '; ! message_die( GENERAL_MESSAGE, $message, $my_script_title ); } --- 218,222 ---- $message = '<table border="0" cellpadding="4" cellspacing="0">' . $s_field_id . '<tr><td><b>' . $lang['SiteStats_Counter_page'] . ':</b> </td><td>[ ' . $mypg . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_hits'] . ':</b> </td><td>[ ' . intval( $mych ) . ' ]</td></tr>' . '<tr><td><b>' . $lang['SiteStats_Counter_sess'] . ':</b> </td><td>[ ' . intval( $mycs ) . ' ]</td></tr>' . '</table> <br /> <br />' . '<div style="width:80%; padding:10px; border:solid blue 1px;">' . $lang['Counter_Config_updated'] . '<br /> <br />' . sprintf( $lang['Click_return_Counter_admin'], '<a href="' . append_sid( $my_script_name ) . '">', '</a>' ) . '</div><br /> '; ! mx_message_die( GENERAL_MESSAGE, $message, $my_script_title ); } |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:45
|
Update of /cvsroot/mxbb/mx_quotations In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2039/modules/mx_quotations Modified Files: mx_last_quotations.php mx_quotations.php mx_random_quotation.php Log Message: replaced all message_die with mx_message_die Index: mx_last_quotations.php =================================================================== RCS file: /cvsroot/mxbb/mx_quotations/mx_last_quotations.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_last_quotations.php 23 Oct 2005 18:52:11 -0000 1.5 --- mx_last_quotations.php 24 Oct 2005 20:18:37 -0000 1.6 *************** *** 58,62 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( "Could not obtain Quotations Information:<br>$sql" ); } --- 58,62 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( "Could not obtain Quotations Information:<br>$sql" ); } Index: mx_random_quotation.php =================================================================== RCS file: /cvsroot/mxbb/mx_quotations/mx_random_quotation.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_random_quotation.php 23 Oct 2005 18:52:11 -0000 1.4 --- mx_random_quotation.php 24 Oct 2005 20:18:37 -0000 1.5 *************** *** 53,57 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( "Could not obtain Quotations Information:<br>$sql" ); } --- 53,57 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( "Could not obtain Quotations Information:<br>$sql" ); } Index: mx_quotations.php =================================================================== RCS file: /cvsroot/mxbb/mx_quotations/mx_quotations.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_quotations.php 23 Oct 2005 18:52:11 -0000 1.8 --- mx_quotations.php 24 Oct 2005 20:18:37 -0000 1.9 *************** *** 72,76 **** else { ! message_die( CRITICAL_MESSAGE, "Hacking attempt" ); } break; --- 72,76 ---- else { ! mx_message_die( CRITICAL_MESSAGE, "Hacking attempt" ); } break; *************** *** 83,87 **** else { ! message_die( CRITICAL_MESSAGE, "Hacking attempt" ); } break; --- 83,87 ---- else { ! mx_message_die( CRITICAL_MESSAGE, "Hacking attempt" ); } break; *************** *** 94,98 **** else { ! message_die( CRITICAL_MESSAGE, "Hacking attempt" ); } break; --- 94,98 ---- else { ! mx_message_die( CRITICAL_MESSAGE, "Hacking attempt" ); } break; *************** *** 203,207 **** if ( !( $result3 = $db->sql_query( $sql3 ) ) ) { ! message_die( GENERAL_ERROR, 'Could not query quotations information', '', __LINE__, __FILE__, $sql3 ); } while ( $row3 = $db->sql_fetchrow( $result2 ) ) --- 203,207 ---- if ( !( $result3 = $db->sql_query( $sql3 ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not query quotations information', '', __LINE__, __FILE__, $sql3 ); } while ( $row3 = $db->sql_fetchrow( $result2 ) ) *************** *** 255,259 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( "Could not obtain Quotations information:<br>$sql" ); } --- 255,259 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( "Could not obtain Quotations information:<br>$sql" ); } |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:45
|
Update of /cvsroot/mxbb/mx_quotations/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2039/modules/mx_quotations/includes Modified Files: mx_quotations_add.php mx_quotations_del.php mx_quotations_edit.php Log Message: replaced all message_die with mx_message_die Index: mx_quotations_add.php =================================================================== RCS file: /cvsroot/mxbb/mx_quotations/includes/mx_quotations_add.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_quotations_add.php 1 Oct 2005 14:16:59 -0000 1.5 --- mx_quotations_add.php 24 Oct 2005 20:18:37 -0000 1.6 *************** *** 26,30 **** if ( $userdata[user_id] == ANONYMOUS ) { ! message_die( GENERAL_ERROR, "Hacking attempt" ); } --- 26,30 ---- if ( $userdata[user_id] == ANONYMOUS ) { ! mx_message_die( GENERAL_ERROR, "Hacking attempt" ); } *************** *** 35,39 **** if ( !isset( $HTTP_POST_VARS['quote'] ) || ( !isset( $HTTP_POST_VARS['author'] ) ) ) { ! message_die( GENERAL_ERROR, $lang['Fill_in_all_fields'] ); } else --- 35,39 ---- if ( !isset( $HTTP_POST_VARS['quote'] ) || ( !isset( $HTTP_POST_VARS['author'] ) ) ) { ! mx_message_die( GENERAL_ERROR, $lang['Fill_in_all_fields'] ); } else *************** *** 53,61 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn´t write quote', '', __LINE__, __FILE__, $sql ); } else { ! message_die( GENERAL_MESSAGE, "<b>" . $lang['Quote_correctly_added'] . "</b> <br /><br /> <b>" . $lang['Quote'] . ":</b> " . stripslashes( $quote ) . "<br /><b>" . $lang['Author'] . ":</b> " . stripslashes( $author ) . '<meta http-equiv="refresh" content="3; url=' . $base_url . '">' ); } } --- 53,61 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn´t write quote', '', __LINE__, __FILE__, $sql ); } else { ! mx_message_die( GENERAL_MESSAGE, "<b>" . $lang['Quote_correctly_added'] . "</b> <br /><br /> <b>" . $lang['Quote'] . ":</b> " . stripslashes( $quote ) . "<br /><b>" . $lang['Author'] . ":</b> " . stripslashes( $author ) . '<meta http-equiv="refresh" content="3; url=' . $base_url . '">' ); } } Index: mx_quotations_del.php =================================================================== RCS file: /cvsroot/mxbb/mx_quotations/includes/mx_quotations_del.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_quotations_del.php 1 Oct 2005 14:16:59 -0000 1.4 --- mx_quotations_del.php 24 Oct 2005 20:18:37 -0000 1.5 *************** *** 33,37 **** if ( !isset( $HTTP_GET_VARS['quote_id'] ) ) { ! message_die( GENERAL_ERROR, $lang['Quote_not_specified'] ); } $quote_id = $HTTP_GET_VARS['quote_id']; --- 33,37 ---- if ( !isset( $HTTP_GET_VARS['quote_id'] ) ) { ! mx_message_die( GENERAL_ERROR, $lang['Quote_not_specified'] ); } $quote_id = $HTTP_GET_VARS['quote_id']; *************** *** 43,47 **** if ( !( $result1 = $db->sql_query( $sql1 ) ) ) { ! message_die( GENERAL_ERROR, "Could not obtain Quotations Information:<br>$sql1" ); } --- 43,47 ---- if ( !( $result1 = $db->sql_query( $sql1 ) ) ) { ! mx_message_die( GENERAL_ERROR, "Could not obtain Quotations Information:<br>$sql1" ); } *************** *** 62,70 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn´t write quote', '', __LINE__, __FILE__, $sql ); } else { ! message_die( GENERAL_MESSAGE, $lang['Quote_correctly_deleted'] . '<meta http-equiv="refresh" content="3; url=' . $base_url . '">' ); } } --- 62,70 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn´t write quote', '', __LINE__, __FILE__, $sql ); } else { ! mx_message_die( GENERAL_MESSAGE, $lang['Quote_correctly_deleted'] . '<meta http-equiv="refresh" content="3; url=' . $base_url . '">' ); } } Index: mx_quotations_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_quotations/includes/mx_quotations_edit.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_quotations_edit.php 1 Oct 2005 14:16:59 -0000 1.5 --- mx_quotations_edit.php 24 Oct 2005 20:18:37 -0000 1.6 *************** *** 33,37 **** if ( !isset( $HTTP_GET_VARS['quote_id'] ) ) { ! message_die( GENERAL_ERROR, $lang['Quote_not_specified'] ); } $quote_id = $HTTP_GET_VARS['quote_id']; --- 33,37 ---- if ( !isset( $HTTP_GET_VARS['quote_id'] ) ) { ! mx_message_die( GENERAL_ERROR, $lang['Quote_not_specified'] ); } $quote_id = $HTTP_GET_VARS['quote_id']; *************** *** 43,47 **** if ( !( $result1 = $db->sql_query( $sql1 ) ) ) { ! message_die( GENERAL_ERROR, "Could not obtain Quotations Information:<br>$sql1" ); } --- 43,47 ---- if ( !( $result1 = $db->sql_query( $sql1 ) ) ) { ! mx_message_die( GENERAL_ERROR, "Could not obtain Quotations Information:<br>$sql1" ); } *************** *** 59,63 **** if ( !isset( $HTTP_POST_VARS['new_quote'] ) || ( !isset( $HTTP_POST_VARS['new_author'] ) ) ) { ! message_die( GENERAL_ERROR, $lang['Fill_in_all_fields'] ); } else --- 59,63 ---- if ( !isset( $HTTP_POST_VARS['new_quote'] ) || ( !isset( $HTTP_POST_VARS['new_author'] ) ) ) { ! mx_message_die( GENERAL_ERROR, $lang['Fill_in_all_fields'] ); } else *************** *** 76,84 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, 'Couldn´t write quote', '', __LINE__, __FILE__, $sql ); } else { ! message_die( GENERAL_MESSAGE, "<b>" . $lang['Quote_correctly_edited'] . "</b> <br /><br />" . $lang['Quote'] . ": " . stripslashes( $new_quote ) . "<br />" . $lang['Author'] . ": " . stripslashes( $new_author ) . '<meta http-equiv="refresh" content="3; url=' . $base_url . '">' ); } } --- 76,84 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldn´t write quote', '', __LINE__, __FILE__, $sql ); } else { ! mx_message_die( GENERAL_MESSAGE, "<b>" . $lang['Quote_correctly_edited'] . "</b> <br /><br />" . $lang['Quote'] . ": " . stripslashes( $new_quote ) . "<br />" . $lang['Author'] . ": " . stripslashes( $new_author ) . '<meta http-equiv="refresh" content="3; url=' . $base_url . '">' ); } } |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:21
|
Update of /cvsroot/mxbb/mx_profilecp/profilcp/def In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp/profilcp/def Modified Files: def_userfuncs.php def_userfuncs_album.php def_userfuncs_std.php Log Message: replaced all message_die with mx_message_die Index: def_userfuncs.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/def/def_userfuncs.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** def_userfuncs.php 29 Jun 2004 22:27:48 -0000 1.1 --- def_userfuncs.php 24 Oct 2005 20:18:06 -0000 1.2 *************** *** 546,550 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not read list informations', '', __LINE__, __FILE__, '<table><tr><td><span class="genmed"><pre>' . $sql . '</pre></span></td></tr></table>'); } $values = array(); --- 546,550 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read list informations', '', __LINE__, __FILE__, '<table><tr><td><span class="genmed"><pre>' . $sql . '</pre></span></td></tr></table>'); } $values = array(); Index: def_userfuncs_album.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/def/def_userfuncs_album.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** def_userfuncs_album.php 9 Jan 2005 21:45:33 -0000 1.1 --- def_userfuncs_album.php 24 Oct 2005 20:18:06 -0000 1.2 *************** *** 90,94 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not read album table', '', __LINE__, __FILE__, $sql); } $number_gals = 0; --- 90,94 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read album table', '', __LINE__, __FILE__, $sql); } $number_gals = 0; *************** *** 184,188 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Could not query Album config information", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) --- 184,188 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Could not query Album config information", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) *************** *** 205,209 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql); } $thiscat = array(); --- 205,209 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql); } $thiscat = array(); *************** *** 253,257 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not count pics', '', __LINE__, __FILE__, $sql); } --- 253,257 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not count pics', '', __LINE__, __FILE__, $sql); } Index: def_userfuncs_std.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/def/def_userfuncs_std.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** def_userfuncs_std.php 9 Jan 2005 21:45:33 -0000 1.2 --- def_userfuncs_std.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 795,799 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get most active topic informations', '', __LINE__, __FILE__, $sql); } if ( $row = $db->sql_fetchrow($result) ) --- 795,799 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get most active topic informations', '', __LINE__, __FILE__, $sql); } if ( $row = $db->sql_fetchrow($result) ) *************** *** 873,877 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get most active forum informations', '', __LINE__, __FILE__, $sql); } if ( $row = $db->sql_fetchrow($result) ) --- 873,877 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get most active forum informations', '', __LINE__, __FILE__, $sql); } if ( $row = $db->sql_fetchrow($result) ) *************** *** 947,951 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } $groups = array(); --- 947,951 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } $groups = array(); *************** *** 985,989 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Couldn\'t obtain viewer group list', '', __LINE__, __FILE__, $sql); } $is_ok = ( $row = $db->sql_fetchrow($result) ); --- 985,989 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Couldn\'t obtain viewer group list', '', __LINE__, __FILE__, $sql); } $is_ok = ( $row = $db->sql_fetchrow($result) ); |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:18
|
Update of /cvsroot/mxbb/mx_profilecp/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp/includes Modified Files: functions_mods_settings.php functions_topics_list.php Log Message: replaced all message_die with mx_message_die Index: functions_topics_list.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/includes/functions_topics_list.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions_topics_list.php 1 Oct 2005 14:16:27 -0000 1.3 --- functions_topics_list.php 24 Oct 2005 20:18:06 -0000 1.4 *************** *** 197,201 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain post information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) --- 197,201 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain post information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) Index: functions_mods_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/includes/functions_mods_settings.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functions_mods_settings.php 1 Oct 2005 14:16:27 -0000 1.2 --- functions_mods_settings.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 47,51 **** $board_config[$key] = $value; $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name,config_value) VALUES('$key','$value')"; ! if ( !$db->sql_query($sql) ) message_die(GENERAL_ERROR, 'Could not add key ' . $key . ' in config table', '', __LINE__, __FILE__, $sql); } else if ($force) --- 47,51 ---- $board_config[$key] = $value; $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name,config_value) VALUES('$key','$value')"; ! if ( !$db->sql_query($sql) ) mx_message_die(GENERAL_ERROR, 'Could not add key ' . $key . ' in config table', '', __LINE__, __FILE__, $sql); } else if ($force) *************** *** 53,57 **** $board_config[$key] = $value; $sql = "UPDATE " . CONFIG_TABLE . " SET config_value='$value' WHERE config_name='$key'"; ! if ( !$db->sql_query($sql) ) message_die(GENERAL_ERROR, 'Could not add key ' . $key . ' in config table', '', __LINE__, __FILE__, $sql); } } --- 53,57 ---- $board_config[$key] = $value; $sql = "UPDATE " . CONFIG_TABLE . " SET config_value='$value' WHERE config_name='$key'"; ! if ( !$db->sql_query($sql) ) mx_message_die(GENERAL_ERROR, 'Could not add key ' . $key . ' in config table', '', __LINE__, __FILE__, $sql); } } |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:18
|
Update of /cvsroot/mxbb/mx_profilecp/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp/admin Modified Files: admin_board_extend.php admin_lang_extend.php admin_pcp_classesfields.php admin_pcp_tableslinked.php admin_pcp_userfields.php admin_pcp_usermaps.php admin_pcp_valueslist.php Log Message: replaced all message_die with mx_message_die Index: admin_pcp_userfields.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_userfields.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_userfields.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_userfields.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 273,277 **** if ( (!$result = $db->sql_query($sql)) || (!$row = $db->sql_fetchrow($result)) ) { ! message_die(CRITICAL_ERROR, 'Could not query users table informations', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result) ) --- 273,277 ---- if ( (!$result = $db->sql_query($sql)) || (!$row = $db->sql_fetchrow($result)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not query users table informations', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result) ) *************** *** 417,421 **** if ( (!$result = $db->sql_query($sql)) || (!$row = $db->sql_fetchrow($result)) ) { ! message_die(CRITICAL_ERROR, 'Could not query users table informations', '', __LINE__, __FILE__, $sql); } --- 417,421 ---- if ( (!$result = $db->sql_query($sql)) || (!$row = $db->sql_fetchrow($result)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not query users table informations', '', __LINE__, __FILE__, $sql); } *************** *** 702,706 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, $error_msg ); } --- 702,706 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, $error_msg ); } *************** *** 719,723 **** $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = empty($sql_result) ? sprintf( ( ($action == 'create') ? $lang['PCP_sql_field_created'] : $lang['PCP_sql_field_modified'] ), '<a href="' . $return_path . '" />', '</a>' ) : $sql_result; ! message_die( GENERAL_MESSAGE, $message ); } else --- 719,723 ---- $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = empty($sql_result) ? sprintf( ( ($action == 'create') ? $lang['PCP_sql_field_created'] : $lang['PCP_sql_field_modified'] ), '<a href="' . $return_path . '" />', '</a>' ) : $sql_result; ! mx_message_die( GENERAL_MESSAGE, $message ); } else *************** *** 731,735 **** if (!$sql_create && !$sql_modify) { ! message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_edit_not_allow']); } --- 731,735 ---- if (!$sql_create && !$sql_modify) { ! mx_message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_edit_not_allow']); } *************** *** 821,825 **** if (!$sql_delete) { ! message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_delete_not_allow']); } --- 821,825 ---- if (!$sql_delete) { ! mx_message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_delete_not_allow']); } *************** *** 828,832 **** $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = empty($sql_result) ? sprintf( $lang['PCP_sql_field_deleted'], '<a href="' . $return_path . '" />', '</a>' ) : $sql_result; ! message_die(GENERAL_MESSAGE, $message); } else --- 828,832 ---- $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = empty($sql_result) ? sprintf( $lang['PCP_sql_field_deleted'], '<a href="' . $return_path . '" />', '</a>' ) : $sql_result; ! mx_message_die(GENERAL_MESSAGE, $message); } else *************** *** 840,844 **** if (!$sql_delete) { ! message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_delete_not_allow']); } --- 840,844 ---- if (!$sql_delete) { ! mx_message_die(GENERAL_MESSAGE, $lang['PCP_err_sql_delete_not_allow']); } *************** *** 980,984 **** // final message $message = $sql_res . ( empty($sql_res) ? '' : '<br /><br />') . $message; ! message_die(GENERAL_MESSAGE, $message); } else --- 980,984 ---- // final message $message = $sql_res . ( empty($sql_res) ? '' : '<br /><br />') . $message; ! mx_message_die(GENERAL_MESSAGE, $message); } else *************** *** 1156,1160 **** if ($error) { ! message_die(GENERAL_MESSAGE, $error_msg); } --- 1156,1160 ---- if ($error) { ! mx_message_die(GENERAL_MESSAGE, $error_msg); } *************** *** 1217,1221 **** $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = sprintf( ( empty($field) ? $lang['PCP_field_created'] : $lang['PCP_field_modified'] ), $sql_message, '<a href="' . $return_path . '"/>', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ($mode == 'edit') --- 1217,1221 ---- $return_path = append_sid("./admin_pcp_userfields.$phpEx"); $message = sprintf( ( empty($field) ? $lang['PCP_field_created'] : $lang['PCP_field_modified'] ), $sql_message, '<a href="' . $return_path . '"/>', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ($mode == 'edit') Index: admin_pcp_classesfields.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_classesfields.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_classesfields.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_classesfields.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 229,233 **** $return_path = append_sid("./admin_pcp_classesfields.$phpEx"); $message = sprintf( $lang['PCP_classesfields_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) --- 229,233 ---- $return_path = append_sid("./admin_pcp_classesfields.$phpEx"); $message = sprintf( $lang['PCP_classesfields_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) *************** *** 273,277 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 273,277 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 312,316 **** $return_path = append_sid("./admin_pcp_classesfields.$phpEx"); $message = sprintf( ( empty($table) ? $lang['PCP_classesfields_created'] : $lang['PCP_classesfields_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 312,316 ---- $return_path = append_sid("./admin_pcp_classesfields.$phpEx"); $message = sprintf( ( empty($table) ? $lang['PCP_classesfields_created'] : $lang['PCP_classesfields_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else Index: admin_lang_extend.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_lang_extend.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_lang_extend.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_lang_extend.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 525,529 **** // send message $pack_url = append_sid("./admin_lang_extend.$phpEx?mode=pack&pack=" . urlencode($pack_file) . "&level=" . urlencode(($level == 'normal') ? 'normal' : 'admin') ); ! message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_delete_done'], '<a href="' . $pack_url . '">', '</a>')); // back to the liset --- 525,529 ---- // send message $pack_url = append_sid("./admin_lang_extend.$phpEx?mode=pack&pack=" . urlencode($pack_file) . "&level=" . urlencode(($level == 'normal') ? 'normal' : 'admin') ); ! mx_message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_delete_done'], '<a href="' . $pack_url . '">', '</a>')); // back to the liset *************** *** 595,599 **** if ( $error ) { ! message_die(GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); exit; } --- 595,599 ---- if ( $error ) { ! mx_message_die(GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); exit; } *************** *** 615,619 **** $key_url = append_sid("./admin_lang_extend.$phpEx?mode=key&pack=" . urlencode($new_pack) . "&key=" . urlencode($new_main) . "&sub=" . urlencode($new_sub) . "&level=" . urlencode(($new_level == 'normal') ? 'normal' : 'admin') ); $pack_url = append_sid("./admin_lang_extend.$phpEx?mode=pack&pack=" . urlencode($new_pack) . "&level=" . urlencode(($new_level == 'normal') ? 'normal' : 'admin') ); ! message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_update_done'], '<a href="' . $key_url . '">','</a>', '<a href="' . $pack_url . '">', '</a>')); } else --- 615,619 ---- $key_url = append_sid("./admin_lang_extend.$phpEx?mode=key&pack=" . urlencode($new_pack) . "&key=" . urlencode($new_main) . "&sub=" . urlencode($new_sub) . "&level=" . urlencode(($new_level == 'normal') ? 'normal' : 'admin') ); $pack_url = append_sid("./admin_lang_extend.$phpEx?mode=pack&pack=" . urlencode($new_pack) . "&level=" . urlencode(($new_level == 'normal') ? 'normal' : 'admin') ); ! mx_message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_update_done'], '<a href="' . $key_url . '">','</a>', '<a href="' . $pack_url . '">', '</a>')); } else *************** *** 847,851 **** { $main_url = append_sid("./admin_lang_extend.$phpEx"); ! message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_search_no_words'], '<a href="' . $main_url . '">', '</a>') ); exit; } --- 847,851 ---- { $main_url = append_sid("./admin_lang_extend.$phpEx"); ! mx_message_die(GENERAL_MESSAGE, sprintf($lang['Lang_extend_search_no_words'], '<a href="' . $main_url . '">', '</a>') ); exit; } Index: admin_pcp_usermaps.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_usermaps.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_usermaps.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_usermaps.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 897,901 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 897,901 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 1124,1128 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 1124,1128 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 1154,1158 **** $return_path = append_sid("./admin_pcp_usermaps.$phpEx" . (empty($parent_map) ? '' : "?map=$parent_map") ); $message = sprintf( $lang['PCP_usermaps_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) --- 1154,1158 ---- $return_path = append_sid("./admin_pcp_usermaps.$phpEx" . (empty($parent_map) ? '' : "?map=$parent_map") ); $message = sprintf( $lang['PCP_usermaps_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) *************** *** 1186,1190 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 1186,1190 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 1305,1309 **** $return_path = append_sid("./admin_pcp_usermaps.$phpEx?map=$full_name"); $message = sprintf( ( empty($map) ? $lang['PCP_usermaps_created'] : $lang['PCP_usermaps_modified']), '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 1305,1309 ---- $return_path = append_sid("./admin_pcp_usermaps.$phpEx?map=$full_name"); $message = sprintf( ( empty($map) ? $lang['PCP_usermaps_created'] : $lang['PCP_usermaps_modified']), '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else Index: admin_board_extend.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_board_extend.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_board_extend.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_board_extend.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 215,219 **** // get the real value of board_config $sql = "SELECT * FROM " . CONFIG_TABLE; ! if ( !$result = $db->sql_query($sql) ) message_die(CRITICAL_ERROR, 'Could not query config information', '', __LINE__, __FILE__, $sql); $config = array(); while ($row = $db->sql_fetchrow($result)) --- 215,219 ---- // get the real value of board_config $sql = "SELECT * FROM " . CONFIG_TABLE; ! if ( !$result = $db->sql_query($sql) ) mx_message_die(CRITICAL_ERROR, 'Could not query config information', '', __LINE__, __FILE__, $sql); $config = array(); while ($row = $db->sql_fetchrow($result)) *************** *** 270,274 **** else { ! message_die(GENERAL_ERROR, 'Unknown type of config data : ' . $field_name, '', __LINE__, __FILE__, ''); } break; --- 270,274 ---- else { ! mx_message_die(GENERAL_ERROR, 'Unknown type of config data : ' . $field_name, '', __LINE__, __FILE__, ''); } break; *************** *** 277,281 **** { $message = $error_msg . '<br /><br />' . sprintf($lang['Click_return_config'], '<a href="' . append_sid("./admin_board_extend.$phpEx?menu=$menu_id&mod=$mod_id&msub=$sub_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("./index.$phpEx?pane=right") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } } --- 277,281 ---- { $message = $error_msg . '<br /><br />' . sprintf($lang['Click_return_config'], '<a href="' . append_sid("./admin_board_extend.$phpEx?menu=$menu_id&mod=$mod_id&msub=$sub_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("./index.$phpEx?pane=right") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 294,298 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Failed to update general configuration for ' . $field_name, '', __LINE__, __FILE__, $sql); } } --- 294,298 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Failed to update general configuration for ' . $field_name, '', __LINE__, __FILE__, $sql); } } *************** *** 305,309 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Failed to update general configuration for ' . $field_name, '', __LINE__, __FILE__, $sql); } } --- 305,309 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Failed to update general configuration for ' . $field_name, '', __LINE__, __FILE__, $sql); } } *************** *** 312,316 **** // send an update message $message = $lang['Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_config'], '<a href="' . append_sid("./admin_board_extend.$phpEx?menu=$menu_id&mod=$mod_id&msub=$sub_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("./index.$phpEx?pane=right") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } --- 312,316 ---- // send an update message $message = $lang['Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_config'], '<a href="' . append_sid("./admin_board_extend.$phpEx?menu=$menu_id&mod=$mod_id&msub=$sub_id") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("./index.$phpEx?pane=right") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } Index: admin_pcp_tableslinked.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_tableslinked.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_tableslinked.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_tableslinked.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 163,167 **** $return_path = append_sid("./admin_pcp_tableslinked.$phpEx"); $message = sprintf( $lang['PCP_tableslinked_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) --- 163,167 ---- $return_path = append_sid("./admin_pcp_tableslinked.$phpEx"); $message = sprintf( $lang['PCP_tableslinked_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) *************** *** 200,204 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 200,204 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 239,243 **** $return_path = append_sid("./admin_pcp_tableslinked.$phpEx"); $message = sprintf( ( empty($table) ? $lang['PCP_tableslinked_created'] : $lang['PCP_tableslinked_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 239,243 ---- $return_path = append_sid("./admin_pcp_tableslinked.$phpEx"); $message = sprintf( ( empty($table) ? $lang['PCP_tableslinked_created'] : $lang['PCP_tableslinked_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else Index: admin_pcp_valueslist.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/admin/admin_pcp_valueslist.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_pcp_valueslist.php 1 Oct 2005 14:16:27 -0000 1.2 --- admin_pcp_valueslist.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 272,276 **** $return_path = append_sid("./admin_pcp_valueslist.$phpEx"); $message = sprintf( $lang['PCP_valueslist_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) --- 272,276 ---- $return_path = append_sid("./admin_pcp_valueslist.$phpEx"); $message = sprintf( $lang['PCP_valueslist_deleted'], '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else if ( $submit ) *************** *** 309,313 **** if ( $error ) { ! message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } --- 309,313 ---- if ( $error ) { ! mx_message_die( GENERAL_MESSAGE, '<br />' . $error_msg . '<br /><br />'); } *************** *** 352,356 **** $return_path = append_sid("./admin_pcp_valueslist.$phpEx"); $message = sprintf( ( empty($vlist) ? $lang['PCP_valueslist_created'] : $lang['PCP_valueslist_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else --- 352,356 ---- $return_path = append_sid("./admin_pcp_valueslist.$phpEx"); $message = sprintf( ( empty($vlist) ? $lang['PCP_valueslist_created'] : $lang['PCP_valueslist_modified'] ), '<a href="' . $return_path . '" />', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else |
Update of /cvsroot/mxbb/mx_profilecp/profilcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp/profilcp Modified Files: functions_profile.php profilcp_activate.php profilcp_board_config.php profilcp_buddy.php profilcp_email.php profilcp_home_buddy.php profilcp_home_privmsgs.php profilcp_home_wtopics.php profilcp_privmsg.php profilcp_privmsg_popup.php profilcp_profil_groups.php profilcp_profil_signature.php profilcp_public_base.php profilcp_public_groups.php profilcp_register.php profilcp_sendpassword.php uacp.php Log Message: replaced all message_die with mx_message_die Index: profilcp_activate.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_activate.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** profilcp_activate.php 1 Oct 2005 14:16:27 -0000 1.4 --- profilcp_activate.php 24 Oct 2005 20:18:06 -0000 1.5 *************** *** 32,36 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); } --- 32,36 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information', '', __LINE__, __FILE__, $sql); } *************** *** 43,47 **** ); ! message_die(GENERAL_MESSAGE, $lang['Already_activated']); } else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != '')) --- 43,47 ---- ); ! mx_message_die(GENERAL_MESSAGE, $lang['Already_activated']); } else if ((trim($row['user_actkey']) == trim($HTTP_GET_VARS['act_key'])) && (trim($row['user_actkey']) != '')) *************** *** 49,53 **** if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $userdata['user_level'] != ADMIN) { ! message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } --- 49,53 ---- if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $userdata['user_level'] != ADMIN) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } *************** *** 59,63 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update); } --- 59,63 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update users table', '', __LINE__, __FILE__, $sql_update); } *************** *** 92,96 **** ); ! message_die(GENERAL_MESSAGE, $lang['Account_active_admin']); } else --- 92,96 ---- ); ! mx_message_die(GENERAL_MESSAGE, $lang['Account_active_admin']); } else *************** *** 102,116 **** $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; ! message_die(GENERAL_MESSAGE, $message); } } else { ! message_die(GENERAL_MESSAGE, $lang['Wrong_activation']); } } else { ! message_die(GENERAL_MESSAGE, $lang['No_such_user']); } --- 102,116 ---- $message = ( $sql_update_pass == '' ) ? $lang['Account_active'] : $lang['Password_activated']; ! mx_message_die(GENERAL_MESSAGE, $message); } } else { ! mx_message_die(GENERAL_MESSAGE, $lang['Wrong_activation']); } } else { ! mx_message_die(GENERAL_MESSAGE, $lang['No_such_user']); } Index: profilcp_home_privmsgs.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_privmsgs.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** profilcp_home_privmsgs.php 1 Oct 2005 14:16:27 -0000 1.2 --- profilcp_home_privmsgs.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 66,70 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql); } $privmsgs_sql = $sql; --- 66,70 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql); } $privmsgs_sql = $sql; *************** *** 93,97 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) --- 93,97 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) Index: profilcp_board_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_board_config.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** profilcp_board_config.php 1 Oct 2005 14:16:27 -0000 1.2 --- profilcp_board_config.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 295,299 **** else { ! message_die(GENERAL_ERROR, 'Unknown type of config data : ' . $field_name, '', __LINE__, __FILE__, ''); } break; --- 295,299 ---- else { ! mx_message_die(GENERAL_ERROR, 'Unknown type of config data : ' . $field_name, '', __LINE__, __FILE__, ''); } break; *************** *** 306,310 **** ); $message = $error_msg . '<br /><br />' . sprintf($lang['Click_return_preferences'], '<a href="' . $ret_link . '">', '</a>') . '<br /><br />'; ! message_die(GENERAL_MESSAGE, $message); } } --- 306,310 ---- ); $message = $error_msg . '<br /><br />' . sprintf($lang['Click_return_preferences'], '<a href="' . $ret_link . '">', '</a>') . '<br /><br />'; ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 325,329 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Failed to update user configuration for ' . $field['user'], '', __LINE__, __FILE__, $sql); } } --- 325,329 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Failed to update user configuration for ' . $field['user'], '', __LINE__, __FILE__, $sql); } } *************** *** 336,340 **** ); $message = $lang['Profile_updated'] . "<br /><br />" . sprintf($lang['Click_return_profilcp'], '<a href="' . $ret_link . '">', '</a>') . '<br /><br />'; ! message_die(GENERAL_MESSAGE, $message); } else --- 336,340 ---- ); $message = $lang['Profile_updated'] . "<br /><br />" . sprintf($lang['Click_return_profilcp'], '<a href="' . $ret_link . '">', '</a>') . '<br /><br />'; ! mx_message_die(GENERAL_MESSAGE, $message); } else Index: profilcp_sendpassword.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_sendpassword.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** profilcp_sendpassword.php 1 Oct 2005 14:16:27 -0000 1.3 --- profilcp_sendpassword.php 24 Oct 2005 20:18:06 -0000 1.4 *************** *** 32,36 **** if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! message_die(GENERAL_ERROR, 'Invalid_session'); } --- 32,36 ---- if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! mx_message_die(GENERAL_ERROR, 'Invalid_session'); } *************** *** 48,52 **** if ( !$row['user_active'] ) { ! message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']); } --- 48,52 ---- if ( !$row['user_active'] ) { ! mx_message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']); } *************** *** 65,69 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update new password information', '', __LINE__, __FILE__, $sql); } --- 65,69 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update new password information', '', __LINE__, __FILE__, $sql); } *************** *** 98,111 **** $message = $lang['Password_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } else { ! message_die(GENERAL_MESSAGE, $lang['No_email_match']); } } else { ! message_die(GENERAL_ERROR, 'Could not obtain user information for sendpassword', '', __LINE__, __FILE__, $sql); } } --- 98,111 ---- $message = $lang['Password_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } else { ! mx_message_die(GENERAL_MESSAGE, $lang['No_email_match']); } } else { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user information for sendpassword', '', __LINE__, __FILE__, $sql); } } Index: profilcp_privmsg.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_privmsg.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** profilcp_privmsg.php 1 Oct 2005 14:16:27 -0000 1.5 --- profilcp_privmsg.php 24 Oct 2005 20:18:06 -0000 1.6 *************** *** 96,100 **** else { ! message_die(GENERAL_ERROR, $lang['No_post_id']); } --- 96,100 ---- else { ! mx_message_die(GENERAL_ERROR, $lang['No_post_id']); } *************** *** 141,145 **** break; default: ! message_die(GENERAL_ERROR, $lang['No_such_folder']); break; } --- 141,145 ---- break; default: ! mx_message_die(GENERAL_ERROR, $lang['No_such_folder']); break; } *************** *** 157,161 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql); } --- 157,161 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query private message post information', '', __LINE__, __FILE__, $sql); } *************** *** 167,171 **** $ret_link = append_sid(this_profile_mxurl("mode=privmsg&sub=inbox")); $message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />'; ! message_die(GENERAL_MESSAGE, $message); } --- 167,171 ---- $ret_link = append_sid(this_profile_mxurl("mode=privmsg&sub=inbox")); $message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />'; ! mx_message_die(GENERAL_MESSAGE, $message); } *************** *** 194,198 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update private message read status for user', '', __LINE__, __FILE__, $sql); } --- 194,198 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update private message read status for user', '', __LINE__, __FILE__, $sql); } *************** *** 202,206 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update private message read status', '', __LINE__, __FILE__, $sql); } --- 202,206 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update private message read status', '', __LINE__, __FILE__, $sql); } *************** *** 212,216 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql); } --- 212,216 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql); } *************** *** 227,231 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not find oldest privmsgs', '', __LINE__, __FILE__, $sql); } $old_privmsgs_id = $db->sql_fetchrow($result); --- 227,231 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not find oldest privmsgs', '', __LINE__, __FILE__, $sql); } $old_privmsgs_id = $db->sql_fetchrow($result); *************** *** 236,240 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (sent)', '', __LINE__, __FILE__, $sql); } --- 236,240 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (sent)', '', __LINE__, __FILE__, $sql); } *************** *** 243,247 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (sent)', '', __LINE__, __FILE__, $sql); } } --- 243,247 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (sent)', '', __LINE__, __FILE__, $sql); } } *************** *** 257,261 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql); } --- 257,261 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not insert private message sent info', '', __LINE__, __FILE__, $sql); } *************** *** 266,270 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not insert private message sent text', '', __LINE__, __FILE__, $sql); } } --- 266,270 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not insert private message sent text', '', __LINE__, __FILE__, $sql); } } *************** *** 412,416 **** // re-read the user_to to have all the fields $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id=$user_id_to"; ! if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read from user info', '', __LINE__, __FILE__, $sql); $user_to = $db->sql_fetchrow($result); --- 412,416 ---- // re-read the user_to to have all the fields $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id=$user_id_to"; ! if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read from user info', '', __LINE__, __FILE__, $sql); $user_to = $db->sql_fetchrow($result); *************** *** 418,426 **** $view_user_id = $user_to['user_id']; $sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$view_user_id AND buddy_id=$user_id"; ! if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read from user buddy info', '', __LINE__, __FILE__, $sql); $buddys = $db->sql_fetchrow($result); $sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$user_id AND buddy_id=$view_user_id"; ! if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read my buddies info', '', __LINE__, __FILE__, $sql); $my_buddys = $db->sql_fetchrow($result); --- 418,426 ---- $view_user_id = $user_to['user_id']; $sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$view_user_id AND buddy_id=$user_id"; ! if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read from user buddy info', '', __LINE__, __FILE__, $sql); $buddys = $db->sql_fetchrow($result); $sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$user_id AND buddy_id=$view_user_id"; ! if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read my buddies info', '', __LINE__, __FILE__, $sql); $my_buddys = $db->sql_fetchrow($result); *************** *** 459,472 **** // re-read the user_from to have all the fields $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id=$user_id_from"; ! if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read from user info', '', __LINE__, __FILE__, $sql); $user_from = $db->sql_fetchrow($result); // get user relational status $sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$view_user_id AND buddy_id=$user_id"; ! if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read from user buddy info', '', __LINE__, __FILE__, $sql); $buddys = $db->sql_fetchrow($result); $sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$user_id AND buddy_id=$view_user_id"; ! if ( !($result = $db->sql_query($sql)) ) message_die(GENERAL_ERROR, 'Could not read my buddies info', '', __LINE__, __FILE__, $sql); $my_buddys = $db->sql_fetchrow($result); --- 459,472 ---- // re-read the user_from to have all the fields $sql = "SELECT * FROM " . USERS_TABLE . " WHERE user_id=$user_id_from"; ! if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read from user info', '', __LINE__, __FILE__, $sql); $user_from = $db->sql_fetchrow($result); // get user relational status $sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$view_user_id AND buddy_id=$user_id"; ! if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read from user buddy info', '', __LINE__, __FILE__, $sql); $buddys = $db->sql_fetchrow($result); $sql = "SELECT * FROM " . BUDDYS_TABLE . " WHERE user_id=$user_id AND buddy_id=$view_user_id"; ! if ( !($result = $db->sql_query($sql)) ) mx_message_die(GENERAL_ERROR, 'Could not read my buddies info', '', __LINE__, __FILE__, $sql); $my_buddys = $db->sql_fetchrow($result); *************** *** 609,613 **** if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! message_die(GENERAL_ERROR, 'Invalid_session'); } --- 609,613 ---- if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! mx_message_die(GENERAL_ERROR, 'Invalid_session'); } *************** *** 684,688 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain id list to delete all messages', '', __LINE__, __FILE__, $sql); } --- 684,688 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain id list to delete all messages', '', __LINE__, __FILE__, $sql); } *************** *** 724,728 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql); } --- 724,728 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql); } *************** *** 779,783 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql); } } --- 779,783 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql); } } *************** *** 822,835 **** if ( !$db->sql_query($delete_sql, BEGIN_TRANSACTION) ) { ! message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql); } if ( !$db->sql_query($delete_text_sql, END_TRANSACTION) ) { ! message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql); } } $msg = $lang['Deleted'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=$folder")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $msg); } } --- 822,835 ---- if ( !$db->sql_query($delete_sql, BEGIN_TRANSACTION) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $delete_sql); } if ( !$db->sql_query($delete_text_sql, END_TRANSACTION) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $delete_text_sql); } } $msg = $lang['Deleted'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=$folder")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $msg); } } *************** *** 848,852 **** if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! message_die(GENERAL_ERROR, 'Invalid_session'); } --- 848,852 ---- if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! mx_message_die(GENERAL_ERROR, 'Invalid_session'); } *************** *** 862,866 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql); } --- 862,866 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain sent message info for sendee', '', __LINE__, __FILE__, $sql); } *************** *** 879,883 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (save)', '', __LINE__, __FILE__, $sql); } $old_privmsgs_id = $db->sql_fetchrow($result); --- 879,883 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (save)', '', __LINE__, __FILE__, $sql); } $old_privmsgs_id = $db->sql_fetchrow($result); *************** *** 888,892 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (save)', '', __LINE__, __FILE__, $sql); } --- 888,892 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (save)', '', __LINE__, __FILE__, $sql); } *************** *** 895,899 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (save)', '', __LINE__, __FILE__, $sql); } } --- 895,899 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (save)', '', __LINE__, __FILE__, $sql); } } *************** *** 931,935 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql); } --- 931,935 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain user id list for outbox messages', '', __LINE__, __FILE__, $sql); } *************** *** 986,990 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql); } } --- 986,990 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update user pm counters', '', __LINE__, __FILE__, $sql); } } *************** *** 1024,1032 **** if ( !$db->sql_query($saved_sql) ) { ! message_die(GENERAL_ERROR, 'Could not save private messages', '', __LINE__, __FILE__, $saved_sql); } } $msg = $lang['Deleted'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=savebox")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $msg); } else if ( $submit || $refresh || $mode != '' ) --- 1024,1032 ---- if ( !$db->sql_query($saved_sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not save private messages', '', __LINE__, __FILE__, $saved_sql); } } $msg = $lang['Deleted'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=savebox")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $msg); } else if ( $submit || $refresh || $mode != '' ) *************** *** 1092,1096 **** if ( ( $current_time - $last_post_time ) < $board_config['flood_interval']) { ! message_die(GENERAL_MESSAGE, $lang['Flood_Error']); } } --- 1092,1096 ---- if ( ( $current_time - $last_post_time ) < $board_config['flood_interval']) { ! mx_message_die(GENERAL_MESSAGE, $lang['Flood_Error']); } } *************** *** 1105,1109 **** if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! message_die(GENERAL_ERROR, 'Invalid_session'); } --- 1105,1109 ---- if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! mx_message_die(GENERAL_ERROR, 'Invalid_session'); } *************** *** 1114,1118 **** WHERE username = '" . str_replace("\'", "''", $to_username) . "' AND user_id <> " . ANONYMOUS; ! if ( !$result = $db->sql_query($sql) ) message_die(GENERAL_ERROR, 'Could not access users table', '', __LINE__, __FILE__, $sql); if ( !$to_userdata = $db->sql_fetchrow($result) ) { --- 1114,1118 ---- WHERE username = '" . str_replace("\'", "''", $to_username) . "' AND user_id <> " . ANONYMOUS; ! if ( !$result = $db->sql_query($sql) ) mx_message_die(GENERAL_ERROR, 'Could not access users table', '', __LINE__, __FILE__, $sql); if ( !$to_userdata = $db->sql_fetchrow($result) ) { *************** *** 1138,1142 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not access buddy list', '', __LINE__, __FILE__, $sql); } if ( $urow = $db->sql_fetchrow($result) ) --- 1138,1142 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not access buddy list', '', __LINE__, __FILE__, $sql); } if ( $urow = $db->sql_fetchrow($result) ) *************** *** 1157,1161 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not access buddy list', '', __LINE__, __FILE__, $sql); } if ( !$row = $db->sql_fetchrow($result) || $row['buddy_ignore'] || ( ($to_userdata['user_viewpm'] == NO) && !$row['buddy_visible'] ) ) --- 1157,1161 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not access buddy list', '', __LINE__, __FILE__, $sql); } if ( !$row = $db->sql_fetchrow($result) || $row['buddy_ignore'] || ( ($to_userdata['user_viewpm'] == NO) && !$row['buddy_visible'] ) ) *************** *** 1208,1212 **** { $message = $lang['Cannot_send_privmsg']; ! message_die(GENERAL_MESSAGE, $message); } --- 1208,1212 ---- { $message = $lang['Cannot_send_privmsg']; ! mx_message_die(GENERAL_MESSAGE, $message); } *************** *** 1226,1230 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_MESSAGE, $lang['No_such_user']); } --- 1226,1230 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_MESSAGE, $lang['No_such_user']); } *************** *** 1243,1247 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql); } $old_privmsgs_id = $db->sql_fetchrow($result); --- 1243,1247 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not find oldest privmsgs (inbox)', '', __LINE__, __FILE__, $sql); } $old_privmsgs_id = $db->sql_fetchrow($result); *************** *** 1252,1256 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql); } --- 1252,1256 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs (inbox)'.$sql, '', __LINE__, __FILE__, $sql); } *************** *** 1259,1263 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql); } } --- 1259,1263 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete oldest privmsgs text (inbox)', '', __LINE__, __FILE__, $sql); } } *************** *** 1276,1280 **** if ( !($result = $db->sql_query($sql_info, BEGIN_TRANSACTION)) ) { ! message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info); } --- 1276,1280 ---- if ( !($result = $db->sql_query($sql_info, BEGIN_TRANSACTION)) ) { ! mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info); } *************** *** 1295,1299 **** if ( !$db->sql_query($sql, END_TRANSACTION) ) { ! message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info); } --- 1295,1299 ---- if ( !$db->sql_query($sql, END_TRANSACTION) ) { ! mx_message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info); } *************** *** 1308,1312 **** if ( !$status = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql); } --- 1308,1312 ---- if ( !$status = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql); } *************** *** 1353,1357 **** $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=inbox")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid($phpbb_root_path . "index.$phpEx") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $msg); } else if ( $preview || $refresh || $error ) --- 1353,1357 ---- $msg = $lang['Message_sent'] . '<br /><br />' . sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=inbox")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid($phpbb_root_path . "index.$phpEx") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $msg); } else if ( $preview || $refresh || $error ) *************** *** 1399,1403 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Could not obtain post and post text", "", __LINE__, __FILE__, $sql); } --- 1399,1403 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Could not obtain post and post text", "", __LINE__, __FILE__, $sql); } *************** *** 1406,1410 **** if ( $userdata['user_id'] != $postrow['user_id'] ) { ! message_die(GENERAL_MESSAGE, $lang['Edit_own_posts']); } --- 1406,1410 ---- if ( $userdata['user_id'] != $postrow['user_id'] ) { ! mx_message_die(GENERAL_MESSAGE, $lang['Edit_own_posts']); } *************** *** 1417,1421 **** if ( !$privmsg_id && ( $mode == 'reply' || $mode == 'edit' || $mode == 'quote' ) ) { ! message_die(GENERAL_ERROR, $lang['No_post_id']); } --- 1417,1421 ---- if ( !$privmsg_id && ( $mode == 'reply' || $mode == 'edit' || $mode == 'quote' ) ) { ! mx_message_die(GENERAL_ERROR, $lang['No_post_id']); } *************** *** 1453,1457 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql); } --- 1453,1457 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql); } *************** *** 1460,1464 **** $ret_link = append_sid( this_profile_mxurl("mode=privmsg&sub=$folder")); $message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_privmsg'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />'; ! message_die(GENERAL_MESSAGE, $message); } --- 1460,1464 ---- $ret_link = append_sid( this_profile_mxurl("mode=privmsg&sub=$folder")); $message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_privmsg'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />'; ! mx_message_die(GENERAL_MESSAGE, $message); } *************** *** 1491,1495 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql); } --- 1491,1495 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain private message for editing', '', __LINE__, __FILE__, $sql); } *************** *** 1498,1502 **** $ret_link = append_sid( this_profile_mxurl("mode=privmsg&sub=$folder")); $message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_privmsg'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />'; ! message_die(GENERAL_MESSAGE, $message); } --- 1498,1502 ---- $ret_link = append_sid( this_profile_mxurl("mode=privmsg&sub=$folder")); $message = $lang['Topic_post_not_exist'] . '<br /><br />' . sprintf($lang['Click_return_privmsg'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />'; ! mx_message_die(GENERAL_MESSAGE, $message); } *************** *** 1530,1534 **** { $message = $lang['Cannot_send_privmsg']; ! message_die(GENERAL_MESSAGE, $message); } --- 1530,1534 ---- { $message = $lang['Cannot_send_privmsg']; ! mx_message_die(GENERAL_MESSAGE, $message); } *************** *** 1636,1640 **** if ($error) { ! message_die(GENERAL_MESSAGE, $error_msg); } --- 1636,1640 ---- if ($error) { ! mx_message_die(GENERAL_MESSAGE, $error_msg); } *************** *** 1839,1843 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql); } --- 1839,1843 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update private message new/read status for user', '', __LINE__, __FILE__, $sql); } *************** *** 1848,1852 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update private message new/read status (2) for user', '', __LINE__, __FILE__, $sql); } --- 1848,1852 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update private message new/read status (2) for user', '', __LINE__, __FILE__, $sql); } *************** *** 1935,1939 **** default: ! message_die(GENERAL_MESSAGE, $lang['No_such_folder']); break; } --- 1935,1939 ---- default: ! mx_message_die(GENERAL_MESSAGE, $lang['No_such_folder']); break; } *************** *** 1970,1974 **** if ( !($result = $db->sql_query($sql_tot)) ) { ! message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot); } --- 1970,1974 ---- if ( !($result = $db->sql_query($sql_tot)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot); } *************** *** 1977,1981 **** if ( !($result = $db->sql_query($sql_all_tot)) ) { ! message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot); } --- 1977,1981 ---- if ( !($result = $db->sql_query($sql_all_tot)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query private message information', '', __LINE__, __FILE__, $sql_tot); } *************** *** 2094,2098 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query private messages', '', __LINE__, __FILE__, $sql); } --- 2094,2098 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query private messages', '', __LINE__, __FILE__, $sql); } Index: profilcp_home_buddy.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_buddy.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** profilcp_home_buddy.php 1 Oct 2005 14:16:27 -0000 1.2 --- profilcp_home_buddy.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 105,109 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not obtain Buddy online list information', '', __LINE__, __FILE__, $sql); } --- 105,109 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain Buddy online list information', '', __LINE__, __FILE__, $sql); } Index: profilcp_profil_signature.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_profil_signature.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** profilcp_profil_signature.php 1 Oct 2005 14:16:27 -0000 1.3 --- profilcp_profil_signature.php 24 Oct 2005 20:18:06 -0000 1.4 *************** *** 64,68 **** if ( $error ) { ! message_die(GENERAL_ERROR, $error_msg); } if (!$error && !$preview) --- 64,68 ---- if ( $error ) { ! mx_message_die(GENERAL_ERROR, $error_msg); } if (!$error && !$preview) *************** *** 76,80 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql); } } --- 76,80 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql); } } Index: profilcp_privmsg_popup.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_privmsg_popup.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** profilcp_privmsg_popup.php 1 Oct 2005 14:16:27 -0000 1.3 --- profilcp_privmsg_popup.php 24 Oct 2005 20:18:06 -0000 1.4 *************** *** 31,35 **** if ( !empty($board_config['privmsg_disable']) ) { ! message_die(GENERAL_MESSAGE, 'PM_disabled'); } // --- 31,35 ---- if ( !empty($board_config['privmsg_disable']) ) { ! mx_message_die(GENERAL_MESSAGE, 'PM_disabled'); } // Index: profilcp_home_wtopics.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_home_wtopics.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** profilcp_home_wtopics.php 1 Oct 2005 14:16:27 -0000 1.2 --- profilcp_home_wtopics.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 99,103 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not unwatched topics', '', __LINE__, __FILE__, $sql); } } --- 99,103 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not unwatched topics', '', __LINE__, __FILE__, $sql); } } *************** *** 140,144 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql); } $topics_watched_total = $db->sql_numrows($result); --- 140,144 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql); } $topics_watched_total = $db->sql_numrows($result); *************** *** 169,173 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result) ) --- 169,173 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query watched topics information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result) ) Index: profilcp_email.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_email.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** profilcp_email.php 1 Oct 2005 14:16:27 -0000 1.6 --- profilcp_email.php 24 Oct 2005 20:18:06 -0000 1.7 *************** *** 39,43 **** else { ! message_die(GENERAL_MESSAGE, $lang['No_user_specified']); } --- 39,43 ---- else { ! mx_message_die(GENERAL_MESSAGE, $lang['No_user_specified']); } *************** *** 67,71 **** if ( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] ) { ! message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']); } --- 67,71 ---- if ( time() - $userdata['user_emailtime'] < $board_config['flood_interval'] ) { ! mx_message_die(GENERAL_MESSAGE, $lang['Flood_email_limit']); } *************** *** 75,79 **** if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! message_die(GENERAL_ERROR, 'Invalid_session'); } --- 75,79 ---- if ( ($sid == '' || $sid != $userdata['session_id']) && !defined('NO_SID') ) { ! mx_message_die(GENERAL_ERROR, 'Invalid_session'); } *************** *** 185,193 **** $message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } else { ! message_die(GENERAL_ERROR, 'Could not update last email time', '', __LINE__, __FILE__, $sql); } } --- 185,193 ---- $message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } else { ! mx_message_die(GENERAL_ERROR, 'Could not update last email time', '', __LINE__, __FILE__, $sql); } } *************** *** 244,253 **** else { ! message_die(GENERAL_MESSAGE, $lang['User_prevent_email']); } } else { ! message_die(GENERAL_MESSAGE, $lang['User_not_exist']); } --- 244,253 ---- else { ! mx_message_die(GENERAL_MESSAGE, $lang['User_prevent_email']); } } else { ! mx_message_die(GENERAL_MESSAGE, $lang['User_not_exist']); } Index: uacp.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/uacp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** uacp.php 1 Oct 2005 14:16:27 -0000 1.3 --- uacp.php 24 Oct 2005 20:18:06 -0000 1.4 *************** *** 78,82 **** // if ($sid == '' || $sid != $userdata['session_id']) // { ! // message_die(GENERAL_ERROR, 'Invalid_session'); // } //-- fin mod : profile cp -------------------------------------------------------------------------- --- 78,82 ---- // if ($sid == '' || $sid != $userdata['session_id']) // { ! // mx_message_die(GENERAL_ERROR, 'Invalid_session'); // } //-- fin mod : profile cp -------------------------------------------------------------------------- *************** *** 91,95 **** else { ! message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']); } --- 91,95 ---- else { ! mx_message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']); } *************** *** 110,114 **** if ( ($profiledata['user_id'] != $userdata['user_id']) && ($userdata['user_level'] != ADMIN) ) { ! message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } --- 110,114 ---- if ( ($profiledata['user_id'] != $userdata['user_id']) && ($userdata['user_level'] != ADMIN) ) { ! mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } *************** *** 304,308 **** ); $message = $lang['Profile_updated'] . '<br /><br />' . $l_from . '<br /><br />'; ! message_die(GENERAL_MESSAGE, $message); exit; --- 304,308 ---- ); $message = $lang['Profile_updated'] . '<br /><br />' . $l_from . '<br /><br />'; ! mx_message_die(GENERAL_MESSAGE, $message); exit; *************** *** 421,425 **** if ( !($result = attach_sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql); } --- 421,425 ---- if ( !($result = attach_sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql); } *************** *** 444,448 **** if ( !($result = attach_sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql); } --- 444,448 ---- if ( !($result = attach_sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql); } *************** *** 474,478 **** if ( !($result = attach_sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql); } --- 474,478 ---- if ( !($result = attach_sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql); } *************** *** 491,495 **** if ( !($result = attach_sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Couldn\'t query topic', '', __LINE__, __FILE__, $sql); } --- 491,495 ---- if ( !($result = attach_sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Couldn\'t query topic', '', __LINE__, __FILE__, $sql); } *************** *** 516,520 **** if ( !($result = attach_sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Couldn\'t get Privmsgs Type', '', __LINE__, __FILE__, $sql); } --- 516,520 ---- if ( !($result = attach_sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Couldn\'t get Privmsgs Type', '', __LINE__, __FILE__, $sql); } Index: profilcp_register.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_register.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** profilcp_register.php 1 Oct 2005 14:16:27 -0000 1.6 --- profilcp_register.php 24 Oct 2005 20:18:06 -0000 1.7 *************** *** 252,260 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql); } if ( !$row = $db->sql_fetchrow($result) ) { ! message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql); } $userrow['user_id'] = $row['total'] + 1; --- 252,260 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql); } if ( !$row = $db->sql_fetchrow($result) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain next user_id information', '', __LINE__, __FILE__, $sql); } $userrow['user_id'] = $row['total'] + 1; *************** *** 286,290 **** if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) { ! message_die(GENERAL_ERROR, 'Could not insert data into users table', '', __LINE__, __FILE__, $sql); } --- 286,290 ---- if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not insert data into users table', '', __LINE__, __FILE__, $sql); } *************** *** 293,297 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not insert data into groups table', '', __LINE__, __FILE__, $sql); } --- 293,297 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not insert data into groups table', '', __LINE__, __FILE__, $sql); } *************** *** 302,306 **** if( !($result = $db->sql_query($sql, END_TRANSACTION)) ) { ! message_die(GENERAL_ERROR, 'Could not insert data into user_group table', '', __LINE__, __FILE__, $sql); } --- 302,306 ---- if( !($result = $db->sql_query($sql, END_TRANSACTION)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not insert data into user_group table', '', __LINE__, __FILE__, $sql); } *************** *** 386,390 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql); } if ( $username_changed ) --- 386,390 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update user table', '', __LINE__, __FILE__, $sql); } if ( $username_changed ) *************** *** 395,399 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql); } } --- 395,399 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not rename users group', '', __LINE__, __FILE__, $sql); } } *************** *** 467,471 **** "META" => '<meta http-equiv="refresh" content="5;url=' . append_sid(this_profile_mxurl()) . '">') ); ! message_die(GENERAL_MESSAGE, $message); } } --- 467,471 ---- "META" => '<meta http-equiv="refresh" content="5;url=' . append_sid(this_profile_mxurl()) . '">') ); ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 524,528 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update session robot', '', __LINE__, __FILE__, $sql); } --- 524,528 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update session robot', '', __LINE__, __FILE__, $sql); } *************** *** 559,563 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not read forum rules post', '', __LINE__, __FILE__, $sql); } if ($row=$db->sql_fetchrow($result)) --- 559,563 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read forum rules post', '', __LINE__, __FILE__, $sql); } if ($row=$db->sql_fetchrow($result)) Index: profilcp_profil_groups.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_profil_groups.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** profilcp_profil_groups.php 1 Oct 2005 14:16:27 -0000 1.2 --- profilcp_profil_groups.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 57,61 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } $select_avail = false; --- 57,61 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } $select_avail = false; *************** *** 245,249 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete group memebership data', '', __LINE__, __FILE__, $sql); } } --- 245,249 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete group memebership data', '', __LINE__, __FILE__, $sql); } } *************** *** 270,274 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Error reading user group', '', __LINE__, __FILE__, $sql); } if ( $row = $db->sql_fetchrow($result) ) --- 270,274 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Error reading user group', '', __LINE__, __FILE__, $sql); } if ( $row = $db->sql_fetchrow($result) ) *************** *** 280,284 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Error updating user group subscription', '', __LINE__, __FILE__, $sql); } } --- 280,284 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Error updating user group subscription', '', __LINE__, __FILE__, $sql); } } *************** *** 292,296 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Error inserting user group subscription', '', __LINE__, __FILE__, $sql); } } --- 292,296 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Error inserting user group subscription', '', __LINE__, __FILE__, $sql); } } *************** *** 310,314 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql); } --- 310,314 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain moderator status', '', __LINE__, __FILE__, $sql); } *************** *** 326,330 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); } } --- 326,330 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update user level', '', __LINE__, __FILE__, $sql); } } *************** *** 346,350 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not obtain owner informations', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) --- 346,350 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain owner informations', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) *************** *** 361,365 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not obtain moderator informations', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) --- 361,365 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain moderator informations', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) *************** *** 443,447 **** $message = $action_msg; $message .= '<br /><br />' . sprintf($lang['Click_return_profilcp'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />'; ! message_die(GENERAL_MESSAGE, $message); } else --- 443,447 ---- $message = $action_msg; $message .= '<br /><br />' . sprintf($lang['Click_return_profilcp'], '<a href="' . $ret_link . '">', "</a>") . '<br /><br />'; ! mx_message_die(GENERAL_MESSAGE, $message); } else Index: profilcp_public_groups.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_public_groups.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** profilcp_public_groups.php 1 Oct 2005 14:16:27 -0000 1.3 --- profilcp_public_groups.php 24 Oct 2005 20:18:06 -0000 1.4 *************** *** 57,61 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) --- 57,61 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not read groups', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) *************** *** 92,96 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Couldn\'t obtain viewer group list', '', __LINE__, __FILE__, $sql); } $is_ok = ( $row = $db->sql_fetchrow($result) ); --- 92,96 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Couldn\'t obtain viewer group list', '', __LINE__, __FILE__, $sql); } $is_ok = ( $row = $db->sql_fetchrow($result) ); Index: profilcp_public_base.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_public_base.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** profilcp_public_base.php 1 Oct 2005 14:16:27 -0000 1.3 --- profilcp_public_base.php 24 Oct 2005 20:18:06 -0000 1.4 *************** *** 89,93 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get buddy information', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) --- 89,93 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get buddy information', '', __LINE__, __FILE__, $sql); } while ( $row = $db->sql_fetchrow($result) ) Index: profilcp_buddy.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profilcp/profilcp_buddy.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** profilcp_buddy.php 1 Oct 2005 14:16:27 -0000 1.4 --- profilcp_buddy.php 24 Oct 2005 20:18:06 -0000 1.5 *************** *** 76,80 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Could not get user information", '', __LINE__, __FILE__, $sql); } if ( !$userrow = $db->sql_fetchrow($result) ) --- 76,80 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Could not get user information", '', __LINE__, __FILE__, $sql); } if ( !$userrow = $db->sql_fetchrow($result) ) *************** *** 82,86 **** $set = ''; $buddy_id = -1; ! message_die(GENERAL_ERROR, $lang['No_such_user']); } } --- 82,86 ---- $set = ''; $buddy_id = -1; ! mx_message_die(GENERAL_ERROR, $lang['No_such_user']); } } *************** *** 129,133 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update buddy information', '', __LINE__, __FILE__, $sql); } } --- 129,133 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update buddy information', '', __LINE__, __FILE__, $sql); } } *************** *** 146,150 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete buddy list entries', '', __LINE__, __FILE__, $sql); } } --- 146,150 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete buddy list entries', '', __LINE__, __FILE__, $sql); } } *************** *** 157,161 **** ); $message = $lang['Profile_updated'] . '<br /><br />' . $l_from . '<br /><br />'; ! message_die(GENERAL_MESSAGE, $message); } } --- 157,161 ---- ); $message = $lang['Profile_updated'] . '<br /><br />' . $l_from . '<br /><br />'; ! mx_message_die(GENERAL_MESSAGE, $message); ... [truncated message content] |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:17
|
Update of /cvsroot/mxbb/mx_profilecp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp Modified Files: profile.php Log Message: replaced all message_die with mx_message_die Index: profile.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/profile.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** profile.php 23 Oct 2005 18:51:56 -0000 1.6 --- profile.php 24 Oct 2005 20:18:07 -0000 1.7 *************** *** 300,304 **** { // $msg = sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=$folder")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); ! // message_die(GENERAL_MESSAGE, $msg); $redirect = str_replace("?", "&", this_profile_mxurl("mode=$mode&sub=$sub&debugg=on") ); mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true)); --- 300,304 ---- { // $msg = sprintf($lang['Click_return_inbox'], '<a href="' . append_sid(this_profile_mxurl("mode=privmsg&sub=$folder")) . '">', '</a> ') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(this_profile_mxurl()) . '">', '</a>'); ! // mx_message_die(GENERAL_MESSAGE, $msg); $redirect = str_replace("?", "&", this_profile_mxurl("mode=$mode&sub=$sub&debugg=on") ); mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=". $redirect, true)); |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:17
|
Update of /cvsroot/mxbb/mx_profilecp/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp/tools Modified Files: tools_groules_buddy_list_to_pcp.php Log Message: replaced all message_die with mx_message_die Index: tools_groules_buddy_list_to_pcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/tools/tools_groules_buddy_list_to_pcp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tools_groules_buddy_list_to_pcp.php 22 Sep 2005 21:26:05 -0000 1.2 --- tools_groules_buddy_list_to_pcp.php 24 Oct 2005 20:18:07 -0000 1.3 *************** *** 57,61 **** $msg = 'All done : you can now remove ' . $table_prefix . 'buddies and this prog<br /><br />' . sprintf ($lang['Click_return_index'], '<a href="' . append_sid ('index.'.$phpEx) . '">', '</a>'); ! message_die (GENERAL_MESSAGE, $msg); ?> \ No newline at end of file --- 57,61 ---- $msg = 'All done : you can now remove ' . $table_prefix . 'buddies and this prog<br /><br />' . sprintf ($lang['Click_return_index'], '<a href="' . append_sid ('index.'.$phpEx) . '">', '</a>'); ! mx_message_die (GENERAL_MESSAGE, $msg); ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2005-10-24 20:18:17
|
Update of /cvsroot/mxbb/mx_profilecp/includes/mods_settings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1692/modules/mx_profilecp/includes/mods_settings Modified Files: mod_profile_control_panel.php Log Message: replaced all message_die with mx_message_die Index: mod_profile_control_panel.php =================================================================== RCS file: /cvsroot/mxbb/mx_profilecp/includes/mods_settings/mod_profile_control_panel.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mod_profile_control_panel.php 1 Oct 2005 14:16:27 -0000 1.2 --- mod_profile_control_panel.php 24 Oct 2005 20:18:06 -0000 1.3 *************** *** 475,484 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not obtain admin user information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($sql); if ( empty($row['user_id']) ) { ! message_die(GENERAL_ERROR, 'Could not obtain another admin user'); } else --- 475,484 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain admin user information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($sql); if ( empty($row['user_id']) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain another admin user'); } else *************** *** 496,500 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not obtain group information for this user', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 496,500 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain group information for this user', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 508,512 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update posts for this user', '', __LINE__, __FILE__, $sql); } --- 508,512 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update posts for this user', '', __LINE__, __FILE__, $sql); } *************** *** 517,521 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update topics for this user', '', __LINE__, __FILE__, $sql); } --- 517,521 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update topics for this user', '', __LINE__, __FILE__, $sql); } *************** *** 526,530 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql); } --- 526,530 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update votes for this user', '', __LINE__, __FILE__, $sql); } *************** *** 535,539 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not select groups where user was moderator', '', __LINE__, __FILE__, $sql); } while ( $row_group = $db->sql_fetchrow($result) ) --- 535,539 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not select groups where user was moderator', '', __LINE__, __FILE__, $sql); } while ( $row_group = $db->sql_fetchrow($result) ) *************** *** 550,554 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql); } } --- 550,554 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update group moderators', '', __LINE__, __FILE__, $sql); } } *************** *** 558,562 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql); } --- 558,562 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql); } *************** *** 565,569 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql); } --- 565,569 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete group for this user', '', __LINE__, __FILE__, $sql); } *************** *** 572,576 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete user from topic watch table', '', __LINE__, __FILE__, $sql); } --- 572,576 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete user from topic watch table', '', __LINE__, __FILE__, $sql); } *************** *** 579,583 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete user from banlist table', '', __LINE__, __FILE__, $sql); } --- 579,583 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete user from banlist table', '', __LINE__, __FILE__, $sql); } *************** *** 589,593 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not select all users private messages', '', __LINE__, __FILE__, $sql); } --- 589,593 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not select all users private messages', '', __LINE__, __FILE__, $sql); } *************** *** 604,608 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $sql); } --- 604,608 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete private message text', '', __LINE__, __FILE__, $sql); } *************** *** 610,614 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $sql); } } --- 610,614 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete private message info', '', __LINE__, __FILE__, $sql); } } *************** *** 618,622 **** if( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete user from user_group table', '', __LINE__, __FILE__, $sql); } --- 618,622 ---- if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete user from user_group table', '', __LINE__, __FILE__, $sql); } *************** *** 625,629 **** if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $sql); } --- 625,629 ---- if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not delete user', '', __LINE__, __FILE__, $sql); } |
2 messages has been excluded from this view by a project administrator.
