Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Jon O. <jon...@us...> - 2005-09-20 15:31:07
|
Update of /cvsroot/mxbb/core/modules/mx_rebuild_search_tables In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15865/modules/mx_rebuild_search_tables Modified Files: Reguild Search Tables.pak Log Message: adding fixes for mxBB 2.8 RC 6 Index: Reguild Search Tables.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/Reguild Search Tables.pak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Reguild Search Tables.pak 20 Aug 2005 18:27:33 -0000 1.1 --- Reguild Search Tables.pak 20 Sep 2005 15:30:59 -0000 1.2 *************** *** 1,2 **** ! module=+:351=+:Reguild Search Tables=+:modules/mx_rebuild_search_tables/=+:=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,2 ---- ! module=+:54=+:Reguild Search Tables=+:modules/mx_rebuild_search_tables/=+:=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: Jon O. <jon...@us...> - 2005-09-15 17:59:39
|
Update of /cvsroot/mxbb/mx_forum/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2687/modules/mx_forum/language/lang_english Modified Files: lang_phpbb.php Log Message: Making the phpBB integration module ready for mxBB 2.8 Index: lang_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/language/lang_english/lang_phpbb.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_phpbb.php 6 Mar 2005 01:12:18 -0000 1.3 --- lang_phpbb.php 15 Sep 2005 17:59:19 -0000 1.4 *************** *** 42,46 **** // Pages ! $lang['phpbb_faq'] = '<b>PAGES:</b><br />faq'; $lang['phpbb_groupcp'] = 'groupcp'; $lang['phpbb_index'] = 'index'; --- 42,46 ---- // Pages ! $lang['phpbb_faq'] = 'faq'; $lang['phpbb_groupcp'] = 'groupcp'; $lang['phpbb_index'] = 'index'; *************** *** 59,67 **** $lang['reset'] = 'Reset'; ! $lang['default_pages_title'] = 'Default MX phpBB page'; $lang['default_pages_title_explain'] = ''; ! $lang['phpbb_override'] = 'Default MX phpBB page'; ! $lang['phpbb_override_explain'] = 'Define the default MX page phpBB will be redirected to when no other variable is defined.<br /><br /><b>Block Setup:</b> Define phpBB redirects for every phpBB block<br /> <b>Override Block Setup:</b> always use these default pages, defined below'; // BEGIN Advanced Topic Type MOD --- 59,75 ---- $lang['reset'] = 'Reset'; ! $lang['default_pages_title'] = 'mxBB and phpBB integration'; $lang['default_pages_title_explain'] = ''; ! $lang['default_pages_more_title'] = 'More phpBB mappings...'; ! $lang['default_pages_more_title_explain'] = ''; ! ! $lang['default_pages_profilecp'] = 'If you have the ProfileCP module installed, you can do the page mapping here (instead of editing the phpBB files directly)'; ! ! $lang['phpbb_override'] = 'Associate phpBB and mxBB pages'; ! $lang['phpbb_override_explain'] = 'phpBB urls are redirected to mxBB pages following these settings.'; ! ! $lang['phpbb_override_yes'] = 'Use Block Settings'; ! $lang['phpbb_override_no'] = 'Use default mapping (see below)'; // BEGIN Advanced Topic Type MOD |
|
From: Jon O. <jon...@us...> - 2005-09-15 17:59:39
|
Update of /cvsroot/mxbb/mx_forum/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2687/modules/mx_forum/admin Modified Files: admin_forums_ext.php mx_module_defs.php Removed Files: admin_edit.php phpbb_config.php Log Message: Making the phpBB integration module ready for mxBB 2.8 --- admin_edit.php DELETED --- Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/admin/mx_module_defs.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_module_defs.php 20 Aug 2005 18:49:25 -0000 1.2 --- mx_module_defs.php 15 Sep 2005 17:59:19 -0000 1.3 *************** *** 70,74 **** switch ( $parameter_data['parameter_type'] ) { ! } --- 70,76 ---- switch ( $parameter_data['parameter_type'] ) { ! case 'phpbb_type_select': ! $parameter_value = addslashes( serialize( $parameter_value ) ); ! break; } *************** *** 81,85 **** function display_module_parameters( $parameter_data ) { ! global $template, $blockcptemplate, $mx_blockcp, $mx_root_path, $theme, $lang; switch ( $parameter_data['parameter_type'] ) --- 83,87 ---- function display_module_parameters( $parameter_data ) { ! global $template, $mx_blockcp, $mx_root_path, $theme, $lang; switch ( $parameter_data['parameter_type'] ) *************** *** 99,104 **** include_once( $module_root_path . "includes/phpbb_defs.$phpEx" ); $template->set_filenames(array( ! 'parameter' => $mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl') ); --- 101,115 ---- include_once( $module_root_path . "includes/phpbb_defs.$phpEx" ); + if (file_exists($mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl')) + { + $module_template_file = $mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl'; + } + else + { + $module_template_file = $mx_root_path . $mx_blockcp->module_root_path . 'templates/subSilver' . '/admin/mx_module_parameters.tpl'; + } + $template->set_filenames(array( ! 'parameter' => $module_template_file) ); *************** *** 126,133 **** $categories = $db->sql_fetchrowset( $result ); ! $phpbb_type_select_data = array(); ! $phpbb_type_select_temp = $mx_blockcp->block_parameters['phpbb_type_select']['parameter_value']; ! $phpbb_type_select_temp = stripslashes( $phpbb_type_select_temp ); ! $phpbb_type_select_data = eval( "return " . $phpbb_type_select_temp . ";" ); // // Check that some categories exist --- 137,142 ---- $categories = $db->sql_fetchrowset( $result ); ! $phpbb_type_select_data = ( !empty( $mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value'] ) ) ? unserialize($mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value']) : array(); ! // // Check that some categories exist *************** *** 158,166 **** 'FORUM_DESC' => $forums[$j][$catt_desc], ! 'CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']]['forum_news'] ? 'CHECKED' : '' ), ! 'ANNOUNCE_CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']]['forum_news_announce'] ? 'CHECKED' : '' ), ! 'STICKY_CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']]['forum_news_sticky'] ? 'CHECKED' : '' ), ! 'NORMAL_CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']]['forum_news_post'] ? 'CHECKED' : '' ) ) ! ); } } --- 167,172 ---- 'FORUM_DESC' => $forums[$j][$catt_desc], ! 'CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']] ? 'CHECKED' : '' ), ! )); } } *************** *** 171,174 **** --- 177,181 ---- $template->assign_vars(array( 'NAME' => $lang[$parameter_data['parameter_name']], + 'SELSCT_NAME' => $parameter_data['parameter_name'], 'PARAMETER_TITLE' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], 'PARAMETER_TYPE' => ( !empty($lang["ParType_".$parameter_data['parameter_type']]) ) ? $lang["ParType_".$parameter_data['parameter_type']] : '', *************** *** 185,188 **** --- 192,197 ---- )); + $template->pparse('parameter'); + } } Index: admin_forums_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/admin/admin_forums_ext.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_forums_ext.php 9 Jan 2005 22:22:02 -0000 1.2 --- admin_forums_ext.php 15 Sep 2005 17:59:19 -0000 1.3 *************** *** 26,38 **** } - // Load default header - - /* - $phpbb_root_path = "./../"; - require($phpbb_root_path . 'extension.inc'); - require('./pagestart.' . $phpEx); - include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); - */ [...1092 lines suppressed...] $template->pparse( "body" ); - // include('./page_footer_admin.'.$phpEx); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 154,168 ---- 'PHPBB_SEARCH' => $phpbb_search, ! //'L_PHPBB_VIEWFORUM' => $lang['phpbb_viewforum'], ! //'PHPBB_VIEWFORUM' => $phpbb_viewforum, 'L_PHPBB_VIEWONLINE' => $lang['phpbb_viewonline'], 'PHPBB_VIEWONLINE' => $phpbb_viewonline, ! //'L_PHPBB_VIEWTOPIC' => $lang['phpbb_viewtopic'], ! //'PHPBB_VIEWTOPIC' => $phpbb_viewtopic ! )); $template->pparse( "body" ); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- phpbb_config.php DELETED --- |
|
From: Jon O. <jon...@us...> - 2005-09-15 17:59:39
|
Update of /cvsroot/mxbb/mx_forum/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2687/modules/mx_forum/templates/subSilver Modified Files: index_body.tpl viewforum_body.tpl viewtopic_body.tpl Log Message: Making the phpBB integration module ready for mxBB 2.8 Index: viewforum_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_forum/templates/subSilver/viewforum_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** viewforum_body.tpl 9 Jan 2005 22:22:02 -0000 1.3 --- viewforum_body.tpl 15 Sep 2005 17:59:19 -0000 1.4 *************** *** 1,4 **** <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <form method="post" action="{S_POST_DAYS_ACTION}"> <tr> <td align="left" valign="bottom" colspan="2"><a class="cattitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td> --- 1,4 ---- + <form method="post" action="{S_POST_DAYS_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> <td align="left" valign="bottom" colspan="2"><a class="cattitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td> *************** *** 6,10 **** </tr> <tr> ! <td align="left" valign="middle" colspan="3"><a href="{U_POST_NEW_TOPIC}"><img src="{POST_IMG}" border="0" alt="{L_POST_NEW_TOPIC}" /></a><span class="nav"> <a href="{U_INDEX}{UU_INDEX}" class="nav">{LL_INDEX}</a> » <a class="nav" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td> </tr> <tr> --- 6,10 ---- </tr> <tr> ! <td align="left" valign="middle" colspan="3"><a href="{U_POST_NEW_TOPIC}"><img src="{POST_IMG}" border="0" alt="{L_POST_NEW_TOPIC}" /></a><span class="nav"> <a href="{UU_INDEX}" class="nav">{L_INDEX}</a> » <a class="nav" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td> </tr> <tr> *************** *** 44,48 **** </table> ! </td></tr></table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> --- 44,48 ---- </table> ! <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> Index: viewtopic_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_forum/templates/subSilver/viewtopic_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** viewtopic_body.tpl 9 Jan 2005 22:22:02 -0000 1.3 --- viewtopic_body.tpl 15 Sep 2005 17:59:19 -0000 1.4 *************** *** 1,6 **** - <!-- BEGIN set_phpbb_cookie --> - <img src="images/spacer.gif" onLoad="set_phpbb_cookie('{set_phpbb_cookie.NAME}', '{set_phpbb_cookie.VALUE}', '{set_phpbb_cookie.EXPIRE}', '{set_phpbb_cookie.COOKIE_PATH}', '{set_phpbb_cookie.COOKIE_DOMAIN}', '{set_phpbb_cookie.COOKIE_SECURE}');"> - <!-- END set_phpbb_cookie --> - <table width="100%" cellspacing="0" cellpadding="2" border="0"> <tr> --- 1,2 ---- *************** *** 14,18 **** <tr> <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{POST_IMG}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{REPLY_IMG}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" /></a> <a target="_blank" href="{U_PRINTER_TOPIC}"><img src="{PRINTER_IMG}" border="0" alt="{L_PRINTER_TOPIC}" align="middle" /></a></span></td> ! <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{U_INDEX}{UU_INDEX}" class="nav">{LL_INDEX}</a> » <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> --- 10,14 ---- <tr> <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{POST_IMG}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{REPLY_IMG}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" /></a> <a target="_blank" href="{U_PRINTER_TOPIC}"><img src="{PRINTER_IMG}" border="0" alt="{L_PRINTER_TOPIC}" align="middle" /></a></span></td> ! <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{UU_INDEX}" class="nav">{L_INDEX}</a> » <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> *************** *** 33,37 **** <td class="{postrow.ROW_CLASS}" width="100%" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td width="100%"><a href="{postrow.U_MINI_POST}"><img src="{postrow.MINI_POST_IMG}" width="12" height="9" alt="{postrow.L_MINI_POST_ALT}" title="{postrow.L_MINI_POST_ALT}" border="0" /></a><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen"> </span> {L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td> <td valign="top" nowrap="nowrap">{postrow.QUOTE_IMG} {postrow.EDIT_IMG} {postrow.DELETE_IMG} {postrow.IP_IMG}</td> </tr> --- 29,33 ---- <td class="{postrow.ROW_CLASS}" width="100%" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td width="100%"><a href="{postrow.U_MINI_POST}"><img src="{postrow.MINI_POST_IMG}" width="12" height="9" alt="{postrow.L_MINI_POST_ALT}" title="{postrow.L_MINI_POST_ALT}" border="0" /></a><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<br />{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td> <td valign="top" nowrap="nowrap">{postrow.QUOTE_IMG} {postrow.EDIT_IMG} {postrow.DELETE_IMG} {postrow.IP_IMG}</td> </tr> *************** *** 72,77 **** </table> - </td></tr></table> - <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> --- 68,71 ---- Index: index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_forum/templates/subSilver/index_body.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index_body.tpl 9 Jan 2005 22:22:02 -0000 1.3 --- index_body.tpl 15 Sep 2005 17:59:19 -0000 1.4 *************** *** 5,9 **** {LAST_VISIT_DATE}<br /> <!-- END switch_user_logged_in --> ! {CURRENT_TIME}</span></td> <td align="right" valign="bottom" class="gensmall"> <!-- BEGIN switch_user_logged_in --> --- 5,9 ---- {LAST_VISIT_DATE}<br /> <!-- END switch_user_logged_in --> ! {CURRENT_TIME}<br /></td> <td align="right" valign="bottom" class="gensmall"> <!-- BEGIN switch_user_logged_in --> *************** *** 16,20 **** <table width="100%" cellpadding="4" cellspacing="0" border="0" > <tr> ! <th colspan="2" class="thCornerL" height="25" nowrap="nowrap"> <span class="nav"><a href="{UU_INDEX}" class="nav">« {LL_INDEX}</a></span> </th> <th width="50" class="thTop" nowrap="nowrap"> {L_TOPICS} </th> <th width="50" class="thTop" nowrap="nowrap"> {L_POSTS} </th> --- 16,20 ---- <table width="100%" cellpadding="4" cellspacing="0" border="0" > <tr> ! <th colspan="2" class="thCornerL" height="25" nowrap="nowrap"> <span class="nav">« <a href="{UU_INDEX}">{L_INDEX}</a></span> </th> <th width="50" class="thTop" nowrap="nowrap"> {L_TOPICS} </th> <th width="50" class="thTop" nowrap="nowrap"> {L_POSTS} </th> *************** *** 23,30 **** <!-- BEGIN catrow --> <tr> - <!-- <td class="catLeft" colspan="2" height="28"><span class="cattitle"><a href="{catrow.U_VIEWCAT}" class="cattitle">{catrow.CAT_DESC}</a></span></td> - --> - <td class="catLeft" colspan="2" height="28"><span class="cattitle">{catrow.CAT_DESC}</span></td> <td class="rowpic" colspan="3" align="right"> </td> </tr> --- 23,27 ---- *************** *** 43,47 **** </table> ! </td></tr></table> <table width="100%" cellspacing="0" border="0" align="center" cellpadding="2"> --- 40,44 ---- </table> ! <table width="100%" cellspacing="0" border="0" align="center" cellpadding="2"> |
|
From: Jon O. <jon...@us...> - 2005-09-15 17:59:38
|
Update of /cvsroot/mxbb/mx_forum/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2687/modules/mx_forum/templates/subSilver/admin Modified Files: forum_admin_body_ext.tpl mx_module_parameters.tpl Removed Files: config_body.tpl forum_edit_body_ext.tpl Log Message: Making the phpBB integration module ready for mxBB 2.8 --- config_body.tpl DELETED --- Index: forum_admin_body_ext.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_forum/templates/subSilver/admin/forum_admin_body_ext.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** forum_admin_body_ext.tpl 16 Sep 2004 19:56:44 -0000 1.1 --- forum_admin_body_ext.tpl 15 Sep 2005 17:59:19 -0000 1.2 *************** *** 11,17 **** <tr> <td class="row1" width="50%">{L_PHPBB_OVERRIDE_DEFAULT_PAGES}<br /><span class="gensmall">{L_PHPBB_OVERRIDE_DEFAULT_PAGES_EXPLAIN}</span></td> ! <td class="row2" width="50%">{PHPBB_OVERRIDE_DEFAULT_PAGES}</td> </tr> <tr> <td class="row1" width="50%">{L_PHPBB_FAQ}</td> <td class="row2" width="50%"><input class="post" type="text" name="faq" value="{PHPBB_FAQ}" size="5" maxlength="4" /></td> --- 11,24 ---- <tr> <td class="row1" width="50%">{L_PHPBB_OVERRIDE_DEFAULT_PAGES}<br /><span class="gensmall">{L_PHPBB_OVERRIDE_DEFAULT_PAGES_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="override_default_pages" value="1" {OVERRIDE_DEFAULT_PAGES_CHECKBOX_YES} /><span class="gensmall">{L_PHPBB_OVERRIDE_DEFAULT_PAGES_YES} <input type="radio" name="override_default_pages" value="0" {OVERRIDE_DEFAULT_PAGES_CHECKBOX_NO} /><span class="gensmall">{L_PHPBB_OVERRIDE_DEFAULT_PAGES_NO}</span></td> </tr> <tr> + <td class="row1" width="50%">{L_PHPBB_INDEX}</td> + <td class="row2" width="50%"><input class="post" type="text" name="index" value="{PHPBB_INDEX}" size="5" maxlength="4" /></td> + </tr> + <tr> + <th class="thHead" colspan="2">{L_DEFAULT_PAGES_MORE_TITLE}<br /><span class="gensmall">{L_DEFAULT_PAGES_MORE_TITLE_EXPLAIN}</span></th> + </tr> + <tr> <td class="row1" width="50%">{L_PHPBB_FAQ}</td> <td class="row2" width="50%"><input class="post" type="text" name="faq" value="{PHPBB_FAQ}" size="5" maxlength="4" /></td> *************** *** 22,34 **** </tr> <tr> - <td class="row1" width="50%">{L_PHPBB_INDEX}</td> - <td class="row2" width="50%"><input class="post" type="text" name="index" value="{PHPBB_INDEX}" size="5" maxlength="4" /></td> - </tr> - <tr> <td class="row1" width="50%">{L_PHPBB_LOGIN}</td> <td class="row2" width="50%"><input class="post" type="text" name="login" value="{PHPBB_LOGIN}" size="5" maxlength="4" /></td> </tr> <tr> ! <td class="row1" width="50%">{L_PHPBB_MEMBERLIST}</td> <td class="row2" width="50%"><input class="post" type="text" name="memberlist" value="{PHPBB_MEMBERLIST}" size="5" maxlength="4" /></td> </tr> --- 29,37 ---- </tr> <tr> <td class="row1" width="50%">{L_PHPBB_LOGIN}</td> <td class="row2" width="50%"><input class="post" type="text" name="login" value="{PHPBB_LOGIN}" size="5" maxlength="4" /></td> </tr> <tr> ! <td class="row1" width="50%">{L_PHPBB_MEMBERLIST}<br /><span class="gensmall">{L_DEFAULT_PAGES_PROFILECP}</span></td> <td class="row2" width="50%"><input class="post" type="text" name="memberlist" value="{PHPBB_MEMBERLIST}" size="5" maxlength="4" /></td> </tr> *************** *** 42,50 **** </tr> <tr> ! <td class="row1" width="50%">{L_PHPBB_PRIVMSG}</td> <td class="row2" width="50%"><input class="post" type="text" name="privmsg" value="{PHPBB_PRIVMSG}" size="5" maxlength="4" /></td> </tr> <tr> ! <td class="row1" width="50%">{L_PHPBB_PROFILE}</td> <td class="row2" width="50%"><input class="post" type="text" name="profile" value="{PHPBB_PROFILE}" size="5" maxlength="4" /></td> </tr> --- 45,53 ---- </tr> <tr> ! <td class="row1" width="50%">{L_PHPBB_PRIVMSG}<br /><span class="gensmall">{L_DEFAULT_PAGES_PROFILECP}</span></td> <td class="row2" width="50%"><input class="post" type="text" name="privmsg" value="{PHPBB_PRIVMSG}" size="5" maxlength="4" /></td> </tr> <tr> ! <td class="row1" width="50%">{L_PHPBB_PROFILE}<br /><span class="gensmall">{L_DEFAULT_PAGES_PROFILECP}</span></td> <td class="row2" width="50%"><input class="post" type="text" name="profile" value="{PHPBB_PROFILE}" size="5" maxlength="4" /></td> </tr> *************** *** 53,68 **** <td class="row2" width="50%"><input class="post" type="text" name="search" value="{PHPBB_SEARCH}" size="5" maxlength="4" /></td> </tr> ! <tr> ! <td class="row1" width="50%">{L_PHPBB_VIEWFORUM}</td> ! <td class="row2" width="50%"><input class="post" type="text" name="viewforum" value="{PHPBB_VIEWFORUM}" size="5" maxlength="4" /></td> ! </tr> <tr> <td class="row1" width="50%">{L_PHPBB_VIEWONLINE}</td> <td class="row2" width="50%"><input class="post" type="text" name="viewonline" value="{PHPBB_VIEWONLINE}" size="5" maxlength="4" /></td> </tr> ! <tr> ! <td class="row1" width="50%">{L_PHPBB_VIEWTOPIC}</td> ! <td class="row2" width="50%"><input class="post" type="text" name="viewtopic" value="{PHPBB_VIEWTOPIC}" size="5" maxlength="4" /></td> ! </tr> <tr> <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /></td> --- 56,65 ---- <td class="row2" width="50%"><input class="post" type="text" name="search" value="{PHPBB_SEARCH}" size="5" maxlength="4" /></td> </tr> ! <tr> <td class="row1" width="50%">{L_PHPBB_VIEWONLINE}</td> <td class="row2" width="50%"><input class="post" type="text" name="viewonline" value="{PHPBB_VIEWONLINE}" size="5" maxlength="4" /></td> </tr> ! <tr> <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /></td> *************** *** 70,106 **** </table> </form> - - <form method="post" action="{S_FORUM_ACTION}"><table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" align="center"> - <tr> - <th class="thHead" colspan="7">{L_FORUM_TITLE}</th> - </tr> - <!-- BEGIN catrow --> - <tr> - <td class="catLeft" colspan="3"><span class="cattitle"><b><a href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></b></span></td> - <td class="cat" align="center" valign="middle"><span class="gen"><a href="{catrow.U_CAT_EDIT}">{L_EDIT}</a></span></td> - <td class="cat" align="center" valign="middle"><span class="gen"><a href="{catrow.U_CAT_DELETE}">{L_DELETE}</a></span></td> - <td class="cat" align="center" valign="middle" nowrap="nowrap"><span class="gen"><a href="{catrow.U_CAT_MOVE_UP}">{L_MOVE_UP}</a> <a href="{catrow.U_CAT_MOVE_DOWN}">{L_MOVE_DOWN}</a></span></td> - <td class="catRight" align="center" valign="middle"><span class="gen"> </span></td> - </tr> - <!-- BEGIN forumrow --> - <tr> - <td class="row2"><span class="gen"><a href="{catrow.forumrow.U_VIEWFORUM}" target="_new">{catrow.forumrow.FORUM_NAME}</a></span><br /><span class="gensmall">{catrow.forumrow.FORUM_DESC}</span></td> - <td class="row1" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_TOPICS}</span></td> - <td class="row2" align="center" valign="middle"><span class="gen">{catrow.forumrow.NUM_POSTS}</span></td> - <td class="row1" align="center" valign="middle"><span class="gen"><a href="{catrow.forumrow.U_FORUM_EDIT}">{L_EDIT}</a></span></td> - <td class="row2" align="center" valign="middle"><span class="gen"><a href="{catrow.forumrow.U_FORUM_DELETE}">{L_DELETE}</a></span></td> - <td class="row1" align="center" valign="middle"><span class="gen"><a href="{catrow.forumrow.U_FORUM_MOVE_UP}">{L_MOVE_UP}</a> <br /> <a href="{catrow.forumrow.U_FORUM_MOVE_DOWN}">{L_MOVE_DOWN}</a></span></td> - <td class="row2" align="center" valign="middle"><span class="gen"><a href="{catrow.forumrow.U_FORUM_RESYNC}">{L_RESYNC}</a></span></td> - </tr> - <!-- END forumrow --> - <tr> - <td colspan="7" class="row2"><input class="post" type="text" name="{catrow.S_ADD_FORUM_NAME}" /> <input type="submit" class="liteoption" name="{catrow.S_ADD_FORUM_SUBMIT}" value="{L_CREATE_FORUM}" /></td> - </tr> - <tr> - <td colspan="7" height="1" class="spaceRow"><img src="../templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> - </tr> - <!-- END catrow --> - <tr> - <td colspan="7" class="catBottom"><input class="post" type="text" name="categoryname" /> <input type="submit" class="liteoption" name="addcategory" value="{L_CREATE_CATEGORY}" /></td> - </tr> - </table></form> --- 67,68 ---- Index: mx_module_parameters.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_forum/templates/subSilver/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 20 Aug 2005 18:22:39 -0000 1.1 --- mx_module_parameters.tpl 15 Sep 2005 17:59:19 -0000 1.2 *************** *** 17,21 **** <!-- BEGIN forumrow_phpbb --> <tr> ! <td class="row1" align="center" valign="top"><input type="checkbox" name="forum_news[{catrow.forumrow_phpbb.FORUM_ID}]" value="1" {catrow.forumrow_phpbb.CHECKED} /></td> <td class="row1" align="left" valign="top"><span class="forumlink">{catrow.forumrow_phpbb.FORUM_NAME}</span><br /><span class="gensmall">{catrow.forumrow_phpbb.FORUM_DESC}</span></td> </tr> --- 17,21 ---- <!-- BEGIN forumrow_phpbb --> <tr> ! <td class="row1" align="center" valign="top"><input type="checkbox" name="{SELSCT_NAME}[{catrow.forumrow_phpbb.FORUM_ID}]" value="1" {catrow.forumrow_phpbb.CHECKED} /></td> <td class="row1" align="left" valign="top"><span class="forumlink">{catrow.forumrow_phpbb.FORUM_NAME}</span><br /><span class="gensmall">{catrow.forumrow_phpbb.FORUM_DESC}</span></td> </tr> --- forum_edit_body_ext.tpl DELETED --- |
Update of /cvsroot/mxbb/mx_forum In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2687/modules/mx_forum Modified Files: db_install.php db_uninstall.php db_upgrade.php groupcp.php index.php mx_forum.pak viewforum.php viewtopic.php Added Files: mx_forum.php Log Message: Making the phpBB integration module ready for mxBB 2.8 Index: index.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/index.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.php 15 Jan 2005 23:45:37 -0000 1.4 --- index.php 15 Sep 2005 17:59:19 -0000 1.5 *************** *** 20,34 **** * ***************************************************************************/ ! //+mx_forum if( !defined('IN_PORTAL') ) { die("Hacking attempt !!!"); } ! include_once($mx_root_path . "modules/mx_forum/includes/forum_hack.$phpEx"); ! include_once($mx_root_path . "modules/mx_forum/includes/forum_constants.$phpEx"); ! //-mx_forum ! //+mx_forum /* define('IN_PHPBB', true); --- 20,32 ---- * ***************************************************************************/ ! //+mxbb_module if( !defined('IN_PORTAL') ) { die("Hacking attempt !!!"); } ! //-mxbb_module ! //+mxbb_module /* define('IN_PHPBB', true); *************** *** 37,84 **** include($phpbb_root_path . 'common.'.$phpEx); */ ! //-mx_forum // // Start session management // ! //+mx_forum /* $userdata = session_pagestart($user_ip, PAGE_INDEX); init_userprefs($userdata); */ ! //-mx_forum // // End session management // - // Newssuite operation mode? - //------------------------------------------------------------------------- - $total_blockk = count( $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['blocks'] ); - - $phpbb2_config['news_mode_operate'] = ''; - for($blockk = 0; $blockk < $total_blockk; $blockk++) - { - if ( $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_source_switch']['parameter_value'] == 'phpbb' && $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_mode_operate']['parameter_value'] == 'Source' ) - { - $newssuite_select_par = $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_type_select']['parameter_value']; - - // Extract 'what posts to view info', the cool Array ;) - $news_type_select_data = array(); - $news_type_select_temp = $newssuite_select_par; - $news_type_select_temp = stripslashes($news_type_select_temp); - $news_type_select_data = eval("return " . $news_type_select_temp . ";"); - $phpbb2_config['news_mode_operate'] = true; - } - else - { - $phpbb2_config['news_mode_operate'] = ''; - } - } - - $phpbb_type_select_data = $mx_forum->phpbb_type_select_data; - - $title = $mx_forum->title; - //------------------------------------------------------------------------- - $viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1; --- 35,53 ---- include($phpbb_root_path . 'common.'.$phpEx); */ ! //-mxbb_module // // Start session management // ! //+mxbb_module /* $userdata = session_pagestart($user_ip, PAGE_INDEX); init_userprefs($userdata); */ ! //-mxbb_module // // End session management // $viewcat = ( !empty($HTTP_GET_VARS[POST_CAT_URL]) ) ? $HTTP_GET_VARS[POST_CAT_URL] : -1; *************** *** 99,108 **** if( $userdata['session_logged_in'] ) { ! $set_phpbb_cookie = true; ! // setcookie($board_config['cookie_name'] . '_f_all', time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); ! } ! else ! { ! $set_phpbb_cookie = 0; } --- 68,72 ---- if( $userdata['session_logged_in'] ) { ! setcookie($board_config['cookie_name'] . '_f_all', time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); } *************** *** 111,123 **** ); ! if ( $set_phpbb_cookie ) ! { ! $temp = "set_phpbb_cookie('". $board_config['cookie_name'] . "_f_all" ."', '".time()."', '0', '".$board_config['cookie_path']."', '".$board_config['cookie_domain']."', '".$board_config['cookie_path']."');"; ! } ! ! $message = '<img src="images/spacer.gif" onLoad="'.$temp.'">' . ! $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . $mx_forum->append_sid("index.$phpEx?f=".$HTTP_GET_VARS['f']) . '">', '</a> '); ! message_die(GENERAL_MESSAGE, $message); } --- 75,81 ---- ); ! $message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . $mx_forum->append_sid("index.$phpEx?f=".$HTTP_GET_VARS['f']) . '">', '</a> '); ! mx_message_die(GENERAL_MESSAGE, $message); } *************** *** 174,178 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql); } --- 132,136 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query categories list', '', __LINE__, __FILE__, $sql); } *************** *** 223,227 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query forums information', '', __LINE__, __FILE__, $sql); } --- 181,185 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query forums information', '', __LINE__, __FILE__, $sql); } *************** *** 235,239 **** if ( !($total_forums = count($forum_data)) ) { ! message_die(GENERAL_MESSAGE, $lang['No_forums']); } --- 193,197 ---- if ( !($total_forums = count($forum_data)) ) { ! mx_message_die(GENERAL_MESSAGE, $lang['No_forums']); } *************** *** 251,255 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql); } --- 209,213 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql); } *************** *** 277,281 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } --- 235,239 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } *************** *** 298,302 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } --- 256,260 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } *************** *** 318,324 **** define('SHOW_ONLINE', true); $page_title = $lang['Index']; ! //+mx_forum //include($phpbb_root_path . 'includes/page_header.'.$phpEx); ! //-mx_forum $template->set_filenames(array( 'body' => 'index_body.tpl') --- 276,282 ---- define('SHOW_ONLINE', true); $page_title = $lang['Index']; ! //+mxBB_module //include($phpbb_root_path . 'includes/page_header.'.$phpEx); ! //-mxBB_module $template->set_filenames(array( 'body' => 'index_body.tpl') *************** *** 348,353 **** 'L_MODERATOR' => $lang['Moderators'], 'L_FORUM_LOCKED' => $lang['Forum_is_locked'], ! 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums']) ! ); // --- 306,315 ---- 'L_MODERATOR' => $lang['Moderators'], 'L_FORUM_LOCKED' => $lang['Forum_is_locked'], ! 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], ! ! //+mxBB_module ! //'U_MARK_READ' => append_sid("index.$phpEx?mark=forums") ! //-mxBB_module ! )); // *************** *** 366,379 **** if ( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id && phpbb2_auth_cat($forum_data[$j]['forum_id'])) { ! // MX forum $val_forum_id = $forum_data[$j]['forum_id']; ! // End $display_forums = true; } } $template->assign_vars(array( 'U_MARK_READ' => $mx_forum->append_sid("index.$phpEx?mark=forums&f=" . $val_forum_id) )); // --- 328,343 ---- if ( $is_auth_ary[$forum_data[$j]['forum_id']]['auth_view'] && $forum_data[$j]['cat_id'] == $cat_id && phpbb2_auth_cat($forum_data[$j]['forum_id'])) { ! //+mxBB_module $val_forum_id = $forum_data[$j]['forum_id']; ! //-mxBB_module $display_forums = true; } } + //+mxBB_module $template->assign_vars(array( 'U_MARK_READ' => $mx_forum->append_sid("index.$phpEx?mark=forums&f=" . $val_forum_id) )); + //-mxBB_module // *************** *** 397,400 **** --- 361,365 ---- $forum_id = $forum_data[$j]['forum_id']; + //+mxBB_module - forum subselect if ( $is_auth_ary[$forum_id]['auth_view'] && phpbb2_auth_cat($forum_id) ) { *************** *** 454,459 **** } ! // MX ADDON ! // Get number of articles in cat - newssuite addon if ( $phpbb2_config['news_mode_operate'] ) { --- 419,424 ---- } ! //+mxBB_module ! // Get number of post in forum - newssuite addon if ( $phpbb2_config['news_mode_operate'] ) { *************** *** 461,470 **** FROM " . TOPICS_TABLE . " WHERE "; ! // newssuite addon ! if ( $phpbb2_config['news_mode_operate'] ) ! { ! $phpbb_types_list = phpbb2_auth_item($forum_id); ! $sql_num .= " topic_type IN " . $phpbb_types_list . ' AND'; ! } $sql_num .= " forum_id = " . $forum_id; if ( !($result_num = $db->sql_query($sql_num)) ) --- 426,430 ---- FROM " . TOPICS_TABLE . " WHERE "; ! $sql_num .= " forum_id = " . $forum_id; if ( !($result_num = $db->sql_query($sql_num)) ) *************** *** 484,493 **** FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p WHERE "; ! // newssuite addon ! if ( $phpbb2_config['news_mode_operate'] ) ! { ! $phpbb_types_list = phpbb2_auth_item($forum_id); ! $sql_num .= " t.topic_type IN " . $phpbb_types_list . ' AND'; ! } $sql_num .= " t.forum_id = " . $forum_id . ' AND'; $sql_num .= " p.forum_id = " . $forum_id . ' AND'; --- 444,448 ---- FROM " . TOPICS_TABLE . " t, " . POSTS_TABLE . " p WHERE "; ! $sql_num .= " t.forum_id = " . $forum_id . ' AND'; $sql_num .= " p.forum_id = " . $forum_id . ' AND'; *************** *** 511,514 **** --- 466,470 ---- $topics = $forum_data[$j]['forum_topics']; } + //-mxBB_module if ( $forum_data[$j]['forum_last_post_id'] ) *************** *** 547,552 **** --- 503,510 ---- 'FORUM_NAME' => $forum_data[$j]['forum_name'], 'FORUM_DESC' => $forum_data[$j]['forum_desc'], + //+mxBB_module 'POSTS' => $posts, 'TOPICS' => $topics, + //-mxBB_module 'LAST_POST' => $last_post, 'MODERATORS' => $moderator_list, *************** *** 567,580 **** else { ! message_die(GENERAL_MESSAGE, $lang['No_forums']); } ! // MX $template->assign_vars(array( - 'LL_INDEX' => $mx_forum->title, - 'U_INDEX' => '', 'UU_INDEX' => $phpbb_root_path . 'index.php?f=' . $val_forum_id, ! )); ! // END // --- 525,537 ---- else { ! mx_message_die(GENERAL_MESSAGE, $lang['No_forums']); } ! //+mxBB_module ! // we need to add forum id to return link $template->assign_vars(array( 'UU_INDEX' => $phpbb_root_path . 'index.php?f=' . $val_forum_id, ! )); ! //-mxBB_module // Index: viewtopic.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/viewtopic.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** viewtopic.php 6 Mar 2005 01:12:18 -0000 1.6 --- viewtopic.php 15 Sep 2005 17:59:19 -0000 1.7 *************** *** 20,24 **** * ***************************************************************************/ ! // Printer topic mod if(isset($HTTP_GET_VARS['printertopic'])) { --- 20,24 ---- * ***************************************************************************/ ! //+mxbb_module - Printer topic mod if(isset($HTTP_GET_VARS['printertopic'])) [...1037 lines suppressed...] include($mx_root_path . 'includes/page_tail.'.$phpEx); } ! //+mx_forum //include($phpbb_root_path . 'includes/page_tail.'.$phpEx); return; ! //-mx_forum ?> \ No newline at end of file --- 1483,1491 ---- include($mx_root_path . 'includes/page_tail.'.$phpEx); } + //-mxbb_module ! //+mxbb_module //include($phpbb_root_path . 'includes/page_tail.'.$phpEx); return; ! //-mxbb_module ?> \ No newline at end of file Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/db_install.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** db_install.php 6 Mar 2005 01:12:17 -0000 1.6 --- db_install.php 15 Sep 2005 17:59:19 -0000 1.7 *************** *** 2,12 **** /** * * ------------------------------------------------------------------------ ! * subject : mx-portal, CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 MX-System * email : jon...@ho... * project site : www.mx-system.com * - * description : * ------------------------------------------------------------------------- * --- 2,11 ---- /** * * ------------------------------------------------------------------------ ! * subject : mxBB-Portal - CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 mxBB-Portal * email : jon...@ho... * project site : www.mx-system.com * * ------------------------------------------------------------------------- * *************** *** 20,37 **** * (at your option) any later version. */ ! define( 'IN_PORTAL', true ); - - $mx_module_version = 'mxBB phpBB Module 1.0.0'; - $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a>'; - if ( !defined( 'IN_ADMIN' ) ) { ! $mx_root_path = '../../'; include( $mx_root_path . 'extension.inc' ); include( $mx_root_path . 'common.' . $phpEx ); - // Start session management - $userdata = session_pagestart( $user_ip, PAGE_INDEX ); mx_init_userprefs( $userdata ); --- 19,30 ---- * (at your option) any later version. */ ! define( 'IN_PORTAL', true ); if ( !defined( 'IN_ADMIN' ) ) { ! $mx_root_path = './../../'; include( $mx_root_path . 'extension.inc' ); include( $mx_root_path . 'common.' . $phpEx ); // Start session management $userdata = session_pagestart( $user_ip, PAGE_INDEX ); mx_init_userprefs( $userdata ); *************** *** 39,54 **** if ( !$userdata['session_logged_in'] ) { ! die( "Hacking attempt(3)" ); } if ( $userdata['user_level'] != ADMIN ) { ! die( "Hacking attempt(4)" ); } - // End session management - } // If fresh install --- 32,48 ---- if ( !$userdata['session_logged_in'] ) { ! die( "Hacking attempt(1)" ); } if ( $userdata['user_level'] != ADMIN ) { ! die( "Hacking attempt(2)" ); } // End session management } + $mx_module_version = 'mxBB phpBB Module 1.0.0'; + $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a>'; + // If fresh install Index: groupcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/groupcp.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** groupcp.php 6 Mar 2005 01:12:17 -0000 1.3 --- groupcp.php 15 Sep 2005 17:59:19 -0000 1.4 *************** *** 26,30 **** } include_once($mx_root_path . "modules/mx_forum/includes/forum_hack.$phpEx"); - include_once($mx_root_path . "modules/mx_forum/includes/forum_constants.$phpEx"); include_once($mx_root_path . "modules/mx_forum/includes/phpbb_constants.$phpEx"); --- 26,29 ---- Index: viewforum.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/viewforum.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** viewforum.php 15 Jan 2005 23:45:37 -0000 1.4 --- viewforum.php 15 Sep 2005 17:59:19 -0000 1.5 *************** *** 21,34 **** ***************************************************************************/ ! //+mx_forum if( !defined('IN_PORTAL') ) { die("Hacking attempt !!!"); } ! include_once($mx_root_path . "modules/mx_forum/includes/forum_hack.$phpEx"); ! include_once($mx_root_path . "modules/mx_forum/includes/forum_constants.$phpEx"); ! //-mx_forum ! //+mx_forum /* define('IN_PHPBB', true); --- 21,32 ---- ***************************************************************************/ ! //+mxbb_module if( !defined('IN_PORTAL') ) { die("Hacking attempt !!!"); } ! //-mxbb_module ! //+mxbb_module /* define('IN_PHPBB', true); *************** *** 37,70 **** include($phpbb_root_path . 'common.'.$phpEx); */ ! //-mx_forum ! - // Newssuite operation mode? - //------------------------------------------------------------------------- - $total_blockk = count( $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['blocks'] ); - - for($blockk = 0; $blockk < $total_blockk; $blockk++) - { - if ( $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_source_switch']['parameter_value'] == 'phpbb' && $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_mode_operate']['parameter_value'] == 'Source' ) - { - $newssuite_select_par = $HTTP_SESSION_VARS['block_' . $block_rows[$blockk]['block_id']]['news_type_select']['parameter_value']; - - // Extract 'what posts to view info', the cool Array ;) - $news_type_select_data = array(); - $news_type_select_temp = $newssuite_select_par; - $news_type_select_temp = stripslashes($news_type_select_temp); - $news_type_select_data = eval("return " . $news_type_select_temp . ";"); - $phpbb2_config['news_mode_operate'] = true; - } - else - { - $phpbb2_config['news_mode_operate'] = ''; - } - } - $phpbb_type_select_data = $mx_forum->phpbb_type_select_data; - $title = $mx_forum->title; - - //------------------------------------------------------------------------- - // // Start initial var setup --- 35,40 ---- include($phpbb_root_path . 'common.'.$phpEx); */ ! //-mxbb_module // // Start initial var setup *************** *** 101,104 **** --- 71,76 ---- // If not give them a nice error page. // + //+mxbb_module + // forum sub select if ( !empty($forum_id) && phpbb2_auth_cat($forum_id)) { *************** *** 108,117 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql); } } else { ! message_die(GENERAL_MESSAGE, 'Forum_not_exist'); } --- 80,89 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql); } } else { ! mx_message_die(GENERAL_MESSAGE, 'Forum_not_exist'); } *************** *** 122,126 **** if ( !($forum_row = $db->sql_fetchrow($result)) ) { ! message_die(GENERAL_MESSAGE, 'Forum_not_exist'); } --- 94,98 ---- if ( !($forum_row = $db->sql_fetchrow($result)) ) { ! mx_message_die(GENERAL_MESSAGE, 'Forum_not_exist'); } *************** *** 128,137 **** // Start session management // ! //+mx_forum /* $userdata = session_pagestart($user_ip, $forum_id); init_userprefs($userdata); */ ! //-mx_forum // // End session management --- 100,109 ---- // Start session management // ! //+mxbb_module /* $userdata = session_pagestart($user_ip, $forum_id); init_userprefs($userdata); */ ! //-mxbb_module // // End session management *************** *** 156,160 **** $message = ( !$is_auth['auth_view'] ) ? $lang['Forum_not_exist'] : sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']); ! message_die(GENERAL_MESSAGE, $message); } // --- 128,132 ---- $message = ( !$is_auth['auth_view'] ) ? $lang['Forum_not_exist'] : sprintf($lang['Sorry_auth_read'], $is_auth['auth_read_type']); ! mx_message_die(GENERAL_MESSAGE, $message); } // *************** *** 174,178 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql); } --- 146,150 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql); } *************** *** 190,201 **** if ( $row['last_post'] > $userdata['user_lastvisit'] ) { - $set_phpbb_cookie = true; $tracking_forums[$forum_id] = time(); ! // setcookie($board_config['cookie_name'] . '_f', serialize($tracking_forums), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); ! } ! else ! { ! $set_phpbb_cookie = 0; } } --- 162,168 ---- if ( $row['last_post'] > $userdata['user_lastvisit'] ) { $tracking_forums[$forum_id] = time(); ! setcookie($board_config['cookie_name'] . '_f', serialize($tracking_forums), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); } } *************** *** 206,216 **** } ! if ( $set_phpbb_cookie ) ! { ! $temp = "set_phpbb_cookie('". $board_config['cookie_name'] . "_f" ."', '".serialize($tracking_forums)."', '0', '".$board_config['cookie_path']."', '".$board_config['cookie_domain']."', '".$board_config['cookie_path']."');"; ! } ! $message = '<img src="images/spacer.gif" onLoad="'.$temp.'">' . ! $lang['Topics_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . $mx_forum->append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a> '); ! message_die(GENERAL_MESSAGE, $message); } // --- 173,178 ---- } ! $message = $lang['Topics_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_forum'], '<a href="' . $mx_forum->append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">', '</a> '); ! mx_message_die(GENERAL_MESSAGE, $message); } // *************** *** 253,257 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } --- 215,219 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } *************** *** 274,278 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } --- 236,240 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query forum moderator information', '', __LINE__, __FILE__, $sql); } *************** *** 307,311 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain limited topics count information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 269,273 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain limited topics count information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 347,375 **** AND p.poster_id = u2.user_id AND t.topic_type = " . POST_ANNOUNCE; ! // newssuite addon ! if ( $phpbb2_config['news_mode_operate'] ) ! { ! $phpbb_types_list = phpbb2_auth_item($forum_id); ! $sql .= " AND t.topic_type IN " . $phpbb_types_list; ! } ! // topic icon addon $sql .= " AND ( (t.topic_type_active = ic.topic_type_id AND t.topic_type_active <> '0') OR (t.topic_type_active = ic.topic_type_id AND t.topic_type_active = '0' AND ic.topic_type_name = 'announce') )"; ! $sql .= " ORDER BY t.topic_last_post_id DESC "; if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql); } $topic_rowset = array(); $total_announcements = 0; while( $row = $db->sql_fetchrow($result) ) { - // Newssuite op addon - if ( phpbb2_auth_item($row['forum_id'], $row['topic_type']) ) - { $topic_rowset[] = $row; $total_announcements++; - } } --- 309,330 ---- AND p.poster_id = u2.user_id AND t.topic_type = " . POST_ANNOUNCE; ! ! //+mxbb_module - topic icon mod $sql .= " AND ( (t.topic_type_active = ic.topic_type_id AND t.topic_type_active <> '0') OR (t.topic_type_active = ic.topic_type_id AND t.topic_type_active = '0' AND ic.topic_type_name = 'announce') )"; ! //-mxbb_module - topic icon mod ! $sql .= " ORDER BY t.topic_last_post_id DESC "; if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql); } $topic_rowset = array(); $total_announcements = 0; + while( $row = $db->sql_fetchrow($result) ) { $topic_rowset[] = $row; $total_announcements++; } *************** *** 388,400 **** AND u2.user_id = p2.poster_id AND t.topic_type <> " . POST_ANNOUNCE; - // newssuite addon - if ( $phpbb2_config['news_mode_operate'] ) - { - $phpbb_types_list = phpbb2_auth_item($forum_id); - $sql .= " AND t.topic_type IN " . $phpbb_types_list; - } - // topic icon addon - $sql .= " AND ( (t.topic_type_active = ic.topic_type_id AND t.topic_type_active <> '0') OR (t.topic_type_active = ic.topic_type_id AND t.topic_type_active = '0' AND ic.topic_type_name = 'announce') )"; $sql .= $limit_topics_time . " ORDER BY t.topic_type DESC, t.topic_last_post_id DESC --- 343,351 ---- AND u2.user_id = p2.poster_id AND t.topic_type <> " . POST_ANNOUNCE; + //+mxbb_module - topic icon mod + $sql .= " AND ( (t.topic_type_active = ic.topic_type_id AND t.topic_type_active <> '0') OR (t.topic_type_active = ic.topic_type_id AND t.topic_type_active = '0' AND ic.topic_type_name = 'announce') )"; + //-mxbb_module - topic icon mod + $sql .= $limit_topics_time . " ORDER BY t.topic_type DESC, t.topic_last_post_id DESC *************** *** 402,406 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql); } --- 353,357 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql); } *************** *** 408,417 **** while( $row = $db->sql_fetchrow($result) ) { - // Newssuite op addon - if ( phpbb2_auth_item($row['forum_id'], $row['topic_type']) ) - { $topic_rowset[] = $row; $total_topics++; - } } --- 359,364 ---- *************** *** 469,475 **** define('SHOW_ONLINE', true); $page_title = $lang['View_forum'] . ' - ' . $forum_row['forum_name']; ! //+mx_forum //include($phpbb_root_path . 'includes/page_header.'.$phpEx); ! //-mx_forum $template->set_filenames(array( 'body' => 'viewforum_body.tpl') --- 416,422 ---- define('SHOW_ONLINE', true); $page_title = $lang['View_forum'] . ' - ' . $forum_row['forum_name']; ! //+mxbb_module //include($phpbb_root_path . 'includes/page_header.'.$phpEx); ! //-mxbb_module $template->set_filenames(array( 'body' => 'viewforum_body.tpl') *************** *** 479,484 **** $template->assign_vars(array( // MX ! 'LL_INDEX' => $mx_forum->title, ! 'UU_INDEX' => "?f=$forum_id", // END 'FORUM_ID' => $forum_id, --- 426,430 ---- $template->assign_vars(array( // MX ! 'UU_INDEX' => $phpbb_root_path . 'index.php?f=' . $forum_id, // END 'FORUM_ID' => $forum_id, *************** *** 720,724 **** --- 666,672 ---- $views = $topic_rowset[$i]['topic_views']; + //+mxbb_module - topic icon mod $topic_icon = !empty($topic_rowset[$i]['topic_type_image']) ? '<img align="absmiddle" src="' . PORTAL_URL . $module_root_path . TEMPLATE_ROOT_PATH .'images/topic_icons/' . $topic_rowset[$i]['topic_type_image'] . '" alt="'.$topic_rowset[$i]['topic_type_name'].'">': ''; + //-mxbb_module - topic icon mod $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; *************** *** 730,735 **** 'FORUM_ID' => $forum_id, 'TOPIC_ID' => $topic_id, ! // Topic_icon addon 'TOPIC_ICON' => $topic_icon, 'TOPIC_FOLDER_IMG' => $folder_image, 'TOPIC_AUTHOR' => $topic_author, --- 678,684 ---- 'FORUM_ID' => $forum_id, 'TOPIC_ID' => $topic_id, ! //+mxbb_module - topic icon mod 'TOPIC_ICON' => $topic_icon, + //-mxbb_module - topic icon mod 'TOPIC_FOLDER_IMG' => $folder_image, 'TOPIC_AUTHOR' => $topic_author, *************** *** 751,780 **** } ! // MX ADDON ! // Get number of articles in cat - newssuite addon ! if ( $phpbb2_config['news_mode_operate'] ) ! { ! $sql_num = "SELECT count(topic_id) AS total ! FROM " . TOPICS_TABLE . " ! WHERE "; ! // newssuite addon ! if ( $phpbb2_config['news_mode_operate'] ) ! { ! $phpbb_types_list = phpbb2_auth_item($forum_id); ! $sql_num .= " topic_type IN " . $phpbb_types_list . ' AND'; ! } ! $sql_num .= " forum_id = " . $forum_id; ! if ( !($result_num = $db->sql_query($sql_num)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Error getting total postss', '', __LINE__, __FILE__, $sql_num); ! } ! if ( $total = $db->sql_fetchrow($result_num) ) ! { ! $topics_count = $total['total']; ! } ! } $topics_count -= $total_announcements; $topics_count = ($topics_count) ? $topics_count : 1 ; $template->assign_vars(array( --- 700,728 ---- } ! //+mxbb_module ! // Get number of articles in cat - newssuite addon ! if ( $phpbb2_config['news_mode_operate'] ) ! { ! $sql_num = "SELECT count(topic_id) AS total ! FROM " . TOPICS_TABLE . " ! WHERE "; ! ! $sql_num .= " forum_id = " . $forum_id; ! if ( !($result_num = $db->sql_query($sql_num)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Error getting total postss', '', __LINE__, __FILE__, $sql_num); ! } ! if ( $total = $db->sql_fetchrow($result_num) ) ! { ! $topics_count = $total['total']; ! } ! } ! //-mxbb_module - topic icon mod $topics_count -= $total_announcements; + + //+mxbb_module $topics_count = ($topics_count) ? $topics_count : 1 ; + //-mxbb_module $template->assign_vars(array( *************** *** 808,815 **** // Page footer // ! //+mx_forum //include($phpbb_root_path . 'includes/page_tail.'.$phpEx); return; ! //-mx_forum ?> \ No newline at end of file --- 756,763 ---- // Page footer // ! //+mxbb_module //include($phpbb_root_path . 'includes/page_tail.'.$phpEx); return; ! //-mxbb_module ?> \ No newline at end of file --- NEW FILE: mx_forum.php --- <?php /*************************************************************************** * mx_index.php * ------------------- * begin : Saturday, Feb 13, 2001 * copyright : (C) 2001 The phpBB Group * email : su...@ph... * * $Id: mx_forum.php,v 1.1 2005/09/15 17:59:19 jonohlsson Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ if( !defined('IN_PORTAL') ) { die("Hacking attempt !!!"); } include_once($mx_root_path . "modules/mx_forum/includes/forum_hack.$phpEx"); include_once($mx_root_path . "modules/mx_forum/includes/phpbb_constants.$phpEx"); $phpbb_type_select_data = ( !empty( $mx_block->block_parameters['Source_phpBB_Forums']['parameter_value'] ) ) ? unserialize($mx_block->block_parameters['Source_phpBB_Forums']['parameter_value']) : array(); switch ( $mx_forum->phpbb_script ) { case 'index': include($mx_root_path . "modules/mx_forum/index.$phpEx"); break; case 'viewforum': include($mx_root_path . "modules/mx_forum/viewforum.$phpEx"); break; case 'viewtopic': include($mx_root_path . "modules/mx_forum/viewtopic.$phpEx"); break; } ?> Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/db_uninstall.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db_uninstall.php 16 Jan 2005 01:02:02 -0000 1.4 --- db_uninstall.php 15 Sep 2005 17:59:19 -0000 1.5 *************** *** 2,12 **** /** * * ------------------------------------------------------------------------ ! * subject : mx-portal, CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 MX-System * email : jon...@ho... * project site : www.mx-system.com * - * description : * ------------------------------------------------------------------------- * --- 2,11 ---- /** * * ------------------------------------------------------------------------ ! * subject : mxBB-Portal - CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 mxBB-Portal * email : jon...@ho... * project site : www.mx-system.com * * ------------------------------------------------------------------------- * *************** *** 24,33 **** if ( !defined( 'IN_ADMIN' ) ) { ! $mx_root_path = '../../'; include( $mx_root_path . 'extension.inc' ); include( $mx_root_path . 'common.' . $phpEx ); - // Start session management - $userdata = session_pagestart( $user_ip, PAGE_INDEX ); mx_init_userprefs( $userdata ); --- 23,30 ---- if ( !defined( 'IN_ADMIN' ) ) { ! $mx_root_path = './../../'; include( $mx_root_path . 'extension.inc' ); include( $mx_root_path . 'common.' . $phpEx ); // Start session management $userdata = session_pagestart( $user_ip, PAGE_INDEX ); mx_init_userprefs( $userdata ); *************** *** 35,59 **** if ( !$userdata['session_logged_in'] ) { ! die( "Hacking attempt(3)" ); } if ( $userdata['user_level'] != ADMIN ) { ! die( "Hacking attempt(4)" ); } - // End session management - } $sql = array( "DROP TABLE IF EXISTS " . $mx_table_prefix . "phpbb_plugin_config", ); - $message .= mx_do_install_upgrade( $sql ); - echo "<br /><br />"; echo "<table width=\"90%\" align=\"center\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">"; echo "<tr><th class=\"thHead\" align=\"center\">Module Installation/Upgrading/Uninstalling Information - module specific db tables</th></tr>"; ! echo "<tr><td class=\"row1\" align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>"; echo "</table><br />"; --- 32,53 ---- if ( !$userdata['session_logged_in'] ) { ! die( "Hacking attempt(1)" ); } if ( $userdata['user_level'] != ADMIN ) { ! die( "Hacking attempt(2)" ); } // End session management } + $sql = array( "DROP TABLE IF EXISTS " . $mx_table_prefix . "phpbb_plugin_config", ); echo "<br /><br />"; echo "<table width=\"90%\" align=\"center\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">"; echo "<tr><th class=\"thHead\" align=\"center\">Module Installation/Upgrading/Uninstalling Information - module specific db tables</th></tr>"; ! echo "<tr><td class=\"row1\" align=\"left\"><span class=\"gen\">" . mx_do_install_upgrade( $sql ) . "</span></td></tr>"; echo "</table><br />"; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/db_upgrade.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** db_upgrade.php 6 Mar 2005 01:12:17 -0000 1.5 --- db_upgrade.php 15 Sep 2005 17:59:19 -0000 1.6 *************** *** 2,12 **** /** * * ------------------------------------------------------------------------ ! * subject : mx-portal, CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 MX-System * email : jon...@ho... * project site : www.mx-system.com * - * description : * ------------------------------------------------------------------------- * --- 2,11 ---- /** * * ------------------------------------------------------------------------ ! * subject : mxBB-Portal - CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 mxBB-Portal * email : jon...@ho... * project site : www.mx-system.com * * ------------------------------------------------------------------------- * *************** *** 22,37 **** define( 'IN_PORTAL', true ); - - $mx_module_version = 'mxBB phpBB Module 1.0.0'; - $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb" >phpBB</a>'; - if ( !defined( 'IN_ADMIN' ) ) { ! $mx_root_path = '../../'; include( $mx_root_path . 'extension.inc' ); include( $mx_root_path . 'common.' . $phpEx ); - // Start session management - $userdata = session_pagestart( $user_ip, PAGE_INDEX ); mx_init_userprefs( $userdata ); --- 21,30 ---- define( 'IN_PORTAL', true ); if ( !defined( 'IN_ADMIN' ) ) { ! $mx_root_path = './../../'; include( $mx_root_path . 'extension.inc' ); include( $mx_root_path . 'common.' . $phpEx ); // Start session management $userdata = session_pagestart( $user_ip, PAGE_INDEX ); mx_init_userprefs( $userdata ); *************** *** 39,54 **** if ( !$userdata['session_logged_in'] ) { ! die( "Hacking attempt(3)" ); } if ( $userdata['user_level'] != ADMIN ) { ! die( "Hacking attempt(4)" ); } - // End session management - } $sql = array(); --- 32,48 ---- if ( !$userdata['session_logged_in'] ) { ! die( "Hacking attempt(1)" ); } if ( $userdata['user_level'] != ADMIN ) { ! die( "Hacking attempt(2)" ); } // End session management } + $mx_module_version = 'mxBB phpBB Module 1.0.0'; + $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb" >phpBB</a>'; + $sql = array(); Index: mx_forum.pak =================================================================== RCS file: /cvsroot/mxbb/mx_forum/mx_forum.pak,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_forum.pak 18 Feb 2005 10:06:52 -0000 1.4 --- mx_forum.pak 15 Sep 2005 17:59:19 -0000 1.5 *************** *** 2,7 **** New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:51=+:82=+:phpBB: FAQ (Forum)=+:=+:faq.php=+: - parameter=+:82=+:165=+:mode=+:Text=+:faq=+: - option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - phpBB: FAQ (Forum)=+:Demo block=+:82=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 --- 2,5 ---- *************** *** 11,17 **** block=+:=+:Demo - phpBB: GroupCP=+:Demo block=+:83=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:51=+:84=+:phpBB: Index=+:=+:index.php=+:modules/mx_forum/admin/phpbb_config.php ! parameter=+:84=+:166=+:phpbb_type_select=+:Text=+:array('init'=>'1')=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - phpBB: Index=+:Demo block=+:84=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 --- 9,14 ---- block=+:=+:Demo - phpBB: GroupCP=+:Demo block=+:83=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:51=+:84=+:phpBB: Index=+:=+:index.php=+: ! parameter=+:84=+:166=+:phpbb_type_select=+:phpbb_type_select=+:=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - phpBB: Index=+:Demo block=+:84=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 *************** *** 45,51 **** block=+:=+:Demo - phpBB: Search=+:Demo block=+:91=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:51=+:92=+:phpBB: ViewForum=+:=+:viewforum.php=+:modules/mx_forum/admin/phpbb_config.php ! parameter=+:92=+:167=+:phpbb_type_select=+:Text=+:array('init'=>'1')=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - phpBB: ViewForum=+:Demo block=+:92=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 --- 42,47 ---- block=+:=+:Demo - phpBB: Search=+:Demo block=+:91=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:51=+:92=+:phpBB: ViewForum=+:=+:viewforum.php=+: ! parameter=+:92=+:167=+:phpbb_type_select=+:phpbb_type_select=+:=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - phpBB: ViewForum=+:Demo block=+:92=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 *************** *** 55,61 **** block=+:=+:Demo - phpBB: ViewOnline=+:Demo block=+:93=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:51=+:94=+:phpBB: ViewTopic=+:=+:viewtopic.php=+:modules/mx_forum/admin/phpbb_config.php ! parameter=+:94=+:316=+:phpbb_type_select=+:Text=+:array('init'=>'1')=+: ! option=+:0=+:0=+:0=+:endoflist=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - phpBB: ViewTopic=+:Demo block=+:94=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 --- 51,56 ---- block=+:=+:Demo - phpBB: ViewOnline=+:Demo block=+:93=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:51=+:94=+:phpBB: ViewTopic=+:=+:viewtopic.php=+: ! parameter=+:94=+:316=+:phpbb_type_select=+:phpbb_type_select=+:=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Demo - phpBB: ViewTopic=+:Demo block=+:94=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 |
|
From: Jon O. <jon...@us...> - 2005-09-10 22:08:33
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6845/modules/mx_coreblocks Modified Files: mx_forum.php mx_poll.php mx_search.php Log Message: updated for phpBB 2.0.17 Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_poll.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_poll.php 6 Sep 2005 18:51:57 -0000 1.21 --- mx_poll.php 10 Sep 2005 22:08:24 -0000 1.22 *************** *** 165,170 **** if ( !($result = $db->sql_query($sql)) ) { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; return; //message_die(GENERAL_ERROR, "Could not obtain vote data for this topic", '', __LINE__, __FILE__, $sql); } --- 165,170 ---- if ( !($result = $db->sql_query($sql)) ) { ! $mx_block->show_title = false; ! $mx_block->show_block = false; return; //message_die(GENERAL_ERROR, "Could not obtain vote data for this topic", '', __LINE__, __FILE__, $sql); } *************** *** 184,189 **** if ( !($result = $db->sql_query($sql)) ) { ! $block_rows[$block]['show_title'] = 0; ! $block_rows[$block]['show_block'] = 0; return; //message_die(GENERAL_ERROR, "Could not obtain user vote data for this topic", '', __LINE__, __FILE__, $sql); } --- 184,189 ---- if ( !($result = $db->sql_query($sql)) ) { ! $mx_block->show_title = false; ! $mx_block->show_block = false; return; //message_die(GENERAL_ERROR, "Could not obtain user vote data for this topic", '', __LINE__, __FILE__, $sql); } Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_search.php 26 Apr 2005 00:08:17 -0000 1.5 --- mx_search.php 10 Sep 2005 22:08:24 -0000 1.6 *************** *** 140,143 **** --- 140,149 ---- for( $i = 0; $i < count( $split_search ); $i++ ) { + if (preg_match('#^[\*%]+$#', trim($split_search[$i])) || preg_match('#^[^\*]{1,2}$#', str_replace(array('*', '%'), '', trim($split_search[$i])))) + { + $split_search[$i] = ''; + continue; + } + switch ( $split_search[$i] ) { Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_forum.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_forum.php 25 Apr 2005 21:48:36 -0000 1.7 --- mx_forum.php 10 Sep 2005 22:08:24 -0000 1.8 *************** *** 88,91 **** --- 88,92 ---- // removing them // + /* $total_posts = get_db_stat('postcount'); $total_users = get_db_stat('usercount'); *************** *** 119,123 **** $l_total_user_s = $lang['Registered_users_total']; } ! // --- 120,124 ---- $l_total_user_s = $lang['Registered_users_total']; } ! */ // *************** *** 281,287 **** 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), ! 'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), ! 'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! 'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), 'FORUM_IMG' => $images['forum'], --- 282,291 ---- 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), ! // ! // Removed stats ! // ! //'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), ! //'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! //'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), 'FORUM_IMG' => $images['forum'], |
|
From: Jon O. <jon...@us...> - 2005-09-10 22:08:33
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6845/templates/subSilver/admin Modified Files: index_body.tpl Log Message: updated for phpBB 2.0.17 Index: index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/index_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index_body.tpl 27 Apr 2005 21:51:36 -0000 1.2 --- index_body.tpl 10 Sep 2005 22:08:24 -0000 1.3 *************** *** 71,73 **** --- 71,78 ---- <!-- END guest_user_row --> </table> + + <h1>{L_VERSION_INFORMATION}</h1> + + {VERSION_INFO} + <br clear="all" /> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2005-09-10 22:08:33
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6845/language/lang_english Modified Files: lang_admin.php Log Message: updated for phpBB 2.0.17 Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** lang_admin.php 9 Sep 2005 08:53:03 -0000 1.42 --- lang_admin.php 10 Sep 2005 22:08:24 -0000 1.43 *************** *** 25,28 **** --- 25,30 ---- // setlocale(LC_ALL, "en"); + $lang['mxBB_adminCP'] = "mxBB-Portal Administration"; + // // Left AdminCP Panel |
|
From: Jon O. <jon...@us...> - 2005-09-10 22:08:33
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6845/includes Modified Files: mx_functions_admincp.php Log Message: updated for phpBB 2.0.17 Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_functions_admincp.php 9 Sep 2005 16:38:20 -0000 1.6 --- mx_functions_admincp.php 10 Sep 2005 22:08:24 -0000 1.7 *************** *** 1418,1422 **** // Get parent page id, to update cache // ! $sql = " SELECT page_id FROM " . COLUMN_BLOCK_TABLE . " WHERE column_id = '" . $column_id . "'"; if( !($result = $db->sql_query($sql)) ) { --- 1418,1422 ---- // Get parent page id, to update cache // ! $sql = " SELECT page_id FROM " . COLUMN_TABLE . " WHERE column_id = '" . $column_id . "'"; if( !($result = $db->sql_query($sql)) ) { |
|
From: Jon O. <jon...@us...> - 2005-09-10 22:08:33
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6845/admin Modified Files: index.php page_header_admin.php pagestart.php Log Message: updated for phpBB 2.0.17 Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pagestart.php 20 Aug 2005 18:19:11 -0000 1.13 --- pagestart.php 10 Sep 2005 22:08:23 -0000 1.14 *************** *** 53,75 **** // - // - // Security - used for block_edits - // - /* - $block_id = $mx_request_vars->post('block_id', MX_TYPE_INT, '0'); - - if ( !empty( $block_id ) ) - { - $block_config = read_block_config( $block_id, false ); - - $block_edit_auth = array(); - $block_edit_auth = block_auth( AUTH_EDIT, $block_id , $userdata, $block_config[$block_id]['auth_edit'], $block_config[$block_id]['auth_edit_group'] ); - } - else - { - $block_edit_auth['auth_edit'] = false; - } - */ - if ( !$userdata['session_logged_in'] ) { --- 53,56 ---- *************** *** 89,92 **** --- 70,79 ---- } + if (!$userdata['session_admin']) + { + mx_redirect(append_sid("login.php?redirect=admin/index.$phpEx&admin=1", true)); + } + + if( empty($no_page_header) ) { Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** page_header_admin.php 28 Apr 2005 04:13:50 -0000 1.9 --- page_header_admin.php 10 Sep 2005 22:08:23 -0000 1.10 *************** *** 102,106 **** 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], // MX ADDON ! 'L_MX_ADMIN' => 'mxBB-Portal Administration', 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'U_PORTAL_ROOT_PATH' => PORTAL_URL, --- 102,106 ---- 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], // MX ADDON ! 'L_MX_ADMIN' => $lang['mxBB_adminCP'], 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'U_PORTAL_ROOT_PATH' => PORTAL_URL, Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** index.php 20 Aug 2005 18:19:11 -0000 1.9 --- index.php 10 Sep 2005 22:08:23 -0000 1.10 *************** *** 763,766 **** --- 763,832 ---- } + // Check for new version + $current_version = explode('.', '2' . $board_config['version']); + $minor_revision = (int) $current_version[2]; + + $errno = 0; + $errstr = $version_info = ''; + + if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr)) + { + @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); + @fputs($fsock, "HOST: www.phpbb.com\r\n"); + @fputs($fsock, "Connection: close\r\n\r\n"); + + $get_info = false; + while (!@feof($fsock)) + { + if ($get_info) + { + $version_info .= @fread($fsock, 1024); + } + else + { + if (@fgets($fsock, 1024) == "\r\n") + { + $get_info = true; + } + } + } + @fclose($fsock); + + $version_info = explode("\n", $version_info); + $latest_head_revision = (int) $version_info[0]; + $latest_minor_revision = (int) $version_info[2]; + $latest_version = (int) $version_info[0] . '.' . (int) $version_info[1] . '.' . (int) $version_info[2]; + + if ($latest_head_revision == 2 && $minor_revision == $latest_minor_revision) + { + $version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>'; + } + else + { + $version_info = '<p style="color:red">' . $lang['Version_not_up_to_date']; + $version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>'; + } + } + else + { + if ($errstr) + { + $version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>'; + } + else + { + $version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>'; + } + } + + $version_info .= '<p>' . $lang['Mailing_list_subscribe_reminder'] . '</p>'; + + + $template->assign_vars(array( + 'VERSION_INFO' => $version_info, + 'L_VERSION_INFORMATION' => $lang['Version_information']) + ); + + $template->pparse("body"); |
|
From: Jon O. <jon...@us...> - 2005-09-10 22:08:33
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6845 Modified Files: common.php login.php Log Message: updated for phpBB 2.0.17 Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** login.php 28 Apr 2005 14:26:26 -0000 1.8 --- login.php 10 Sep 2005 22:08:24 -0000 1.9 *************** *** 54,58 **** if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) ) { ! if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] ) { $username = isset($HTTP_POST_VARS['username']) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; --- 54,58 ---- if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) ) { ! if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && (!$userdata['session_logged_in'] || isset($HTTP_POST_VARS['admin'])) ) { $username = isset($HTTP_POST_VARS['username']) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; *************** *** 79,83 **** $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; ! $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin); if( $session_id ) --- 79,84 ---- $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; ! $admin = (isset($HTTP_POST_VARS['admin'])) ? 1 : 0; ! $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin); if( $session_id ) *************** *** 160,164 **** // user not already logged in // ! if( !$userdata['session_logged_in'] ) { $page_title = $lang['Login']; --- 161,165 ---- // user not already logged in // ! if( !$userdata['session_logged_in'] || (isset($HTTP_GET_VARS['admin']) && $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN)) { $page_title = $lang['Login']; *************** *** 209,212 **** --- 210,214 ---- $s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />'; + $s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '<input type="hidden" name="admin" value="1" />' : ''; make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx, $forum_id); *************** *** 214,218 **** 'USERNAME' => $username, ! 'L_ENTER_PASSWORD' => $lang['Enter_password'], 'L_SEND_PASSWORD' => $lang['Forgotten_password'], --- 216,220 ---- 'USERNAME' => $username, ! 'L_ENTER_PASSWORD' => (isset($HTTP_GET_VARS['admin'])) ? $lang['Admin_reauthenticate'] : $lang['Enter_password'], 'L_SEND_PASSWORD' => $lang['Forgotten_password'], Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** common.php 6 Sep 2005 18:51:56 -0000 1.36 --- common.php 10 Sep 2005 22:08:24 -0000 1.37 *************** *** 204,209 **** str_replace("//", "/", $phpbb_root_path); - include_once($mx_root_path . 'config.' . $phpEx); - include_once($phpbb_root_path . 'includes/constants.' . $phpEx); include_once($mx_root_path . 'includes/template.' . $phpEx); --- 204,207 ---- |
|
From: Jon O. <jon...@us...> - 2005-09-09 17:52:49
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18141/install/schemas Modified Files: mysql_schema_install.sql Log Message: updating, fixing reported errors Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mysql_schema_install.sql 9 Sep 2005 08:57:17 -0000 1.6 --- mysql_schema_install.sql 9 Sep 2005 17:52:00 -0000 1.7 *************** *** 518,528 **** - - # - # Dumping data for table 'mx_table_portal' - # - INSERT INTO mx_table_portal VALUES("1", "mxBB-Portal (Fresh install)", "http://127.0.0.1/phpBB2/", "http://127.0.0.1/", "2.8 - RC1", "0", "1", "1126035152"); - - # # Table structure for table 'mx_table_search_results' --- 518,521 ---- |
|
From: Jon O. <jon...@us...> - 2005-09-09 17:52:49
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18141/admin Modified Files: admin_mx_module.php Log Message: updating, fixing reported errors Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** admin_mx_module.php 8 Sep 2005 21:16:18 -0000 1.34 --- admin_mx_module.php 9 Sep 2005 17:52:00 -0000 1.35 *************** *** 162,165 **** --- 162,167 ---- 'L_MODULE_NAME' => $lang['Module_name'], 'L_MODULE_DESC' => $lang['Module_desc'], + 'L_MODULE_PATH' => $lang['Module_path'], + 'L_MODULE_INCLUDE_ADMIN' => $lang['Module_include_admin'], 'L_IMPORT_PACK' => $lang['import_module_pack'], 'L_UPGRADE_PACK' => $lang['upgrade_module_pack'], |
|
From: Jon O. <jon...@us...> - 2005-09-09 16:50:06
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3600/install/schemas Modified Files: upgrade_schemas_map.php Added Files: mysql_schema_upgrade_to_2.8_rc5.sql Removed Files: mysql_schema_upgrade_to_2.801.sql Log Message: updated install schemes --- mysql_schema_upgrade_to_2.801.sql DELETED --- --- NEW FILE: mysql_schema_upgrade_to_2.8_rc5.sql --- # # mxBB-Portal - MySQL Schema - Upgrade "2.8 - RC4" # # $Id: mysql_schema_upgrade_to_2.8_rc5.sql,v 1.1 2005/09/09 16:49:57 jonohlsson Exp $ # # ------------------------------------------------------------ # # Changed Fields in Table `mx_block` (update for new permissions) # ALTER TABLE mx_table_block MODIFY auth_view_group VARCHAR(255) NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block MODIFY auth_edit_group VARCHAR(255) NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block MODIFY auth_delete_group VARCHAR(255) NOT NULL DEFAULT '0'; # ------------------------------------------------------------ # # New Fields in Table `mx_block` # ALTER TABLE mx_table_block ADD auth_moderator_group VARCHAR(255) NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block ADD show_title TINYINT(2) UNSIGNED NOT NULL DEFAULT '1'; ALTER TABLE mx_table_block ADD show_block TINYINT(2) UNSIGNED NOT NULL DEFAULT '1'; ALTER TABLE mx_table_block ADD show_stats TINYINT(2) UNSIGNED NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block ADD block_time VARCHAR(255) BINARY NOT NULL DEFAULT ''; ALTER TABLE mx_table_block ADD block_editor_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0'; # ------------------------------------------------------------ # # New/Changed Fields in Table `mx_block_system_parameter` // Maybe this only works for mySQL # ALTER TABLE mx_table_block_system_parameter CHANGE bbcode_uid parameter_opt TEXT; ALTER TABLE mx_table_block_system_parameter ADD sub_id INT(255) UNSIGNED NOT NULL DEFAULT '0'; ALTER TABLE mx_table_block_system_parameter DROP PRIMARY KEY, ADD PRIMARY KEY (block_id, parameter_id, sub_id); # ------------------------------------------------------------ # # New Fields in Table `mx_page` (update for new permissions) # ALTER TABLE mx_table_page ADD page_desc varchar(255) default NULL; ALTER TABLE mx_table_page ADD auth_moderator_group varchar(255) NOT NULL default '0'; ALTER TABLE mx_table_page ADD page_graph_border varchar(255) NOT NULL default ''; # ------------------------------------------------------------ # # Changed Fields in Table `mx_page` (update for new permissions) # ALTER TABLE mx_table_page MODIFY auth_view_group VARCHAR(255) NOT NULL DEFAULT '0'; # ------------------------------------------------------------ # # New Fields in Table `mx_table_menu_categories` # ALTER TABLE mx_table_menu_categories ADD cat_url smallint(5) unsigned default '0'; ALTER TABLE mx_table_menu_categories ADD cat_target tinyint(2) unsigned NOT NULL default '0'; # ------------------------------------------------------------ # # New Fields in Table `mx_module` # ALTER TABLE mx_table_module ADD module_version varchar(255) default NULL; ALTER TABLE mx_table_module ADD module_copy text default NULL; # ------------------------------------------------------------ # # Table structure for table `mx_wordlist` # CREATE TABLE mx_table_wordlist ( word_text VARCHAR(50) BINARY NOT NULL DEFAULT '', word_id MEDIUMINT(8) UNSIGNED NOT NULL AUTO_INCREMENT, word_common TINYINT(1) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY (word_text), KEY word_id (word_id) ); # ------------------------------------------------------------ # # Table structure for table `mx_search_results` # CREATE TABLE mx_table_search_results ( search_id INT(11) UNSIGNED NOT NULL DEFAULT '0', session_id VARCHAR(32) NOT NULL DEFAULT '', search_array TEXT NOT NULL, PRIMARY KEY (search_id), KEY session_id (session_id) ); # ------------------------------------------------------------ # # Table structure for table `mx_wordmatch` # CREATE TABLE mx_table_wordmatch ( block_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', word_id MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0', title_match TINYINT(1) NOT NULL DEFAULT '0', KEY block_id (block_id), KEY word_id (word_id) ); # ------------------------------------------------------------ # # New Fields in Table `mx_parameter` # ALTER TABLE mx_table_parameter ADD parameter_order smallint(5) unsigned NOT NULL default '0'; # # Delete Table `mx_parameter_option` # DROP TABLE IF EXISTS mx_table_parameter_option; # ------------------------------------------------------------ # # New Fields in Table `mx_portal` # ALTER TABLE mx_table_portal ADD portal_recached VARCHAR(255) BINARY NOT NULL DEFAULT ''; ALTER TABLE mx_table_portal ADD mx_use_cache smallint(5) unsigned NOT NULL default '1'; # # Table structure for table 'mx_table_page_templates' # DROP TABLE IF EXISTS mx_table_page_templates; CREATE TABLE `mx_table_page_templates` ( `page_template_id` smallint(3) unsigned NOT NULL auto_increment, `template_name` varchar(255) NOT NULL default '', PRIMARY KEY (`page_template_id`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_page_templates' # INSERT INTO mx_table_page_templates VALUES("1", "NONE"); INSERT INTO mx_table_page_templates VALUES("2", "Two-Columns left1"); INSERT INTO mx_table_page_templates VALUES("3", "Two-Columns right"); INSERT INTO mx_table_page_templates VALUES("4", "Three-Columns"); # # Table structure for table 'mx_table_column_templates' # DROP TABLE IF EXISTS mx_table_column_templates; CREATE TABLE `mx_table_column_templates` ( `column_template_id` smallint(5) unsigned NOT NULL auto_increment, `column_title` varchar(100) default '0', `column_order` smallint(5) unsigned NOT NULL default '0', `column_size` varchar(5) default '0', `page_template_id` smallint(5) NOT NULL default '0', PRIMARY KEY (`column_template_id`), KEY `cat_order` (`column_order`) ) TYPE=MyISAM; # # Dumping data for table 'mx_table_column_templates' # INSERT INTO mx_table_column_templates VALUES("1", "Left", "40", "200", "2"); INSERT INTO mx_table_column_templates VALUES("2", "Main", "50", "100%", "2"); INSERT INTO mx_table_column_templates VALUES("3", "Main", "10", "100%", "3"); INSERT INTO mx_table_column_templates VALUES("4", "Right", "20", "200", "3"); INSERT INTO mx_table_column_templates VALUES("5", "Left", "10", "180", "4"); INSERT INTO mx_table_column_templates VALUES("6", "Middle", "20", "100%", "4"); INSERT INTO mx_table_column_templates VALUES("7", "Right", "30", "180", "4"); # # Some fixes related to the navigation menu block being modulized # SET module = SELECT MAX(module_id) AS next_id FROM mx_table_module; SET module.next_id = module.next_id + 1; INSERT INTO mx_table_module VALUES('{module.next_id}', "Navigation Menu", "modules/mx_navmenu/", "mxBB Navigation Module", "0", NULL, "mzBB Core Module"); SET function = SELECT * FROM mx_table_function WHERE function_file = 'mx_menu_nav.php'; UPDATE mx_table_function SET module_id = '{module.next_id}', function_name = 'Navigation Menu', function_desc = 'This is the function for Navigation Menu Blocks', function_admin = '' WHERE function_id = '{function.function_id}'; # # Updating the TextBlocks # SET function = SELECT * FROM mx_table_function WHERE function_file = 'mx_textblock_bbcode.php'; UPDATE mx_table_function SET function_name = 'TextBlock (phpBB)', function_desc = 'BBcodes, html and smilies - defined by phpBB config', function_admin = '' WHERE function_id = '{function.function_id}'; SET function = SELECT * FROM mx_table_function WHERE function_file = 'mx_textblock_html.php'; UPDATE mx_table_function SET function_name = 'TextBlock (Html/wysiwyg)', function_desc = 'Plain html textblock, or featuring a wysiwyg editor', function_admin = '' WHERE function_id = '{function.function_id}'; SET function = SELECT * FROM mx_table_function WHERE function_file = 'mx_textblock_multi.php'; UPDATE mx_table_function SET function_name = 'TextBlock (Customized)', function_desc = 'Textblock, featuring block defined settings', function_admin = '' WHERE function_id = '{function.function_id}'; # # Finally, all core blocks have been moved to the modules/mx_coreblocks folder # SET function = SELECT * FROM mx_table_module WHERE module_path = './'; UPDATE mx_table_module SET module_name = 'Core Blocks', SET module_desc = 'mxBB Core (standard) Module', SET module_path = 'modules/mx_coreblocks/', WHERE module_id = '{module.module_id}'; Index: upgrade_schemas_map.php =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/upgrade_schemas_map.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** upgrade_schemas_map.php 9 Sep 2005 08:57:17 -0000 1.6 --- upgrade_schemas_map.php 9 Sep 2005 16:49:57 -0000 1.7 *************** *** 40,45 **** array('schema' => 'upgrade_to_2.706' , 'sql' => "SELECT portal_version FROM mx_table_portal"), array('schema' => 'upgrade_to_2.7.1' , 'sql' => "SELECT link_target FROM mx_table_menu_nav"), ! array('schema' => 'upgrade_to_2.7.4' , 'sql' => "SELECT page_template_id FROM mx_table_page_templates"), ! array('schema' => 'upgrade_to_2.8.RC5' , 'sql' => "SELECT parameter_order FROM mx_table_parameter") ); --- 40,44 ---- array('schema' => 'upgrade_to_2.706' , 'sql' => "SELECT portal_version FROM mx_table_portal"), array('schema' => 'upgrade_to_2.7.1' , 'sql' => "SELECT link_target FROM mx_table_menu_nav"), ! array('schema' => 'upgrade_to_2.8_rc5' , 'sql' => "SELECT parameter_order FROM mx_table_parameter") ); |
|
From: Jon O. <jon...@us...> - 2005-09-09 16:38:28
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1122/includes Modified Files: mx_functions_admincp.php Log Message: forgotten images removed bad config.php Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_functions_admincp.php 9 Sep 2005 08:53:03 -0000 1.5 --- mx_functions_admincp.php 9 Sep 2005 16:38:20 -0000 1.6 *************** *** 2273,2277 **** { $module_data = explode($delimeter, trim($fcontents[$i])); ! switch( $module_data[0] ) { --- 2273,2277 ---- { $module_data = explode($delimeter, trim($fcontents[$i])); ! echo($module_data[0].'<br>'); switch( $module_data[0] ) { *************** *** 2364,2369 **** --- 2364,2371 ---- $safe_row = get_info(PARAMETER_TABLE, 'function_id', $function_id, 'parameter_name', $module_data['3']); + if( $module_data['4'] == 'endoflist' ) { + /* $old_items = $this->get_old_items(PARAMETER_TABLE, 'function_id', $function_id, 'parameter_id', $exists_par_ids); *************** *** 2376,2379 **** --- 2378,2382 ---- $delete_par = true; } + */ } else if( $safe_row ) |
|
From: Jon O. <jon...@us...> - 2005-09-09 16:38:28
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1122 Modified Files: config.php Log Message: forgotten images removed bad config.php Index: config.php =================================================================== RCS file: /cvsroot/mxbb/core/config.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** config.php 8 Sep 2005 21:16:18 -0000 1.8 --- config.php 9 Sep 2005 16:38:20 -0000 1.9 *************** *** 6,25 **** // This file must be put into the mxBB-Portal directory, not into the phpBB directory. - $dbms = 'mysql'; - - $dbhost = 'localhost'; - $dbname = '276'; - $dbuser = 'Jon'; - $dbpasswd = '1234'; - - $mx_table_prefix = 'mx_'; - $table_prefix = 'phpbb_'; - - $phpbb_root_path = $mx_root_path . 'core276/phpBB2/'; - - define('MX_INSTALLED', true); - - define('PHPBB_INSTALLED', true); ?> \ No newline at end of file --- 6,10 ---- |
|
From: Jon O. <jon...@us...> - 2005-09-09 16:38:28
|
Update of /cvsroot/mxbb/core/templates/subSilver/images/admin_icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1122/templates/subSilver/images/admin_icons Added Files: 2105.gif contract.gif expand.gif icon_block.gif icon_dot.gif icon_edit.gif icon_function.gif icon_module.gif icon_page.gif icon_page_column.gif icon_parameter.gif icon_parameter_20.gif icon_search.gif nav_menu.gif script.gif Log Message: forgotten images removed bad config.php --- NEW FILE: icon_page_column.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_function.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_parameter_20.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_block.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_edit.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: expand.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_menu.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 2105.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_module.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: script.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_search.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: contract.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_parameter.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_page.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_dot.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Jon O. <jon...@us...> - 2005-09-09 16:36:16
|
Update of /cvsroot/mxbb/core/templates/subSilver/images/admin_icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv763/admin_icons Log Message: Directory /cvsroot/mxbb/core/templates/subSilver/images/admin_icons added to the repository |
|
From: Jon O. <jon...@us...> - 2005-09-09 14:15:44
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32190/includes Modified Files: mx_functions_core.php Log Message: fixing up Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_functions_core.php 9 Sep 2005 08:53:03 -0000 1.6 --- mx_functions_core.php 9 Sep 2005 14:15:35 -0000 1.7 *************** *** 1041,1045 **** function _parameter_data_exist() { - //echo(var_export($this->block_parameters)); if ( !empty( $this->block_parameters ) ) { --- 1041,1044 ---- |
|
From: Jon O. <jon...@us...> - 2005-09-09 14:15:44
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32190/modules/mx_textblocks/admin Modified Files: mx_module_defs.php Log Message: fixing up Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_module_defs.php 8 Sep 2005 21:16:19 -0000 1.4 --- mx_module_defs.php 9 Sep 2005 14:15:35 -0000 1.5 *************** *** 22,27 **** /********************************************************************************\ ! | Class: mx_blockcp_parameter ! | The mx_blockcp_parameter object provides extra module block parameters, added to the standard core parameters. | | Usage examples: --- 22,27 ---- /********************************************************************************\ ! | Class: mx_module_defs ! | The mx_module_defs object define extra module block parameters, added to the standard core parameters. | | Usage examples: *************** *** 29,37 **** \********************************************************************************/ - // - // The following flags are class specific options - // - //define('MX_ALL_DATA' , -1); // Flag - write all data - class mx_module_defs { --- 29,32 ---- |
|
From: Jon O. <jon...@us...> - 2005-09-09 09:15:22
|
Update of /cvsroot/mxbb/core/modules/mx_ajax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25208/modules/mx_ajax Removed Files: prototype.js rico.js Log Message: fixing up --- prototype.js DELETED --- --- rico.js DELETED --- |
|
From: Jon O. <jon...@us...> - 2005-09-09 09:15:22
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25208/modules/mx_textblocks/language/lang_english Added Files: lang_admin.php Log Message: fixing up --- NEW FILE: lang_admin.php --- <?php /*************************************************************************** * lang_kb.php * ------------------- * begin : Sunday, Mar 31, 2003 * copyright : (C) 2001 The phpBB Group * email : su...@ph... * * $Id: lang_admin.php,v 1.1 2005/09/09 09:15:13 jonohlsson Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ // // Parameter Types // $lang['ParType_phpBBTextBlock'] = "Standard phpBB TextBlock"; $lang['ParType_phpBBTextBlock_info'] = "This is a Standard phpBB TextBlock, parsing bbcodes, html och smilies as defined by the phpBB config settings."; $lang['ParType_CustomizedTextBlock'] = "Customized TextBlock"; $lang['ParType_CustomizedTextBlock_info'] = "This is a Customized TextBlock, parsing bbcodes, html och smilies as defined by this block settings"; $lang['ParType_WysiwygTextBlock'] = "Wysiwyg TextBlock"; $lang['ParType_WysiwygTextBlock_info'] = "This is a Wysiwyg TextBlock, featuring a html editor"; // // Parameter Names // $lang['block_style'] = "Block Border:"; $lang['title_style'] = "Title Header Style:"; $lang['allow_bbcode'] = "Allow BBCodes:"; $lang['allow_html'] = "Allow Html:"; $lang['allow_smilies'] = "Allow smilies:"; $lang['html_tags'] = "Allowed Html tags:"; $lang['block_style_explain'] = "Show border around textblock:"; $lang['title_style_explain'] = "Use css style for title row:"; ?> |
|
From: Jon O. <jon...@us...> - 2005-09-09 09:15:21
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25208/templates/subSilver/admin Added Files: mx_blockcp_admin_body.tpl mx_core_parameters.tpl mx_modulecp_admin_body.tpl mx_pagecp_admin_body.tpl Log Message: fixing up --- NEW FILE: mx_modulecp_admin_body.tpl --- <script type="text/javascript" src="../modules/mx_ajax/DynamicOptionList.js"></script> <script type="text/javascript"> function getCookie(name) { var cookies = document.cookie; var start = cookies.indexOf(name + '='); if( start < 0 ) return null; var len = start + name.length + 1; var end = cookies.indexOf(';', len); if( end < 0 ) end = cookies.length; return unescape(cookies.substring(len, end)); } function setCookie(name, value, expires, path, domain, secure) { document.cookie = name + '=' + escape (value) + ((expires) ? '; expires=' + ( (expires == 'never') ? 'Thu, 31-Dec-2099 23:59:59 GMT' : expires.toGMTString() ) : '') + ((path) ? '; path=' + path : '') + ((domain) ? '; domain=' + domain : '') + ((secure) ? '; secure' : ''); } function delCookie(name, path, domain) { if( getCookie(name) ) { document.cookie = name + '=;expires=Thu, 01-Jan-1970 00:00:01 GMT' + ((path) ? '; path=' + path : '') + ((domain) ? '; domain=' + domain : ''); } } function handleError() { return true; } window.onerror = handleError; function menuCat(id, mode, visible) { this.cat_id = id; this.menu_mode = mode; this.status = visible != '' ? visible : 'none'; } var menuCats = new Array(); <!-- BEGIN module --> menuCats['adminModule_{module.MODULE_ID}'] = new menuCat('{module.MODULE_ID}', 'adminModule_', '{module.VISIBLE}'); <!-- BEGIN function --> menuCats['adminFunction_{module.function.FUNCTION_ID}'] = new menuCat('{module.function.FUNCTION_ID}', 'adminFunction_', '{module.function.VISIBLE_FUNC}'); menuCats['adminFunctionDelete_{module.function.FUNCTION_ID}'] = new menuCat('{module.function.FUNCTION_ID}', 'adminFunctionDelete_', '{module.function.VISIBLE_DELETE}'); menuCats['adminParameter_{module.function.FUNCTION_ID}'] = new menuCat('{module.function.FUNCTION_ID}', 'adminParameter_', '{module.function.VISIBLE_PAR}'); menuCats['adminBlock_{module.function.FUNCTION_ID}'] = new menuCat('{module.function.FUNCTION_ID}', 'adminBlock_', '{module.function.VISIBLE_BLOCK}'); <!-- BEGIN parameter --> menuCats['adminParEdit_{module.function.parameter.PARAMETER_ID}'] = new menuCat('{module.function.parameter.PARAMETER_ID}', 'adminParEdit_', '{module.function.parameter.VISIBLE}'); menuCats['adminParDelete_{module.function.parameter.PARAMETER_ID}'] = new menuCat('{module.function.parameter.PARAMETER_ID}', 'adminParDelete_', '{module.function.parameter.VISIBLE_DELETE}'); <!-- END parameter --> <!-- BEGIN block --> menuCats['adminEdit_{module.function.block.BLOCK_ID}'] = new menuCat('{module.function.block.BLOCK_ID}', 'adminEdit_', '{module.function.block.VISIBLE_EDIT}'); menuCats['adminPrivate_{module.function.block.BLOCK_ID}'] = new menuCat('{module.function.block.BLOCK_ID}', 'adminPrivate_', '{module.function.block.VISIBLE_PRIVATE}'); menuCats['adminBlockDelete_{module.function.block.BLOCK_ID}'] = new menuCat('{module.function.block.BLOCK_ID}', 'adminBlockDelete_', '{module.function.block.VISIBLE_DELETE}'); <!-- BEGIN settings --> menuCats['adminSettings_{module.function.block.BLOCK_ID}'] = new menuCat('{module.function.block.BLOCK_ID}', 'adminSettings_', '{module.function.block.VISIBLE_SETTINGS}'); <!-- END settings --> <!-- END block --> <!-- END function --> <!-- END module --> function getObj(obj) { return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) ); } function displayObj(obj, status) { var x = getObj(obj); if( x && x.style ) x.style.display = status; } var queueInterval = 0; // milliseconds between queued steps. var execInterval = 0; var queuedSteps; var currentStep; function queueStep(o, s) { this.obj = o; this.status = s; } function execQueue() { if( currentStep < queuedSteps.length ) { var obj = queuedSteps[currentStep].obj; var status = queuedSteps[currentStep].status; displayObj(obj, status); if( menuCats[obj] ) menuCats[obj].status = status; currentStep++; setTimeout("execQueue();", execInterval); } else { execInterval = queueInterval; } } function onMenuCatClick(cat_id, type, init) { var currentCat, currentStatus; var imageSCR = type+'image_'+cat_id; var strSubmitContent = ''; parentModuleMode = 'adminModule_'; parentFunctionMode = 'adminBlock_'; parentFuncEditMode = 'adminFunction_'; parentFuncParMode = 'adminParameter_'; parentFuncDeleteMode = 'adminFunctionDelete_'; parentBlockEditMode = 'adminEdit_'; parentBlockPrivateMode = 'adminPrivate_'; parentBlockDeleteMode = 'adminBlockDelete_'; parentModuleCat = parentModuleMode + cat_id; parentFunctionCat = parentFunctionMode + cat_id; parentFuncEditCat = parentFuncEditMode + cat_id; parentFuncParCat = parentFuncParMode + cat_id; parentFuncDeleteCat = parentFuncDeleteMode + cat_id; parentBlockEditCat = parentBlockEditMode + cat_id; parentBlockPrivateCat = parentBlockPrivateMode + cat_id; parentBlockDeleteCat = parentBlockDeleteMode + cat_id; currentCat = type + cat_id; currentStatus = menuCats[currentCat].status; queuedSteps = new Array(); cookieArray = new Array(); currentStep = 0; for( var forCat in menuCats ) { if( (init == 'true' && (menuCats[forCat].status == 'block') && menuCats[forCat].menu_mode == parentModuleMode) || (init != 'true' && ( (currentCat == parentModuleCat && menuCats[forCat].status == 'block') || (currentCat == parentFunctionCat && menuCats[forCat].menu_mode != parentModuleMode && menuCats[forCat].status == 'block') || (currentCat == parentFuncEditCat && menuCats[forCat].menu_mode != parentModuleMode && menuCats[forCat].menu_mode != parentFunctionMode && menuCats[forCat].status == 'block') || (currentCat == parentFuncParCat && menuCats[forCat].menu_mode != parentModuleMode && menuCats[forCat].menu_mode != parentFunctionMode && menuCats[forCat].status == 'block') || (currentCat == parentFuncDeleteCat && menuCats[forCat].menu_mode != parentModuleMode && menuCats[forCat].menu_mode != parentFunctionMode && menuCats[forCat].status == 'block') || (currentCat == parentBlockEditCat && menuCats[forCat].menu_mode != parentModuleMode && menuCats[forCat].menu_mode != parentFunctionMode && menuCats[forCat].status == 'block') || (currentCat == parentBlockPrivateCat && menuCats[forCat].menu_mode != parentModuleMode && menuCats[forCat].menu_mode != parentFunctionMode && menuCats[forCat].status == 'block') || (currentCat == parentBlockDeleteCat && menuCats[forCat].menu_mode != parentModuleMode && menuCats[forCat].menu_mode != parentFunctionMode && menuCats[forCat].status == 'block') || (currentCat != parentModuleCat && currentCat != parentFunctionCat && forCat == currentCat && currentStatus == 'block') ))) { queuedSteps[currentStep++] = new queueStep(forCat, 'none'); menuCats[forCat].status = 'none'; forCatimage = menuCats[forCat].menu_mode+'image_'+menuCats[forCat].cat_id; if( document.images && document.images[forCatimage] ) { document.images[forCatimage].src = '{IMG_URL_EXPAND}'; } } } if( currentStatus == 'none' ) { queuedSteps[currentStep++] = new queueStep(currentCat, 'block'); menuCats[currentCat].status = 'block'; if (currentCat == parentModuleCat) { var expdate = new Date(); // 72 Hours from now expdate.setTime(expdate.getTime() + (72 * 60 * 60 * 1000)); setCookie('{COOKIE_NAME}_'+type+'module_id', cat_id, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}', ('{COOKIE_SECURE}' == '0') ? false : true); } if( document.images && document.images[imageSCR] ) { document.images[imageSCR].src = '{IMG_URL_CONTRACT}'; } } else { delCookie('{COOKIE_NAME}_'+type+'module_id', ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}'); } for( var forCat in menuCats ) { if ( menuCats[forCat].status == 'block' ) { strSubmitContent += forCat + ','; } } // Remove trailing separator strSubmitContent = strSubmitContent.substr(0, strSubmitContent.length - 1); setCookie('{COOKIE_NAME}_admincp_blockstates', strSubmitContent, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}', ('{COOKIE_SECURE}' == '0') ? false : true); currentStep = 0; setTimeout("execQueue();", execInterval); } function doOnLoadMenuACP() { var cat_id; if( getObj('adminModule_' + '{NAV_MODULE_ID}') ) { if ( '{NAV_MODULE_ID}' > 0 ) { cat_id = '{NAV_MODULE_ID}'; } else { cat_id = getCookie('{COOKIE_NAME}_adminModule_module_id'); } if( menuCats['adminModule_'+cat_id] ) { menuCats['adminModule_'+cat_id].status = 'none'; onMenuCatClick(cat_id, 'adminModule_', 'true'); } } if( oldOnLoadMenuACP ) { oldOnLoadMenuACP(); } } var oldOnLoadMenuACP = window.onload; window.onload = doOnLoadMenuACP; // --> </script> <h1>{L_TITLE}</h1> <p>{L_EXPLAIN}</p> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> <td align="center"> <form method="post" name="jumpbox" action="{S_ACTION}"> <table width="100%" cellspacing="0" cellpadding="0" border="0" > <tr> <td align="left"> <span class="gensmall">{L_INCLUDE_ALL}: <input type="radio" name="include_all" value="1" {S_INCLUDE_ALL_YES} /> {L_YES} <input type="radio" name="include_all" value="0" {S_INCLUDE_ALL_NO} /> {L_NO} <input type="submit" value="{S_SUBMIT}" class="liteoption" /> </span> </td> <td nowrap="nowrap" align="right"> <span class="gensmall">{L_QUICK_NAV} {MODULE_SELECT_BOX} <input type="submit" value="{S_SUBMIT}" class="liteoption" /> </span> </td> </tr> </table> </form> </td> </tr> </table> <div id="admincp"> <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" align="center"> <tr> <td align="center"> {RESULT_MESSAGE} </td> </tr> <tr> <th class="thHead">{L_TITLE}</th> </tr> <!-- BEGIN nomodule --> <tr> <td class="row1"><span class="gensmall">{nomodule.NONE}</span></td> </tr> <!-- END nomodule --> <!-- BEGIN module --> <!-- BEGIN allmodules --> <tr> <td bgcolor="#006699" height="5"> </td> </tr> <!-- END allmodules --> <tr> <td class="row1"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr title="ddd"> <!-- BEGIN is_current --> <td width="70%" colspan="3" class="catLeft" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.MODULE_ID}','adminModule_');"><img name="adminModule_image_{module.MODULE_ID}" src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> <img src="{IMG_ICON_MODULE}" border="0" align="absmiddle"> <span class="cattitle"> {module.MODULE_TITLE}</span> <span class="gensmall">{module.MODULE_DESC}</span></td> <!-- END is_current --> <!-- BEGIN reload --> <td width="70%" colspan="3" class="catLeft" style="cursor:pointer;cursor:hand;"><img name="adminModule_image_{module.MODULE_ID}" src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> <img src="{IMG_ICON_MODULE}" border="0" align="absmiddle"> <a href="{module.reload.U_MODULE_EDIT}"><span class="cattitle">{module.MODULE_TITLE}</span></a> <span class="gensmall">{module.MODULE_DESC}</span></td> <!-- END reload --> <td width="30%" class="catRight" align="right" valign="middle"><img src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> <span class="cattitle"><a href="{module.U_MODULE_EDIT}">{L_EDIT}</a></span></td> </tr> <tr> <td colspan="4" class="row3"> <div id="adminModule_{module.MODULE_ID}" style="display:none;" class="genmed"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <td bgcolor="#006699" width="10"></td> <td> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> <!-- BEGIN nofunction --> <tr> <td colspan="5" class="row1"><span class="gensmall">{module.nofunction.NONE}</span></td> </tr> <!-- END nofunction --> <!-- BEGIN function --> <tr> <td class="row1" colspan="5"> <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" align="center"> <tr> <td class="row2" width="5"> </td> <td> <table width="100%" cellpadding="4" cellspacing="0" border="0" align="center"> <tr> <td width="70%" class="row2" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.FUNCTION_ID}','{module.function.COOKIE_TAG}');"><img name="{module.function.COOKIE_TAG}image_{module.function.FUNCTION_ID}" src="{module.function.IMG_URL_FUNC}" border="0" align="absmiddle"> <img src="{IMG_ICON_FUNCTION}" border="0" align="absmiddle"> {module.function.FUNCTION_TITLE} <span class="gensmall">{module.function.FUNCTION_DESC}</span></td> <td width="10%" class="row2" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.FUNCTION_ID}','adminFunction_');"> <!-- BEGIN is_function --> <img name="adminFunction_image_{module.function.FUNCTION_ID}" src="{module.function.IMG_URL_FUNC}" border="0" align="absmiddle"> <span class="genmed"><b>{L_EDIT}</b></span> <!-- END is_function --> </td> <td width="10%" class="row2" align="center" valign="middle" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.FUNCTION_ID}','adminParameter_');" > <!-- BEGIN is_function --> <img name="adminParameter_image_{module.function.FUNCTION_ID}" src="{module.function.IMG_URL_PAR}" border="0" align="absmiddle"> <span class="genmed"><b>{module.function.L_EDIT_PAR}</b></span> <!-- END is_function --> </td> <td width="10%" class="row2" align="center" valign="middle" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.FUNCTION_ID}','adminFunctionDelete_');" > <!-- BEGIN is_function --> <img name="adminFunctionDelete_image_{module.function.FUNCTION_ID}" src="{module.function.IMG_URL_DELETE}" border="0" align="absmiddle"> <span class="genmed"><b>{module.function.L_DELETE}</b></span> <!-- END is_function --> </td> </tr> <!-- Function Delete --> <tr> <td colspan="5" class="row1"> <div id="adminFunctionDelete_{module.function.FUNCTION_ID}" style="display:{module.function.VISIBLE_DELETE};" class="genmed"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.FUNCTION_ID}','adminFunctionDelete_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{L_DELETE}</span></td> </tr> <tr> <td width="50%" align="center" colspan="2">{module.function.MESSAGE_DELETE}</td> </tr> </table> </div> </td> </tr> <!-- Function Delete --> <!-- Function Settings --> <tr> <td class="row1" colspan="4"> <div id="adminFunction_{module.function.FUNCTION_ID}" style="display:{module.function.VISIBLE_FUNC};" class="genmed"> <form id="form_adminFunction_{module.function.FUNCTION_ID}" action="{S_ACTION}" method="post"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.FUNCTION_ID}','adminFunction_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{module.function.L_TITLE}</span></td> </tr> <!-- <tr> <td width="50%" align="right" >{module.function.L_MODULE}</td> <td >{module.function.E_MODULE_SELECT}</td> </tr> --> <tr> <td width="50%" align="right" >{module.function.L_FUNCTION_TITLE}</td> <td ><input type="text" size="45" name="function_name" value="{module.function.E_FUNCTION_TITLE}" class="post" /></td> </tr> <tr> <td width="50%" align="right" >{module.function.L_FUNCTION_DESC}</td> <td ><input type="text" size="45" name="function_desc" value="{module.function.E_FUNCTION_DESC}" class="post" /></td> </tr> <tr> <td width="50%" align="right" >{module.function.L_FUNCTION_FILE}</td> <td ><input type="text" size="45" name="function_file" value="{module.function.E_FUNCTION_FILE}" class="post" /></td> </tr> <tr> <td width="50%" align="right" >{module.function.L_FUNCTION_ADMIN_FILE}</td> <td ><input type="text" size="45" name="function_admin" value="{module.function.E_FUNCTION_ADMIN_FILE}" class="post" /></td> </tr> <tr> <td class="row2" colspan="2" align="center">{module.function.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{module.function.S_SUBMIT}" class="liteoption" /></td> </tr> </table> </form> </div> </td> </tr> <!-- Function Settings --> <!-- Parameter Settings --> <tr> <td colspan="4" class="row1"> <div id="adminParameter_{module.function.FUNCTION_ID}" style="display:{module.function.VISIBLE_PAR};" class="genmed"> <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" align="center"> <tr> <td class="row3" width="1"> </td> <td> <form method="post" action="{S_ACTION}"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center" > <tr> <td class="row3" colspan="5" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.FUNCTION_ID}','adminParameter_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{module.function.L_TITLE_PAR}</span></td> </tr> <tr> <td width="40%" class="row2"><span class="topictitle">{module.function.parameter.L_PARAMETER_TITLE}</span></td> <td width="20%" class="row2"><span class="topictitle">{module.function.parameter.L_PARAMETER_TYPE}</span></td> <td width="40%" colspan="3" class="row2" align="center"><span class="topictitle">{module.function.parameter.L_ACTION}</span></td> </tr> <!-- BEGIN noparameter --> <tr> <td colspan="5" class="row1"><span class="gensmall">{module.function.noparameter.NONE}</span></td> </tr> <!-- END noparameter --> <!-- BEGIN parameter --> <tr> <td width="40%" class="{module.function.parameter.ROW_CLASS}" style="cursor:pointer;cursor:hand;" onclick=" onMenuCatClick('{module.function.parameter.PARAMETER_ID}','adminParEdit_');"> <img src="{IMG_ICON_PARAMETER}" border="0" align="absmiddle"> {module.function.parameter.PARAMETER_TITLE} </td> <td width="20%" class="{module.function.parameter.ROW_CLASS}"> <!-- BEGIN is_parameter --> {module.function.parameter.PARAMETER_TYPE} <!-- END is_parameter --> </td> <td width="10%" class="{module.function.parameter.ROW_CLASS}" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.parameter.PARAMETER_ID}','adminParEdit_');"> <!-- BEGIN is_parameter --> <img name="adminParEdit_image_{module.function.parameter.PARAMETER_ID}" src="{module.function.parameter.IMG_URL}" border="0" align="absmiddle"> <!-- END is_parameter --> {module.function.parameter.L_EDIT}</td> <td width="10%" class="{module.function.parameter.ROW_CLASS}" align="center" valign="middle" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.parameter.PARAMETER_ID}','adminParDelete_');" > <!-- BEGIN is_parameter --> <img name="adminParDelete_image_{module.function.parameter.PARAMETER_ID}" src="{module.function.parameter.IMG_URL_DELETE}" border="0" align="absmiddle"> <span class="genmed"><b>{module.function.parameter.L_DELETE}</b></span> <!-- END is_parameter --> </td> <td width="20%" class="{module.function.parameter.ROW_CLASS}" align="center" valign="middle"><span class="gen"> <!-- BEGIN is_parameter --> <a href="{module.function.parameter.U_MOVE_UP}"><span class="gensmall">{L_MOVE_UP}</span></a> <a href="{module.function.parameter.U_MOVE_DOWN}"><span class="gensmall">{L_MOVE_DOWN}</span></a></span> <!-- END is_parameter --> </td> </tr> <!-- Parameter Delete --> <tr> <td colspan="5" class="row1"> <div id="adminParDelete_{module.function.parameter.PARAMETER_ID}" style="display:{module.function.parameter.VISIBLE_DELETE};" class="genmed"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.parameter.PARAMETER_ID}','adminParDelete_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{L_DELETE}</span></td> </tr> <tr> <td width="50%" align="center" colspan="2">{module.function.parameter.MESSAGE_DELETE}</td> </tr> </table> </div> </td> </tr> <!-- Parameter Delete --> <!-- Parameter EDIT --> <tr> <td colspan="5" class="row1"> <div id="adminParEdit_{module.function.parameter.PARAMETER_ID}" style="display:{module.function.parameter.VISIBLE};" class="genmed"> <form action="{S_ACTION}" method="post"> <table width="100%" cellpadding="2" cellspacing="1" border="0" align="center"> <tr> <td class="row3" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.parameter.PARAMETER_ID}','adminParEdit_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{module.function.parameter.L_EDIT}</span></td> </tr> <tr> <td width="50%" align="right">{module.function.parameter.L_PARAMETER_TITLE}</td> <td><input type="text" size="45" name="parameter_name" value="{module.function.parameter.E_PARAMETER_TITLE}" class="post" /></td> </tr> <tr> <!-- <tr> <td width="50%" align="right">{module.function.parameter.L_FUNCTION}</td> <td>{module.function.parameter.E_FUNCTION_SELECT}</td> </tr> --> <tr> <td width="50%" align="right">{module.function.parameter.L_PARAMETER_TYPE}</td> <td>{module.function.parameter.E_PARAMETER_TYPE}</td> </tr> <tr> <td width="50%" align="right">{module.function.parameter.L_PARAMETER_DEFAULT}</td> <td><input type="text" size="45" name="parameter_default" value="{module.function.parameter.E_PARAMETER_DEFAULT}" class="post" /></td> </tr> <tr> <td width="50%" align="right">{module.function.parameter.L_PARAMETER_FUNCTION}<br /><br /><span class="gensmall">{module.function.parameter.L_PARAMETER_FUNCTION_EXPLAIN}</span></td> <td><textarea rows="20" cols="100" wrap="virtual" name="parameter_function" class="post" />{module.function.parameter.E_PARAMETER_FUNCTION}</textarea></td> </tr> <tr> <td class="row3" colspan="2" align="center">{module.function.parameter.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{module.function.parameter.S_SUBMIT}" class="mainoption" /></td> </tr> </table> </form> </div> </td> </tr> <!-- END parameter --> </table> </form> </td> </tr> </table> </div> </td> </tr> <!-- Parameter Settings --> </table> </td> </tr> </table> </td> </tr> <tr> <td colspan="4" class="row1"> <div id="adminBlock_{module.function.FUNCTION_ID}" style="display:{module.function.VISIBLE_BLOCK};" class="genmed"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <!-- BEGIN noblock --> <tr> <td colspan="5" class="row1"><span class="gensmall">{module.function.noblock.NONE}</span></td> </tr> <!-- END noblock --> <!-- BEGIN block --> <tr> <td width="50%" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.block.BLOCK_ID}','adminEdit_');" class="row1"> <img src="{IMG_ICON_BLOCK}" border="0" align="absmiddle"> <span class="gen">{module.function.block.BLOCK_TITLE}</span> <span class="gensmall"><i>{module.function.block.BLOCK_LAST_EDITED}</i></span> <span class="gensmall">{module.function.block.BLOCK_DESC}</span> </td> <td width="15%" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.block.BLOCK_ID}','adminEdit_');" class="row1"> <!-- BEGIN is_block --> <img name="adminEdit_image_{module.function.block.BLOCK_ID}" src="{module.function.block.IMG_URL_EDIT}" border="0" align="absmiddle"> <span class="genmed">{module.function.block.L_EDIT}</span> <!-- END is_block --> </td> <td width="15%" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.block.BLOCK_ID}','adminPrivate_');" class="row1"> <!-- BEGIN is_block --> <img name="adminPrivate_image_{module.function.block.BLOCK_ID}" src="{module.function.block.IMG_URL_PRIVATE}" border="0" align="absmiddle"> <span class="genmed">{module.function.block.L_PERMISSIONS_ADV}</span> <!-- END is_block --> </td> <td width="10%" class="row1" align="center" valign="middle"> <!-- BEGIN is_block --> <span class="gensmall"><a href="{module.function.block.U_BLOCK_SETTINGS}">{module.function.block.L_SETTINGS}</a></span> <!-- END is_block --> </td> <td width="10%" class="row1" align="center" valign="middle" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.block.BLOCK_ID}','adminBlockDelete_');" > <!-- BEGIN is_block --> <img name="adminBlockDelete_image_{module.function.block.BLOCK_ID}" src="{module.function.block.IMG_URL_DELETE}" border="0" align="absmiddle"> <span class="genmed">{module.function.block.L_DELETE}</span> <!-- END is_block --> </td> </tr> <!-- Block Delete --> <tr> <td colspan="5" class="row1"> <div id="adminBlockDelete_{module.function.block.BLOCK_ID}" style="display:{module.function.block.VISIBLE_DELETE};" class="genmed"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.block.BLOCK_ID}','adminBlockDelete_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{L_DELETE}</span></td> </tr> <tr> <td width="50%" align="center" colspan="2">{module.function.block.MESSAGE_DELETE}</td> </tr> </table> </div> </td> </tr> <!-- Block Delete --> <!-- Block Quick Edit --> <tr> <td colspan="5"> <div id="adminEdit_{module.function.block.BLOCK_ID}" style="display:{module.function.block.VISIBLE_EDIT};" class="genmed"> <form action="{S_ACTION}" method="post"> <table width="100%" cellpadding="2" cellspacing="1" border="0" align="center"> <tr> <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.block.BLOCK_ID}','adminEdit_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{module.function.block.L_TITLE}</span></td> </tr> <tr> <td class="row1" width="50%" align="right"><b>{module.function.block.L_BLOCK_TITLE}</b></td> <td class="row1"><input type="text" size="65" name="block_title" value="{module.function.block.E_BLOCK_TITLE}" class="post" /></td> </tr> <tr> <td class="row1" width="50%" align="right"><b>{module.function.block.L_BLOCK_DESC}</b></td> <td class="row1"><input type="text" size="65" name="block_desc" value="{module.function.block.E_BLOCK_DESC}" class="post" /></td> </tr> <tr> <td class="row1" width="50%" align="right"><b>{module.function.block.L_SHOW_TITLE}</b><br /><span class="gensmall">{module.function.block.L_SHOW_TITLE_EXPLAIN}</span></td> <td class="row1"><input type="radio" name="show_title" value="1" {module.function.block.S_SHOW_TITLE_YES} /> <span class="gensmall">{L_YES}</span> <input type="radio" name="show_title" value="0" {module.function.block.S_SHOW_TITLE_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> <tr> <td class="row1" width="50%" align="right"><b>{module.function.block.L_SHOW_STATS}</b><br /><span class="gensmall">{module.function.block.L_SHOW_STATS_EXPLAIN}</span></td> <td class="row1"><input type="radio" name="show_stats" value="1" {module.function.block.S_SHOW_STATS_YES} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_stats" value="0" {module.function.block.S_SHOW_STATS_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> <tr> <td class="row1" width="50%" align="right"><b>{module.function.block.L_SHOW_BLOCK}</b><br /><span class="gensmall">{module.function.block.L_SHOW_BLOCK_EXPLAIN}</span></td> <td class="row1"><input type="radio" name="show_block" value="1" {module.function.block.S_SHOW_BLOCK_YES} /> <span class="gensmall">{L_YES} </span><input type="radio" name="show_block" value="0" {module.function.block.S_SHOW_BLOCK_NO} /> <span class="gensmall">{L_NO}</span></td> </tr> <tr> <td class="row1" width="50%" align="right"><b>{module.function.block.L_AUTH_TITLE}</b><br /><span class="gensmall">{module.function.block.L_AUTH_TITLE_EXPLAIN}</span></td> <td class="row1"> <table cellspacing="1" cellpadding="4" border="0"> <tr> <!-- BEGIN block_auth_titles --> <td class="row3" align="center"><span class="topictitle">{module.function.block.block_auth_titles.CELL_TITLE}</span></td> <!-- END block_auth_titles --> </tr> <tr> <!-- BEGIN block_auth_data --> <td> <table> <tr> <td class="row1" align="center">{module.function.block.block_auth_data.S_AUTH_LEVELS_SELECT}</td> </tr> </table> </td> <!-- END block_auth_data --> </tr> </table> </td> </tr> <tr> <td class="row1" width="50%" align="right">{module.function.block.L_COLUMN}</td> <td class="row1">{module.function.block.S_COLUMN_LIST}</td> </tr> <tr> <td class="row2" colspan="2" align="center">{module.function.block.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{module.function.block.S_SUBMIT}" class="mainoption" /></td> </tr> </table> </form> <hr> </div> </td> </tr> <!-- Block Edit --> <!-- Block PRIVATE Auth --> <tr> <td colspan="5"> <div id="adminPrivate_{module.function.block.BLOCK_ID}" style="display:{module.function.block.VISIBLE_PRIVATE};" class="genmed"> <form action="{S_ACTION}" method="post"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <td class="row2" colspan="4" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{module.function.block.BLOCK_ID}','adminPrivate_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle"> <span class="topictitle">{module.function.block.L_TITLE}</span></td> </tr> <tr> <td width="40%" class="row3" align="center" height="25" nowrap="nowrap"><b>{L_GROUPS}</b></td> <td width="20%" class="row3" align="center" nowrap="nowrap"><b>{L_VIEW}</b></td> <td width="20%" class="row3" align="center" nowrap="nowrap"><b>{L_EDIT}</b></td> <td width="20%" class="row3" align="center" nowrap="nowrap"><b>{L_IS_MODERATOR}</b></td> </tr> <tr> <td class="row1" align="center" colspan="4"> <div style="overflow:auto; overflow-y:scroll; height:150px;"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <!-- BEGIN grouprows --> {module.function.block.grouprows.GROUP_ROWS} <!-- END grouprows --> </table> </div> </td> </tr> <tr> <td class="catBottom" height="25" align="center" colspan="4">{module.function.block.S_HIDDEN_PRIVATE_FIELDS}<input type="submit" name="submit" value="{module.function.block.S_SUBMIT}" class="mainoption" /></td> </tr> </table> </form> <hr> </div> </td> </tr> <!-- Block PRIVATE Auth --> <!-- END block --> </table> </td> </tr> <!-- END function --> </table> </td> </tr> </table> </div> </td> </tr> </table> </td> </tr> <!-- END module --> </table> </div> --- NEW FILE: mx_pagecp_admin_body.tpl --- <script type="text/javascript"> function getCookie(name) { var cookies = document.cookie; var start = cookies.indexOf(name + '='); if( start < 0 ) return null; var len = start + name.length + 1; var end = cookies.indexOf(';', len); if( end < 0 ) end = cookies.length; return unescape(cookies.substring(len, end)); } function setCookie(name, value, expires, path, domain, secure) { document.cookie = name + '=' + escape (value) + ((expires) ? '; expires=' + ( (expires == 'never') ? 'Thu, 31-Dec-2099 23:59:59 GMT' : expires.toGMTString() ) : '') + ((path) ? '; path=' + path : '') + ((domain) ? '; domain=' + domain : '') + ((secure) ? '; secure' : ''); } function delCookie(name, path, domain) { if( getCookie(name) ) { document.cookie = name + '=;expires=Thu, 01-Jan-1970 00:00:01 GMT' + ((path) ? '; path=' + path : '') + ((domain) ? '; domain=' + domain : ''); } } function menuCat(id, mode, visible) { this.cat_id = id; this.menu_mode = mode; this.status = visible != '' ? visible : 'none'; } var menuCats = new Array(); menuCats['adminPage_Template'] = new menuCat('Template', 'adminPage_', '{VISIBLE}'); <!-- BEGIN templates --> menuCats['adminTemplateEdit_{templates.TEMPLATE_ID}'] = new menuCat('{templates.TEMPLATE_ID}', 'adminTemplateEdit_', '{templates.VISIBLE}'); menuCats['adminTemplateDelete_{templates.TEMPLATE_ID}'] = new menuCat('{templates.TEMPLATE_ID}', 'adminTemplateDelete_', '{templates.VISIBLE_DELETE}'); <!-- BEGIN columnrow --> menuCats['adminTemplateColumnEdit_{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}'] = new menuCat('{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}', 'adminTemplateColumnEdit_', '{templates.columnrow.VISIBLE}'); menuCats['adminTemplateColumnDelete_{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}'] = new menuCat('{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}', 'adminTemplateColumnDelete_', '{templates.columnrow.VISIBLE_DELETE}'); <!-- END columnrow --> <!-- END templates --> <!-- BEGIN pages --> menuCats['adminPage_{pages.PAGE_ID}'] = new menuCat('{pages.PAGE_ID}', 'adminPage_', '{pages.VISIBLE}'); menuCats['adminPageDelete_{pages.PAGE_ID}'] = new menuCat('{pages.PAGE_ID}', 'adminPageDelete_', '{pages.VISIBLE_DELETE}'); menuCats['adminPageEdit_{pages.PAGE_ID}'] = new menuCat('{pages.PAGE_ID}', 'adminPageEdit_', '{pages.VISIBLE_EDIT}'); menuCats['adminPageSettings_{pages.PAGE_ID}'] = new menuCat('{pages.PAGE_ID}', 'adminPageSettings_', '{pages.VISIBLE_SETTINGS}'); menuCats['adminPagePrivate_{pages.PAGE_ID}'] = new menuCat('{pages.PAGE_ID}', 'adminPagePrivate_', '{pages.VISIBLE_PRIVATE}'); <!-- BEGIN columnrow --> menuCats['adminColumnEdit_{pages.PAGE_ID}_{pages.columnrow.COLUMN_ID}'] = new menuCat('{pages.PAGE_ID}_{pages.columnrow.COLUMN_ID}', 'adminColumnEdit_', '{pages.columnrow.VISIBLE}'); menuCats['adminColumnDelete_{pages.PAGE_ID}_{pages.columnrow.COLUMN_ID}'] = new menuCat('{pages.PAGE_ID}_{pages.columnrow.COLUMN_ID}', 'adminColumnDelete_', '{pages.columnrow.VISIBLE_DELETE}'); <!-- END columnrow --> <!-- END pages --> function getObj(obj) { return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) ); } function displayObj(obj, status) { var x = getObj(obj); if( x && x.style ) x.style.display = status; } var queueInterval = 0; // milliseconds between queued steps. var execInterval = 0; var queuedSteps; var currentStep; function queueStep(o, s) { this.obj = o; this.status = s; } function execQueue() { if( currentStep < queuedSteps.length ) { var obj = queuedSteps[currentStep].obj; var status = queuedSteps[currentStep].status; displayObj(obj, status); if( menuCats[obj] ) menuCats[obj].status = status; currentStep++; setTimeout("execQueue();", execInterval); } else { execInterval = queueInterval; } } function onMenuCatClick(cat_id, type, init) { var currentCat, currentStatus; var imageSCR = type+'image_'+cat_id; var strSubmitContent = ''; parentPageMode = 'adminPage_'; parentEditMode = 'adminPageEdit_'; parentPrivateMode = 'adminPagePrivate_'; parentSettingsMode = 'adminPageSettings_'; parentTemplateMode = 'adminTemplateEdit_'; parentPageCat = parentPageMode + cat_id; parentEditCat = parentEditMode + cat_id; parentPrivateCat = parentPrivateMode + cat_id; parentSettingsCat = parentSettingsMode + cat_id; parentTemplateCat = parentTemplateMode + cat_id; currentCat = type + cat_id; currentStatus = menuCats[currentCat].status; queuedSteps = new Array(); cookieArray = new Array(); currentStep = 0; for( var forCat in menuCats ) { if( (init == 'true' && (menuCats[forCat].status == 'block') && menuCats[forCat].menu_mode == parentPageMode) || (init != 'true' && ( (currentCat == parentPageCat && menuCats[forCat].status == 'block' ) || (currentCat == parentEditCat && menuCats[forCat].menu_mode != parentPageMode && menuCats[forCat].status == 'block') || (currentCat == parentPrivateCat && menuCats[forCat].menu_mode != parentPageMode && menuCats[forCat].status == 'block') || (currentCat == parentSettingsCat && menuCats[forCat].menu_mode != parentPageMode && menuCats[forCat].status == 'block') || (currentCat == parentTemplateCat && menuCats[forCat].menu_mode != parentPageMode && menuCats[forCat].status == 'block') || (currentCat != parentPageCat && forCat == currentCat && currentStatus == 'block') ))) { queuedSteps[currentStep++] = new queueStep(forCat, 'none'); menuCats[forCat].status = 'none'; forCatimage = menuCats[forCat].menu_mode+'image_'+menuCats[forCat].cat_id; if( document.images && document.images[forCatimage] ) { document.images[forCatimage].src = '{IMG_URL_EXPAND}'; } } } if( currentStatus == 'none' ) { if (menuCats[parentPageCat]) { if (menuCats[parentPageCat].status == 'none') { queuedSteps[currentStep++] = new queueStep(parentPageCat, 'block'); menuCats[parentPageCat].status = 'block'; forCatimage = menuCats[parentPageCat].menu_mode+'image_'+menuCats[parentPageCat].cat_id; if( document.images && document.images[forCatimage] ) { document.images[forCatimage].src = '{IMG_URL_CONTRACT}'; } } } queuedSteps[currentStep++] = new queueStep(currentCat, 'block'); menuCats[currentCat].status = 'block'; if (currentCat == parentPageCat) { var expdate = new Date(); // 72 Hours from now expdate.setTime(expdate.getTime() + (72 * 60 * 60 * 1000)); setCookie('{COOKIE_NAME}_'+type+'page_id', cat_id, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}', ('{COOKIE_SECURE}' == '0') ? false : true); } if( document.images && document.images[imageSCR] ) { document.images[imageSCR].src = '{IMG_URL_CONTRACT}'; } } else { delCookie('{COOKIE_NAME}_'+type+'page_id', ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}'); } for( var forCat in menuCats ) { if ( menuCats[forCat].status == 'block' ) { strSubmitContent += forCat + ','; } } // Remove trailing separator strSubmitContent = strSubmitContent.substr(0, strSubmitContent.length - 1); setCookie('{COOKIE_NAME}_admincp_pagestates', strSubmitContent, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', ('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}', ('{COOKIE_SECURE}' == '0') ? false : true); currentStep = 0; setTimeout("execQueue();", execInterval); } function doOnLoadMenuACP() { var cat_id; if( getObj('adminPage_' + '{NAV_PAGE_ID}') ) { if ( '{NAV_PAGE_ID}' > 0 ) { cat_id = '{NAV_PAGE_ID}'; } else { cat_id = getCookie('{COOKIE_NAME}_adminPage_page_id'); } if( menuCats['adminPage_'+cat_id] ) { menuCats['adminPage_'+cat_id].status = 'none'; onMenuCatClick(cat_id, 'adminPage_', 'true'); } } if( oldOnLoadMenuACP ) { oldOnLoadMenuACP(); } } var oldOnLoadMenuACP = window.onload; // --> </script> <!-- BEGIN pages --> <!-- BEGIN has_columns --> <!-- dynamic_select --> <script type="text/javascript" src="../modules/mx_ajax/DynamicOptionList.js"></script> <script type="text/javascript" id="DYNAMIC_LIST"> var makeModule = new DynamicOptionList("module_id","function_id","block_id"); {DYNAMIC_FUNCTION_SETUP} {DYNAMIC_BLOCK_SETUP} {DYNAMIC_DEFAULT_SETUP} </script> <!-- dynamic_select --> <!-- END has_columns --> <!-- END pages --> <script type="text/javascript"> function doOnLoadFunctions() { doOnLoadMenuACP(); <!-- BEGIN pages --> <!-- BEGIN is_page --> initDynamicOptionLists(); <!-- END is_page --> <!-- END pages --> } window.onload = doOnLoadFunctions; </script> <h1>{L_TITLE}</h1> <p>{L_EXPLAIN}</p> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> <td align="center"> <form method="post" name="jumpbox" action="{S_ACTION}"> <table width="100%" cellspacing="0" cellpadding="0" border="0" > <tr> <td colspan="2"> <span class="gensmall">{L_INCLUDE_ALL}: <input type="radio" name="include_all" value="1" {S_INCLUDE_ALL_YES} /> {L_YES} <input type="radio" name="include_all" value="0" {S_INCLUDE_ALL_NO} /> {L_NO} <input type="submit" value="{S_SUBMIT}" class="liteoption" /> </span> </td> </tr> <tr> <td align="left"> <span class="genmed"> {L_SELECT_SORT_METHOD}: <select name="sort_method"> <option {S_PAGE_TITLE} value='page_name'>{L_SORT_TITLE}</option> <option {S_PAGE_DESC} value='page_desc'>{L_SORT_DESC}</option> <option {S_PAGE_ID} value='page_id'>{L_SORT_ID}</option> </select> {L_ORDER}: <select name="sort_order"> <option {SORT_ASC} value="ASC">{L_ASC}</option> <option {SORT_DESC} value="DESC">{L_DESC}</option> </select> <input type="submit" name="submit" value="{L_SORT}" class="liteoption" /> </span> </td> <td nowrap="nowrap" align="right"> <span class="gensmall">{L_QUICK_NAV} {PAGE_SELECT_BOX} <input type="submit" value="{S_SUBMIT}" class="liteoption" /> </span> </td> </tr> </table> </form> </td> </tr> </table> <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" align="center"> <tr> <td align="center">{RESULT_MESSAGE}</td> </tr> <tr> <th class="thHead">{L_TITLE_TEMPLATES}</th> </tr> <tr> <td class="catLeft" align="left" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('Template','adminPage_');"> <img name="adminPage_image_Template" src="{IMG_URL}" border="0" align="absmiddle"> <span class="topictitle">{L_TITLE_TEMPLATE}</span></td> </tr> <tr> <td class="row2"> <div id="adminPage_Template" style="display:{VISIBLE};" class="genmed"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <td bgcolor="#006699" width="10"></td> <td> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <!-- BEGIN notemplates --> <tr> <td class="row1"><span class="gensmall">{nopages.NONE}</span></td> </tr> <!-- END notemplates --> <!-- BEGIN templates --> <tr> <td class="row1"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <!-- BEGIN new_template --> <td width="80%" class="catLeft" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{templates.TEMPLATE_ID}','adminTemplateEdit_');"> <img name="adminTemplateEdit_image_{templates.TEMPLATE_ID}" src="{templates.IMG_URL}" border="0" align="absmiddle"> {templates.TEMPLATE_ICON} <span class="cattitle">{templates.TEMPLATE_TITLE}</span></td> <!-- END new_template --> <!-- BEGIN current_template --> <td width="80%" class="catLeft" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{templates.TEMPLATE_ID}','adminTemplateEdit_');"> <img name="adminTemplateEdit_image_{templates.TEMPLATE_ID}" src="{templates.IMG_URL}" border="0" align="absmiddle"> {templates.TEMPLATE_ICON} <span class="cattitle">{templates.TEMPLATE_TITLE}</span></td> <!-- END current_template --> <td width="20%" class="catRight" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{templates.TEMPLATE_ID}','adminTemplateDelete_');"> <!-- BEGIN delete --> <img name="adminTemplateDelete_image_{templates.TEMPLATE_ID}" src="{templates.IMG_URL_DELETE}" border="0" align="absmiddle"> <span class="gen">{L_DELETE}</span> <!-- END delete --> </td> </tr> <!-- Function Delete --> <tr> <td colspan="2" class="row1"> <div id="adminTemplateDelete_{templates.TEMPLATE_ID}" style="display:{templates.VISIBLE_DELETE};" class="genmed"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center" class="forumline"> <tr> <td width="50%" align="center" colspan="2">{templates.MESSAGE_DELETE}</td> </tr> </table> </div> </td> </tr> <!-- Function Delete --> <tr> <td colspan="2" class="row1"> <div id="adminTemplateEdit_{templates.TEMPLATE_ID}" style="display:{templates.VISIBLE};" class="genmed"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <!-- Template Edit --> <tr> <td class="row1"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <td bgcolor="#006699" width="10"></td> <td> <form action="{S_ACTION}" method="post"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td width="50%" align="right" >{templates.L_TEMPLATE_NAME}</td> <td><input type="text" size="45" name="template_name" value="{templates.E_TEMPLATE_TITLE}" class="post" /></td> </tr> <tr> <td class="row2" colspan="2" align="center">{templates.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{templates.S_SUBMIT}" class="mainoption" /></td> </tr> </table> </form> </td> </tr> </table> </td> </tr> <!-- Template Edit --> <!-- Template Main Panel --> <tr> <td class="row1"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <td bgcolor="#006699" width="10"></td> <td> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <td class="row3"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> <!-- BEGIN columnrow --> <tr> <td class="row3" width="100%" colspan="5"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center" class="forumline"> <tr> <td width="70%" class="row3" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}','adminTemplateColumnEdit_');"> <img name="adminTemplateColumnEdit_image_{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}" src="{templates.columnrow.IMG_URL}" border="0" align="absmiddle"> <img src="{IMG_ICON_PAGE_COLUMN}" border="0" align="absmiddle"> <span class="topictitle"><b>{templates.columnrow.L_COLUMN}: <span class="cattitle">{templates.columnrow.COLUMN_TITLE}</span></b></span></td> <td width="15%" class="row3" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}','adminTemplateColumnDelete_');"> <img name="adminTemplateColumnDelete_image_{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}" src="{templates.columnrow.IMG_URL_DELETE}" border="0" align="absmiddle"> <span class="gen">{templates.columnrow.L_DELETE}</span></td> <td width="15%" class="row3" align="center" valign="middle" nowrap="nowrap"><span class="genmed"><a href="{templates.columnrow.U_COLUMN_MOVE_UP}">{templates.columnrow.L_MOVE_UP}</a> <a href="{templates.columnrow.U_COLUMN_MOVE_DOWN}">{templates.columnrow.L_MOVE_DOWN}</a></span></td> </tr> <!-- Function Delete --> <tr> <td colspan="3" class="row1"> <div id="adminTemplateColumnDelete_{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}" style="display:{templates.columnrow.VISIBLE_DELETE};" class="genmed"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center" class="forumline"> <tr> <td width="50%" align="center" colspan="2">{templates.columnrow.MESSAGE_DELETE}</td> </tr> </table> </div> </td> </tr> <!-- Function Delete --> <!-- COLUMN EDIT --> <tr> <td colspan="3" class="row1"> <div id="adminTemplateColumnEdit_{templates.TEMPLATE_ID}_{templates.columnrow.COLUMN_ID}" style="display:{templates.columnrow.VISIBLE};" class="genmed"> <form action="{S_ACTION}" method="post"> <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center"> <tr> <td width="50%" align="right">{templates.columnrow.L_COLUMN_NAME}</td> <td ><input type="text" size="25" name="column_title" value="{templates.columnrow.E_COLUMN_TITLE}" /></td> </tr> <tr> <td width="50%" align="right">{templates.columnrow.L_COLUMN_SIZE}</td> <td ><input type="text" maxlength="5" size="5" name="column_size" value="{templates.columnrow.E_COLUMN_SIZE}" /></td> </tr> <tr> <td class="row2" colspan="2" align="center">{templates.columnrow.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{templates.columnrow.S_SUBMIT}" class="mainoption" /></td> </tr> </table> </form> </div> </td> </tr> <!-- COLUMN EDIT --> </table> </td> </tr> <tr> <td colspan="5" height="1" class="spaceRow"><img src="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}spacer.gif" alt="" width="1" height="1" /></td> </tr> <!-- END columnrow --> </table> </td> </tr> </table> </td> </tr> </table> </td> </tr> <!-- Template Main Panel --> </table> </div> </td> </tr> </table> </td> </tr> <!-- END templates --> </table> </td> </tr> </table> </div> </td> </tr> <!-- BEGIN nopages --> <tr> <td class="row1"><span class="gensmall">{nopages.NONE}</span></td> </tr> <!-- END nopages --> <!-- BEGIN pages --> <!-- BEGIN is_current --> <tr> <th class="thHead">{L_TITLE_PAGES}</th> </tr> <!-- END is_current --> <!-- BEGIN reload --> <tr> <th class="thHead">{L_TITLE_PAGES}</th> </tr> <!-- END reload --> <!-- BEGIN is_new --> <tr> <th class="thHead">{L_TITLE_NEW_PAGE}</th> </tr> <!-- END is_new --> <tr> <td class="row1"> <table width="100%" cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <!-- BEGIN is_current --> <td width="60%" class="catLeft" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{pages.PAGE_ID}','adminPage_');"> <img name="adminPage_image_{pages.PAGE_ID}" src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> {pages.PAGE_ICON} <span class="cattitle">{pages.PAGE_TITLE}</span> <span class="gensmall">{pages.PAGE_DESC}</span></td> <!-- END is_current --> <!-- BEGIN is_new --> <td width="60%" class="catLeft" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{pages.PAGE_ID}','adminPage_');"> <img name="adminPage_image_{pages.PAGE_ID}" src="{IMG_URL_EXPAND}" border="0" align="absmiddle"> {pages.PAGE_ICON} <span class="topictitle">{pages.PAGE_TITLE}</span> <span class="gensmall">{pages.PAGE_DESC}</span></td> <!-- END is_new --> <!-- BEGIN reload --> <td width="60%" class="catLeft" styl... [truncated message content] |
|
From: Jon O. <jon...@us...> - 2005-09-09 08:57:28
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20164/install/schemas Modified Files: mysql_schema_install.sql upgrade_schemas_map.php Log Message: fixing up installation Index: upgrade_schemas_map.php =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/upgrade_schemas_map.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** upgrade_schemas_map.php 7 Sep 2005 19:38:10 -0000 1.5 --- upgrade_schemas_map.php 9 Sep 2005 08:57:17 -0000 1.6 *************** *** 41,48 **** array('schema' => 'upgrade_to_2.7.1' , 'sql' => "SELECT link_target FROM mx_table_menu_nav"), array('schema' => 'upgrade_to_2.7.4' , 'sql' => "SELECT page_template_id FROM mx_table_page_templates"), - array('schema' => 'upgrade_to_2.8.RC1' , 'sql' => "SELECT page_desc FROM mx_table_page"), - array('schema' => 'upgrade_to_2.8.RC2' , 'sql' => "SELECT word_id FROM mx_table_wordlist"), - array('schema' => 'upgrade_to_2.8.RC3' , 'sql' => "SELECT mx_use_cache FROM mx_table_portal"), - array('schema' => 'upgrade_to_2.8.RC4' , 'sql' => "SELECT portal_recached FROM mx_table_portal"), array('schema' => 'upgrade_to_2.8.RC5' , 'sql' => "SELECT parameter_order FROM mx_table_parameter") ); --- 41,44 ---- Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mysql_schema_install.sql 7 Sep 2005 19:38:10 -0000 1.5 --- mysql_schema_install.sql 9 Sep 2005 08:57:17 -0000 1.6 *************** *** 29,33 **** `block_editor_id` mediumint(8) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`) ! ) TYPE=MyISAM; --- 29,33 ---- `block_editor_id` mediumint(8) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`) ! ); *************** *** 73,77 **** `sub_id` int(255) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`,`parameter_id`,`sub_id`) ! ) TYPE=MyISAM; --- 73,77 ---- `sub_id` int(255) unsigned NOT NULL default '0', PRIMARY KEY (`block_id`,`parameter_id`,`sub_id`) ! ); *************** *** 148,152 **** PRIMARY KEY (`column_id`), KEY `cat_order` (`column_order`) ! ) TYPE=MyISAM; --- 148,152 ---- PRIMARY KEY (`column_id`), KEY `cat_order` (`column_order`) ! ); *************** *** 174,178 **** `block_id` smallint(5) NOT NULL default '0', `block_order` smallint(5) NOT NULL default '0' ! ) TYPE=MyISAM; --- 174,178 ---- `block_id` smallint(5) NOT NULL default '0', `block_order` smallint(5) NOT NULL default '0' ! ); *************** *** 215,219 **** PRIMARY KEY (`column_template_id`), KEY `cat_order` (`column_order`) ! ) TYPE=MyISAM; --- 215,219 ---- PRIMARY KEY (`column_template_id`), KEY `cat_order` (`column_order`) ! ); *************** *** 245,249 **** PRIMARY KEY (`function_id`), KEY `module_id` (`module_id`) ! ) TYPE=MyISAM; --- 245,249 ---- PRIMARY KEY (`function_id`), KEY `module_id` (`module_id`) ! ); *************** *** 290,294 **** PRIMARY KEY (`cat_id`), KEY `cat_order` (`cat_order`) ! ) TYPE=MyISAM; --- 290,294 ---- PRIMARY KEY (`cat_id`), KEY `cat_order` (`cat_order`) ! ); *************** *** 326,330 **** PRIMARY KEY (`menu_id`), KEY `cat_id` (`cat_id`) ! ) TYPE=MyISAM; --- 326,330 ---- PRIMARY KEY (`menu_id`), KEY `cat_id` (`cat_id`) ! ); *************** *** 338,345 **** INSERT INTO mx_table_menu_nav VALUES("10", "4", "IncludeX", "IncludeX Demo", "", "0", "40", "f7adaf1201", "icon_dot.gif", "0", "27", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("11", "4", "phpBB Polls (if any)", "phpBB Polls Demo", "", "0", "50", "a80fe73aee", "icon_dot.gif", "0", "6", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("12", "5", "phpBB TextBlock", "phpBB TextBlock Demo", "", "0", "10", "85d178caa8", "icon_dot.gif", "0", "1", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("13", "5", "WYSIWYG TextBlock", "WYSIWYG TextBlock Demo", "", "0", "20", "51e2ddb3a7", "icon_dot.gif", "0", "10", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("14", "5", "Custom TextBlock", "Custom TextBlock Demo", "", "0", "30", "22cb7a4f9f", "icon_dot.gif", "0", "9", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("15", "6", "Modules Info", "Information", "", "0", "10", "630ce0e7f0", "icon_dot.gif", "0", "30", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("5", "1", "phpBB Home", "", "http://www.phpbb.com", "0", "20", "71fe54c6a2", "icon_info.gif", "0", "0", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("3", "3", "SiteStats", "Some Sitestats", "", "0", "30", "62b47107b4", "icon_stats.gif", "0", "0", "4", "0", "0"); --- 338,345 ---- INSERT INTO mx_table_menu_nav VALUES("10", "4", "IncludeX", "IncludeX Demo", "", "0", "40", "f7adaf1201", "icon_dot.gif", "0", "27", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("11", "4", "phpBB Polls (if any)", "phpBB Polls Demo", "", "0", "50", "a80fe73aee", "icon_dot.gif", "0", "6", "0", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("12", "5", "phpBB TextBlock", "phpBB TextBlock Demo", "", "0", "10", "85d178caa8", "icon_dot.gif", "0", "1", "3", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("13", "5", "WYSIWYG TextBlock", "WYSIWYG TextBlock Demo", "", "0", "20", "51e2ddb3a7", "icon_dot.gif", "0", "10", "3", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("14", "5", "Custom TextBlock", "Custom TextBlock Demo", "", "0", "30", "22cb7a4f9f", "icon_dot.gif", "0", "9", "3", "0", "0"); ! INSERT INTO mx_table_menu_nav VALUES("15", "6", "Modules Info", "Information", "", "0", "10", "630ce0e7f0", "icon_dot.gif", "0", "30", "3", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("5", "1", "phpBB Home", "", "http://www.phpbb.com", "0", "20", "71fe54c6a2", "icon_info.gif", "0", "0", "0", "0", "0"); INSERT INTO mx_table_menu_nav VALUES("3", "3", "SiteStats", "Some Sitestats", "", "0", "30", "62b47107b4", "icon_stats.gif", "0", "0", "4", "0", "0"); *************** *** 364,368 **** `module_copy` text, PRIMARY KEY (`module_id`) ! ) TYPE=MyISAM; --- 364,368 ---- `module_copy` text, PRIMARY KEY (`module_id`) ! ); *************** *** 394,398 **** `page_graph_border` varchar(255) NOT NULL default '', PRIMARY KEY (`page_id`) ! ) TYPE=MyISAM; --- 394,398 ---- `page_graph_border` varchar(255) NOT NULL default '', PRIMARY KEY (`page_id`) ! ); *************** *** 416,420 **** `template_name` varchar(255) NOT NULL default '', PRIMARY KEY (`page_template_id`) ! ) TYPE=MyISAM; --- 416,420 ---- `template_name` varchar(255) NOT NULL default '', PRIMARY KEY (`page_template_id`) ! ); *************** *** 443,447 **** `parameter_order` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`parameter_id`) ! ) TYPE=MyISAM; --- 443,447 ---- `parameter_order` smallint(5) unsigned NOT NULL default '0', PRIMARY KEY (`parameter_id`) ! ); *************** *** 515,519 **** `portal_recached` varchar(255) binary NOT NULL default '', PRIMARY KEY (`portal_id`) ! ) TYPE=MyISAM; --- 515,519 ---- `portal_recached` varchar(255) binary NOT NULL default '', PRIMARY KEY (`portal_id`) ! ); *************** *** 536,546 **** PRIMARY KEY (`search_id`), KEY `session_id` (`session_id`) ! ) TYPE=MyISAM; ! ! ! ! # ! # Dumping data for table 'mx_table_search_results' ! # --- 536,540 ---- PRIMARY KEY (`search_id`), KEY `session_id` (`session_id`) ! ); *************** *** 556,566 **** PRIMARY KEY (`word_text`), KEY `word_id` (`word_id`) ! ) TYPE=MyISAM; ! ! ! ! # ! # Dumping data for table 'mx_table_wordlist' ! # --- 550,554 ---- PRIMARY KEY (`word_text`), KEY `word_id` (`word_id`) ! ); *************** *** 576,584 **** KEY `block_id` (`block_id`), KEY `word_id` (`word_id`) ! ) TYPE=MyISAM; ! ! - # - # Dumping data for table 'mx_table_wordmatch' - # --- 564,567 ---- KEY `block_id` (`block_id`), KEY `word_id` (`word_id`) ! ); |
2 messages has been excluded from this view by a project administrator.
