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...> - 2005-09-09 08:57:25
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20164/install Modified Files: mx_install.php Log Message: fixing up installation Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** mx_install.php 7 Sep 2005 19:38:10 -0000 1.47 --- mx_install.php 9 Sep 2005 08:57:17 -0000 1.48 *************** *** 1504,1507 **** --- 1504,1508 ---- // $commands_ary = @file_get_contents($schema); + $commands_ary = encode_serialized_data($commands_ary); $commands_ary = preg_replace('/mx_table_/', $mx_table_prefix, $commands_ary); $commands_ary = $remove_remarks($commands_ary); *************** *** 1509,1512 **** --- 1510,1514 ---- $commands_cnt = count($commands_ary); + // // Let's process the statements *************** *** 1522,1529 **** --- 1524,1534 ---- // Commands supported: SQL statements and SET (see format below). // + $command = decode_serialized_data($command); $parse_command = ( preg_match('#^set[\s]+[a-z][a-z0-9_\.]+#i', $command) ? 'parse_cmd_set' : 'parse_cmd_sql' ); // // Let's execute this command (before we'll convert any variable stored by any previous SET command) // + + //echo($command . '<br>'); $parse_command(convert_setvars($command, true)); } *************** *** 1532,1535 **** --- 1537,1561 ---- // + // Encode/decode serialized data + // + function encode_serialized_data($command) + { + $command = str_replace(';i:', '::i::', $command); + $command = str_replace(';s:', '::s::', $command); + $command = str_replace(';}', '::end::', $command); + + return $command; + } + + function decode_serialized_data($command) + { + $command = str_replace('::i::', ';i:', $command); + $command = str_replace('::s::', ';s:', $command); + $command = str_replace('::end::',';}', $command); + + return $command; + } + + // // Command: SET name = SELECT ...; // |
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19461/includes Modified Files: mx_functions.php mx_functions_admincp.php mx_functions_auth.php mx_functions_blockcp.php mx_functions_core.php Removed Files: mx_functions_parameter.php Log Message: fixing up 2.8 Index: mx_functions_auth.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_auth.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_functions_auth.php 20 Aug 2005 18:19:11 -0000 1.1 --- mx_functions_auth.php 9 Sep 2005 08:53:03 -0000 1.2 *************** *** 26,30 **** * - menu_auth * - get_auth_forum ! * - mx_auth_group * - mx_get_groups */ --- 26,30 ---- * - menu_auth * - get_auth_forum ! * - mx_is_group_member (old mx_auth_group) * - mx_get_groups */ Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_functions_blockcp.php 6 Sep 2005 18:51:56 -0000 1.3 --- mx_functions_blockcp.php 9 Sep 2005 08:53:03 -0000 1.4 *************** *** 27,38 **** /********************************************************************************\ | Class: mx_blockcp ! | The mx_blockcp class will provide a block control panel. | This class will load additional module specific parameters, eg advanced textblocks (bbcode/html/mxBB/wysiwyg) and serialized data types | | // | // Methods | // ! | $mx_blockcp->panel($block_id); ! | $mx_blockcp->do_it(ACTION, TYPE, $block_id) | | // --- 27,39 ---- /********************************************************************************\ | Class: mx_blockcp ! | The mx_blockcp class provides a Block Control Panel, extending the mx_block class. | This class will load additional module specific parameters, eg advanced textblocks (bbcode/html/mxBB/wysiwyg) and serialized data types | + | This class is instantiated in admin_mx_block_cp.php (adminCP mode) or in coreblocks/blockcp.php (user mode) + | | // | // Methods | // ! | $mx_blockcp->generate_cp($block_id); | | // *************** *** 40,47 **** | // | - | $mx_blockcp->panel($block_id, $new_block); : This will create new block dialog - | $mx_blockcp->panel($block_id); : This will create edit block dialog - | - | $mx_blockcp->do_it(ACTION, TYPE, $block_id) | \********************************************************************************/ --- 41,44 ---- *************** *** 451,562 **** } - /* - function _get_parameter_option($parameter_id, $id) - { - global $db; - - $table = PARAMETER_OPTION_TABLE; - $idfield = 'option_code'; - $namefield = 'option_desc'; - - $sql = "SELECT * FROM " . $table; - $sql .= " WHERE parameter_id = $parameter_id"; - $sql .= " ORDER BY $namefield "; - - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't get list options parameter", "", __LINE__, __FILE__, $sql); - } - - $column_list = ''; - - while( $row = $db->sql_fetchrow($result) ) - { - $s = ''; - if( $row[$idfield] == $id ) - { - $s = " selected=\"selected\""; - } - $columnlist .= "<option value=\"$row[$idfield]\"$s>" . $row[$namefield] . "</option>\n"; - } - - return $columnlist; - } - */ - - function _do_update($block_id) - { - global $template, $lang, $phpEx, $db, $board_config, $theme, $HTTP_POST_VARS, $portalpage, $phpbb_root_path, $mx_root_path, $phpEx; - - while( list($param_id, $param_value) = each($HTTP_POST_VARS) ) - { - if( !( $param_id == 'mode' || $param_id == 'submit' || $param_id == 'block_title' || $param_id == 'block_desc' || $param_id == 'show_block' ) ) - { - if( is_array($param_value) ) - { - $param_value = implode(',' , $param_value); - } - - $param_info = get_info(PARAMETER_TABLE, 'parameter_id', intval($param_id)); - - if( $param_info['parameter_type'] == 'BBText' ) - { - $bbcode_uid = make_bbcode_uid(); - $param_value = prepare_message($param_value, true, true, true, $bbcode_uid); - } - - $sql = "UPDATE " . BLOCK_SYSTEM_PARAMETER_TABLE . " - SET parameter_value = '$param_value', - bbcode_uid = '$bbcode_uid' - WHERE block_id = '$block_id' - AND parameter_id = '$param_id'"; - - if( !($db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't update system parameter table", "", __LINE__, __FILE__, $sql); - } - } - } - - $block_title = ( isset($HTTP_POST_VARS['block_title']) ) ? trim(strip_tags($HTTP_POST_VARS['block_title'])) : $block_config[$block_id]['block_title']; - $block_desc = trim(strip_tags($HTTP_POST_VARS['block_desc'])); - $show_block = intval($HTTP_POST_VARS['show_block']); - $show_title = intval($HTTP_POST_VARS['show_title']); - $show_stats = intval($HTTP_POST_VARS['show_stats']); - - $block_time = time(); - $block_editor_id = $userdata['user_id']; - - $sql = "UPDATE " . BLOCK_TABLE . " - SET block_title = '" . str_replace("\'", "''", $block_title) . "', - block_desc = '" . str_replace("\'", "''", $block_desc) . "', - block_time = '" . str_replace("\'", "''", $block_time) . "', - block_editor_id = '" . intval($block_editor_id) . "', - show_block = '" . intval($show_block) . "', - show_title = '" . intval($show_title) . "', - show_stats = '" . intval($show_stats) . "' - WHERE block_id = $block_id"; - - if( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) - { - mx_message_die(GENERAL_ERROR, "Could not update block title information.", "", __LINE__, __FILE__, $sql); - } - - // - // Update cache - // - update_session_cache($block_id); - - if( !empty($portalpage) ) - { - $message = $lang['Portal_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_portal_config'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.php?pane=right" ) . '">', '</a>'); - } - else - { - $message = $lang['Portal_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_portal_config'], '<a href="' . append_sid("admin_mx_block.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.php?pane=right") . '">', '</a>'); - } - mx_message_die(GENERAL_MESSAGE, $message); - } - // ------------------------------ // Public Methods --- 448,451 ---- *************** *** 583,615 **** } } - - // - // $action: MX_DO_INSERT, MX_DO_UPDATE, MX_DO_DELETE, MX_DO_SAVE_SETTINGS - // - function submit( $action = '', $id = 0, $parent = false, $recache = true ) - { - $mx_status = ''; - - switch ( $action ) - { - case MX_DO_INSERT: - $mx_status = $this->_do_insert( $id ); - break; - - case MX_DO_UPDATE: - $mx_status = $this->_do_update( $id ); - break; - - case MX_DO_DELETE: - $mx_status = $this->_do_delete( $id, $parent, $recache ); - break; - } - - if (!empty($mx_status)) - { - //mx_message_die( GENERAL_MESSAGE, $message ); - return $mx_status; - } - } } // class mx_blockcp --- 472,475 ---- Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_functions_core.php 8 Sep 2005 21:16:18 -0000 1.5 --- mx_functions_core.php 9 Sep 2005 08:53:03 -0000 1.6 *************** *** 43,49 **** | // | ! | $mx_cache->update( MX_ALL_DATA ); : Updates all cache ! | $mx_cache->update( MX_BLOCK, [$block_id] ); : Optional parameter $block_id to update only specific cache fle ! | $mx_cache->update( MX_PAGE, [$page_id] ); : Optional parameter $page_id to update only specific cache file \********************************************************************************/ --- 43,49 ---- | // | ! | $mx_cache->update( MX_CACHE_ALL ); : Updates all cache ! | $mx_cache->update( MX_CACHE_BLOCK_TYPE, [$block_id] ); : Optional parameter $block_id to update only specific cache fle ! | $mx_cache->update( MX_CACHE_PAGE_TYPE, [$page_id] ); : Optional parameter $page_id to update only specific cache file \********************************************************************************/ *************** *** 52,56 **** // define('MX_CACHE_ALL' , -1); // Flag - all ! define('MX_CACHE_SINGLE' , -2); // Flag - all define('MX_CACHE_PAGE_TYPE' , -3); // Flag - blocks data define('MX_CACHE_BLOCK_TYPE' , -4); // Flag - pages data --- 52,56 ---- // define('MX_CACHE_ALL' , -1); // Flag - all ! define('MX_CACHE_SINGLE' , -2); // Flag - single define('MX_CACHE_PAGE_TYPE' , -3); // Flag - blocks data define('MX_CACHE_BLOCK_TYPE' , -4); // Flag - pages data *************** *** 583,587 **** /********************************************************************************\ | Class: mx_block ! | The mx_block class defines all block properties and handle all block contents output, and is called from index.php. | The object calls the mx_cache class for retrieving block data. | Once initiated, $mx_block->init($block_id), the mx_block object has the following public properties and methods. --- 583,587 ---- /********************************************************************************\ | Class: mx_block ! | The mx_block class defines all block properties, extending the mx_parameter class, and handle all block contents output, and is called from index.php. | The object calls the mx_cache class for retrieving block data. | Once initiated, $mx_block->init($block_id), the mx_block object has the following public properties and methods. *************** *** 932,938 **** $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array() ); } - - - } // class mx_block --- 932,935 ---- *************** *** 940,944 **** /********************************************************************************\ | Class: mx_block_parameter ! | The mx_block_parameter class is actually a mx_block subclass, and shouldn't be called by itself ;). | | // --- 937,942 ---- /********************************************************************************\ | Class: mx_block_parameter ! | The mx_block_parameter class is actually a mx_block parent class, and shouldn't be called by itself ;). ! | This class handles all block parameter editing and loads module specific block parameters. | | // *************** *** 950,957 **** | // | - | Initiate/Kill: - | $mx_block->init($block_id) : Initiate all block properties for passed $block_id | ! | Output to template: | | // --- 948,955 ---- | // | | ! | $this->load_block_parameters($block_id) : Load all block parameters and format the form element ! | $this->load_block_panels($block_id) : Load (if exists) an additional module panel. Eg the Navigation Menu Panel ! | $this->submit_parameters($block_id) : Submit all block parameters and update cache | | // *************** *** 961,972 **** \********************************************************************************/ - // Parameter Types - define( 'INPUT', 0 ); - define( 'TEXTAREA', 1 ); - define( 'RADIO', 2 ); - define( 'SELECT', 3 ); - define( 'SELECT_MULTIPLE', 4 ); - define( 'CHECKBOX', 5 ); - class mx_block_parameter { --- 959,962 ---- *************** *** 1615,1626 **** } - /* - function get_field_data( $field_id ) - { - $return_array = $this->mxParameter[$field_id]; - $return_array['data'] = !empty( $return_array['data'] ) ? implode( "\n", unserialize( stripslashes( $return_array['data'] ) ) ) : ''; - return $return_array; - } - */ } --- 1605,1608 ---- Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_functions_admincp.php 7 Sep 2005 19:36:30 -0000 1.4 --- mx_functions_admincp.php 9 Sep 2005 08:53:03 -0000 1.5 *************** *** 27,31 **** /********************************************************************************\ | Class: mx_admin ! | The mx_admin class provides all (most) tools for db actions. To be used by the adminCP - module, block and page administration. | | // --- 27,31 ---- /********************************************************************************\ | Class: mx_admin ! | The mx_admin class provides all (most) tools for the adminCP Panels - Module area, Module CP, Block CP and Page CP administration. | | // *************** *** 33,55 **** | // | ! | $mx_admin->do_it($mode, $action, $id); | | // | // Usage examples: | // | | case 'create_block': // Insert ! | $result_message = $mx_admin->do_it(MX_BLOCK_TYPE, MX_DO_INSERT); ! | // block_create_block(); | break; | | case 'delete_block': ! | $result_message = $mx_admin->do_it(MX_BLOCK_TYPE, MX_DO_DELETE, $block_id); ! | // block_delete($block_id); | break; | | case 'modify_block': ! | $result_message = $mx_admin->do_it(MX_BLOCK_TYPE, MX_DO_UPDATE, $block_id); ! | // block_modify($block_id); | break; | --- 33,66 ---- | // | ! | $mx_admin->do_it( $mode, $action, $id, $parent [optional boolean], $recache [optional boolean] ) | | // + | // Switches + | // + | + | $action: + | - MX_DO_INSERT, MX_DO_UPDATE, MX_DO_DELETE, + | - MX_DO_MOVE, MX_DO_SYNC, + | - MX_DO_INSTALL, MX_DO_UPGRADE, MX_DO_EXPORT + | + | $type: + | - MX_MODULE_TYPE, MX_FUNCTION_TYPE, MX_PARAMETER_TYPE, + | - MX_BLOCK_TYPE, MX_BLOCK_PARAMETER_TYPE, MX_BLOCK_PRIVATE_TYPE, MX_BLOCK_SETTINGS_TYPE, + | - MX_PAGE_TYPE, MX_PAGE_COLUMN_TYPE, MX_PAGE_BLOCK_TYPE, MX_PAGE_PRIVATE_TYPE, MX_PAGE_TEMPLATE_TYPE, MX_PAGE_TEMPLATE_COLUMN_TYPE + | + | // | // Usage examples: | // | | case 'create_block': // Insert ! | $result_message = $mx_admin->do_it(MX_DO_INSERT, MX_BLOCK_TYPE ); | break; | | case 'delete_block': ! | $result_message = $mx_admin->do_it(MX_DO_DELETE, MX_BLOCK_TYPE, $block_id); | break; | | case 'modify_block': ! | $result_message = $mx_admin->do_it(MX_DO_UPDATE, MX_BLOCK_TYPE, $block_id); | break; | *************** *** 3023,3043 **** // ! // ! // Examples ! // ! ! // $block_config = $mx_cache->read( MX_BLOCK, $block_id, [MX_QUERY_DB] ); // Optional flag 'MX_QUERY_DB' to force db query ! // $page_config = $mx_cache->read( MX_PAGE, $page_id, [MX_QUERY_DB] ); // Optional flag 'MX_QUERY_DB' to force db query ! ! // $mx_cache->update( MX_ALL_DATA ); // Updates all cache ! // $mx_cache->update( MX_BLOCK, [$block_id] ); // Optional parameter $block_id to update only specific cache fle ! // $mx_cache->update( MX_PAGE, [$page_id] ); // Optional parameter $page_id to update only specific cache file ! ! // ! // Switches ! // ! // $action: MX_DO_INSERT, MX_DO_UPDATE, MX_DO_DELETE, MX_DO_SAVE_SETTINGS ! // $type: MX_MODULE, MX_BLOCK, MX_FUNCTION, MX_PARAMETER, MX_PAGE, MX_PAGE_COLUMN, MX_PAGE_ITEM function do_it( $mode = '', $action = '', $id = '', $parent = false, $recache = true ) --- 3034,3046 ---- // ! // $action: ! // - MX_DO_INSERT, MX_DO_UPDATE, MX_DO_DELETE, ! // - MX_DO_MOVE, MX_DO_SYNC, ! // - MX_DO_INSTALL, MX_DO_UPGRADE, MX_DO_EXPORT ! // $type: ! // - MX_MODULE_TYPE, MX_FUNCTION_TYPE, MX_PARAMETER_TYPE, ! // - MX_BLOCK_TYPE, MX_BLOCK_PARAMETER_TYPE, MX_BLOCK_PRIVATE_TYPE, MX_BLOCK_SETTINGS_TYPE, ! // - MX_PAGE_TYPE, MX_PAGE_COLUMN_TYPE, MX_PAGE_BLOCK_TYPE, MX_PAGE_PRIVATE_TYPE, MX_PAGE_TEMPLATE_TYPE, MX_PAGE_TEMPLATE_COLUMN_TYPE function do_it( $mode = '', $action = '', $id = '', $parent = false, $recache = true ) *************** *** 3110,3134 **** $message .= '<br /> If you get some Errors, Already Added or Updated messages, relax, this is normal when updating modules'; - if ( $main_install ) - { - if ( !$inst_error ) - { - $message .= '-> no db errors :-)<br /><br /><b>Portal installed successfully! </b><hr><br /><br />'; - $message .= '1) Now, delete the /install and /contrib folders!!!<br /><br />'; - $message .= '2) If you haven\'t already done a db backup, now is the time ;)<br /><br />'; - $message .= '3) Then (after step 1), you HAVE to configure MX core and its modules from within the adminCP, simply \'upgrade\' MX portal Core and all modules in use!!!<br /><br />'; - - $message .= 'Click <a href=../admin/admin_mx_module.php>Here</a> to administer/upgrade the portal/modules. You will be promted for an admin username and pass. The upgrade process provide informative output...'; - } - else - { - $message .= '<br /><br /><b>Portal installed successfully (with some warnings)! </b><hr><br /><br />'; - $message .= '1) Now, delete the /install and /contrib folders!!!<br /><br />'; - $message .= '2) If you haven\'t already done a db backup, now is the time ;)<br /><br />'; - $message .= '3) Now (after step 1), you HAVE to configure MX core and its modules from within the adminCP, simply \'upgrade\' MX portal Core and all modules in use!!!<br /><br />'; - - $message .= 'Click <a href=../admin/admin_mx_module.php>Here</a> to administer/upgrade the portal/modules. You will be promted for an admin username and pass. The upgrade process provide informative output...'; - } - } return $message; } --- 3113,3116 ---- --- mx_functions_parameter.php DELETED --- Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** mx_functions.php 6 Sep 2005 18:51:56 -0000 1.45 --- mx_functions.php 9 Sep 2005 08:53:03 -0000 1.46 *************** *** 23,33 **** * Included functions in this file: * - get_info - * - get_old_items * - get_exists * - get_list - * - get_mx_select_list - * - get_list_formatted * - get_list_static * - get_list_multiple * - get_list_opt [...1002 lines suppressed...] - $mx_module_copy = '<h1>' . $lang['mx_copy'] . '</h1><hr /><br />'; - $mx_module_copy .= $lang['mx_copy_text'] . '<br /><br />'; - $mx_module_copy .= $lang['mx_modules_text'] . '<br />'; - - for( $i = 0; $i < count($module); $i++ ) - { - if( !empty($module[$i]['module_version']) ) - { - $mx_module_copy .= '<br />' . $module[$i]['module_version'] . ', ' . $module[$i]['module_copy']; - } - } - - $mx_module_copy = $mx_module_copy . '<br /><br /><hr />'; - - mx_message_die(GENERAL_MESSAGE, $mx_module_copy, 'Modules info and copyrights'); - } - ?> \ No newline at end of file --- 1499,1501 ---- |
|
From: Jon O. <jon...@us...> - 2005-09-09 08:53:11
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19461/admin Modified Files: admin_mx_block_cp.php admin_mx_module_cp.php Log Message: fixing up 2.8 Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_mx_module_cp.php 8 Sep 2005 21:16:18 -0000 1.4 --- admin_mx_module_cp.php 9 Sep 2005 08:53:02 -0000 1.5 *************** *** 702,705 **** --- 702,706 ---- 'L_PARAMETER_DEFAULT' => $lang['Parameter_default'], 'L_PARAMETER_FUNCTION' => $lang['Parameter_function'], + 'L_PARAMETER_FUNCTION_EXPLAIN' => $lang['Parameter_function_explain'], "L_PARAMETER_TEXT" => $lang['Parameter_admin_explain'], 'L_PARAMETER_ID' => $lang['Parameter_id'], Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_block_cp.php 6 Sep 2005 18:51:56 -0000 1.2 --- admin_mx_block_cp.php 9 Sep 2005 08:53:02 -0000 1.3 *************** *** 198,209 **** )); - // -------------------------------------------------------- - // Previews Layout - // -------------------------------------------------------- - if( $preview && !$error ) - { - $mx_blockcp->generate_preview($block_id); - } - $mx_blockcp->generate_cp($block_id, $new_block); --- 198,201 ---- |
|
From: Jon O. <jon...@us...> - 2005-09-09 08:53:10
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19461/language/lang_english Modified Files: lang_admin.php Log Message: fixing up 2.8 Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** lang_admin.php 7 Sep 2005 19:36:30 -0000 1.41 --- lang_admin.php 9 Sep 2005 08:53:03 -0000 1.42 *************** *** 174,178 **** $lang['Parameter_type'] = "<b>Parameter Type</b>"; $lang['Parameter_default'] = "<b>Default Value</b>"; ! $lang['Parameter_function'] = "<b>Function (for Type 'Function')</b><br />- You may pass the parameter data to an external function <br /> to generate the parameter form field.<br />- For example: <br />get_list_formatted(\"block_list\",\"{parameter_value}\",\"{parameter_id}[]\")"; $lang['Parameters'] = "Parameters"; --- 174,180 ---- $lang['Parameter_type'] = "<b>Parameter Type</b>"; $lang['Parameter_default'] = "<b>Default Value</b>"; ! $lang['Parameter_function'] = "<b>Function/Options</b>"; ! $lang['Parameter_function_explain'] = "<b>Function</b> (when using the 'Function' type)<br />- You may pass the parameter data to an external function <br /> to generate the parameter form field.<br />- For example: <br />get_list_formatted(\"block_list\",\"{parameter_value}\",\"{parameter_id}[]\")"; ! $lang['Parameter_function_explain'] .= "<br /><br /><b>Option(s)</b> (when using 'Selection' parameter types)<br />- For all selection parameters (radiobuttons, checkboxes and menys) all options are listed here, one option per line."; $lang['Parameters'] = "Parameters"; |
|
From: Jon O. <jon...@us...> - 2005-09-08 21:16:31
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14010/modules/mx_coreblocks Modified Files: mx_site_log.php Log Message: fixing up installer and search and site log Index: mx_site_log.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_site_log.php 6 Sep 2005 18:51:57 -0000 1.2 --- mx_site_log.php 8 Sep 2005 21:16:19 -0000 1.3 *************** *** 68,72 **** { case 'no limit': ! $news_time_filter_lo = "no"; break; case '1 day': --- 68,72 ---- { case 'no limit': ! $log_time_filter_lo = "no"; break; case '1 day': *************** *** 126,134 **** AND col.page_id IN ($valid_page_ids)"; if ( $log_time_filter_lo != 'no' && !empty($log_time_filter_lo) ) { $sql .= " AND blk.block_time > " . $log_time_filter_lo ; } ! if ( !$result = $db->sql_query( $sql ) ) { --- 126,135 ---- AND col.page_id IN ($valid_page_ids)"; + if ( $log_time_filter_lo != 'no' && !empty($log_time_filter_lo) ) { $sql .= " AND blk.block_time > " . $log_time_filter_lo ; } ! if ( !$result = $db->sql_query( $sql ) ) { |
|
From: Jon O. <jon...@us...> - 2005-09-08 21:16:31
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14010/admin Modified Files: admin_mx_module.php admin_mx_module_cp.php admin_mx_page_cp.php Log Message: fixing up installer and search and site log Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_module_cp.php 6 Sep 2005 18:51:56 -0000 1.3 --- admin_mx_module_cp.php 8 Sep 2005 21:16:18 -0000 1.4 *************** *** 304,308 **** $module_rows_current = array(); ! $module_rows_current = $db->sql_fetchrowset($q_modules_current); // --- 304,311 ---- $module_rows_current = array(); ! if( $total_modules_current = $db->sql_numrows($q_modules_current) ) ! { ! $module_rows_current = $db->sql_fetchrowset($q_modules_current); ! } // *************** *** 326,330 **** } ! if ( $total_modules == 0 ) { $template->assign_block_vars('nomodule', array( --- 329,333 ---- } ! if ( $total_modules + $total_modules_current == 0 ) { $template->assign_block_vars('nomodule', array( *************** *** 334,337 **** --- 337,341 ---- $module_rows = array_merge($module_rows_current, $module_rows); + $total_modules = $total_modules + $total_modules_current; // *************** *** 351,355 **** $is_current_module = ($module_id == $nav_module_id); ! $module_rows_select[$module_id] = $module_rows[$module_count]['module_name']; if (!$include_all && $module_count > 0) --- 355,362 ---- $is_current_module = ($module_id == $nav_module_id); ! if ($module_count != $total_modules) ! { ! $module_rows_select[$module_id] = $module_rows[$module_count]['module_name']; ! } if (!$include_all && $module_count > 0) Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_mx_page_cp.php 6 Sep 2005 18:51:56 -0000 1.3 --- admin_mx_page_cp.php 8 Sep 2005 21:16:18 -0000 1.4 *************** *** 613,617 **** $is_current_page = $page_id == $nav_page_id; ! if ($page_count - -1) { $page_rows_select_tmp = !empty($page_rows[$page_count]['page_desc']) ? ' (' . $page_rows[$page_count]['page_desc'] . ')' : ''; --- 613,617 ---- $is_current_page = $page_id == $nav_page_id; ! if ($page_count > -1) { $page_rows_select_tmp = !empty($page_rows[$page_count]['page_desc']) ? ' (' . $page_rows[$page_count]['page_desc'] . ')' : ''; Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** admin_mx_module.php 7 Sep 2005 19:36:30 -0000 1.33 --- admin_mx_module.php 8 Sep 2005 21:16:18 -0000 1.34 *************** *** 213,217 **** $module_rows_current = array(); ! $module_rows_current = $db->sql_fetchrowset($q_modules_current); // --- 213,220 ---- $module_rows_current = array(); ! if( $total_modules_current = $db->sql_numrows($q_modules_current) ) ! { ! $module_rows_current = $db->sql_fetchrowset($q_modules_current); ! } // *************** *** 235,239 **** } ! if ( $total_modules == 0 ) { $template->assign_block_vars('nomodule', array( --- 238,242 ---- } ! if ( $total_modules + $total_modules_current == 0 ) { $template->assign_block_vars('nomodule', array( *************** *** 243,246 **** --- 246,250 ---- $module_rows = array_merge($module_rows_current, $module_rows); + $total_modules = $total_modules + $total_modules_current; // *************** *** 281,285 **** $is_current_module = $module_id == $nav_module_id; ! $module_rows_select[$module_id] = $module_rows[$module_count]['module_name']; $check_opt = ''; --- 285,292 ---- $is_current_module = $module_id == $nav_module_id; ! if ($module_count > -1) ! { ! $module_rows_select[$module_id] = $module_rows[$module_count]['module_name']; ! } $check_opt = ''; |
|
From: Jon O. <jon...@us...> - 2005-09-08 21:16:31
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14010/includes Modified Files: mx_functions_core.php Log Message: fixing up installer and search and site log Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_functions_core.php 7 Sep 2005 19:36:30 -0000 1.4 --- mx_functions_core.php 8 Sep 2005 21:16:18 -0000 1.5 *************** *** 1064,1068 **** function submit_parameters( $block_id = false ) { ! global $HTTP_POST_VARS, $db, $mx_cache, $lang; $return = false; --- 1064,1068 ---- function submit_parameters( $block_id = false ) { ! global $HTTP_POST_VARS, $db, $mx_cache, $lang, $userdata; $return = false; *************** *** 1108,1111 **** --- 1108,1112 ---- case 'Checkbox_multiple_select': $parameter_value = addslashes( serialize( $parameter_value ) ); + die($parameter_value); break; case 'Separator': *************** *** 1119,1122 **** --- 1120,1126 ---- } + // + // Update block data + // if ( $sub_id == $parameter_data['sub_id'] || true ) { *************** *** 1146,1149 **** --- 1150,1173 ---- mx_message_die(GENERAL_ERROR, "Couldn't update system parameter table", "", __LINE__, __FILE__, $sql); } + + // + // Update block itself + // + if( $sub_id == 0 ) + { + $block_time = time(); + $block_editor_id = $userdata['user_id']; + + $sql = "UPDATE " . BLOCK_TABLE . " + SET block_time = '" . str_replace("\'", "''", $block_time) . "', + block_editor_id = '" . intval($block_editor_id) . "' + WHERE block_id = $block_id"; + + if( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) ) + { + mx_message_die(GENERAL_ERROR, "Could not update block title information.", "", __LINE__, __FILE__, $sql); + } + } + } |
|
From: Jon O. <jon...@us...> - 2005-09-08 21:16:31
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14010/modules/mx_coreblocks/templates/subSilver Modified Files: mx_announce.tpl mx_forum.tpl mx_google.tpl mx_includex.tpl mx_language.tpl mx_login.tpl mx_online.tpl mx_poll_ballot.tpl mx_poll_result.tpl mx_site_log.tpl mx_theme.tpl Log Message: fixing up installer and search and site log Index: mx_poll_ballot.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_poll_ballot.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_poll_ballot.tpl 26 Apr 2005 00:15:03 -0000 1.7 --- mx_poll_ballot.tpl 8 Sep 2005 21:16:19 -0000 1.8 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1"><br clear="all" /> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1"><br clear="all" /> Index: mx_forum.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_forum.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_forum.tpl 19 Apr 2005 20:49:28 -0000 1.4 --- mx_forum.tpl 8 Sep 2005 21:16:19 -0000 1.5 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> <th colspan="2" class="thCornerL" height="25" nowrap="nowrap"> {L_FORUM} </th> --- 1,3 ---- ! <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> <th colspan="2" class="thCornerL" height="25" nowrap="nowrap"> {L_FORUM} </th> *************** *** 25,29 **** </table> ! <table width="{BLOCK_SIZE}" cellspacing="0" border="0" align="center" cellpadding="2"> <tr> <td align="left"><span class="gensmall"><a href="{U_MARK_READ}" class="gensmall">{L_MARK_FORUMS_READ}</a></span></td> --- 25,29 ---- </table> ! <table width="100%" cellspacing="0" border="0" align="center" cellpadding="2"> <tr> <td align="left"><span class="gensmall"><a href="{U_MARK_READ}" class="gensmall">{L_MARK_FORUMS_READ}</a></span></td> Index: mx_online.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_online.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_online.tpl 19 Apr 2005 18:29:14 -0000 1.5 --- mx_online.tpl 8 Sep 2005 21:16:19 -0000 1.6 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" align="center" valign="middle" rowspan="2"><a href="{U_VIEWONLINE}" class="cattitle"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" border="0" /></a></td> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" align="center" valign="middle" rowspan="2"><a href="{U_VIEWONLINE}" class="cattitle"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" border="0" /></a></td> Index: mx_site_log.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_site_log.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_site_log.tpl 19 Apr 2005 18:29:14 -0000 1.2 --- mx_site_log.tpl 8 Sep 2005 21:16:19 -0000 1.3 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <!-- BEGIN no_row --> <tr> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <!-- BEGIN no_row --> <tr> Index: mx_login.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_login.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_login.tpl 20 Apr 2005 17:06:19 -0000 1.7 --- mx_login.tpl 8 Sep 2005 21:16:19 -0000 1.8 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" valign="middle" height="28"><span class="gensmall"> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" valign="middle" height="28"><span class="gensmall"> Index: mx_theme.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_theme.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_theme.tpl 19 Apr 2005 18:02:27 -0000 1.6 --- mx_theme.tpl 8 Sep 2005 21:16:19 -0000 1.7 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" align="center" valign="middle" height="28"><span class="genmed"> <b>{L_SUBTITLE}</b> </span></td> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" align="center" valign="middle" height="28"><span class="genmed"> <b>{L_SUBTITLE}</b> </span></td> Index: mx_language.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_language.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_language.tpl 19 Apr 2005 17:14:19 -0000 1.5 --- mx_language.tpl 8 Sep 2005 21:16:19 -0000 1.6 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" align="center" valign="middle" height="28"><span class="genmed"> <b>{L_SUBTITLE}</b> </span></td> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" align="center" valign="middle" height="28"><span class="genmed"> <b>{L_SUBTITLE}</b> </span></td> Index: mx_google.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_google.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_google.tpl 19 Apr 2005 17:14:19 -0000 1.6 --- mx_google.tpl 8 Sep 2005 21:16:19 -0000 1.7 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" align="center" valign="middle" height="28"> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1" align="center" valign="middle" height="28"> Index: mx_includex.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_includex.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_includex.tpl 19 Apr 2005 17:14:19 -0000 1.3 --- mx_includex.tpl 8 Sep 2005 21:16:19 -0000 1.4 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <!-- BEGIN iframe_mode --> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <!-- BEGIN iframe_mode --> Index: mx_announce.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_announce.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_announce.tpl 28 Apr 2005 13:58:33 -0000 1.8 --- mx_announce.tpl 8 Sep 2005 21:16:19 -0000 1.9 *************** *** 1,4 **** <!-- BEGIN postrow --> ! <table width="{BLOCK_SIZE}" border="0" cellpadding="1" cellspacing="0" class="forumline"> <tr> <td class="row1"> --- 1,4 ---- <!-- BEGIN postrow --> ! <table width="100%" border="0" cellpadding="1" cellspacing="0" class="forumline"> <tr> <td class="row1"> Index: mx_poll_result.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_poll_result.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_poll_result.tpl 26 Apr 2005 00:15:03 -0000 1.7 --- mx_poll_result.tpl 8 Sep 2005 21:16:19 -0000 1.8 *************** *** 1,3 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1"><br clear="all" /> --- 1,3 ---- ! <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> <tr> <td class="row1"><br clear="all" /> |
|
From: Jon O. <jon...@us...> - 2005-09-08 21:16:31
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14010/modules/mx_textblocks/admin Modified Files: mx_module_defs.php Log Message: fixing up installer and search and site log Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_module_defs.php 6 Sep 2005 18:51:57 -0000 1.3 --- mx_module_defs.php 8 Sep 2005 21:16:19 -0000 1.4 *************** *** 65,69 **** function submit_module_parameters( $parameter_data, $block_id ) { ! global $HTTP_POST_VARS, $db, $board_config, $html_entities_match, $html_entities_replace; $parameter_value = $HTTP_POST_VARS[$parameter_data['parameter_name']]; --- 65,69 ---- function submit_module_parameters( $parameter_data, $block_id ) { ! global $HTTP_POST_VARS, $db, $board_config, $html_entities_match, $html_entities_replace, $mx_cache; $parameter_value = $HTTP_POST_VARS[$parameter_data['parameter_name']]; *************** *** 109,112 **** --- 109,122 ---- $parameter_opt = $bbcode_uid; + // + // Add search words + // + mx_remove_search_post($block_id); + $block_config_temp = $mx_cache->read( $block_id, MX_CACHE_BLOCK_TYPE ); + $block_info_temp = $block_config_temp[$block_id]['block_info']; + $block_title = $block_info_temp['block_title']; + mx_add_search_words('single', $block_id, $parameter_value, $block_title); + + return array('parameter_value' => $parameter_value, 'parameter_opt' => $parameter_opt); } |
|
From: Jon O. <jon...@us...> - 2005-09-08 21:16:31
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14010 Modified Files: config.php Log Message: fixing up installer and search and site log Index: config.php =================================================================== RCS file: /cvsroot/mxbb/core/config.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** config.php 20 Aug 2005 18:27:33 -0000 1.7 --- config.php 8 Sep 2005 21:16:18 -0000 1.8 *************** *** 1,23 **** <?php ! ! // MX-Portal auto-generated config file // Do not change anything in this file! ! ! // This file must be put into the portal directory, not into the phpBB directory. $dbms = 'mysql'; $dbhost = 'localhost'; ! $dbname = 'core'; $dbuser = 'Jon'; $dbpasswd = '1234'; ! $mx_table_prefix = 'mx2_'; $table_prefix = 'phpbb_'; ! $phpbb_root_path = $mx_root_path . 'phpBB2/'; define('MX_INSTALLED', true); --- 1,21 ---- <?php ! // mxBB-Portal auto-generated config file // Do not change anything in this file! ! // This file must be put into the mxBB-Portal directory, not into the phpBB directory. $dbms = 'mysql'; $dbhost = 'localhost'; ! $dbname = '276'; $dbuser = 'Jon'; $dbpasswd = '1234'; ! $mx_table_prefix = 'mx_'; $table_prefix = 'phpbb_'; ! $phpbb_root_path = $mx_root_path . 'core276/phpBB2/'; define('MX_INSTALLED', true); |
|
From: Jon O. <jon...@us...> - 2005-09-07 21:14:52
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21027/install/schemas Added Files: mysql_schema_install_2.801.sql mysql_schema_upgrade_to_2.801.sql Removed Files: mysql_schema_upgrade_to_2.8.RC1.sql mysql_schema_upgrade_to_2.8.RC2.sql mysql_schema_upgrade_to_2.8.RC3.sql mysql_schema_upgrade_to_2.8.RC4.sql Log Message: fixing up installation/upgrading --- NEW FILE: mysql_schema_install_2.801.sql --- # MySQL-Front Dump 2.4 # # Host: localhost Database: core_28 #-------------------------------------------------------- # Server version 3.23.51-nt # # Table structure for table 'mx_table_block' # CREATE TABLE `mx_table_block` ( `block_id` smallint(5) unsigned NOT NULL auto_increment, `block_title` varchar(150) default NULL, `block_desc` text, `function_id` smallint(5) unsigned default NULL, `auth_view` tinyint(2) NOT NULL default '0', `auth_edit` tinyint(2) default '0', `auth_delete` tinyint(2) default '0', `auth_view_group` varchar(255) NOT NULL default '0', `auth_edit_group` varchar(255) NOT NULL default '0', `auth_delete_group` varchar(255) NOT NULL default '0', `auth_moderator_group` varchar(255) NOT NULL default '0', `show_title` tinyint(2) unsigned NOT NULL default '1', `show_block` tinyint(2) unsigned NOT NULL default '1', `show_stats` tinyint(2) unsigned NOT NULL default '0', `block_time` varchar(255) binary NOT NULL default '', `block_editor_id` mediumint(8) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_block' # INSERT INTO mx_table_block VALUES("1", "phpBB TextBlock", "This is a Demo Block", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1125865999", "2"); INSERT INTO mx_table_block VALUES("2", "Split Block", "This is a Demo Block", "11", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841933", "2"); INSERT INTO mx_table_block VALUES("6", "Poll", "This is a Demo Block", "14", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841942", "2"); INSERT INTO mx_table_block VALUES("7", "Language Select", "This is a Demo Block", "6", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841887", "2"); INSERT INTO mx_table_block VALUES("8", "Navigation Menu", "This is a vertical Navigation Menu Demo Block", "51", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1126034018", "2"); INSERT INTO mx_table_block VALUES("24", "Forum", "This is a Demo Block", "8", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841817", "2"); INSERT INTO mx_table_block VALUES("13", "Login", "This is a Demo Block", "7", "9", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125867452", "2"); INSERT INTO mx_table_block VALUES("14", "Theme Select", "This is a Demo Block", "12", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841964", "2"); INSERT INTO mx_table_block VALUES("21", "Google", "This is a Demo Block", "4", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1126033253", "2"); INSERT INTO mx_table_block VALUES("18", "Announcements", "This is a Demo Block", "2", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125868467", "2"); INSERT INTO mx_table_block VALUES("19", "Who is Online?", "This is a Demo Block", "13", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841983", "2"); INSERT INTO mx_table_block VALUES("16", "Last Message Post", "This is a Demo Block", "31", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125842159", "2"); INSERT INTO mx_table_block VALUES("26", "Statistics", "This is a Demo Block", "41", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125842177", "2"); INSERT INTO mx_table_block VALUES("27", "IncludeX", "This is a Demo Block", "5", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841878", "2"); INSERT INTO mx_table_block VALUES("25", "Navigation Menu", "This is a horizontal Navigation Menu Demo Block", "51", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125842132", "2"); INSERT INTO mx_table_block VALUES("4", "Dynamic Block", "This is a Demo Block", "3", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841802", "2"); INSERT INTO mx_table_block VALUES("5", "Blog TextBlock", "This is a Demo Block", "21", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1125842544", "2"); INSERT INTO mx_table_block VALUES("10", "WYSIWYG TextBlock", "This is a Demo Block", "23", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1125842503", "2"); INSERT INTO mx_table_block VALUES("28", "Welcome", "This is the firstpage welcome block", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1125852430", "2"); INSERT INTO mx_table_block VALUES("29", "Demo Pages", "Introduction", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1125859625", "2"); INSERT INTO mx_table_block VALUES("30", "Modules Info", "Introduction", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1125859742", "2"); INSERT INTO mx_table_block VALUES("3", "Site Log", "This is a Demo Block", "10", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1125841954", "2"); INSERT INTO mx_table_block VALUES("9", "mxBB TextBlock", "This is a Demo Block", "22", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1125865570", "2"); # # Table structure for table 'mx_table_block_system_parameter' # CREATE TABLE `mx_table_block_system_parameter` ( `block_id` smallint(5) unsigned NOT NULL default '0', `parameter_id` smallint(5) unsigned NOT NULL default '0', `parameter_value` text, `parameter_opt` text, `sub_id` int(255) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`,`parameter_id`,`sub_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_block_system_parameter' # INSERT INTO mx_table_block_system_parameter VALUES("8", "66", "", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("25", "66", "", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("2", "60", "21,7,14", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("2", "61", "33%, 33%,*", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("2", "62", "4", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("6", "36", "", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("6", "13", "0", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "17", "5", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "18", "TRUE", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "19", "30", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "20", "_self", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "21", "left", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "22", "TRUE", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "37", "", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "38", "FALSE", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "39", "FALSE", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "40", "TRUE", NULL, "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "1", "3", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "2", "10", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "3", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "4", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "5", "FALSE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "7", "thumb_news.gif", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "8", "thumb_globe.gif", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "9", "thumb_globe.gif", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "6", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "10", "thumb_globe.gif", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("18", "11", "", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("8", "63", "Vertical", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("8", "64", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("27", "72", "http://127.0.0.1/include_file/startsidan.htm", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("27", "70", "1", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("27", "73", "325", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("25", "63", "Horizontal", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("25", "64", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("4", "80", "29", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("10", "16", "<table cellpadding=\"2\" width=\"100%\" border=\"0\"><tr><td class=\"row2\" valign=\"top\" align=\"left\"><span class=\"genmed\"><strong>Mon</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- MÅNDAG -->Busy with <em>this and that</em></span></td></tr><tr><td class=\"row1\" valign=\"top\" align=\"left\"><span class=\"genmed\"><strong>Tue</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TISDAG-->Not so busy</span></td></tr><tr><td class=\"row2\" valign=\"top\" align=\"left\"><span class=\"genmed\"><strong>Wen</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- ONSDAG-->Very busy</span></td></tr><tr><td class=\"row1\" valign=\"top\" align=\"left\"><span class=\"genmed\"><strong>Thu</strong></span></td><td class=\"row1\"><span class=\"gensmall\"><!-- TORSDAG-->Lazy</span></td></tr><tr><td class=\"row2\" valign=\"top\" align=\"left\"><span class=\"genmed\"><strong>Fri</strong></span></td><td class=\"row2\"><span class=\"gensmall\"><!-- FREDAG-->Resting...</span></td></tr></table><p>This basic table structure is a nice demonstration in which the wysiwyg editor comes in handy!</p><p>Try it out! <br />(to edit use the top right edit button)</p>", "0", "0"); INSERT INTO mx_table_block_system_parameter VALUES("1", "15", "This is a [i:d4ee1ca70a]standard [/i:d4ee1ca70a]TextBlock, featuring bbcodes, html and smilies as defined by the phpBB config settings.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)", "d4ee1ca70a", "0"); INSERT INTO mx_table_block_system_parameter VALUES("16", "65", "5", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("3", "91", "3 months", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("28", "15", "[b:5093963b57]mxBB Portal [/b:5093963b57]is a fully modular portal and CMS, for phpBB, featuring dynamic pages, blocks, themes and more by means of a powerful yet flexible adminCP and front end block editing possibilites on the fly. While it uses integrated features it works without touching phpBB. mxBB Portal requires phpBB to run, and currently supports the MySQL and PostgreSQL databases. mxBB Portal is the classical phpBB portal addon, improved and enhanced for every phpBB version since 2001.\r\n\r\n[i:5093963b57]Welcome, and thanks for using the mxBB Portal![/i:5093963b57] \r\n\r\n :lol:", "5093963b57", "0"); INSERT INTO mx_table_block_system_parameter VALUES("29", "15", "On this page we [i:a561d23b0e]demonstrate [/i:a561d23b0e]a few basic portal blocks (not already present on this or other pages) - to get you started. Please, try out the top links to different demo blocks.", "a561d23b0e", "0"); INSERT INTO mx_table_block_system_parameter VALUES("30", "15", "You may enrich your portal with addon modules - for specific functionality:\r\n\r\n- Download manager\r\n- Picture Album\r\n- Calendar Tools\r\n- Knowledge Base\r\n- Links Gallery\r\n- Games\r\n\r\nand many more. Be sure to visit www.mx-system.com for latest available modules!", "ecfe9a4569", "0"); INSERT INTO mx_table_block_system_parameter VALUES("3", "92", "5", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "50", "This is basically a [i:3883289f58]standard[/i:3883289f58] TextBlock, but you may configure settings for bbcodes, html and smilies for [i:3883289f58]this[/i:3883289f58] block.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)", "3883289f58", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "51", "none", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "52", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "53", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "56", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "54", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "57", "TRUE", "", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "55", "b,i,u,img", "", "0"); # # Table structure for table 'mx_table_column' # CREATE TABLE `mx_table_column` ( `column_id` smallint(5) unsigned NOT NULL auto_increment, `column_title` varchar(100) default NULL, `column_order` smallint(5) unsigned NOT NULL default '0', `bbcode_uid` varchar(10) default NULL, `column_size` varchar(5) default '100%', `page_id` smallint(5) NOT NULL default '0', PRIMARY KEY (`column_id`), KEY `cat_order` (`column_order`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_column' # INSERT INTO mx_table_column VALUES("8", "Main", "50", NULL, "100%", "4"); INSERT INTO mx_table_column VALUES("2", "Main", "35", NULL, "100%", "1"); INSERT INTO mx_table_column VALUES("7", "Left", "40", NULL, "200", "4"); INSERT INTO mx_table_column VALUES("6", "Main", "50", NULL, "100%", "3"); INSERT INTO mx_table_column VALUES("5", "Left", "40", NULL, "200", "3"); INSERT INTO mx_table_column VALUES("4", "Main", "50", NULL, "100%", "2"); INSERT INTO mx_table_column VALUES("1", "Left", "25", NULL, "200", "1"); INSERT INTO mx_table_column VALUES("3", "Left", "40", NULL, "200", "2"); # # Table structure for table 'mx_table_column_block' # CREATE TABLE `mx_table_column_block` ( `column_id` smallint(5) NOT NULL default '0', `block_id` smallint(5) NOT NULL default '0', `block_order` smallint(5) NOT NULL default '0' ) TYPE=MyISAM; # # Dumping data for table 'mx_table_column_block' # INSERT INTO mx_table_column_block VALUES("5", "14", "40"); INSERT INTO mx_table_column_block VALUES("4", "19", "20"); INSERT INTO mx_table_column_block VALUES("8", "19", "20"); INSERT INTO mx_table_column_block VALUES("4", "24", "10"); INSERT INTO mx_table_column_block VALUES("1", "13", "20"); INSERT INTO mx_table_column_block VALUES("3", "16", "20"); INSERT INTO mx_table_column_block VALUES("5", "3", "30"); INSERT INTO mx_table_column_block VALUES("2", "19", "20"); INSERT INTO mx_table_column_block VALUES("2", "28", "10"); INSERT INTO mx_table_column_block VALUES("1", "8", "10"); INSERT INTO mx_table_column_block VALUES("6", "25", "10"); INSERT INTO mx_table_column_block VALUES("8", "26", "10"); INSERT INTO mx_table_column_block VALUES("7", "8", "10"); INSERT INTO mx_table_column_block VALUES("6", "4", "20"); INSERT INTO mx_table_column_block VALUES("5", "8", "10"); INSERT INTO mx_table_column_block VALUES("6", "19", "30"); INSERT INTO mx_table_column_block VALUES("5", "7", "20"); INSERT INTO mx_table_column_block VALUES("3", "13", "30"); INSERT INTO mx_table_column_block VALUES("3", "8", "10"); # # Table structure for table 'mx_table_column_templates' # CREATE TABLE `mx_table_column_templates` ( `column_template_id` smallint(5) unsigned NOT NULL auto_increment, `column_title` varchar(100) default '0', `column_order` smallint(5) unsigned NOT NULL default '0', `column_size` varchar(5) default '0', `page_template_id` smallint(5) NOT NULL default '0', PRIMARY KEY (`column_template_id`), KEY `cat_order` (`column_order`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_column_templates' # INSERT INTO mx_table_column_templates VALUES("1", "Left", "40", "200", "2"); INSERT INTO mx_table_column_templates VALUES("2", "Main", "50", "100%", "2"); INSERT INTO mx_table_column_templates VALUES("3", "Main", "10", "100%", "3"); INSERT INTO mx_table_column_templates VALUES("4", "Right", "20", "200", "3"); INSERT INTO mx_table_column_templates VALUES("5", "Left", "10", "180", "4"); INSERT INTO mx_table_column_templates VALUES("6", "Middle", "20", "100%", "4"); INSERT INTO mx_table_column_templates VALUES("7", "Right", "30", "180", "4"); # # Table structure for table 'mx_table_function' # CREATE TABLE `mx_table_function` ( `function_id` smallint(5) unsigned NOT NULL auto_increment, `module_id` smallint(5) unsigned NOT NULL default '0', `function_name` varchar(150) default NULL, `function_desc` text, `function_file` varchar(255) default NULL, `function_admin` varchar(255) default NULL, PRIMARY KEY (`function_id`), KEY `module_id` (`module_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_function' # INSERT INTO mx_table_function VALUES("8", "10", "phpBB forum", "phpBB Function for the phpBB Index Block", "mx_forum.php", ""); INSERT INTO mx_table_function VALUES("51", "50", "Navigation Menu", "This is the function for Navigation Menu Blocks", "mx_menu_nav.php", ""); INSERT INTO mx_table_function VALUES("14", "10", "Polls", "This is the function for Polls", "mx_poll.php", ""); INSERT INTO mx_table_function VALUES("6", "10", "Language Select", "Language Select Function", "mx_language.php", ""); INSERT INTO mx_table_function VALUES("7", "10", "Login", "Login Function", "mx_login.php", ""); INSERT INTO mx_table_function VALUES("12", "10", "Theme Select", "Theme Select Function", "mx_theme.php", ""); INSERT INTO mx_table_function VALUES("4", "10", "Google", "Google Block Function", "mx_google.php", ""); INSERT INTO mx_table_function VALUES("2", "10", "Announcements", "Announcements Function", "mx_announce.php", ""); INSERT INTO mx_table_function VALUES("13", "10", "Who is Online", "Who is Online Function", "mx_online.php", ""); INSERT INTO mx_table_function VALUES("11", "10", "Split Block", "Split Block Function - a block that puts subblocks side by side", "mx_multiple_blocks.php", ""); INSERT INTO mx_table_function VALUES("24", "20", "TextBlock (phpBB)", "BBcodes, html and smilies - defined by phpBB config", "mx_textblock_bbcode.php", ""); INSERT INTO mx_table_function VALUES("23", "20", "TextBlock (Html/wysiwyg)", "Plain html textblock, or featuring a wysiwyg editor", "mx_textblock_html.php", ""); INSERT INTO mx_table_function VALUES("22", "20", "TextBlock (Customized)", "Textblock, featuring block defined settings", "mx_textblock_multi.php", ""); INSERT INTO mx_table_function VALUES("31", "30", "Post Last Message", "Post Last Message Function", "mx_last_msg.php", ""); INSERT INTO mx_table_function VALUES("41", "40", "Statistics MX", "Statistics Function", "mx_statistics.php", NULL); INSERT INTO mx_table_function VALUES("5", "10", "IncludeX", "Include a iframe, site, multimedia or file", "mx_includex.php", ""); INSERT INTO mx_table_function VALUES("3", "10", "DynamicBlock", "Dynamic block defined by its block_id", "mx_dynamic.php", ""); INSERT INTO mx_table_function VALUES("21", "20", "TextBlock (Blog)", "UserBlog Textblock", "mx_textblock_blog.php", ""); INSERT INTO mx_table_function VALUES("10", "10", "Site Log", "Site Log monitor Function", "mx_site_log.php", ""); # # Table structure for table 'mx_table_menu_categories' # CREATE TABLE `mx_table_menu_categories` ( `block_id` smallint(5) unsigned NOT NULL default '1', `cat_id` mediumint(8) unsigned NOT NULL auto_increment, `cat_title` varchar(100) default NULL, `cat_order` mediumint(8) unsigned NOT NULL default '0', `bbcode_uid` varchar(10) default NULL, `cat_desc` text, `cat_show` tinyint(1) unsigned NOT NULL default '0', `cat_url` smallint(5) unsigned default '0', `cat_target` tinyint(2) unsigned NOT NULL default '0', PRIMARY KEY (`cat_id`), KEY `cat_order` (`cat_order`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_menu_categories' # INSERT INTO mx_table_menu_categories VALUES("8", "1", "Resources", "20", "c1affc0aaa", "", "0", "0", "0"); INSERT INTO mx_table_menu_categories VALUES("8", "3", "Home", "10", "eab7a16ce5", "", "1", "1", "0"); INSERT INTO mx_table_menu_categories VALUES("25", "4", "Core Blocks", "40", "a5abf5b8c4", "Demo Core blocks", "1", "0", "0"); INSERT INTO mx_table_menu_categories VALUES("25", "5", "TextBlocks", "50", "fa33545edc", "Demo TextBlocks", "0", "0", "0"); INSERT INTO mx_table_menu_categories VALUES("25", "6", "Modules", "60", "7dafcede48", "Modules Info", "0", "0", "0"); # # Table structure for table 'mx_table_menu_nav' # CREATE TABLE `mx_table_menu_nav` ( `menu_id` smallint(5) unsigned NOT NULL auto_increment, `cat_id` mediumint(8) unsigned NOT NULL default '0', `menu_name` varchar(150) default NULL, `menu_desc` text, `menu_links` varchar(255) default NULL, `auth_view` tinyint(2) NOT NULL default '0', `menu_order` smallint(5) unsigned default '0', `bbcode_uid` varchar(10) default NULL, `menu_icon` varchar(255) default NULL, `function_id` smallint(5) unsigned default '0', `block_id` smallint(8) NOT NULL default '0', `page_id` smallint(5) unsigned default '0', `auth_view_group` smallint(5) NOT NULL default '0', `link_target` tinyint(2) unsigned NOT NULL default '0', PRIMARY KEY (`menu_id`), KEY `cat_id` (`cat_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_menu_nav' # INSERT INTO mx_table_menu_nav VALUES("7", "4", "Split Block", "Split block Demo", "", "0", "10", "043673560e", "icon_dot.gif", "0", "2", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("8", "4", "Google Block", "Google Block Demo", "", "0", "20", "795e2489d7", "icon_dot.gif", "0", "21", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("9", "4", "phpBB Announcements (if any)", "phpBB Announcements Demo", "", "0", "30", "29add66982", "icon_dot.gif", "0", "18", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("10", "4", "IncludeX", "IncludeX Demo", "", "0", "40", "f7adaf1201", "icon_dot.gif", "0", "27", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("11", "4", "phpBB Polls (if any)", "phpBB Polls Demo", "", "0", "50", "a80fe73aee", "icon_dot.gif", "0", "6", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("12", "5", "phpBB TextBlock", "phpBB TextBlock Demo", "", "0", "10", "85d178caa8", "icon_dot.gif", "0", "1", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("13", "5", "WYSIWYG TextBlock", "WYSIWYG TextBlock Demo", "", "0", "20", "51e2ddb3a7", "icon_dot.gif", "0", "10", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("14", "5", "Custom TextBlock", "Custom TextBlock Demo", "", "0", "30", "22cb7a4f9f", "icon_dot.gif", "0", "9", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("15", "6", "Modules Info", "Information", "", "0", "10", "630ce0e7f0", "icon_dot.gif", "0", "30", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("5", "1", "phpBB Home", "", "http://www.phpbb.com", "0", "20", "71fe54c6a2", "icon_info.gif", "0", "0", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("3", "3", "SiteStats", "Some Sitestats", "", "0", "30", "62b47107b4", "icon_stats.gif", "0", "0", "4", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("4", "1", "mxBB-Portal Home", "", "http://www.mx-system.com", "0", "10", "c40e66a4ae", "icon_info.gif", "0", "0", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("6", "1", "Demo Pages", "On this page are several demo blocks located", "", "0", "30", "348dc29f4a", "icon_dev.gif", "0", "0", "3", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("1", "3", "Home", "Back to home", "", "0", "10", "bb51181967", "icon_home.gif", "0", "0", "1", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("2", "3", "Forum", "phpBB Forum Index", "", "0", "20", "a33e401abc", "icon_forum.gif", "0", "0", "2", "0", "0"); # # Table structure for table 'mx_table_module' # CREATE TABLE `mx_table_module` ( `module_id` smallint(5) unsigned NOT NULL auto_increment, `module_name` varchar(150) default NULL, `module_path` varchar(255) default NULL, `module_desc` text, `module_include_admin` char(1) default '0', `module_version` varchar(255) default NULL, `module_copy` text, PRIMARY KEY (`module_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_module' # INSERT INTO mx_table_module VALUES("10", "Core Blocks", "modules/mx_coreblocks/", "mxBB Core (standard) Module", "0", "", "mzBB Core Module"); INSERT INTO mx_table_module VALUES("20", "Text Blocks", "modules/mx_textblocks/", "mxBB Textblocks Module", "0", NULL, "mzBB Core Module"); INSERT INTO mx_table_module VALUES("30", "Post Last Message", "modules/mx_last_msg/", "mxBB Last Message Module", "0", NULL, "mzBB Core Module"); INSERT INTO mx_table_module VALUES("40", "Statistics MX", "modules/mx_statistics/", "mxBB Statistics Module", "0", NULL, "mzBB Core Module"); INSERT INTO mx_table_module VALUES("50", "Navigation Menu", "modules/mx_navmenu/", "mxBB Navigation Module", "0", NULL, "mzBB Core Module"); # # Table structure for table 'mx_table_page' # CREATE TABLE `mx_table_page` ( `page_id` smallint(5) NOT NULL auto_increment, `page_name` varchar(255) default NULL, `page_desc` varchar(255) default NULL, `page_icon` varchar(255) default NULL, `auth_view` tinyint(2) NOT NULL default '0', `auth_view_group` varchar(255) NOT NULL default '0', `auth_moderator_group` varchar(255) NOT NULL default '0', `page_header` varchar(255) default 'overall_header.tpl', `page_graph_border` varchar(255) NOT NULL default '', PRIMARY KEY (`page_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_page' # INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "nav_statistics.gif", "0", "0", "0", "overall_header.tpl", ""); INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "nav_home.gif", "0", "0", "0", "overall_header.tpl", ""); INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "nav_forum.gif", "0", "0", "0", "overall_header.tpl", ""); INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "nav_develope.gif", "0", "0", "0", "overall_header.tpl", ""); # # Table structure for table 'mx_table_page_templates' # CREATE TABLE `mx_table_page_templates` ( `page_template_id` smallint(3) unsigned NOT NULL auto_increment, `template_name` varchar(255) NOT NULL default '', PRIMARY KEY (`page_template_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_page_templates' # INSERT INTO mx_table_page_templates VALUES("1", "NONE"); INSERT INTO mx_table_page_templates VALUES("2", "Two-Columns left1"); INSERT INTO mx_table_page_templates VALUES("3", "Two-Columns right"); INSERT INTO mx_table_page_templates VALUES("4", "Three-Columns"); # # Table structure for table 'mx_table_parameter' # CREATE TABLE `mx_table_parameter` ( `parameter_id` smallint(5) unsigned NOT NULL auto_increment, `function_id` smallint(5) unsigned NOT NULL default '0', `parameter_name` varchar(150) default NULL, `parameter_type` varchar(30) default NULL, `parameter_default` varchar(150) default NULL, `parameter_function` varchar(255) default NULL, `parameter_order` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`parameter_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_parameter' # INSERT INTO mx_table_parameter VALUES("1", "2", "announce_nbr_display", "Number", "1", "", "0"); INSERT INTO mx_table_parameter VALUES("2", "2", "announce_nbr_days", "Number", "14", "", "0"); INSERT INTO mx_table_parameter VALUES("3", "2", "announce_display", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("4", "2", "announce_display_sticky", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("5", "2", "announce_display_normal", "Boolean", "FALSE", "", "0"); INSERT INTO mx_table_parameter VALUES("7", "2", "announce_img", "Text", "thumb_globe.gif", "", "0"); INSERT INTO mx_table_parameter VALUES("8", "2", "announce_img_sticky", "Text", "thumb_globe.gif", "", "0"); INSERT INTO mx_table_parameter VALUES("9", "2", "announce_img_normal", "Text", "thumb_globe.gif", "", "0"); INSERT INTO mx_table_parameter VALUES("6", "2", "announce_display_global", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("10", "2", "announce_img_global", "Text", "thumb_globe.gif", "", "0"); INSERT INTO mx_table_parameter VALUES("11", "2", "announce_forum", "Function", "", "get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)", "0"); INSERT INTO mx_table_parameter VALUES("13", "14", "Poll_Display", "Function", "0", "poll_select( {parameter_value}, \"{parameter_id}\" )", "0"); INSERT INTO mx_table_parameter VALUES("36", "14", "poll_forum", "Function", "", "get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)", "0"); INSERT INTO mx_table_parameter VALUES("15", "24", "Text", "phpBBTextBlock", "Insert your text here", "", "0"); INSERT INTO mx_table_parameter VALUES("16", "23", "Html", "WysiwygTextBlock", "Entre your Html code here", "", "0"); INSERT INTO mx_table_parameter VALUES("17", "31", "Last_Msg_Number_Title", "Number", "15", "", "0"); INSERT INTO mx_table_parameter VALUES("18", "31", "Last_Msg_Display_Date", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("19", "31", "Last_Msg_Title_Length", "Number", "30", "", "0"); INSERT INTO mx_table_parameter VALUES("20", "31", "Last_Msg_Target", "Values", "_blank", "", "0"); INSERT INTO mx_table_parameter VALUES("21", "31", "Last_Msg_Align", "Values", "left", "", "0"); INSERT INTO mx_table_parameter VALUES("22", "31", "Last_Msg_Display_Forum", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("37", "31", "Last_Msg_forum", "Function", "", "get_list_multiple(\"{parameter_id}[]\", FORUMS_TABLE, \'forum_id\', \'forum_name\', \"{parameter_value}\", TRUE)", "0"); INSERT INTO mx_table_parameter VALUES("38", "31", "Last_Msg_Display_Last_Author", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("39", "31", "Last_Msg_Display_Author", "Boolean", "FALSE", "", "0"); INSERT INTO mx_table_parameter VALUES("40", "31", "Last_Msg_Display_Icon_View", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("50", "22", "Text", "CustomizedTextBlock", "Enter your block text here", "", "0"); INSERT INTO mx_table_parameter VALUES("51", "22", "text_style", "Text", "none", "", "0"); INSERT INTO mx_table_parameter VALUES("52", "22", "block_style", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("53", "22", "title_style", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("91", "10", "log_filter_date", "Menu_single_select", "1 month", "a:12:{i:0;s:8:\"no limit\";i:1;s:5:\"1 day\";i:2;s:6:\"2 days\";i:3;s:6:\"3 days\";i:4;s:6:\"1 week\";i:5;s:7:\"2 weeks\";i:6;s:7:\"3 weeks\";i:7;s:7:\"1 month\";i:8;s:8:\"2 months\";i:9;s:8:\"3 months\";i:10;s:8:\"6 months\";i:11;s:6:\"1 year\";}", "0"); INSERT INTO mx_table_parameter VALUES("60", "11", "block_ids", "Function", "1,2,3", "get_list_multiple( \"{parameter_id}[]\", BLOCK_TABLE, \'block_id\', \'block_title\', \"{parameter_value}\", TRUE)", "0"); INSERT INTO mx_table_parameter VALUES("61", "11", "block_sizes", "Text", "20%,30%,*", "", "0"); INSERT INTO mx_table_parameter VALUES("62", "11", "space_between", "Number", "4", "", "0"); INSERT INTO mx_table_parameter VALUES("70", "5", "x_mode", "Menu_single_select", "x_iframe", "a:6:{i:0;s:8:\"x_listen\";i:1;s:8:\"x_iframe\";i:2;s:10:\"x_textfile\";i:3;s:12:\"x_multimedia\";i:4;s:5:\"x_pic\";i:5;s:8:\"x_format\";}", "0"); INSERT INTO mx_table_parameter VALUES("80", "3", "default_block_id", "Function", "0", "get_list_formatted(\"block_list\",\"{parameter_value}\",\"{parameter_id}[]\")", "0"); INSERT INTO mx_table_parameter VALUES("72", "5", "x_1", "Text", "", "", "0"); INSERT INTO mx_table_parameter VALUES("73", "5", "x_2", "Text", "", "", "0"); INSERT INTO mx_table_parameter VALUES("63", "51", "menu_display_mode", "Radio_single_select", "Vertical", "a:2:{i:0;s:8:\"Vertical\";i:1;s:10:\"Horizontal\";}", "20"); INSERT INTO mx_table_parameter VALUES("64", "51", "menu_page_sync", "Boolean", "0", "", "30"); INSERT INTO mx_table_parameter VALUES("71", "5", "x_3", "Text", "http://www.mx-system.com", "", "0"); INSERT INTO mx_table_parameter VALUES("81", "21", "Blog", "BBText", "Add your text here...", "", "0"); INSERT INTO mx_table_parameter VALUES("92", "10", "numOfEvents", "Number", "5", "", "0"); INSERT INTO mx_table_parameter VALUES("65", "51", "msg_filter_date", "Function", "5", "get_list_static(\"{parameter_id}[]\",array(\"no limit\", \"1 day\", \"2 days\", \"3 days\", \"1 week\", \"2 weeks\", \"3 weeks\", \"1 month\", \"2 months\", \"3 months\", \"6 months\", \"1 year\"),\"{parameter_value}\")", "0"); INSERT INTO mx_table_parameter VALUES("57", "22", "allow_smilies", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("54", "22", "allow_html", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("56", "22", "allow_bbcode", "Boolean", "TRUE", "", "0"); INSERT INTO mx_table_parameter VALUES("55", "22", "html_tags", "Text", "b,i,u,img", "", "0"); INSERT INTO mx_table_parameter VALUES("66", "51", "Nav menu", "nav_menu", "", "", "10"); # # Table structure for table 'mx_table_portal' # CREATE TABLE `mx_table_portal` ( `portal_id` smallint(5) unsigned NOT NULL auto_increment, `portal_name` varchar(150) default NULL, `portal_phpbb_url` varchar(255) default 'http://www.phpbb.com/phpBB/', `portal_url` varchar(255) default NULL, `portal_version` varchar(255) default NULL, `top_phpbb_links` smallint(5) unsigned NOT NULL default '1', `mx_use_cache` smallint(5) unsigned NOT NULL default '1', `portal_recached` varchar(255) binary NOT NULL default '', PRIMARY KEY (`portal_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_portal' # INSERT INTO mx_table_portal VALUES("1", "mxBB-Portal (Fresh install)", "http://127.0.0.1/phpBB2/", "http://127.0.0.1/", "2.8 - RC1", "0", "1", "1126035152"); # # Table structure for table 'mx_table_search_results' # CREATE TABLE `mx_table_search_results` ( `search_id` int(11) unsigned NOT NULL default '0', `session_id` varchar(32) NOT NULL default '', `search_array` text NOT NULL, PRIMARY KEY (`search_id`), KEY `session_id` (`session_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_search_results' # # # Table structure for table 'mx_table_wordlist' # CREATE TABLE `mx_table_wordlist` ( `word_text` varchar(50) binary NOT NULL default '', `word_id` mediumint(8) unsigned NOT NULL auto_increment, `word_common` tinyint(1) unsigned NOT NULL default '0', PRIMARY KEY (`word_text`), KEY `word_id` (`word_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_wordlist' # # # Table structure for table 'mx_table_wordmatch' # CREATE TABLE `mx_table_wordmatch` ( `block_id` mediumint(8) unsigned NOT NULL default '0', `word_id` mediumint(8) unsigned NOT NULL default '0', `title_match` tinyint(1) NOT NULL default '0', KEY `block_id` (`block_id`), KEY `word_id` (`word_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_wordmatch' # --- NEW FILE: mysql_schema_upgrade_to_2.801.sql --- # # mxBB-Portal - MySQL Schema - Upgrade "2.8 - RC4" # # $Id: mysql_schema_upgrade_to_2.801.sql,v 1.1 2005/09/07 21:14:43 jonohlsson Exp $ # # ------------------------------------------------------------ # # Changed Fields in Table `mx_block` (update for new permissions) # ALTER TABLE mx_table_block MODIFY auth_view_group VARCHAR(255) NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block MODIFY auth_edit_group VARCHAR(255) NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block MODIFY auth_delete_group VARCHAR(255) NOT NULL DEFAULT '0'; # ------------------------------------------------------------ # # New Fields in Table `mx_block` # ALTER TABLE mx_table_block ADD auth_moderator_group VARCHAR(255) NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block ADD show_title TINYINT(2) UNSIGNED NOT NULL DEFAULT '1'; ALTER TABLE mx_table_block ADD show_block TINYINT(2) UNSIGNED NOT NULL DEFAULT '1'; ALTER TABLE mx_table_block ADD show_stats TINYINT(2) UNSIGNED NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block ADD block_time VARCHAR(255) BINARY NOT NULL DEFAULT ''; ALTER TABLE mx_table_block ADD block_editor_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'; # ------------------------------------------------------------ # # New/Changed Fields in Table `mx_block_system_parameter` // Maybe this only works for mySQL # ALTER TABLE mx_table_block_system_parameter CHANGE bbcode_uid parameter_opt TEXT ALTER TABLE mx_table_block_system_parameter ADD sub_id INT(255) UNSIGNED NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block_system_parameter DROP PRIMARY KEY, ADD PRIMARY KEY (block_id, parameter_id, sub_id); # ------------------------------------------------------------ # # New Fields in Table `mx_page` (update for new permissions) # ALTER TABLE mx_table_page ADD page_desc varchar(255) default NULL; ALTER TABLE mx_table_page ADD auth_moderator_group varchar(255) NOT NULL default '0'; ALTER TABLE mx_table_page ADD page_header varchar(255) default 'overall_header.tpl'; ALTER TABLE mx_table_page ADD page_graph_border varchar(255) NOT NULL default ''; # ------------------------------------------------------------ # # Changed Fields in Table `mx_page` (update for new permissions) # ALTER TABLE mx_table_page MODIFY auth_view_group VARCHAR(255) NOT NULL DEFAULT '0'; # ------------------------------------------------------------ # # New Fields in Table `mx_table_menu_categories` # ALTER TABLE mx_table_menu_categories ADD cat_url smallint(5) unsigned default '0'; ALTER TABLE mx_table_menu_categories ADD cat_target tinyint(2) unsigned NOT NULL default '0'; # ------------------------------------------------------------ # # New Fields in Table `mx_table_menu_nav` # ALTER TABLE mx_table_menu_nav ADD link_target tinyint(2) unsigned NOT NULL default '0'; # ------------------------------------------------------------ # # New Fields in Table `mx_module` # ALTER TABLE mx_table_module ADD module_version varchar(255) default NULL; ALTER TABLE mx_table_module ADD module_copy text default NULL; # ------------------------------------------------------------ # # Table structure for table `mx_wordlist` # CREATE TABLE mx_table_wordlist ( word_text VARCHAR(50) BINARY NOT NULL DEFAULT '', word_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, word_common TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (word_text), KEY word_id (word_id) ); # ------------------------------------------------------------ # # Table structure for table `mx_search_results` # CREATE TABLE mx_table_search_results ( search_id INT(11) UNSIGNED NOT NULL DEFAULT '0', session_id VARCHAR(32) NOT NULL DEFAULT '', search_array TEXT NOT NULL, PRIMARY KEY (search_id), KEY session_id (session_id) ); # ------------------------------------------------------------ # # Table structure for table `mx_wordmatch` # CREATE TABLE mx_table_wordmatch ( block_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', word_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', title_match TINYINT(1) NOT NULL DEFAULT '0', KEY block_id (block_id), KEY word_id (word_id) ); # ------------------------------------------------------------ # # New Fields in Table `mx_parameter` # ALTER TABLE mx_table_parameter ADD parameter_order smallint(5) unsigned NOT NULL default '0'; # # Delete Table `mx_parameter_option` # DROP TABLE IF EXISTS mx_table_parameter_option; # ------------------------------------------------------------ # # New Fields in Table `mx_portal` # ALTER TABLE mx_table_portal ADD portal_recached VARCHAR(255) BINARY NOT NULL DEFAULT ''; ALTER TABLE mx_table_portal ADD mx_use_cache smallint(5) unsigned NOT NULL default '1'; # # Table structure for table 'mx_table_page_templates' # DROP TABLE IF EXISTS mx_table_page_templates; CREATE TABLE `mx_table_page_templates` ( `page_template_id` smallint(3) unsigned NOT NULL auto_increment, `template_name` varchar(255) NOT NULL default '', PRIMARY KEY (`page_template_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_page_templates' # INSERT INTO mx_table_page_templates VALUES("1", "NONE"); INSERT INTO mx_table_page_templates VALUES("2", "Two-Columns left1"); INSERT INTO mx_table_page_templates VALUES("3", "Two-Columns right"); INSERT INTO mx_table_page_templates VALUES("4", "Three-Columns"); # # Table structure for table 'mx_table_column_templates' # DROP TABLE IF EXISTS mx_table_column_templates; CREATE TABLE `mx_table_column_templates` ( `column_template_id` smallint(5) unsigned NOT NULL auto_increment, `column_title` varchar(100) default '0', `column_order` smallint(5) unsigned NOT NULL default '0', `column_size` varchar(5) default '0', `page_template_id` smallint(5) NOT NULL default '0', PRIMARY KEY (`column_template_id`), KEY `cat_order` (`column_order`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_column_templates' # INSERT INTO mx_table_column_templates VALUES("1", "Left", "40", "200", "2"); INSERT INTO mx_table_column_templates VALUES("2", "Main", "50", "100%", "2"); INSERT INTO mx_table_column_templates VALUES("3", "Main", "10", "100%", "3"); INSERT INTO mx_table_column_templates VALUES("4", "Right", "20", "200", "3"); INSERT INTO mx_table_column_templates VALUES("5", "Left", "10", "180", "4"); INSERT INTO mx_table_column_templates VALUES("6", "Middle", "20", "100%", "4"); INSERT INTO mx_table_column_templates VALUES("7", "Right", "30", "180", "4"); # # Some fixes related to the navigation menu block being modulized # SET module = SELECT MAX(module_id) AS next_id FROM mx_table_module; SET module.next_id = module.next_id + 1; INSERT INTO mx_table_module VALUES('{module.next_id}', "Navigation Menu", "modules/mx_navmenu/", "mxBB Navigation Module", "0", NULL, "mzBB Core Module"); SET function = SELECT * FROM mx_table_function WHERE function_file = 'mx_menu_nav.php'; UPDATE mx_table_function SET module_id = '{module.next_id}', function_name = 'Navigation Menu', function_desc = 'This is the function for Navigation Menu Blocks', function_admin = '' WHERE function_id = '{function.function_id}' # # Updating the TextBlocks # SET function = SELECT * FROM mx_table_function WHERE function_file = 'mx_textblock_bbcode.php'; UPDATE mx_table_function SET function_name = 'TextBlock (phpBB)', function_desc = 'BBcodes, html and smilies - defined by phpBB config', function_admin = '' WHERE function_id = '{function.function_id}' SET function = SELECT * FROM mx_table_function WHERE function_file = 'mx_textblock_html.php'; UPDATE mx_table_function SET function_name = 'TextBlock (Html/wysiwyg)', function_desc = 'Plain html textblock, or featuring a wysiwyg editor', function_admin = '' WHERE function_id = '{function.function_id}' SET function = SELECT * FROM mx_table_function WHERE function_file = 'mx_textblock_multi.php'; UPDATE mx_table_function SET function_name = 'TextBlock (Customized)', function_desc = 'Textblock, featuring block defined settings', function_admin = '' WHERE function_id = '{function.function_id}' --- mysql_schema_upgrade_to_2.8.RC1.sql DELETED --- --- mysql_schema_upgrade_to_2.8.RC3.sql DELETED --- --- mysql_schema_upgrade_to_2.8.RC2.sql DELETED --- --- mysql_schema_upgrade_to_2.8.RC4.sql DELETED --- |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:38:19
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32039/install Modified Files: mx_install.php Log Message: further fixes Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** mx_install.php 20 Aug 2005 18:19:11 -0000 1.46 --- mx_install.php 7 Sep 2005 19:38:10 -0000 1.47 *************** *** 48,52 **** // $mx_portal_name = 'mxBB-Portal'; ! $mx_portal_version = '2.8 - RC3'; // --- 48,52 ---- // $mx_portal_name = 'mxBB-Portal'; ! $mx_portal_version = '2.8 - RC5'; // *************** *** 54,58 **** // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '2.0.0'); define('INSTALLER_NAME', 'mxBB-IWizard'); --- 54,58 ---- // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '2.0.1'); define('INSTALLER_NAME', 'mxBB-IWizard'); *************** *** 341,344 **** --- 341,345 ---- $language = ( isset($HTTP_POST_VARS['language']) ? $HTTP_POST_VARS['language'] : ( isset($HTTP_GET_VARS['language']) ? $HTTP_GET_VARS['language'] : '' ) ); $language = ( preg_match('#^[a-z_]+$#', $language) ? strip_tags($language) : '' ); + if( empty($language) ) { *************** *** 378,381 **** --- 379,383 ---- $language = guess_lang(); } + include($mx_root_path . "language/lang_$language/lang_main.$phpEx"); include($mx_root_path . "language/lang_$language/lang_admin.$phpEx"); *************** *** 528,531 **** --- 530,534 ---- include($phpbb_root_path . "includes/sql_parse.$phpEx"); include($phpbb_root_path . "includes/db.$phpEx"); + $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false); if ( !$db->db_connect_id ) *************** *** 578,583 **** if( @file_exists($mx_root_path . 'cache/block_config.xml') ) { ! include($mx_root_path . "cache/mx_functions_core$phpEx"); ! write_cache_config(); $process_msgs[] = $lang['Cache_generate']; } --- 581,586 ---- if( @file_exists($mx_root_path . 'cache/block_config.xml') ) { ! include($mx_root_path . "cache/mx_functions_core.$phpEx"); ! update_session_cache(MX_ALL_DATA); $process_msgs[] = $lang['Cache_generate']; } *************** *** 593,597 **** $portal_config = $db->sql_fetchrow($result); include($mx_root_path . "includes/mx_functions_core.$phpEx"); ! update_session_cache(); $process_msgs[] = $lang['Cache_generate']; } --- 596,600 ---- $portal_config = $db->sql_fetchrow($result); include($mx_root_path . "includes/mx_functions_core.$phpEx"); ! update_session_cache(MX_ALL_DATA); $process_msgs[] = $lang['Cache_generate']; } |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:38:19
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32039/install/schemas Modified Files: mysql_schema_install.sql upgrade_schemas_map.php Log Message: further fixes Index: upgrade_schemas_map.php =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/upgrade_schemas_map.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** upgrade_schemas_map.php 20 Mar 2005 03:37:05 -0000 1.4 --- upgrade_schemas_map.php 7 Sep 2005 19:38:10 -0000 1.5 *************** *** 44,48 **** array('schema' => 'upgrade_to_2.8.RC2' , 'sql' => "SELECT word_id FROM mx_table_wordlist"), array('schema' => 'upgrade_to_2.8.RC3' , 'sql' => "SELECT mx_use_cache FROM mx_table_portal"), ! array('schema' => 'upgrade_to_2.8.RC4' , 'sql' => "SELECT portal_recached FROM mx_table_portal") ); --- 44,49 ---- array('schema' => 'upgrade_to_2.8.RC2' , 'sql' => "SELECT word_id FROM mx_table_wordlist"), array('schema' => 'upgrade_to_2.8.RC3' , 'sql' => "SELECT mx_use_cache FROM mx_table_portal"), ! array('schema' => 'upgrade_to_2.8.RC4' , 'sql' => "SELECT portal_recached FROM mx_table_portal"), ! array('schema' => 'upgrade_to_2.8.RC5' , 'sql' => "SELECT parameter_order FROM mx_table_parameter") ); Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mysql_schema_install.sql 26 Apr 2005 00:17:32 -0000 1.4 --- mysql_schema_install.sql 7 Sep 2005 19:38:10 -0000 1.5 *************** *** 1,523 **** # ! # mxBB-Portal - MySQL Schema # ! # $Id$ # ! # ------------------------------------------------------------ # ! # Table structure for table `mx_portal` # [...1078 lines suppressed...] ! # ! # Table structure for table 'mx_table_wordmatch' # + DROP TABLE IF EXISTS mx_table_wordmatch; ! CREATE TABLE `mx_table_wordmatch` ( ! `block_id` mediumint(8) unsigned NOT NULL default '0', ! `word_id` mediumint(8) unsigned NOT NULL default '0', ! `title_match` tinyint(1) NOT NULL default '0', ! KEY `block_id` (`block_id`), ! KEY `word_id` (`word_id`) ! ) TYPE=MyISAM; ! ! ! # ! # Dumping data for table 'mx_table_wordmatch' ! # |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:36:39
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31652/modules/mx_textblocks Modified Files: TextBlocks.pak Log Message: further fixes Index: TextBlocks.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/TextBlocks.pak,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TextBlocks.pak 12 Apr 2005 17:38:37 -0000 1.6 --- TextBlocks.pak 7 Sep 2005 19:36:31 -0000 1.7 *************** *** 1,40 **** ! module=+:20=+:Text Blocks=+:modules/mx_textblocks/=+:Textblocks module=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:20=+:TextBlock (phpBB)=+:BBcodes, html and smilies usage defined by phpBB config=+:mx_textblock_bbcode.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php ! parameter=+:20=+:15=+:Text=+:BBText=+:Insert your text here=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (phpBB)=+:Demo block=+:20=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:80=+:TextBlock_Blog=+:UserBlog Textblock=+:mx_textblock_blog.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php ! parameter=+:80=+:163=+:Blog=+:BBText=+:Add your text here...=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock_Blog=+:Demo block=+:80=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:21=+:TextBlock (Html/wysiwyg)=+:Plain html textblock, or featuring wysiwyg =+:mx_textblock_html.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php ! parameter=+:21=+:16=+:Html=+:Html=+:Entre your Html code here=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (Html/wysiwyg)=+:Demo block=+:21=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:22=+:TextBlock (Multi)=+:Textblock, featuring block defined settings=+:mx_textblock_multi.php=+:modules/mx_textblocks/admin/mx_textblock_edit.php ! parameter=+:22=+:327=+:allow_bbcode=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:22=+:326=+:allow_html=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:22=+:326=+:html_tags=+:Text=+:b,i,u,img=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:22=+:328=+:allow_smilies=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:22=+:52=+:block_style=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:22=+:50=+:Text=+:BBText=+:Enter your block text here=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:22=+:51=+:text_style=+:Values=+:none=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:22=+:53=+:title_style=+:Boolean=+:TRUE=+: - option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (Multi)=+:Demo block=+:22=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,29 ---- ! module=+:20=+:Text Blocks=+:modules/mx_textblocks/=+:mxBB Textblocks Module=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:24=+:TextBlock (phpBB)=+:BBcodes, html and smilies - defined by phpBB config=+:mx_textblock_bbcode.php=+: ! parameter=+:24=+:15=+:Text=+:phpBBTextBlock=+:Insert your text here=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (phpBB)=+:Demo block=+:24=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:21=+:TextBlock (Blog)=+:UserBlog Textblock=+:mx_textblock_blog.php=+: ! parameter=+:21=+:81=+:Blog=+:BBText=+:Add your text here...=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (Blog)=+:Demo block=+:21=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:23=+:TextBlock (Html/wysiwyg)=+:Plain html textblock, or featuring a wysiwyg editor=+:mx_textblock_html.php=+: ! parameter=+:23=+:16=+:Html=+:WysiwygTextBlock=+:Entre your Html code here=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (Html/wysiwyg)=+:Demo block=+:23=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:20=+:22=+:TextBlock (Customized)=+:Textblock, featuring block defined settings=+:mx_textblock_multi.php=+: ! parameter=+:22=+:56=+:allow_bbcode=+:Boolean=+:TRUE=+: ! parameter=+:22=+:54=+:allow_html=+:Boolean=+:TRUE=+: ! parameter=+:22=+:57=+:allow_smilies=+:Boolean=+:TRUE=+: parameter=+:22=+:52=+:block_style=+:Boolean=+:TRUE=+: ! parameter=+:22=+:55=+:html_tags=+:Text=+:b,i,u,img=+: ! parameter=+:22=+:50=+:Text=+:CustomizedTextBlock=+:Enter your block text here=+: ! parameter=+:22=+:51=+:text_style=+:Text=+:none=+: parameter=+:22=+:53=+:title_style=+:Boolean=+:TRUE=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - TextBlock (Customized)=+:Demo block=+:22=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:36:39
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31652/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: further fixes Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_module_defs.php 6 Sep 2005 18:51:57 -0000 1.4 --- mx_module_defs.php 7 Sep 2005 19:36:31 -0000 1.5 *************** *** 157,161 **** // Get vars // ! //$portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1); $id = $mx_request_vars->request('id', MX_TYPE_INT, ''); --- 157,161 ---- // Get vars // ! $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1); $id = $mx_request_vars->request('id', MX_TYPE_INT, ''); *************** *** 181,200 **** } // if .. !empty($mode) - /* - if( isset($HTTP_POST_VARS['addmenu']) || isset($HTTP_POST_VARS['addcategory']) ) - { - $mode = ( isset($HTTP_POST_VARS['addmenu']) ) ? 'addmenu' : 'addcat'; - - if( $mode == 'addmenu' ) - { - list($cat_id) = each($HTTP_POST_VARS['addmenu']); - // - // stripslashes needs to be run on this because slashes are added when the menu name is posted - // - $menuname = stripslashes($HTTP_POST_VARS['menuname'][$cat_id]); - } - } - */ - // // Begin program proper --- 181,184 ---- *************** *** 225,246 **** $show_cat_sel = '<select name="cat_show_sel"><option value="0">' . ( !empty($lang['Folded']) ? $lang['Folded'] : 'Folded' ) . '</option><option value="1" selected="selected">' . ( !empty($lang['Unfolded']) ? $lang['Unfolded'] : 'Unfolded' ) . '</option></select>'; - /* - $menu_display_mode_list = '<select name="menu_display_mode">'; - for( $j = 0; $j < count($menu_display_mode_options); $j++ ) - { - $selected = ( $mx_menu_config['menu_display_mode'] == $menu_display_mode_options[$j] ) ? ' selected="selected"' : ''; - $menu_display_mode_list .= '<option value="' . $menu_display_mode_options[$j] . '" ' . $selected . '>' . $menu_display_mode_options[$j] . "</option>\n"; - } - $menu_display_mode_list .= '</select>'; - - $menu_page_sync_list = '<select name="menu_page_sync">'; - for( $j = 0; $j < count($menu_page_sync_options); $j++ ) - { - $selected = ( $mx_menu_config['menu_page_sync'] == $menu_page_sync_options[$j] ) ? ' selected="selected"' : ''; - $menu_page_sync_list .= '<option value="' . $menu_page_sync_options[$j] . '" ' . $selected . '>' . $menu_page_sync_options[$j] . "</option>\n"; - } - $menu_page_sync_list .= '</select>'; - */ - // // Generate generic form selects --- 209,212 ---- |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:36:39
|
Update of /cvsroot/mxbb/core/modules/mx_last_msg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31652/modules/mx_last_msg Modified Files: LastMessage.pak Log Message: further fixes Index: LastMessage.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_last_msg/LastMessage.pak,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LastMessage.pak 18 Feb 2005 10:05:05 -0000 1.5 --- LastMessage.pak 7 Sep 2005 19:36:30 -0000 1.6 *************** *** 1,33 **** ! module=+:30=+:Post Last Message=+:modules/mx_last_msg/=+:Last Message Module=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:30=+:30=+:Post Last Message=+:Post Last Message=+:mx_last_msg.php=+: ! parameter=+:30=+:21=+:Last_Msg_Align=+:Values=+:left=+: ! option=+:3=+:21=+:left=+:left ! option=+:4=+:21=+:right=+:right ! option=+:5=+:21=+:center=+:center ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:39=+:Last_Msg_Display_Author=+:Boolean=+:FALSE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:18=+:Last_Msg_Display_Date=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:22=+:Last_Msg_Display_Forum=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:40=+:Last_Msg_Display_Icon_View=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:38=+:Last_Msg_Display_Last_Author=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:37=+:Last_Msg_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:17=+:Last_Msg_Number_Title=+:Number=+:15=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:20=+:Last_Msg_Target=+:Values=+:_blank=+: ! option=+:6=+:20=+:_blank=+:New Window ! option=+:7=+:20=+:_self=+:Current Window ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:19=+:Last_Msg_Title_Length=+:Number=+:30=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:30=+:318=+:msg_filter_date=+:Function=+:5=+:get_list_static("{parameter_id}[]",array("no limit", "1 day", "2 days", "3 days", "1 week", "2 weeks", "3 weeks", "1 month", "2 months", "3 months", "6 months", "1 year"),"{parameter_value}") ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Post Last Message=+:Demo block=+:30=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,16 ---- ! module=+:30=+:Post Last Message=+:modules/mx_last_msg/=+:mxBB Last Message Module=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:30=+:31=+:Post Last Message=+:Post Last Message Function=+:mx_last_msg.php=+: ! parameter=+:31=+:21=+:Last_Msg_Align=+:Values=+:left=+: ! parameter=+:31=+:39=+:Last_Msg_Display_Author=+:Boolean=+:FALSE=+: ! parameter=+:31=+:18=+:Last_Msg_Display_Date=+:Boolean=+:TRUE=+: ! parameter=+:31=+:22=+:Last_Msg_Display_Forum=+:Boolean=+:TRUE=+: ! parameter=+:31=+:40=+:Last_Msg_Display_Icon_View=+:Boolean=+:TRUE=+: ! parameter=+:31=+:38=+:Last_Msg_Display_Last_Author=+:Boolean=+:TRUE=+: ! parameter=+:31=+:37=+:Last_Msg_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) ! parameter=+:31=+:17=+:Last_Msg_Number_Title=+:Number=+:15=+: ! parameter=+:31=+:20=+:Last_Msg_Target=+:Values=+:_blank=+: ! parameter=+:31=+:19=+:Last_Msg_Title_Length=+:Number=+:30=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Post Last Message=+:Demo block=+:31=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:36:39
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31652/modules/mx_coreblocks Modified Files: CoreBlocks.pak mx_blockcp.php Log Message: further fixes Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_blockcp.php 6 Sep 2005 18:51:57 -0000 1.2 --- mx_blockcp.php 7 Sep 2005 19:36:30 -0000 1.3 *************** *** 167,171 **** } ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&portalpage=$portalpage&dynamic_block=$dynamic_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage&dynamic_block=$dynamic_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 167,172 ---- } ! $has_dyn_block_id = $dynamic_block_id > 0 ? '&dynamic_block='.$dynamic_block_id : ''; ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&portalpage=$portalpage$has_dyn_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 232,236 **** // $blockcptemplate->assign_vars(array( ! 'CANCEL' => ' <input type="submit" name="cancel" value="' . $lang['Cancel'] . '"class="liteoption" />', 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">-::-<br/>' . $result_message . '<br/> -::-</span></div>': '', 'S_ACTION' => append_sid($mx_root_path . "modules/mx_coreblocks/mx_blockcp.$phpEx") --- 233,237 ---- // $blockcptemplate->assign_vars(array( ! 'CANCEL' => ' <input type="submit" name="cancel" value="' . $lang['return_to_page'] . '"class="liteoption" />', 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">-::-<br/>' . $result_message . '<br/> -::-</span></div>': '', 'S_ACTION' => append_sid($mx_root_path . "modules/mx_coreblocks/mx_blockcp.$phpEx") Index: CoreBlocks.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/CoreBlocks.pak,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CoreBlocks.pak 13 Apr 2005 21:23:28 -0000 1.5 --- CoreBlocks.pak 7 Sep 2005 19:36:30 -0000 1.6 *************** *** 1,104 **** ! module=+:10=+:Core Blocks=+:modules/mx_coreblocks/=+:Core blocks=+: ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:17=+:Announcements=+:Announcements=+:mx_announce.php=+: ! parameter=+:17=+:3=+:announce_display=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:6=+:announce_display_global=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:5=+:announce_display_normal=+:Boolean=+:FALSE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:4=+:announce_display_sticky=+:Boolean=+:TRUE=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:11=+:announce_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:7=+:announce_img=+:Text=+:thumb_globe.gif=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:10=+:announce_img_global=+:Text=+:thumb_globe.gif=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:9=+:announce_img_normal=+:Text=+:thumb_globe.gif=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:8=+:announce_img_sticky=+:Text=+:thumb_globe.gif=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:2=+:announce_nbr_days=+:Number=+:14=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:17=+:1=+:announce_nbr_display=+:Number=+:1=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Announcements=+:Demo block=+:17=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:53=+:DynamicBlock=+:Dynamic block defined by its block_id=+:mx_dynamic.php=+: ! parameter=+:53=+:136=+:default_block_id=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]") ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - DynamicBlock=+:Demo block=+:53=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:10=+:Forum phpBB=+:Forum phpBB=+:mx_forum.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Forum phpBB=+:Demo block=+:10=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:16=+:Google=+:Google=+:mx_google.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Google=+:Demo block=+:16=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:48=+:IncludeX=+:Include site or file=+:mx_includex.php=+: ! parameter=+:48=+:133=+:x_1=+:Text=+:=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:48=+:134=+:x_2=+:Text=+:=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:48=+:161=+:x_3=+:Text=+:http://www.mx-system.com=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:48=+:131=+:x_mode=+:Function=+:0=+:get_mx_select_list( 'includex', "{parameter_value}", "{parameter_id}[]") ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - IncludeX=+:Demo block=+:48=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:13=+:Language Select=+:Language Select=+:mx_language.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Language Select=+:Demo block=+:13=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:14=+:Login=+:Login=+:mx_login.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Login=+:Demo block=+:14=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:11=+:Navigation Menu=+:Menu Navigation=+:mx_menu_nav.php=+:admin/admin_mx_menu.php ! parameter=+:11=+:63=+:menu_display_mode=+:Text=+:Vertical=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:11=+:64=+:menu_page_sync=+:Text=+:0=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Navigation Menu=+:Demo block=+:11=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:19=+:Multiple Horizontal Blocks=+:Block that can arrange other blocks in a horizontal line.=+:mx_multiple_blocks.php=+: ! parameter=+:19=+:60=+:block_ids=+:Function=+:1,2,3=+:get_list_multiple( "{parameter_id}[]", BLOCK_TABLE, 'block_id', 'block_title', "{parameter_value}", TRUE) ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:19=+:61=+:block_sizes=+:Text=+:20%,30%,*=+: ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:19=+:62=+:space_between=+:Number=+:4=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Multiple Horizontal Blocks=+:Demo block=+:19=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:18=+:Who is Online=+:Who is Online=+:mx_online.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Who is Online=+:Demo block=+:18=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:12=+:Polls=+:Polls=+:mx_poll.php=+: ! parameter=+:12=+:13=+:Poll_Display=+:Function=+:0=+:poll_select( {parameter_value}, "{parameter_id}" ) ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:12=+:36=+:poll_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Polls=+:Demo block=+:12=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:97=+:Site Log=+:Site change monitor=+:mx_site_log.php=+: ! parameter=+:97=+:317=+:log_filter_date=+:Function=+:5=+:get_list_static("{parameter_id}[]",array("no limit", "1 day", "2 days", "3 days", "1 week", "2 weeks", "3 weeks", "1 month", "2 months", "3 months", "6 months", "1 year"),"{parameter_value}") ! option=+:0=+:0=+:0=+:endoflist=+: ! parameter=+:97=+:315=+:numOfEvents=+:Number=+:5=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Site Log=+:Demo block=+:97=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:15=+:Theme Select=+:Theme Select=+:mx_theme.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Theme Select=+:Demo block=+:15=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,73 ---- ! module=+:10=+:Core Blocks=+:modules/mx_coreblocks/=+:mxBB Core (standard) Module=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:2=+:Announcements=+:Announcements Function=+:mx_announce.php=+: ! parameter=+:2=+:3=+:announce_display=+:Boolean=+:TRUE=+: ! parameter=+:2=+:6=+:announce_display_global=+:Boolean=+:TRUE=+: ! parameter=+:2=+:5=+:announce_display_normal=+:Boolean=+:FALSE=+: ! parameter=+:2=+:4=+:announce_display_sticky=+:Boolean=+:TRUE=+: ! parameter=+:2=+:11=+:announce_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) ! parameter=+:2=+:7=+:announce_img=+:Text=+:thumb_globe.gif=+: ! parameter=+:2=+:10=+:announce_img_global=+:Text=+:thumb_globe.gif=+: ! parameter=+:2=+:9=+:announce_img_normal=+:Text=+:thumb_globe.gif=+: ! parameter=+:2=+:8=+:announce_img_sticky=+:Text=+:thumb_globe.gif=+: ! parameter=+:2=+:2=+:announce_nbr_days=+:Number=+:14=+: ! parameter=+:2=+:1=+:announce_nbr_display=+:Number=+:1=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Announcements=+:Demo block=+:2=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:3=+:DynamicBlock=+:Dynamic block defined by its block_id=+:mx_dynamic.php=+: ! parameter=+:3=+:80=+:default_block_id=+:Function=+:0=+:get_list_formatted("block_list","{parameter_value}","{parameter_id}[]") parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - DynamicBlock=+:Demo block=+:3=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:8=+:phpBB forum=+:phpBB Function for the phpBB Index Block=+:mx_forum.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - phpBB forum=+:Demo block=+:8=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:4=+:Google=+:Google Block Function=+:mx_google.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Google=+:Demo block=+:4=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:5=+:IncludeX=+:Include a iframe, site, multimedia or file=+:mx_includex.php=+: ! parameter=+:5=+:72=+:x_1=+:Text=+:=+: ! parameter=+:5=+:73=+:x_2=+:Text=+:=+: ! parameter=+:5=+:71=+:x_3=+:Text=+:http://www.mx-system.com=+: ! parameter=+:5=+:70=+:x_mode=+:Menu_single_select=+:x_iframe=+:a:6:{i:0;s:8:"x_listen";i:1;s:8:"x_iframe";i:2;s:10:"x_textfile";i:3;s:12:"x_multimedia";i:4;s:5:"x_pic";i:5;s:8:"x_format";} parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - IncludeX=+:Demo block=+:5=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:6=+:Language Select=+:Language Select Function=+:mx_language.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Language Select=+:Demo block=+:6=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:7=+:Login=+:Login Function=+:mx_login.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Login=+:Demo block=+:7=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:11=+:Split Block=+:Split Block Function - a block that puts subblocks side by side=+:mx_multiple_blocks.php=+: ! parameter=+:11=+:60=+:block_ids=+:Function=+:1,2,3=+:get_list_multiple( "{parameter_id}[]", BLOCK_TABLE, 'block_id', 'block_title', "{parameter_value}", TRUE) ! parameter=+:11=+:61=+:block_sizes=+:Text=+:20%,30%,*=+: ! parameter=+:11=+:62=+:space_between=+:Number=+:4=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Split Block=+:Demo block=+:11=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:13=+:Who is Online=+:Who is Online Function=+:mx_online.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Who is Online=+:Demo block=+:13=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:14=+:Polls=+:This is the function for Polls=+:mx_poll.php=+: ! parameter=+:14=+:13=+:Poll_Display=+:Function=+:0=+:poll_select( {parameter_value}, "{parameter_id}" ) ! parameter=+:14=+:36=+:poll_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE) parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Polls=+:Demo block=+:14=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:10=+:Site Log=+:Site Log monitor Function=+:mx_site_log.php=+: ! parameter=+:10=+:91=+:log_filter_date=+:Menu_single_select=+:1 month=+:a:12:{i:0;s:8:"no limit";i:1;s:5:"1 day";i:2;s:6:"2 days";i:3;s:6:"3 days";i:4;s:6:"1 week";i:5;s:7:"2 weeks";i:6;s:7:"3 weeks";i:7;s:7:"1 month";i:8;s:8:"2 months";i:9;s:8:"3 months";i:10;s:8:"6 months";i:11;s:6:"1 year";} ! parameter=+:10=+:92=+:numOfEvents=+:Number=+:5=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Site Log=+:Demo block=+:10=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:10=+:12=+:Theme Select=+:Theme Select Function=+:mx_theme.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Theme Select=+:Demo block=+:12=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:36:39
|
Update of /cvsroot/mxbb/core/modules/mx_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31652/modules/mx_statistics Modified Files: statistics.pak Log Message: further fixes Index: statistics.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_statistics/statistics.pak,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** statistics.pak 15 Jan 2005 01:04:50 -0000 1.3 --- statistics.pak 7 Sep 2005 19:36:31 -0000 1.4 *************** *** 1,6 **** ! module=+:40=+:Statistics MX=+:modules/mx_statistics/=+:Statistics Modules=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:40=+:40=+:Statistics MX=+:Statistics MX=+:mx_statistics.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Statistics MX=+:Demo block=+:40=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,6 ---- ! module=+:40=+:Statistics MX=+:modules/mx_statistics/=+:mxBB Statistics Module=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:40=+:41=+:Statistics MX=+:Statistics Function=+:mx_statistics.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Demo - Statistics MX=+:Demo block=+:41=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:36:38
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31652/includes Modified Files: mx_functions_admincp.php mx_functions_core.php Log Message: further fixes Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_functions_core.php 6 Sep 2005 18:51:56 -0000 1.3 --- mx_functions_core.php 7 Sep 2005 19:36:30 -0000 1.4 *************** *** 174,178 **** if ( MX_CACHE_DEBUG ) { echo('writing id (' . $id .') page cache'); } $pages_config = $this->_get_page_config( $id ); ! $this->_data2cache( $pages_config, $cache_file, $action, $type ); break; --- 174,178 ---- if ( MX_CACHE_DEBUG ) { echo('writing id (' . $id .') page cache'); } $pages_config = $this->_get_page_config( $id ); ! $this->_data2cache( $pages_config[$id], $cache_file, $action, $type ); break; Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_functions_admincp.php 6 Sep 2005 18:51:56 -0000 1.3 --- mx_functions_admincp.php 7 Sep 2005 19:36:30 -0000 1.4 *************** *** 2384,2387 **** --- 2384,2388 ---- // 4: option_desc // + /* case 'option': $module_data[2] = $parameter_id; *************** *** 2417,2421 **** } break; ! // // 0: block, 1: block_id, 2: block_title, 3: block_desc, --- 2418,2423 ---- } break; ! */ ! // // 0: block, 1: block_id, 2: block_title, 3: block_desc, *************** *** 2579,2582 **** --- 2581,2585 ---- // 4: option_desc // + /* case 'option': $table = PARAMETER_OPTION_TABLE; *************** *** 2595,2599 **** $sql_delete = "DELETE FROM " . PARAMETER_OPTION_TABLE . " WHERE option_id = " . $module_data[1] . " AND parameter_id = " . $module_data[2]; break; ! // // 0: block, 1: block_id, 2: block_title, 3: block_desc, --- 2598,2603 ---- $sql_delete = "DELETE FROM " . PARAMETER_OPTION_TABLE . " WHERE option_id = " . $module_data[1] . " AND parameter_id = " . $module_data[2]; break; ! */ ! // // 0: block, 1: block_id, 2: block_title, 3: block_desc, *************** *** 2704,2709 **** // delete option // $output_message .= ' - <font color=#0000ff>delete</font> ' . $module_data[0] . ' (' . $module_data[1] . ', ' . $module_data[2] .', ' . ') ' .'<br />'; - $result = $pak_debug == false ? $db->sql_query($sql_delete) : true; --- 2708,2713 ---- // delete option // + /* $output_message .= ' - <font color=#0000ff>delete</font> ' . $module_data[0] . ' (' . $module_data[1] . ', ' . $module_data[2] .', ' . ') ' .'<br />'; $result = $pak_debug == false ? $db->sql_query($sql_delete) : true; *************** *** 2717,2720 **** --- 2721,2725 ---- $output_message .= '<font color=#00ff00>[db...ok]</font>' . '<br />'; } + */ } } *************** *** 2923,2926 **** --- 2928,2932 ---- $paramater_id = $resultset_param[$p]['parameter_id']; + /* // Parameter Option $sql = "SELECT * FROM " . PARAMETER_OPTION_TABLE . " WHERE parameter_id = $paramater_id ORDER BY option_id"; *************** *** 2945,2948 **** --- 2951,2955 ---- $module_pak .= '0' . $delimeter; $module_pak .= 'endoflist' . $delimeter . "\n"; + */ } |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:36:38
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31652/language/lang_english Modified Files: lang_admin.php Log Message: further fixes Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** lang_admin.php 6 Sep 2005 18:51:57 -0000 1.40 --- lang_admin.php 7 Sep 2005 19:36:30 -0000 1.41 *************** *** 69,72 **** --- 69,73 ---- $lang['Permissions_std'] = "Standard Permissions"; $lang['Permissions_adv'] = "Advanced Permissions"; + $lang['return_to_page'] = "Back to Portal Page"; $lang['AdminCP_status'] = "<b>Progress report</b>"; |
|
From: Jon O. <jon...@us...> - 2005-09-07 19:36:38
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31652/admin Modified Files: admin_mx_module.php Log Message: further fixes Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** admin_mx_module.php 6 Sep 2005 18:51:56 -0000 1.32 --- admin_mx_module.php 7 Sep 2005 19:36:30 -0000 1.33 *************** *** 118,122 **** // $modules_list = $mx_admin->get_new_module_pak_files(); ! $modules_select_list = get_list_static('module_path', $modules_list, ''); // --- 118,122 ---- // $modules_list = $mx_admin->get_new_module_pak_files(); ! $modules_select_list = get_list_static('module_path', $modules_list, '', false); // *************** *** 252,256 **** // Loop through the rows of modules setting block vars for the template. // ! for( $module_count = -1; $module_count < $total_modules + 1; $module_count++ ) { // --- 252,256 ---- // Loop through the rows of modules setting block vars for the template. // ! for( $module_count = -1; $module_count < $total_modules; $module_count++ ) { // |
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/admin Modified Files: admin_mx_block_cp.php admin_mx_chkobjs.php admin_mx_module.php admin_mx_module_cp.php admin_mx_page_cp.php admin_mx_portal.php Log Message: Finalizing core 2.8 ;) Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin_mx_chkobjs.php 20 Aug 2005 18:19:11 -0000 1.11 --- admin_mx_chkobjs.php 6 Sep 2005 18:51:56 -0000 1.12 *************** *** 68,78 **** ), array( - 'table' => PARAMETER_OPTION_TABLE, - 'fkeys' => array( - array(PARAMETER_TABLE, 'parameter_id', 'parameter_name'), - array(PARAMETER_OPTION_TABLE, 'option_id', 'option_desc') - ) - ), - array( 'table' => BLOCK_TABLE, 'fkeys' => array( --- 68,71 ---- Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_page_cp.php 21 Aug 2005 21:40:51 -0000 1.2 --- admin_mx_page_cp.php 6 Sep 2005 18:51:56 -0000 1.3 *************** *** 58,62 **** { $cookie_tmp = $board_config['cookie_name'].'_adminPage_page_id'; ! $nav_page_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : ''; } --- 58,62 ---- { $cookie_tmp = $board_config['cookie_name'].'_adminPage_page_id'; ! $nav_page_id = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? $HTTP_COOKIE_VARS[$cookie_tmp] : '1'; } *************** *** 74,77 **** --- 74,88 ---- $result_message = $mx_admin->do_it($mode, $action, $id); + // + // If new page, load new page settings panel + // + if (is_array($result_message)) + { + $nav_page_id = $result_message['new_page_id']; + $result_message = $result_message['text']; + } + + $result_message = $lang['AdminCP_status'] . '<hr>' . $result_message; + } // if .. !empty($mode) *************** *** 194,197 **** --- 205,209 ---- 'L_TITLE_PAGES' => $lang['Page_admin'], + 'L_TITLE_NEW_PAGE' => $lang['Page_admin_new_page'], 'L_TITLE_TEMPLATES' => $lang['Page_templates_admin'], 'L_EXPLAIN' => $lang['Page_admin_explain'], *************** *** 204,208 **** 'L_CHANGE_NOW' => $lang['Change'], 'S_SUBMIT' => $lang['Update'], ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">-::-<br/>' . $result_message . '<br/> -::-</span></div>': '', // --- 216,220 ---- 'L_CHANGE_NOW' => $lang['Change'], 'S_SUBMIT' => $lang['Update'], ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', // *************** *** 407,411 **** $template->assign_block_vars('templates.current_template', array()); } ! $sql = "SELECT * FROM " . COLUMN_TEMPLATES . " --- 419,428 ---- $template->assign_block_vars('templates.current_template', array()); } ! ! if ( $new_template ) ! { ! continue; ! } ! $sql = "SELECT * FROM " . COLUMN_TEMPLATES . " *************** *** 419,504 **** $column_rows = array(); ! if( $total_column = $db->sql_numrows($q_column) ) { ! $column_rows = $db->sql_fetchrowset($q_column); ! // ! // Okay, let's build the index ! // ! for( $column = 0; $column < $total_column + 1; $column++ ) ! { ! $new_column = $column == $total_column; ! $column_template_id = $new_column ? $template_id . '_0' : $column_rows[$column]['column_template_id']; ! $mode = MX_PAGE_TEMPLATE_COLUMN_TYPE; ! $action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $column_template_id; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_template_id . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_template_id . '&move=15'; ! // ! // Hidden fields ! // ! $s_hidden_column_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> ! <input type="hidden" name="action" value="' . $action . '" /> ! <input type="hidden" name="id" value="' . $column_template_id . '" /> ! <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! // ! // Subpanel - column edit ! // ! $column_title = $new_column ? '' : $column_rows[$column]['column_title']; ! $column_size = $new_column ? '100%' : $column_rows[$column]['column_size']; ! $message_delete = $lang['Delete_page_template_column'] . ' - ' . $column_title ! . '<br /><br />' . $lang['Delete_page_template_column_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') ! . '<br /><br />'; ! $visible_column_edit = in_array('adminTemplateColumnEdit_' . $page_template_id . '_' . $column_template_id, $cookie_states); ! $visible_column_delete = in_array('adminTemplateColumnDelete_' . $page_template_id . '_' . $column_template_id, $cookie_states); ! $template->assign_block_vars('templates.columnrow', array( ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'VISIBLE_DELETE' => $visible_column_delete ? 'block' : 'none', ! 'IMG_URL' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'COLUMN_ID' => $column_template_id, ! 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! // ! // Column Edit ! // ! 'L_DELETE' => $new_column ? '' : $lang['Delete'], ! 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], ! 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], ! 'L_COLUMN' => $lang['Column'], ! 'L_COLUMN_NAME' => $lang['Column_name'], ! 'L_COLUMN_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! ! 'E_COLUMN_TITLE' => $column_title, ! 'E_COLUMN_SIZE' => $column_size, ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! // Quick Panels ! 'MESSAGE_DELETE' => $message_delete, ! 'S_HIDDEN_FIELDS' => $s_hidden_column_fields ! )); ! } // for ... column ! } // if ... total_categories } --- 436,523 ---- $column_rows = array(); ! if( $total_column = $db->sql_numrows($q_columns) ) { ! $column_rows = $db->sql_fetchrowset($q_columns); ! } ! ! // ! // Okay, let's build the index ! // ! for( $column = 0; $column < $total_column + 1; $column++ ) ! { ! $new_column = $column == $total_column; ! $column_template_id = $new_column ? $page_template_id . '_0' : $column_rows[$column]['column_template_id']; ! $mode = MX_PAGE_TEMPLATE_COLUMN_TYPE; ! $action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $column_template_id; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_template_id . '&page_template_id=' . $page_template_id . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_template_id . '&page_template_id=' . $page_template_id . '&move=15'; ! // ! // Hidden fields ! // ! $s_hidden_column_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> ! <input type="hidden" name="action" value="' . $action . '" /> ! <input type="hidden" name="page_template_id" value="' . $page_template_id . '" /> ! <input type="hidden" name="id" value="' . $column_template_id . '" /> ! <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; ! // ! // Subpanel - column edit ! // ! $column_title = $new_column ? '' : $column_rows[$column]['column_title']; ! $column_size = $new_column ? '100%' : $column_rows[$column]['column_size']; ! $message_delete = $lang['Delete_page_template_column'] . ' - ' . $column_title ! . '<br /><br />' . $lang['Delete_page_template_column_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') ! . '<br /><br />'; ! $visible_column_edit = in_array('adminTemplateColumnEdit_' . $page_template_id . '_' . $column_template_id, $cookie_states); ! $visible_column_delete = in_array('adminTemplateColumnDelete_' . $page_template_id . '_' . $column_template_id, $cookie_states); ! $template->assign_block_vars('templates.columnrow', array( ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'VISIBLE_DELETE' => $visible_column_delete ? 'block' : 'none', ! 'IMG_URL' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! 'IMG_URL_DELETE' => $visible_column_delete ? $admin_icon['contract'] : $admin_icon['expand'], ! 'COLUMN_ID' => $column_template_id, ! 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! // ! // Column Edit ! // ! 'L_DELETE' => $new_column ? '' : $lang['Delete'], ! 'L_MOVE_UP' => $new_column ? '' : $lang['Move_up'], ! 'L_MOVE_DOWN' => $new_column ? '' : $lang['Move_down'], ! 'L_COLUMN' => $lang['Column'], ! 'L_COLUMN_NAME' => $lang['Column_name'], ! 'L_COLUMN_SIZE' => $lang['Column_Size'], ! 'VISIBLE' => $visible_column_edit ? 'block' : 'none', ! 'IMG_URL_EDIT' => $visible_column_edit ? $admin_icon['contract'] : $admin_icon['expand'], ! ! 'E_COLUMN_TITLE' => $column_title, ! 'E_COLUMN_SIZE' => $column_size, ! 'S_SUBMIT' => $new_column ? $lang['Create_column'] : $lang['Update'], ! // Quick Panels ! 'MESSAGE_DELETE' => $message_delete, ! 'S_HIDDEN_FIELDS' => $s_hidden_column_fields ! )); ! } // for ... column } *************** *** 544,548 **** $page_rows_current = array(); ! $page_rows_current = $db->sql_fetchrowset($q_pages_current); // --- 563,570 ---- $page_rows_current = array(); ! if( $total_pages_current = $db->sql_numrows($q_pages_current) ) ! { ! $page_rows_current = $db->sql_fetchrowset($q_pages_current); ! } // *************** *** 566,570 **** } ! if ( $total_pages == 0 ) { $template->assign_block_vars('nopage', array( --- 588,592 ---- } ! if ( ($total_pages_current + $total_pages) == 0 ) { $template->assign_block_vars('nopage', array( *************** *** 574,578 **** $page_rows = array_merge($page_rows_current, $page_rows); ! // --- 596,600 ---- $page_rows = array_merge($page_rows_current, $page_rows); ! $total_pages = $total_pages + $total_pages_current; // *************** *** 590,597 **** $page_id = $new_page ? 'new_page' : $page_rows[$page_count]['page_id']; $is_current_page = $page_id == $nav_page_id; - - $page_rows_select_tmp = !empty($page_rows[$page_count]['page_desc']) ? ' (' . $page_rows[$page_count]['page_desc'] . ')' : ''; - $page_rows_select[$page_id] = $page_rows[$page_count]['page_name'] . $page_rows_select_tmp; if (!$include_all && $page_count > 0) { --- 612,622 ---- $page_id = $new_page ? 'new_page' : $page_rows[$page_count]['page_id']; $is_current_page = $page_id == $nav_page_id; + if ($page_count - -1) + { + $page_rows_select_tmp = !empty($page_rows[$page_count]['page_desc']) ? ' (' . $page_rows[$page_count]['page_desc'] . ')' : ''; + $page_rows_select[$page_id] = $page_rows[$page_count]['page_name'] . $page_rows_select_tmp; + } + if (!$include_all && $page_count > 0) { *************** *** 610,613 **** --- 635,644 ---- <input type="hidden" name="id" value="' . $page_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; + + $s_hidden_private_fields = '<input type="hidden" name="mode" value="' . MX_PAGE_PRIVATE_TYPE . '" /> + <input type="hidden" name="action" value="' . MX_DO_UPDATE . '" /> + <input type="hidden" name="id" value="' . $page_id . '" /> + <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; + $page_title = !$new_page ? $page_rows[$page_count]['page_name'] : ''; *************** *** 697,700 **** --- 728,732 ---- 'S_HIDDEN_FIELDS' => $s_hidden_page_fields, + 'S_HIDDEN_PRIVATE_FIELDS' => $s_hidden_private_fields, 'S_SUBMIT' => $new_page ? $lang['Add_Page'] : $lang['Update'] *************** *** 749,756 **** } ! if ( $is_current_page || $new_page ) { $template->assign_block_vars('pages.is_current', array()); } else { --- 781,792 ---- } ! if ( $is_current_page ) { $template->assign_block_vars('pages.is_current', array()); } + else if ( $new_page ) + { + $template->assign_block_vars('pages.is_new', array()); + } else { *************** *** 811,823 **** // Get blocklist for alternative add_block $blocklist = get_list_formatted('block_list', 0, 'block_id'); ! $mx_page = new mx_page(); ! $mx_page->init( $page_id ); $mx_block = new mx_block(); $radio_column_list = ''; ! if ( $mx_page->total_column > 0) { $template->assign_block_vars('pages.has_columns', array()); --- 847,879 ---- // Get blocklist for alternative add_block $blocklist = get_list_formatted('block_list', 0, 'block_id'); + + $sql = "SELECT * + FROM " . COLUMN_TABLE . " + WHERE page_id = $page_id + ORDER BY page_id, column_order"; ! if( !($q_columns = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not query page columns information", "", __LINE__, __FILE__, $sql); ! } ! ! $column_rows = array(); ! if( $total_column = $db->sql_numrows($q_columns) ) ! { ! $column_rows = $db->sql_fetchrowset($q_columns); ! } + if ( $total_column == 0 ) + { + $template->assign_block_vars('nocolumns', array( + 'NONE' => $lang['No_columns'] + )); + } + $mx_block = new mx_block(); $radio_column_list = ''; ! if ( $total_column > 0 ) { $template->assign_block_vars('pages.has_columns', array()); *************** *** 827,841 **** // Okay, let's build the index // ! for( $column = 0; $column < $mx_page->total_column + 1; $column++ ) { ! $new_column = $column == $mx_page->total_column; ! $column_id = $new_column ? $page_id . '_0' : $mx_page->columns[$column]['column_id']; $mode = MX_PAGE_COLUMN_TYPE; $action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $column_id; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_id . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_id . '&move=15'; // --- 883,897 ---- // Okay, let's build the index // ! for( $column = 0; $column < $total_column + 1; $column++ ) { ! $new_column = $column == $total_column; ! $column_id = $new_column ? $page_id . '_0' : $column_rows[$column]['column_id']; $mode = MX_PAGE_COLUMN_TYPE; $action = $new_column ? MX_DO_INSERT : MX_DO_UPDATE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $column_id . '&page_id=' . $page_id; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_id . '&page_id=' . $page_id . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $column_id . '&page_id=' . $page_id . '&move=15'; // *************** *** 845,848 **** --- 901,905 ---- <input type="hidden" name="action" value="' . $action . '" /> <input type="hidden" name="id" value="' . $column_id . '" /> + <input type="hidden" name="page_id" value="' . $page_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; *************** *** 856,861 **** // ! $column_title = $new_column ? '' : $mx_page->columns[$column]['column_title']; ! $column_size = $new_column ? '100%' : $mx_page->columns[$column]['column_size']; $visible_column_edit = in_array('adminColumnEdit_' . $page_id . '_' . $column_id, $cookie_states); --- 913,918 ---- // ! $column_title = $new_column ? '' : $column_rows[$column]['column_title']; ! $column_size = $new_column ? '100%' : $column_rows[$column]['column_size']; $visible_column_edit = in_array('adminColumnEdit_' . $page_id . '_' . $column_id, $cookie_states); *************** *** 904,921 **** if (!$new_column) { ! $radio_column_list .= '<input type="radio" name="column_id" value="'.$column_id.'" '.$radio_column_checked.' /><span class="gensmall">'.$column_title.' </span><br />'; } ! // // Now continue with page blocks // ! for( $block = 0; $block < $mx_page->total_block; $block++ ) { ! if( $mx_page->columns[$column]['column_id'] == $mx_page->blocks[$block]['column_id'] ) ! { ! $block_id = $mx_page->blocks[$block]['block_id']; $mx_block->init( $block_id ); ! $block_order = $mx_page->blocks[$block]['block_order']; $editor_name_tmp = get_userdata($mx_block->editor_id); $editor_name = $editor_name_tmp['username']; --- 961,995 ---- if (!$new_column) { ! $radio_column_list .= '<input type="radio" name="id" value="'.$column_id.'" '.$radio_column_checked.' /><span class="gensmall">'.$column_title.' </span><br />'; } ! ! $sql = "SELECT cbl.*, blk.*, function_admin ! FROM " . COLUMN_BLOCK_TABLE . " cbl, ! " . BLOCK_TABLE . " blk, ! " . FUNCTION_TABLE . " fnc ! WHERE blk.function_id = fnc.function_id ! AND blk.block_id = cbl.block_id ! AND cbl.column_id = '" . $column_rows[$column]['column_id'] . "' ! ORDER BY column_id, block_order"; ! ! if( !($q_blocks = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not query blocks information", "", __LINE__, __FILE__, $sql); ! } ! ! if( $total_blocks = $db->sql_numrows($q_blocks) ) ! { ! $block_rows = $db->sql_fetchrowset($q_blocks); ! } ! // // Now continue with page blocks // ! for( $block = 0; $block < $total_blocks; $block++ ) { ! $block_id = $block_rows[$block]['block_id']; $mx_block->init( $block_id ); ! $block_order = $block_rows[$block]['block_order']; $editor_name_tmp = get_userdata($mx_block->editor_id); $editor_name = $editor_name_tmp['username']; *************** *** 923,930 **** $mode = MX_PAGE_BLOCK_TYPE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order; ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&block_id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order . '&move=15'; ! $syncmode = '?mode=' . $mode . '&action=' . MX_DO_SYNC . '&block_id=' . $block_id . '&column_id=' . $column_id; if( !empty($mx_block->block_edit_file) ) --- 997,1005 ---- $mode = MX_PAGE_BLOCK_TYPE; ! $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $block_id . '&column_id=' . $column_id . '&block_order=' . $block_order; ! ! $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=-15'; ! $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $block_id . '&column_id=' . $column_id . '&page_id=' . $page_id . '&block_order=' . $block_order . '&move=15'; ! $syncmode = '?mode=' . $mode . '&action=' . MX_DO_SYNC . '&id=' . $block_id . '&column_id=' . $column_id; if( !empty($mx_block->block_edit_file) ) *************** *** 942,952 **** // admin_mx_block.php will populate them if necessary (see B4). // ! //$param_rows = get_exists(PARAMETER_TABLE, 'function_id', $mx_block->block_config[$block_id]['function_id']); ! //if( $param_rows['number'] > 0 ) ! if ( count( $mx_block->block_config[$block_id] ) > 17) ! { ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); ! } } --- 1017,1022 ---- // admin_mx_block.php will populate them if necessary (see B4). // ! $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); } *************** *** 970,974 **** 'U_BLOCK_RESYNC' => append_sid("admin_mx_page_cp.$phpEx" . $syncmode) )); - } // if ... column_id == column_id } // for ... blocks --- 1040,1043 ---- *************** *** 984,987 **** --- 1053,1057 ---- <input type="hidden" name="action" value="' . $action . '" /> <input type="hidden" name="id" value="' . $column_id . '" /> + <input type="hidden" name="page_id" value="' . $page_id . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; *************** *** 1006,1012 **** $page_select_box = get_list_static('page_id', $page_rows_select, $nav_page_id, false); $template->assign_vars(array( 'PAGE_SELECT_BOX' => $page_select_box, ! 'RADIO_COLUMN_LIST' => $radio_column_list )); --- 1076,1093 ---- $page_select_box = get_list_static('page_id', $page_rows_select, $nav_page_id, false); + $mode = MX_PAGE_BLOCK_TYPE; + $action = MX_DO_INSERT; + + // + // Hidden fields + // + $s_hidden_dyn_fields = '<input type="hidden" name="mode" value="' . $mode . '" /> + <input type="hidden" name="action" value="' . $action . '" /> + <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; + $template->assign_vars(array( 'PAGE_SELECT_BOX' => $page_select_box, ! 'RADIO_COLUMN_LIST' => $radio_column_list, ! 'S_HIDDEN_DYN_FIELDS' => $s_hidden_dyn_fields )); Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** admin_mx_module.php 20 Aug 2005 18:19:11 -0000 1.31 --- admin_mx_module.php 6 Sep 2005 18:51:56 -0000 1.32 *************** *** 64,79 **** $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); - if( isset($HTTP_POST_VARS['export_pack']) || isset($HTTP_GET_VARS['export_pack']) ) - { - $mode = 'export_pack'; - } - if( isset($HTTP_POST_VARS['import_pack']) || isset($HTTP_GET_VARS['import_pack']) ) - { - $mode = 'import_pack'; - } [...1455 lines suppressed...] - $output_message .= '<br /><b><font color=#0000ff>[db...error]</font></b> line: ' . __LINE__ . ' , ' . $sql . '<br />'; - $pak_error = true; - return $output_message; - } - else - { - $output_message .= '<font color=#00ff00>[db...ok]</font>'; - } - - $output_message .= ' ' . $parameter_row[1] . '-' . $resultset_param[$p]['parameter_id'] . ','; - } - - $output_message .= '<br /> ... ok<br />'; - - return $output_message; - } - ?> \ No newline at end of file --- 374,376 ---- Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_module_cp.php 21 Aug 2005 21:40:51 -0000 1.2 --- admin_mx_module_cp.php 6 Sep 2005 18:51:56 -0000 1.3 *************** *** 76,79 **** --- 76,80 ---- // $result_message = $mx_admin->do_it($mode, $action, $id); + $result_message = $lang['AdminCP_status'] . '<hr>' . $result_message; } // if .. !empty($mode) *************** *** 164,169 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'SID' => $userdata['session_id'], ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">-::-<br/>' . $result_message . '<br/> -::-</span></div>': '', // --- 165,170 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'SID' => $userdata['session_id'], ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', // *************** *** 380,394 **** $type_row = array(); ! if ( file_exists( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_blockcp_parameter.php' ) ) { ! include_once( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_blockcp_parameter.php' ); ! if (class_exists('mx_blockcp_parameter')) { ! $mx_blockcp_parameter = new mx_blockcp_parameter(); ! if ( method_exists( $mx_blockcp_parameter, 'get_parameters' ) ) { ! $type_row = $mx_blockcp_parameter->get_parameters($type_row); } } --- 381,395 ---- $type_row = array(); ! if ( file_exists( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.php' ) ) { ! include_once( $mx_root_path . $module_rows[$module_count]['module_path'] . 'admin/mx_module_defs.php' ); ! if (class_exists('mx_module_defs')) { ! $mx_module_defs = new mx_module_defs(); ! if ( method_exists( $mx_module_defs, 'get_parameters' ) ) { ! $type_row = $mx_module_defs->get_parameters($type_row); } } *************** *** 408,411 **** --- 409,414 ---- $type_row['Function'] = !empty($lang['ParType_Function']) ? $lang['ParType_Function'] : "Function"; + + $type_row['Separator'] = !empty($lang['ParType_Separator']) ? $lang['ParType_Separator'] : "-Separator-"; //$type_row['Values'] = !empty($lang['ParType_Values']) ? $lang['ParType_Values'] : "Values"; *************** *** 596,600 **** FROM " . PARAMETER_TABLE . " par WHERE par.function_id = $function_id ! ORDER BY par.parameter_id"; if( !($result = $db->sql_query($sql)) ) --- 599,603 ---- FROM " . PARAMETER_TABLE . " par WHERE par.function_id = $function_id ! ORDER BY par.parameter_order"; if( !($result = $db->sql_query($sql)) ) *************** *** 626,629 **** --- 629,635 ---- $deletemode = '?mode=' . $mode . '&action=' . MX_DO_DELETE . '&id=' . $parameter_id; + $upmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $parameter_id . '&function_id=' . $function_id . '&block_order=' . $block_order . '&move=-15'; + $downmode = '?mode=' . $mode . '&action=' . MX_DO_MOVE . '&id=' . $parameter_id . '&function_id=' . $function_id . '&block_order=' . $block_order . '&move=15'; + // // Hidden fields *************** *** 634,642 **** <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; - - - $parameter_title = !$new_parameter ? $parameter_rows[$parameter_count]['parameter_name'] : ''; ! $parameter_type = !$new_parameter ? get_list_static('parameter_type', $type_row, $parameter_rows[$parameter_count]['parameter_type']) : get_list_static('parameter_type', $type_row, 'BBText'); $parameter_function = $parameter_rows[$parameter_count]['parameter_function']; --- 640,646 ---- <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; $parameter_title = !$new_parameter ? $parameter_rows[$parameter_count]['parameter_name'] : ''; ! $parameter_type_key = $parameter_rows[$parameter_count]['parameter_type']; ! $parameter_type = !$new_parameter ? get_list_static('parameter_type', $type_row, $parameter_type_key) : get_list_static('parameter_type', $type_row, 'BBText'); $parameter_function = $parameter_rows[$parameter_count]['parameter_function']; *************** *** 651,656 **** // Replace htmlentites for < and > with actual character. ! $row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !( $i % 2 ) ) ? $theme['td_class1'] : $theme['td_class2']; // --- 655,660 ---- // Replace htmlentites for < and > with actual character. ! //$row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !( $parameter_count % 2 ) ) ? 'row1' : 'row1'; // *************** *** 668,673 **** 'IMG_URL_DELETE' => $visible_delete ? $module_nav_icon_url . 'contract.gif' : $module_nav_icon_url . 'expand.gif', ! "ROW_COLOR" => '#' . $row_color, ! "ROW_CLASS" => $row_class, 'L_EDIT' => $new_parameter ? '' : $lang['Edit'], --- 672,677 ---- 'IMG_URL_DELETE' => $visible_delete ? $module_nav_icon_url . 'contract.gif' : $module_nav_icon_url . 'expand.gif', ! //"ROW_COLOR" => '#' . $row_color, ! "ROW_CLASS" => $parameter_type_key == 'Separator' ? 'row3' : $row_class, 'L_EDIT' => $new_parameter ? '' : $lang['Edit'], *************** *** 677,682 **** --- 681,689 ---- "PARAMETER_TITLE" => $new_parameter ? '<span class="cattitle">'. $lang['Create_parameter'] . '</span>' : ( ! empty ( $lang[$parameter_title] ) ? $lang[$parameter_title] : $parameter_title ), "PARAMETER_DESC" => $new_parameter ? '' : ' - ' . $parameter_desc, + "PARAMETER_TYPE" => $new_parameter ? '' : (!empty($lang['ParType_'.$parameter_type_key]) ? $lang['ParType_'.$parameter_type_key] : $parameter_type_key), "U_DELETE" => append_sid("admin_mx_module_cp.php" . $deletemode), + "U_MOVE_UP" => append_sid("admin_mx_module_cp.php" . $upmode), + "U_MOVE_DOWN" => append_sid("admin_mx_module_cp.php" . $downmode), // Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** admin_mx_portal.php 20 Aug 2005 18:19:11 -0000 1.16 --- admin_mx_portal.php 6 Sep 2005 18:51:56 -0000 1.17 *************** *** 64,70 **** } - // Update cache - update_session_cache($block_id); - $message = $lang['Portal_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_portal_config'], "<a href=\"" . append_sid("admin_mx_portal.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); --- 64,67 ---- Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_mx_block_cp.php 20 Aug 2005 18:19:11 -0000 1.1 --- admin_mx_block_cp.php 6 Sep 2005 18:51:56 -0000 1.2 *************** *** 75,90 **** setcookie($board_config['cookie_name'] . '_adminBlockCP_block_id', $block_id, time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); // ! // Load states // ! //$cookie_tmp = $board_config['cookie_name'].'_blockcp_blockstates'; ! //$cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); ! $mx_blockcp->init($block_id, true); // // SUBMIT? // ! if( !empty($mode) && !empty($action) ) { // --- 75,98 ---- 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); + // ! // Define blockcp mode: 'mx_blockcp' or 'admin_mx_block_cp' // ! $mx_blockcp->blockcp_mode = 'admin_mx_block_cp'; ! // ! // Parameters ! // ! $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false; ! $submit_pars = ( isset($HTTP_POST_VARS['submit_pars']) ) ? true : false; ! $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; ! $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false; ! $refresh = $preview || $submit_search; // // SUBMIT? // ! if( ($submit || $submit_pars) && !empty($mode) && !empty($action) ) { // *************** *** 92,101 **** // //$portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1); ! //$id = $mx_request_vars->request('id', MX_TYPE_INT, ''); ! // ! // Send to adminCP ! // ! $result_message = $mx_blockcp->submit_parameters($block_id); // --- 100,122 ---- // //$portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 1); ! $block_id = $mx_request_vars->request('id', MX_TYPE_INT, ''); ! ! if( $submit ) ! { ! // ! // Send to adminCP ! // ! $result_message = $mx_admin->do_it($mode, $action, $block_id); ! } ! ! if( $submit_pars ) ! { ! // ! // Send to BlockCP ! // ! $result_message = $mx_blockcp->submit_parameters($block_id); ! } ! $result_message = $lang['AdminCP_status'] . '<hr>' . $result_message; // *************** *** 151,162 **** // - // Parameters - // - $submit = ( isset($HTTP_POST_VARS['post']) ) ? true : false; - $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; - $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false; - $refresh = $preview || $submit_search; - - // // Cancel // --- 172,175 ---- *************** *** 181,186 **** // $blockcptemplate->assign_vars(array( ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">-::-<br/>' . $result_message . '<br/> -::-</span></div>': '', ! 'S_ACTION_SUBMIT' => append_sid("admin_mx_block_cp.$phpEx") )); --- 194,199 ---- // $blockcptemplate->assign_vars(array( ! 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">' . $result_message . '<br/> -::-</span></div>': '', ! 'S_ACTION_SUBMIT' => append_sid("admin_mx_block_cp.$phpEx") )); |
|
From: Jon O. <jon...@us...> - 2005-09-06 18:52:06
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/includes Modified Files: mx_functions.php mx_functions_admincp.php mx_functions_blockcp.php mx_functions_core.php Log Message: Finalizing core 2.8 ;) Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_functions_blockcp.php 20 Aug 2005 18:48:49 -0000 1.2 --- mx_functions_blockcp.php 6 Sep 2005 18:51:56 -0000 1.3 *************** *** 50,53 **** --- 50,58 ---- class mx_blockcp extends mx_block { + // + // Define blockcp mode: 'mx_blockcp' or 'admin_mx_block_cp' + // + var $blockcp_mode = 'mx_blockcp'; + // ------------------------------ // Private Methods *************** *** 60,64 **** function _controlpanel( $id, $new_block ) { ! global $blockcptemplate, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $portalpage, $cookie_states, $module_nav_icon_url, $portalpage; if (empty($id)) --- 65,71 ---- function _controlpanel( $id, $new_block ) { ! global $blockcptemplate, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $portalpage, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars; ! ! $dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, ''); if (empty($id)) *************** *** 199,203 **** 'SID' => $userdata['session_id'], - 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">-::-<br/>' . $result_message . '<br/> -::-</span></div>': '', // --- 206,209 ---- *************** *** 279,282 **** --- 285,289 ---- <input type="hidden" name="action" value="' . $action . '" /> <input type="hidden" name="id" value="' . $block_id . '" /> + <input type="hidden" name="dynamic_block" value="' . $dynamic_block_id . '" /> <input type="hidden" name="portalpage" value="' . $portalpage . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; *************** *** 285,288 **** --- 292,296 ---- <input type="hidden" name="action" value="' . $action . '" /> <input type="hidden" name="id" value="' . $block_id . '" /> + <input type="hidden" name="dynamic_block" value="' . $dynamic_block_id . '" /> <input type="hidden" name="portalpage" value="' . $portalpage . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; *************** *** 291,294 **** --- 299,303 ---- <input type="hidden" name="action" value="' . $action . '" /> <input type="hidden" name="id" value="' . $block_id . '" /> + <input type="hidden" name="dynamic_block" value="' . $dynamic_block_id . '" /> <input type="hidden" name="portalpage" value="' . $portalpage . '" /> <input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_functions_core.php 20 Aug 2005 18:48:49 -0000 1.2 --- mx_functions_core.php 6 Sep 2005 18:51:56 -0000 1.3 *************** *** 51,61 **** // The following flags are class specific options // ! define('MX_ALL_DATA' , -1); // Flag - write all data ! define('MX_ALL_BLOCKS' , -2); // Flag - write all blocks data ! define('MX_ALL_PAGES' , -3); // Flag - write all pages data ! define('MX_BLOCK' , 0); // Block read mode ! define('MX_PAGE' , 1); // Page read mode ! define('MX_QUERY_DB' , true); // Flag - to force db query define('MX_CACHE_DEBUG' , false); // echo lots of debug info --- 51,60 ---- // The following flags are class specific options // ! define('MX_CACHE_ALL' , -1); // Flag - all ! define('MX_CACHE_SINGLE' , -2); // Flag - all ! define('MX_CACHE_PAGE_TYPE' , -3); // Flag - blocks data ! define('MX_CACHE_BLOCK_TYPE' , -4); // Flag - pages data ! define('MX_QUERY_DB' , true); // Flag - to force db query // not used define('MX_CACHE_DEBUG' , false); // echo lots of debug info *************** *** 76,80 **** switch ( $type ) { ! case MX_BLOCK: $cache_file = $cache_dir . "block_" . $id . ".xml"; --- 75,79 ---- switch ( $type ) { ! case MX_CACHE_BLOCK_TYPE: $cache_file = $cache_dir . "block_" . $id . ".xml"; *************** *** 95,99 **** break; ! case MX_PAGE: $cache_file = $cache_dir . "page_" . $id . ".xml"; --- 94,98 ---- break; ! case MX_CACHE_PAGE_TYPE: $cache_file = $cache_dir . "page_" . $id . ".xml"; *************** *** 117,121 **** // Write cache ! function _write_config( $type, $id, $action ) { global $portal_config, $mx_root_path, $lang; --- 116,120 ---- // Write cache ! function _write_config( $type, $action, $id = '' ) { global $portal_config, $mx_root_path, $lang; *************** *** 126,130 **** @chmod($cache_dir, 0777); ! $cache_file = $cache_dir . ( $type == MX_BLOCK ? "block_" : "page_" ) . ( $action == 'single' ? $id . ".xml" : '' ); if ( !is_writable($cache_dir) ) --- 125,129 ---- @chmod($cache_dir, 0777); ! $cache_file = $cache_dir . ( $type == MX_CACHE_BLOCK_TYPE ? "block_" : "page_" ) . ( $action == MX_CACHE_SINGLE ? $id . ".xml" : '' ); if ( !is_writable($cache_dir) ) *************** *** 136,144 **** switch ( $type ) { ! case MX_BLOCK: switch ( $action ) { ! case 'all': if ( MX_CACHE_DEBUG ) { echo('writing all block cache'); } --- 135,143 ---- switch ( $type ) { ! case MX_CACHE_BLOCK_TYPE: switch ( $action ) { ! case MX_CACHE_ALL: if ( MX_CACHE_DEBUG ) { echo('writing all block cache'); } *************** *** 148,154 **** break; ! case 'single': ! if ( MX_CACHE_DEBUG ) { echo('writing id block cache'); } $block_config = $this->_get_block_config( $id, 0 ); $this->_data2cache( $block_config[$id], $cache_file, $action, $type ); --- 147,153 ---- break; ! case MX_CACHE_SINGLE: ! if ( MX_CACHE_DEBUG ) { echo('writing id (' . $id .') block cache'); } $block_config = $this->_get_block_config( $id, 0 ); $this->_data2cache( $block_config[$id], $cache_file, $action, $type ); *************** *** 159,167 **** break; ! case MX_PAGE: switch ( $action ) { ! case 'all': if ( MX_CACHE_DEBUG ) { echo('writing all page cache'); } --- 158,166 ---- break; ! case MX_CACHE_PAGE_TYPE: switch ( $action ) { ! case MX_CACHE_ALL: if ( MX_CACHE_DEBUG ) { echo('writing all page cache'); } *************** *** 171,177 **** break; ! case 'single': ! if ( MX_CACHE_DEBUG ) { echo('writing id page cache'); } $pages_config = $this->_get_page_config( $id ); $this->_data2cache( $pages_config, $cache_file, $action, $type ); --- 170,176 ---- break; ! case MX_CACHE_SINGLE: ! if ( MX_CACHE_DEBUG ) { echo('writing id (' . $id .') page cache'); } $pages_config = $this->_get_page_config( $id ); $this->_data2cache( $pages_config, $cache_file, $action, $type ); *************** *** 192,196 **** switch ( $action ) { ! case 'all': if ( empty($data) || empty($xml_file) ) --- 191,195 ---- switch ( $action ) { ! case MX_CACHE_ALL: if ( empty($data) || empty($xml_file) ) *************** *** 203,207 **** $OUTPUT = serialize($value); ! if ( $type == MX_PAGE ) { $fp = fopen($xml_file . $value['page_info']['page_id'] . $xml_file_type . ".xml","w"); // open file with Write permission --- 202,206 ---- $OUTPUT = serialize($value); ! if ( $type == MX_CACHE_PAGE_TYPE ) { $fp = fopen($xml_file . $value['page_info']['page_id'] . $xml_file_type . ".xml","w"); // open file with Write permission *************** *** 220,224 **** break; ! case 'single': if ( empty($data) || empty($xml_file) ) --- 219,223 ---- break; ! case MX_CACHE_SINGLE: if ( empty($data) || empty($xml_file) ) *************** *** 520,531 **** // ! // $block_config = $mx_cache->read( MX_BLOCK, $block_id, [MX_QUERY_DB] ); // Optional flag 'MX_QUERY_DB' to force db query ! // $page_config = $mx_cache->read( MX_PAGE, $page_id, [MX_QUERY_DB] ); // Optional flag 'MX_QUERY_DB' to force db query // $mx_cache->update( MX_ALL_DATA ); // Updates all cache ! // $mx_cache->update( MX_BLOCK, [$block_id] ); // Optional parameter $block_id to update only specific cache fle ! // $mx_cache->update( MX_PAGE, [$page_id] ); // Optional parameter $page_id to update only specific cache file ! function read( $id = '', $type = MX_BLOCK, $force_query = false ) { if ( is_array( $id ) ) --- 519,530 ---- // ! // $block_config = $mx_cache->read( MX_CACHE_BLOCK_TYPE, $block_id, [MX_QUERY_DB] ); // Optional flag 'MX_QUERY_DB' to force db query ! // $page_config = $mx_cache->read( MX_CACHE_PAGE_TYPE, $page_id, [MX_QUERY_DB] ); // Optional flag 'MX_QUERY_DB' to force db query // $mx_cache->update( MX_ALL_DATA ); // Updates all cache ! // $mx_cache->update( MX_CACHE_BLOCK_TYPE, [$block_id] ); // Optional parameter $block_id to update only specific cache fle ! // $mx_cache->update( MX_CACHE_PAGE_TYPE, [$page_id] ); // Optional parameter $page_id to update only specific cache file ! function read( $id = '', $type = MX_CACHE_BLOCK_TYPE, $force_query = false ) { if ( is_array( $id ) ) *************** *** 550,572 **** } ! // TYPE: MX_ALL_DATA, MX_PAGE, MX_BLOCK ! function update( $type = MX_ALL_DATA, $id = '' ) { ! if ( $type == MX_ALL_DATA && empty($id) ) { ! $this->_write_config( MX_BLOCK, '', 'all' ); ! $this->_write_config( MX_PAGE, '', 'all' ); } ! else if ( $type == MX_ALL_BLOCKS && empty($id) ) { ! $this->_write_config( MX_BLOCK, '', 'all' ); } ! else if ( $type == MX_ALL_PAGES && empty($id) ) { ! $this->_write_config( MX_PAGE, '', 'all' ); } ! else if ( $id > 0 ) { ! $this->_write_config( $type, $id, 'single' ); } else --- 549,571 ---- } ! // TYPE: MX_CACHE_ALL, MX_CACHE_PAGE_TYPE, MX_CACHE_BLOCK_TYPE ! function update( $type = MX_CACHE_ALL, $id = '' ) { ! if ( $type == MX_CACHE_ALL && empty($id) ) { ! $this->_write_config( MX_CACHE_PAGE_TYPE, MX_CACHE_ALL ); ! $this->_write_config( MX_CACHE_BLOCK_TYPE, MX_CACHE_ALL ); } ! else if ( $type == MX_CACHE_BLOCK_TYPE && empty($id) ) { ! $this->_write_config( MX_CACHE_BLOCK_TYPE, MX_CACHE_ALL ); } ! else if ( $type == MX_CACHE_PAGE_TYPE && empty($id) ) { ! $this->_write_config( MX_CACHE_PAGE_TYPE, MX_CACHE_ALL ); } ! else if ( $type != MX_CACHE_ALL && $id > 0 ) { ! $this->_write_config( $type, MX_CACHE_SINGLE, $id ); } else *************** *** 793,797 **** global $mx_cache; ! $this->block_config = $mx_cache->read( $block_id, MX_BLOCK, $force_query ); $this->_set_all( $block_id ); } --- 792,796 ---- global $mx_cache; ! $this->block_config = $mx_cache->read( $block_id, MX_CACHE_BLOCK_TYPE, $force_query ); $this->_set_all( $block_id ); } *************** *** 855,859 **** global $layouttemplate, $lang; ! $hidden_img = '<img src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/block_hidden.gif" alt="' . $lang['Hidden_block'] . '">'; $layouttemplate->assign_block_vars('layout_column.blocks.edit.hidden_block', array( 'HIDDEN_BLOCK' => $hidden_img --- 854,858 ---- global $layouttemplate, $lang; ! $hidden_img = '<img src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/block_hidden.gif" alt="' . $lang['Hidden_block_explain'] . '">'; $layouttemplate->assign_block_vars('layout_column.blocks.edit.hidden_block', array( 'HIDDEN_BLOCK' => $hidden_img *************** *** 885,889 **** // ! $block_edit_img = ( ( $this->block_file == 'mx_multiple_blocks.php' ) ? 'block_edit_split.gif' : ( $this->block_file == 'mx_textblock_blog.php' ? 'block_edit_admin.gif' : 'block_edit.gif' ) ) ; $edit_file = !empty( $this->block_edit_file ) ? $this->block_edit_file : 'modules/mx_coreblocks/mx_blockcp.php'; --- 884,904 ---- // ! //$block_edit_img = ( ( $this->block_file == 'mx_multiple_blocks.php' ) ? 'block_edit_split.gif' : ( $this->block_file == 'mx_textblock_blog.php' ? 'block_edit_admin.gif' : 'block_edit.gif' ) ) ; ! if ($this->is_dynamic) ! { ! $block_edit_img = 'block_edit_admin.gif'; ! $block_edit_alt = $lang['Block_Edit_dyn']; ! } ! else if ($this->is_sub) ! { ! $block_edit_img = 'block_edit_split.gif'; ! $block_edit_alt = $lang['Block_Edit_sub']; ! } ! else ! { ! $block_edit_img = 'block_edit.gif'; ! $block_edit_alt = $lang['Block_Edit']; ! } ! $edit_file = !empty( $this->block_edit_file ) ? $this->block_edit_file : 'modules/mx_coreblocks/mx_blockcp.php'; *************** *** 894,900 **** $block_desc = !empty( $this->block_desc ) ? ' (' . $this->block_desc . ')' : ''; $edit_url = append_sid( $mx_root_path . $edit_file . "?sid=" . $userdata['session_id'] ); ! $edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . $block_edit_img . '" alt="' . $lang['Block_Edit'] . ' :: ' . $this->block_title . $block_desc . '" title="' . $lang['Block_Edit'] . ' :: ' . $this->block_title . $block_desc . '">'; $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $this->block_id . '" />'; // --- 909,916 ---- $block_desc = !empty( $this->block_desc ) ? ' (' . $this->block_desc . ')' : ''; $edit_url = append_sid( $mx_root_path . $edit_file . "?sid=" . $userdata['session_id'] ); ! $edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . $block_edit_img . '" alt="' . $block_edit_alt . ' :: ' . $this->block_title . $block_desc . '" title="' . $block_edit_alt . "\n" . '- ' . $this->block_title . $block_desc . '">'; $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $this->block_id . '" />'; + $s_hidden_fields .= '<input type="hidden" name="dynamic_block" value="' . $this->dynamic_block_id . '" />'; // *************** *** 1048,1052 **** function submit_parameters( $block_id = false ) { ! global $HTTP_POST_VARS, $db; $return = false; --- 1064,1068 ---- function submit_parameters( $block_id = false ) { ! global $HTTP_POST_VARS, $db, $mx_cache, $lang; $return = false; *************** *** 1056,1139 **** { $parameter_id = $parameter_data['parameter_id']; ! if ( isset($HTTP_POST_VARS[$parameter_id]) || isset($HTTP_POST_VARS[$parameter_name]) ) { ! $parameter_value = $HTTP_POST_VARS[$parameter_id]; ! ! $parameter_opt = ''; ! ! switch ( $parameter_data['parameter_type'] ) ! { ! case 'Boolean': ! case 'Text': ! case 'TextArea': ! $parameter_value = htmlspecialchars( trim( $parameter_value ) ); ! break; ! case 'BBText': ! $bbcode_uid = $parameter_opt = make_bbcode_uid(); ! $parameter_value = prepare_message($parameter_value, true, true, true, $bbcode_uid); ! break; ! case 'Html': ! $parameter_value = prepare_message($parameter_value, true, false, false); ! break; ! case 'Number': ! $parameter_value = intval($parameter_value); ! break; ! case 'Function': ! if( is_array($parameter_value) ) ! { ! $parameter_value = implode(',' , htmlspecialchars($parameter_value)); ! } ! break; ! // Custom Fields ! case 'Radio_single_select': ! case 'Menu_single_select': ! $parameter_value = htmlspecialchars( trim( $parameter_value ) ); ! break; ! case 'Menu_multiple_select': ! case 'Checkbox_multiple_select': ! $parameter_value = addslashes( serialize( $parameter_value ) ); ! break; ! default: ! $parameter_custom = $this->_submit_custom_module_parameters($parameter_data); ! $parameter_value = $parameter_custom['parameter_value']; ! $parameter_opt = $parameter_custom['parameter_opt']; ! } ! ! if ( $sub_id == $parameter_data['sub_id'] || true ) ! { ! //echo('d'.$sub_id . 'd' .$parameter_data['sub_id']); ! // ! // If standard block ! // ! $sql = "UPDATE " . BLOCK_SYSTEM_PARAMETER_TABLE . " ! SET parameter_value = '" . str_replace("\'", "''", $parameter_value) . "', ! parameter_opt = '$parameter_opt' ! WHERE block_id = '$block_id' ! AND parameter_id = '$parameter_id' ! AND sub_id = '$sub_id'"; ! } ! else ! { ! /* ! // ! // If subblock ! // ! $sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "(block_id, parameter_id, parameter_value, parameter_opt, sub_id) ! VALUES('$block_id','$parameter_id','" . str_replace("\'", "''", $parameter_value) . "','$parameter_opt', '$sub_id')"; ! */ ! } ! if( !($db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't update system parameter table", "", __LINE__, __FILE__, $sql); ! } ! ! ! $this->_submit_custom_module_parameters($parameter_data, $block_id); } } } --- 1072,1157 ---- { $parameter_id = $parameter_data['parameter_id']; ! $parameter_value = isset($HTTP_POST_VARS[$parameter_id]) ? $HTTP_POST_VARS[$parameter_id] : $parameter_data['parameter_default']; ! $parameter_opt = ''; ! ! switch ( $parameter_data['parameter_type'] ) { ! case 'Boolean': ! case 'Text': ! case 'TextArea': ! $parameter_value = htmlspecialchars( trim( $parameter_value ) ); ! break; ! case 'BBText': ! $bbcode_uid = $parameter_opt = make_bbcode_uid(); ! $parameter_value = prepare_message($parameter_value, true, true, true, $bbcode_uid); ! break; ! case 'Html': ! $parameter_value = prepare_message($parameter_value, true, false, false); ! break; ! case 'Number': ! $parameter_value = intval($parameter_value); ! break; ! case 'Function': ! if( is_array($parameter_value) ) ! { ! //$parameter_value = implode(',' , htmlspecialchars($parameter_value)); ! $parameter_value = implode(',' , $parameter_value); ! } ! break; ! // Custom Fields ! case 'Radio_single_select': ! case 'Menu_single_select': ! $parameter_value = htmlspecialchars( trim( $parameter_value ) ); ! break; ! case 'Menu_multiple_select': ! case 'Checkbox_multiple_select': ! $parameter_value = addslashes( serialize( $parameter_value ) ); ! break; ! case 'Separator': ! break; ! default: ! $parameter_custom = $this->_submit_custom_module_parameters($parameter_data, $block_id); ! $parameter_value = $parameter_custom['parameter_value']; ! $parameter_opt = $parameter_custom['parameter_opt']; ! break; ! } ! if ( $sub_id == $parameter_data['sub_id'] || true ) ! { ! // ! // If standard block ! // ! $sql = "UPDATE " . BLOCK_SYSTEM_PARAMETER_TABLE . " ! SET parameter_value = '" . str_replace("\'", "''", $parameter_value) . "', ! parameter_opt = '$parameter_opt' ! WHERE block_id = '$block_id' ! AND parameter_id = '$parameter_id' ! AND sub_id = '$sub_id'"; ! } ! else ! { ! /* ! // ! // If subblock ! // ! $sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "(block_id, parameter_id, parameter_value, parameter_opt, sub_id) ! VALUES('$block_id','$parameter_id','" . str_replace("\'", "''", $parameter_value) . "','$parameter_opt', '$sub_id')"; ! */ ! } ! if( !($db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't update system parameter table", "", __LINE__, __FILE__, $sql); } + } + // + // Update cache + // + $mx_cache->update(MX_CACHE_BLOCK_TYPE, $block_id); // Maybe ambitious, but why not ;) + $message .= $lang['AdminCP_action'] . ": " . $lang['Block'] . ' ' . $lang['was_updated']; + } *************** *** 1184,1188 **** switch ( $parameter_data['parameter_type'] ) { ! case 'Text': $this->display_edit_PlainTextField( $block_id, $parameter_data['parameter_id'], $parameter_data ); break; --- 1202,1209 ---- switch ( $parameter_data['parameter_type'] ) { ! case 'Separator': ! $this->display_edit_Separator( $block_id, $parameter_data['parameter_id'], $parameter_data ); ! break; ! case 'Text': $this->display_edit_PlainTextField( $block_id, $parameter_data['parameter_id'], $parameter_data ); break; *************** *** 1219,1226 **** $this->display_edit_Checkbox_multiple_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); break; } - $this->_get_custom_module_parameters($parameter_data, $block_id); - $return = true; } --- 1240,1248 ---- $this->display_edit_Checkbox_multiple_select( $block_id, $parameter_data['parameter_id'], $parameter_data ); break; + default: + $this->_get_custom_module_parameters($parameter_data, $block_id); + break; } $return = true; } *************** *** 1238,1241 **** --- 1260,1283 ---- } + function display_edit_Separator( $block_id, $parameter_id, $parameter_data ) + { + global $template, $board_config, $db, $theme, $lang; + + // $parameter_field = '<input type="text" maxlength="150" size="50" name="' . $parameter_id . '" value="' . $parameter_data['parameter_value'] . '" />'; + + $template->set_filenames(array( + 'parameter' => 'admin/mx_core_parameters.tpl') + ); + + $template->assign_block_vars('separator', array( + 'PARAMETER_TITLE' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], + 'PARAMETER_TITLE_EXPLAIN' => ( !empty($lang[$parameter_data['parameter_name']. "_explain"]) ) ? '<br />' . $lang[$parameter_data['parameter_name']. "_explain"] : '', + 'PARAMETER_TYPE' => ( !empty($lang["ParType_".$parameter_data['parameter_type']]) ) ? $lang["ParType_".$parameter_data['parameter_type']] : '', + 'PARAMETER_TYPE_INFO' => ( !empty($lang["ParType_".$parameter_data['parameter_type'] . "_info"]) ) ? ' :: ' . $lang["ParType_".$parameter_data['parameter_type'] . "_info"] : '' + )); + + $template->pparse('parameter'); + } + function display_edit_PlainTextField( $block_id, $parameter_id, $parameter_data ) { *************** *** 1353,1357 **** $selected_true = ''; $selected_false = ''; ! if( $parameter_data['parameter_value'] == 'TRUE' ) { $selected_true = ' checked="checked"'; --- 1395,1399 ---- $selected_true = ''; $selected_false = ''; ! if( $parameter_data['parameter_value'] == 'TRUE' || $parameter_data['parameter_value'] == '1' ) { $selected_true = ' checked="checked"'; *************** *** 1414,1417 **** --- 1456,1462 ---- $template->assign_block_vars( 'radio', array( + 'PARAMETER_TITLE' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], + 'PARAMETER_TITLE_EXPLAIN' => ( !empty($lang[$parameter_data['parameter_name']. "_explain"]) ) ? '<br />' . $lang[$parameter_data['parameter_name']. "_explain"] : '', + 'FIELD_NAME' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], 'FIELD_ID' => $parameter_data['parameter_id'], *************** *** 1444,1447 **** --- 1489,1495 ---- $template->assign_block_vars( 'select', array( + 'PARAMETER_TITLE' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], + 'PARAMETER_TITLE_EXPLAIN' => ( !empty($lang[$parameter_data['parameter_name']. "_explain"]) ) ? '<br />' . $lang[$parameter_data['parameter_name']. "_explain"] : '', + 'FIELD_NAME' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], 'FIELD_ID' => $parameter_data['parameter_id'], *************** *** 1513,1516 **** --- 1561,1567 ---- $template->assign_block_vars( 'checkbox', array( + 'PARAMETER_TITLE' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], + 'PARAMETER_TITLE_EXPLAIN' => ( !empty($lang[$parameter_data['parameter_name']. "_explain"]) ) ? '<br />' . $lang[$parameter_data['parameter_name']. "_explain"] : '', + 'FIELD_NAME' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], 'FIELD_ID' => $parameter_data['parameter_id'], *************** *** 1685,1693 **** // ! function init( $page_id ) { global $mx_cache; ! $this->page_config = $mx_cache->read( $page_id, MX_PAGE ); $this->_set_all( $page_id ); } --- 1736,1744 ---- // ! function init( $page_id, $force_query = false ) { global $mx_cache; ! $this->page_config = $mx_cache->read( $page_id, MX_CACHE_PAGE_TYPE, $force_query ); $this->_set_all( $page_id ); } *************** *** 1714,1722 **** $block_size = $this->columns[$column]['column_size']; ! // // Setup column css styles // - $colclass = $this->_get_colclass( $column ); --- 1765,1772 ---- $block_size = $this->columns[$column]['column_size']; ! // // Setup column css styles // $colclass = $this->_get_colclass( $column ); *************** *** 1724,1728 **** // Output // - $layouttemplate->assign_block_vars('layout_column', array( 'COL_CLASS' => $colclass, --- 1774,1777 ---- *************** *** 1756,1760 **** global $mx_cache; ! if ($id == MX_ALL_BLOCKS) { $mx_cache->update( MX_ALL_BLOCKS ); --- 1805,1822 ---- global $mx_cache; ! if (!is_object($mx_cache)) ! { ! // ! // instatiate the mx_cache class ! // ! $mx_cache = new mx_cache(); ! } ! ! if ($id == MX_ALL_DATA) ! { ! $mx_cache->update( MX_ALL_BLOCKS ); ! $mx_cache->update( MX_ALL_PAGES ); ! } ! else if ($id == MX_ALL_BLOCKS) { $mx_cache->update( MX_ALL_BLOCKS ); Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_functions_admincp.php 21 Aug 2005 21:40:51 -0000 1.2 --- mx_functions_admincp.php 6 Sep 2005 18:51:56 -0000 1.3 *************** *** 20,32 **** */ - /** - * Included functions in this file: - * - mx_db_remove - * - mx_db_add - * - mx_do_install_upgrade - */ - - // For use during module import/export [...3877 lines suppressed...] + $message .= '1) Now, delete the /install and /contrib folders!!!<br /><br />'; + $message .= '2) If you haven\'t already done a db backup, now is the time ;)<br /><br />'; + $message .= '3) Then (after step 1), you HAVE to configure MX core and its modules from within the adminCP, simply \'upgrade\' MX portal Core and all modules in use!!!<br /><br />'; + + $message .= 'Click <a href=../admin/admin_mx_module.php>Here</a> to administer/upgrade the portal/modules. You will be promted for an admin username and pass. The upgrade process provide informative output...'; + } + else + { + $message .= '<br /><br /><b>Portal installed successfully (with some warnings)! </b><hr><br /><br />'; + $message .= '1) Now, delete the /install and /contrib folders!!!<br /><br />'; + $message .= '2) If you haven\'t already done a db backup, now is the time ;)<br /><br />'; + $message .= '3) Now (after step 1), you HAVE to configure MX core and its modules from within the adminCP, simply \'upgrade\' MX portal Core and all modules in use!!!<br /><br />'; + $message .= 'Click <a href=../admin/admin_mx_module.php>Here</a> to administer/upgrade the portal/modules. You will be promted for an admin username and pass. The upgrade process provide informative output...'; + } + } + return $message; + } ?> \ No newline at end of file Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** mx_functions.php 20 Aug 2005 18:19:11 -0000 1.44 --- mx_functions.php 6 Sep 2005 18:51:56 -0000 1.45 *************** *** 107,114 **** $sql .= " WHERE $idfield <> $id"; } ! if( !empty($id2) ) { ! $sql .= " WHERE $idfield2 = $id2"; } $sql .= " ORDER BY $namefield"; --- 107,118 ---- $sql .= " WHERE $idfield <> $id"; } ! if( !$select && !empty($id2) ) { ! $sql .= " AND $idfield2 = $id2"; } + if( $select && !empty($id2) ) + { + $sql .= " WHERE $idfield2 = $id2"; + } $sql .= " ORDER BY $namefield"; *************** *** 254,284 **** /********************************************************************************\ - | - \********************************************************************************/ - function get_mx_select_list($type = 'includex', $id, $name_select) - { - global $lang; - - switch($type) - { - case 'includex': - $select_row = array('x_listen', 'x_iframe', 'x_textfile', 'x_multimedia', 'x_pic', 'x_format'); - $select_list = '<select name="' . $name_select . '">'; - for( $i = 0; $i < count($select_row); $i++ ) - { - $selected = ( $i == $id ) ? ' selected="selected"' : ''; - $select_list .= '<option value="' . $i . '"' . $selected . '>' . $lang[$select_row[$i]] . "</option>\n"; - } - $select_list .= '</select>'; - break; - - default: - break; - } - - return $select_list; - } - - /********************************************************************************\ | function get_list_formatted() | ------------------------------------------------------------------------------- --- 258,261 ---- *************** *** 983,986 **** --- 960,964 ---- $type |= (MX_TYPE_POST_VARS|MX_TYPE_GET_VARS); } + if( ($type & MX_TYPE_POST_VARS) && isset($HTTP_POST_VARS[$var]) || ($type & MX_TYPE_GET_VARS) && isset($HTTP_GET_VARS[$var]) ) *************** *** 1006,1017 **** --- 984,998 ---- $val = $dflt; } + if( $type & MX_TYPE_INT ) // integer { return intval($val); } + if( $type & MX_TYPE_FLOAT ) // float { return floatval($val); } + if( $type & MX_TYPE_NO_TAGS ) // ie username { *************** *** 1042,1045 **** --- 1023,1027 ---- } } + if( $type & MX_TYPE_SQL_QUOTED ) { *************** *** 1056,1059 **** --- 1038,1042 ---- } } + return $val; } |
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/modules/mx_coreblocks Modified Files: mx_announce.php mx_blockcp.php mx_includex.php mx_language.php mx_login.php mx_poll.php mx_site_log.php mx_theme.php Log Message: Finalizing core 2.8 ;) Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_poll.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_poll.php 26 Apr 2005 00:15:03 -0000 1.20 --- mx_poll.php 6 Sep 2005 18:51:57 -0000 1.21 *************** *** 302,307 **** else { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; } } --- 302,307 ---- else { ! $mx_block->show_title = false; ! $mx_block->show_block = false; } } Index: mx_login.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_login.php 19 Apr 2005 17:18:47 -0000 1.6 --- mx_login.php 6 Sep 2005 18:51:57 -0000 1.7 *************** *** 41,49 **** )); - // if( !$userdata['session_logged_in'] ) - // { $template->assign_block_vars('switch_user_logged_out', array()); $template->pparse('body_login'); - // } ?> \ No newline at end of file --- 41,46 ---- Index: mx_language.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_language.php 19 Apr 2005 18:02:26 -0000 1.9 --- mx_language.php 6 Sep 2005 18:51:57 -0000 1.10 *************** *** 92,97 **** else { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; } --- 92,97 ---- else { ! $mx_block->show_title = false; ! $mx_block->show_block = false; } Index: mx_site_log.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_site_log.php 11 Feb 2005 22:05:56 -0000 1.1 --- mx_site_log.php 6 Sep 2005 18:51:57 -0000 1.2 *************** *** 29,46 **** // Read block Configuration ! $log_numberOfEvents = $block_config[$block_id][numOfEvents]['parameter_value'] > 0 ? intval( $block_config[$block_id][numOfEvents]['parameter_value']) : '5'; ! $log_filter_time = $block_config[$block_id][log_filter_date]['parameter_value']; // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year, ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); ! } ! else ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); ! } $log_start = ( isset( $HTTP_GET_VARS['log_start'] ) ) ? intval( $HTTP_GET_VARS['log_start'] ) : 0; --- 29,34 ---- // Read block Configuration ! $log_numberOfEvents = $block_config[$block_id]['numOfEvents']['parameter_value'] > 0 ? intval( $block_config[$block_id]['numOfEvents']['parameter_value']) : '5'; ! $log_filter_time = $block_config[$block_id]['log_filter_date']['parameter_value']; // no limit, last day, 2 days, 3 days, week, 2 weeks, 3 weeks, month, 2 months, 3 months, 6 months, i year, $log_start = ( isset( $HTTP_GET_VARS['log_start'] ) ) ? intval( $HTTP_GET_VARS['log_start'] ) : 0; *************** *** 79,116 **** switch ( $log_filter_time ) { ! case '0': $news_time_filter_lo = "no"; break; ! case '1': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '2': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '3': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '4': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 7), intval(substr($log_today, 4, 4)) ); break; ! case '5': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 14), intval(substr($log_today, 4, 4)) ); break; ! case '6': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 21), intval(substr($log_today, 4, 4)) ); break; ! case '7': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 1), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '8': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 2), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '9': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 3), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '10': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 6), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '11': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4) - 1) ); break; --- 67,104 ---- switch ( $log_filter_time ) { ! case 'no limit': $news_time_filter_lo = "no"; break; ! case '1 day': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '2 days': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '3 days': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 1), intval(substr($log_today, 4, 4)) ); break; ! case '1 week': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 7), intval(substr($log_today, 4, 4)) ); break; ! case '2 weeks': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 14), intval(substr($log_today, 4, 4)) ); break; ! case '3 weeks': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2) - 21), intval(substr($log_today, 4, 4)) ); break; ! case '1 month': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 1), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '2 months': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 2), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '3 months': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 3), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '6 months': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2) - 6), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4)) ); break; ! case '1 year': $log_time_filter_lo = mktime ( 0, 0, 0 , intval(substr($log_today, 0, 2)), intval(substr($log_today, 2, 2)), intval(substr($log_today, 4, 4) - 1) ); break; Index: mx_includex.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_includex.php 19 Apr 2005 17:14:19 -0000 1.4 --- mx_includex.php 6 Sep 2005 18:51:57 -0000 1.5 *************** *** 98,103 **** default: // Hidden ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; return; } --- 98,103 ---- default: // Hidden ! $mx_block->show_title = false; ! $mx_block->show_block = false; return; } Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_blockcp.php 20 Aug 2005 18:19:12 -0000 1.1 --- mx_blockcp.php 6 Sep 2005 18:51:57 -0000 1.2 *************** *** 30,33 **** --- 30,36 ---- include($mx_root_path . 'includes/mx_functions_admincp.' . $phpEx); + include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // required for search tables + include_once($phpbb_root_path . "includes/functions_post.$phpEx"); // required by mx_generate_smilies + $view_page = false; *************** *** 35,39 **** // Start session management // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); mx_init_userprefs($userdata); --- 38,42 ---- // Start session management // ! $userdata = session_pagestart($user_ip, '-999'); mx_init_userprefs($userdata); *************** *** 41,46 **** // End session management // - include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // required for search tables - include_once($phpbb_root_path . "includes/functions_post.$phpEx"); // required by mx_generate_smilies // ********************************************************************** --- 44,47 ---- *************** *** 82,85 **** --- 83,91 ---- // + // Define blockcp mode: 'mx_blockcp' or 'admin_mx_block_cp' + // + $mx_blockcp->blockcp_mode = 'mx_blockcp'; + + // // Mode setting // *************** *** 101,104 **** --- 107,111 ---- // $submit = ( isset($HTTP_POST_VARS['submit']) ) ? true : false; + $submit_pars = ( isset($HTTP_POST_VARS['submit_pars']) ) ? true : false; $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? true : false; $preview = ( isset($HTTP_POST_VARS['preview']) ) ? true : false; *************** *** 136,150 **** // SUBMIT? // ! if( $submit && !empty($mode) && !empty($action) ) { // // Get vars // ! // ! // Send to adminCP ! // ! $result_message = $mx_blockcp->submit_parameters($block_id); ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&portalpage=$portalpage&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 143,171 ---- // SUBMIT? // ! if( ($submit || $submit_pars) && !empty($mode) && !empty($action) ) { // // Get vars // + $block_id = $mx_request_vars->request('id', MX_TYPE_INT, ''); + $dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, ''); ! if( $submit ) ! { ! // ! // Send to adminCP ! // ! $result_message = $mx_admin->do_it($mode, $action, $block_id); ! } ! ! if( $submit_pars ) ! { ! // ! // Send to BlockCP ! // ! $result_message = $mx_blockcp->submit_parameters($block_id); ! } ! ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid($mx_root_path ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&portalpage=$portalpage&dynamic_block=$dynamic_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage&dynamic_block=$dynamic_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_announce.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mx_announce.php 28 Apr 2005 13:58:32 -0000 1.14 --- mx_announce.php 6 Sep 2005 18:51:57 -0000 1.15 *************** *** 133,138 **** if ( $total_posts == 0 ) { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; return; } --- 133,138 ---- if ( $total_posts == 0 ) { ! $mx_block->show_title = false; ! $mx_block->show_block = false; return; } Index: mx_theme.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_theme.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_theme.php 19 Apr 2005 18:02:27 -0000 1.9 --- mx_theme.php 6 Sep 2005 18:51:57 -0000 1.10 *************** *** 92,97 **** else { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; } --- 92,97 ---- else { ! $mx_block->show_title = false; ! $mx_block->show_block = false; } |
|
From: Jon O. <jon...@us...> - 2005-09-06 18:52:06
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4716/modules/mx_textblocks Modified Files: mx_textblock_bbcode.php mx_textblock_html.php mx_textblock_multi.php Log Message: Finalizing core 2.8 ;) Index: mx_textblock_html.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_html.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_textblock_html.php 26 Apr 2005 19:52:18 -0000 1.7 --- mx_textblock_html.php 6 Sep 2005 18:51:57 -0000 1.8 *************** *** 30,34 **** $message = $block_config[$block_id]['Html']['parameter_value']; ! $message = str_replace("\n", "\n<br />\n", $message); // --- 30,34 ---- $message = $block_config[$block_id]['Html']['parameter_value']; ! //$message = str_replace("\n", "\n<br />\n", $message); // Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_textblock_multi.php 26 Apr 2005 19:52:18 -0000 1.9 --- mx_textblock_multi.php 6 Sep 2005 18:51:57 -0000 1.10 *************** *** 78,82 **** if( $allow_bbcode ) { ! $bbcode_uid = $block_config[$block_id]['Text']['bbcode_uid']; $message = mx_decode($message, $bbcode_uid, $allow_smilies, $allow_bbcode); } --- 78,82 ---- if( $allow_bbcode ) { ! $bbcode_uid = $block_config[$block_id]['Text']['parameter_opt']; $message = mx_decode($message, $bbcode_uid, $allow_smilies, $allow_bbcode); } Index: mx_textblock_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_bbcode.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_textblock_bbcode.php 26 Apr 2005 19:52:14 -0000 1.8 --- mx_textblock_bbcode.php 6 Sep 2005 18:51:57 -0000 1.9 *************** *** 43,47 **** if( $bbcode_on ) { ! $bbcode_uid = $block_config[$block_id][Text]['bbcode_uid']; $message = mx_decode($message, $bbcode_uid, $smilies_on, $bbcode_on); } --- 43,47 ---- if( $bbcode_on ) { ! $bbcode_uid = $block_config[$block_id]['Text']['parameter_opt']; $message = mx_decode($message, $bbcode_uid, $smilies_on, $bbcode_on); } |