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: Jon O. <jon...@us...> - 2006-08-22 20:32:34
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv31446/templates/subSilver/admin Modified Files: mx_blockcp_admin_body.tpl Log Message: fix Index: mx_blockcp_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/mx_blockcp_admin_body.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_blockcp_admin_body.tpl 22 Aug 2006 20:21:50 -0000 1.5 --- mx_blockcp_admin_body.tpl 22 Aug 2006 20:32:29 -0000 1.6 *************** *** 228,233 **** {ERROR_BOX} <div id="adminBlockCP_require_refresh" style="display:block;" class="genmed"> ! <table width="100%" cellpadding="1" cellspacing="0" border="0" class="forumline" align="center"> <tr> <td align="center" colspan="5">{RESULT_MESSAGE}</td> --- 228,235 ---- {ERROR_BOX} + <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"><tr><td> + <div id="adminBlockCP_require_refresh" style="display:block;" class="genmed"> ! <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-bottom:none;" align="center"> <tr> <td align="center" colspan="5">{RESULT_MESSAGE}</td> *************** *** 264,268 **** <div id="adminBlockCP_general_add" style="display:{VISIBLE_GENERAL_ADD};" class="genmed"> <!-- BEGIN blockcp_general_adds --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> <tr> <td class="row1" colspan="2"> --- 266,270 ---- <div id="adminBlockCP_general_add" style="display:{VISIBLE_GENERAL_ADD};" class="genmed"> <!-- BEGIN blockcp_general_adds --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline" style="border-top:none;"> <tr> <td class="row1" colspan="2"> *************** *** 334,338 **** <div id="adminBlockCP_general" style="display:{VISIBLE_GENERAL};" class="genmed"> <!-- BEGIN blockcp_general --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> <tr> <td class="row1" colspan="2"> --- 336,340 ---- <div id="adminBlockCP_general" style="display:{VISIBLE_GENERAL};" class="genmed"> <!-- BEGIN blockcp_general --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline" style="border-top:none;"> <tr> <td class="row1" colspan="2"> *************** *** 413,417 **** <div id="adminBlockCP_settings" style="display:{VISIBLE_SETTINGS};" class="genmed"> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> <!-- BEGIN blockcp_panel --> <tr> --- 415,419 ---- <div id="adminBlockCP_settings" style="display:{VISIBLE_SETTINGS};" class="genmed"> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline" style="border-top:none;"> <!-- BEGIN blockcp_panel --> <tr> *************** *** 459,463 **** <div id="adminBlockCP_private" style="display:{VISIBLE_PRIVATE};" class="genmed"> <!-- BEGIN blockcp_permissions --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> <tr> <td class="row1" colspan="2" width="100%"> --- 461,465 ---- <div id="adminBlockCP_private" style="display:{VISIBLE_PRIVATE};" class="genmed"> <!-- BEGIN blockcp_permissions --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline" style="border-top:none;"> <tr> <td class="row1" colspan="2" width="100%"> *************** *** 494,498 **** <div id="adminBlockCP_delete" style="display:{VISIBLE_DELETE};" class="genmed"> <!-- BEGIN blockcp_delete --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> <tr> <td colspan="2" class="row1"> --- 496,500 ---- <div id="adminBlockCP_delete" style="display:{VISIBLE_DELETE};" class="genmed"> <!-- BEGIN blockcp_delete --> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline" style="border-top:none;"> <tr> <td colspan="2" class="row1"> *************** *** 510,514 **** <div id="adminBlockCP_require_refresh_info" style="display:none;" class="genmed"> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> <tr> <td colspan="2" class="row1"> --- 512,516 ---- <div id="adminBlockCP_require_refresh_info" style="display:none;" class="genmed"> ! <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline" style="border-top:none;"> <tr> <td colspan="2" class="row1"> *************** *** 521,523 **** </tr> </table> ! </div> \ No newline at end of file --- 523,527 ---- </tr> </table> ! </div> ! ! </td></tr></table> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:23:27
|
Update of /cvsroot/mxbb/mx_pafiledb/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27637/modules/mx_pafiledb/admin Modified Files: admin_pafiledb.php Log Message: basedir restriction fix Index: admin_pafiledb.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pafiledb.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_pafiledb.php 13 Aug 2006 19:44:45 -0000 1.5 --- admin_pafiledb.php 22 Aug 2006 20:23:24 -0000 1.6 *************** *** 47,51 **** $setmodules_admin_path = $setmodules_module_path . 'admin/'; ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 47,51 ---- $setmodules_admin_path = $setmodules_module_path . 'admin/'; ! define( 'MXBB_27x', file_exists( $setmodules_root_path . 'mx_login.php' ) ); $phpEx = substr(strrchr(__FILE__, '.'), 1); |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:22:52
|
Update of /cvsroot/mxbb/mx_kb/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27249/modules/mx_kb/admin Modified Files: admin_kb.php Log Message: basedir restriction fix Index: admin_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_kb.php 13 Aug 2006 19:43:06 -0000 1.4 --- admin_kb.php 22 Aug 2006 20:22:47 -0000 1.5 *************** *** 47,51 **** $setmodules_admin_path = $setmodules_module_path . 'admin/'; ! define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); $phpEx = substr(strrchr(__FILE__, '.'), 1); --- 47,51 ---- $setmodules_admin_path = $setmodules_module_path . 'admin/'; ! define( 'MXBB_27x', file_exists( $setmodules_root_path . 'mx_login.php' ) ); $phpEx = substr(strrchr(__FILE__, '.'), 1); |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:22:00
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767/includes Modified Files: mx_functions_admincp.php mx_functions_blockcp.php mx_functions_style.php Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mx_functions_blockcp.php 17 Jun 2006 20:09:07 -0000 1.13 --- mx_functions_blockcp.php 22 Aug 2006 20:21:50 -0000 1.14 *************** *** 60,70 **** * @return unknown */ ! function _controlpanel( $id, $new_block ) { global $blockcptemplate, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars, $images; $dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, ''); ! if (empty($id)) { die('Invalid block panel call - no id'); --- 60,72 ---- * @return unknown */ ! function _controlpanel( $id, $new_block = false ) { global $blockcptemplate, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars, $images; + $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; + $dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, ''); ! if ( empty($id) && !$new_block) { die('Invalid block panel call - no id'); *************** *** 225,231 **** 'L_NO' => $lang['No'], ! 'L_SETTING' => $new_block ? '' : $l_setting, ! 'L_DELETE' => $new_block ? '' : $lang['Delete'], ! 'L_EDIT' => $new_block ? '' : $lang['Edit'], 'L_AUTH_TITLE' => $lang['Auth_Block'], --- 227,233 ---- 'L_NO' => $lang['No'], ! 'L_SETTING' => $l_setting, ! 'L_DELETE' => $lang['Delete'], ! 'L_EDIT' => $lang['Edit'], 'L_AUTH_TITLE' => $lang['Auth_Block'], *************** *** 243,247 **** 'BLOCK_ID' => $block_id, ! 'BLOCK_TITLE' => $new_block ? '<span class="cattitle">'. $lang['Create_block'] . '</span>' : ' ' . $block_title, 'BLOCK_DESC' => ( $block_desc != '' ) ? ' - ' . $block_desc : '', --- 245,249 ---- 'BLOCK_ID' => $block_id, ! 'BLOCK_TITLE' => ' ' . $block_title, 'BLOCK_DESC' => ( $block_desc != '' ) ? ' - ' . $block_desc : '', *************** *** 359,404 **** // Activate BlockCP SubPanels, based on auth // ! $blockcptemplate->assign_block_vars('blockcp_general', array( ! 'L_TITLE' => $lang['Edit'], ! 'S_HIDDEN_FIELDS' => $s_hidden_general_fields, ! 'S_SUBMIT' => $buttonvalue ! )); ! ! if ($this->auth_mod) ! { ! $blockcptemplate->assign_block_vars('blockcp_general_add', array( ! 'L_TITLE' => $lang['Create_block'], ! 'S_HIDDEN_FIELDS' => $s_hidden_general_add_fields, ! 'S_SUBMIT' => $buttonvalue_add ! )); ! } ! ! if (!empty($this->block_parameters)) { ! $blockcptemplate->assign_block_vars('blockcp_settings', array( ! 'L_TITLE' => $lang['Settings'], ! 'S_HIDDEN_FIELDS' => $s_hidden_settings_fields, 'S_SUBMIT' => $buttonvalue )); } ! if ($this->auth_mod) { ! $blockcptemplate->assign_block_vars('blockcp_permissions', array( ! 'L_TITLE' => $lang['Permissions_adv'], ! 'S_HIDDEN_FIELDS' => $s_hidden_permissions_fields, ! 'S_SUBMIT' => $buttonvalue )); // - // Some general blockcp settings are moderator only - // - $blockcptemplate->assign_block_vars('blockcp_general.is_auth', array()); - - // - // Now query all permissions data (not needed if not authorized ;) - // - - // // Output values of individual auth fields - add // --- 361,382 ---- // Activate BlockCP SubPanels, based on auth // ! if (!$new_block) { ! $blockcptemplate->assign_block_vars('blockcp_general', array( ! 'L_TITLE' => $lang['Edit'], ! 'S_HIDDEN_FIELDS' => $s_hidden_general_fields, 'S_SUBMIT' => $buttonvalue )); } ! if ( ($this->auth_mod || $is_admin ) || $new_block) { ! $blockcptemplate->assign_block_vars('blockcp_general_adds', array( ! 'L_TITLE' => $lang['Create_block'], ! 'S_HIDDEN_FIELDS' => $s_hidden_general_add_fields, ! 'S_SUBMIT' => $buttonvalue_add )); // // Output values of individual auth fields - add // *************** *** 417,428 **** $cell_title = $field_names[$block_auth_fields[$j]]; ! $blockcptemplate->assign_block_vars('blockcp_general_add.block_auth_titles', array( 'CELL_TITLE' => $cell_title )); ! $blockcptemplate->assign_block_vars('blockcp_general_add.block_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] )); } // --- 395,433 ---- $cell_title = $field_names[$block_auth_fields[$j]]; ! $blockcptemplate->assign_block_vars('blockcp_general_adds.block_auth_titles', array( 'CELL_TITLE' => $cell_title )); ! $blockcptemplate->assign_block_vars('blockcp_general_adds.block_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] )); } + } + + if (!empty($this->block_parameters) && !$new_block) + { + $blockcptemplate->assign_block_vars('blockcp_settings', array( + 'L_TITLE' => $lang['Settings'], + 'S_HIDDEN_FIELDS' => $s_hidden_settings_fields, + 'S_SUBMIT' => $buttonvalue + )); + } + + if ( ($this->auth_mod || $is_admin) && !$new_block) + { + $blockcptemplate->assign_block_vars('blockcp_permissions', array( + 'L_TITLE' => $lang['Permissions_adv'], + 'S_HIDDEN_FIELDS' => $s_hidden_permissions_fields, + 'S_SUBMIT' => $buttonvalue + )); + + // + // Some general blockcp settings are moderator only + // + $blockcptemplate->assign_block_vars('blockcp_general.is_auth', array()); + + // + // Now query all permissions data (not needed if not authorized ;) + // // *************** *** 525,529 **** } ! if ($this->auth_mod) { $blockcptemplate->assign_block_vars('blockcp_delete', array( --- 530,534 ---- } ! if ( ($this->auth_mod || $is_admin) && !$new_block) { $blockcptemplate->assign_block_vars('blockcp_delete', array( *************** *** 559,579 **** * @access public * @param unknown_type $id - * @param unknown_type $new_block */ ! function generate_cp( $id = '', $new_block = false ) { ! $action = $new_block ? MX_ADD : MX_EDIT; ! switch ( $action ) ! { ! case MX_ADD: ! $function_id = $id; ! $this->_controlpanel($function_id, $new_block ); ! break; ! case MX_EDIT: ! $block_id = $id; ! $this->_controlpanel($block_id, $new_block ); ! break; ! } } --- 564,574 ---- * @access public * @param unknown_type $id */ ! function generate_cp( $id = '' ) { ! $newBlock = $id == 'noBlock' ? true : false; ! $block_id = $id == 'noBlock' ? '' : $id; ! $this->_controlpanel($block_id, $newBlock ); } Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_functions_style.php 27 Jun 2006 18:12:22 -0000 1.7 --- mx_functions_style.php 22 Aug 2006 20:21:50 -0000 1.8 *************** *** 122,128 **** } */ ! else if( file_exists($mx_root_path . $this->root . '/' . $filename) ) { ! $filename = $mx_root_path . $this->root . '/' . $filename; } else --- 122,128 ---- } */ ! else if( file_exists( $this->root . '/' . $filename) ) { ! $filename = $this->root . '/' . $filename; } else Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** mx_functions_admincp.php 15 Aug 2006 08:37:01 -0000 1.31 --- mx_functions_admincp.php 22 Aug 2006 20:21:49 -0000 1.32 *************** *** 3379,3438 **** * @access private */ ! function _get_data() { global $db, $template, $lang, $board_config, $userdata; ! $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; ! ! if (!$is_admin) { // ! // Authorization SQL // ! $auth_blocks = get_auth_blocks(); ! $auth_sql = " AND blk.block_id in ( ". $auth_blocks. " ) "; ! } ! ! // ! // ! // Generate dynamic block select ! $sql = "SELECT blk.*, function_admin, fnc.function_name, fnc.function_id, fnc.function_desc, fnc.module_id, mdl.module_name, mdl.module_id, mdl.module_desc ! FROM " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl ! WHERE blk.function_id = fnc.function_id ! AND mdl.module_id = fnc.module_id ! " . $auth_sql . " ! ORDER BY mdl.module_name ASC, fnc.function_name ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of Column/blocks", '', __LINE__, __FILE__, $sql); ! } ! if( $total_blocks = $db->sql_numrows($result) ) ! { ! $row = $db->sql_fetchrowset($result); ! } ! $db->sql_freeresult($result); ! $module_id = $function_id = $block_id = 0; ! for( $j = 0; $j < $total_blocks; $j++ ) ! { ! if( $row[$j]['module_id'] != $row[$j-1]['module_id'] ) { ! $module_desc_tmp = str_replace("\n", '', $row[$j]['module_desc']); ! $module_desc_tmp = str_replace("\r", '', $module_desc_tmp); ! $module_id = $row[$j]['module_id']; ! $module_title = !empty($row[$j]['module_name']) ? addslashes(strip_tags(trim($row[$j]['module_name']))) : ''; ! $module_desc = !empty($row[$j]['module_desc']) ? addslashes(strip_tags(trim($module_desc_tmp))) : ''; ! $this->_addModule($module_id, $module_title, $module_desc); } ! if( $row[$j]['function_id'] != $row[$j-1]['function_id'] ) { $function_desc_tmp = str_replace("\n", '', $row[$j]['function_desc']); $function_desc_tmp = str_replace("\r", '', $function_desc_tmp); --- 3379,3465 ---- * @access private */ ! function _get_data($all_functions = false) { global $db, $template, $lang, $board_config, $userdata; ! if ($all_functions) { + $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; + if (!$is_admin) + { + // + // Authorization SQL + // + $auth_blocks = get_auth_blocks(); + $auth_sql = " AND blk.block_id in ( ". $auth_blocks. " ) "; + } + // ! // First, get a module, function, block mapping // ! $sql = "SELECT * ! FROM " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc ! WHERE blk.function_id = fnc.function_id ! " . $auth_sql . " ! ORDER BY fnc.function_id ASC, blk.block_title ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of Functions/Block", '', __LINE__, __FILE__, $sql); ! } ! if( $total_blocks = $db->sql_numrows($result) ) ! { ! $row = $db->sql_fetchrowset($result); ! } ! $db->sql_freeresult($result); ! $function_id = $block_id = 0; ! $functionBlocks = array(); ! for( $j = 0; $j < $total_blocks; $j++ ) { ! $functionBlocks[$row[$j]['function_id']][] = $row[$j]; ! } ! unset($row); ! // ! // Generate dynamic block select ! // ! $sql = "SELECT * ! FROM " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl ! WHERE mdl.module_id = fnc.module_id ! ORDER BY mdl.module_name ASC, fnc.function_name ASC"; ! ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of Modules/Functions", '', __LINE__, __FILE__, $sql); } ! if( $total_functions = $db->sql_numrows($result) ) ! { ! $row = $db->sql_fetchrowset($result); ! } ! ! $db->sql_freeresult($result); ! $module_id = $function_id = 0; ! ! for( $j = 0; $j < $total_functions; $j++ ) { + if( $row[$j]['module_id'] != $row[$j-1]['module_id'] ) + { + $module_desc_tmp = str_replace("\n", '', $row[$j]['module_desc']); + $module_desc_tmp = str_replace("\r", '', $module_desc_tmp); + + $module_id = $row[$j]['module_id']; + $module_title = !empty($row[$j]['module_name']) ? addslashes(strip_tags(trim($row[$j]['module_name']))) : ''; + $module_desc = !empty($row[$j]['module_desc']) ? addslashes(strip_tags(trim($module_desc_tmp))) : ''; + + $this->_addModule($module_id, $module_title, $module_desc); + } + $function_desc_tmp = str_replace("\n", '', $row[$j]['function_desc']); $function_desc_tmp = str_replace("\r", '', $function_desc_tmp); *************** *** 3443,3458 **** $this->_addFunction($module_id, $function_id, $function_title, $function_desc); } ! $block_desc_tmp = str_replace("\n", '', $row[$j]['block_desc']); ! $block_desc_tmp = str_replace("\r", '', $block_desc_tmp); ! $block_id = $row[$j]['block_id']; ! $block_title = !empty($row[$j]['block_title']) ? addslashes(strip_tags(trim($row[$j]['block_title']))) : ''; ! $block_desc = !empty($block_desc_tmp) ? ' (' . addslashes(strip_tags(trim($block_desc_tmp))) . ')' : ''; ! $this->_addBlock($module_id, $function_id, $block_id, $block_title, $block_desc); } - unset($row); } --- 3470,3569 ---- $this->_addFunction($module_id, $function_id, $function_title, $function_desc); + + // + // Get all function blocks (if any) + // + if (isset($functionBlocks[$function_id])) + { + foreach($functionBlocks[$function_id] as $key => $block_row) + { + $block_desc_tmp = str_replace("\n", '', $block_row['block_desc']); + $block_desc_tmp = str_replace("\r", '', $block_desc_tmp); + + $block_id = $block_row['block_id']; + $block_title = !empty($block_row['block_title']) ? addslashes(strip_tags(trim($block_row['block_title']))) : ''; + $block_desc = !empty($block_desc_tmp) ? ' (' . addslashes(strip_tags(trim($block_desc_tmp))) . ')' : ''; + + $this->_addBlock($module_id, $function_id, $block_id, $block_title, $block_desc); + } + } } + unset($row); ! } ! else ! { ! $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; ! if (!$is_admin) ! { ! // ! // Authorization SQL ! // ! $auth_blocks = get_auth_blocks(); ! $auth_sql = " AND blk.block_id in ( ". $auth_blocks. " ) "; ! } ! // ! // Generate dynamic block select ! // ! $sql = "SELECT blk.*, function_admin, fnc.function_name, fnc.function_id, fnc.function_desc, fnc.module_id, mdl.module_name, mdl.module_id, mdl.module_desc ! FROM " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc, ! " . MODULE_TABLE . " mdl ! WHERE blk.function_id = fnc.function_id ! AND mdl.module_id = fnc.module_id ! " . $auth_sql . " ! ORDER BY mdl.module_name ASC, fnc.function_name ASC"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of Modules/Functions", '', __LINE__, __FILE__, $sql); ! } ! ! if( $total_blocks = $db->sql_numrows($result) ) ! { ! $row = $db->sql_fetchrowset($result); ! } ! ! $db->sql_freeresult($result); ! $module_id = $function_id = $block_id = 0; ! ! for( $j = 0; $j < $total_blocks; $j++ ) ! { ! if( $row[$j]['module_id'] != $row[$j-1]['module_id'] ) ! { ! $module_desc_tmp = str_replace("\n", '', $row[$j]['module_desc']); ! $module_desc_tmp = str_replace("\r", '', $module_desc_tmp); ! ! $module_id = $row[$j]['module_id']; ! $module_title = !empty($row[$j]['module_name']) ? addslashes(strip_tags(trim($row[$j]['module_name']))) : ''; ! $module_desc = !empty($row[$j]['module_desc']) ? addslashes(strip_tags(trim($module_desc_tmp))) : ''; ! ! $this->_addModule($module_id, $module_title, $module_desc); ! } ! ! if( $row[$j]['function_id'] != $row[$j-1]['function_id'] ) ! { ! $function_desc_tmp = str_replace("\n", '', $row[$j]['function_desc']); ! $function_desc_tmp = str_replace("\r", '', $function_desc_tmp); ! ! $function_id = $row[$j]['function_id']; ! $function_title = !empty($row[$j]['function_name']) ? addslashes(strip_tags(trim($row[$j]['function_name']))) : ''; ! $function_desc = !empty($function_desc_tmp) ? addslashes(strip_tags(trim($function_desc_tmp))) : ''; ! ! $this->_addFunction($module_id, $function_id, $function_title, $function_desc); ! } ! ! $block_desc_tmp = str_replace("\n", '', $row[$j]['block_desc']); ! $block_desc_tmp = str_replace("\r", '', $block_desc_tmp); ! ! $block_id = $row[$j]['block_id']; ! $block_title = !empty($row[$j]['block_title']) ? addslashes(strip_tags(trim($row[$j]['block_title']))) : ''; ! $block_desc = !empty($block_desc_tmp) ? ' (' . addslashes(strip_tags(trim($block_desc_tmp))) . ')' : ''; ! ! $this->_addBlock($module_id, $function_id, $block_id, $block_title, $block_desc); ! } ! unset($row); } } *************** *** 3631,3637 **** * @param unknown_type $block_id */ ! function generate($block_id = '') { ! $this->_get_data(); $this->_generate_tpl($block_id); } --- 3742,3748 ---- * @param unknown_type $block_id */ ! function generate($block_id = '', $all_functions = false) { ! $this->_get_data($all_functions); $this->_generate_tpl($block_id); } |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:21:55
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767/templates/subSilver/admin Modified Files: mx_blockcp_admin_body.tpl Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: mx_blockcp_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/mx_blockcp_admin_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_blockcp_admin_body.tpl 5 Apr 2006 20:35:41 -0000 1.4 --- mx_blockcp_admin_body.tpl 22 Aug 2006 20:21:50 -0000 1.5 *************** *** 97,121 **** parentMode = 'adminBlockCP_'; ! parentCat = parentMode + cat_id; ! currentCat = type + cat_id; ! currentStatus = blockcp_menuCats[currentCat].status; blockcp_queuedSteps = new Array(); cookieArray = new Array(); ! blockcp_currentStep = 0; for( var forCat in blockcp_menuCats ) { ! if( (init == 'true' && (blockcp_menuCats[forCat].status == 'block') && blockcp_menuCats[forCat].menu_mode == parentMode) || ! (init != 'true' && ( (currentCat == parentCat && blockcp_menuCats[forCat].status == 'block' ) ))) { blockcp_queuedSteps[blockcp_currentStep++] = new blockcp_queueStep(forCat, 'none'); blockcp_menuCats[forCat].status = 'none'; ! forCatimage = blockcp_menuCats[forCat].menu_mode+'image_'+blockcp_menuCats[forCat].cat_id; if( document.images && document.images[forCatimage] ) --- 97,121 ---- parentMode = 'adminBlockCP_'; ! parentCat = parentMode + cat_id; ! currentCat = type + cat_id; ! currentStatus = blockcp_menuCats[currentCat].status; blockcp_queuedSteps = new Array(); cookieArray = new Array(); ! blockcp_currentStep = 0; for( var forCat in blockcp_menuCats ) { ! if( (init == 'true' && (blockcp_menuCats[forCat].status == 'block') && blockcp_menuCats[forCat].menu_mode == parentMode) || ! (init != 'true' && ( (currentCat == parentCat && blockcp_menuCats[forCat].status == 'block' ) ))) { blockcp_queuedSteps[blockcp_currentStep++] = new blockcp_queueStep(forCat, 'none'); blockcp_menuCats[forCat].status = 'none'; ! forCatimage = blockcp_menuCats[forCat].menu_mode+'image_'+blockcp_menuCats[forCat].cat_id; if( document.images && document.images[forCatimage] ) *************** *** 125,129 **** } } ! if( currentStatus == 'none' ) { --- 125,129 ---- } } ! if( currentStatus == 'none' ) { *************** *** 134,153 **** blockcp_queuedSteps[blockcp_currentStep++] = new blockcp_queueStep(parentCat, 'block'); blockcp_menuCats[parentCat].status = 'block'; ! forCatimage = blockcp_menuCats[parentCat].menu_mode+'image_'+blockcp_menuCats[parentCat].cat_id; if( document.images && document.images[forCatimage] ) { document.images[forCatimage].src = '{IMG_URL_CONTRACT}'; ! } } } ! blockcp_queuedSteps[blockcp_currentStep++] = new blockcp_queueStep(currentCat, 'block'); blockcp_menuCats[currentCat].status = 'block'; ! if (currentCat == parentCat) { var expdate = new Date(); // 72 Hours from now ! expdate.setTime(expdate.getTime() + (72 * 60 * 60 * 1000)); blockcp_setCookie('{COOKIE_NAME}_'+type+'mode', cat_id, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', --- 134,153 ---- blockcp_queuedSteps[blockcp_currentStep++] = new blockcp_queueStep(parentCat, 'block'); blockcp_menuCats[parentCat].status = 'block'; ! forCatimage = blockcp_menuCats[parentCat].menu_mode+'image_'+blockcp_menuCats[parentCat].cat_id; if( document.images && document.images[forCatimage] ) { document.images[forCatimage].src = '{IMG_URL_CONTRACT}'; ! } } } ! blockcp_queuedSteps[blockcp_currentStep++] = new blockcp_queueStep(currentCat, 'block'); blockcp_menuCats[currentCat].status = 'block'; ! if (currentCat == parentCat) { var expdate = new Date(); // 72 Hours from now ! expdate.setTime(expdate.getTime() + (72 * 60 * 60 * 1000)); blockcp_setCookie('{COOKIE_NAME}_'+type+'mode', cat_id, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', *************** *** 155,163 **** ('{COOKIE_SECURE}' == '0') ? false : true); } ! if( document.images && document.images[imageSCR] ) { document.images[imageSCR].src = '{IMG_URL_CONTRACT}'; ! } } else --- 155,163 ---- ('{COOKIE_SECURE}' == '0') ? false : true); } ! if( document.images && document.images[imageSCR] ) { document.images[imageSCR].src = '{IMG_URL_CONTRACT}'; ! } } else *************** *** 167,171 **** ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}'); } ! blockcp_currentStep = 0; setTimeout("blockcp_execQueue();", blockcp_execInterval); --- 167,171 ---- ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}'); } ! blockcp_currentStep = 0; setTimeout("blockcp_execQueue();", blockcp_execInterval); *************** *** 174,178 **** function require_refresh() { ! displayObj('adminBlockCP_require_refresh', 'none'); displayObj('adminBlockCP_require_refresh_info', 'block'); } --- 174,178 ---- function require_refresh() { ! displayObj('adminBlockCP_require_refresh', 'none'); displayObj('adminBlockCP_require_refresh_info', 'block'); } *************** *** 199,203 **** <select name="module_id" MULTIPLE size=5" onClick="require_refresh();"> {DYNAMIC_MODULE_SELECT} ! </select> </td> <td>»</td> --- 199,203 ---- <select name="module_id" MULTIPLE size=5" onClick="require_refresh();"> {DYNAMIC_MODULE_SELECT} ! </select> </td> <td>»</td> *************** *** 219,223 **** {S_HIDDEN_DYN_FILEDS} </td> ! <td> </td> </tr> </table> --- 219,223 ---- {S_HIDDEN_DYN_FILEDS} </td> ! <td> </td> </tr> </table> *************** *** 230,242 **** <div id="adminBlockCP_require_refresh" style="display:block;" class="genmed"> <table width="100%" cellpadding="1" cellspacing="0" border="0" class="forumline" align="center"> ! <tr> <td align="center" colspan="5">{RESULT_MESSAGE}</td> </tr> <tr> ! <!-- BEGIN blockcp_general_add --> <th width="20%" class="thHead" style="cursor:pointer;cursor:hand;" onclick="blockcp_onMenuCatClick('general_add','adminBlockCP_');"> ! <img name="adminBlockCP_image_general_add" src="{IMG_URL_GENERAL_ADD}" border="0" align="absmiddle"> {blockcp_general_add.L_TITLE} </th> ! <!-- END blockcp_general_add --> <!-- BEGIN blockcp_general --> <th width="20%" class="thHead" style="cursor:pointer;cursor:hand;" onclick="blockcp_onMenuCatClick('general','adminBlockCP_');"> --- 230,242 ---- <div id="adminBlockCP_require_refresh" style="display:block;" class="genmed"> <table width="100%" cellpadding="1" cellspacing="0" border="0" class="forumline" align="center"> ! <tr> <td align="center" colspan="5">{RESULT_MESSAGE}</td> </tr> <tr> ! <!-- BEGIN blockcp_general_adds --> <th width="20%" class="thHead" style="cursor:pointer;cursor:hand;" onclick="blockcp_onMenuCatClick('general_add','adminBlockCP_');"> ! <img name="adminBlockCP_image_general_add" src="{IMG_URL_GENERAL_ADD}" border="0" align="absmiddle"> {blockcp_general_adds.L_TITLE} </th> ! <!-- END blockcp_general_adds --> <!-- BEGIN blockcp_general --> <th width="20%" class="thHead" style="cursor:pointer;cursor:hand;" onclick="blockcp_onMenuCatClick('general','adminBlockCP_');"> *************** *** 258,267 **** <img name="adminBlockCP_image_delete" src="{IMG_URL_DELETE}" border="0" align="absmiddle"> {blockcp_delete.L_TITLE} </th> ! <!-- END blockcp_delete --> ! </tr> </table> <div id="adminBlockCP_general_add" style="display:{VISIBLE_GENERAL_ADD};" class="genmed"> ! <!-- BEGIN blockcp_general_add --> <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> <tr> --- 258,267 ---- <img name="adminBlockCP_image_delete" src="{IMG_URL_DELETE}" border="0" align="absmiddle"> {blockcp_delete.L_TITLE} </th> ! <!-- END blockcp_delete --> ! </tr> </table> <div id="adminBlockCP_general_add" style="display:{VISIBLE_GENERAL_ADD};" class="genmed"> ! <!-- BEGIN blockcp_general_adds --> <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> <tr> *************** *** 269,278 **** <form action="{S_ACTION}" method="post" onsubmit="return checkForm(this)"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> ! <tr> <td class="row1" width="50%" align="right"><b>{L_BLOCK_TITLE}</b></td> <td class="row1"><input type="text" size="65" name="block_title" value="" class="post" /></td> </tr> ! ! <tr> <td class="row1" width="50%" align="right"><b>{L_BLOCK_DESC}</b></td> <td class="row1"><input type="text" size="65" name="block_desc" value="" class="post" /></td> --- 269,278 ---- <form action="{S_ACTION}" method="post" onsubmit="return checkForm(this)"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> ! <tr> <td class="row1" width="50%" align="right"><b>{L_BLOCK_TITLE}</b></td> <td class="row1"><input type="text" size="65" name="block_title" value="" class="post" /></td> </tr> ! ! <tr> <td class="row1" width="50%" align="right"><b>{L_BLOCK_DESC}</b></td> <td class="row1"><input type="text" size="65" name="block_desc" value="" class="post" /></td> *************** *** 282,306 **** <td class="row1"><input type="radio" name="show_title" value="1" {S_SHOW_TITLE_YES_ADD} /> <span class="gensmall">{L_YES}</span> <input type="radio" name="show_title" value="0" {S_SHOW_TITLE_NO_ADD} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_SHOW_STATS}</b><br /><span class="gensmall">{L_SHOW_STATS_EXPLAIN}</span></td> ! <td class="row1"><input type="radio" name="show_stats" value="1" {S_SHOW_STATS_YES_ADD} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_stats" value="0" {S_SHOW_STATS_NO_ADD} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_SHOW_BLOCK}</b><br /><span class="gensmall">{L_SHOW_BLOCK_EXPLAIN}</span></td> ! <td class="row1"><input type="radio" name="show_block" value="1" {S_SHOW_BLOCK_YES_ADD} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_block" value="0" {S_SHOW_BLOCK_NO_ADD} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> <td class="row1" width="50%" align="right"> <b>{L_AUTH_TITLE}</b><br /><span class="gensmall">{L_AUTH_TITLE_EXPLAIN}</span> </td> ! <td class="row1"> ! <table cellspacing="1" cellpadding="4" border="0"> ! <tr> <!-- BEGIN block_auth_titles --> ! <td class="row3" align="center"><span class="topictitle">{blockcp_general_add.block_auth_titles.CELL_TITLE}</span></td> <!-- END block_auth_titles --> </tr> --- 282,306 ---- <td class="row1"><input type="radio" name="show_title" value="1" {S_SHOW_TITLE_YES_ADD} /> <span class="gensmall">{L_YES}</span> <input type="radio" name="show_title" value="0" {S_SHOW_TITLE_NO_ADD} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_SHOW_STATS}</b><br /><span class="gensmall">{L_SHOW_STATS_EXPLAIN}</span></td> ! <td class="row1"><input type="radio" name="show_stats" value="1" {S_SHOW_STATS_YES_ADD} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_stats" value="0" {S_SHOW_STATS_NO_ADD} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_SHOW_BLOCK}</b><br /><span class="gensmall">{L_SHOW_BLOCK_EXPLAIN}</span></td> ! <td class="row1"><input type="radio" name="show_block" value="1" {S_SHOW_BLOCK_YES_ADD} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_block" value="0" {S_SHOW_BLOCK_NO_ADD} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> <td class="row1" width="50%" align="right"> <b>{L_AUTH_TITLE}</b><br /><span class="gensmall">{L_AUTH_TITLE_EXPLAIN}</span> </td> ! <td class="row1"> ! <table cellspacing="1" cellpadding="4" border="0"> ! <tr> <!-- BEGIN block_auth_titles --> ! <td class="row3" align="center"><span class="topictitle">{blockcp_general_adds.block_auth_titles.CELL_TITLE}</span></td> <!-- END block_auth_titles --> </tr> *************** *** 310,315 **** <table> <tr> ! <td class="row1" align="center">{blockcp_general_add.block_auth_data.S_AUTH_LEVELS_SELECT}</td> ! </tr> </table> </td> --- 310,315 ---- <table> <tr> ! <td class="row1" align="center">{blockcp_general_adds.block_auth_data.S_AUTH_LEVELS_SELECT}</td> ! </tr> </table> </td> *************** *** 319,333 **** </td> </tr> ! <tr> ! <td class="row1" height="25" align="center" colspan="2">{blockcp_general_add.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{blockcp_general_add.S_SUBMIT}" class="mainoption" />{CANCEL}</td> ! </tr> </table> </form> ! </td> </tr> ! </table> ! <!-- END blockcp_general_add --> </div> --- 319,333 ---- </td> </tr> ! <tr> ! <td class="row1" height="25" align="center" colspan="2">{blockcp_general_adds.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{blockcp_general_adds.S_SUBMIT}" class="mainoption" />{CANCEL}</td> ! </tr> </table> </form> ! </td> </tr> ! </table> ! <!-- END blockcp_general_adds --> </div> *************** *** 339,368 **** <form action="{S_ACTION}" method="post" onsubmit="return checkForm(this)"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> ! <tr> <td class="row1" width="50%" align="right"><b>{L_BLOCK_TITLE}</b></td> <td class="row1"><input type="text" size="65" name="block_title" value="{E_BLOCK_TITLE}" class="post" /></td> </tr> ! ! <tr> <td class="row1" width="50%" align="right"><b>{L_BLOCK_DESC}</b></td> <td class="row1"><input type="text" size="65" name="block_desc" value="{E_BLOCK_DESC}" class="post" /></td> </tr> ! <!-- BEGIN is_auth --> <tr> <td class="row1" width="50%" align="right"><b>{L_SHOW_TITLE}</b><br /><span class="gensmall">{L_SHOW_TITLE_EXPLAIN}</span></td> <td class="row1"><input type="radio" name="show_title" value="1" {S_SHOW_TITLE_YES} /> <span class="gensmall">{L_YES}</span> <input type="radio" name="show_title" value="0" {S_SHOW_TITLE_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_SHOW_STATS}</b><br /><span class="gensmall">{L_SHOW_STATS_EXPLAIN}</span></td> ! <td class="row1"><input type="radio" name="show_stats" value="1" {S_SHOW_STATS_YES} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_stats" value="0" {S_SHOW_STATS_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_SHOW_BLOCK}</b><br /><span class="gensmall">{L_SHOW_BLOCK_EXPLAIN}</span></td> ! <td class="row1"><input type="radio" name="show_block" value="1" {S_SHOW_BLOCK_YES} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_block" value="0" {S_SHOW_BLOCK_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> <!-- ! <tr> <td class="row1" width="50%" align="right"><b>{L_FUNCTION}</b></td> <td class="row1">{S_FUNCTION_LIST}</td> --- 339,368 ---- <form action="{S_ACTION}" method="post" onsubmit="return checkForm(this)"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> ! <tr> <td class="row1" width="50%" align="right"><b>{L_BLOCK_TITLE}</b></td> <td class="row1"><input type="text" size="65" name="block_title" value="{E_BLOCK_TITLE}" class="post" /></td> </tr> ! ! <tr> <td class="row1" width="50%" align="right"><b>{L_BLOCK_DESC}</b></td> <td class="row1"><input type="text" size="65" name="block_desc" value="{E_BLOCK_DESC}" class="post" /></td> </tr> ! <!-- BEGIN is_auth --> <tr> <td class="row1" width="50%" align="right"><b>{L_SHOW_TITLE}</b><br /><span class="gensmall">{L_SHOW_TITLE_EXPLAIN}</span></td> <td class="row1"><input type="radio" name="show_title" value="1" {S_SHOW_TITLE_YES} /> <span class="gensmall">{L_YES}</span> <input type="radio" name="show_title" value="0" {S_SHOW_TITLE_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_SHOW_STATS}</b><br /><span class="gensmall">{L_SHOW_STATS_EXPLAIN}</span></td> ! <td class="row1"><input type="radio" name="show_stats" value="1" {S_SHOW_STATS_YES} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_stats" value="0" {S_SHOW_STATS_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> ! ! <tr> ! <td class="row1" width="50%" align="right"><b>{L_SHOW_BLOCK}</b><br /><span class="gensmall">{L_SHOW_BLOCK_EXPLAIN}</span></td> ! <td class="row1"><input type="radio" name="show_block" value="1" {S_SHOW_BLOCK_YES} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_block" value="0" {S_SHOW_BLOCK_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> <!-- ! <tr> <td class="row1" width="50%" align="right"><b>{L_FUNCTION}</b></td> <td class="row1">{S_FUNCTION_LIST}</td> *************** *** 370,375 **** --> <!-- END is_auth --> ! ! <tr> <td class="row1" width="50%" align="right"> <!-- BEGIN is_auth --> --- 370,375 ---- --> <!-- END is_auth --> ! ! <tr> <td class="row1" width="50%" align="right"> <!-- BEGIN is_auth --> *************** *** 377,384 **** <!-- END is_auth --> </td> ! <td class="row1"> ! <table cellspacing="1" cellpadding="4" border="0"> ! <tr> <!-- BEGIN block_auth_titles --> <td class="row3" align="center"><span class="topictitle">{blockcp_general.block_auth_titles.CELL_TITLE}</span></td> --- 377,384 ---- <!-- END is_auth --> </td> ! <td class="row1"> ! <table cellspacing="1" cellpadding="4" border="0"> ! <tr> <!-- BEGIN block_auth_titles --> <td class="row3" align="center"><span class="topictitle">{blockcp_general.block_auth_titles.CELL_TITLE}</span></td> *************** *** 391,395 **** <tr> <td class="row1" align="center">{blockcp_general.block_auth_data.S_AUTH_LEVELS_SELECT}</td> ! </tr> </table> </td> --- 391,395 ---- <tr> <td class="row1" align="center">{blockcp_general.block_auth_data.S_AUTH_LEVELS_SELECT}</td> ! </tr> </table> </td> *************** *** 399,415 **** </td> </tr> ! <tr> <td class="row1" height="25" align="center" colspan="2">{blockcp_general.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{blockcp_general.S_SUBMIT}" class="mainoption" />{CANCEL}</td> ! </tr> </table> </form> ! </td> </tr> ! </table> <!-- END blockcp_general --> </div> ! <div id="adminBlockCP_settings" style="display:{VISIBLE_SETTINGS};" class="genmed"> <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> --- 399,415 ---- </td> </tr> ! <tr> <td class="row1" height="25" align="center" colspan="2">{blockcp_general.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{blockcp_general.S_SUBMIT}" class="mainoption" />{CANCEL}</td> ! </tr> </table> </form> ! </td> </tr> ! </table> <!-- END blockcp_general --> </div> ! <div id="adminBlockCP_settings" style="display:{VISIBLE_SETTINGS};" class="genmed"> <table border="0" cellpadding="0" cellspacing="0" width="100%" class="forumline"> *************** *** 418,426 **** <td class="row1" colspan="2"> {blockcp_panel.BLOCKCP_PANELS} ! </td> ! </tr> <!-- END blockcp_panel --> ! <!-- BEGIN blockcp_settings --> <tr> --- 418,426 ---- <td class="row1" colspan="2"> {blockcp_panel.BLOCKCP_PANELS} ! </td> ! </tr> <!-- END blockcp_panel --> ! <!-- BEGIN blockcp_settings --> <tr> *************** *** 428,435 **** <form action="{S_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> ! <tr> ! <td class="row2" colspan="2"> <table cellspacing="0" cellpadding="1" border="0" width="100%"> ! <!-- BEGIN no_settings --> <tr> --- 428,435 ---- <form action="{S_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> ! <tr> ! <td class="row2" colspan="2"> <table cellspacing="0" cellpadding="1" border="0" width="100%"> ! <!-- BEGIN no_settings --> <tr> *************** *** 437,452 **** <td class="row1">{blockcp_settings.no_settings.INFO}</td> </tr> ! <!-- END no_settings --> ! {BLOCKCP_PARAMETERS} ! </table> </td> </tr> ! <tr> <td class="row1" height="25" align="center" colspan="2">{blockcp_settings.S_HIDDEN_FIELDS}<input type="submit" name="submit_pars" value="{blockcp_settings.S_SUBMIT}" class="mainoption" />{CANCEL}</td> ! </tr> ! </table> </form> --- 437,452 ---- <td class="row1">{blockcp_settings.no_settings.INFO}</td> </tr> ! <!-- END no_settings --> ! {BLOCKCP_PARAMETERS} ! </table> </td> </tr> ! <tr> <td class="row1" height="25" align="center" colspan="2">{blockcp_settings.S_HIDDEN_FIELDS}<input type="submit" name="submit_pars" value="{blockcp_settings.S_SUBMIT}" class="mainoption" />{CANCEL}</td> ! </tr> ! </table> </form> *************** *** 498,502 **** <td colspan="2" class="row1"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> ! <tr> <td width="50%" align="center" colspan="2">{blockcp_delete.MESSAGE_DELETE}</td> </tr> --- 498,502 ---- <td colspan="2" class="row1"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> ! <tr> <td width="50%" align="center" colspan="2">{blockcp_delete.MESSAGE_DELETE}</td> </tr> *************** *** 505,509 **** </tr> </table> ! <!-- END blockcp_delete --> </div> </div> --- 505,509 ---- </tr> </table> ! <!-- END blockcp_delete --> </div> </div> *************** *** 514,518 **** <td colspan="2" class="row1"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> ! <tr> <td width="50%" align="center" colspan="2">{L_UPDATE}</td> </tr> --- 514,518 ---- <td colspan="2" class="row1"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> ! <tr> <td width="50%" align="center" colspan="2">{L_UPDATE}</td> </tr> |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:21:55
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_module_defs.php 29 Jun 2006 13:13:44 -0000 1.22 --- mx_module_defs.php 22 Aug 2006 20:21:50 -0000 1.23 *************** *** 226,230 **** 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', - // // Generic form selects --- 226,229 ---- *************** *** 300,303 **** --- 299,303 ---- // --------------------------------------------------------------------------------------- + /* // // Get menu data *************** *** 316,322 **** $pageMapping = $mx_nav_data['pagemapping']; ! $num_of_cats = count($navCategory); ! if ( $num_of_cats == 0 ) { $template->assign_block_vars('nocat', array( --- 316,341 ---- $pageMapping = $mx_nav_data['pagemapping']; ! $total_cats = count($navCategory); ! */ ! $sql = "SELECT * ! FROM " . MENU_CAT_TABLE . " ! WHERE block_id = '" . $block_id . "' ! ORDER BY cat_order"; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldnt query Navigation Categories', '', __LINE__, __FILE__, $sql ); ! } ! ! $cat_rows = array(); ! if( $total_cats = $db->sql_numrows($result) ) ! { ! $cat_rows = $db->sql_fetchrowset($result); ! } ! ! $db->sql_freeresult($result); ! ! if ( $total_cats == 0 ) { $template->assign_block_vars('nocat', array( *************** *** 325,336 **** } ! $navCategory[] = array(); ! $cat_count = 0; ! foreach($navCategory as $cat_id => $catData) { ! $cat_count++; ! $new_cat = $cat_count == $num_of_cats + 1; ! ! $cat_id = $new_cat ? 'new_cat' : $catData[0]['cat_id']; $mode = MX_MENU_CAT_TYPE; --- 344,351 ---- } ! for( $cat_count = 0; $cat_count < $total_cats + 1; $cat_count++ ) { ! $new_cat = $cat_count == $total_cats; ! $cat_id = $new_cat ? 'new_cat' : $cat_rows[$cat_count]['cat_id']; $mode = MX_MENU_CAT_TYPE; *************** *** 361,366 **** <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $cat_title = !$new_cat ? $catData[0]['cat_title'] : ''; ! $cat_desc = !$new_cat ? $catData[0]['cat_desc'] : ''; // --- 376,381 ---- <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! $cat_title = !$new_cat ? $cat_rows[$cat_count]['cat_title'] : ''; ! $cat_desc = !$new_cat ? $cat_rows[$cat_count]['cat_desc'] : ''; // *************** *** 369,373 **** if (!$new_cat) { ! $bbcode_uid = $catData[0]['bbcode_uid']; $cat_desc = preg_replace("/\:(([a-z0-9]:)?)$bbcode_uid/si", '', $cat_desc); --- 384,388 ---- if (!$new_cat) { ! $bbcode_uid = $cat_rows[$cat_count]['bbcode_uid']; $cat_desc = preg_replace("/\:(([a-z0-9]:)?)$bbcode_uid/si", '', $cat_desc); *************** *** 376,380 **** } ! $show_cat = $catData[0]['cat_show']; if( $show_cat == 0 ) --- 391,395 ---- } ! $show_cat = $cat_rows[$cat_count]['cat_show']; if( $show_cat == 0 ) *************** *** 387,392 **** } ! $cat_url = $catData[0]['cat_url']; ! $cat_target = $link_target_options[$catData[0]['cat_target']]; $link_target_list = '<select name="cat_target_sel">'; --- 402,407 ---- } ! $cat_url = $cat_rows[$cat_count]['cat_url']; ! $cat_target = $link_target_options[$cat_rows[$cat_count]['cat_target']]; $link_target_list = '<select name="cat_target_sel">'; *************** *** 404,419 **** { $buttonvalue = $lang['Move_and_or_Delete']; ! $name = $catData[0]['cat_title']; ! if( $num_of_cats == 1 ) { ! if( count($catData) > 0 ) ! { ! mx_message_die(GENERAL_ERROR, $lang['Must_delete_menus']); ! } ! else ! { ! $select_to = $lang['Nowhere_to_move']; ! } } else --- 419,427 ---- { $buttonvalue = $lang['Move_and_or_Delete']; ! $name = $cat_rows[$cat_count]['cat_title']; ! if( $total_cats == 1 ) { ! $select_to = $lang['Nowhere_to_move']; } else *************** *** 494,500 **** } $num_of_menus = count($catData); ! if ( $num_of_menus == 0 ) { $template->assign_block_vars('catrow.nocat', array( --- 502,528 ---- } + /* $num_of_menus = count($catData); + */ ! $sql = "SELECT * ! FROM " . MENU_NAV_TABLE . " ! WHERE cat_id = '" . $cat_id . "' ! ORDER BY menu_order"; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldnt query Navigation menus', '', __LINE__, __FILE__, $sql ); ! } ! ! $menu_rows = array(); ! if( $total_menus = $db->sql_numrows($result) ) ! { ! $menu_rows = $db->sql_fetchrowset($result); ! } ! ! $db->sql_freeresult($result); ! ! if ( $total_menus == 0 ) { $template->assign_block_vars('catrow.nocat', array( *************** *** 503,513 **** } ! $catData[] = array(); ! $menu_count = 0; ! foreach($catData as $key => $menuData) { ! $menu_count++; ! $new_menu = $menu_count == $num_of_menus + 1; ! $menu_id = $new_menu ? $cat_id . '_0' : $menuData['menu_id']; $mode = MX_MENU_TYPE; --- 531,538 ---- } ! for( $menu_count = 0; $menu_count < $total_menus + 1; $menu_count++ ) { ! $new_menu = $menu_count == $total_menus; ! $menu_id = $new_menu ? $cat_id . '_0' : $menu_rows[$menu_count]['menu_id']; $mode = MX_MENU_TYPE; *************** *** 530,535 **** ! $menuname = !$new_menu ? $menuData['menu_name'] : ''; ! $menudesc = !$new_menu ? $menuData['menu_desc'] : ''; $message_delete = $lang['Delete_nav_menu'] . ' - ' . $menuname --- 555,560 ---- ! $menuname = !$new_menu ? $menu_rows[$menu_count]['menu_name'] : ''; ! $menudesc = !$new_menu ? $menu_rows[$menu_count]['menu_desc'] : ''; $message_delete = $lang['Delete_nav_menu'] . ' - ' . $menuname *************** *** 538,549 **** . '<br /><br />'; ! $menuicons = $new_menu ? post_icons('menu_icons/') : post_icons('menu_icons/', $menuData['menu_icon']); ! $menulinks = !$new_menu ? $menuData['menu_links'] : ''; ! $block_nav = !$new_menu ? $menuData['block_id'] : ''; ! $function_nav = !$new_menu ? $menuData['function_id'] : ''; ! $page_nav = !$new_menu ? $menuData['page_id'] : ''; ! $auth_view = !$new_menu ? $menuData['auth_view'] : ''; ! $auth_view_group_id = !$new_menu ? $menuData['auth_view_group'] : ''; ! $link_target = !$new_menu ? $link_target_options[$menuData['link_target']] : ''; $link_target_list = '<select name="link_target">'; --- 563,574 ---- . '<br /><br />'; ! $menuicons = $new_menu ? post_icons('menu_icons/') : post_icons('menu_icons/', $menu_rows[$menu_count]['menu_icon']); ! $menulinks = !$new_menu ? $menu_rows[$menu_count]['menu_links'] : ''; ! $block_nav = !$new_menu ? $menu_rows[$menu_count]['block_id'] : ''; ! $function_nav = !$new_menu ? $menu_rows[$menu_count]['function_id'] : ''; ! $page_nav = !$new_menu ? $menu_rows[$menu_count]['page_id'] : ''; ! $auth_view = !$new_menu ? $menu_rows[$menu_count]['auth_view'] : ''; ! $auth_view_group_id = !$new_menu ? $menu_rows[$menu_count]['auth_view_group'] : ''; ! $link_target = !$new_menu ? $link_target_options[$menu_rows[$menu_count]['link_target']] : ''; $link_target_list = '<select name="link_target">'; *************** *** 632,636 **** for( $k = 0; $k < count($module_auth_levels); $k++ ) { ! $selected = ( $menuData[$module_auth_fields[$j]] == $module_auth_const[$k] ) ? ' selected="selected"' : ''; $custom_auth[$j] .= '<option value="' . $module_auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $module_auth_levels[$k]] . "</option>\n"; } --- 657,661 ---- for( $k = 0; $k < count($module_auth_levels); $k++ ) { ! $selected = ( $menu_rows[$menu_count][$module_auth_fields[$j]] == $module_auth_const[$k] ) ? ' selected="selected"' : ''; $custom_auth[$j] .= '<option value="' . $module_auth_const[$k] . '"' . $selected . '>' . $lang['AUTH_' . $module_auth_levels[$k]] . "</option>\n"; } |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:21:55
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767/modules/mx_coreblocks Modified Files: mx_blockcp.php Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** mx_blockcp.php 26 Jun 2006 21:32:23 -0000 1.12 --- mx_blockcp.php 22 Aug 2006 20:21:50 -0000 1.13 *************** *** 98,110 **** } ! if ( empty($block_id) ) { $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id'; $block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1; } ! setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); ! ! $mx_blockcp->init($block_id, true); // --- 98,125 ---- } ! // ! // Intitialize with cookie stored block id ! // ! if ( empty($block_id) && !$mx_request_vars->is_request('function_id') ) { $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id'; $block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1; } + else if ( empty($block_id) && $mx_request_vars->is_request('function_id') ) + { + $block_id = 'noBlock'; // blockCP, functions with no blocks // This should NEVER happen when in blockCP (not adminCP) mode + } + else + { + setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + } ! // ! // Init the User BlockCP ! // ! if (is_numeric($block_id)) ! { ! $mx_blockcp->init($block_id, true); ! } // *************** *** 233,237 **** $mx_blockcp->blockcp_mode = 'mx_blockcp'; ! $mx_blockcp->generate_cp($block_id, $new_block); $mx_page->page_title = $lang['Block_admin']; --- 248,252 ---- $mx_blockcp->blockcp_mode = 'mx_blockcp'; ! $mx_blockcp->generate_cp($block_id); $mx_page->page_title = $lang['Block_admin']; |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:21:55
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767 Modified Files: index.php Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** index.php 16 Aug 2006 20:00:33 -0000 1.59 --- index.php 22 Aug 2006 20:21:49 -0000 1.60 *************** *** 44,47 **** --- 44,57 ---- // + // Handy switch, when recostructing the site. Only admin is able to view pages and browse around normally + // + /* + if( !($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ) + { + mx_message_die(GENERAL_MESSAGE, 'We are currenty upgrading this site with latest mxBB software. Hopefully everything will run smoothly again later tonight (GMT). /Jon', 'Information'); + } + */ + + // // Load and instatiate page and block classes // |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:21:54
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767/admin Modified Files: admin_mx_block_cp.php Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin_mx_block_cp.php 27 Jun 2006 07:52:02 -0000 1.12 --- admin_mx_block_cp.php 22 Aug 2006 20:21:49 -0000 1.13 *************** *** 79,94 **** } ! if ( empty($block_id) ) { $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id'; $block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1; } ! ! setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); // // Init the User BlockCP // ! $mx_blockcp->init($block_id, true); // --- 79,106 ---- } ! // ! // Intitialize with cookie stored block id ! // ! if ( empty($block_id) && !$mx_request_vars->is_request('function_id') ) { $cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_block_id'; $block_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : 1; } ! else if ( empty($block_id) && $mx_request_vars->is_request('function_id') ) ! { ! $block_id = 'noBlock'; // blockCP, functions with no blocks ! } ! else ! { ! setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); ! } // // Init the User BlockCP // ! if (is_numeric($block_id)) ! { ! $mx_blockcp->init($block_id, true); ! } // *************** *** 178,182 **** // $mx_dynamic_select = new mx_dynamic_select(); ! $mx_dynamic_select->generate($block_id); // --- 190,194 ---- // $mx_dynamic_select = new mx_dynamic_select(); ! $mx_dynamic_select->generate($block_id, true); // *************** *** 215,219 **** $mx_blockcp->blockcp_mode = 'admin_mx_block_cp'; ! $mx_blockcp->generate_cp($block_id, $new_block); include_once($mx_root_path . 'admin/page_header_admin.' . $phpEx); --- 227,231 ---- $mx_blockcp->blockcp_mode = 'admin_mx_block_cp'; ! $mx_blockcp->generate_cp($block_id); include_once($mx_root_path . 'admin/page_header_admin.' . $phpEx); |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:21:54
|
Update of /cvsroot/mxbb/core/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767/templates/subSilver Modified Files: overall_header_navigation.tpl Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: overall_header_navigation.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_header_navigation.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overall_header_navigation.tpl 29 Jun 2006 19:05:04 -0000 1.2 --- overall_header_navigation.tpl 22 Aug 2006 20:21:50 -0000 1.3 *************** *** 67,71 **** <a name="top"></a> ! <table width="100%" cellspacing="0" cellpadding="1" border="0" align="center" class="mx_main_table"> <tr> <td class="bodyline"> --- 67,71 ---- <a name="top"></a> ! <table width="780" cellspacing="0" cellpadding="1" border="0" align="center" class="mx_main_table"> <tr> <td class="bodyline"> |
|
From: Jon O. <jon...@us...> - 2006-08-22 20:21:54
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26767/modules/mx_navmenu Modified Files: mx_menu_nav.php Log Message: handy switch in common.php when upgrading sites several major fixes for the blockCP - adding blocks for functions with no blocks etc navigation menu adminCP rewritten. query data. no cache. subsilver narrow layout a couple of fixes when basedir restriction is activated Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_menu_nav.php 20 Aug 2006 14:21:12 -0000 1.16 --- mx_menu_nav.php 22 Aug 2006 20:21:50 -0000 1.17 *************** *** 146,150 **** $catData[$key]['is_current'] = true; } ! else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id && !$catData[$key]['is_current'] ) { $catData[$key]['is_current'] = true; --- 146,150 ---- $catData[$key]['is_current'] = true; } ! else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id ) { $catData[$key]['is_current'] = true; |
|
From: Jon O. <jon...@us...> - 2006-08-20 14:21:16
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1662/modules/mx_navmenu Modified Files: mx_menu_nav.php Log Message: This navigation business is complex :/ Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mx_menu_nav.php 20 Aug 2006 13:02:42 -0000 1.15 --- mx_menu_nav.php 20 Aug 2006 14:21:12 -0000 1.16 *************** *** 106,112 **** $num_of_cats = count($navCategory); - $hasCurrentMenu = false; foreach($navCategory as $cat_id => $catData) { // // Check if this Category contains any authorized menus, or any at all --- 106,113 ---- $num_of_cats = count($navCategory); foreach($navCategory as $cat_id => $catData) { + $hasCurrentMenu = false; + // // Check if this Category contains any authorized menus, or any at all *************** *** 130,133 **** --- 131,156 ---- $catData[0]['cat_url'] = $menuData['page_id']; } + + // + // Highlight current menu + // + $catData[$key]['is_current'] = false; + if ( $menu_page_sync && !$hasCurrentMenu) + { + if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) + { + $catData[$key]['is_current'] = true; + } + else if ( $menuData['page_id'] == $page_id && $menuData['block_id'] == 0 ) + { + $catData[$key]['is_current'] = true; + } + else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id && !$catData[$key]['is_current'] ) + { + $catData[$key]['is_current'] = true; + } + $hasCurrentMenu = $catData[$key]['is_current']; + } + } *************** *** 172,176 **** // Generate the fold/unfold categories switches // ! $cat_on = $current_cat ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 ); $template->assign_block_vars('catrow', array( --- 195,199 ---- // Generate the fold/unfold categories switches // ! $cat_on = $current_cat || $hasCurrentMenu ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 ); $template->assign_block_vars('catrow', array( *************** *** 200,204 **** foreach($catData as $key => $menuData) { - $isCurrentMenu = false; // // Find if user is allowed for view menu --- 223,226 ---- *************** *** 220,263 **** $action = mx_decode($action, $bbcode_uid, false); - if ( $menu_page_sync && !$hasCurrentMenu) - { - if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) - { - $isCurrentMenu = true; - } - else if ( $menuData['page_id'] == $page_id && $menuData['block_id'] == 0 ) - { - $isCurrentMenu = true; - } - else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id && !$isCurrentMenu ) - { - $isCurrentMenu = true; - } - $hasCurrentMenu = $isCurrentMenu; - } - - $style = $isCurrentMenu ? 'cattitle' : 'genmed'; ! /* ! if ( $menu_page_sync ) ! { ! if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) ! { ! $style = 'cattitle'; ! } ! else if ( $menuData['page_id'] == $page_id && $menuData['block_id'] == 0 && !isset($HTTP_GET_VARS['dynamic_block']) ) ! { ! $style = 'cattitle'; ! } ! else ! { ! $style = 'genmed'; ! } ! } ! else ! { ! $style = 'genmed'; ! } ! */ // --- 242,247 ---- $action = mx_decode($action, $bbcode_uid, false); ! $style = $menuData['is_current'] ? 'cattitle' : 'genmed'; // *************** *** 269,274 **** if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) ) { ! $icon_url = ( $isCurrentMenu ) ? $icon_url_hot : $icon_tmp; ! $icon_style = ( $isCurrentMenu ) ? 'mx_icon_hot' : 'mx_icon'; } else --- 253,258 ---- if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) ) { ! $icon_url = ( $menuData['is_current'] ) ? $icon_url_hot : $icon_tmp; ! $icon_style = ( $menuData['is_current'] ) ? 'mx_icon_hot' : 'mx_icon'; } else |
|
From: Jon O. <jon...@us...> - 2006-08-20 14:21:16
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1662/modules/mx_navmenu/includes Modified Files: navmenu_functions.php Log Message: This navigation business is complex :/ Index: navmenu_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** navmenu_functions.php 16 Aug 2006 20:00:33 -0000 1.3 --- navmenu_functions.php 20 Aug 2006 14:21:11 -0000 1.4 *************** *** 166,169 **** --- 166,170 ---- $num_of_cats = 0; $navCategory = array(); + $pageMapping = array(); for( $menu_count = 0; $menu_count < $num_of_menus; $menu_count++ ) { *************** *** 173,177 **** if ( $cat_id != $mx_nav_data[$menu_count]['cat_id'] ) { ! if ($mx_nav_data[$menu_count]['cat_url'] != '0') { $pageMapping[$mx_nav_data[$menu_count]['cat_url']] = $mx_nav_data[$menu_count]['cat_id']; --- 174,178 ---- if ( $cat_id != $mx_nav_data[$menu_count]['cat_id'] ) { ! if ($mx_nav_data[$menu_count]['cat_url'] != '0' && !isset($pageMapping[$mx_nav_data[$menu_count]['cat_url']])) { $pageMapping[$mx_nav_data[$menu_count]['cat_url']] = $mx_nav_data[$menu_count]['cat_id']; *************** *** 184,190 **** // Menu Maps // ! if ($mx_nav_data[$menu_count]['page_id'] != '0') { ! $pageMapping[$mx_nav_data[$menu_count]['page_id']] = $mx_nav_data[$menu_count]['cat_id']; } --- 185,191 ---- // Menu Maps // ! if ($mx_nav_data[$menu_count]['page_id'] != '0' && !isset($pageMapping[$mx_nav_data[$menu_count]['page_id']])) { ! $pageMapping[$mx_nav_data[$menu_count]['page_id']] = $mx_nav_data[$menu_count]['cat_id']; } |
|
From: Jon O. <jon...@us...> - 2006-08-20 13:02:46
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29694/modules/mx_navmenu Modified Files: mx_menu_nav.php Log Message: highlight fix Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mx_menu_nav.php 16 Aug 2006 20:00:33 -0000 1.14 --- mx_menu_nav.php 20 Aug 2006 13:02:42 -0000 1.15 *************** *** 106,109 **** --- 106,110 ---- $num_of_cats = count($navCategory); + $hasCurrentMenu = false; foreach($navCategory as $cat_id => $catData) { *************** *** 194,199 **** --- 195,204 ---- } + // + // Loop through each menu in this category + // foreach($catData as $key => $menuData) { + $isCurrentMenu = false; // // Find if user is allowed for view menu *************** *** 215,218 **** --- 220,243 ---- $action = mx_decode($action, $bbcode_uid, false); + if ( $menu_page_sync && !$hasCurrentMenu) + { + if ( isset($HTTP_GET_VARS['dynamic_block']) ? $menuData['block_id'] == $HTTP_GET_VARS['dynamic_block'] : false ) + { + $isCurrentMenu = true; + } + else if ( $menuData['page_id'] == $page_id && $menuData['block_id'] == 0 ) + { + $isCurrentMenu = true; + } + else if ( $menu_display_style == 'Overall_navigation' && $current_cat && $menuData['page_id'] == $page_id && !$isCurrentMenu ) + { + $isCurrentMenu = true; + } + $hasCurrentMenu = $isCurrentMenu; + } + + $style = $isCurrentMenu ? 'cattitle' : 'genmed'; + + /* if ( $menu_page_sync ) { *************** *** 234,237 **** --- 259,263 ---- $style = 'genmed'; } + */ // *************** *** 243,248 **** if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) ) { ! $icon_url = ( $style == 'cattitle' ) ? $icon_url_hot : $icon_tmp; ! $icon_style = ( $style == 'cattitle' ) ? 'mx_icon_hot' : 'mx_icon'; } else --- 269,274 ---- if ( file_exists($mx_root_path . $images['mx_graphics']['menu_icons'] . '/' . $icon_url_hot) ) { ! $icon_url = ( $isCurrentMenu ) ? $icon_url_hot : $icon_tmp; ! $icon_style = ( $isCurrentMenu ) ? 'mx_icon_hot' : 'mx_icon'; } else |
|
From: Jon O. <jon...@us...> - 2006-08-20 13:01:55
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29281 Modified Files: .htaccess Log Message: before removing Index: .htaccess =================================================================== RCS file: /cvsroot/mxbb/core/.htaccess,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .htaccess 14 Aug 2006 13:01:41 -0000 1.2 --- .htaccess 20 Aug 2006 13:01:49 -0000 1.3 *************** *** 1,3 **** --- 1,8 ---- + #DirIndex DirectoryIndex index.php index.html index.htm + + # Just in case, let's disable viewing of directory indexes. + Options -Indexes + # # Limit *************** *** 9,12 **** --- 14,18 ---- order allow,deny allow from all + # # Banned: Who, Reason, Reference Link (topic), etc. ???... |
|
From: Jon O. <jon...@us...> - 2006-08-18 16:22:08
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30220/language/lang_english Modified Files: lang_main.php Log Message: Updated block stats Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_main.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** lang_main.php 1 Aug 2006 21:06:13 -0000 1.32 --- lang_main.php 18 Aug 2006 16:22:04 -0000 1.33 *************** *** 25,29 **** $lang['Redirect_login'] = 'Click %sHere%s to login.'; $lang['Show_admin_options'] = 'Show/Hide Page Admin Options: '; ! $lang['Block_updated_by'] = 'Updated by '; $lang['Powered_by'] = 'Powered by '; --- 25,30 ---- $lang['Redirect_login'] = 'Click %sHere%s to login.'; $lang['Show_admin_options'] = 'Show/Hide Page Admin Options: '; ! $lang['Block_updated_date'] = 'Updated '; ! $lang['Block_updated_by'] = 'by '; $lang['Powered_by'] = 'Powered by '; |
|
From: Jon O. <jon...@us...> - 2006-08-18 16:22:08
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30220/includes Modified Files: mx_functions_core.php Log Message: Updated block stats Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** mx_functions_core.php 18 Aug 2006 08:01:57 -0000 1.34 --- mx_functions_core.php 18 Aug 2006 16:22:03 -0000 1.35 *************** *** 1385,1392 **** function output_stats() { ! global $layouttemplate, $board_config, $lang; if ( $this->show_stats && !empty($this->block_time) && !empty($this->editor_id) ) { $editor_name_tmp = mx_get_userdata($this->editor_id); $editor_name = $editor_name_tmp['username']; --- 1385,1393 ---- function output_stats() { ! global $layouttemplate, $board_config, $lang, $userdata; if ( $this->show_stats && !empty($this->block_time) && !empty($this->editor_id) ) { + $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; $editor_name_tmp = mx_get_userdata($this->editor_id); $editor_name = $editor_name_tmp['username']; *************** *** 1394,1399 **** $layouttemplate->assign_block_vars('layout_column.blocks.block_stats', array( ! 'L_BLOCK_UPDATED' => $lang['Block_updated_by'], ! 'EDITOR_NAME' => $editor_name, 'EDIT_TIME' => $edit_time )); --- 1395,1400 ---- $layouttemplate->assign_block_vars('layout_column.blocks.block_stats', array( ! 'L_BLOCK_UPDATED' => $lang['Block_updated_date'], ! 'EDITOR_NAME' => $is_admin ? $lang['Block_updated_by'] . $editor_name : '', 'EDIT_TIME' => $edit_time )); |
|
From: Jon O. <jon...@us...> - 2006-08-18 10:45:27
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22920/modules/mx_textblocks/templates/subSilver Modified Files: mx_textblock_html.tpl Log Message: template fix Index: mx_textblock_html.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/subSilver/mx_textblock_html.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_textblock_html.tpl 5 Apr 2006 21:07:17 -0000 1.7 --- mx_textblock_html.tpl 18 Aug 2006 10:45:19 -0000 1.8 *************** *** 1,3 **** ! <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> <td class="row1" align="left" colspan="2">{U_TEXT}</td> --- 1,3 ---- ! <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> <td class="row1" align="left" colspan="2">{U_TEXT}</td> |
|
From: Jon O. <jon...@us...> - 2006-08-18 08:02:52
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22358/modules/mx_linkdb/linkdb/admin Modified Files: admin_cat_manage.php Log Message: bugfix Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_cat_manage.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_cat_manage.php 13 Aug 2006 19:43:51 -0000 1.10 --- admin_cat_manage.php 18 Aug 2006 08:02:45 -0000 1.11 *************** *** 299,303 **** for( $k = 0; $k < count( $cat_auth_approval_levels ); $k++ ) { ! $selected = ( $cat_rowset[$auth] == $cat_auth_approval_const[$k] ) ? ' selected="selected"' : ''; $auth_select_approval[$auth] .= '<option value="' . $cat_auth_approval_const[$k] . '"' . $selected . '>' . $lang['Cat_' . $cat_auth_approval_levels[$k]] . '</option>'; } --- 299,303 ---- for( $k = 0; $k < count( $cat_auth_approval_levels ); $k++ ) { ! $selected = ( $this->cat_rowset[$cat_id][$auth] == $cat_auth_approval_const[$k] ) ? ' selected="selected"' : ''; $auth_select_approval[$auth] .= '<option value="' . $cat_auth_approval_const[$k] . '"' . $selected . '>' . $lang['Cat_' . $cat_auth_approval_levels[$k]] . '</option>'; } |
|
From: Jon O. <jon...@us...> - 2006-08-18 08:02:05
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21927/templates/subSilver/admin Modified Files: index_body.tpl Log Message: Updated adminCP startpage Index: index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/index_body.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index_body.tpl 30 Dec 2005 18:49:52 -0000 1.6 --- index_body.tpl 18 Aug 2006 08:01:57 -0000 1.7 *************** *** 1,5 **** ! <h1>{L_WELCOME}</h1> ! <p>{L_ADMIN_INTRO}</p> <h1>{L_FORUM_STATS}</h1> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> --- 1,8 ---- ! <h1>{L_WELCOME_MXBB}</h1> ! ! <p>{L_ADMIN_INTRO_MXBB}</p> ! <h1>{L_FORUM_STATS}</h1> + <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> *************** *** 52,56 **** <th width="20%" height="25" class="thTop"> {L_STARTED} </th> <th width="20%" class="thTop"> {L_LAST_UPDATE} </th> ! <th width="20%" class="thCornerR"> {L_FORUM_LOCATION} </th> <th width="20%" height="25" class="thCornerR"> {L_IP_ADDRESS} </th> </tr> --- 55,59 ---- <th width="20%" height="25" class="thTop"> {L_STARTED} </th> <th width="20%" class="thTop"> {L_LAST_UPDATE} </th> ! <th width="20%" class="thTop"> {L_FORUM_LOCATION} </th> <th width="20%" height="25" class="thCornerR"> {L_IP_ADDRESS} </th> </tr> *************** *** 60,65 **** <td width="20%" align="center" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.STARTED}</span> </td> <td width="20%" align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.LASTUPDATE}</span> </td> ! <td width="20%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.FORUM_LOCATION}</a></span> </td> ! <td width="20%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_phpbbwhois">{reg_user_row.IP_ADDRESS}</a></span> </td> </tr> <!-- END reg_user_row --> --- 63,68 ---- <td width="20%" align="center" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.STARTED}</span> </td> <td width="20%" align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.LASTUPDATE}</span> </td> ! <td width="20%" align="center" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.FORUM_LOCATION}</a></span> </td> ! <td width="20%" align="right" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_WHOIS_IP}" class="gen" target="_phpbbwhois">{reg_user_row.IP_ADDRESS}</a></span> </td> </tr> <!-- END reg_user_row --> *************** *** 72,77 **** <td width="20%" align="center" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.STARTED}</span> </td> <td width="20%" align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.LASTUPDATE}</span> </td> ! <td width="20%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.FORUM_LOCATION}</a></span> </td> ! <td width="20%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_WHOIS_IP}" target="_phpbbwhois">{guest_user_row.IP_ADDRESS}</a></span> </td> </tr> <!-- END guest_user_row --> --- 75,80 ---- <td width="20%" align="center" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.STARTED}</span> </td> <td width="20%" align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.LASTUPDATE}</span> </td> ! <td width="20%" align="center" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.FORUM_LOCATION}</a></span> </td> ! <td width="20%" align="right" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_WHOIS_IP}" target="_phpbbwhois">{guest_user_row.IP_ADDRESS}</a></span> </td> </tr> <!-- END guest_user_row --> |
|
From: Jon O. <jon...@us...> - 2006-08-18 08:02:05
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21927/language/lang_english Modified Files: lang_admin.php Log Message: Updated adminCP startpage Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** lang_admin.php 1 Aug 2006 21:06:13 -0000 1.67 --- lang_admin.php 18 Aug 2006 08:01:57 -0000 1.68 *************** *** 43,46 **** --- 43,52 ---- // + // Index + // + $lang['Welcome_phpBB'] = 'Welcome to mxBB'; + $lang['Admin_intro'] = 'Thank you for choosing mxBB as your portal/cms solution and phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your site. You can get back to this page by clicking on the <u>Admin Index</u> link in the left pane. To return to the index of your board, click the logo also in the left pane. The other links on the left hand side of this screen will allow you to control every aspect of your portal/forum experience. Each screen will have instructions on how to use the tools.'; + + // // General // |
|
From: Jon O. <jon...@us...> - 2006-08-18 08:02:05
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21927/admin Modified Files: index.php Log Message: Updated adminCP startpage Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** index.php 17 Jun 2006 20:09:06 -0000 1.26 --- index.php 18 Aug 2006 08:01:57 -0000 1.27 *************** *** 320,324 **** --- 320,326 ---- // END "L_WELCOME" => $lang['Welcome_phpBB'], + "L_WELCOME_MXBB" => $lang['Welcome_mxBB'], "L_ADMIN_INTRO" => $lang['Admin_intro'], + "L_ADMIN_INTRO_MXBB" => $lang['Admin_intro_mxBB'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], *************** *** 933,936 **** } - ?> \ No newline at end of file --- 935,937 ---- |
|
From: Jon O. <jon...@us...> - 2006-08-18 08:02:05
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21927/includes Modified Files: mx_functions_core.php Log Message: Updated adminCP startpage Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** mx_functions_core.php 16 Aug 2006 20:00:33 -0000 1.33 --- mx_functions_core.php 18 Aug 2006 08:01:57 -0000 1.34 *************** *** 1178,1182 **** $temp = $this->block_config[$this->block_id]; $this->block_info = $temp['block_info']; ! $this->block_parameters = isset($temp['block_parameters']) ? $temp['block_parameters'] : ''; unset($temp); --- 1178,1182 ---- $temp = $this->block_config[$this->block_id]; $this->block_info = $temp['block_info']; ! $this->block_parameters = $temp['block_parameters']; unset($temp); |
|
From: Jon O. <jon...@us...> - 2006-08-17 12:41:26
|
Update of /cvsroot/mxbb/mx_calsnails In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29589/modules/mx_calsnails Modified Files: mx_calendar_events.php Log Message: fix for new parameter Index: mx_calendar_events.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/mx_calendar_events.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_calendar_events.php 17 Aug 2006 12:38:42 -0000 1.22 --- mx_calendar_events.php 17 Aug 2006 12:41:22 -0000 1.23 *************** *** 134,138 **** case CALRANGE_THIS_AND_NEXT_WEEK: $tmp_time = time(); ! $tmp_dir = ( true ) ? 1 : -1; while ( $cal_config['week_start'] != gmdate( 'w', $tmp_time ) ) { --- 134,138 ---- case CALRANGE_THIS_AND_NEXT_WEEK: $tmp_time = time(); ! $tmp_dir = ( false ) ? 1 : -1; while ( $cal_config['week_start'] != gmdate( 'w', $tmp_time ) ) { *************** *** 286,289 **** --- 286,292 ---- $events_label = $lang['Ev_next_week'] . '' . $nextweek; break; + case CALRANGE_THIS_AND_NEXT_WEEK: + $events_label = $lang['Ev_this_week'] . '' . $currentweek . ' - ' . $nextweek; + break; case CALRANGE_NEXT_MONTH: $events_label = $lang['Ev_next_month'] . ' (' . $nextmonthname . ')'; |
|
From: Jon O. <jon...@us...> - 2006-08-17 12:38:52
|
Update of /cvsroot/mxbb/mx_calsnails In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28272/modules/mx_calsnails Modified Files: CalSnails_Lite.pak mx_calendar_events.php Log Message: New event time range added Index: mx_calendar_events.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/mx_calendar_events.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_calendar_events.php 29 Jun 2006 22:03:22 -0000 1.21 --- mx_calendar_events.php 17 Aug 2006 12:38:42 -0000 1.22 *************** *** 41,44 **** --- 41,45 ---- define( 'CALRANGE_THIS_WEEK' , 'this week' ); define( 'CALRANGE_NEXT_WEEK' , 'next week' ); + define( 'CALRANGE_THIS_AND_NEXT_WEEK' , 'thisnext week' ); define( 'CALRANGE_THIS_MONTH', 'this month' ); define( 'CALRANGE_NEXT_MONTH', 'next month' ); *************** *** 131,134 **** --- 132,145 ---- $end_time = $ini_time + ( SECONDS_PER_DAY * 6 ); break; + case CALRANGE_THIS_AND_NEXT_WEEK: + $tmp_time = time(); + $tmp_dir = ( true ) ? 1 : -1; + while ( $cal_config['week_start'] != gmdate( 'w', $tmp_time ) ) + { + $tmp_time += ( SECONDS_PER_DAY * $tmp_dir ); + } + $ini_time = $tmp_time; + $end_time = $ini_time + ( SECONDS_PER_DAY * 13 ); + break; case CALRANGE_NEXT_MONTH: list( $tmp_yy, $tmp_mm ) = explode( '-', create_date( 'Y-m', time(), $cal_timezone ) ); Index: CalSnails_Lite.pak =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/CalSnails_Lite.pak,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CalSnails_Lite.pak 14 Aug 2006 10:40:19 -0000 1.11 --- CalSnails_Lite.pak 17 Aug 2006 12:38:42 -0000 1.12 *************** *** 1,35 **** ! module=+:56=+:CalSnails Lite=+:modules/mx_calsnails/=+:This is Calendar Lite Module (www.snailsource.com) for MX-System :-)=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:56=+:64=+:CalSnails Lite=+:Main Calendar Lite script=+:calendar.php=+: ! parameter=+:64=+:136=+:cal_mod_group=+:Function=+:0=+:mx_get_groups("{parameter_value}","{parameter_id}[]")=+:0=+:0 ! parameter=+:64=+:135=+:cal_filter=+:Boolean=+:0=+:=+:0=+:0 ! parameter=+:64=+:134=+:auth_reg=+:Function=+:2=+:get_list_static("{parameter_id}[]",array("No access","View only","View,Suggest","View,Add","View,Add(Edit/Delete own)"),"{parameter_value}")=+:0=+:0 ! parameter=+:64=+:133=+:auth_all=+:Function=+:2=+:get_list_static("{parameter_id}[]",array("No access","View only","View,Suggest","View,Add","View,Add(Edit/Delete own)"),"{parameter_value}")=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - CalSnails Lite=+:Demo block=+:64=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:56=+:65=+:CalSnails Events=+:Basic script to deal with calendar event reports=+:mx_calendar_events.php=+: ! parameter=+:65=+:144=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "calendar.php")=+:0=+:0 ! parameter=+:65=+:143=+:Calendar_Vertical_Size=+:Number=+:200=+:=+:0=+:0 ! parameter=+:65=+:142=+:Calendar_Text_Length=+:Number=+:30=+:=+:0=+:0 ! parameter=+:65=+:141=+:Calendar_Events_Range=+:Menu_single_select=+:this week=+:a:5:{i:0;s:5:"today";i:1;s:9:"this week";i:2;s:9:"next week";i:3;s:10:"this month";i:4;s:10:"next month";}=+:0=+:0 ! parameter=+:65=+:140=+:Calendar_Events_Prev=+:Number=+:3=+:=+:0=+:0 ! parameter=+:65=+:139=+:Calendar_Events_Next=+:Number=+:3=+:=+:0=+:0 ! parameter=+:65=+:138=+:Calendar_Events_dateformat=+:Text=+:l, d F Y h:i a=+:=+:0=+:0 ! parameter=+:65=+:137=+:Calendar_Block_Title=+:Text=+:=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - CalSnails Events=+:Demo block=+:65=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:56=+:66=+:CalSnails Mini=+:Calendar Lite (mini function)=+:mx_calendar_mini.php=+: ! parameter=+:66=+:145=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "calendar.php")=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - CalSnails Mini=+:Demo block=+:66=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:56=+:67=+:Calendar Querys1=+:Sample function to help you export Calendar Lite data=+:mx_calendar_query.php=+: ! parameter=+:67=+:146=+:Calendar_Block_Title=+:Text=+:=+:=+:0=+:0 ! parameter=+:67=+:147=+:Calendar_Events_dateformat=+:Text=+:=+:=+:0=+:0 ! parameter=+:67=+:148=+:Calendar_Order=+:Text=+:stamp, subject=+:=+:0=+:0 ! parameter=+:67=+:149=+:Calendar_Where=+:Text=+:=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Calendar Querys1=+:Demo block=+:67=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,35 ---- ! module=+:42=+:CalSnails Lite=+:modules/mx_calsnails/=+:This is Calendar Lite Module (www.snailsource.com) for MX-System :-)=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:42=+:43=+:CalSnails Lite=+:Main Calendar Lite script=+:calendar.php=+: ! parameter=+:43=+:169=+:cal_mod_group=+:Function=+:0=+:mx_get_groups("{parameter_value}","{parameter_id}[]")=+:0=+:0 ! parameter=+:43=+:112=+:auth_reg=+:Function=+:2=+:get_list_static("{parameter_id}[]",array("No access","View only","View,Suggest","View,Add","View,Add(Edit/Delete own)"),"{parameter_value}")=+:0=+:0 ! parameter=+:43=+:170=+:cal_filter=+:Boolean=+:0=+:=+:0=+:0 ! parameter=+:43=+:111=+:auth_all=+:Function=+:2=+:get_list_static("{parameter_id}[]",array("No access","View only","View,Suggest","View,Add","View,Add(Edit/Delete own)"),"{parameter_value}")=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - CalSnails Lite=+:Demo block=+:43=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:42=+:45=+:CalSnails Events=+:Basic script to deal with calendar event reports=+:mx_calendar_events.php=+: ! parameter=+:45=+:68=+:Calendar_Block_Title=+:Text=+:=+:=+:0=+:0 ! parameter=+:45=+:69=+:Calendar_Events_dateformat=+:Text=+:l, d F Y h:i a=+:=+:0=+:0 ! parameter=+:45=+:70=+:Calendar_Vertical_Size=+:Number=+:200=+:=+:0=+:0 ! parameter=+:45=+:71=+:Calendar_Text_Length=+:Number=+:30=+:=+:0=+:0 ! parameter=+:45=+:72=+:Calendar_Events_Range=+:Menu_single_select=+:this week=+:a:6:{i:0;s:5:"today";i:1;s:9:"this week";i:2;s:9:"next week";i:3;s:13:"thisnext week";i:4;s:10:"this month";i:5;s:10:"next month";}=+:0=+:0 ! parameter=+:45=+:73=+:Calendar_Events_Prev=+:Number=+:3=+:=+:0=+:0 ! parameter=+:45=+:74=+:Calendar_Events_Next=+:Number=+:3=+:=+:0=+:0 ! parameter=+:45=+:110=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "calendar.php")=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - CalSnails Events=+:Demo block=+:45=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:42=+:44=+:CalSnails Mini=+:Calendar Lite (mini function)=+:mx_calendar_mini.php=+: ! parameter=+:44=+:325=+:target_block=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]", "calendar.php")=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - CalSnails Mini=+:Demo block=+:44=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:42=+:46=+:Calendar Querys1=+:Sample function to help you export Calendar Lite data=+:mx_calendar_query.php=+: ! parameter=+:46=+:75=+:Calendar_Block_Title=+:Text=+:=+:=+:0=+:0 ! parameter=+:46=+:76=+:Calendar_Events_dateformat=+:Text=+:=+:=+:0=+:0 ! parameter=+:46=+:77=+:Calendar_Where=+:Text=+:=+:=+:0=+:0 ! parameter=+:46=+:78=+:Calendar_Order=+:Text=+:stamp, subject=+:=+:0=+:0 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Calendar Querys1=+:Demo block=+:46=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
2 messages has been excluded from this view by a project administrator.
