Menu
▾
▴
[mxbb-commits] core/includes mx_functions_admincp.php, 1.52, 1.53 mx_functions_blockcp.php, 1.25, 1.26 mx_functions_core.php, 1.83, 1.84 mx_functions_phpbb.php, 1.54, 1.55 mx_functions_style.php, 1.61, 1.62
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17021/includes Modified Files: mx_functions_admincp.php mx_functions_blockcp.php mx_functions_core.php mx_functions_phpbb.php mx_functions_style.php Log Message: Virtual pages See notes is Dev area Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** mx_functions_blockcp.php 9 Feb 2008 19:44:11 -0000 1.25 --- mx_functions_blockcp.php 9 Mar 2008 23:38:00 -0000 1.26 *************** *** 67,70 **** --- 67,71 ---- $dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, ''); + $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, 0); if ( empty($id) && !$new_block) *************** *** 342,345 **** --- 343,347 ---- <input type="hidden" name="id" value="' . $block_id . '" /> <input type="hidden" name="dynamic_block" value="' . $dynamic_block_id . '" /> + <input type="hidden" name="virtual" value="' . $virtual_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.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** mx_functions_core.php 23 Feb 2008 19:36:11 -0000 1.83 --- mx_functions_core.php 9 Mar 2008 23:38:00 -0000 1.84 *************** *** 208,212 **** * @return unknown */ ! function _read_config( $id, $sub_id, $type, $cache ) { global $portal_config, $mx_root_path; --- 208,212 ---- * @return unknown */ ! function _read_config( $id, $sub_id = 0, $type, $force_query = false ) { global $portal_config, $mx_root_path; *************** *** 216,229 **** case MX_CACHE_BLOCK_TYPE: ! if ($portal_config['mx_use_cache'] == 1) { ! if ( $this->_exists( '_block_' . $id ) ) { ! $this->block_config = $this->get( '_block_' . $id ); } else { $this->_get_block_config( $id, $sub_id ); ! $this->put( '_block_' . $id, $this->block_config); } } --- 216,229 ---- case MX_CACHE_BLOCK_TYPE: ! if ($portal_config['mx_use_cache'] == 1 && !$force_query) { ! if ( $this->_exists( '_block_' . $id . '_' . $sub_id ) ) { ! $this->block_config = $this->get( '_block_' . $id . '_' . $sub_id ); } else { $this->_get_block_config( $id, $sub_id ); ! $this->put( '_block_' . $id . '_' . $sub_id, $this->block_config); } } *************** *** 237,241 **** case MX_CACHE_PAGE_TYPE: ! if ($portal_config['mx_use_cache'] == 1) { if ( $this->_exists( '_page_' . $id ) ) --- 237,241 ---- case MX_CACHE_PAGE_TYPE: ! if ($portal_config['mx_use_cache'] == 1 && !$force_query) { if ( $this->_exists( '_page_' . $id ) ) *************** *** 325,329 **** $db->sql_freeresult($result); ! $sql_block = !empty( $id ) ? " AND sys.block_id = " . $id : ''; // --- 325,330 ---- $db->sql_freeresult($result); ! $sql_block = !empty( $id ) ? ' AND sys.block_id = ' . $id : ''; ! $sql_sub = !empty( $sub_id ) ? ' AND sys.sub_id = ' . $sub_id : ' AND sys.sub_id = 0'; // *************** *** 346,349 **** --- 347,351 ---- $sql .= $sql_block; + $sql .= $sql_sub; $sql .= " ORDER BY sys.block_id, par.parameter_order"; *************** *** 449,453 **** col.column_order, col.column_size, ! blk.block_id FROM " . COLUMN_BLOCK_TABLE . " bct, " . BLOCK_TABLE . " blk, --- 451,456 ---- col.column_order, col.column_size, ! blk.block_id, ! fnc.function_file FROM " . COLUMN_BLOCK_TABLE . " bct, " . BLOCK_TABLE . " blk, *************** *** 506,510 **** $block_row = array( "block_id" => $row['block_id'], ! "column_id" => $row['column_id'] //"module_path" => $row['module_path'], //"function_file" => $row['function_file'], --- 509,513 ---- $block_row = array( "block_id" => $row['block_id'], ! "column_id" => $row['column_id'], //"module_path" => $row['module_path'], //"function_file" => $row['function_file'], *************** *** 526,529 **** --- 529,540 ---- // + // Is this a virtual page? + // + if ($row['function_file'] == 'mx_virtual.php') + { + $temp_row['virtual'] = true; + } + + // // Compose the pages config array // *************** *** 576,581 **** if ( is_array( $id ) ) { $id = $id['id']; - $sub_id = $id['sub_id']; } else --- 587,592 ---- if ( is_array( $id ) ) { + $sub_id = $id['sub_id']; $id = $id['id']; } else *************** *** 586,590 **** if ( $id > 0 ) { ! $this->_read_config( $id, $sub_id, $type, !$force_query ); return $type == MX_CACHE_BLOCK_TYPE ? $this->block_config : $this->pages_config; } --- 597,601 ---- if ( $id > 0 ) { ! $this->_read_config( $id, $sub_id, $type, $force_query ); return $type == MX_CACHE_BLOCK_TYPE ? $this->block_config : $this->pages_config; } *************** *** 604,608 **** * @param unknown_type $id */ ! function update( $type = MX_CACHE_ALL, $id = '' ) { global $mx_cache; --- 615,619 ---- * @param unknown_type $id */ ! function update( $type = MX_CACHE_ALL, $id = '', $sub_id = 0 ) { global $mx_cache; *************** *** 635,639 **** else if ( $type == MX_CACHE_BLOCK_TYPE && $id > 0 ) { ! $this->destroy('_block_' . $id); } // --- 646,650 ---- else if ( $type == MX_CACHE_BLOCK_TYPE && $id > 0 ) { ! $this->destroy('_block_' . $id . '_' . $sub_id); } // *************** *** 1283,1286 **** --- 1294,1306 ---- /**#@+ + * Virtual block variables + * + * @access public + */ + var $virtual_id = ''; + var $block_virtual_parameters = array(); + /**#@-*/ + + /**#@+ * Dynamic block variables * *************** *** 1375,1381 **** --- 1395,1403 ---- unset($this->block_info); unset($this->block_parameters); + unset($this->block_virtual_parameters); unset($this->block_contents); unset($this->block_id); + unset($this->virtual_id); unset($this->block_title); unset($this->block_desc); *************** *** 1400,1403 **** --- 1422,1426 ---- unset($this->is_dynamic); unset($this->is_sub); + unset($this->is_virtual); unset($this->init_error_msg); *************** *** 1419,1428 **** { $this->dynamic_block_id = $mx_request_vars->request('dynamic_block', MX_TYPE_INT, $this->block_parameters['default_block_id']['parameter_value']); - - if ( $this->dynamic_block_id == 0 || empty( $this->dynamic_block_id ) ) - { - $is_dynamic = false; - } - } --- 1442,1445 ---- *************** *** 1492,1495 **** --- 1509,1669 ---- /** + * Enter description here... + * + */ + function virtual_init($virtual_id = '', $create_virtual = false) + { + global $mx_cache, $userdata; + + if ( empty($virtual_id) ) + { + return false; + } + + $this->virtual_id = $virtual_id; + + // + // Check existance + // + $mx_cache->_read_config($this->block_id, $this->virtual_id, MX_CACHE_BLOCK_TYPE); // Try cache + $this->block_virtual_parameters = $mx_cache->block_config[$this->block_id]['block_parameters']; + + if (!is_array($this->block_virtual_parameters)) + { + $mx_cache->_read_config($this->block_id, $this->virtual_id, MX_CACHE_BLOCK_TYPE, true); // Query + $this->block_virtual_parameters = $mx_cache->block_config[$this->block_id]['block_parameters']; + } + + if (!is_array($this->block_virtual_parameters) && $create_virtual) + { + $this->virtual_create($this->virtual_id); + } + + return is_array($this->block_virtual_parameters); + } + + /** + * Enter description here... + * + */ + function virtual_create($virtual_id = '', $project_name = '') + { + global $db, $mx_cache; + + if (!$this->block_id) + { + return; + } + + if (!empty($virtual_id)) + { + if ($virtual_id > 0) + { + $sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "(block_id, parameter_id, parameter_value, sub_id) + SELECT " . $this->block_id . ", parameter_id, parameter_default, " . intval($virtual_id) . " + FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $this->function_id; + + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, "Couldn't insert block data information", "", __LINE__, __FILE__, $sql); + } + $db->sql_freeresult($result); + } + else if(!empty($project_name)) + { + $sql = "SELECT MAX(sub_id) AS max_id FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " WHERE block_id = '" . $this->block_id . "'"; + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, "Couldn't get max_id from block data", "", __LINE__, __FILE__, $sql); + } + $row = $db->sql_fetchrow($result); + $virtual_id = $row['max_id'] + 1; + + $sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . "(block_id, parameter_id, parameter_value, parameter_opt, sub_id) + SELECT " . $this->block_id . ", parameter_id, parameter_default, '".$project_name."', " . intval($virtual_id) . " + FROM " . PARAMETER_TABLE . " par " . " WHERE function_id = " . $this->function_id; + + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, "Couldn't insert block data information", "", __LINE__, __FILE__, $sql); + } + $db->sql_freeresult($result); + } + + + } + + $mx_cache->_read_config($this->block_id, $virtual_id, MX_CACHE_BLOCK_TYPE); + } + + /** + * Enter description here... + * + */ + function virtual_update($virtual_id = '', $project_name = '') + { + global $db, $mx_cache; + + if (!$this->block_id) + { + return; + } + + if (!empty($virtual_id) && !empty($project_name)) + { + $sql = "UPDATE " . BLOCK_SYSTEM_PARAMETER_TABLE . " + SET parameter_opt = '" . $project_name . "' + WHERE block_id = " . $this->block_id . " AND sub_id = ". intval($virtual_id); + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, "Couldn't update block data information", "", __LINE__, __FILE__, $sql); + } + $db->sql_freeresult($result); + } + + $mx_cache->update(MX_CACHE_BLOCK_TYPE, $this->block_id, $virtual_id); + } + + /** + * Enter description here... + * + */ + function virtual_delete($virtual_id = '') + { + global $db, $mx_cache, $userdata; + + if (!$this->block_id) + { + return; + } + + // + // Delete all subdata + // + if (!empty($virtual_id)) + { + $sql = "SELECT block_id FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " WHERE sub_id = " . intval($virtual_id); + + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, "Couldn't find block data information", "", __LINE__, __FILE__, $sql); + } + + while ($row = $db->sql_fetchrow($result)) + { + $sql_del = "DELETE FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " WHERE block_id = ".$row['block_id']." AND sub_id = " . intval($virtual_id); + + if( !($result_del = $db->sql_query($sql_del)) ) + { + mx_message_die(GENERAL_ERROR, "Couldn't delete block data information", "", __LINE__, __FILE__, $sql); + } + + $mx_cache->update(MX_CACHE_BLOCK_TYPE, $row['block_id'], intval($virtual_id)); + } + $db->sql_freeresult($result); + } + } + + /** * Hide block * @access public *************** *** 1660,1663 **** --- 1834,1838 ---- $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 . '" />'; + $s_hidden_fields .= '<input type="hidden" name="virtual" value="' . $this->virtual_id . '" />'; // *************** *** 1709,1712 **** --- 1884,1889 ---- function get_parameters($key = MX_GET_ALL_PARS, $mode = MX_GET_PAR_VALUE) { + global $mx_request_vars; + $block_config_temp = ''; *************** *** 1721,1725 **** } ! return $this->block_parameters[$key]['parameter_value']; } --- 1898,1902 ---- } ! return !empty($this->virtual_id) ? $this->block_virtual_parameters[$key]['parameter_value'] : $this->block_parameters[$key]['parameter_value']; } *************** *** 2038,2043 **** // Update block data // ! if ( $sub_id == $parameter_data['sub_id'] || true ) { // // If standard block --- 2215,2222 ---- // Update block data // ! if ( true ) { + $sub_id = $mx_request_vars->is_request('virtual') ? $mx_request_vars->request('virtual', MX_TYPE_INT, 0) : 0; + // // If standard block *************** *** 2090,2094 **** // 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']; --- 2269,2273 ---- // Update cache // ! $mx_cache->update(MX_CACHE_BLOCK_TYPE, $block_id, $sub_id); // Maybe ambitious, but why not ;) $message .= $lang['AdminCP_action'] . ": " . $lang['Block'] . ' ' . $lang['was_updated']; *************** *** 2701,2704 **** --- 2880,2884 ---- var $mxbb_copyright_addup = array(); var $mxbb_css_addup = array(); + var $is_virtual = false; var $total_column = ''; *************** *** 2913,2916 **** --- 3093,3098 ---- // $this->editcp_show = ( $userdata['user_level'] == ADMIN && isset($_COOKIE['editCP_switch']) ) ? $_COOKIE['editCP_switch'] == 1 : true; + + $this->is_virtual = $this->page_config[$this->page_id]['virtual']; } Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** mx_functions_style.php 9 Mar 2008 11:51:55 -0000 1.61 --- mx_functions_style.php 9 Mar 2008 23:38:00 -0000 1.62 *************** *** 153,158 **** function mx_Template($root = '.') { ! $this->root = $root; ! parent::Template($this->root); } --- 153,157 ---- function mx_Template($root = '.') { ! parent::Template($root); } *************** *** 312,350 **** $filename = $mx_root_path . 'templates/' . $mx_user->default_template_name . '/' . $filename2; } - // - // Look at Custom Root folder..............this is used my mx_mod installers too.......this does not use standard templates folders wich are set when the template was re-initialized and defined as custom var - // else if( file_exists( $this->root . '/' . $filename) ) { $filename = $this->root . '/' . $filename; } - if( file_exists($this->root . '/' . $style_path . '/' . $filename) ) - { - // - // First check current template - // - $filename = $this->root . '/' . $style_path . '/' . $filename; - } - else if( file_exists($this->root . '/' . $style_path . '/' . $filename2) ) - { - // - // tpl - html - // - $filename = $this->root. '/' . $style_path . '/' . $filename2; - } - else if( file_exists($this->root . '/' . $mx_user->default_template_name . '/' . $filename) ) - { - // - // Then check current template - // - $filename = $mx_root_path . '/' . $mx_user->default_template_name . '/' . $filename; - } - else if( file_exists($this->root . '/' . $moduleDefault . '/' . $filename) ) - { - // - // Finally check the Custom Root folde(for compatibility with some old modules) - // - $filename = $this->root . '/' . $moduleDefault . '/' . $filename; - } else { --- 311,318 ---- *************** *** 443,447 **** if( !file_exists($filename) ) { ! die("Template->make_filename(): Error - file $filename does not exist. <br />Class-Root: $this->root <br />Module: $module_root_path <br />Current style: $style_path <br />Cloned style: $mx_user->cloned_template_name <br />Default style: $mx_user->default_template_name <br />Custom module default style: $moduleDefault"); } } --- 411,415 ---- if( !file_exists($filename) ) { ! die("Template->make_filename(): Error - file $filename does not exist. <br />Module: $module_root_path <br />Current style: $style_path <br />Cloned style: $mx_user->cloned_template_name <br />Default style: $mx_user->default_template_name <br />Custom module default style: $moduleDefault"); } } *************** *** 487,491 **** define('MX_IMAGES' , 50); define('MX_IMAGES_NONE' , 60); - define('MX_LANG_CUSTOM' , 70); /**#@-*/ --- 455,458 ---- *************** *** 1200,1212 **** } ! //$img_lang = ( file_exists($phpbb_root_path . $this->current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english'; ! if (PORTAL_BACKEND == 'phpbb3') ! { ! $img_lang = ($this->lang['default_lang']) ? $this->lang['default_lang'] : (($board_config['phpbb_lang']) ? $board_config['phpbb_lang'] : 'en'); ! } ! else ! { ! $img_lang = ($this->lang['default_lang']) ? $this->get_old_lang($this->lang['default_lang']) : (($board_config['default_lang']) ? $board_config['default_lang'] : 'english'); ! } // --- 1167,1171 ---- } ! $img_lang = ( file_exists($phpbb_root_path . $this->current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english'; // *************** *** 1251,1270 **** $default_template_path = $module_root_path . $this->default_current_template_path; $template_name = $this->template_name; - - // - // If use default template with difrent modules config file name - // - if (!empty($this->module_cfg_name[$module_root_path])) - { - $module_cfg_info = "<br />Custom module config file: " . $this->module_cfg_name[$module_root_path]; - $default_cfg_file = $this->module_cfg_name[$module_root_path]; - - } - else - { - $module_cfg_info = "<br />Custom module config file: Not set"; - $default_cfg_file = false; - } - @include($mx_root_path . $module_root_path . $this->current_template_path . '/' . $this->template_name . '.cfg'); --- 1210,1213 ---- *************** *** 1277,1283 **** $current_template_path = $module_root_path . $this->cloned_current_template_path; $template_name = $this->cloned_template_name; - $default_cfg_file = ($default_cfg_file) ? $default_cfg_file : $this->cloned_template_name; ! @include($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $default_cfg_file . '.cfg'); } --- 1220,1225 ---- $current_template_path = $module_root_path . $this->cloned_current_template_path; $template_name = $this->cloned_template_name; ! @include($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $this->cloned_template_name . '.cfg'); } *************** *** 1289,1309 **** $current_template_path = $module_root_path . $this->default_current_template_path; $template_name = $this->default_template_name; - $default_cfg_file = ($default_cfg_file) ? $default_cfg_file : $this->default_template_name; ! @include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $default_cfg_file . '.cfg'); } - - // - // If use default module template intead - // - if ( !$mx_template_config ) - { - $current_template_path = $module_root_path . $this->default_module_style; - $template_name = $this->default_module_style; - $default_cfg_file = ($default_cfg_file) ? $default_cfg_file : $this->default_module_style; - @include($mx_root_path . $module_root_path . $this->default_module_style . '/' . $default_cfg_file . '.cfg'); - } - // // We have no template to use - die --- 1231,1238 ---- $current_template_path = $module_root_path . $this->default_current_template_path; $template_name = $this->default_template_name; ! @include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $this->default_template_name . '.cfg'); } // // We have no template to use - die *************** *** 1311,1315 **** if ( !$mx_template_config ) { ! mx_message_die(CRITICAL_ERROR, "Could not open " . $mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $this->cloned_template_name . '.cfg' . " style config file or file can not be validated. <br /> Current style: $this->template_name <br />Cloned style: $this->cloned_template_name <br />Default style: $this->default_template_name <br />Custom module default style: $this->default_module_style $module_cfg_info", '', __LINE__, __FILE__); } --- 1240,1244 ---- if ( !$mx_template_config ) { ! mx_message_die(CRITICAL_ERROR, "Could not open MX-Publisher " . $module_root_path . $this->default_current_template_path . " style config file", '', __LINE__, __FILE__); } *************** *** 1362,1382 **** if ($lang_mode == MX_LANG_MAIN || $lang_mode == MX_LANG_ALL) { - if (!empty($this->module_lang_path[$mx_block->module_root_path])) - { - $module_lang_path = $this->module_lang_path[$mx_block->module_root_path]; - } - else - { - $module_lang_path = $mx_root_path . $mx_block->module_root_path; - } - // ------------------------------------------------------------------------- // Read Module Main Language Definition // ------------------------------------------------------------------------- ! if ((@include $module_lang_path . "language/lang_" . $default_lang . "/lang_main.$phpEx") === false) { ! if ((@include $module_lang_path . "language/lang_english/lang_main.$phpEx") === false) { ! mx_message_die(CRITICAL_ERROR, 'Module main language file ' . $mx_root_path . $module_lang_path . "language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.'); } } --- 1291,1302 ---- if ($lang_mode == MX_LANG_MAIN || $lang_mode == MX_LANG_ALL) { // ------------------------------------------------------------------------- // Read Module Main Language Definition // ------------------------------------------------------------------------- ! if ((@include $mx_root_path . $mx_block->module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx") === false) { ! if ((@include $mx_root_path . $mx_block->module_root_path . "language/lang_english/lang_main.$phpEx") === false) { ! mx_message_die(CRITICAL_ERROR, 'Module main language file ' . $mx_root_path . $mx_block->module_root_path . "language/lang_" . $default_lang . "/lang_main.$phpEx" . ' couldn\'t be opened.'); } } *************** *** 1388,1396 **** // Read Module Admin Language Definition // ------------------------------------------------------------------------- ! if ((@include $module_lang_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx") === false) { ! if ((@include $module_lang_path . "language/lang_english/lang_admin.$phpEx") === false) { ! mx_message_die(CRITICAL_ERROR, 'Modiule admin language file ' . $mx_root_path . $module_lang_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx" . ' couldn\'t be opened.'); } } --- 1308,1316 ---- // Read Module Admin Language Definition // ------------------------------------------------------------------------- ! if ((@include $mx_root_path . $mx_block->module_root_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx") === false) { ! if ((@include $mx_root_path . $mx_block->module_root_path . "language/lang_english/lang_admin.$phpEx") === false) { ! mx_message_die(CRITICAL_ERROR, 'Modiule admin language file ' . $mx_root_path . $mx_block->module_root_path . "language/lang_" . $default_lang . "/lang_admin.$phpEx" . ' couldn\'t be opened.'); } } *************** *** 1727,1744 **** $this->loaded_default_styles[$mx_block->module_root_path] = $default_module_style; } - - function set_module_cfg_name($module_cfg_name = '') - { - global $mx_block; - - $this->module_cfg_name[$mx_block->module_root_path] = $module_cfg_name; - } - - function set_module_lang_path($module_lang_path = '') - { - global $mx_block; - - $this->module_lang_path[$mx_block->module_root_path] = $module_lang_path; - } } // class mx_user ?> \ No newline at end of file --- 1647,1650 ---- Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** mx_functions_phpbb.php 7 Mar 2008 11:08:37 -0000 1.54 --- mx_functions_phpbb.php 9 Mar 2008 23:38:00 -0000 1.55 *************** *** 29,32 **** --- 29,33 ---- case 'internal': case 'phpbb2': + include_once($phpbb_root_path . 'includes/functions.' . $phpEx); // In case we need old functions... include_once($mx_root_path . 'includes/sessions/phpbb2/auth.' . $phpEx); break; *************** *** 591,603 **** if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass')) ! { ! mx_page::load_file('bbcode'); } ! if (PORTAL_BACKEND == 'phpbb3') ! { /* if (!class_exists('bbcode')) ! { mx_page::load_file('bbcode'); } --- 592,604 ---- if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass')) ! { ! mx_page::load_file('bbcode'); } ! if (PORTAL_BACKEND == 'phpbb3') ! { /* if (!class_exists('bbcode')) ! { mx_page::load_file('bbcode'); } Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** mx_functions_admincp.php 1 Mar 2008 21:21:10 -0000 1.52 --- mx_functions_admincp.php 9 Mar 2008 23:38:00 -0000 1.53 *************** *** 2158,2162 **** // ! // delete old/removed block parameters when user change the fonction_id of a block or delete function parameters // $sql = "SELECT * FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " WHERE block_id = " . $block_id; --- 2158,2162 ---- // ! // delete old/removed block parameters when user change the function_id of a block or delete function parameters // $sql = "SELECT * FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " WHERE block_id = " . $block_id; *************** *** 2192,2196 **** // ! // insert/update new block parameters when user change the fonction_id of a block or add/edit function parameters // $sql = "SELECT * FROM " . PARAMETER_TABLE . " WHERE function_id = " . $function_id; --- 2192,2196 ---- // ! // insert/update new block parameters when user change the function_id of a block or add/edit function parameters // $sql = "SELECT * FROM " . PARAMETER_TABLE . " WHERE function_id = " . $function_id; |