Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: OryNider <ory...@us...> - 2008-03-10 05:49:18
|
Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes/shared/phpbb2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17901/phpbb2 Log Message: Directory /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes/shared/phpbb2 added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:49:08
|
Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes/shared In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17579/shared Log Message: Directory /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes/shared added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:48:54
|
Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod/styles In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17469/styles Log Message: Directory /cvsroot/mxbb/mx_mod_core/root/mx_mod/styles added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:48:54
|
Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod/language In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17469/language Log Message: Directory /cvsroot/mxbb/mx_mod_core/root/mx_mod/language added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:48:54
|
Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17469/includes Log Message: Directory /cvsroot/mxbb/mx_mod_core/root/mx_mod/includes added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:48:50
|
Update of /cvsroot/mxbb/mx_mod_core/root/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17433/admin Log Message: Directory /cvsroot/mxbb/mx_mod_core/root/admin added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:48:50
|
Update of /cvsroot/mxbb/mx_mod_core/root/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17433/templates Log Message: Directory /cvsroot/mxbb/mx_mod_core/root/templates added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:48:50
|
Update of /cvsroot/mxbb/mx_mod_core/root/mx_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17433/mx_mod Log Message: Directory /cvsroot/mxbb/mx_mod_core/root/mx_mod added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:48:28
|
Update of /cvsroot/mxbb/mx_mod_core/root In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17413/root Log Message: Directory /cvsroot/mxbb/mx_mod_core/root added to the repository |
|
From: OryNider <ory...@us...> - 2008-03-10 05:18:34
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4442 Modified Files: common.php Log Message: revent last change Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** common.php 5 Mar 2008 20:51:57 -0000 1.88 --- common.php 10 Mar 2008 05:18:30 -0000 1.89 *************** *** 348,352 **** // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(true); } $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/'; --- 348,352 ---- // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(); } $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/'; |
|
From: OryNider <ory...@us...> - 2008-03-10 05:17:31
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3953 Modified Files: Tag: core28x common.php Log Message: revent last Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.67.2.9 retrieving revision 1.67.2.10 diff -C2 -d -r1.67.2.9 -r1.67.2.10 *** common.php 23 Feb 2008 19:38:24 -0000 1.67.2.9 --- common.php 10 Mar 2008 05:17:23 -0000 1.67.2.10 *************** *** 392,396 **** // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the mxBB cache whenever updating phpBB config settings // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(false); } --- 392,396 ---- // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the mxBB cache whenever updating phpBB config settings // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(); } |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:49:51
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24767 Modified Files: mx_functions_style.php Log Message: oops. i accidently removed all your updates, i was trying to understand what you had done, and swtiched files... Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** mx_functions_style.php 9 Mar 2008 23:38:00 -0000 1.62 --- mx_functions_style.php 9 Mar 2008 23:49:46 -0000 1.63 *************** *** 153,157 **** function mx_Template($root = '.') { ! parent::Template($root); } --- 153,158 ---- function mx_Template($root = '.') { ! $this->root = $root; ! parent::Template($this->root); } *************** *** 311,318 **** --- 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 { *************** *** 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"); } } --- 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"); } } *************** *** 455,458 **** --- 487,491 ---- define('MX_IMAGES' , 50); define('MX_IMAGES_NONE' , 60); + define('MX_LANG_CUSTOM' , 70); /**#@-*/ *************** *** 1167,1171 **** } ! $img_lang = ( file_exists($phpbb_root_path . $this->current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english'; // --- 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'); ! } // *************** *** 1210,1213 **** --- 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'); *************** *** 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'); } --- 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'); } *************** *** 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 --- 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 *************** *** 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__); } --- 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__); } *************** *** 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.'); } } --- 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.'); } } *************** *** 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.'); } } --- 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.'); } } *************** *** 1647,1650 **** --- 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 |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:41:08
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19058 Modified Files: mx_module_defs.php Log Message: Virtual pages See notes is Dev area Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** mx_module_defs.php 9 Feb 2008 12:50:41 -0000 1.28 --- mx_module_defs.php 9 Mar 2008 23:41:01 -0000 1.29 *************** *** 114,117 **** --- 114,135 ---- { global $template, $mx_blockcp, $mx_root_path, $theme, $lang; + global $mx_page, $mx_request_vars, $mx_blockcp; + + // + // Virtual Hack + // + if ($mx_page->is_virtual && $mx_request_vars->request('virtual')) + { + $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, 0); + if (!$mx_blockcp->virtual_init($virtual_id, true)) + { + $mx_blockcp->virtual_create($virtual_id); + } + $mx_blockcp->virtual_id = $virtual_id; + foreach($mx_blockcp->block_virtual_parameters as $parameter_name => $data) + { + $parameter_data = $data; + } + } switch ( $parameter_data['parameter_type'] ) |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:40:39
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18939 Modified Files: mx_module_parameters.tpl Log Message: Virtual pages See notes is Dev area Index: mx_module_parameters.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/subSilver/admin/mx_module_parameters.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_module_parameters.tpl 8 Feb 2008 07:00:11 -0000 1.9 --- mx_module_parameters.tpl 9 Mar 2008 23:40:28 -0000 1.10 *************** *** 470,474 **** <tr> <td class="row1">{catrow.menurow.L_MENU_DESC}</td> ! <td class="row2"><textarea rows="5" cols="45" wrap="virtual" name="message" class="post">{catrow.menurow.E_MENU_DESC}</textarea></td> </tr> <tr> --- 470,474 ---- <tr> <td class="row1">{catrow.menurow.L_MENU_DESC}</td> ! <td class="row2"><textarea rows="2" cols="45" wrap="virtual" name="message" class="post">{catrow.menurow.E_MENU_DESC}</textarea></td> </tr> <tr> *************** *** 484,495 **** </tr> <tr> - <td class="row1">{catrow.menurow.L_MENU_LINKS}</td> - <td class="row2"><input type="text" size="65" name="menulinks" value="{catrow.menurow.E_MENU_LINKS}" class="post" /></td> - </tr> - <tr> <td class="row1">{catrow.menurow.L_MENU_BLOCK}</td> <td class="row2"><select name="block_nav" ><option value="0">0</option></select></td> </tr> <tr> <td class="row1" colspan="2">{catrow.menurow.L_MENU_ACTION_ADV}</td> </tr> --- 484,495 ---- </tr> <tr> <td class="row1">{catrow.menurow.L_MENU_BLOCK}</td> <td class="row2"><select name="block_nav" ><option value="0">0</option></select></td> </tr> <tr> + <td class="row1">{catrow.menurow.L_MENU_LINKS}</td> + <td class="row2"><input type="text" size="65" name="menulinks" value="{catrow.menurow.E_MENU_LINKS}" class="post" /></td> + </tr> + <tr> <td class="row1" colspan="2">{catrow.menurow.L_MENU_ACTION_ADV}</td> </tr> *************** *** 502,526 **** </tr> <tr> ! <td class="row1">{catrow.menurow.L_AUTH_TITLE}</td> ! <td class="row2"> ! <table cellspacing="1" cellpadding="4" border="0" class="portalline"> ! <tr> ! <!-- BEGIN module_auth_titles --> ! <th class="thTop">{catrow.menurow.module_auth_titles.CELL_TITLE}</th> ! <!-- END module_auth_titles --> ! </tr> ! <!-- BEGIN module_auth_data --> ! <tr> ! <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_LEVELS_SELECT}</td> ! </tr> ! <tr> ! <th class="thTop">{catrow.menurow.module_auth_data.L_AUTH_GROUP_LEVELS_SELECT}</th> ! </tr> ! <tr> ! <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_GROUP_LEVELS_SELECT}</td> ! </tr> ! <!-- END module_auth_data --> ! </table> ! </td> </tr> <tr> --- 502,524 ---- </tr> <tr> ! <td class="row1">{catrow.menurow.L_AUTH_TITLE}</td> ! <td class="row2"> ! <table cellspacing="1" cellpadding="4" border="0" class="portalline"> ! <tr> ! <!-- BEGIN module_auth_titles --> ! <th class="thTop">{catrow.menurow.module_auth_titles.CELL_TITLE}</th> ! <!-- END module_auth_titles --> ! <!-- BEGIN module_auth_data --> ! <th class="thTop">{catrow.menurow.module_auth_data.L_AUTH_GROUP_LEVELS_SELECT}</th> ! <!-- END module_auth_data --> ! </tr> ! <!-- BEGIN module_auth_data --> ! <tr> ! <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_LEVELS_SELECT}</td> ! <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_GROUP_LEVELS_SELECT}</td> ! </tr> ! <!-- END module_auth_data --> ! </table> ! </td> </tr> <tr> |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:40:19
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18805 Modified Files: mx_module_parameters.tpl Log Message: Virtual pages See notes is Dev area Index: mx_module_parameters.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/admin/mx_module_parameters.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_module_parameters.tpl 9 Sep 2007 16:52:51 -0000 1.1 --- mx_module_parameters.tpl 9 Mar 2008 23:40:12 -0000 1.2 *************** *** 470,474 **** <tr> <td class="row1">{catrow.menurow.L_MENU_DESC}</td> ! <td class="row2"><textarea rows="5" cols="45" wrap="virtual" name="message" class="post">{catrow.menurow.E_MENU_DESC}</textarea></td> </tr> <tr> --- 470,474 ---- <tr> <td class="row1">{catrow.menurow.L_MENU_DESC}</td> ! <td class="row2"><textarea rows="2" cols="45" wrap="virtual" name="message" class="post">{catrow.menurow.E_MENU_DESC}</textarea></td> </tr> <tr> *************** *** 484,495 **** </tr> <tr> - <td class="row1">{catrow.menurow.L_MENU_LINKS}</td> - <td class="row2"><input type="text" size="65" name="menulinks" value="{catrow.menurow.E_MENU_LINKS}" class="post" /></td> - </tr> - <tr> <td class="row1">{catrow.menurow.L_MENU_BLOCK}</td> <td class="row2"><select name="block_nav" ><option value="0">0</option></select></td> </tr> <tr> <td class="row1" colspan="2">{catrow.menurow.L_MENU_ACTION_ADV}</td> </tr> --- 484,495 ---- </tr> <tr> <td class="row1">{catrow.menurow.L_MENU_BLOCK}</td> <td class="row2"><select name="block_nav" ><option value="0">0</option></select></td> </tr> <tr> + <td class="row1">{catrow.menurow.L_MENU_LINKS}</td> + <td class="row2"><input type="text" size="65" name="menulinks" value="{catrow.menurow.E_MENU_LINKS}" class="post" /></td> + </tr> + <tr> <td class="row1" colspan="2">{catrow.menurow.L_MENU_ACTION_ADV}</td> </tr> *************** *** 502,526 **** </tr> <tr> ! <td class="row1">{catrow.menurow.L_AUTH_TITLE}</td> ! <td class="row2"> ! <table cellspacing="1" cellpadding="4" border="0" class="portalline"> ! <tr> ! <!-- BEGIN module_auth_titles --> ! <th class="thTop">{catrow.menurow.module_auth_titles.CELL_TITLE}</th> ! <!-- END module_auth_titles --> ! </tr> ! <!-- BEGIN module_auth_data --> ! <tr> ! <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_LEVELS_SELECT}</td> ! </tr> ! <tr> ! <th class="thTop">{catrow.menurow.module_auth_data.L_AUTH_GROUP_LEVELS_SELECT}</th> ! </tr> ! <tr> ! <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_GROUP_LEVELS_SELECT}</td> ! </tr> ! <!-- END module_auth_data --> ! </table> ! </td> </tr> <tr> --- 502,524 ---- </tr> <tr> ! <td class="row1">{catrow.menurow.L_AUTH_TITLE}</td> ! <td class="row2"> ! <table cellspacing="1" cellpadding="4" border="0" class="portalline"> ! <tr> ! <!-- BEGIN module_auth_titles --> ! <th class="thTop">{catrow.menurow.module_auth_titles.CELL_TITLE}</th> ! <!-- END module_auth_titles --> ! <!-- BEGIN module_auth_data --> ! <th class="thTop">{catrow.menurow.module_auth_data.L_AUTH_GROUP_LEVELS_SELECT}</th> ! <!-- END module_auth_data --> ! </tr> ! <!-- BEGIN module_auth_data --> ! <tr> ! <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_LEVELS_SELECT}</td> ! <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_GROUP_LEVELS_SELECT}</td> ! </tr> ! <!-- END module_auth_data --> ! </table> ! </td> </tr> <tr> *************** *** 563,568 **** </td> </tr> - - <!-- END catrow --> </table> --- 561,564 ---- *************** *** 593,596 **** <!-- END catrow --> // --> ! </script> ! --- 589,591 ---- <!-- END catrow --> // --> ! </script> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:40:01
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18378/lang_english Modified Files: lang_admin.php Log Message: Virtual pages See notes is Dev area Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_english/lang_admin.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** lang_admin.php 5 Feb 2008 18:37:20 -0000 1.10 --- lang_admin.php 9 Mar 2008 23:39:47 -0000 1.11 *************** *** 34,45 **** $lang['Menu_desc'] = 'Description'; $lang['Click_return_admin_index'] = 'Click %sHere%s to return to the Administration Index'; ! $lang['Menu_links'] = 'Menu URL<br />- Link to external page (enter full URL) or internal page (enter relative path)<br />- This option may be used together with \'Link Target: - iframe mode\'.'; ! $lang['Menu_page'] = 'Menu Page (default/standard) <br />- link to internal portal page<br />NOTE: Pages are created using Page Administration.'; ! $lang['Menu_block'] = 'Dynamic Block<br />- need a dynamic block on the Page to handle the setting'; $lang['Menu_function'] = 'Menu Function (dev only)<br />- link to MX-Publisher specific function (not available)'; $lang['Menu_action_title'] = '<b>Menu Action:</b> <br /><i>(Chose one of the 4 options below.)</i> '; $lang['Menu_action_adv'] = '<b>Advanced Menu Actions:</b> <br /><i>(Use carefully - intended for developers only):</i>'; $lang['Menu_permissions_title'] = '<b>View/Edit Permissions:</b>'; ! $lang['Link_target'] = 'Link Target:<br />- \'default\', open in this browser<br />- \'new browser\', open in new browser<br />- \'iframe mode\', open url (given below) in page with IncludeX block.'; $lang['Menu_display_mode'] = 'Navigation Mode:<br /> - span horizontal or vertical'; $lang['Menu_page_sync'] = 'Highlight selected page in navigation menu<br /> - current menu option is highlighted and its icon will be switched (if you have a *_hot.gif)'; --- 34,45 ---- $lang['Menu_desc'] = 'Description'; $lang['Click_return_admin_index'] = 'Click %sHere%s to return to the Administration Index'; ! $lang['Menu_links'] = 'Alternative URL<br />- Link to external page (full URL) or internal page (relative path)<br />- compatible with \'Link Target: - iframe mode\''; ! $lang['Menu_page'] = 'Menu Page<br />- link to internal portal page<br />NOTE: Pages are created using Page Administration'; ! $lang['Menu_block'] = 'Sub Page<br />- sends dynamic block to the page. Note: the page must be set for subpages'; $lang['Menu_function'] = 'Menu Function (dev only)<br />- link to MX-Publisher specific function (not available)'; $lang['Menu_action_title'] = '<b>Menu Action:</b> <br /><i>(Chose one of the 4 options below.)</i> '; $lang['Menu_action_adv'] = '<b>Advanced Menu Actions:</b> <br /><i>(Use carefully - intended for developers only):</i>'; $lang['Menu_permissions_title'] = '<b>View/Edit Permissions:</b>'; ! $lang['Link_target'] = 'Target:'; $lang['Menu_display_mode'] = 'Navigation Mode:<br /> - span horizontal or vertical'; $lang['Menu_page_sync'] = 'Highlight selected page in navigation menu<br /> - current menu option is highlighted and its icon will be switched (if you have a *_hot.gif)'; |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:40:00
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18378/lang_swedish Modified Files: lang_admin.php Log Message: Virtual pages See notes is Dev area Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_swedish/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_admin.php 13 Feb 2008 21:15:48 -0000 1.1 --- lang_admin.php 9 Mar 2008 23:39:47 -0000 1.2 *************** *** 33,44 **** $lang['Menu_desc'] = 'Beskrivning'; $lang['Click_return_admin_index'] = 'Klicka %shär%s för att återvända till Indexadministrationen'; ! $lang['Menu_links'] = 'URL <br /> - länk till extern sida (ange full url) eller intern sida (ange relativ url)<br /> - detta alternativ kan användas tillsammans med \'target - iframe\''; ! $lang['Menu_page'] = 'Portalsida <br /> - länk till intern portalsida'; ! $lang['Menu_block'] = 'Dynamiskt block <br /> - kräver att portalsidan har ett dynamiskt block'; $lang['Menu_function'] = 'Menyfunktion <br /> - länk till funktion (inaktiverad)'; ! $lang['Menu_action_title'] = '<b>Menyval:</b> <br /><i>(Välj ett eller flera av alternativen nedan. De hanteras i tur och ordning)</i> '; ! $lang['Menu_action_adv'] = '<b>Avancerade åtgärder:</b> <br /><i>(använd försiktigt):</i>'; $lang['Menu_permissions_title'] = '<b>VISA/REDIGERA RÄTTIGHETER:</b>'; ! $lang['Link_target'] = 'Mål (target):<br /> - \'default\', öppna i samma fönster<br /> - \'new browser\', öppna i nytt fönster<br /> - \'iframe mode\', öppna url (angiven nedan) på en sida som har ett InlcudeX block.'; $lang['Menu_display_mode'] = 'Navigationsläge:<br /> - du kan låta menyn flyta horisontellt eller vertikalt'; $lang['Menu_page_sync'] = 'Markera aktuell portalsida i navigeringen<br /> - menylänken förstärks och menyikonen ändras (om du har en *_hot.gif bild)'; --- 33,44 ---- $lang['Menu_desc'] = 'Beskrivning'; $lang['Click_return_admin_index'] = 'Klicka %shär%s för att återvända till Indexadministrationen'; ! $lang['Menu_links'] = 'Alternativ länk<br />- länk till extern sida (ange full url) eller intern sida (relativ url)<br />- kompatibelt med \'target - iframe\''; ! $lang['Menu_page'] = 'Portalsida <br />- länk till intern portalsida'; ! $lang['Menu_block'] = 'Undersida<br />- skicka dynamiskt block till sidan. Notera att sidan måste hantera undersidor'; $lang['Menu_function'] = 'Menyfunktion <br /> - länk till funktion (inaktiverad)'; ! $lang['Menu_action_title'] = '<b>Menyval:</b><br /><i>(Välj ett eller flera av alternativen nedan. De hanteras i tur och ordning)</i>'; ! $lang['Menu_action_adv'] = '<b>Avancerade åtgärder:</b><br /><i>(Använd försiktigt):</i>'; $lang['Menu_permissions_title'] = '<b>VISA/REDIGERA RÄTTIGHETER:</b>'; ! $lang['Link_target'] = 'Mål (target):'; $lang['Menu_display_mode'] = 'Navigationsläge:<br /> - du kan låta menyn flyta horisontellt eller vertikalt'; $lang['Menu_page_sync'] = 'Markera aktuell portalsida i navigeringen<br /> - menylänken förstärks och menyikonen ändras (om du har en *_hot.gif bild)'; |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:39:35
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18330 Modified Files: navmenu_functions.php Log Message: Virtual pages See notes is Dev area Index: navmenu_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** navmenu_functions.php 9 Feb 2008 19:46:55 -0000 1.12 --- navmenu_functions.php 9 Mar 2008 23:39:30 -0000 1.13 *************** *** 413,417 **** function output_menu($page_data, $current_parent_page) { ! global $mx_page, $template, $phpEx, $images, $block_id, $mx_root_path; $row_color_over = $theme['tr_color2']; --- 413,417 ---- function output_menu($page_data, $current_parent_page) { ! global $mx_page, $template, $phpEx, $images, $block_id, $mx_root_path, $virtual_id; $row_color_over = $theme['tr_color2']; *************** *** 456,460 **** // Generate Links // ! $menu_link = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_data['page_id']); $link_target = ( true ) ? '' : '_blank'; --- 456,460 ---- // Generate Links // ! $menu_link = mx_append_sid(PORTAL_URL . 'index.php?page=' . $page_data['page_id'] . !empty($virtual_id) ? '&virtual=' . $virtual_id : '') ; $link_target = ( true ) ? '' : '_blank'; |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:39:18
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18258/mx_textblocks Modified Files: mx_textblock_bbcode.php mx_textblock_html.php mx_textblock_multi.php Log Message: Virtual pages See notes is Dev area Index: mx_textblock_html.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_html.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mx_textblock_html.php 4 Feb 2008 16:55:12 -0000 1.17 --- mx_textblock_html.php 9 Mar 2008 23:39:14 -0000 1.18 *************** *** 16,19 **** --- 16,35 ---- // + // Virtual Blog Mode + // + if ($mx_page->is_virtual) + { + if ($mx_request_vars->is_request('virtual')) + { + $mx_block->virtual_init($mx_request_vars->get('virtual', MX_TYPE_INT, 0), true); + } + else + { + //$mx_block->show_title = false; + //$mx_block->show_block = false; + } + } + + // // Read Block Settings // Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_textblock_multi.php 9 Feb 2008 12:50:41 -0000 1.23 --- mx_textblock_multi.php 9 Mar 2008 23:39:14 -0000 1.24 *************** *** 16,19 **** --- 16,35 ---- // + // Virtual Blog Mode + // + if ($mx_page->is_virtual) + { + if ($mx_request_vars->is_request('virtual')) + { + $mx_block->virtual_init($mx_request_vars->get('virtual', MX_TYPE_INT, 0), true); + } + else + { + //$mx_block->show_title = false; + //$mx_block->show_block = false; + } + } + + // // Read Block Settings // Index: mx_textblock_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_bbcode.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mx_textblock_bbcode.php 4 Feb 2008 16:55:12 -0000 1.17 --- mx_textblock_bbcode.php 9 Mar 2008 23:39:14 -0000 1.18 *************** *** 16,19 **** --- 16,35 ---- // + // Virtual Blog Mode + // + if ($mx_page->is_virtual) + { + if ($mx_request_vars->is_request('virtual')) + { + $mx_block->virtual_init($mx_request_vars->get('virtual', MX_TYPE_INT, 0), true); + } + else + { + //$mx_block->show_title = false; + //$mx_block->show_block = false; + } + } + + // // Read Block Settings // |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:39:18
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18258/mx_coreblocks Modified Files: mx_blockcp.php Log Message: Virtual pages See notes is Dev area Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_blockcp.php 23 Feb 2008 19:33:14 -0000 1.23 --- mx_blockcp.php 9 Mar 2008 23:39:13 -0000 1.24 *************** *** 90,94 **** $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); $action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, ''); - $blog_mode = $mx_request_vars->request('blog_mode', MX_TYPE_NO_TAGS, ''); $sid = $mx_request_vars->request('sid', MX_TYPE_NO_TAGS, ''); --- 90,93 ---- *************** *** 98,103 **** $block_id = $mx_request_vars->is_request('block_id') ? $mx_request_vars->request('block_id', MX_TYPE_INT, '') : $mx_request_vars->request('id', MX_TYPE_INT, ''); $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, ''); $sub_id = $mx_request_vars->request('sub_id', MX_TYPE_INT, 0); - $blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']); $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; --- 97,102 ---- $block_id = $mx_request_vars->is_request('block_id') ? $mx_request_vars->request('block_id', MX_TYPE_INT, '') : $mx_request_vars->request('id', MX_TYPE_INT, ''); $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, ''); + $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); $sub_id = $mx_request_vars->request('sub_id', MX_TYPE_INT, 0); $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0; *************** *** 204,208 **** $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="' . mx_append_sid( PORTAL_URL ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&module_id=$module_id&function_id=$function_id&portalpage=$portalpage$has_dyn_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 203,207 ---- $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="' . mx_append_sid( PORTAL_URL ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&module_id=$module_id&function_id=$function_id&portalpage=$portalpage$has_dyn_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage&virtual=$virtual_id$has_dyn_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 211,214 **** --- 210,214 ---- $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $block_id . '" />'; + $s_hidden_fields .= '<input type="hidden" name="virtual" value="' . $virtual_id . '" />'; $s_hidden_fields .= '<input type="hidden" name="portalpage" value="' . $portalpage . '" />'; $s_hidden_fields .= '<input type="hidden" name="sub_id" value="' . $sub_id . '" />'; |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:39:17
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18258/mx_navmenu Modified Files: mx_menu_nav.php mx_site_nav.php Log Message: Virtual pages See notes is Dev area Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** mx_menu_nav.php 11 Feb 2008 22:50:14 -0000 1.31 --- mx_menu_nav.php 9 Mar 2008 23:39:14 -0000 1.32 *************** *** 61,64 **** --- 61,65 ---- // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); + $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation'))) *************** *** 322,325 **** --- 323,331 ---- } + // + // Virtual + // + $menu_link = !empty($virtual_id) ? $menu_link . '&virtual=' . $virtual_id : $menu_link; + $link_target = ( $menuData['link_target'] == 0 || $menuData['link_target'] == 2 ) ? '' : '_blank'; $row_color_over = $theme['tr_color2']; Index: mx_site_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_site_nav.php 6 Feb 2008 23:44:03 -0000 1.6 --- mx_site_nav.php 9 Mar 2008 23:39:14 -0000 1.7 *************** *** 61,64 **** --- 61,65 ---- // $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); + $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, ''); if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation'))) *************** *** 103,107 **** 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! //phpBB 'U_SEARCH' => mx_append_sid(PHPBB_URL .'search.'.$phpEx), --- 104,108 ---- 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! //phpBB 'U_SEARCH' => mx_append_sid(PHPBB_URL .'search.'.$phpEx), *************** *** 109,113 **** 'U_SEARCH_SELF' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'), 'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'), ! // // css --- 110,114 ---- 'U_SEARCH_SELF' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'), 'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'), ! // // css |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:38:55
|
Update of /cvsroot/mxbb/core/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17861/lang_swedish Modified Files: lang_main.php Log Message: Virtual pages See notes is Dev area Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_swedish/lang_main.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_main.php 16 Feb 2008 21:42:22 -0000 1.2 --- lang_main.php 9 Mar 2008 23:38:50 -0000 1.3 *************** *** 74,77 **** --- 74,94 ---- // + // Core Blocks - Virtual + // + $lang['Virtual_Create_new'] = 'Skapa ny '; + $lang['Virtual_Create_new_user'] = 'användarsida'; + $lang['Virtual_Create_new_group'] = 'gruppsida'; + $lang['Virtual_Create_new_project'] = 'Projektsida'; + $lang['Virtual_Create'] = 'Skapa nu'; + $lang['Virtual_Edit'] = 'Ändra sidnamnet'; + $lang['Virtual_Delete'] = 'Ta bort sidan'; + + $lang['Virtual_Welcome'] = 'Välkommen '; + $lang['Virtual_Info'] = 'Här kan du hantera din webbsida.'; + $lang['Virtual_CP'] = 'Sidkontrollpanel'; + $lang['Virtual_Go'] = 'Gå'; + $lang['Virtual_Select'] = 'Välj:'; + + // // Core Blocks - Site Log (and many last 'item' blocks) // |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:38:53
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17861/lang_english Modified Files: lang_main.php Log Message: Virtual pages See notes is Dev area Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_main.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** lang_main.php 5 Feb 2008 14:51:27 -0000 1.39 --- lang_main.php 9 Mar 2008 23:38:50 -0000 1.40 *************** *** 69,72 **** --- 69,89 ---- // + // Core Blocks - Virtual + // + $lang['Virtual_Create_new'] = 'Create new '; + $lang['Virtual_Create_new_user'] = 'User Page'; + $lang['Virtual_Create_new_group'] = 'Group Page'; + $lang['Virtual_Create_new_project'] = 'Project Page'; + $lang['Virtual_Create'] = 'Create now'; + $lang['Virtual_Edit'] = 'Update page name'; + $lang['Virtual_Delete'] = 'Delete this page'; + + $lang['Virtual_Welcome'] = 'Welcome '; + $lang['Virtual_Info'] = 'Here you can control your private web page.'; + $lang['Virtual_CP'] = 'Page Control Panel'; + $lang['Virtual_Go'] = 'Go'; + $lang['Virtual_Select'] = 'Select:'; + + // // Core Blocks - Site Log (and many last 'item' blocks) // |
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; |
|
From: Jon O. <jon...@us...> - 2008-03-09 23:38:07
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17021 Modified Files: index.php Log Message: Virtual pages See notes is Dev area Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** index.php 11 Feb 2008 11:13:17 -0000 1.74 --- index.php 9 Mar 2008 23:38:00 -0000 1.75 *************** *** 139,143 **** // Instatiate the dynamic block // ! $mx_block->init( $mx_dynamic_block->dynamic_block_id ); } --- 139,150 ---- // Instatiate the dynamic block // ! if ($mx_dynamic_block->dynamic_block_id > 0) ! { ! $mx_block->init( $mx_dynamic_block->dynamic_block_id ); ! } ! else ! { ! $mx_block->init_error_msg = 'This dynamic block has not been configured with a default block.'; ! } } |
2 messages has been excluded from this view by a project administrator.