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: Markus P. <mar...@us...> - 2005-04-26 20:13:52
|
Update of /cvsroot/mxbb/core/modules/mx_statistics/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12315 Removed Files: mx_statistics.tpl Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- mx_statistics.tpl DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:12:51
|
Update of /cvsroot/mxbb/core/modules/mx_last_msg/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11840 Removed Files: mx_last_msg.tpl mx_last_msg_view.tpl Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- mx_last_msg.tpl DELETED --- --- mx_last_msg_view.tpl DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:12:05
|
Update of /cvsroot/mxbb/core/modules/mx_last_msg/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11525/admin Removed Files: index.htm Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- index.htm DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:12:04
|
Update of /cvsroot/mxbb/core/modules/mx_last_msg/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11525/language/lang_english Removed Files: index.htm Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- index.htm DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:12:04
|
Update of /cvsroot/mxbb/core/modules/mx_last_msg/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11525/language Removed Files: index.htm Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- index.htm DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:11:05
|
Update of /cvsroot/mxbb/core/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10971 Removed Files: index.htm Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- index.htm DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:08:59
|
Update of /cvsroot/mxbb/core/modules/mx_statistics/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9870/mx_statistics/templates/subSilver Added Files: mx_statistics.tpl Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- NEW FILE: mx_statistics.tpl --- <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> <tr> <td class="catHead" align="center" colspan="4"> <span class="cattitle">{L_ADMIN_STATISTICS}</span> </td> </tr> <tr> <th width="25%" class="thCornerL" align="center"><strong>{L_STATISTIC}</strong></td> <th width="25%" class="thTop" align="center"><strong>{L_VALUE}</strong></td> <th width="25%" class="thTop" align="center"><strong>{L_STATISTIC}</strong></td> <th width="25%" class="thCornerR" align="center"><strong>{L_VALUE}</strong></td> </tr> <!-- BEGIN adminrow --> <tr> <td class="row2" align="center"><span class="gen">{adminrow.STATISTIC}</span></td> <td class="row1" width="25%" align="center"><span class="gen">{adminrow.VALUE}</span></td> <td class="row2" align="center"><span class="gen">{adminrow.STATISTIC2}</span></td> <td class="row1" width="25%" align="center"><span class="gen">{adminrow.VALUE2}</span></td> </tr> <!-- END adminrow --> </table> <br clear="all" /> <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> <tr> <td class="catHead" align="center" colspan="5"> <span class="cattitle">{L_TOP_POSTERS}</span> </td> </tr> <tr> <th class="thCornerL" align="center"><strong>{L_RANK}</strong></th> <th class="thTop" align="center" width="10%"><strong>{L_USERNAME}</strong></th> <th class="thTop" align="center" width="10%"><strong>{L_POSTS}</strong></th> <th class="thTop" align="center" width="10%"><strong>{L_PERCENTAGE}</strong></th> <th class="thCornerR" align="center" width="50%"><strong>{L_GRAPH}</strong></th> </tr> <!-- BEGIN users --> <tr> <td class="{users.CLASS}" align="left" width="10%"><span class="gen">{users.RANK}</span></td> <td class="{users.CLASS}" align="left" width="10%"><span class="gen"><a href="{users.URL}">{users.USERNAME}</a></span></td> <td class="{users.CLASS}" align="center" width="10%"><span class="gen">{users.POSTS}</span></td> <td class="{users.CLASS}" align="center" width="10%"><span class="gen">{users.PERCENTAGE}%</span></td> <td class="{users.CLASS}" align="left" width="50%"> <table cellspacing="0" cellpadding="0" border="0" align="left"> <tr> <td align="right"><img src="{LEFT_GRAPH_IMAGE}" width="4" height="12" /></td> </tr> </table> <table cellspacing="0" cellpadding="0" border="0" align="left" width="{users.BAR}%"> <tr> <td><img src="{GRAPH_IMAGE}" width="100%" height="12" /></td> </tr> </table> <table cellspacing="0" cellpadding="0" border="0" align="left"> <tr> <td align="left"><img src="{RIGHT_GRAPH_IMAGE}" width="4" height="12" /></td> </tr> </table> </td> </tr> <!-- END users --> </table> <br clear="all" /> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td valign="top" width="50%" style="padding-right:2px;"> <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> <tr> <td class="catHead" align="center" colspan="3"><span class="cattitle">{L_MOST_VIEWED}</span></td> </tr> <tr> <th colspan="1" class="thCornerL" align="left"><strong>{L_RANK}</strong></th> <th class="thTop" align="center"><strong>{L_VIEWS}</strong></th> <th class="thCornerR" align="center"><strong>{L_TOPIC}</strong></th> </tr> <!-- BEGIN topicviews --> <tr> <td class="{topicviews.CLASS}" align="left" width="5%"><span class="gen">{topicviews.RANK}</span></td> <td class="{topicviews.CLASS}" align="center" width="20%"><span class="gen">{topicviews.VIEWS}</span></td> <td class="{topicviews.CLASS}" align="left"><span class="gen"><a href="{topicviews.URL}">{topicviews.TITLE}</a></span></td> </tr> <!-- END topicviews --> </table> </td> <td valign="top" width="50%" style="padding-left:2px;"> <table border="0" cellpadding="4" cellspacing="1" class="forumline" width="100%"> <tr> <td class="catHead" align="center" colspan="3" height="28"> <span class="cattitle">{L_MOST_ACTIVE}</span></td> </tr> <tr> <th colspan="1" class="thCornerL" align="left"><strong>{L_RANK}</strong></th> <th class="thTop" align="center"><strong>{L_REPLIES}</strong></th> <th class="thCornerR" align="center"><strong>{L_TOPIC}</strong></th> </tr> <!-- BEGIN topicreplies --> <tr> <td class="{topicreplies.CLASS}" align="left" width="5%"><span class="gen">{topicreplies.RANK}</span></td> <td class="{topicreplies.CLASS}" align="center" width="20%"><span class="gen">{topicreplies.REPLIES}</span></td> <td class="{topicreplies.CLASS}" align="left"><span class="gen"><a href="{topicreplies.URL}">{topicreplies.TITLE}</a></span></td> </tr> <!-- END topicreplies --> </table> </td> </tr> </table> |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:08:58
|
Update of /cvsroot/mxbb/core/modules/mx_statistics/language In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9870/mx_statistics/language Removed Files: index.htm Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- index.htm DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:08:58
|
Update of /cvsroot/mxbb/core/modules/mx_statistics/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9870/mx_statistics/language/lang_english Removed Files: index.htm Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- index.htm DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:08:58
|
Update of /cvsroot/mxbb/core/modules/mx_statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9870/mx_statistics Removed Files: index.htm mx_install_readme.htm version_history.txt Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- mx_install_readme.htm DELETED --- --- version_history.txt DELETED --- --- index.htm DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:08:56
|
Update of /cvsroot/mxbb/core/modules/mx_last_msg/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9870/mx_last_msg/templates/subSilver Added Files: mx_last_msg.tpl mx_last_msg_view.tpl Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- NEW FILE: mx_last_msg.tpl --- <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <!-- BEGIN no_row --> <tr> <td class="row1" align="left" colspan="2">{no_row.L_NO_ITEMS}</td> </tr> <!-- END no_row --> <!-- BEGIN msg_row --> <tr> <td class="row2" align="center"><span class="cattitle"><img src="{U_PHPBB_ROOT_PATH}{msg_row.FOLDER_IMG}" width="19" height="18" alt="{msg_row.L_TOPIC_FOLDER_ALT}" title="{msg_row.L_TOPIC_FOLDER_ALT}" /></span></td> <td class="row1" align="{U_ALIGN}"><span class="genmed"><b><a href="{msg_row.U_LAST_MSG}" target="{U_TARGET}" class="genmed">{msg_row.LAST_MSG}</a></b></span><br /><span class="genmed"><a href="{msg_row.U_FORUM}" target="{U_TARGET}" class="genmed">{msg_row.FORUM_NAME}</a></span><br /> <div align="right"><span class="gensmall" nowrap="nowrap">{msg_row.LAST_MSG_DATE}</span><span class="gensmall" nowrap="nowrap"> {msg_row.TOPIC_AUTHOR} {msg_row.LAST_POST_AUTHOR}{msg_row.LAST_POST_IMG}</span></div></td> </tr> <!-- END msg_row --> <tr valign="middle"> <!-- <td align="center" class="catBottom" height="28" colspan="2"> <a href="{U_URL_PREV}" class="cattitle"><img src="{TEMPLATE_ROOT_PATH}images/msg_prev.gif" border="0" width="19" height="18" alt="{L_MSG_PREV}" title="{L_MSG_PREV}" /></a> <a href="{U_URL_NEXT}" class="cattitle"><img src="{TEMPLATE_ROOT_PATH}images/msg_next.gif" border="0" width="19" height="18" alt="{L_MSG_NEXT}" title="{L_MSG_NEXT}" /></a> </td> --> <!--<td align="center" valign="top"><span class="catBottom">{PAGE_NUMBER}</span></td> --> <td align="right" valign="top" nowrap="nowrap" colspan="2" height="28" class="catBottom"><span class="gensmall">{PAGINATION}</span></td> </tr> </table> --- NEW FILE: mx_last_msg_view.tpl --- <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <!-- BEGIN no_row --> <tr> <td class="row1" align="left" colspan="2">{no_row.L_NO_ITEMS}</td> </tr> <!-- END no_row --> <!-- BEGIN msg_row --> <tr> <td width="5%" class="catLeft" align="center"><span class="cattitle"><img src="{U_PHPBB_ROOT_PATH}{msg_row.FOLDER_IMG}" width="19" height="18" alt="{msg_row.L_TOPIC_FOLDER_ALT}" title="{msg_row.L_TOPIC_FOLDER_ALT}" /></span></td> <td class="row1" align="{U_ALIGN}"><span class="genmed"><a href="{msg_row.U_LAST_MSG}" target="{U_TARGET}" class="genmed">{msg_row.LAST_MSG}</a></span> </td> <td class="row1" align="{U_ALIGN}"><span class="genmed"><a href="{msg_row.U_FORUM}" target="{U_TARGET}" class="genmed">{msg_row.FORUM_NAME}</a></span> </td> <td class="row1" align="right"><span class="genmed"><a href="{msg_row.U_LAST_MSG}" target="{U_TARGET}" class="genmed">{msg_row.LAST_MSG_DATE} {msg_row.LAST_POST_AUTHOR}{msg_row.LAST_POST_IMG}</a></span></td> </tr> <!-- END msg_row --> <tr valign="middle"> <!-- <td align="center" class="catBottom" height="28" colspan="5"> <a href="{U_URL_PREV}" class="cattitle"><img src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/msg_prev.gif" border="0" width="19" height="18" alt="{L_MSG_PREV}" title="{L_MSG_PREV}" /></a> <a href="{U_URL_NEXT}" class="cattitle"><img src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/msg_next.gif" border="0" width="19" height="18" alt="{L_MSG_NEXT}" title="{L_MSG_NEXT}" /></a> </td> --> <!-- <td align="center" valign="top"><span class="catBottom">{PAGE_NUMBER}</span></td> --> <td align="right" valign="top" nowrap="nowrap" colspan="5" height="28" class="catBottom"><span class="gensmall">{PAGINATION}</span></td> </tr> </table> |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:08:56
|
Update of /cvsroot/mxbb/core/modules/mx_last_msg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9870/mx_last_msg Removed Files: functions.php index.htm mx_install_readme.htm version_history.txt Log Message: Removed obsolete files from mx_last_msg and mx_statistics modules. Created subSilver folder and moved templates to proper place. --- functions.php DELETED --- --- mx_install_readme.htm DELETED --- --- version_history.txt DELETED --- --- index.htm DELETED --- |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:07:24
|
Update of /cvsroot/mxbb/core/modules/mx_last_msg/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9086/subSilver Log Message: Directory /cvsroot/mxbb/core/modules/mx_last_msg/templates/subSilver added to the repository |
|
From: Markus P. <mar...@us...> - 2005-04-26 20:06:26
|
Update of /cvsroot/mxbb/core/modules/mx_statistics/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8617/subSilver Log Message: Directory /cvsroot/mxbb/core/modules/mx_statistics/templates/subSilver added to the repository |
|
From: Markus P. <mar...@us...> - 2005-04-26 19:52:36
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1355/mx_textblocks Modified Files: mx_textblock_bbcode.php mx_textblock_blog.php mx_textblock_html.php mx_textblock_multi.php Log Message: Code cleanup and fixed XHTML issues in some templates. Index: mx_textblock_html.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_html.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_textblock_html.php 12 Apr 2005 17:38:37 -0000 1.6 --- mx_textblock_html.php 26 Apr 2005 19:52:18 -0000 1.7 *************** *** 12,16 **** */ ! /** * 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 --- 12,16 ---- */ ! /** * 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 *************** *** 18,51 **** * (at your option) any later version. */ ! ! $block_config = read_block_config( $block_id ); $title = $block_config[$block_id]['block_title']; ! $message = $block_config[$block_id][Html]['parameter_value']; $message = str_replace("\n", "\n<br />\n", $message); // Start output of page ! $template->set_filenames( array( "body_block" => "mx_textblock_html.tpl" ) ! ); ! ! $template->assign_vars( array( 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_TITLE' => ( !empty( $lang[$title] ) ? $lang[$title] : $title ), ! 'S_ACTION' => $edit_url, ! 'U_URL' => append_sid( PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id ), ! 'U_TEXT' => $message, ! 'EDIT_IMG' => $edit_img, ! 'MOVE_L_IMG' => $move_l_img, ! 'MOVE_R_IMG' => $move_r_img, ! 'MOVE_U_IMG' => $move_u_img, ! 'MOVE_D_IMG' => $move_d_img, ! 'CACHE_IMG' => $cache_img, ! 'DELETE_IMG' => $delete_img, ! 'BLOCK_ID' => $block_id, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields ) ! ); ! $template->pparse( "body_block" ); ?> \ No newline at end of file --- 18,60 ---- * (at your option) any later version. */ ! ! if( !defined('IN_PORTAL') ) ! { ! die("Hacking attempt"); ! } ! ! ! $block_config = read_block_config($block_id); $title = $block_config[$block_id]['block_title']; ! $message = $block_config[$block_id]['Html']['parameter_value']; $message = str_replace("\n", "\n<br />\n", $message); + // // Start output of page + // + $template->set_filenames(array( + 'body_block' => 'mx_textblock_html.tpl') + ); ! $template->assign_vars(array( ! 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'L_TITLE' => ( !empty($lang[$title]) ? $lang[$title] : $title ), ! 'S_ACTION' => $edit_url, ! 'U_URL' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id), ! 'U_TEXT' => $message, ! 'EDIT_IMG' => $edit_img, ! 'MOVE_L_IMG' => $move_l_img, ! 'MOVE_R_IMG' => $move_r_img, ! 'MOVE_U_IMG' => $move_u_img, ! 'MOVE_D_IMG' => $move_d_img, ! 'CACHE_IMG' => $cache_img, ! 'DELETE_IMG' => $delete_img, ! 'BLOCK_ID' => $block_id, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields) ! ); ! $template->pparse('body_block'); ?> \ No newline at end of file Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_textblock_multi.php 12 Apr 2005 17:38:37 -0000 1.8 --- mx_textblock_multi.php 26 Apr 2005 19:52:18 -0000 1.9 *************** *** 12,16 **** */ ! /** * 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 --- 12,16 ---- */ ! /** * 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 *************** *** 18,23 **** * (at your option) any later version. */ ! ! $block_config = read_block_config( $block_id ); $title = $block_config[$block_id]['block_title']; --- 18,29 ---- * (at your option) any later version. */ ! ! if( !defined('IN_PORTAL') ) ! { ! die("Hacking attempt"); ! } ! ! ! $block_config = read_block_config($block_id); $title = $block_config[$block_id]['block_title']; *************** *** 36,51 **** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); ! } // Block Pages/toc ! if ( isset( $HTTP_POST_VARS['page_num'] ) || isset( $HTTP_GET_VARS['page_num'] ) ) { ! $page_num = ( isset( $HTTP_POST_VARS['page_num'] ) ) ? $HTTP_POST_VARS['page_num'] : $HTTP_GET_VARS['page_num']; $page_num = $page_num - 1; } --- 42,60 ---- // Read language definition // ********************************************************************** ! if( !file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { ! include($module_root_path . 'language/lang_english/lang_main.' . $phpEx); } else { ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); ! } ! ! // // Block Pages/toc ! // ! if( isset($HTTP_POST_VARS['page_num']) || isset($HTTP_GET_VARS['page_num']) ) { ! $page_num = ( isset($HTTP_POST_VARS['page_num']) ) ? $HTTP_POST_VARS['page_num'] : $HTTP_GET_VARS['page_num']; $page_num = $page_num - 1; } *************** *** 55,90 **** } ! $art_pages = explode( '[page]', $message ); ! $message = trim( $art_pages[$page_num] ); ! $message = str_replace( '[toc]', '', $message ); ! ! // End Pages/TOC ! if ( !$allow_html ) { ! $message = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $message ); ! } ! if ( $allow_bbcode ) { $bbcode_uid = $block_config[$block_id]['Text']['bbcode_uid']; ! $message = mx_decode( $message, $bbcode_uid, $allow_smilies, $allow_bbcode ) ; } - - // Start output of page ! $template->set_filenames( array( "body_block" => "mx_textblock_multi.tpl" ) ! ); ! if ( $show_title == 'TRUE' ) { ! if ( $title_style == 'TRUE' ) { ! $template->assign_block_vars( "switch_standard_style", array() ); } else { ! $template->assign_block_vars( "switch_no_style", array() ); } } --- 64,101 ---- } ! $art_pages = explode('[page]', $message); ! $message = trim($art_pages[$page_num]); ! $message = str_replace('[toc]', '', $message); ! // // End Pages/TOC + // ! if( !$allow_html ) { ! $message = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $message); ! } ! if( $allow_bbcode ) { $bbcode_uid = $block_config[$block_id]['Text']['bbcode_uid']; ! $message = mx_decode($message, $bbcode_uid, $allow_smilies, $allow_bbcode); } ! // ! // Start output of page ! // ! $template->set_filenames(array( ! 'body_block' => 'mx_textblock_multi.tpl') ! ); ! if( $show_title == 'TRUE' ) { ! if( $title_style == 'TRUE' ) { ! $template->assign_block_vars('switch_standard_style', array()); } else { ! $template->assign_block_vars('switch_no_style', array()); } } *************** *** 93,202 **** $text_style = ( ( $text_style == '' ) || ( $text_style == 'none' ) ) ? 'genmed' : $text_style; ! $template->assign_vars( array( 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_TITLE' => ( !empty( $lang[$title] ) ? $lang[$title] : $title ), ! 'S_ACTION' => $edit_url, ! 'U_TEXT' => $message, ! 'EDIT_IMG' => $edit_img, ! 'MOVE_L_IMG' => $move_l_img, ! 'MOVE_R_IMG' => $move_r_img, ! 'MOVE_U_IMG' => $move_u_img, ! 'MOVE_D_IMG' => $move_d_img, ! 'CACHE_IMG' => $cache_img, ! 'DELETE_IMG' => $delete_img, ! 'BLOCK_ID' => $block_id, ! 'BLOCK_STYLE' => $block_style, ! 'TEXT_STYLE' => $text_style, ! 'TITLE_STYLE' => $block_style, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields, ! 'L_TOC' => $lang['Toc_title'], ! 'L_GOTO_PAGE' => $lang['Goto_page'] ! ) ); ! $xtra_dynamic = isset( $HTTP_GET_VARS['dynamic_block'] ) ? '&dynamic_block=' . $HTTP_GET_VARS['dynamic_block']: ''; // Formatting the TOC ! ! if ( count( $art_pages ) > 1 ) { ! $template->assign_block_vars( 'switch_toc', array() ); $i = 0; ! ! while ( $i < count( $art_pages ) ) { $page_number = $i + 1; ! $art_split = explode( '[toc]', $art_pages[$i] ); $article_toc = $art_split[0]; // $article_body = $art_split[1]; ! // Fix up the toc title ! if ( !$allow_html ) { ! $article_toc = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $article_toc ); ! } ! // Parse message ! ! $article_toc = preg_replace( "/\[(\S+)\]/e", "", $article_toc ); ! $article_toc = make_clickable( $article_toc ); ! // Parse smilies ! ! if ( $allow_smilies ) { ! $article_toc = mx_smilies_pass( $article_toc ); ! } ! // Replace naughty words ! ! if ( count( $orig_word ) ) { ! $article_toc = str_replace( '\"', '"', substr( preg_replace( '#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $article_toc . '<' ), 1, -1 ) ); ! } ! // Replace newlines (we use this rather than nl2br because // till recently it wasn't XHTML compliant) // $article_toc = str_replace("\n", "\n<br />\n", $article_toc); ! $page_toc = $art_pages[$i]; ! if ( $page_num != $i ) { ! $temp_url = append_sid( "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic ); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } else { ! $page_link = $page_number . ' - ' . $article_toc ; } ! if ( $i < count( $art_pages ) - 1 ) { $page_link .= '<br />'; } ! ! $template->assign_block_vars( 'switch_toc.pages', array( 'TOC_ITEM' => $page_link ) ! ); ! $i++; } ! } // Formatting the TOC navigation/pagination ! ! if ( count( $art_pages ) > 1 ) { ! $template->assign_block_vars( 'switch_pages', array() ); $i = 0; ! ! while ( $i < count( $art_pages ) ) { $page_number = $i + 1; ! ! if ( $page_num != $i ) { ! $temp_url = append_sid( "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic ); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; } --- 104,223 ---- $text_style = ( ( $text_style == '' ) || ( $text_style == 'none' ) ) ? 'genmed' : $text_style; ! $template->assign_vars(array( ! 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'L_TITLE' => ( !empty($lang[$title]) ? $lang[$title] : $title ), ! 'S_ACTION' => $edit_url, ! 'U_TEXT' => $message, ! 'EDIT_IMG' => $edit_img, ! 'MOVE_L_IMG' => $move_l_img, ! 'MOVE_R_IMG' => $move_r_img, ! 'MOVE_U_IMG' => $move_u_img, ! 'MOVE_D_IMG' => $move_d_img, ! 'CACHE_IMG' => $cache_img, ! 'DELETE_IMG' => $delete_img, ! 'BLOCK_ID' => $block_id, ! 'BLOCK_STYLE' => $block_style, ! 'TEXT_STYLE' => $text_style, ! 'TITLE_STYLE' => $block_style, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields, ! 'L_TOC' => $lang['Toc_title'], ! 'L_GOTO_PAGE' => $lang['Goto_page'] ! )); ! $xtra_dynamic = isset($HTTP_GET_VARS['dynamic_block']) ? '&dynamic_block=' . $HTTP_GET_VARS['dynamic_block'] : ''; + // // Formatting the TOC ! // ! if( count($art_pages) > 1 ) { ! $template->assign_block_vars('switch_toc', array()); $i = 0; ! ! while( $i < count($art_pages) ) { $page_number = $i + 1; ! $art_split = explode('[toc]', $art_pages[$i]); $article_toc = $art_split[0]; // $article_body = $art_split[1]; ! ! // // Fix up the toc title ! // ! if( !$allow_html ) { ! $article_toc = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $article_toc); ! } ! ! // // Parse message ! // ! $article_toc = preg_replace("/\[(\S+)\]/e", "", $article_toc); ! $article_toc = make_clickable($article_toc); ! ! // // Parse smilies ! // ! if( $allow_smilies ) { ! $article_toc = mx_smilies_pass($article_toc); ! } ! ! // // Replace naughty words ! // ! if( count($orig_word) ) { ! $article_toc = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $article_toc . '<'), 1, -1)); ! } ! ! // // Replace newlines (we use this rather than nl2br because // till recently it wasn't XHTML compliant) // $article_toc = str_replace("\n", "\n<br />\n", $article_toc); ! // $page_toc = $art_pages[$i]; ! if( $page_num != $i ) { ! $temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } else { ! $page_link = $page_number . ' - ' . $article_toc; } ! if( $i < count($art_pages) - 1 ) { $page_link .= '<br />'; } ! ! $template->assign_block_vars('switch_toc.pages', array( ! 'TOC_ITEM' => $page_link) ! ); ! $i++; } ! } + // // Formatting the TOC navigation/pagination ! // ! if( count($art_pages) > 1 ) { ! $template->assign_block_vars('switch_pages', array()); $i = 0; ! ! while( $i < count($art_pages) ) { $page_number = $i + 1; ! ! if( $page_num != $i ) { ! $temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; } *************** *** 206,222 **** } ! if ( $i < count( $art_pages ) - 1 ) { $page_link .= ', '; } ! ! $template->assign_block_vars( 'switch_pages.pages', array( 'PAGE_LINK' => $page_link ) ! ); ! $i++; } } ! $template->pparse( "body_block" ); ?> \ No newline at end of file --- 227,244 ---- } ! if( $i < count($art_pages) - 1 ) { $page_link .= ', '; } ! ! $template->assign_block_vars('switch_pages.pages', array( ! 'PAGE_LINK' => $page_link) ! ); ! $i++; } } ! $template->pparse('body_block'); ?> \ No newline at end of file Index: mx_textblock_blog.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_blog.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_textblock_blog.php 13 Apr 2005 21:23:28 -0000 1.7 --- mx_textblock_blog.php 26 Apr 2005 19:52:18 -0000 1.8 *************** *** 12,16 **** */ ! /** * 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 --- 12,16 ---- */ ! /** * 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 *************** *** 18,30 **** * (at your option) any later version. */ ! ! if ( isset( $HTTP_POST_VARS['u'] ) || isset( $HTTP_GET_VARS['u'] ) ) { ! $sub_id = ( isset( $HTTP_POST_VARS['u'] ) ) ? intval( $HTTP_POST_VARS['u'] ) : intval( $HTTP_GET_VARS['u'] ); $blog_mode = 'user'; } ! else if ( isset( $HTTP_POST_VARS['g'] ) || isset( $HTTP_GET_VARS['g'] ) ) { ! $sub_id = ( isset( $HTTP_POST_VARS['g'] ) ) ? intval( $HTTP_POST_VARS['g'] ) : intval( $HTTP_GET_VARS['g'] ); $blog_mode = 'group'; } --- 18,36 ---- * (at your option) any later version. */ ! ! if( !defined('IN_PORTAL') ) { ! die("Hacking attempt"); ! } ! ! ! if( isset($HTTP_POST_VARS['u']) || isset($HTTP_GET_VARS['u']) ) ! { ! $sub_id = ( isset($HTTP_POST_VARS['u']) ) ? intval($HTTP_POST_VARS['u']) : intval($HTTP_GET_VARS['u']); $blog_mode = 'user'; } ! else if( isset($HTTP_POST_VARS['g']) || isset($HTTP_GET_VARS['g']) ) { ! $sub_id = ( isset($HTTP_POST_VARS['g']) ) ? intval($HTTP_POST_VARS['g']) : intval($HTTP_GET_VARS['g']); $blog_mode = 'group'; } *************** *** 38,42 **** } ! $block_config = read_block_config( $block_id, false, $sub_id ); $title = $block_config[$block_id]['block_title']; --- 44,48 ---- } ! $block_config = read_block_config($block_id, false, $sub_id); $title = $block_config[$block_id]['block_title']; *************** *** 51,66 **** // Read language definition // ********************************************************************** ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) ) { ! include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); } else { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); ! } // Block Pages/toc ! if ( isset( $HTTP_POST_VARS['page_num'] ) || isset( $HTTP_GET_VARS['page_num'] ) ) { ! $page_num = ( isset( $HTTP_POST_VARS['page_num'] ) ) ? $HTTP_POST_VARS['page_num'] : $HTTP_GET_VARS['page_num']; $page_num = $page_num - 1; } --- 57,75 ---- // Read language definition // ********************************************************************** ! if( !file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx) ) { ! include($module_root_path . 'language/lang_english/lang_main.' . $phpEx); } else { ! include($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); ! } ! ! // // Block Pages/toc ! // ! if( isset($HTTP_POST_VARS['page_num']) || isset($HTTP_GET_VARS['page_num']) ) { ! $page_num = ( isset($HTTP_POST_VARS['page_num']) ) ? $HTTP_POST_VARS['page_num'] : $HTTP_GET_VARS['page_num']; $page_num = $page_num - 1; } *************** *** 70,87 **** } ! $art_pages = explode( '[page]', $message ); ! $message = trim( $art_pages[$page_num] ); ! $message = str_replace( '[toc]', '', $message ); // End Pages/TOC $bbcode_uid = $block_config[$block_id]['Blog']['bbcode_uid']; ! $message = mx_decode( $message, $bbcode_uid ) ; // EDIT BLOG ! $iss_auth_ary = array(); ! $iss_auth_ary = block_auth( AUTH_EDIT, $block_id , $userdata, $block_config[$block_id][auth_edit], $block_config[$block_id][auth_edit_group] ); ! $blog_validate = ( $blog_mode == 'user' ) ? $sub_id == $userdata['user_id'] : mx_auth_group( $sub_id, true ); ! if ( $blog_validate || $iss_auth_ary[auth_edit] ) { $ss_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; --- 79,100 ---- } ! $art_pages = explode('[page]', $message); ! $message = trim($art_pages[$page_num]); ! $message = str_replace('[toc]', '', $message); ! ! // // End Pages/TOC + // $bbcode_uid = $block_config[$block_id]['Blog']['bbcode_uid']; ! $message = mx_decode($message, $bbcode_uid); + // // EDIT BLOG ! // ! $iss_auth_ary = block_auth(AUTH_EDIT, $block_id, $userdata, $block_config[$block_id]['auth_edit'], $block_config[$block_id]['auth_edit_group']); ! $blog_validate = ( $blog_mode == 'user' ) ? $sub_id == $userdata['user_id'] : mx_auth_group($sub_id, true); ! if( $blog_validate || $iss_auth_ary['auth_edit'] ) { $ss_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; *************** *** 89,94 **** $ss_hidden_fields .= '<input type="hidden" name="portalpage" value="' . $page_id . '" />'; $ss_hidden_fields .= '<input type="hidden" name="mode" value="editblog" />'; ! //$ss_hidden_fields .= '<input type="hidden" name="u" value="' . intval( $HTTP_GET_VARS['u'] ) . '" />'; ! //$ss_hidden_fields .= '<input type="hidden" name="g" value="' . intval( $HTTP_GET_VARS['g'] ) . '" />'; $ss_hidden_fields .= '<input type="hidden" name="u" value="' . $sub_id. '" />'; $ss_hidden_fields .= '<input type="hidden" name="g" value="' . $sub_id. '" />'; --- 102,107 ---- $ss_hidden_fields .= '<input type="hidden" name="portalpage" value="' . $page_id . '" />'; $ss_hidden_fields .= '<input type="hidden" name="mode" value="editblog" />'; ! //$ss_hidden_fields .= '<input type="hidden" name="u" value="' . intval($HTTP_GET_VARS['u']) . '" />'; ! //$ss_hidden_fields .= '<input type="hidden" name="g" value="' . intval($HTTP_GET_VARS['g']) . '" />'; $ss_hidden_fields .= '<input type="hidden" name="u" value="' . $sub_id. '" />'; $ss_hidden_fields .= '<input type="hidden" name="g" value="' . $sub_id. '" />'; *************** *** 98,127 **** $splitt_admin_file = 'modules/mx_textblocks/admin/mx_textblock_edit.php'; $editt_url = append_sid( $mx_root_path . $splitt_admin_file . "?sid=" . $userdata['session_id'] ); ! $editt_img = '<input type="image" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/block_edit.gif" alt="' . $lang['Block_Edit'] . '" title="' . $lang['Block_Edit'] . ' :: ' . $block_config[$block_id][block_title] . '"></input>'; ! $template->assign_block_vars( "switch_blog_edit", array( 'EDIT_ACTION' => $editt_url, ! 'EDIT_IMG' => $editt_img, ! 'S_HIDDEN_FORM_FIELDS' => $ss_hidden_fields ! ) ); } else { ! $template->assign_block_vars( "switch_blog_noedit", array() ); } // Start output of page ! $template->set_filenames( array( "body_block" => "mx_textblock_blog.tpl" ) ! ); ! ! if ( $show_title == 'TRUE' ) { ! if ( $title_style == 'TRUE' ) { ! $template->assign_block_vars( "switch_standard_style", array() ); } else { ! $template->assign_block_vars( "switch_no_style", array() ); } } --- 111,143 ---- $splitt_admin_file = 'modules/mx_textblocks/admin/mx_textblock_edit.php'; $editt_url = append_sid( $mx_root_path . $splitt_admin_file . "?sid=" . $userdata['session_id'] ); ! $editt_img = '<input type="image" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/block_edit.gif" alt="' . $lang['Block_Edit'] . '" title="' . $lang['Block_Edit'] . ' :: ' . $block_config[$block_id]['block_title'] . '"></input>'; ! $template->assign_block_vars('switch_blog_edit', array( ! 'EDIT_ACTION' => $editt_url, ! 'EDIT_IMG' => $editt_img, ! 'S_HIDDEN_FORM_FIELDS' => $ss_hidden_fields ! )); } else { ! $template->assign_block_vars('switch_blog_noedit', array()); } + // // Start output of page + // + $template->set_filenames(array( + 'body_block' => 'mx_textblock_blog.tpl') + ); ! if( $show_title == 'TRUE' ) { ! if( $title_style == 'TRUE' ) { ! $template->assign_block_vars('switch_standard_style', array()); } else { ! $template->assign_block_vars('switch_no_style', array()); } } *************** *** 130,200 **** $text_style = ( ( $text_style == '' ) || ( $text_style == 'none' ) ) ? 'genmed' : $text_style; ! if ( !empty($blog_id) && $userdata['session_logged_in'] && $blog_mode == 'user' ) { ! $template->assign_block_vars( "switch_blog_id", array( ! 'BLOG_ID' => sprintf( $blog_id, $userdata['username'] ) ! ) ); } ! $template->assign_vars( array( 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_TITLE' => ( !empty( $lang[$title] ) ? $lang[$title] : $title ), ! 'S_ACTION' => $edit_url, ! 'U_TEXT' => $message, ! 'EDIT_IMG' => $edit_img, ! 'MOVE_L_IMG' => $move_l_img, ! 'MOVE_R_IMG' => $move_r_img, ! 'MOVE_U_IMG' => $move_u_img, ! 'MOVE_D_IMG' => $move_d_img, ! 'CACHE_IMG' => $cache_img, ! 'DELETE_IMG' => $delete_img, ! 'BLOCK_ID' => $block_id, ! 'BLOCK_STYLE' => $block_style, ! 'TEXT_STYLE' => $text_style, ! 'TITLE_STYLE' => $block_style, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields, ! 'L_TOC' => $lang['Toc_title'], ! 'L_GOTO_PAGE' => $lang['Goto_page'] ! ) ); // article pages table of contents ! ! if ( count( $art_pages ) > 1 ) { ! $template->assign_block_vars( 'switch_toc', array() ); $i = 0; ! while ( $i < count( $art_pages ) ) { $page_number = $i + 1; ! $art_split = explode( '[toc]', $art_pages[$i] ); $article_toc = $art_split[0]; // $article_body = $art_split[1]; // Fix up the toc title ! if ( !$board_config['allow_html'] ) { ! $article_toc = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $article_toc ); ! } ! // Parse message ! // $bbcode_uid = $row['bbcode_uid']; // $article_toc = preg_replace('/\:[0-9a-z\:]+\]/si', ']', $article_toc); ! $article_toc = preg_replace( "/\[(\S+)\]/e", "", $article_toc ); // $txt = preg_replace("/<a href=\"(.*)\">(.*)<\/a>/i", "\\2 (\\1)", $txt); ! $article_toc = make_clickable( $article_toc ); ! // Parse smilies ! ! if ( $board_config['allow_smilies'] ) { ! $article_toc = mx_smilies_pass( $article_toc ); ! } ! // Replace naughty words ! ! if ( count( $orig_word ) ) { ! $article_toc = str_replace( '\"', '"', substr( preg_replace( '#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $article_toc . '<' ), 1, -1 ) ); } // Replace newlines (we use this rather than nl2br because --- 146,221 ---- $text_style = ( ( $text_style == '' ) || ( $text_style == 'none' ) ) ? 'genmed' : $text_style; ! if( !empty($blog_id) && $userdata['session_logged_in'] && $blog_mode == 'user' ) { ! $template->assign_block_vars('switch_blog_id', array( ! 'BLOG_ID' => sprintf($blog_id, $userdata['username']) ! )); } ! $template->assign_vars(array( ! 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'L_TITLE' => ( !empty($lang[$title]) ? $lang[$title] : $title ), ! 'S_ACTION' => $edit_url, ! 'U_TEXT' => $message, ! 'EDIT_IMG' => $edit_img, ! 'MOVE_L_IMG' => $move_l_img, ! 'MOVE_R_IMG' => $move_r_img, ! 'MOVE_U_IMG' => $move_u_img, ! 'MOVE_D_IMG' => $move_d_img, ! 'CACHE_IMG' => $cache_img, ! 'DELETE_IMG' => $delete_img, ! 'BLOCK_ID' => $block_id, ! 'BLOCK_STYLE' => $block_style, ! 'TEXT_STYLE' => $text_style, ! 'TITLE_STYLE' => $block_style, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields, ! 'L_TOC' => $lang['Toc_title'], ! 'L_GOTO_PAGE' => $lang['Goto_page'] ! )); + // // article pages table of contents ! // ! if( count($art_pages) > 1 ) { ! $template->assign_block_vars('switch_toc', array()); $i = 0; ! while( $i < count($art_pages) ) { $page_number = $i + 1; ! $art_split = explode('[toc]', $art_pages[$i]); $article_toc = $art_split[0]; // $article_body = $art_split[1]; // Fix up the toc title ! if( !$board_config['allow_html'] ) { ! $article_toc = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $article_toc); ! } ! ! // // Parse message ! // // $bbcode_uid = $row['bbcode_uid']; // $article_toc = preg_replace('/\:[0-9a-z\:]+\]/si', ']', $article_toc); ! $article_toc = preg_replace("/\[(\S+)\]/e", "", $article_toc); // $txt = preg_replace("/<a href=\"(.*)\">(.*)<\/a>/i", "\\2 (\\1)", $txt); ! $article_toc = make_clickable($article_toc); ! ! // // Parse smilies ! // ! if( $board_config['allow_smilies'] ) { ! $article_toc = mx_smilies_pass($article_toc); ! } ! ! // // Replace naughty words ! // ! if( count($orig_word) ) { ! $article_toc = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $article_toc . '<'), 1, -1)); } // Replace newlines (we use this rather than nl2br because *************** *** 203,239 **** $page_toc = $art_pages[$i]; ! if ( $page_num != $i ) { ! $temp_url = append_sid( "index.php?page=$page_id&mode=article&page_num=$page_number" ); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } else { ! $page_link = $page_number . ' - ' . $article_toc ; } ! if ( $i < count( $art_pages ) - 1 ) { $page_link .= '<br />'; } ! $template->assign_block_vars( 'switch_toc.pages', array( 'TOC_ITEM' => $page_link ) ! ); $i++; } ! } // article pages ! ! if ( count( $art_pages ) > 1 ) { ! $template->assign_block_vars( 'switch_pages', array() ); $i = 0; ! while ( $i < count( $art_pages ) ) { $page_number = $i + 1; ! if ( $page_num != $i ) { ! $temp_url = append_sid( "index.php?page=$page_id&mode=article&page_num=$page_number" ); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; } --- 224,262 ---- $page_toc = $art_pages[$i]; ! if( $page_num != $i ) { ! $temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=article&page_num=$page_number"); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } else { ! $page_link = $page_number . ' - ' . $article_toc; } ! if( $i < count($art_pages) - 1 ) { $page_link .= '<br />'; } ! $template->assign_block_vars('switch_toc.pages', array( ! 'TOC_ITEM' => $page_link) ! ); $i++; } ! } + // // article pages ! // ! if( count($art_pages) > 1 ) { ! $template->assign_block_vars('switch_pages', array()); $i = 0; ! while( $i < count($art_pages) ) { $page_number = $i + 1; ! if( $page_num != $i ) { ! $temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=article&page_num=$page_number"); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; } *************** *** 243,257 **** } ! if ( $i < count( $art_pages ) - 1 ) { $page_link .= ', '; } ! $template->assign_block_vars( 'switch_pages.pages', array( 'PAGE_LINK' => $page_link ) ! ); $i++; } } ! $template->pparse( "body_block" ); ?> \ No newline at end of file --- 266,281 ---- } ! if( $i < count($art_pages) - 1 ) { $page_link .= ', '; } ! $template->assign_block_vars('switch_pages.pages', array( ! 'PAGE_LINK' => $page_link) ! ); $i++; } } ! $template->pparse('body_block'); ?> \ No newline at end of file Index: mx_textblock_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_bbcode.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_textblock_bbcode.php 12 Apr 2005 17:38:37 -0000 1.7 --- mx_textblock_bbcode.php 26 Apr 2005 19:52:14 -0000 1.8 *************** *** 12,16 **** */ ! /** * 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 --- 12,16 ---- */ ! /** * 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 *************** *** 18,25 **** * (at your option) any later version. */ - - // Read block Configuration ! $block_config = read_block_config( $block_id ); $title = $block_config[$block_id]['block_title']; --- 18,31 ---- * (at your option) any later version. */ ! if( !defined('IN_PORTAL') ) ! { ! die("Hacking attempt"); ! } ! ! // ! // Read block Configuration ! // ! $block_config = read_block_config($block_id); $title = $block_config[$block_id]['block_title']; *************** *** 30,65 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! if ( !$html_on ) { ! $message = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $message ); ! } ! if ( $bbcode_on ) { $bbcode_uid = $block_config[$block_id][Text]['bbcode_uid']; ! $message = mx_decode( $message, $bbcode_uid, $smilies_on, $bbcode_on ) ; } // Start output of page ! $template->set_filenames( array( "body_block" => "mx_textblock_bbcode.tpl" ) ! ); ! ! $template->assign_vars( array( 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_TITLE' => ( !empty( $lang[$title] ) ? $lang[$title] : $title ), ! 'S_ACTION' => $edit_url, ! 'U_TEXT' => $message, ! 'EDIT_IMG' => $edit_img, ! 'MOVE_L_IMG' => $move_l_img, ! 'MOVE_R_IMG' => $move_r_img, ! 'MOVE_U_IMG' => $move_u_img, ! 'MOVE_D_IMG' => $move_d_img, ! 'CACHE_IMG' => $cache_img, ! 'DELETE_IMG' => $delete_img, ! 'BLOCK_ID' => $block_id, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields ! ) ); ! $template->pparse( "body_block" ); ?> \ No newline at end of file --- 36,74 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! if( !$html_on ) { ! $message = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $message); ! } ! if( $bbcode_on ) { $bbcode_uid = $block_config[$block_id][Text]['bbcode_uid']; ! $message = mx_decode($message, $bbcode_uid, $smilies_on, $bbcode_on); } + // // Start output of page + // + $template->set_filenames(array( + 'body_block' => 'mx_textblock_bbcode.tpl') + ); ! $template->assign_vars(array( ! 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'L_TITLE' => ( !empty($lang[$title]) ? $lang[$title] : $title ), ! 'S_ACTION' => $edit_url, ! 'U_TEXT' => $message, ! 'EDIT_IMG' => $edit_img, ! 'MOVE_L_IMG' => $move_l_img, ! 'MOVE_R_IMG' => $move_r_img, ! 'MOVE_U_IMG' => $move_u_img, ! 'MOVE_D_IMG' => $move_d_img, ! 'CACHE_IMG' => $cache_img, ! 'DELETE_IMG' => $delete_img, ! 'BLOCK_ID' => $block_id, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields ! )); ! $template->pparse('body_block'); ?> \ No newline at end of file |
Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1355/mx_textblocks/templates/subSilver Modified Files: mx_textblock_bbcode.tpl mx_textblock_blog.tpl mx_textblock_html.tpl mx_textblock_multi.tpl mx_textblock_preview.tpl Log Message: Code cleanup and fixed XHTML issues in some templates. Index: mx_textblock_html.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/subSilver/mx_textblock_html.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_textblock_html.tpl 9 Jan 2005 21:53:02 -0000 1.5 --- mx_textblock_html.tpl 26 Apr 2005 19:52:18 -0000 1.6 *************** *** 1,10 **** <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <!-- ! <tr> ! <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> ! </tr> --> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="genmed">{U_TEXT}</span></td> ! </tr> ! </table> --- 1,10 ---- <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <!-- ! <tr> ! <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> ! </tr> --> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="genmed">{U_TEXT}</span></td> ! </tr> ! </table> \ No newline at end of file Index: mx_textblock_multi.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/subSilver/mx_textblock_multi.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_textblock_multi.tpl 9 Jan 2005 21:53:02 -0000 1.4 --- mx_textblock_multi.tpl 26 Apr 2005 19:52:18 -0000 1.5 *************** *** 1,38 **** <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="{BLOCK_STYLE}"> - <tr> ! <!-- BEGIN switch_standard_style --> ! <!--<th class="thHead" align="left" colspan="2"> {L_TITLE} </th>--> ! <!-- END switch_standard_style --> ! <!-- BEGIN switch_no_style --> ! <!--<td class="row1" align="left" colspan="2"><b>{L_TITLE}</b> </td>--> ! <!-- END switch_no_style --> ! ! </tr> ! ! <!-- BEGIN switch_toc --> ! <tr> ! <td class="row1" align="left" colspan="2"><br /><span class="topictitle">{L_TOC}</span><br /><hr> ! <span class="nav"> ! <!-- BEGIN pages --> ! {switch_toc.pages.TOC_ITEM} ! <!-- END pages --> ! </span></td> ! </tr> ! <!-- END switch_toc --> ! ! <tr> ! <td class="row1" align="left" colspan="2"><span class="{TEXT_STYLE}">{U_TEXT}</span></td> ! </tr> ! <!-- BEGIN switch_pages --> ! <tr> ! <td class="row1" align="center" colspan="2"><span class="nav"><hr>{L_GOTO_PAGE} ! <!-- BEGIN pages --> ! {switch_pages.pages.PAGE_LINK} ! <!-- END pages --> ! </span></td> ! </tr> ! <!-- END switch_pages --> ! ! </table> --- 1,36 ---- <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="{BLOCK_STYLE}"> ! <!-- <tr> --> ! <!-- BEGIN switch_standard_style --> ! <!-- <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> --> ! <!-- END switch_standard_style --> ! <!-- BEGIN switch_no_style --> ! <!-- <td class="row1" align="left" colspan="2"><b>{L_TITLE}</b> </td> --> ! <!-- END switch_no_style --> ! <!-- </tr> --> ! <!-- BEGIN switch_toc --> ! <tr> ! <td class="row1" align="left" colspan="2"><br /><span class="topictitle">{L_TOC}</span><br /><hr /><span class="nav"> ! <!-- BEGIN pages --> ! {switch_toc.pages.TOC_ITEM} ! <!-- END pages --> ! </span></td> ! </tr> ! <!-- END switch_toc --> ! ! <tr> ! <td class="row1" align="left" colspan="2"><span class="{TEXT_STYLE}">{U_TEXT}</span></td> ! </tr> ! ! <!-- BEGIN switch_pages --> ! <tr> ! <td class="row1" align="center" colspan="2"><span class="nav"><hr />{L_GOTO_PAGE} ! <!-- BEGIN pages --> ! {switch_pages.pages.PAGE_LINK} ! <!-- END pages --> ! </span></td> ! </tr> ! <!-- END switch_pages --> ! ! </table> \ No newline at end of file Index: mx_textblock_preview.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/subSilver/mx_textblock_preview.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_textblock_preview.tpl 9 Jan 2005 21:53:02 -0000 1.3 --- mx_textblock_preview.tpl 26 Apr 2005 19:52:18 -0000 1.4 *************** *** 1,9 **** <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thCornerL" align="left" > {BLOCK_TITLE} </th> ! <th class="thCornerR" align="right" > </th> ! </tr> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="genmed">{BLOCK_INFO}</span></td> ! </tr> ! </table> --- 1,9 ---- <table width="100%" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <th class="thCornerL" align="left" > {BLOCK_TITLE} </th> ! <th class="thCornerR" align="right" > </th> ! </tr> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="genmed">{BLOCK_INFO}</span></td> ! </tr> ! </table> \ No newline at end of file Index: mx_textblock_blog.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/subSilver/mx_textblock_blog.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_textblock_blog.tpl 15 Jan 2005 23:55:39 -0000 1.2 --- mx_textblock_blog.tpl 26 Apr 2005 19:52:18 -0000 1.3 *************** *** 1,64 **** ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline" > ! <tr> ! ! <!-- BEGIN switch_blog_edit --> ! <form action="{switch_blog_edit.EDIT_ACTION}" method="post" > ! <!--<th class="thCornerL" align="left" > {L_TITLE} </th>--> ! <td class="row1" align="left" > {switch_blog_edit.EDIT_IMG} </td> ! <!-- END switch_blog_edit --> ! ! <!-- BEGIN switch_blog_noedit --> ! <!--<th class="thHead" align="left" colspan="2"> {L_TITLE} </th>--> ! <!-- END switch_blog_noedit --> ! ! <!-- BEGIN switch_blog_edit --> ! {switch_blog_edit.S_HIDDEN_FORM_FIELDS} </form> ! <!-- END switch_blog_edit --> ! ! </tr> ! <tr> ! <!-- BEGIN switch_standard_style --> ! <!--<th class="thHead" align="left" colspan="2"> {L_TITLE} </th>--> ! <!-- END switch_standard_style --> ! <!-- BEGIN switch_no_style --> ! <!--<td class="row1" align="left" colspan="2"><b>{L_TITLE}</b> </td>--> ! <!-- END switch_no_style --> ! ! </tr> ! ! <!-- BEGIN switch_toc --> ! <tr> ! <td class="row1" align="left" colspan="2"><br /><span class="topictitle">{L_TOC}</span><br /><hr> ! <span class="nav"> ! <!-- BEGIN pages --> ! {switch_toc.pages.TOC_ITEM} ! <!-- END pages --> ! </span></td> ! </tr> ! <!-- END switch_toc --> ! <!-- BEGIN switch_blog_id --> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="{TEXT_STYLE}"><i>{switch_blog_id.BLOG_ID}</i></span><hr></td> ! </tr> ! <!-- END switch_blog_id --> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="{TEXT_STYLE}">{U_TEXT}</span></td> ! </tr> ! <!-- BEGIN switch_pages --> ! <tr> ! <td class="row1" align="center" colspan="2"><span class="nav"><hr>{L_GOTO_PAGE} ! <!-- BEGIN pages --> ! {switch_pages.pages.PAGE_LINK} ! <!-- END pages --> ! </span></td> ! </tr> ! <!-- END switch_pages --> ! ! </table> --- 1,58 ---- ! <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> ! <tr> ! <!-- BEGIN switch_blog_edit --> ! <form action="{switch_blog_edit.EDIT_ACTION}" method="post"> ! <!-- <th class="thCornerL" align="left" > {L_TITLE} </th> --> ! <td class="row1" align="left" > {switch_blog_edit.EDIT_IMG} </td> ! <!-- END switch_blog_edit --> ! <!-- BEGIN switch_blog_noedit --> ! <!-- <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> --> ! <!-- END switch_blog_noedit --> ! <!-- BEGIN switch_blog_edit --> ! {switch_blog_edit.S_HIDDEN_FORM_FIELDS} </form> ! <!-- END switch_blog_edit --> ! </tr> ! <!-- <tr> --> ! <!-- BEGIN switch_standard_style --> ! <!-- <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> --> ! <!-- END switch_standard_style --> ! <!-- BEGIN switch_no_style --> ! <!-- <td class="row1" align="left" colspan="2"><b>{L_TITLE}</b> </td> --> ! <!-- END switch_no_style --> ! <!-- </tr> --> ! <!-- BEGIN switch_toc --> ! <tr> ! <td class="row1" align="left" colspan="2"><br /><span class="topictitle">{L_TOC}</span><br /><hr /><span class="nav"> ! <!-- BEGIN pages --> ! {switch_toc.pages.TOC_ITEM} ! <!-- END pages --> ! </span></td> ! </tr> ! <!-- END switch_toc --> ! <!-- BEGIN switch_blog_id --> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="{TEXT_STYLE}"><i>{switch_blog_id.BLOG_ID}</i></span><hr /></td> ! </tr> ! <!-- END switch_blog_id --> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="{TEXT_STYLE}">{U_TEXT}</span></td> ! </tr> ! ! <!-- BEGIN switch_pages --> ! <tr> ! <td class="row1" align="center" colspan="2"><span class="nav"><hr />{L_GOTO_PAGE} ! <!-- BEGIN pages --> ! {switch_pages.pages.PAGE_LINK} ! <!-- END pages --> ! </span></td> ! </tr> ! <!-- END switch_pages --> ! ! </table> \ No newline at end of file Index: mx_textblock_bbcode.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/subSilver/mx_textblock_bbcode.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_textblock_bbcode.tpl 9 Jan 2005 21:53:02 -0000 1.4 --- mx_textblock_bbcode.tpl 26 Apr 2005 19:52:18 -0000 1.5 *************** *** 1,10 **** <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <!-- ! <tr> ! <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> ! </tr> --> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="genmed">{U_TEXT}</span></td> ! </tr> ! </table> --- 1,10 ---- <table width="{BLOCK_SIZE}" cellpadding="4" cellspacing="0" border="0" class="forumline"> <!-- ! <tr> ! <th class="thHead" align="left" colspan="2"> {L_TITLE} </th> ! </tr> --> ! <tr> ! <td class="row1" align="left" colspan="2"><span class="genmed">{U_TEXT}</span></td> ! </tr> ! </table> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-26 19:52:33
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1355/mx_textblocks/language/lang_english Modified Files: lang_main.php Log Message: Code cleanup and fixed XHTML issues in some templates. Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/language/lang_english/lang_main.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_main.php 22 May 2004 21:05:30 -0000 1.3 --- lang_main.php 26 Apr 2005 19:52:18 -0000 1.4 *************** *** 20,25 **** * ***************************************************************************/ ! // Entries for Flexible Blocks $lang['Block_Style'] = "Block Border:"; $lang['Title_Style'] = "Title Header Style:"; --- 20,27 ---- * ***************************************************************************/ ! ! // // Entries for Flexible Blocks + // $lang['Block_Style'] = "Block Border:"; $lang['Title_Style'] = "Title Header Style:"; *************** *** 42,44 **** --- 44,47 ---- $lang['Toc_title'] = "Contents:"; $lang['Goto_page'] = "Goto page:"; + ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-26 18:17:29
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14187 Modified Files: admin_edit.php Log Message: Code cleanup and removed debug code. Index: admin_edit.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/admin_edit.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_edit.php 9 Jan 2005 21:53:02 -0000 1.3 --- admin_edit.php 26 Apr 2005 18:17:19 -0000 1.4 *************** *** 13,17 **** */ ! /** * 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 --- 13,17 ---- */ ! /** * 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 *************** *** 19,40 **** * (at your option) any later version. */ - - $no_page_header = true; ! if ( !empty( $setmodules ) ) { return; } ! define( 'IN_PORTAL', 1 ); ! $mx_root_path = "../../../"; ! // Security and page header ! require( $mx_root_path . 'admin/pagestart.php' ); ! ! mx_message_die( GENERAL_MESSAGE, 'Sorry, but this block is NOT designed to be configured in the AdminCP <br /> - please use the EDIT feature in normal portal mode instead.' ); ! include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); ?> \ No newline at end of file --- 19,40 ---- * (at your option) any later version. */ ! if( !empty($setmodules) ) { return; } ! // // Security and page header + // + define('IN_PORTAL', 1); + $mx_root_path = '../../../'; + $no_page_header = true; + include($mx_root_path . 'extension.inc'); + require($mx_root_path . "admin/pagestart.$phpEx"); ! mx_message_die(GENERAL_MESSAGE, 'Sorry, but this block is NOT designed to be configured in the AdminCP <br /> - please use the EDIT feature in normal portal mode instead.'); ! include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-26 18:07:44
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8038 Modified Files: mx_textblock_edit.php Log Message: Code cleanup and removed debug code. Index: mx_textblock_edit.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_textblock_edit.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_textblock_edit.php 13 Apr 2005 21:23:29 -0000 1.18 --- mx_textblock_edit.php 26 Apr 2005 18:07:30 -0000 1.19 *************** *** 12,16 **** */ ! /** * 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 --- 12,16 ---- */ ! /** * This program is free software; you can redistribute it and/or modify [...1310 lines suppressed...] ! 'S_SHOW_TITLE_NO' => $show_title_no, ! ! 'S_SHOW_STATS_YES' => $show_stats_yes, ! 'S_SHOW_STATS_NO' => $show_stats_no, ! ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL ! )); ! ! $template->pparse('body'); ! ! if( !empty($portalpage) ) { $page_title = $lang['Block_admin']; ! include($mx_root_path . 'includes/page_tail.' . $phpEx); } else { ! include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); } |
|
From: Markus P. <mar...@us...> - 2005-04-26 01:12:14
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28684 Modified Files: index_frameset.tpl Log Message: Changed ACP frameset title. Index: index_frameset.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/index_frameset.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index_frameset.tpl 19 May 2003 19:00:58 -0000 1.1 --- index_frameset.tpl 26 Apr 2005 01:11:49 -0000 1.2 *************** *** 1,5 **** <html> <head> ! <title>MX-System Administration</title> <meta http-equiv="Content-Type" content="text/html;"> </head> --- 1,5 ---- <html> <head> ! <title>mxBB-Portal Administration</title> <meta http-equiv="Content-Type" content="text/html;"> </head> |
|
From: Markus P. <mar...@us...> - 2005-04-26 00:17:41
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28809 Modified Files: mysql_schema_install.sql Log Message: Fixed Core Blocks module path in installation schema. Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mysql_schema_install.sql 20 Mar 2005 04:20:17 -0000 1.3 --- mysql_schema_install.sql 26 Apr 2005 00:17:32 -0000 1.4 *************** *** 42,46 **** # Dumping data for table `mx_module` # ! INSERT INTO mx_table_module VALUES('10', 'Core Blocks', './', 'Core blocks', '', '', ''); INSERT INTO mx_table_module VALUES('20', 'Text Blocks', 'modules/mx_textblocks/', 'Textblocks module', '', '', ''); INSERT INTO mx_table_module VALUES('30', 'Post Last Message', 'modules/mx_last_msg/', 'Last Message Module', '0', '', ''); --- 42,46 ---- # Dumping data for table `mx_module` # ! INSERT INTO mx_table_module VALUES('10', 'Core Blocks', 'modules/mx_coreblocks/', 'Core blocks', '', '', ''); INSERT INTO mx_table_module VALUES('20', 'Text Blocks', 'modules/mx_textblocks/', 'Textblocks module', '', '', ''); INSERT INTO mx_table_module VALUES('30', 'Post Last Message', 'modules/mx_last_msg/', 'Last Message Module', '0', '', ''); |
|
From: Markus P. <mar...@us...> - 2005-04-26 00:15:39
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27303/modules/mx_coreblocks/templates/subSilver Modified Files: mx_poll_ballot.tpl mx_poll_result.tpl Log Message: Added link to topic in poll results. Index: mx_poll_ballot.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_poll_ballot.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_poll_ballot.tpl 10 Apr 2005 23:30:23 -0000 1.6 --- mx_poll_ballot.tpl 26 Apr 2005 00:15:03 -0000 1.7 *************** *** 5,9 **** <table cellspacing="0" cellpadding="4" border="0" align="center"> <tr> ! <td align="center"><span class="gen"><a href="{U_URL}">{POLL_QUESTION}</a></span></td> </tr> <tr> --- 5,9 ---- <table cellspacing="0" cellpadding="4" border="0" align="center"> <tr> ! <td align="center"><span class="gen"><a href="{U_URL}"><b>{POLL_QUESTION}</b></a></span></td> </tr> <tr> Index: mx_poll_result.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver/mx_poll_result.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_poll_result.tpl 10 Apr 2005 23:30:23 -0000 1.6 --- mx_poll_result.tpl 26 Apr 2005 00:15:03 -0000 1.7 *************** *** 4,8 **** <table cellspacing="0" cellpadding="4" border="0" align="center"> <tr> ! <td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span></td> </tr> <tr> --- 4,8 ---- <table cellspacing="0" cellpadding="4" border="0" align="center"> <tr> ! <td align="center"><span class="gen"><a href="{U_URL}"><b>{POLL_QUESTION}</b></a></span></td> </tr> <tr> |
|
From: Markus P. <mar...@us...> - 2005-04-26 00:15:39
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27303/modules/mx_coreblocks Modified Files: mx_poll.php Log Message: Added link to topic in poll results. Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_poll.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** mx_poll.php 25 Apr 2005 21:32:41 -0000 1.19 --- mx_poll.php 26 Apr 2005 00:15:03 -0000 1.20 *************** *** 247,251 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'L_TOTAL_VOTES' => $lang['Total_votes'], ! 'TOTAL_VOTES' => $vote_results_sum) ); --- 247,252 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'L_TOTAL_VOTES' => $lang['Total_votes'], ! 'TOTAL_VOTES' => $vote_results_sum, ! 'U_URL' => append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); |
|
From: Markus P. <mar...@us...> - 2005-04-26 00:08:44
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23647/modules/mx_coreblocks Modified Files: mx_search.php Log Message: Fixed site search block. Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_search.php 25 Apr 2005 23:56:09 -0000 1.4 --- mx_search.php 26 Apr 2005 00:08:17 -0000 1.5 *************** *** 18,22 **** define( 'IN_PORTAL', true ); ! $mx_root_path = './'; include( $mx_root_path . 'extension.inc' ); --- 18,22 ---- define( 'IN_PORTAL', true ); ! $mx_root_path = '../../'; include( $mx_root_path . 'extension.inc' ); |
|
From: Markus P. <mar...@us...> - 2005-04-26 00:08:44
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23647/includes Modified Files: page_header.php Log Message: Fixed site search block. Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** page_header.php 25 Apr 2005 20:50:05 -0000 1.19 --- page_header.php 26 Apr 2005 00:08:06 -0000 1.20 *************** *** 427,430 **** --- 427,432 ---- 'U_INDEX_FORUM' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=2'), 'U_INDEX' => append_sid(PORTAL_URL . 'index.' . $phpEx), + 'U_SEARCH_SITE' => append_sid(PORTAL_URL . "modules/mx_coreblocks/mx_search.$phpEx?mode=results&search_terms=all"), + 'U_SEARCH_KB' => append_sid(PORTAL_URL . "modules/mx_kb/kb_search.$phpEx?mode=results&search_terms=all"), 'PAGE_ICON' => $page_icon_img, |
2 messages has been excluded from this view by a project administrator.
