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...> - 2008-01-28 21:53:25
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16555 Modified Files: music.php music_lists.php Log Message: probably nothing...but i got conflicts during update... Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** music.php 21 Sep 2007 22:21:56 -0000 1.11 --- music.php 28 Jan 2008 21:53:19 -0000 1.12 *************** *** 29,33 **** // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management --- 29,33 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management *************** *** 58,64 **** if( is_object($mx_block)) { ! $is_block = TRUE; } ! global $images, $mx_images; } --- 58,64 ---- if( is_object($mx_block)) { ! $is_block = TRUE; } ! global $images, $mx_images; } *************** *** 710,714 **** 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['comments'] . '</a>' ) : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($topsongrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($topsongrow[$j]['song_user_ip']) .'</a><br />' : '' ) ); --- 710,714 ---- 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['comments'] . '</a>' ) : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . phpBB2::decode_ip($topsongrow[$j]['song_user_ip']) . '" target="_blank">' . phpBB2::decode_ip($topsongrow[$j]['song_user_ip']) .'</a><br />' : '' ) ); Index: music_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_lists.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_lists.php 1 Aug 2007 23:33:27 -0000 1.1 --- music_lists.php 28 Jan 2008 21:53:20 -0000 1.2 *************** *** 454,458 **** 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['comments'] . '</a>' ) : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($topsongrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($topsongrow[$j]['song_user_ip']) .'</a><br />' : '', 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])), --- 454,458 ---- 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['comments'] . '</a>' ) : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . phpBB2::decode_ip($topsongrow[$j]['song_user_ip']) . '" target="_blank">' . phpBB2::decode_ip($topsongrow[$j]['song_user_ip']) .'</a><br />' : '', 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])), *************** *** 461,465 **** 'S_ROW_COUNT' => $j) ! ); } } --- 461,465 ---- 'S_ROW_COUNT' => $j) ! ); } } |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:53:24
|
Update of /cvsroot/mxbb/mx_music/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16555/includes Modified Files: music_cat.php music_comment.php Log Message: probably nothing...but i got conflicts during update... Index: music_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_comment.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_comment.php 8 Sep 2007 13:28:29 -0000 1.4 --- music_comment.php 28 Jan 2008 21:53:16 -0000 1.5 *************** *** 139,143 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_comment&song_id=$song_id"), true)); exit; } --- 139,143 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_comment&song_id=$song_id"), true)); exit; } *************** *** 298,302 **** 'POSTER' => $poster, 'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']), ! 'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '', 'TEXT' => nl2br($commentrow[$i]['comment_text']), --- 298,302 ---- 'POSTER' => $poster, 'TIME' => create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']), ! 'IP' => ($userdata['user_level'] == ADMIN) ? '-----------------------------------<br />' . $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . phpBB2::decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '', 'TEXT' => nl2br($commentrow[$i]['comment_text']), *************** *** 423,427 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_mxurl("music_mode=music_comment&song_id=$song_id"), true)); } else --- 423,427 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_mxurl("music_mode=music_comment&song_id=$song_id"), true)); } else Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/includes/music_cat.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** music_cat.php 10 Jan 2008 00:41:16 -0000 1.14 --- music_cat.php 28 Jan 2008 21:53:16 -0000 1.15 *************** *** 76,97 **** $cat_parent = $thiscat['cat_parent']; ! if ($cat_parent != 0) ! { ! $sql = "SELECT cat_id,cat_title ! FROM ". MUSIC_CAT_TABLE ." ! WHERE cat_id = $cat_parent"; ! if ( $result = $db->sql_query($sql) ) { $thiscat_parent = array(); ! $thiscat_parent = $db->sql_fetchrow($result); ! $template->assign_vars(array( 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), 'U_NAV_CAT_PARENT' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], ! 'CAT_PARENT' => $thiscat_parent['cat_id']) ); ! } ! } // // END cat info --- 76,97 ---- $cat_parent = $thiscat['cat_parent']; ! if ($cat_parent != 0) ! { ! $sql = "SELECT cat_id,cat_title ! FROM ". MUSIC_CAT_TABLE ." ! WHERE cat_id = $cat_parent"; ! if ( $result = $db->sql_query($sql) ) { $thiscat_parent = array(); ! $thiscat_parent = $db->sql_fetchrow($result); ! $template->assign_vars(array( 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), 'U_NAV_CAT_PARENT' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], ! 'CAT_PARENT' => $thiscat_parent['cat_id']) ); ! } ! } // // END cat info *************** *** 105,109 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_cat&cat_id=$cat_id"), true)); } else --- 105,109 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_cat&cat_id=$cat_id"), true)); } else *************** *** 345,358 **** } ! // ! // Update the music view counter ! // ! $sql = "UPDATE " . MUSIC_CAT_TABLE . " ! SET cat_views = cat_views + 1 ! WHERE cat_id = $cat_id"; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not update music views.", '', __LINE__, __FILE__, $sql); ! } $songrow = array(); --- 345,358 ---- } ! // ! // Update the music view counter ! // ! $sql = "UPDATE " . MUSIC_CAT_TABLE . " ! SET cat_views = cat_views + 1 ! WHERE cat_id = $cat_id"; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not update music views.", '', __LINE__, __FILE__, $sql); ! } $songrow = array(); *************** *** 419,423 **** // ------------------------------------ ! $song_id = $songrow[$j]['song_id']; $sql = "SELECT s.*, u.user_id, u.username, r.rate_song_id, AVG(r.rate_point) AS rating, COUNT(DISTINCT c.comment_id) AS comments --- 419,423 ---- // ------------------------------------ ! $song_id = $songrow[$j]['song_id']; $sql = "SELECT s.*, u.user_id, u.username, r.rate_song_id, AVG(r.rate_point) AS rating, COUNT(DISTINCT c.comment_id) AS comments *************** *** 459,464 **** if ( ($thissong['song_filetype'] == '') || ($song_filetype) && ($thissong['song_filetype'] != $song_filetype) ) { ! // ! // Update the song filetype // $sql = "UPDATE " . MUSIC_TABLE . " --- 459,464 ---- if ( ($thissong['song_filetype'] == '') || ($song_filetype) && ($thissong['song_filetype'] != $song_filetype) ) { ! // ! // Update the song filetype // $sql = "UPDATE " . MUSIC_TABLE . " *************** *** 466,473 **** WHERE song_id = '" . $song_id . "'"; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not update song filetype.", '', __LINE__, __FILE__, $sql); ! } } --- 466,473 ---- WHERE song_id = '" . $song_id . "'"; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, "Could not update song filetype.", '', __LINE__, __FILE__, $sql); ! } } *************** *** 558,562 **** $counthost = count($host) - 1; $docid2 = $host[$counthost]; ! // $domaintmp = explode(".", $domain, -1); // Php 5 only // $sitename = implode(".", $domaintmp); --- 558,562 ---- $counthost = count($host) - 1; $docid2 = $host[$counthost]; ! // $domaintmp = explode(".", $domain, -1); // Php 5 only // $sitename = implode(".", $domaintmp); *************** *** 566,570 **** function mx_music_sitename($domain) { $domaintmp = explode(".", $domain); ! $y = count($domaintmp) - 1; $r = ""; --- 566,570 ---- function mx_music_sitename($domain) { $domaintmp = explode(".", $domain); ! $y = count($domaintmp) - 1; $r = ""; *************** *** 575,579 **** } } ! $sitename = substr(mx_music_sitename($domain), 1); --- 575,579 ---- } } ! $sitename = substr(mx_music_sitename($domain), 1); *************** *** 582,586 **** function mx_music_sitesufix($domain) { $domaintmp = explode(".", $domain); ! $y = count($domaintmp) - 1; $r = $domaintmp[$y];; --- 582,586 ---- function mx_music_sitesufix($domain) { $domaintmp = explode(".", $domain); ! $y = count($domaintmp) - 1; $r = $domaintmp[$y];; *************** *** 588,594 **** } } ! $sitesufix = mx_music_sitesufix($domain); ! if (!empty($sitesufix) ) { --- 588,594 ---- } } ! $sitesufix = mx_music_sitesufix($domain); ! if (!empty($sitesufix) ) { *************** *** 606,618 **** $sitelngprefix = ''; } ! if ($sitename == 'video.google') { $videoid['song_url'] = explode("-", $thissong['song_url']); ! if (empty($videoid['song_url'][1]) ) { $docid['song_url'] = explode("?", $thissong['song_url']); ! if (empty($docid['song_url'][1]) ) { --- 606,618 ---- $sitelngprefix = ''; } ! if ($sitename == 'video.google') { $videoid['song_url'] = explode("-", $thissong['song_url']); ! if (empty($videoid['song_url'][1]) ) { $docid['song_url'] = explode("?", $thissong['song_url']); ! if (empty($docid['song_url'][1]) ) { *************** *** 639,643 **** $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $row_type = 'youtube'; ! } } else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) --- 639,643 ---- $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); $row_type = 'youtube'; ! } } else if ( ($sitename == 'www.youtube') || ($sitename == 'youtube') ) *************** *** 647,653 **** if (empty($videoid['song_url'][1]) ) { ! $videoid['song_url'] = explode("/v/", $thissong['song_url']); } ! if (empty($videoid['song_url'][1]) ) { --- 647,653 ---- if (empty($videoid['song_url'][1]) ) { ! $videoid['song_url'] = explode("/v/", $thissong['song_url']); } ! if (empty($videoid['song_url'][1]) ) { *************** *** 665,669 **** $domain = 'youtube.' . $sitesufix; } ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); --- 665,669 ---- $domain = 'youtube.' . $sitesufix; } ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); *************** *** 676,684 **** $thisvid['song_url'] = explode("videoid", $thissong['song_url']); $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); ! if (empty($videoid['song_url'][1]) ) { $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); --- 676,684 ---- $thisvid['song_url'] = explode("videoid", $thissong['song_url']); $videoid['song_url'] = explode("=", $thisvid['song_url'][1]); ! if (empty($videoid['song_url'][1]) ) { $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); *************** *** 689,693 **** { $template->assign_block_vars('songrow.youtube', array()); ! $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player.php?videoid=' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); --- 689,693 ---- { $template->assign_block_vars('songrow.youtube', array()); ! $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/player.php?videoid=' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Watch']) ? $lang['Watch'] : 'Watch URL' ); *************** *** 695,699 **** $row_type = 'youtube'; } ! } else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) --- 695,699 ---- $row_type = 'youtube'; } ! } else if ( ($sitename == 'www.myvideo') || ($sitename == 'myvideo') ) *************** *** 702,706 **** { $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); --- 702,706 ---- { $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); *************** *** 711,718 **** { $template->assign_block_vars('songrow.youtube', array()); ! $url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); $row_type = 'youtube'; } --- 711,718 ---- { $template->assign_block_vars('songrow.youtube', array()); ! $url_download = ( !empty($docid2) ? 'http://' . $domain . '/watch/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! $url_video = ( !empty($docid2) ? 'http://' . $domain . '/movie/' . $docid2 : $url_download ); $row_type = 'youtube'; } *************** *** 721,725 **** { $videoid['song_url'] = explode("=", $thissong['song_url']); ! if (empty($videoid['song_url'][1]) ) { --- 721,725 ---- { $videoid['song_url'] = explode("=", $thissong['song_url']); ! if (empty($videoid['song_url'][1]) ) { *************** *** 727,731 **** { $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); --- 727,731 ---- { $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); *************** *** 736,743 **** { $template->assign_block_vars('songrow.youtube', array()); ! $url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); $row_type = 'youtube'; } --- 736,743 ---- { $template->assign_block_vars('songrow.youtube', array()); ! $url_download = ( !empty($docid2) ? 'http://' . $sitelngprefix . 'sevenload.' . 'com' . '/videos/' . $docid2 : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! $url_video = ( !empty($docid2) ? 'http://' . $domain . '/swf/player.swf?id=' . $docid2 : $url_download ); $row_type = 'youtube'; } *************** *** 746,756 **** { $template->assign_block_vars('songrow.youtube', array()); ! $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); $row_type = 'youtube'; } ! } else --- 746,756 ---- { $template->assign_block_vars('songrow.youtube', array()); ! $url_download = ( !empty($videoid['song_url'][1]) ? 'http://' . $sitelngprefix . 'sevenload.'. 'com' . '/videos/' . $videoid['song_url'][1] : $thissong['song_url'] ); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); ! $url_video = ( !empty($videoid['song_url'][1]) ? 'http://' . $domain . '/swf/player.swf?id=' . $videoid['song_url'][1] : $url_download ); $row_type = 'youtube'; } ! } else *************** *** 775,783 **** { case 'img': ! $switch_row_type = 'img'; break; default: ! $switch_row_type = 'media'; } --- 775,783 ---- { case 'img': ! $switch_row_type = 'img'; break; default: ! $switch_row_type = 'media'; } |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:53:09
|
Update of /cvsroot/mxbb/mx_linkdb/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16082/templates/_core Modified Files: link_comment_posting.tpl Log Message: general updates... tinymce support Index: link_comment_posting.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/templates/_core/link_comment_posting.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** link_comment_posting.tpl 9 Sep 2007 20:09:50 -0000 1.1 --- link_comment_posting.tpl 28 Jan 2008 21:53:05 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + <!-- BEGIN switch_bbcodes --> <script language="JavaScript" type="text/javascript"> <!-- *************** *** 232,235 **** --- 233,238 ---- //--> </script> + <!-- END switch_bbcodes --> + <script language="javascript"> <!-- *************** *** 250,253 **** --- 253,364 ---- </script> + <!-- BEGIN tinyMCE --> + <script language="javascript" type="text/javascript" src="{tinyMCE.PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> + <script language="javascript" type="text/javascript"> + tinyMCE.init({ + mode : "textareas", + language : "{tinyMCE.LANG}", + docs_language : "{tinyMCE.LANG}", + + apply_source_formatting : "true", + cleanup : "true", + inline_styles : "true", + convert_fonts_to_spans : "true", + fix_list_elements : "true", + fix_table_elements : "true", + force_p_newlines : "true", + remove_trailing_nbsp : "true", + + plugins : "style,advimage,advlink,preview,searchreplace,contextmenu,paste,fullscreen", + + theme : "advanced", + theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6", + + theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace", + + theme_advanced_buttons1 : "newdocument,separator,cut,copy,paste,pastetext,pasteword,separator,formatselect,styleselect,fontsizeselect", + + theme_advanced_buttons2: "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,sup,sub,separator,link,unlink,image,separator,forecolor,separator,undo,redo", + + theme_advanced_buttons3: "", + + theme_advanced_disable : "", + + theme_advanced_toolbar_location : "top", + theme_advanced_toolbar_align : "left", + + content_css : "{tinyMCE.TEMPLATE}", + theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote", + + table_styles : "Layout=forumline", + table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3", + table_row_styles : "Table row 1=oddrow", + table_default_border : "0", + + document_base_url : "{tinyMCE.PATH}index.php", + relative_urls : "true", + + extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]" + }); + </script> + <!-- END tinyMCE --> + + <!-- BEGIN tinyMCE_admin --> + <script language="javascript" type="text/javascript" src="{tinyMCE_admin.PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> + <script language="javascript" type="text/javascript"> + tinyMCE.init({ + mode : "textareas", + language : "{tinyMCE_admin.LANG}", + docs_language : "{tinyMCE_admin.LANG}", + + apply_source_formatting : "true", + cleanup : "true", + inline_styles : "true", + convert_fonts_to_spans : "true", + fix_list_elements : "true", + fix_table_elements : "true", + force_p_newlines : "true", + remove_trailing_nbsp : "true", + + plugins : "table,advimage,advlink,insertdatetime,preview,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable", + + theme : "advanced", + theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6", + + theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace", + + theme_advanced_buttons1_add_before : "newdocument,separator", + theme_advanced_buttons1_add : "fontselect,fontsizeselect", + + theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor", + theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator", + + theme_advanced_buttons3_add_before : "tablecontrols,separator", + theme_advanced_buttons3_add : "print,separator,ltr,rtl,separator,fullscreen", + + theme_advanced_disable : "", + + theme_advanced_toolbar_location : "top", + theme_advanced_toolbar_align : "left", + + theme_advanced_path_location : "bottom", + theme_advanced_statusbar_location : "bottom", + + content_css : "{tinyMCE_admin.TEMPLATE}", + theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote", + + table_styles : "Layout=forumline", + table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3", + table_row_styles : "Table row 1=oddrow", + table_default_border : "0", + + document_base_url : "{tinyMCE_admin.PATH}index.php", + relative_urls : "true", + + extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]" + }); + </script> + <!-- END tinyMCE_admin --> + <form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"> *************** *** 274,321 **** <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <tr> ! <th class="thHead" colspan="2" height="25"><b>{L_COMMENT_ADD}</b></th> </tr> <tr> ! <td class="row1" ><span class="gen"><b>{L_COMMENT_TITLE}</b></span></td> ! <td class="row2"><input type="text" name="subject" size="45" maxlength="60" style="width:450px" tabindex="2" class="post" value="{TITLE}" /></span></td> </tr> <tr> ! <td class="row1" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="1"> ! <tr> ! <td><span class="gen"><b>{L_COMMENT}</b></span></td> ! </tr> ! <tr> ! <td valign="middle" align="center"> <br /> ! <table width="100" border="0" cellspacing="0" cellpadding="5"> ! <tr align="center"> ! <td colspan="{S_SMILIES_COLSPAN}" class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_EMOTICONS}</a></td> ! </tr> ! <!-- BEGIN smilies_row --> ! <tr align="center" valign="middle"> ! <!-- BEGIN smilies_col --> ! <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td> ! <!-- END smilies_col --> ! </tr> ! <!-- END smilies_row --> ! </table> ! </td> ! </tr> ! </table> ! </td> ! <td class="row2" valign="top"><span class="gen"> <span class="genmed"> </span> ! <table width="450" border="0" cellspacing="0" cellpadding="2"> <tr align="center" valign="middle"> <td><span class="genmed"> ! <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> </span></td> <td><span class="genmed"> --- 385,415 ---- <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <tr> ! <th colspan="2" class="thHead" height="25"><b>{L_COMMENT_ADD}</b></th> </tr> <tr> ! <td colspan="2" class="row1" ><span class="gen"><b>{L_COMMENT_TITLE}</b></span></td> </tr> <tr> ! <td colspan="2" class="row1"><input type="text" name="subject" size="45" maxlength="60" style="width:400px" tabindex="2" class="post" value="{TITLE}" /></span></td> ! </tr> ! <tr> ! <td colspan="2" class="row1" valign="top"><span class="gen"><b>{L_COMMENT}</b></span></td> ! </tr> ! <!-- BEGIN switch_bbcodes --> ! <tr> ! <td colspan="2" class="row2" valign="top"><span class="gen"> ! <table border="0" cellspacing="0" cellpadding="1"> <tr align="center" valign="middle"> <td><span class="genmed"> ! <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 20px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 20px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 20px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 45px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> </span></td> <td><span class="genmed"> *************** *** 323,327 **** </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> </span></td> <td><span class="genmed"> --- 417,421 ---- </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 35px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> </span></td> <td><span class="genmed"> *************** *** 329,336 **** </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> </span></td> </tr> --- 423,430 ---- </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 35px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 35px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> </span></td> </tr> *************** *** 339,343 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="genmed"> {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"> <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> --- 433,438 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="genmed"> ! {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"> <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> *************** *** 356,360 **** <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option> ! </select> {L_FONT_SIZE}: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> <option value="7" class="genmed">{L_FONT_TINY}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option> --- 451,456 ---- <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option> ! </select> <br /> ! {L_FONT_SIZE}: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> <option value="7" class="genmed">{L_FONT_TINY}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option> *************** *** 371,385 **** <tr> <td colspan="9"> <span class="gensmall"> ! <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> </span></td> </tr> - <tr> - <td colspan="9" class="row2"><span class="gen"> - <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{COMMENT}</textarea> - </td> - </tr> </table> </td> </tr> <tr> <td class="row1"><span class="gen"><B>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}<br />{LINKS_STATUS}<br />{IMAGES_STATUS}</span></td> --- 467,511 ---- <tr> <td colspan="9"> <span class="gensmall"> ! <input type="text" name="helpbox" size="45" maxlength="100" style="width:400px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> </span></td> </tr> </table> </td> </tr> + <!-- END switch_bbcodes --> + + <tr> + <td colspan="2" valign="middle" class="row1"> + <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <tr> + <td colspan="{S_SMILIES_COLSPAN}" class="genmed"> + <b>{L_EMOTICONS}</b> + </td> + </tr> + <tr valign="middle"> + <td> + <!-- BEGIN smilies_row --> + <!-- BEGIN smilies_col --> + <a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a> + <!-- END smilies_col --> + <!-- END smilies_row --> + </td> + </tr> + <!-- BEGIN switch_smilies_extra --> + <tr> + <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td> + </tr> + <!-- END switch_smilies_extra --> + </table> + </td> + </tr> + + <tr> + <td colspan="2" class="row1"> + <span class="gen"> + <textarea name="message" rows="30" cols="35" wrap="virtual" style="width:400px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{COMMENT}</textarea> + </span> + </td> + </tr> <tr> <td class="row1"><span class="gen"><B>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}<br />{LINKS_STATUS}<br />{IMAGES_STATUS}</span></td> *************** *** 388,392 **** <tr> <td class="cat" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS}<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" /> <input type="submit" accesskey="s" tabindex="6" name="submit" class="mainoption" value="{L_SUBMIT}" /></td> ! </form> </tr> </table> --- 514,519 ---- <tr> <td class="cat" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS}<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" /> <input type="submit" accesskey="s" tabindex="6" name="submit" class="mainoption" value="{L_SUBMIT}" /></td> ! </tr> </table> + </form> |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:53:09
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16082/linkdb/includes Modified Files: functions_linkdb.php Log Message: general updates... tinymce support Index: functions_linkdb.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/includes/functions_linkdb.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** functions_linkdb.php 9 Sep 2007 20:09:02 -0000 1.27 --- functions_linkdb.php 28 Jan 2008 21:53:04 -0000 1.28 *************** *** 82,88 **** // $this->comments[$cat_rowset[$i]['cat_id']]['activated'] = $cat_rowset[$i]['cat_allow_comments'] == -1 ? ($linkdb_config['use_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['cat_allow_comments'] == 1 ? true : false ); ! $this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($linkdb_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments ! $this->comments[$cat_rowset[$i]['cat_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($linkdb_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] < 1 ? ( intval($linkdb_config['comments_forum_id']) ) : ( intval($cat_rowset[$i]['comments_forum_id']) ); // phpBB target forum (only used for phpBB comments) if ($this->comments[$cat_rowset[$i]['cat_id']]['activated'] && !$this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id']) < 1) --- 82,100 ---- // $this->comments[$cat_rowset[$i]['cat_id']]['activated'] = $cat_rowset[$i]['cat_allow_comments'] == -1 ? ($linkdb_config['use_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['cat_allow_comments'] == 1 ? true : false ); ! ! switch($portal_config['portal_backend']) ! { ! case 'internal': ! $this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] = true; // phpBB or internal comments ! $this->comments[$cat_rowset[$i]['cat_id']]['autogenerate_comments'] = false; // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id'] = 0; // phpBB target forum (only used for phpBB comments) ! break; ! ! default: ! $this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($linkdb_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments ! $this->comments[$cat_rowset[$i]['cat_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($linkdb_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] < 1 ? ( intval($linkdb_config['comments_forum_id']) ) : ( intval($cat_rowset[$i]['comments_forum_id']) ); // phpBB target forum (only used for phpBB comments) ! break; ! } if ($this->comments[$cat_rowset[$i]['cat_id']]['activated'] && !$this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id']) < 1) *************** *** 1070,1073 **** --- 1082,1087 ---- $pageId = empty($pageId) ? $page_id : $pageId; + $args .= ($args == '' ? '' : '&' ) . 'modrewrite=no'; + if ( !MXBB_MODULE ) { *************** *** 1173,1177 **** * @param unknown_type $smilies_on */ ! function update_add_comment($link_data = '', $item_id, $cid, $subject = '', $message = '', $html_on = false, $bbcode_on = true, $smilies_on = false) { global $template, $linkdb_functions, $lang, $board_config, $phpEx, $linkdb_config, $db, $images, $userdata; --- 1187,1191 ---- * @param unknown_type $smilies_on */ ! function update_add_comment($link_data = '', $item_id, $cid, $subject = '', $message = '', $html_on = false, $bbcode_on = true, $smilies_on = false, $allow_wysiwyg = false) { global $template, $linkdb_functions, $lang, $board_config, $phpEx, $linkdb_config, $db, $images, $userdata; *************** *** 1215,1219 **** $mx_text = new mx_text(); $mx_text->init($html_on, $bbcode_on, $smilies_on); ! //$mx_text->allow_all_html_tags = $parameter_data['parameter_type'] = 'WysiwygTextBlock' ? true : false; // --- 1229,1233 ---- $mx_text = new mx_text(); $mx_text->init($html_on, $bbcode_on, $smilies_on); ! $mx_text->allow_all_html_tags = $allow_wysiwyg; // |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:53:09
|
Update of /cvsroot/mxbb/mx_linkdb/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16082/templates/_core/admin Modified Files: linkdb_admin_settings.tpl Log Message: general updates... tinymce support Index: linkdb_admin_settings.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/templates/_core/admin/linkdb_admin_settings.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** linkdb_admin_settings.tpl 9 Sep 2007 20:09:54 -0000 1.1 --- linkdb_admin_settings.tpl 28 Jan 2008 21:53:04 -0000 1.2 *************** *** 99,103 **** <tr> <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} /> {L_INTERNAL_COMMENTS_PHPBB}</td> </tr> <tr> --- 99,103 ---- <tr> <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} {S_READONLY} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} {S_READONLY} /> {L_INTERNAL_COMMENTS_PHPBB}</td> </tr> <tr> |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:53:08
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16082/linkdb/modules Modified Files: link_post_comment.php Log Message: general updates... tinymce support Index: link_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_post_comment.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** link_post_comment.php 9 Sep 2007 20:09:04 -0000 1.4 --- link_post_comment.php 28 Jan 2008 21:53:04 -0000 1.5 *************** *** 30,33 **** --- 30,34 ---- global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; + global $mx_block, $theme; // *************** *** 124,134 **** // ! // Toggles // ! $html_on = ( $link_config['allow_comment_html'] ) ? true : 0; ! $bbcode_on = ( $link_config['allow_comment_bbcode'] ) ? true : 0; ! $smilies_on = ( $link_config['allow_comment_smilies'] ) ? true : 0; ! $links_on = ( $link_config['allow_comment_links'] ) ? true : 0; ! $images_on = ( $link_config['allow_comment_images'] ) ? true : 0; // --- 125,180 ---- // ! // wysiwyg // ! if ( $link_config['allow_comment_wysiwyg'] && file_exists( $mx_root_path . $link_config['wysiwyg_path'] . 'tinymce/jscripts/tiny_mce/blank.htm' )) ! { ! // ! // Toggles ! // ! $allow_wysiwyg = true; ! $bbcode_on = false; ! $html_on = true; ! $smilies_on = false; ! $links_on = false; ! $images_on = false; ! ! $langcode = mx_get_langcode(); ! ! if ($mx_block->auth_mod) ! { ! $template->assign_block_vars( "tinyMCE_admin", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); ! } ! else ! { ! $template->assign_block_vars( "tinyMCE", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); ! } ! } ! else ! { ! // ! // Toggles ! // ! $allow_wysiwyg = false; ! $html_on = ( $link_config['allow_comment_html'] ) ? true : 0; ! $bbcode_on = ( $link_config['allow_comment_bbcode'] ) ? true : 0; ! $smilies_on = ( $link_config['allow_comment_smilies'] ) ? true : 0; ! $links_on = ( $link_config['allow_comment_links'] ) ? true : 0; ! $images_on = ( $link_config['allow_comment_images'] ) ? true : 0; ! ! $board_config['allow_html_tags'] = $link_config['allowed_comment_html_tags']; ! ! if ($smilies_on) ! { ! $linkdb_functions->generate_smilies( 'inline', PAGE_POSTING ); ! } ! } // *************** *** 143,147 **** // Fix: Setting 'emtpy' enables all // ! //$mx_text->allow_all_html_tags = $allow_wysiwyg; // Not yet implemented for comments // ======================================================= --- 189,193 ---- // Fix: Setting 'emtpy' enables all // ! $mx_text->allow_all_html_tags = $allow_wysiwyg; // ======================================================= *************** *** 196,200 **** if ( $submit ) { ! $this->update_add_comment($link_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); --- 242,246 ---- if ( $submit ) { ! $this->update_add_comment($link_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on, $allow_wysiwyg); $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); *************** *** 206,214 **** // ======================================================= - // - // Generate smilies listing for page output - // - $linkdb_functions->generate_smilies( 'inline', PAGE_POSTING ); - $html_status = ( $html_on ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF']; $bbcode_status = ( $bbcode_on ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF']; --- 252,255 ---- *************** *** 257,261 **** if ( $mx_request_vars->is_request('cid') ) { ! $hidden_form_fields = '<input type="hidden" name="mode" value="post_comment"> <input type="hidden" name="cat_id" value="' . $cat_id . '"> <input type="hidden" name="item_id" value="' . $item_id . '"> --- 298,302 ---- if ( $mx_request_vars->is_request('cid') ) { ! $hidden_form_fields = '<input type="hidden" name="action" value="post_comment"> <input type="hidden" name="cat_id" value="' . $cat_id . '"> <input type="hidden" name="item_id" value="' . $item_id . '"> *************** *** 271,275 **** $comment_body = ''; ! $hidden_form_fields = '<input type="hidden" name="mode" value="post_comment"> <input type="hidden" name="cat_id" value="' . $cat_id . '"> <input type="hidden" name="item_id" value="' . $item_id . '"> --- 312,316 ---- $comment_body = ''; ! $hidden_form_fields = '<input type="hidden" name="action" value="post_comment"> <input type="hidden" name="cat_id" value="' . $cat_id . '"> <input type="hidden" name="item_id" value="' . $item_id . '"> *************** *** 358,361 **** --- 399,407 ---- ); + if ( $bbcode_on ) + { + $template->assign_block_vars( 'switch_bbcodes', array()); + } + // =================================================== // assign var for navigation |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:53:08
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16082/linkdb/admin Modified Files: admin_cat_manage.php admin_setting.php Log Message: general updates... tinymce support Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_cat_manage.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_cat_manage.php 9 Sep 2007 20:09:01 -0000 1.13 --- admin_cat_manage.php 28 Jan 2008 21:53:03 -0000 1.14 *************** *** 18,22 **** function main( $action ) { ! global $db, $template, $lang, $phpEx, $linkdb_functions; $mode = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( $_REQUEST['mode'] ) : ''; --- 18,22 ---- function main( $action ) { ! global $db, $template, $lang, $phpEx, $linkdb_functions, $portal_config; $mode = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( $_REQUEST['mode'] ) : ''; *************** *** 335,339 **** 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], --- 335,340 ---- 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $portal_config['portal_backend'] != 'internal' ? $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ) : 'not available', ! //'FORUM_LIST' => $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], Index: admin_setting.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_setting.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_setting.php 9 Sep 2007 20:09:01 -0000 1.14 --- admin_setting.php 28 Jan 2008 21:53:04 -0000 1.15 *************** *** 18,22 **** function main( $action ) { ! global $db, $template, $lang, $phpEx, $linkdb_functions, $linkdb_cache; $submit = ( isset( $_POST['submit'] ) ) ? true : false; --- 18,22 ---- function main( $action ) { ! global $db, $template, $lang, $phpEx, $linkdb_functions, $linkdb_cache, $portal_config; $submit = ( isset( $_POST['submit'] ) ) ? true : false; *************** *** 128,141 **** $use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $comments_forum_id = $new['comments_forum_id']; ! $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; $allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : ""; --- 128,164 ---- $use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : ""; ! switch ($portal_config['portal_backend']) ! { ! case 'internal': ! $internal_comments_internal = "checked=\"checked\""; ! $internal_comments_phpbb = ""; ! $comments_forum_id = 0; ! $del_topic_yes = ""; ! $del_topic_no = "checked=\"checked\""; ! $autogenerate_comments_yes = ""; ! $autogenerate_comments_no = "checked=\"checked\""; ! $template->assign_vars( array( ! 'S_READONLY' => "disabled=\"disabled\"" ) ! ); ! break; ! ! default: ! $internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $comments_forum_id = $new['comments_forum_id']; ! ! $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : ""; ! ! $autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $template->assign_vars( array( ! 'S_READONLY' => "" ) ! ); ! break; ! } $allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : ""; *************** *** 310,314 **** 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], --- 333,338 ---- 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! //'FORUM_LIST' => $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ), ! 'FORUM_LIST' => $portal_config['portal_backend'] != 'internal' ? $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ) : 'not available', 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:51:09
|
Update of /cvsroot/mxbb/mx_kb/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15568/templates/_core Modified Files: kb_comment_posting.tpl kb_post_body.tpl Log Message: general updates... tinymce support updated Index: kb_post_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/_core/kb_post_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_post_body.tpl 9 Sep 2007 20:06:04 -0000 1.1 --- kb_post_body.tpl 28 Jan 2008 21:51:04 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + <!-- BEGIN switch_bbcodes --> <script language="JavaScript" type="text/javascript"> <!-- *************** *** 238,266 **** //--> </script> ! <!-- BEGIN tinyMCE --> ! <script language="javascript" type="text/javascript" src="modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> ! <script language="javascript" type="text/javascript"> ! tinyMCE.init({ ! mode : "textareas", ! theme : "advanced", ! language : "{tinyMCE.LANG}", ! docs_language : "{tinyMCE.LANG}", ! plugins : "table,advhr,advimage,advlink,emotions,insertdatetime,preview,zoom,flash,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable", ! theme_advanced_buttons1_add_before : "newdocument,separator", ! theme_advanced_buttons1_add : "fontselect,fontsizeselect", ! theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor,backcolor", ! theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator", ! theme_advanced_buttons3_add_before : "tablecontrols,separator", ! theme_advanced_buttons3_add : "emotions,flash,advhr,separator,print,separator,ltr,rtl,separator,fullscreen", ! theme_advanced_toolbar_location : "top", ! theme_advanced_toolbar_align : "left", ! theme_advanced_path_location : "bottom", ! content_css : "{tinyMCE.TEMPLATE}", ! relative_urls : false, ! extended_valid_elements : "td[*],div[*],form[*],input[*]" ! }); ! </script> ! <!-- END tinyMCE --> <form method="post" action="{S_ACTION}" onsubmit="return checkForm(this)" name="post"> --- 239,352 ---- //--> </script> + <!-- END switch_bbcodes --> ! ! <!-- BEGIN tinyMCE --> ! <script language="javascript" type="text/javascript" src="{tinyMCE.PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> ! <script language="javascript" type="text/javascript"> ! tinyMCE.init({ ! mode : "textareas", ! language : "{tinyMCE.LANG}", ! docs_language : "{tinyMCE.LANG}", ! ! apply_source_formatting : "true", ! cleanup : "true", ! inline_styles : "true", ! convert_fonts_to_spans : "true", ! fix_list_elements : "true", ! fix_table_elements : "true", ! force_p_newlines : "true", ! remove_trailing_nbsp : "true", ! ! plugins : "style,advimage,advlink,preview,searchreplace,contextmenu,paste,fullscreen", ! ! theme : "advanced", ! theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6", ! ! theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace", ! ! theme_advanced_buttons1 : "newdocument,separator,cut,copy,paste,pastetext,pasteword,separator,formatselect,styleselect,fontsizeselect", ! ! theme_advanced_buttons2: "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,sup,sub,separator,link,unlink,image,separator,forecolor,separator,undo,redo", ! ! theme_advanced_buttons3: "", ! ! theme_advanced_disable : "", ! ! theme_advanced_toolbar_location : "top", ! theme_advanced_toolbar_align : "left", ! ! content_css : "{tinyMCE.TEMPLATE}", ! theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote", ! ! table_styles : "Layout=forumline", ! table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3", ! table_row_styles : "Table row 1=oddrow", ! table_default_border : "0", ! ! document_base_url : "{tinyMCE.PATH}index.php", ! relative_urls : "true", ! ! extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]" ! }); ! </script> ! <!-- END tinyMCE --> ! ! <!-- BEGIN tinyMCE_admin --> ! <script language="javascript" type="text/javascript" src="{tinyMCE_admin.PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> ! <script language="javascript" type="text/javascript"> ! tinyMCE.init({ ! mode : "textareas", ! language : "{tinyMCE_admin.LANG}", ! docs_language : "{tinyMCE_admin.LANG}", ! ! apply_source_formatting : "true", ! cleanup : "true", ! inline_styles : "true", ! convert_fonts_to_spans : "true", ! fix_list_elements : "true", ! fix_table_elements : "true", ! force_p_newlines : "true", ! remove_trailing_nbsp : "true", ! ! plugins : "table,advimage,advlink,insertdatetime,preview,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable", ! ! theme : "advanced", ! theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6", ! ! theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace", ! ! theme_advanced_buttons1_add_before : "newdocument,separator", ! theme_advanced_buttons1_add : "fontselect,fontsizeselect", ! ! theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor", ! theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator", ! ! theme_advanced_buttons3_add_before : "tablecontrols,separator", ! theme_advanced_buttons3_add : "print,separator,ltr,rtl,separator,fullscreen", ! ! theme_advanced_disable : "", ! ! theme_advanced_toolbar_location : "top", ! theme_advanced_toolbar_align : "left", ! ! theme_advanced_path_location : "bottom", ! theme_advanced_statusbar_location : "bottom", ! ! content_css : "{tinyMCE_admin.TEMPLATE}", ! theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote", ! ! table_styles : "Layout=forumline", ! table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3", ! table_row_styles : "Table row 1=oddrow", ! table_default_border : "0", ! ! document_base_url : "{tinyMCE_admin.PATH}index.php", ! relative_urls : "true", ! ! extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]" ! }); ! </script> ! <!-- END tinyMCE_admin --> <form method="post" action="{S_ACTION}" onsubmit="return checkForm(this)" name="post"> Index: kb_comment_posting.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/_core/kb_comment_posting.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_comment_posting.tpl 9 Sep 2007 20:06:03 -0000 1.1 --- kb_comment_posting.tpl 28 Jan 2008 21:51:04 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + <!-- BEGIN switch_bbcodes --> <script language="JavaScript" type="text/javascript"> <!-- *************** *** 232,235 **** --- 233,238 ---- //--> </script> + <!-- END switch_bbcodes --> + <script language="javascript"> <!-- *************** *** 250,253 **** --- 253,364 ---- </script> + <!-- BEGIN tinyMCE --> + <script language="javascript" type="text/javascript" src="{tinyMCE.PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> + <script language="javascript" type="text/javascript"> + tinyMCE.init({ + mode : "textareas", + language : "{tinyMCE.LANG}", + docs_language : "{tinyMCE.LANG}", + + apply_source_formatting : "true", + cleanup : "true", + inline_styles : "true", + convert_fonts_to_spans : "true", + fix_list_elements : "true", + fix_table_elements : "true", + force_p_newlines : "true", + remove_trailing_nbsp : "true", + + plugins : "style,advimage,advlink,preview,searchreplace,contextmenu,paste,fullscreen", + + theme : "advanced", + theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6", + + theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace", + + theme_advanced_buttons1 : "newdocument,separator,cut,copy,paste,pastetext,pasteword,separator,formatselect,styleselect,fontsizeselect", + + theme_advanced_buttons2: "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,sup,sub,separator,link,unlink,image,separator,forecolor,separator,undo,redo", + + theme_advanced_buttons3: "", + + theme_advanced_disable : "", + + theme_advanced_toolbar_location : "top", + theme_advanced_toolbar_align : "left", + + content_css : "{tinyMCE.TEMPLATE}", + theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote", + + table_styles : "Layout=forumline", + table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3", + table_row_styles : "Table row 1=oddrow", + table_default_border : "0", + + document_base_url : "{tinyMCE.PATH}index.php", + relative_urls : "true", + + extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]" + }); + </script> + <!-- END tinyMCE --> + + <!-- BEGIN tinyMCE_admin --> + <script language="javascript" type="text/javascript" src="{tinyMCE_admin.PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> + <script language="javascript" type="text/javascript"> + tinyMCE.init({ + mode : "textareas", + language : "{tinyMCE_admin.LANG}", + docs_language : "{tinyMCE_admin.LANG}", + + apply_source_formatting : "true", + cleanup : "true", + inline_styles : "true", + convert_fonts_to_spans : "true", + fix_list_elements : "true", + fix_table_elements : "true", + force_p_newlines : "true", + remove_trailing_nbsp : "true", + + plugins : "table,advimage,advlink,insertdatetime,preview,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable", + + theme : "advanced", + theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6", + + theme_advanced_fonts : "Verdana=verdana,arial,helvetica,sans-serif;Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace", + + theme_advanced_buttons1_add_before : "newdocument,separator", + theme_advanced_buttons1_add : "fontselect,fontsizeselect", + + theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor", + theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator", + + theme_advanced_buttons3_add_before : "tablecontrols,separator", + theme_advanced_buttons3_add : "print,separator,ltr,rtl,separator,fullscreen", + + theme_advanced_disable : "", + + theme_advanced_toolbar_location : "top", + theme_advanced_toolbar_align : "left", + + theme_advanced_path_location : "bottom", + theme_advanced_statusbar_location : "bottom", + + content_css : "{tinyMCE_admin.TEMPLATE}", + theme_advanced_styles : "Tiny Text=copyright;Small Text=gensmall;Normal Text=genmed;Big Text=gen;Code=code;Quote=quote", + + table_styles : "Layout=forumline", + table_cell_styles : "Table cell 1=row1;Table cell 2=row2;Table cell 3=row3", + table_row_styles : "Table row 1=oddrow", + table_default_border : "0", + + document_base_url : "{tinyMCE_admin.PATH}index.php", + relative_urls : "true", + + extended_valid_elements : "a[*],img[*],table[*],tr[*],td[*],div[*],form[*],input[*]" + }); + </script> + <!-- END tinyMCE_admin --> + <form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"> *************** *** 278,325 **** <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <tr> ! <th class="thHead" colspan="2" height="25"><b>{L_COMMENT_ADD}</b></th> </tr> <tr> ! <td class="row1" ><span class="gen"><b>{L_COMMENT_TITLE}</b></span></td> ! <td class="row2"><input type="text" name="subject" size="45" maxlength="60" style="width:450px" tabindex="2" class="post" value="{TITLE}" /></span></td> </tr> <tr> ! <td class="row1" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="1"> ! <tr> ! <td><span class="gen"><b>{L_COMMENT}</b></span></td> ! </tr> ! <tr> ! <td valign="middle" align="center"> <br /> ! <table width="100" border="0" cellspacing="0" cellpadding="5"> ! <tr align="center"> ! <td colspan="{S_SMILIES_COLSPAN}" class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_EMOTICONS}</a></td> ! </tr> ! <!-- BEGIN smilies_row --> ! <tr align="center" valign="middle"> ! <!-- BEGIN smilies_col --> ! <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td> ! <!-- END smilies_col --> ! </tr> ! <!-- END smilies_row --> ! </table> ! </td> ! </tr> ! </table> ! </td> ! <td class="row2" valign="top"><span class="gen"> <span class="genmed"> </span> ! <table width="450" border="0" cellspacing="0" cellpadding="2"> <tr align="center" valign="middle"> <td><span class="genmed"> ! <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> </span></td> <td><span class="genmed"> --- 389,419 ---- <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <tr> ! <th colspan="2" class="thHead" height="25"><b>{L_COMMENT_ADD}</b></th> </tr> <tr> ! <td colspan="2" class="row1" ><span class="gen"><b>{L_COMMENT_TITLE}</b></span></td> </tr> <tr> ! <td colspan="2" class="row1"><input type="text" name="subject" size="45" maxlength="60" style="width:400px" tabindex="2" class="post" value="{TITLE}" /></span></td> ! </tr> ! <tr> ! <td colspan="2" class="row1" valign="top"><span class="gen"><b>{L_COMMENT}</b></span></td> ! </tr> ! <!-- BEGIN switch_bbcodes --> ! <tr> ! <td colspan="2" class="row2" valign="top"><span class="gen"> ! <table border="0" cellspacing="0" cellpadding="1"> <tr align="center" valign="middle"> <td><span class="genmed"> ! <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 20px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 20px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 20px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 45px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> </span></td> <td><span class="genmed"> *************** *** 327,331 **** </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> </span></td> <td><span class="genmed"> --- 421,425 ---- </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 35px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> </span></td> <td><span class="genmed"> *************** *** 333,340 **** </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> </span></td> </tr> --- 427,434 ---- </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 35px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> </span></td> <td><span class="genmed"> ! <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 35px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> </span></td> </tr> *************** *** 343,347 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="genmed"> {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"> <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> --- 437,442 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="genmed"> ! {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"> <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> *************** *** 360,364 **** <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option> ! </select> {L_FONT_SIZE}: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> <option value="7" class="genmed">{L_FONT_TINY}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option> --- 455,460 ---- <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option> ! </select> <br /> ! {L_FONT_SIZE}: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> <option value="7" class="genmed">{L_FONT_TINY}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option> *************** *** 375,389 **** <tr> <td colspan="9"> <span class="gensmall"> ! <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> </span></td> </tr> - <tr> - <td colspan="9" class="row2"><span class="gen"> - <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{COMMENT}</textarea> - </td> - </tr> </table> </td> </tr> <tr> <td class="row1"><span class="gen"><B>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}<br />{LINKS_STATUS}<br />{IMAGES_STATUS}</span></td> --- 471,515 ---- <tr> <td colspan="9"> <span class="gensmall"> ! <input type="text" name="helpbox" size="45" maxlength="100" style="width:400px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> </span></td> </tr> </table> </td> </tr> + <!-- END switch_bbcodes --> + + <tr> + <td colspan="2" valign="middle" class="row1"> + <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <tr> + <td colspan="{S_SMILIES_COLSPAN}" class="genmed"> + <b>{L_EMOTICONS}</b> + </td> + </tr> + <tr valign="middle"> + <td> + <!-- BEGIN smilies_row --> + <!-- BEGIN smilies_col --> + <a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a> + <!-- END smilies_col --> + <!-- END smilies_row --> + </td> + </tr> + <!-- BEGIN switch_smilies_extra --> + <tr> + <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td> + </tr> + <!-- END switch_smilies_extra --> + </table> + </td> + </tr> + + <tr> + <td colspan="2" class="row1"> + <span class="gen"> + <textarea name="message" rows="30" cols="35" wrap="virtual" style="width:400px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{COMMENT}</textarea> + </span> + </td> + </tr> <tr> <td class="row1"><span class="gen"><B>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}<br />{LINKS_STATUS}<br />{IMAGES_STATUS}</span></td> *************** *** 392,396 **** <tr> <td class="cat" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS}<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" /> <input type="submit" accesskey="s" tabindex="6" name="submit" class="mainoption" value="{L_SUBMIT}" /></td> ! </form> </tr> ! </table> \ No newline at end of file --- 518,523 ---- <tr> <td class="cat" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS}<input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" /> <input type="submit" accesskey="s" tabindex="6" name="submit" class="mainoption" value="{L_SUBMIT}" /></td> ! </tr> ! </table> ! </form> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:51:08
|
Update of /cvsroot/mxbb/mx_kb/kb/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15568/kb/admin Modified Files: admin_cat_manage.php admin_settings.php Log Message: general updates... tinymce support updated Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_cat_manage.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_cat_manage.php 9 Sep 2007 20:06:01 -0000 1.5 --- admin_cat_manage.php 28 Jan 2008 21:51:02 -0000 1.6 *************** *** 18,22 **** function main( $action ) { ! global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; // --- 18,22 ---- function main( $action ) { ! global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config; // *************** *** 205,209 **** 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], --- 205,210 ---- 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $portal_config['portal_backend'] != 'internal' ? $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ) : 'not available', ! //'FORUM_LIST' => $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], Index: admin_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_settings.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_settings.php 9 Sep 2007 20:06:01 -0000 1.4 --- admin_settings.php 28 Jan 2008 21:51:03 -0000 1.5 *************** *** 18,22 **** function main( $action ) { ! global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; // --- 18,22 ---- function main( $action ) { ! global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config; // *************** *** 180,193 **** $use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $comments_forum_id = $new['comments_forum_id']; ! $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; $allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : ""; --- 180,216 ---- $use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : ""; ! switch ($portal_config['portal_backend']) ! { ! case 'internal': ! $internal_comments_internal = "checked=\"checked\""; ! $internal_comments_phpbb = ""; ! $comments_forum_id = 0; ! $del_topic_yes = ""; ! $del_topic_no = "checked=\"checked\""; ! $autogenerate_comments_yes = ""; ! $autogenerate_comments_no = "checked=\"checked\""; ! $template->assign_vars( array( ! 'S_READONLY' => "disabled=\"disabled\"" ) ! ); ! break; ! ! default: ! $internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $comments_forum_id = $new['comments_forum_id']; ! ! $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : ""; ! ! $autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $template->assign_vars( array( ! 'S_READONLY' => "" ) ! ); ! break; ! } $allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : ""; *************** *** 411,415 **** 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], --- 434,439 ---- 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! //'FORUM_LIST' => $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ), ! 'FORUM_LIST' => $portal_config['portal_backend'] != 'internal' ? $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ) : 'not available', 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:51:08
|
Update of /cvsroot/mxbb/mx_kb/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15568/language/lang_english Modified Files: lang_main.php Log Message: general updates... tinymce support updated Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/language/lang_english/lang_main.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** lang_main.php 25 Jul 2007 23:13:20 -0000 1.19 --- lang_main.php 28 Jan 2008 21:51:03 -0000 1.20 *************** *** 220,223 **** --- 220,224 ---- $lang['Comment_explain'] = 'Use the textbox above to give your opinion on this file!'; $lang['Comment_add'] = 'Add Comment'; + $lang['Comment_edit'] = 'Edit'; $lang['Comment_delete'] = 'Delete'; $lang['Comment_posted'] = 'Your comment has been entered successfully'; |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:51:08
|
Update of /cvsroot/mxbb/mx_kb/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15568/templates/_core/admin Modified Files: kb_config_body.tpl Log Message: general updates... tinymce support updated Index: kb_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/_core/admin/kb_config_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_config_body.tpl 9 Sep 2007 20:06:05 -0000 1.1 --- kb_config_body.tpl 28 Jan 2008 21:51:04 -0000 1.2 *************** *** 131,135 **** <tr> <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} /> {L_INTERNAL_COMMENTS_PHPBB}</td> </tr> <tr> --- 131,135 ---- <tr> <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} {S_READONLY} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} {S_READONLY} /> {L_INTERNAL_COMMENTS_PHPBB}</td> </tr> <tr> |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:51:08
|
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15568/kb/modules Modified Files: kb_post.php kb_post_comment.php Log Message: general updates... tinymce support updated Index: kb_post.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** kb_post.php 9 Sep 2007 20:06:02 -0000 1.13 --- kb_post.php 28 Jan 2008 21:51:03 -0000 1.14 *************** *** 180,188 **** $langcode = mx_get_langcode(); ! $template->assign_block_vars( "tinyMCE", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $phpbb_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); } else --- 180,200 ---- $langcode = mx_get_langcode(); ! ! if ($this->auth_user[$cat_id]['auth_mod']) ! { ! $template->assign_block_vars( "tinyMCE_admin", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); ! } ! else ! { ! $template->assign_block_vars( "tinyMCE", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); ! } } else Index: kb_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post_comment.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** kb_post_comment.php 9 Sep 2007 20:06:02 -0000 1.11 --- kb_post_comment.php 28 Jan 2008 21:51:03 -0000 1.12 *************** *** 30,33 **** --- 30,34 ---- global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; + global $mx_block, $theme; // *************** *** 124,134 **** // ! // Toggles // ! $html_on = ( $kb_config['allow_comment_html'] ) ? true : 0; ! $bbcode_on = ( $kb_config['allow_comment_bbcode'] ) ? true : 0; ! $smilies_on = ( $kb_config['allow_comment_smilies'] ) ? true : 0; ! $links_on = ( $kb_config['allow_comment_links'] ) ? true : 0; ! $images_on = ( $kb_config['allow_comment_images'] ) ? true : 0; // --- 125,180 ---- // ! // wysiwyg // ! if ( $kb_config['allow_comment_wysiwyg'] && file_exists( $mx_root_path . $kb_config['wysiwyg_path'] . 'tinymce/jscripts/tiny_mce/blank.htm' )) ! { ! // ! // Toggles ! // ! $allow_wysiwyg = true; ! $bbcode_on = false; ! $html_on = true; ! $smilies_on = false; ! $links_on = false; ! $images_on = false; ! ! $langcode = mx_get_langcode(); ! ! if ($mx_block->auth_mod) ! { ! $template->assign_block_vars( "tinyMCE_admin", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); ! } ! else ! { ! $template->assign_block_vars( "tinyMCE", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); ! } ! } ! else ! { ! // ! // Toggles ! // ! $allow_wysiwyg = false; ! $html_on = ( $kb_config['allow_comment_html'] ) ? true : 0; ! $bbcode_on = ( $kb_config['allow_comment_bbcode'] ) ? true : 0; ! $smilies_on = ( $kb_config['allow_comment_smilies'] ) ? true : 0; ! $links_on = ( $kb_config['allow_comment_links'] ) ? true : 0; ! $images_on = ( $kb_config['allow_comment_images'] ) ? true : 0; ! ! $board_config['allow_html_tags'] = $kb_config['allowed_comment_html_tags']; ! ! if ($smilies_on) ! { ! $mx_kb_functions->generate_smilies( 'inline', PAGE_POSTING ); ! } ! } // *************** *** 143,147 **** // Fix: Setting 'emtpy' enables all // ! //$mx_text->allow_all_html_tags = $allow_wysiwyg; // Not yet implemented for comments // ======================================================= --- 189,193 ---- // Fix: Setting 'emtpy' enables all // ! $mx_text->allow_all_html_tags = $allow_wysiwyg; // ======================================================= *************** *** 196,200 **** if ( $submit ) { ! $this->update_add_comment($article_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); --- 242,246 ---- if ( $submit ) { ! $this->update_add_comment($article_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on, $allow_wysiwyg); $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return_article'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=article&k=' . $item_id ) ) . '">', '</a>' ); *************** *** 206,214 **** // ======================================================= - // - // Generate smilies listing for page output - // - $mx_kb_functions->generate_smilies( 'inline', PAGE_POSTING ); - $html_status = ( $html_on ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF']; $bbcode_status = ( $bbcode_on ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF']; --- 252,255 ---- *************** *** 360,363 **** --- 401,409 ---- ); + if ( $bbcode_on ) + { + $template->assign_block_vars( 'switch_bbcodes', array()); + } + // =================================================== // assign var for navigation |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:51:07
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15568/kb/includes Modified Files: functions_kb.php Log Message: general updates... tinymce support updated Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** functions_kb.php 9 Sep 2007 20:06:01 -0000 1.22 --- functions_kb.php 28 Jan 2008 21:51:03 -0000 1.23 *************** *** 93,99 **** // $this->comments[$cat_rowset[$i]['category_id']]['activated'] = $cat_rowset[$i]['cat_allow_comments'] == -1 ? ($kb_config['use_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['cat_allow_comments'] == 1 ? true : false ); ! $this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($kb_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments ! $this->comments[$cat_rowset[$i]['category_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($kb_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] < 1 ? ( intval($kb_config['comments_forum_id']) ) : ( intval($cat_rowset[$i]['comments_forum_id']) ); // phpBB target forum (only used for phpBB comments) if ($this->comments[$cat_rowset[$i]['category_id']]['activated'] && !$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id']) < 1) --- 93,111 ---- // $this->comments[$cat_rowset[$i]['category_id']]['activated'] = $cat_rowset[$i]['cat_allow_comments'] == -1 ? ($kb_config['use_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['cat_allow_comments'] == 1 ? true : false ); ! ! switch($portal_config['portal_backend']) ! { ! case 'internal': ! $this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] = true; // phpBB or internal comments ! $this->comments[$cat_rowset[$i]['category_id']]['autogenerate_comments'] = false; // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id'] = 0; // phpBB target forum (only used for phpBB comments) ! break; ! ! default: ! $this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($kb_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments ! $this->comments[$cat_rowset[$i]['category_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($kb_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated ! $this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] < 1 ? ( intval($kb_config['comments_forum_id']) ) : ( intval($cat_rowset[$i]['comments_forum_id']) ); // phpBB target forum (only used for phpBB comments) ! break; ! } if ($this->comments[$cat_rowset[$i]['category_id']]['activated'] && !$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id']) < 1) *************** *** 1349,1352 **** --- 1361,1366 ---- $pageId = empty($pageId) ? $page_id : $pageId; + $args .= ($args == '' ? '' : '&' ) . 'modrewrite=no'; + if ( !MXBB_MODULE ) { *************** *** 1489,1493 **** * @param unknown_type $smilies_on */ ! function update_add_comment($article_data = '', $item_id, $cid, $subject = '', $message = '', $html_on = false, $bbcode_on = true, $smilies_on = false) { global $template, $mx_kb_functions, $lang, $board_config, $phpEx, $kb_config, $db, $images, $userdata; --- 1503,1507 ---- * @param unknown_type $smilies_on */ ! function update_add_comment($article_data = '', $item_id, $cid, $subject = '', $message = '', $html_on = false, $bbcode_on = true, $smilies_on = false, $allow_wysiwyg = false) { global $template, $mx_kb_functions, $lang, $board_config, $phpEx, $kb_config, $db, $images, $userdata; *************** *** 1531,1535 **** $mx_text = new mx_text(); $mx_text->init($html_on, $bbcode_on, $smilies_on); ! //$mx_text->allow_all_html_tags = $parameter_data['parameter_type'] = 'WysiwygTextBlock' ? true : false; // --- 1545,1549 ---- $mx_text = new mx_text(); $mx_text->init($html_on, $bbcode_on, $smilies_on); ! $mx_text->allow_all_html_tags = $allow_wysiwyg; // |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:49:54
|
Update of /cvsroot/mxbb/mx_glance In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15075 Modified Files: mx_glance.php Log Message: probably nothing...but i got conflicts during update... Index: mx_glance.php =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mx_glance.php 24 Jan 2008 18:50:12 -0000 1.10 --- mx_glance.php 28 Jan 2008 21:49:46 -0000 1.11 *************** *** 1,3 **** ! <?php /** * --- 1,3 ---- ! <?php /** * *************** *** 34,38 **** // NUMBER OF NEWS ARTICLES YOU WISH TO DISPLAY $recent_num_news = $mx_block->get_parameters( 'Glance_num_news' ); ! // NUMBER OF RECENT ARTICLES YOU WISH TO DISPLAY $recent_num_topics = $mx_block->get_parameters( 'Glance_num_recent' ); --- 34,38 ---- // NUMBER OF NEWS ARTICLES YOU WISH TO DISPLAY $recent_num_news = $mx_block->get_parameters( 'Glance_num_news' ); ! // NUMBER OF RECENT ARTICLES YOU WISH TO DISPLAY $recent_num_topics = $mx_block->get_parameters( 'Glance_num_recent' ); *************** *** 40,47 **** // FORUMS YOU WISH TO IGNORE IN YOUR RECENT ARTICLES $recent_forums_ignore = $mx_block->get_parameters( 'Glance_recent_ignore' ); ! // TABLE WIDTH $block_size = $mx_block->get_parameters( 'Glance_table_width' ); ! // CHANGE THE BULLET IF A TOPIC IS NEW? (true / false) $recent_show_new_bullets = $mx_block->get_parameters( 'Glance_show_new_bullets' ); --- 40,47 ---- // FORUMS YOU WISH TO IGNORE IN YOUR RECENT ARTICLES $recent_forums_ignore = $mx_block->get_parameters( 'Glance_recent_ignore' ); ! // TABLE WIDTH $block_size = $mx_block->get_parameters( 'Glance_table_width' ); ! // CHANGE THE BULLET IF A TOPIC IS NEW? (true / false) $recent_show_new_bullets = $mx_block->get_parameters( 'Glance_show_new_bullets' ); *************** *** 52,64 **** // SHOW USERS WITH BOLD IF PREVIOUS OPTION IS FALSE? (true / false) $recent_show_user_bold = $mx_block->get_parameters( 'Glance_show_user_bold' ); ! // MESSAGE TRACKING WILL TRACK TO SEE IF A USER HAS READ THE TOPIC DURING THEIR SESSION (true / false) $recent_track = $mx_block->get_parameters( 'Glance_track' ); ! // SHOW TOPICS THE USER CAN VIEW, BUT NOT READ? (true / false) $recent_auth_read = $mx_block->get_parameters( 'Glance_auth_read' ); // LIMIT THE NUMBER OF CHARACTERS DISPLAYED FOR TOPIC TITLES ! $recent_topic_length = $mx_block->get_parameters( 'Glance_title_length' ); // Read language definition --- 52,64 ---- // SHOW USERS WITH BOLD IF PREVIOUS OPTION IS FALSE? (true / false) $recent_show_user_bold = $mx_block->get_parameters( 'Glance_show_user_bold' ); ! // MESSAGE TRACKING WILL TRACK TO SEE IF A USER HAS READ THE TOPIC DURING THEIR SESSION (true / false) $recent_track = $mx_block->get_parameters( 'Glance_track' ); ! // SHOW TOPICS THE USER CAN VIEW, BUT NOT READ? (true / false) $recent_auth_read = $mx_block->get_parameters( 'Glance_auth_read' ); // LIMIT THE NUMBER OF CHARACTERS DISPLAYED FOR TOPIC TITLES ! $recent_topic_length = $mx_block->get_parameters( 'Glance_title_length' ); // Read language definition *************** *** 69,89 **** //Images ! $recent_news_bullet_old_src = $images['folder_announce']; //$mx_user->img('announce_read', 'POST_ANNOUNCEMENT'); ! ! $recent_posts_bullet_old_src = $images['folder']; //$mx_user->img('topic_read', 'NEW_POSTS'); ! ! $recent_news_bullet_new_src = $images['folder_announce_new']; //$mx_user->img('announce_unread', 'POST_ANNOUNCEMENT'); ! ! $recent_posts_bullet_new_src = $images['folder_new']; //$mx_user->img('topic_unread', 'NEW_POSTS'); //Images SRC ! $recent_news_bullet_old = '<img src="' . $recent_news_bullet_old_src . '" border="0" width="19" height="18" alt="" title="" />'; //$mx_user->img('announce_read', 'POST_ANNOUNCEMENT', false, '', 'src'); ! ! $recent_posts_bullet_old = '<img src="' . $recent_posts_bullet_old_src . '" border="0" width="19" height="18" alt="" title="" />'; //$mx_user->img('topic_read', 'NEW_POSTS', false, '', 'src'); ! ! $recent_news_bullet_new = '<img src="' . $recent_news_bullet_new_src . '" border="0" width="19" height="18" alt="" title="" />'; //$mx_user->img('announce_unread', 'POST_ANNOUNCEMENT', false, '', 'src'); ! ! $recent_posts_bullet_new = '<img src="' . $recent_posts_bullet_new_src . '" border="0" width="19" height="18" alt="" title="" />'; //$mx_user->img('topic_unread', 'NEW_POSTS', false, '', 'src'); } else --- 69,89 ---- //Images ! $recent_news_bullet_old_src = $images['folder_announce']; //$mx_user->img('announce_read', 'POST_ANNOUNCEMENT'); ! ! $recent_posts_bullet_old_src = $images['folder']; //$mx_user->img('topic_read', 'NEW_POSTS'); ! ! $recent_news_bullet_new_src = $images['folder_announce_new']; //$mx_user->img('announce_unread', 'POST_ANNOUNCEMENT'); ! ! $recent_posts_bullet_new_src = $images['folder_new']; //$mx_user->img('topic_unread', 'NEW_POSTS'); //Images SRC ! $recent_news_bullet_old = '<img src="' . $recent_news_bullet_old_src . '" border="0" width="19" height="18" alt="" title="" />'; //$mx_user->img('announce_read', 'POST_ANNOUNCEMENT', false, '', 'src'); ! ! $recent_posts_bullet_old = '<img src="' . $recent_posts_bullet_old_src . '" border="0" width="19" height="18" alt="" title="" />'; //$mx_user->img('topic_read', 'NEW_POSTS', false, '', 'src'); ! ! $recent_news_bullet_new = '<img src="' . $recent_news_bullet_new_src . '" border="0" width="19" height="18" alt="" title="" />'; //$mx_user->img('announce_unread', 'POST_ANNOUNCEMENT', false, '', 'src'); ! ! $recent_posts_bullet_new = '<img src="' . $recent_posts_bullet_new_src . '" border="0" width="19" height="18" alt="" title="" />'; //$mx_user->img('topic_unread', 'NEW_POSTS', false, '', 'src'); } else *************** *** 91,111 **** //Images ! $recent_news_bullet_old = $mx_user->img('announce_read', 'POST_ANNOUNCEMENT'); ! ! $recent_posts_bullet_old = $mx_user->img('topic_read', 'NEW_POSTS'); ! ! $recent_news_bullet_new = $mx_user->img('announce_unread', 'POST_ANNOUNCEMENT'); ! ! $recent_posts_bullet_new = $mx_user->img('topic_unread', 'NEW_POSTS'); //Images SRC ! $recent_news_bullet_old_src = $mx_user->img('announce_read', 'POST_ANNOUNCEMENT', false, '', 'src'); ! ! $recent_posts_bullet_old_src = $mx_user->img('topic_read', 'NEW_POSTS', false, '', 'src'); ! ! $recent_news_bullet_new_src = $mx_user->img('announce_unread', 'POST_ANNOUNCEMENT', false, '', 'src'); ! ! $recent_posts_bullet_new_src = $mx_user->img('topic_unread', 'NEW_POSTS', false, '', 'src'); } --- 91,111 ---- //Images ! $recent_news_bullet_old = $mx_user->img('announce_read', 'POST_ANNOUNCEMENT'); ! ! $recent_posts_bullet_old = $mx_user->img('topic_read', 'NEW_POSTS'); ! ! $recent_news_bullet_new = $mx_user->img('announce_unread', 'POST_ANNOUNCEMENT'); ! ! $recent_posts_bullet_new = $mx_user->img('topic_unread', 'NEW_POSTS'); //Images SRC ! $recent_news_bullet_old_src = $mx_user->img('announce_read', 'POST_ANNOUNCEMENT', false, '', 'src'); ! ! $recent_posts_bullet_old_src = $mx_user->img('topic_read', 'NEW_POSTS', false, '', 'src'); ! ! $recent_news_bullet_new_src = $mx_user->img('announce_unread', 'POST_ANNOUNCEMENT', false, '', 'src'); ! ! $recent_posts_bullet_new_src = $mx_user->img('topic_unread', 'NEW_POSTS', false, '', 'src'); } *************** *** 157,161 **** $recent_forums_offset = $mx_request_vars->request('recent_posts_offset', MX_TYPE_NO_TAGS, ''); $recent_news_offset = $mx_request_vars->request('recent_news_offset', MX_TYPE_NO_TAGS, ''); ! // MESSAGE TRACKING // if ( !isset($tracking_topics) && $recent_track ) $tracking_topics = $mx_request_vars->request($board_config['cookie_name'] . '_t', '', false, true); --- 157,161 ---- $recent_forums_offset = $mx_request_vars->request('recent_posts_offset', MX_TYPE_NO_TAGS, ''); $recent_news_offset = $mx_request_vars->request('recent_news_offset', MX_TYPE_NO_TAGS, ''); ! // MESSAGE TRACKING // if ( !isset($tracking_topics) && $recent_track ) $tracking_topics = $mx_request_vars->request($board_config['cookie_name'] . '_t', '', false, true); *************** *** 168,172 **** $tracking_topics = array(); } ! // CHECK FOR BAD WORDS // Define censored word matches --- 168,172 ---- $tracking_topics = array(); } ! // CHECK FOR BAD WORDS // Define censored word matches *************** *** 186,190 **** if ( $row = $db->sql_fetchrow($result) ) { ! do { $orig_word[] = '#\b(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')\b#i'; --- 186,190 ---- if ( $row = $db->sql_fetchrow($result) ) { ! do { $orig_word[] = '#\b(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')\b#i'; *************** *** 201,205 **** obtain_word_list($orig_word, $replacement_word); } ! else { $orig_word = array(); --- 201,205 ---- obtain_word_list($orig_word, $replacement_word); } ! else { $orig_word = array(); *************** *** 215,219 **** $template->set_filenames($template_tmp); ! // set the topic title sql depending on the character limit $sql_title = ($recent_topic_length) ? ", LEFT(t.topic_title, " . $recent_topic_length . ") as topic_title" : ", t.topic_title"; --- 215,219 ---- $template->set_filenames($template_tmp); ! // set the topic title sql depending on the character limit $sql_title = ($recent_topic_length) ? ", LEFT(t.topic_title, " . $recent_topic_length . ") as topic_title" : ", t.topic_title"; *************** *** 222,226 **** if ($recent_num_news) { ! $sql_news_limit = $recent_num_news; $sql_news_start = ($recent_news_offset) ? $recent_news_offset : 0; --- 222,226 ---- if ($recent_num_news) { ! $sql_news_limit = $recent_num_news; $sql_news_start = ($recent_news_offset) ? $recent_news_offset : 0; *************** *** 252,269 **** $sql = " ! SELECT ! f.forum_id, f.forum_name" . $sql_title . ", t.*, ! p2.post_time, p2.poster_id, ! u.username as last_username, u2.username as author_username ! FROM " . FORUMS_TABLE . " f, " ! . POSTS_TABLE . " p, " ! . TOPICS_TABLE . " t, " ! . POSTS_TABLE . " p2, " . USERS_TABLE . " u, " ! . USERS_TABLE . " u2 ! WHERE ! f.forum_id IN (" . $recent_news_forum_id . ") AND t.forum_id = f.forum_id AND p.post_id = t.topic_first_post_id --- 252,269 ---- $sql = " ! SELECT ! f.forum_id, f.forum_name" . $sql_title . ", t.*, ! p2.post_time, p2.poster_id, ! u.username as last_username, u2.username as author_username ! FROM " . FORUMS_TABLE . " f, " ! . POSTS_TABLE . " p, " ! . TOPICS_TABLE . " t, " ! . POSTS_TABLE . " p2, " . USERS_TABLE . " u, " ! . USERS_TABLE . " u2 ! WHERE ! f.forum_id IN (" . $recent_news_forum_id . ") AND t.forum_id = f.forum_id AND p.post_id = t.topic_first_post_id *************** *** 326,337 **** { $unauthed = false; ! if ( !$auth_mod['auth_view'] && ( strstr($recent_news_forum_id,$auth_mod['forum_id']) === FALSE ) ) ! { ! $unauthed = true; ! } ! if ( !$recent_auth_read && !$auth_mod['auth_read'] && ( strstr($recent_news_forum_id,$auth_mod['forum_id']) === FALSE ) ) ! { ! $unauthed = true; ! } if ( $unauthed ) { --- 326,337 ---- { $unauthed = false; ! if ( !$auth_mod['auth_view'] && ( strstr($recent_news_forum_id,$auth_mod['forum_id']) === FALSE ) ) ! { ! $unauthed = true; ! } ! if ( !$recent_auth_read && !$auth_mod['auth_read'] && ( strstr($recent_news_forum_id,$auth_mod['forum_id']) === FALSE ) ) ! { ! $unauthed = true; ! } if ( $unauthed ) { *************** *** 341,345 **** } } ! else { $recent_auth_level = ($recent_auth_read) ? '!f_read' : true; --- 341,345 ---- } } ! else { $recent_auth_level = ($recent_auth_read) ? '!f_read' : true; *************** *** 352,356 **** $recentforumsignore = $recent_news_forum_id; ! if ( $num_forums = count($auth_user) ) { --- 352,356 ---- $recentforumsignore = $recent_news_forum_id; ! if ( $num_forums = count($auth_user) ) { *************** *** 358,369 **** { $unauthed = false; ! if ( !$auth_mod['f_list'] && ( strstr($recent_news_forum_id,$auth_mod['forum_id']) === FALSE )) ! { ! $unauthed = true; ! } ! if ( !$recent_auth_read && !$auth_mod['f_read'] && ( strstr($recent_news_forum_id,$auth_mod['forum_id']) === FALSE ) ) ! { ! $unauthed = true; ! } if ( $unauthed ) { --- 358,369 ---- { $unauthed = false; ! if ( !$auth_mod['f_list'] && ( strstr($recent_news_forum_id,$auth_mod['forum_id']) === FALSE )) ! { ! $unauthed = true; ! } ! if ( !$recent_auth_read && !$auth_mod['f_read'] && ( strstr($recent_news_forum_id,$auth_mod['forum_id']) === FALSE ) ) ! { ! $unauthed = true; ! } if ( $unauthed ) { *************** *** 376,382 **** $recentforumsignore .= ($recentforumsignore && $recent_forums_ignore) ? ',' : ''; ! $sql_forums_limit = $recent_num_topics; ! $sql_forums_start = ($recent_forums_offset) ? $recent_forums_offset : 0; /* --- 376,382 ---- $recentforumsignore .= ($recentforumsignore && $recent_forums_ignore) ? ',' : ''; ! $sql_forums_limit = $recent_num_topics; ! $sql_forums_start = ($recent_forums_offset) ? $recent_forums_offset : 0; /* *************** *** 391,395 **** ), ! 'WHERE' => 'f.forum_id NOT IN (' . $recentforumsignore . $recent_forums_ignore . ') AND t.forum_id = f.forum_id AND p.post_id = t.topic_first_post_id --- 391,395 ---- ), ! 'WHERE' => 'f.forum_id NOT IN (' . $recentforumsignore . $recent_forums_ignore . ') AND t.forum_id = f.forum_id AND p.post_id = t.topic_first_post_id *************** *** 404,421 **** $sql = " ! SELECT f.forum_id, f.forum_name" . $sql_title . ", t.*, ! p2.post_time, p2.poster_id, ! u.username as last_username, u2.username as author_username ! FROM " . FORUMS_TABLE . " f, " ! . POSTS_TABLE . " p, " ! . TOPICS_TABLE . " t, " ! . POSTS_TABLE . " p2, " . USERS_TABLE . " u, " ! . USERS_TABLE . " u2 ! WHERE ! f.forum_id NOT IN (" . $recentforumsignore . $recent_forums_ignore . ") AND t.forum_id = f.forum_id AND p.post_id = t.topic_first_post_id --- 404,421 ---- $sql = " ! SELECT f.forum_id, f.forum_name" . $sql_title . ", t.*, ! p2.post_time, p2.poster_id, ! u.username as last_username, u2.username as author_username ! FROM " . FORUMS_TABLE . " f, " ! . POSTS_TABLE . " p, " ! . TOPICS_TABLE . " t, " ! . POSTS_TABLE . " p2, " . USERS_TABLE . " u, " ! . USERS_TABLE . " u2 ! WHERE ! f.forum_id NOT IN (" . $recentforumsignore . $recent_forums_ignore . ") AND t.forum_id = f.forum_id AND p.post_id = t.topic_first_post_id *************** *** 446,450 **** case POST_STICKY: $latest_stickys[] = $topic_row; ! break; default: $latest_topics[] = $topic_row; --- 446,450 ---- case POST_STICKY: $latest_stickys[] = $topic_row; ! break; default: $latest_topics[] = $topic_row; *************** *** 469,473 **** { $bullet_pre = 'recent_news_bullet'; ! for ( $i = 0; $i < count($latest_news); $i++ ) { --- 469,473 ---- { $bullet_pre = 'recent_news_bullet'; ! for ( $i = 0; $i < count($latest_news); $i++ ) { *************** *** 539,569 **** while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; } ! else ! { $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } } $db->sql_freeresult($result); } ! else if ($recent_show_user_bold) ! { $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } ! else ! { $last_poster_color = ''; ! $last_poster_style = ''; } --- 539,569 ---- while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; } ! else ! { $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } } $db->sql_freeresult($result); } ! else if ($recent_show_user_bold) ! { $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } ! else ! { $last_poster_color = ''; ! $last_poster_style = ''; } *************** *** 584,614 **** while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; } ! else ! { $topic_poster_color = ''; ! $topic_poster_style = 'style="font-weight : bold;"'; } } $db->sql_freeresult($result); } ! else if ($recent_show_user_bold) ! { $topic_poster_color = ''; ! $topic_poster_style = 'style="font-weight : bold;"'; } ! else ! { $topic_poster_color = ''; ! $topic_poster_style = ''; } --- 584,614 ---- while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; } ! else ! { $topic_poster_color = ''; ! $topic_poster_style = 'style="font-weight : bold;"'; } } $db->sql_freeresult($result); } ! else if ($recent_show_user_bold) ! { $topic_poster_color = ''; ! $topic_poster_style = 'style="font-weight : bold;"'; } ! else ! { $topic_poster_color = ''; ! $topic_poster_style = ''; } *************** *** 638,647 **** { $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_news_offset=')); ! if ($recent_news_offset > 0) ! { $prev_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset-$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th"><< Prev ' . $recent_num_news . '</a>' : $new_url . ($recent_news_offset-$recent_num_news).'" class="th"><< Prev ' . $recent_num_news . '</a>'; } ! else ! { $prev_news_url = ''; } --- 638,647 ---- { $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_news_offset=')); ! if ($recent_news_offset > 0) ! { $prev_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset-$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th"><< Prev ' . $recent_num_news . '</a>' : $new_url . ($recent_news_offset-$recent_num_news).'" class="th"><< Prev ' . $recent_num_news . '</a>'; } ! else ! { $prev_news_url = ''; } *************** *** 650,661 **** $next_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset+$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th">Next ' . $recent_num_news . ' >></a>' : $new_url . ($recent_news_offset+$recent_num_news).'" class="th">Next ' . $recent_num_news . ' >></a>'; } ! else ! { $next_news_url = ''; } } ! else { ! $prev_news_url = ''; $next_news_url = ''; } --- 650,661 ---- $next_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset+$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th">Next ' . $recent_num_news . ' >></a>' : $new_url . ($recent_news_offset+$recent_num_news).'" class="th">Next ' . $recent_num_news . ' >></a>'; } ! else ! { $next_news_url = ''; } } ! else { ! $prev_news_url = ''; $next_news_url = ''; } *************** *** 663,669 **** $template->assign_block_vars('latest_news', array( 'NEWEST_POST_IMG' => $$bullet_full, ! 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, 'TOPIC_TITLE' => $latest_news[$i]['topic_title'], ! 'U_LAST_POST' => mx_append_sid( PHPBB_URL . 'viewtopic.' . $phpEx . '?' . 'f=' . $latest_news[$i]['forum_id'] . '&t=' . $latest_news[$i]['topic_id'] . '&p=' . $latest_news[$i]['topic_last_post_id'] . '#p' . $latest_news[$i]['topic_last_post_id']), 'TOPIC_TIME' => $message_date, 'LAST_POST_TIME' => $last_post_time, --- 663,669 ---- $template->assign_block_vars('latest_news', array( 'NEWEST_POST_IMG' => $$bullet_full, ! 'TOPIC_FOLDER_IMG_SRC' => $$bullet_src, 'TOPIC_TITLE' => $latest_news[$i]['topic_title'], ! 'U_LAST_POST' => mx_append_sid( PHPBB_URL . 'viewtopic.' . $phpEx . '?' . 'f=' . $latest_news[$i]['forum_id'] . '&t=' . $latest_news[$i]['topic_id'] . '&p=' . $latest_news[$i]['topic_last_post_id'] . '#p' . $latest_news[$i]['topic_last_post_id']), 'TOPIC_TIME' => $message_date, 'LAST_POST_TIME' => $last_post_time, *************** *** 698,707 **** { $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_news_offset=')); ! if ($recent_news_offset > 0) ! { $prev_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset-$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th"><< Prev ' . $recent_num_news . '</a>' : $new_url . ($recent_news_offset-$recent_num_news).'" class="th"><< Prev ' . $recent_num_news . '</a>'; } ! else ! { $prev_news_url = ''; } --- 698,707 ---- { $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_news_offset=')); ! if ($recent_news_offset > 0) ! { $prev_news_url = ($recent_forums_offset > 0) ? $new_url . ($recent_news_offset-$recent_num_news) . '&recent_posts_offset=' . $recent_forums_offset . '" class="th"><< Prev ' . $recent_num_news . '</a>' : $new_url . ($recent_news_offset-$recent_num_news).'" class="th"><< Prev ' . $recent_num_news . '</a>'; } ! else ! { $prev_news_url = ''; } *************** *** 709,715 **** $next_news_url = ''; } ! else { ! $prev_news_url = ''; $next_news_url = ''; } --- 709,715 ---- $next_news_url = ''; } ! else { ! $prev_news_url = ''; $next_news_url = ''; } *************** *** 720,729 **** 'TOPIC_POSTER' => 'None', 'TOPIC_AUTHOR' => 'None', ! 'TOPIC_REPLIES' => '0', 'TOPIC_TITLE' => 'None' )); } } ! if ($recent_num_topics) { --- 720,729 ---- 'TOPIC_POSTER' => 'None', 'TOPIC_AUTHOR' => 'None', ! 'TOPIC_REPLIES' => '0', 'TOPIC_TITLE' => 'None' )); } } ! if ($recent_num_topics) { *************** *** 811,841 **** while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; } ! else ! { $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } } $db->sql_freeresult($result); } ! else if ($recent_show_user_bold) ! { $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } ! else ! { $last_poster_color = ''; ! $last_poster_style = ''; } --- 811,841 ---- while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { $last_poster_color = $theme['fontcolor3']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { $last_poster_color = $theme['fontcolor2']; ! $last_poster_style = 'style="color:#' . $last_poster_color . '; font-weight : bold;"'; } ! else ! { $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } } $db->sql_freeresult($result); } ! else if ($recent_show_user_bold) ! { $last_poster_color = ''; ! $last_poster_style = 'style="font-weight : bold;"'; } ! else ! { $last_poster_color = ''; ! $last_poster_style = ''; } *************** *** 856,890 **** while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; } ! else ! { $topic_poster_color = $theme['fontcolor1']; ! $topic_poster_style = 'style="font-weight : bold;"'; } } $db->sql_freeresult($result); } ! else if ($recent_show_user_bold) ! { $topic_poster_color = ''; ! $topic_poster_style = 'style="font-weight : bold;"'; } ! else ! { $topic_poster_color = ''; ! $topic_poster_style = ''; } $topic_autor_id = append_sid(PHPBB_URL . 'profile.php?mode=viewprofile&u=' . $latest_topics[$i]['user_id']); $topic_autor = $latest_topics[$i]['username']; ! $topic_poster = ($latest_topics[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_topics[$i]['author_username'] . '</span></a> '; $topic_poster_full = $topic_poster; --- 856,890 ---- while( $row = $db->sql_fetchrow($result) ) { ! if ($row['user_level'] == ADMIN) ! { $topic_poster_color = $theme['fontcolor3']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; ! } ! else if ($row['user_level'] == MOD) ! { $topic_poster_color = $theme['fontcolor2']; ! $topic_poster_style = 'style="color:#' . $topic_poster_color . '; font-weight : bold;"'; } ! else ! { $topic_poster_color = $theme['fontcolor1']; ! $topic_poster_style = 'style="font-weight : bold;"'; } } $db->sql_freeresult($result); } ! else if ($recent_show_user_bold) ! { $topic_poster_color = ''; ! $topic_poster_style = 'style="font-weight : bold;"'; } ! else ! { $topic_poster_color = ''; ! $topic_poster_style = ''; } $topic_autor_id = append_sid(PHPBB_URL . 'profile.php?mode=viewprofile&u=' . $latest_topics[$i]['user_id']); $topic_autor = $latest_topics[$i]['username']; ! $topic_poster = ($latest_topics[$i]['topic_poster'] == ANONYMOUS ) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $latest_topics[$i]['topic_poster']) . '"><span ' . $topic_poster_style . '>' . $latest_topics[$i]['author_username'] . '</span></a> '; $topic_poster_full = $topic_poster; *************** *** 897,906 **** { $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_posts_offset=')); ! if ($recent_forums_offset > 0) ! { $prev_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset-$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th"><< Prev ' . $recent_num_topics . '</a>' : $new_url . ($recent_forums_offset-$recent_num_topics).'" class="th"><< Prev ' . $recent_num_topics . '</a>'; } ! else ! { $prev_recent_url = ''; } --- 897,906 ---- { $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_posts_offset=')); ! if ($recent_forums_offset > 0) ! { $prev_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset-$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th"><< Prev ' . $recent_num_topics . '</a>' : $new_url . ($recent_forums_offset-$recent_num_topics).'" class="th"><< Prev ' . $recent_num_topics . '</a>'; } ! else ! { $prev_recent_url = ''; } *************** *** 909,920 **** $next_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset+$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th">Next ' . $recent_num_topics . ' >></a>' : $new_url . ($recent_forums_offset+$recent_num_topics).'" class="th">Next ' . $recent_num_topics . ' >></a>'; } ! else ! { $next_recent_url = ''; } } ! else { ! $prev_recent_url = ''; $next_recent_url = ''; } --- 909,920 ---- $next_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset+$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th">Next ' . $recent_num_topics . ' >></a>' : $new_url . ($recent_forums_offset+$recent_num_topics).'" class="th">Next ' . $recent_num_topics . ' >></a>'; } ! else ! { $next_recent_url = ''; } } ! else { ! $prev_recent_url = ''; $next_recent_url = ''; } *************** *** 957,966 **** { $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_posts_offset=')); ! if ($recent_forums_offset > 0) ! { $prev_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset-$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th"><< Prev ' . $recent_num_topics . '</a>' : $new_url . ($recent_forums_offset-$recent_num_topics).'" class="th"><< Prev ' . $recent_num_topics . '</a>'; } ! else ! { $prev_recent_url = ''; } --- 957,966 ---- { $new_url = '<a href="' . mx_append_sid(this_recent_url('recent_posts_offset=')); ! if ($recent_forums_offset > 0) ! { $prev_recent_url = ($recent_news_offset > 0) ? $new_url . ($recent_forums_offset-$recent_num_topics) . '&recent_news_offset=' . $recent_news_offset . '" class="th"><< Prev ' . $recent_num_topics . '</a>' : $new_url . ($recent_forums_offset-$recent_num_topics).'" class="th"><< Prev ' . $recent_num_topics . '</a>'; } ! else ! { $prev_recent_url = ''; } *************** *** 968,974 **** $next_recent_url = ''; } ! else { ! $prev_recent_url = ''; $next_recent_url = ''; } --- 968,974 ---- $next_recent_url = ''; } ! else { ! $prev_recent_url = ''; $next_recent_url = ''; } *************** *** 979,983 **** 'TOPIC_POSTER' => 'None', 'TOPIC_AUTHOR' => 'None', ! 'TOPIC_REPLIES' => '0', 'TOPIC_TITLE' => 'None' )); --- 979,983 ---- 'TOPIC_POSTER' => 'None', 'TOPIC_AUTHOR' => 'None', ! 'TOPIC_REPLIES' => '0', 'TOPIC_TITLE' => 'None' )); *************** *** 1020,1024 **** 'L_VIEWS' => $lang['Views'], 'L_LASTPOST' => $lang['Last_Post'], ! 'L_AUTHOR' => $lang['Author'], 'L_WRITEN_BY' => $lang['writen_by'], 'L_LAST_BY' => $lang['last_by'], --- 1020,1024 ---- 'L_VIEWS' => $lang['Views'], 'L_LASTPOST' => $lang['Last_Post'], ! 'L_AUTHOR' => $lang['Author'], 'L_WRITEN_BY' => $lang['writen_by'], 'L_LAST_BY' => $lang['last_by'], *************** *** 1029,1033 **** 'L_NEW_POSTS' => $lang['New_posts'], 'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'], ! 'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'], 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_BACK_TO_TOP' => ( !empty($lang['Back_to_top']) ? $lang['Back_to_top'] : 'Back to Top' ) --- 1029,1033 ---- 'L_NEW_POSTS' => $lang['New_posts'], 'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'], ! 'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'], 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_BACK_TO_TOP' => ( !empty($lang['Back_to_top']) ? $lang['Back_to_top'] : 'Back to Top' ) *************** *** 1035,1039 **** $template->pparse('glance_output'); ! // THE END ?> --- 1035,1039 ---- $template->pparse('glance_output'); ! // THE END ?> |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:48:56
|
Update of /cvsroot/mxbb/mx_ggsitemaps In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14659 Modified Files: db_install.php db_uninstall.php Log Message: updated for 2.9.x. several intit methods were outdated... Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_ggsitemaps/db_install.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** db_install.php 22 Jul 2007 21:17:26 -0000 1.1 --- db_install.php 28 Jan 2008 21:48:50 -0000 1.2 *************** *** 9,59 **** */ ! // Edited by to both fit mx and phpbb. ! // Added multi language support. ! if ( file_exists( 'viewtopic.php' ) ) ! { ! define('IN_PHPBB', true); ! $module_root_path2 = $phpbb_root_path = $mx_root_path = './'; ! $module_root_path = $mx_root_path . 'mx_ggsitemaps/'; ! } ! else ! { ! define('IN_PORTAL', true); ! $mx_root_path = '../../'; ! $module_root_path2 = $module_root_path = '../modules/mx_ggsitemaps/'; ! } ! ! if ( !defined('IN_ADMIN') ) { ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.'.$phpEx); ! ! // ! // Start session management ! // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! if (defined('IN_PORTAL')) ! { ! mx_init_userprefs($userdata); ! } ! if (defined('IN_PHPBB')) ! { ! init_userprefs($userdata); ! $mx_table_prefix = $table_prefix; ! } ! ! if( !$userdata['session_logged_in'] ) { ! die("Hacking attempt(3)"); } ! if( $userdata['user_level'] != ADMIN ) { ! die("Hacking attempt(4)"); } ! // ! // End session management ! // } --- 9,31 ---- */ ! define( 'IN_PORTAL', true ); ! if ( !defined( 'IN_ADMIN' ) ) { + $mx_root_path = './../../'; + $phpEx = substr(strrchr(__FILE__, '.'), 1); + include( $mx_root_path . 'common.' . $phpEx ); + // Start session management + $mx_user->init($user_ip, PAGE_INDEX); ! if ( !$userdata['session_logged_in'] ) { ! die( "Hacking attempt(1)" ); } ! if ( $userdata['user_level'] != ADMIN ) { ! die( "Hacking attempt(2)" ); } ! // End session management } *************** *** 61,124 **** $mx_module_copy = 'Original phpBB <i>Google Sitemaps</i> MOD by <a href="http://www.mxbb.net/" target="_blank">dcz</a> :: Adapted for mxBB by <a href="http://www.mxbb.net" target="_blank">dcz</a> & <a href="http://www.mxbb.net" target="_blank">Jon</a>'; ! // ! // Include common module stuff... ! // ! require($module_root_path . 'includes/common_GGsitemaps.' . $phpEx); ! ! ! $message = $lang['Google_install']; ! $sql = array( ! "DROP TABLE IF EXISTS ".$mx_table_prefix."ggsitemap_config", ! "CREATE TABLE ".$mx_table_prefix."ggsitemap_config( ! config_name varchar(255) NOT NULL, ! config_value varchar(255) NOT NULL, ! PRIMARY KEY (config_name) ! )", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_sql_limit', '200')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_url_limit', '2500')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_sort', 'DESC')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_rewrited', 'FALSE')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_announce_priority', '0.5')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_default_priority', '1.0')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_sticky_priority', '0.75')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_limitdown', '5')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_limitup', '5')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_kb_mx_page', 'FALSE')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_c_info', '(C) 2006 dcz - http://www.phpbb-seo.com/')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_ver', 'v1.0.0RC2')", ! ); ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " ! SET module_version = '" . $mx_module_version . "', ! module_copy = '" . $mx_module_copy . "' ! WHERE module_id = '" . $mx_module_id . "'"; ! $n = 0; ! $message .= '<b>' . $lang['Google_install_ok'] . '</b><br /><br />'; ! while($sql[$n]) { ! $message .= ($mods[$n-1] != $mods[$n]) ? '<p><b><font size=3>'.$mods[$n].'</font></b><br />' : ''; ! if(!$result = $db->sql_query($sql[$n])) ! { ! $message .= '<b><font color=#FF0000>' . $lang['Google_error'] .($n+1).' , '.$sql[$n].'<br />'; ! } ! else ! { ! $message .='<b><font color=#0000fF>' . $lang['Google_sql_ok'] .($n+1).' , '.$sql[$n].'<br />'; ! } ! $n++; } $message .= '<br />' . $lang['Google_general']; echo "<br /><br />"; ! echo "<table cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">"; ! echo "<tr><th class=\"thHead\" align=\"center\">".$lang['Google_instal_info']."</th></tr>"; ! echo "<tr><td class=\"row1\" align=\"center\"><span class=\"gen\">" . $message . "</span></td></tr>"; echo "</table><br />"; --- 33,88 ---- $mx_module_copy = 'Original phpBB <i>Google Sitemaps</i> MOD by <a href="http://www.mxbb.net/" target="_blank">dcz</a> :: Adapted for mxBB by <a href="http://www.mxbb.net" target="_blank">dcz</a> & <a href="http://www.mxbb.net" target="_blank">Jon</a>'; ! // If fresh install ! if ( !$result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "ggsitemap_config" ) ) ! { ! // ! // Include common module stuff... ! // ! $message = $lang['Google_install']; ! $sql = array( ! "DROP TABLE IF EXISTS ".$mx_table_prefix."ggsitemap_config", ! "CREATE TABLE ".$mx_table_prefix."ggsitemap_config( ! config_name varchar(255) NOT NULL, ! config_value varchar(255) NOT NULL, ! PRIMARY KEY (config_name) ! )", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_sql_limit', '200')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_url_limit', '2500')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_sort', 'DESC')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_rewrited', 'FALSE')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_announce_priority', '0.5')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_default_priority', '1.0')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_sticky_priority', '0.75')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_limitdown', '5')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_limitup', '5')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_kb_mx_page', 'FALSE')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_c_info', '(C) 2006 dcz - http://www.phpbb-seo.com/')", ! "INSERT INTO ".$mx_table_prefix."ggsitemap_config VALUES ('sitemap_ver', 'v1.0.0RC2')", ! ); ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " ! SET module_version = '" . $mx_module_version . "', ! module_copy = '" . $mx_module_copy . "' ! WHERE module_id = '" . $mx_module_id . "'"; ! $message .= mx_do_install_upgrade( $sql ); ! } ! else { ! // If already installed ! $message = "<b>Module is already installed...consider upgrading ;)</b><br/><br/>"; } $message .= '<br />' . $lang['Google_general']; 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/Uninstallation Information - module specific DB tables</th></tr>"; ! echo "<tr><td class=\"row1\" align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>"; echo "</table><br />"; Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_ggsitemaps/db_uninstall.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** db_uninstall.php 22 Jul 2007 21:17:27 -0000 1.1 --- db_uninstall.php 28 Jan 2008 21:48:50 -0000 1.2 *************** *** 9,69 **** */ ! // Edited by dcz to both fit mx and phpbb. ! // Added multi language support. ! ! if ( file_exists( 'viewtopic.php' ) ) ! { ! define('IN_PHPBB', true); ! $module_root_path2 = $phpbb_root_path = $mx_root_path = './'; ! $module_root_path = $mx_root_path . 'mx_ggsitemaps/'; ! } ! else ! { ! define('IN_PORTAL', true); ! $mx_root_path = '../../'; ! $module_root_path2 = $module_root_path = '../modules/mx_ggsitemaps/'; ! } ! ! if ( !defined('IN_ADMIN') ) { ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.'.$phpEx); ! ! // ! // Start session management ! // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! if (defined('IN_PORTAL')) ! { ! mx_init_userprefs($userdata); ! } ! if (defined('IN_PHPBB')) ! { ! init_userprefs($userdata); ! $mx_table_prefix = $table_prefix; ! } ! ! if( !$userdata['session_logged_in'] ) { ! die("Hacking attempt(3)"); } ! if( $userdata['user_level'] != ADMIN ) { ! die("Hacking attempt(4)"); } ! // ! // End session management ! // } - // - // Include common module stuff... - // - require($module_root_path . 'includes/common_GGsitemaps.' . $phpEx); - - $message = $lang['Google_uninstall']; $sql = array( "DROP TABLE ".$mx_table_prefix."ggsitemap_config", --- 9,35 ---- */ ! define( 'IN_PORTAL', true ); ! if ( !defined( 'IN_ADMIN' ) ) { + $mx_root_path = './../../'; + $phpEx = substr(strrchr(__FILE__, '.'), 1); + include( $mx_root_path . 'common.' . $phpEx ); + // Start session management + $mx_user->init($user_ip, PAGE_INDEX); ! if ( !$userdata['session_logged_in'] ) { ! die( "Hacking attempt(1)" ); } ! if ( $userdata['user_level'] != ADMIN ) { ! die( "Hacking attempt(2)" ); } ! // End session management } $message = $lang['Google_uninstall']; + $sql = array( "DROP TABLE ".$mx_table_prefix."ggsitemap_config", *************** *** 71,94 **** - $n = 0; - while($sql[$n]) - { - $message .= ($mods[$n-1] != $mods[$n]) ? '<p><b><font size=3>'.$mods[$n].'</font></b><br />' : ''; - if(!$result = $db->sql_query($sql[$n])) - { - $message .= '<b><font color=#FF0000>'. $lang['Google_unerror'] .($n+1).' , '.$sql[$n].'<br />'; - } - else - { - $message .='<b><font color=#0000fF>' . $lang['Google_unsql_ok'] .($n+1).' , '.$sql[$n].'<br />'; - } - $n++; - } - - $message .= '<br />' . $lang['Google_general']; echo "<br /><br />"; ! echo "<table cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">"; ! echo "<tr><th class=\"thHead\" align=\"center\">".$lang['Google_uninstal_info']."</th></tr>"; ! echo "<tr><td class=\"row1\" align=\"center\"><span class=\"gen\">" . $message . "</span></td></tr>"; echo "</table><br />"; --- 37,44 ---- 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 />"; |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:48:54
|
Update of /cvsroot/mxbb/mx_ggsitemaps/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14659/admin Modified Files: admin_mx_ggsitemap.php Log Message: updated for 2.9.x. several intit methods were outdated... Index: admin_mx_ggsitemap.php =================================================================== RCS file: /cvsroot/mxbb/mx_ggsitemaps/admin/admin_mx_ggsitemap.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_ggsitemap.php 9 Sep 2007 19:59:18 -0000 1.2 --- admin_mx_ggsitemap.php 28 Jan 2008 21:48:50 -0000 1.3 *************** *** 60,64 **** if ( !$result = $db->sql_query( $sql ) ) { ! message_die( CRITICAL_ERROR, "Could not query Google sitemap configuration information ", "", __LINE__, __FILE__, $sql ); } else --- 60,64 ---- if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( CRITICAL_ERROR, "Could not query Google sitemap configuration information ", "", __LINE__, __FILE__, $sql ); } else *************** *** 126,130 **** if( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Failed to update Google sitemap configuration ", "", __LINE__, __FILE__, $sql); } } --- 126,130 ---- if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update Google sitemap configuration ", "", __LINE__, __FILE__, $sql); } } *************** *** 136,140 **** $message = $lang['Google_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_ggsitemap_config'], "<a href=\"" . mx_append_sid($admin_root_path2 . "admin_mx_ggsitemap.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($admin_root_path1 . "index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } } --- 136,140 ---- $message = $lang['Google_Config_updated'] . "<br /><br />" . sprintf($lang['Click_return_ggsitemap_config'], "<a href=\"" . mx_append_sid($admin_root_path2 . "admin_mx_ggsitemap.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($admin_root_path1 . "index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } } |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:48:53
|
Update of /cvsroot/mxbb/mx_ggsitemaps/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14659/includes Modified Files: common_GGsitemaps.php sitemap_mx.php Log Message: updated for 2.9.x. several intit methods were outdated... Index: sitemap_mx.php =================================================================== RCS file: /cvsroot/mxbb/mx_ggsitemaps/includes/sitemap_mx.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sitemap_mx.php 22 Jul 2007 21:17:36 -0000 1.1 --- sitemap_mx.php 28 Jan 2008 21:48:50 -0000 1.2 *************** *** 23,26 **** --- 23,28 ---- if ( $mx_map ) { + $mx_page->init( '1' ); + // // First get all visible blocks Index: common_GGsitemaps.php =================================================================== RCS file: /cvsroot/mxbb/mx_ggsitemaps/includes/common_GGsitemaps.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** common_GGsitemaps.php 22 Jul 2007 21:17:31 -0000 1.1 --- common_GGsitemaps.php 28 Jan 2008 21:48:50 -0000 1.2 *************** *** 61,65 **** if ( strstr(urldecode($url), "\n") || strstr(urldecode($url), "\r") ) { ! message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.'); } // Redirect via an HTML form for PITA webservers --- 61,65 ---- if ( strstr(urldecode($url), "\n") || strstr(urldecode($url), "\r") ) { ! mx_message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.'); } // Redirect via an HTML form for PITA webservers |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:47:35
|
Update of /cvsroot/mxbb/mx_calsnails/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14207/templates/_core Modified Files: mx_calendar_events.tpl Log Message: general updates... Index: mx_calendar_events.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/templates/_core/mx_calendar_events.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_calendar_events.tpl 9 Sep 2007 19:48:58 -0000 1.1 --- mx_calendar_events.tpl 28 Jan 2008 21:47:30 -0000 1.2 *************** *** 3,7 **** <td width="100%" class="row1"> <!-- BEGIN switch_use_vsize_on --> ! <div style="overflow:auto; height:{BLOCK_VSIZE}px;"> <!-- END switch_use_vsize_on --> <table width="100%" cellpadding="2" cellspacing="1" border="0"> --- 3,7 ---- <td width="100%" class="row1"> <!-- BEGIN switch_use_vsize_on --> ! <div class="calsnailslist" style="overflow-y:auto; overflow-x:hidden;height:{BLOCK_VSIZE}px; width:100%;"> <!-- END switch_use_vsize_on --> <table width="100%" cellpadding="2" cellspacing="1" border="0"> *************** *** 15,19 **** <!-- BEGIN no_events --> <tr> ! <td class="row1" align="center"><span class="gen"> <br />{no_events.NO_EVENTS}</span></td> </tr> <!-- END no_events --> --- 15,19 ---- <!-- BEGIN no_events --> <tr> ! <td class="row1" align="center"><span class="genmed"> <br />{no_events.NO_EVENTS}</span></td> </tr> <!-- END no_events --> |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:47:35
|
Update of /cvsroot/mxbb/mx_calsnails/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14207/includes Modified Files: cal_settings.php Log Message: general updates... Index: cal_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/includes/cal_settings.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** cal_settings.php 5 May 2007 20:19:22 -0000 1.15 --- cal_settings.php 28 Jan 2008 21:47:30 -0000 1.16 *************** *** 39,42 **** --- 39,43 ---- $mx_user->extend(); $mx_page->add_copyright( 'mxBB Calsnails Module' ); + $mx_page->add_css_file(); } ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:44:48
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12825/bugsbt/admin Modified Files: admin_cat_manage.php admin_settings.php Log Message: general updates... Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_cat_manage.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_cat_manage.php 9 Sep 2007 19:35:10 -0000 1.5 --- admin_cat_manage.php 28 Jan 2008 21:44:43 -0000 1.6 *************** *** 19,23 **** function main( $action ) { ! global $db, $images, $template, $lang, $phpEx, $mx_bugsbt_functions, $mx_bugsbt_cache, $bugsbt_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; // --- 19,23 ---- function main( $action ) { ! global $db, $images, $template, $lang, $phpEx, $mx_bugsbt_functions, $mx_bugsbt_cache, $bugsbt_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config; // *************** *** 221,225 **** 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], --- 221,226 ---- 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $portal_config['portal_backend'] != 'internal' ? $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ) : 'not available', ! //'FORUM_LIST' => $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], Index: admin_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/admin/admin_settings.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_settings.php 9 Sep 2007 19:35:10 -0000 1.3 --- admin_settings.php 28 Jan 2008 21:44:43 -0000 1.4 *************** *** 19,23 **** function main( $action ) { ! global $db, $images, $template, $lang, $phpEx, $mx_bugsbt_functions, $mx_bugsbt_cache, $bugsbt_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; // --- 19,23 ---- function main( $action ) { ! global $db, $images, $template, $lang, $phpEx, $mx_bugsbt_functions, $mx_bugsbt_cache, $bugsbt_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config; // *************** *** 181,194 **** $use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $comments_forum_id = $new['comments_forum_id']; ! $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; $allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : ""; --- 181,217 ---- $use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : ""; ! switch ($portal_config['portal_backend']) ! { ! case 'internal': ! $internal_comments_internal = "checked=\"checked\""; ! $internal_comments_phpbb = ""; ! $comments_forum_id = 0; ! $del_topic_yes = ""; ! $del_topic_no = "checked=\"checked\""; ! $autogenerate_comments_yes = ""; ! $autogenerate_comments_no = "checked=\"checked\""; ! $template->assign_vars( array( ! 'S_READONLY' => "disabled=\"disabled\"" ) ! ); ! break; ! ! default: ! $internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $comments_forum_id = $new['comments_forum_id']; ! ! $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : ""; ! ! $autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $template->assign_vars( array( ! 'S_READONLY' => "" ) ! ); ! break; ! } $allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : ""; *************** *** 400,404 **** 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], --- 423,428 ---- 'L_FORUM_ID' => $lang['Forum_id'], 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => $portal_config['portal_backend'] != 'internal' ? $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ) : 'not available', ! //'FORUM_LIST' => $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ), 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:44:48
|
Update of /cvsroot/mxbb/mx_bugsbt/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12825/templates/_core Modified Files: bugsbt_comment_posting.tpl Log Message: general updates... Index: bugsbt_comment_posting.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/templates/_core/bugsbt_comment_posting.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bugsbt_comment_posting.tpl 9 Sep 2007 19:35:11 -0000 1.1 --- bugsbt_comment_posting.tpl 28 Jan 2008 21:44:44 -0000 1.2 *************** *** 1,2 **** --- 1,3 ---- + <form method="post" action="{S_POST_ACTION}" onsubmit="saveComment(this); this.blur(); return false;" name="post"> *************** *** 16,75 **** <table border="0" cellpadding="4" cellspacing="1" width="100%"> <tr> ! <td class="row1" width="200"><span class="gen"><b>{L_COMMENT_TITLE}</b></span></td> ! <td class="row2" width="100%"><input type="text" name="subject" size="45" maxlength="60" style="width:450px" tabindex="2" class="post" value="{TITLE}" /></span></td> </tr> <tr> ! <td class="row1" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="1"> ! <tr> ! <td><span class="gen"><b>{L_COMMENT}</b></span></td> ! </tr> ! <tr> ! <td valign="middle" align="center"> <br /> ! <table width="100" border="0" cellspacing="0" cellpadding="5"> ! <tr align="center"> ! <td colspan="{S_SMILIES_COLSPAN}" class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_EMOTICONS}</a></td> ! </tr> ! <!-- BEGIN smilies_row --> ! <tr align="center" valign="middle"> ! <!-- BEGIN smilies_col --> ! <td><a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a></td> ! <!-- END smilies_col --> ! </tr> ! <!-- END smilies_row --> ! </table> ! </td> ! </tr> ! </table> ! </td> ! <td class="row2" valign="top"><span class="gen"> <span class="genmed"> </span> ! <table width="450" border="0" cellspacing="0" cellpadding="2"> <tr align="center" valign="middle"> ! <td width="10"><span class="genmed"> ! <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> </span></td> ! <td width="10"><span class="genmed"> ! <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> </span></td> ! <td width="10"><span class="genmed"> ! <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> </span></td> ! <td width="10"><span class="genmed"> ! <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> </span></td> ! <td width="10"><span class="genmed"> <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" onMouseOver="helpline('c')" /> </span></td> ! <td width="10"><span class="genmed"> ! <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> </span></td> ! <td width="10"><span class="genmed"> <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" onMouseOver="helpline('o')" /> </span></td> ! <td width="10"><span class="genmed"> ! <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> </span></td> ! <td width="10"><span class="genmed"> ! <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> </span></td> </tr> --- 17,62 ---- <table border="0" cellpadding="4" cellspacing="1" width="100%"> <tr> ! <th colspan="2" class="thHead" height="25"><b>{L_COMMENT_ADD}</b></th> </tr> <tr> ! <td colspan="2" class="row1" ><span class="gen"><b>{L_COMMENT_TITLE}</b></span></td> ! </tr> ! <tr> ! <td colspan="2" class="row1"><input type="text" name="subject" size="45" maxlength="60" style="width:400px" tabindex="2" class="post" value="{TITLE}" /></span></td> ! </tr> ! <tr> ! <td colspan="2" class="row1" valign="top"><span class="gen"><b>{L_COMMENT}</b></span></td> ! </tr> ! <!-- BEGIN switch_bbcodes --> ! <tr> ! <td colspan="2" class="row2" valign="top"><span class="gen"> ! <table border="0" cellspacing="0" cellpadding="1"> <tr align="center" valign="middle"> ! <td><span class="genmed"> ! <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 20px" onClick="bbstyle(0)" onMouseOver="helpline('b')" /> </span></td> ! <td><span class="genmed"> ! <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 20px" onClick="bbstyle(2)" onMouseOver="helpline('i')" /> </span></td> ! <td><span class="genmed"> ! <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 20px" onClick="bbstyle(4)" onMouseOver="helpline('u')" /> </span></td> ! <td><span class="genmed"> ! <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 45px" onClick="bbstyle(6)" onMouseOver="helpline('q')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(8)" onMouseOver="helpline('c')" /> </span></td> ! <td><span class="genmed"> ! <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 35px" onClick="bbstyle(10)" onMouseOver="helpline('l')" /> </span></td> ! <td><span class="genmed"> <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(12)" onMouseOver="helpline('o')" /> </span></td> ! <td><span class="genmed"> ! <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 35px" onClick="bbstyle(14)" onMouseOver="helpline('p')" /> </span></td> ! <td><span class="genmed"> ! <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 35px" onClick="bbstyle(16)" onMouseOver="helpline('w')" /> </span></td> </tr> *************** *** 78,82 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="genmed"> {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"> <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> --- 65,70 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><span class="genmed"> ! {L_FONT_COLOR}: <select name="addbbcode18" onChange="bbfontstyle('[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"> <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">{L_COLOR_DEFAULT}</option> *************** *** 95,99 **** <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option> ! </select> {L_FONT_SIZE}: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> <option value="7" class="genmed">{L_FONT_TINY}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option> --- 83,88 ---- <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">{L_COLOR_WHITE}</option> <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">{L_COLOR_BLACK}</option> ! </select> <br /> ! {L_FONT_SIZE}: <select name="addbbcode20" onChange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> <option value="7" class="genmed">{L_FONT_TINY}</option> <option value="9" class="genmed">{L_FONT_SMALL}</option> *************** *** 110,124 **** <tr> <td colspan="9"> <span class="gensmall"> ! <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> </span></td> </tr> - <tr> - <td colspan="9" class="row2"><span class="gen"> - <textarea name="message" rows="7" cols="25" wrap="virtual" style="width:450px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{COMMENT}</textarea> - </td> - </tr> </table> </td> </tr> <tr> <td class="row1"><span class="gen"><B>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}<br />{LINKS_STATUS}<br />{IMAGES_STATUS}</span></td> --- 99,143 ---- <tr> <td colspan="9"> <span class="gensmall"> ! <input type="text" name="helpbox" size="45" maxlength="100" style="width:400px; font-size:10px" class="helpline" value="{L_STYLES_TIP}" /> </span></td> </tr> </table> </td> </tr> + <!-- END switch_bbcodes --> + + <tr> + <td colspan="2" valign="middle" class="row1"> + <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <tr> + <td colspan="{S_SMILIES_COLSPAN}" class="genmed"> + <b>{L_EMOTICONS}</b> + </td> + </tr> + <tr valign="middle"> + <td> + <!-- BEGIN smilies_row --> + <!-- BEGIN smilies_col --> + <a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" border="0" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a> + <!-- END smilies_col --> + <!-- END smilies_row --> + </td> + </tr> + <!-- BEGIN switch_smilies_extra --> + <tr> + <td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td> + </tr> + <!-- END switch_smilies_extra --> + </table> + </td> + </tr> + + <tr> + <td colspan="2" class="row1"> + <span class="gen"> + <textarea name="message" rows="30" cols="35" wrap="virtual" style="width:400px" tabindex="3" class="post" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{COMMENT}</textarea> + </span> + </td> + </tr> <tr> <td class="row1"><span class="gen"><B>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}<br />{LINKS_STATUS}<br />{IMAGES_STATUS}</span></td> *************** *** 131,136 **** <input type="hidden" id="body-tmp" name="body-tmp" value=""> </td> - </form> </tr> </table> <span class="gen"><p id="saved"></p></span> \ No newline at end of file --- 150,155 ---- <input type="hidden" id="body-tmp" name="body-tmp" value=""> </td> </tr> </table> + </form> <span class="gen"><p id="saved"></p></span> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:44:47
|
Update of /cvsroot/mxbb/mx_bugsbt/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12825/templates/_core/admin Modified Files: bugsbt_config_body.tpl Log Message: general updates... Index: bugsbt_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/templates/_core/admin/bugsbt_config_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bugsbt_config_body.tpl 9 Sep 2007 19:35:13 -0000 1.1 --- bugsbt_config_body.tpl 28 Jan 2008 21:44:44 -0000 1.2 *************** *** 131,135 **** <tr> <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} /> {L_INTERNAL_COMMENTS_PHPBB}</td> </tr> <tr> --- 131,135 ---- <tr> <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} {S_READONLY} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} {S_READONLY} /> {L_INTERNAL_COMMENTS_PHPBB}</td> </tr> <tr> |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:44:47
|
Update of /cvsroot/mxbb/mx_bugsbt/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12825/language/lang_swedish Modified Files: lang_main.php Log Message: general updates... Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/language/lang_swedish/lang_main.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lang_main.php 5 Aug 2007 22:08:08 -0000 1.5 --- lang_main.php 28 Jan 2008 21:44:44 -0000 1.6 *************** *** 147,151 **** $lang['Comment'] = 'Kommentar'; $lang['Comment_explain'] = 'Använd textrutan och skriv din kommentar!'; ! $lang['Comment_add'] = 'Lägg till kommentar'; $lang['Comment_delete'] = 'Ta bort'; $lang['Comment_posted'] = 'Kommentaren skickades...'; --- 147,152 ---- $lang['Comment'] = 'Kommentar'; $lang['Comment_explain'] = 'Använd textrutan och skriv din kommentar!'; ! $lang['Comment_add'] = 'Skriv kommentar'; ! $lang['Comment_edit'] = 'Ändra'; $lang['Comment_delete'] = 'Ta bort'; $lang['Comment_posted'] = 'Kommentaren skickades...'; |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:44:47
|
Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12825/bugsbt/modules Modified Files: bugsbt_post_comment.php Log Message: general updates... Index: bugsbt_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/modules/bugsbt_post_comment.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bugsbt_post_comment.php 9 Sep 2007 19:35:11 -0000 1.2 --- bugsbt_post_comment.php 28 Jan 2008 21:44:43 -0000 1.3 *************** *** 31,34 **** --- 31,35 ---- global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; global $page_id, $block_id; + global $mx_block, $theme; // *************** *** 125,135 **** // ! // Toggles // ! $html_on = ( $bugsbt_config['allow_comment_html'] ) ? true : 0; ! $bbcode_on = ( $bugsbt_config['allow_comment_bbcode'] ) ? true : 0; ! $smilies_on = ( $bugsbt_config['allow_comment_smilies'] ) ? true : 0; ! $links_on = ( $bugsbt_config['allow_comment_links'] ) ? true : 0; ! $images_on = ( $bugsbt_config['allow_comment_images'] ) ? true : 0; // --- 126,181 ---- // ! // wysiwyg // ! if ( $bugsbt_config['allow_comment_wysiwyg'] && file_exists( $mx_root_path . $bugsbt_config['wysiwyg_path'] . 'tinymce/jscripts/tiny_mce/blank.htm' )) ! { ! // ! // Toggles ! // ! $allow_wysiwyg = true; ! $bbcode_on = false; ! $html_on = true; ! $smilies_on = false; ! $links_on = false; ! $images_on = false; ! ! $langcode = mx_get_langcode(); ! ! if ($mx_block->auth_mod) ! { ! $template->assign_block_vars( "tinyMCE_admin", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); ! } ! else ! { ! $template->assign_block_vars( "tinyMCE", array( ! 'PATH' => $mx_root_path, ! 'LANG' => !empty($langcode) ? $langcode : $HTTP_SERVER_VARS['HTTP_ACCEPT_LANGUAGE'], ! 'TEMPLATE' => $mx_root_path . 'templates/'. $theme['template_name'] . '/' . $theme['head_stylesheet'] ! )); ! } ! } ! else ! { ! // ! // Toggles ! // ! $allow_wysiwyg = false; ! $html_on = ( $bugsbt_config['allow_comment_html'] ) ? true : 0; ! $bbcode_on = ( $bugsbt_config['allow_comment_bbcode'] ) ? true : 0; ! $smilies_on = ( $bugsbt_config['allow_comment_smilies'] ) ? true : 0; ! $links_on = ( $bugsbt_config['allow_comment_links'] ) ? true : 0; ! $images_on = ( $bugsbt_config['allow_comment_images'] ) ? true : 0; ! ! $board_config['allow_html_tags'] = $bugsbt_config['allowed_comment_html_tags']; ! ! if ($smilies_on) ! { ! $mx_bugsbt_functions->generate_smilies( 'inline', PAGE_POSTING ); ! } ! } // *************** *** 144,148 **** // Fix: Setting 'emtpy' enables all // ! //$mx_text->allow_all_html_tags = $allow_wysiwyg; // Not yet implemented for comments // ======================================================= --- 190,194 ---- // Fix: Setting 'emtpy' enables all // ! $mx_text->allow_all_html_tags = $allow_wysiwyg; // ======================================================= *************** *** 197,201 **** if ( $submit ) { ! $this->update_add_comment($bug_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on); $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return_bug'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=bug&k=' . $item_id ) ) . '">', '</a>' ); --- 243,247 ---- if ( $submit ) { ! $this->update_add_comment($bug_data, $item_id, $cid, '', '', $html_on, $bbcode_on, $smilies_on, $allow_wysiwyg); $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return_bug'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=bug&k=' . $item_id ) ) . '">', '</a>' ); *************** *** 207,215 **** // ======================================================= - // - // Generate smilies listing for page output - // - $mx_bugsbt_functions->generate_smilies( 'inline', PAGE_POSTING ); - $html_status = ( $html_on ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF']; $bbcode_status = ( $bbcode_on ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF']; --- 253,256 ---- *************** *** 370,373 **** --- 411,419 ---- ); + if ( $bbcode_on ) + { + $template->assign_block_vars( 'switch_bbcodes', array()); + } + // =================================================== // assign var for navigation |
|
From: Jon O. <jon...@us...> - 2008-01-28 21:44:47
|
Update of /cvsroot/mxbb/mx_bugsbt/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12825/language/lang_english Modified Files: lang_main.php Log Message: general updates... Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_bugsbt/language/lang_english/lang_main.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** lang_main.php 5 Aug 2007 22:08:08 -0000 1.6 --- lang_main.php 28 Jan 2008 21:44:43 -0000 1.7 *************** *** 150,153 **** --- 150,154 ---- $lang['Comment_explain'] = 'Use the textbox above to give your opinion on this file!'; $lang['Comment_add'] = 'Add Comment'; + $lang['Comment_edit'] = 'Edit'; $lang['Comment_delete'] = 'Delete'; $lang['Comment_posted'] = 'Your comment has been entered successfully'; |
2 messages has been excluded from this view by a project administrator.
