Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: OryNider <ory...@us...> - 2008-01-31 05:47:55
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12150/templates/_core Modified Files: mx_online.tpl Log Message: mx_online changes for phpBB2 backend, pls don't drop this again... Index: mx_online.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/templates/_core/mx_online.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_online.tpl 9 Sep 2007 16:49:36 -0000 1.1 --- mx_online.tpl 31 Jan 2008 05:47:48 -0000 1.2 *************** *** 10,14 **** <tr> <td class="row1" align="left"> ! <span class="gensmall">{TOTAL_USERS_ONLINE} [ {L_WHOSONLINE_ADMIN} ] [ {L_WHOSONLINE_MOD} ]<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span> </td> </tr> --- 10,14 ---- <tr> <td class="row1" align="left"> ! <span class="gensmall">{TOTAL_USERS_ONLINE} {ONLINE_LEGEND} <br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span> </td> </tr> |
|
From: OryNider <ory...@us...> - 2008-01-31 05:47:55
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12150 Modified Files: mx_online.php Log Message: mx_online changes for phpBB2 backend, pls don't drop this again... Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_online.php 9 Jan 2008 01:49:27 -0000 1.23 --- mx_online.php 31 Jan 2008 05:47:47 -0000 1.24 *************** *** 15,18 **** --- 15,23 ---- } + if (PORTAL_BACKEND == 'phpbb3') + { + $mx_user->setup(); + } + // ================================================================================ // The following code is backported from includes/page_header.php (phpBB 2.0.13) *************** *** 98,102 **** $logged_visible_online++; } ! else if (PORTAL_BACKEND == 'internal') { $user_online_link = '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; --- 103,107 ---- $logged_visible_online++; } ! else if (PORTAL_BACKEND == 'phpbb2') { $user_online_link = '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; *************** *** 253,258 **** $total_users = phpBB2::get_db_stat('usercount'); $newest_userdata = phpBB2::get_db_stat('newestuser'); ! $newest_user = $newest_userdata['username']; ! $newest_uid = $newest_userdata['user_id']; if( $total_posts == 0 ) --- 258,285 ---- $total_users = phpBB2::get_db_stat('usercount'); $newest_userdata = phpBB2::get_db_stat('newestuser'); ! $newest_username = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_username'] : $newest_userdata['username']; ! $newest_uid = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_user_id'] : $newest_userdata['user_id']; ! ! if (PORTAL_BACKEND == 'phpbb3') ! { ! $newest_color = $board_config['newest_user_colour']; ! $newest_style_color = ($newest_color) ? ' style="color:#' . $newest_color . '" class="username-coloured"' : ''; ! $newest_user = sprintf($mx_user->lang['NEWEST_USER'], mx_get_username_string('full', $newest_uid, $newest_username, $newest_color)); ! } ! else ! { ! if ( $newest_userdata['user_level'] == ADMIN ) ! { ! $newest_color = $theme['fontcolor3']; ! $newest_username = '<b>' . $newest_username . '</b>'; ! } ! else if ( $newest_userdata['user_level'] == MOD ) ! { ! $newest_color = $theme['fontcolor2']; ! $newest_username = '<b>' . $newest_username . '</b>'; ! } ! $newest_style_color = 'style="color:#' . $newest_color . '"'; ! $newest_user = sprintf($lang['Newest_user'], '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '"' . $style_color .'>', $newest_username, '</a>'); ! } if( $total_posts == 0 ) *************** *** 282,285 **** --- 309,389 ---- } + if (PORTAL_BACKEND == 'phpbb3') + { + // Grab group details for legend display + if ($phpbb_auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) + { + $sql = 'SELECT group_id, group_name, group_colour, group_type + FROM ' . GROUPS_TABLE . ' + WHERE group_legend = 1 + ORDER BY group_name ASC'; + } + else + { + $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type + FROM ' . GROUPS_TABLE . ' g + LEFT JOIN ' . USER_GROUP_TABLE . ' ug + ON ( + g.group_id = ug.group_id + AND ug.user_id = ' . $mx_user->data['user_id'] . ' + AND ug.user_pending = 0 + ) + WHERE g.group_legend = 1 + AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $mx_user->data['user_id'] . ') + ORDER BY g.group_name ASC'; + } + $result = $db->sql_query($sql); + } + + $legend = ''; + + if (PORTAL_BACKEND == 'phpbb3') + { + while ($row = $db->sql_fetchrow($result)) + { + $colour_text = ($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . '"' : ''; + + if ($row['group_name'] == 'BOTS') + { + $legend .= (($legend != '') ? ', ' : '') . '<span' . $colour_text . '>' . $mx_user->lang['G_BOTS'] . '</span>'; + } + else + { + $legend .= (($legend != '') ? ', ' : '') . '<a' . $colour_text . ' href="' . mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']) . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $mx_user->lang['G_' . $row['group_name']] : $row['group_name']) . '</a>'; + } + } + $db->sql_freeresult($result); + } + else + { + $legend .= (($legend != '') ? ', ' : '') . '[' . sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>') . '] [' . sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>') . ']'; + } + + // Generate birthday list if required ... + $birthday_list = ''; + if (PORTAL_BACKEND == 'phpbb3') + { + if ($board_config['load_birthdays'] && $board_config['allow_birthdays']) + { + $now = getdate(time() + $mx_user->timezone + $mx_user->dst - date('Z')); + $sql = 'SELECT user_id, username, user_colour, user_birthday + FROM ' . USERS_TABLE . " + WHERE user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' + AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $birthday_list .= (($birthday_list != '') ? ', ' : '') . mx_get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); + + if ($age = (int) substr($row['user_birthday'], -4)) + { + $birthday_list .= ' (' . ($now['year'] - $age) . ')'; + } + } + $db->sql_freeresult($result); + } + } + // ================================================================================ // Send our Who's Online block to the browser *************** *** 302,309 **** 'LOGGED_IN_USER_LIST' => $online_userlist, 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], phpBB2::create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), - 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], ! 'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'), ! 'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'), 'L_ONLINE_EXPLAIN' => $lang['Online_explain'], --- 406,413 ---- 'LOGGED_IN_USER_LIST' => $online_userlist, 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], phpBB2::create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], ! 'ONLINE_LEGEND' => $legend, ! 'L_ONLINE_LEGEND' => !empty($mx_user->lang['LEGEND']) ? $mx_user->lang['LEGEND'] : 'Legend', ! 'ONLINE_BIRTHDAY_LIST' => $birthday_list, 'L_ONLINE_EXPLAIN' => $lang['Online_explain'], *************** *** 316,320 **** 'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), 'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! 'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), )); --- 420,424 ---- 'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), 'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! 'NEWEST_USER' => $newest_user, )); |
|
From: OryNider <ory...@us...> - 2008-01-31 05:46:53
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subsilver2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12032/subsilver2 Log Message: Directory /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subsilver2 added to the repository |
Update of /cvsroot/mxbb/mx_music/music_box/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5442/modules Modified Files: Tag: core28x music_cat.php music_comment.php music_comment_delete.php music_comment_edit.php music_delete.php music_download.php music_edit.php music_list.php music_media_cat.php music_modcp.php music_page.php music_pic_cat.php music_rate.php music_rss.php music_song.php music_stream.php music_upload.php Log Message: ready for 2.8.1 release. Index: music_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_upload.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_upload.php 16 Jan 2008 19:53:16 -0000 1.1.2.1 --- music_upload.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 79,83 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_upload&cat_id=$cat_id"), true)); } else --- 79,83 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_upload&cat_id=$cat_id"), true)); } else *************** *** 211,215 **** $template->assign_vars(array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], --- 211,215 ---- $template->assign_vars(array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], *************** *** 269,279 **** 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), ) ); --- 269,279 ---- 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()), ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), ) ); *************** *** 671,675 **** @unlink($song_image_path . $song_imagename); ! message_die(GENERAL_ERROR, 'Your uploaded image size is too big'); } } --- 671,675 ---- @unlink($song_image_path . $song_imagename); ! mx_message_die(GENERAL_ERROR, 'Your uploaded image size is too big'); } } *************** *** 711,721 **** { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . '">') ); } //$message .= $sql; ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . "\">", "</a>"); ! $message .= "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 711,721 ---- { $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . '">') ); } //$message .= $sql; ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . "\">", "</a>"); ! $message .= "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . mx_append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: music_delete.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_delete.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_delete.php 16 Jan 2008 19:53:12 -0000 1.1.2.1 --- music_delete.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 90,94 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_delete&song_id=$song_id"), true)); } else --- 90,94 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_delete&song_id=$song_id"), true)); } else *************** *** 123,127 **** if( isset($HTTP_POST_VARS['cancel']) ) { ! mx_redirect(append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id"))); exit; } --- 123,127 ---- if( isset($HTTP_POST_VARS['cancel']) ) { ! mx_redirect(mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id"))); exit; } *************** *** 148,152 **** 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => append_sid(this_mo_mxurl("music_mode=music_delete&song_id=$song_id")), ) ); --- 148,152 ---- 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_delete&song_id=$song_id")), ) ); *************** *** 210,219 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . "\">", "</a>"); ! $message .= "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 210,219 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . '">') ); ! $message .= "<br /><br />" . sprintf($lang['Click_return_category'], "<a href=\"" . mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")) . "\">", "</a>"); ! $message .= "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . mx_append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: music_comment_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_comment_edit.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_comment_edit.php 16 Jan 2008 19:53:12 -0000 1.1.2.1 --- music_comment_edit.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 142,146 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_comment_edit&comment_id=$comment_id"), true)); } else --- 142,146 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_comment_edit&comment_id=$comment_id"), true)); } else *************** *** 180,184 **** else { ! $poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thissong['user_id']) .'">'. $thissong['username'] .'</a>'; } --- 180,184 ---- else { ! $poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thissong['user_id']) .'">'. $thissong['username'] .'</a>'; } *************** *** 200,210 **** $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), ! 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_song&song_id=$song_id")), 'SONG_TITLE' => $thissong['song_title'], 'POSTER' => $poster, ! 'SONG_TIME' => create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_COMMENTS' => $total_comments, --- 200,210 ---- $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=$song_id")), 'SONG_TITLE' => $thissong['song_title'], 'POSTER' => $poster, ! 'SONG_TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $thissong['song_time'], $board_config['board_timezone']), 'SONG_VIEW' => $thissong['song_view_count'], 'SONG_COMMENTS' => $total_comments, *************** *** 227,231 **** 'L_SUBMIT' => $lang['Submit'], ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_comment_edit&comment_id=$comment_id")) ) ); --- 227,231 ---- 'L_SUBMIT' => $lang['Submit'], ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_comment_edit&comment_id=$comment_id")) ) ); *************** *** 282,289 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . '#'.$comment_id.'">') ); ! $message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 282,289 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . '#'.$comment_id.'">') ); ! $message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . mx_append_sid(this_mo_mxurl("music_mode=music_comment&comment_id=$comment_id")) . "#$comment_id\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_music_index'], "<a href=\"" . mx_append_sid(this_mo_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: music_pic_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_pic_cat.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_pic_cat.php 16 Jan 2008 19:53:15 -0000 1.1.2.1 --- music_pic_cat.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 85,89 **** $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], 'CAT_PARENT' => $thiscat_parent['cat_id']) --- 85,89 ---- $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => mx_append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], 'CAT_PARENT' => $thiscat_parent['cat_id']) *************** *** 102,106 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_pic_cat&cat_id=$cat_id"), true)); } else --- 102,106 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_pic_cat&cat_id=$cat_id"), true)); } else *************** *** 142,146 **** if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // --- 142,146 ---- if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // *************** *** 179,183 **** for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. append_sid($phpbb_root_path . "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; --- 179,183 ---- for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. mx_append_sid($phpbb_root_path . "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; *************** *** 394,398 **** $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link .= '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; --- 394,398 ---- $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link .= '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; *************** *** 403,407 **** $template->assign_block_vars('songrow.songcol', array( ! 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, --- 403,407 ---- $template->assign_block_vars('songrow.songcol', array( ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, *************** *** 415,419 **** else { ! $song_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } --- 415,419 ---- else { ! $song_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } *************** *** 482,486 **** { $template->assign_block_vars('songrow.flash', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; --- 482,486 ---- { $template->assign_block_vars('songrow.flash', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; *************** *** 489,493 **** { $template->assign_block_vars('songrow.ram', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; --- 489,493 ---- { $template->assign_block_vars('songrow.ram', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; *************** *** 496,500 **** { $template->assign_block_vars('songrow.rm', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; --- 496,500 ---- { $template->assign_block_vars('songrow.rm', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; *************** *** 503,507 **** { $template->assign_block_vars('songrow.qt', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; --- 503,507 ---- { $template->assign_block_vars('songrow.qt', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; *************** *** 518,522 **** $template->assign_block_vars('songrow.flv', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; $row_type = 'flv'; --- 518,522 ---- $template->assign_block_vars('songrow.flv', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; $row_type = 'flv'; *************** *** 524,528 **** else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; --- 524,528 ---- else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; *************** *** 536,540 **** { $template->assign_block_vars('songrow.media', array()); ! $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; --- 536,540 ---- { $template->assign_block_vars('songrow.media', array()); ! $url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; *************** *** 660,664 **** } ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; --- 660,664 ---- } ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; *************** *** 675,679 **** $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' ); $url_video = $url_download; --- 675,679 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 697,701 **** $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' ); $url_video = $url_download; --- 697,701 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 722,726 **** $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' ); $url_video = $url_download; --- 722,726 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 751,755 **** { $template->assign_block_vars('songrow.media', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 751,755 ---- { $template->assign_block_vars('songrow.media', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 760,765 **** { $template->assign_block_vars('songrow.media', array()); ! //$url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; --- 760,765 ---- { $template->assign_block_vars('songrow.media', array()); ! //$url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; *************** *** 782,790 **** else { ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } $template->assign_block_vars('songrow.song_detail', array( ! 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, --- 782,792 ---- else { ! $url_song = mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } + $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); + $template->assign_block_vars('songrow.song_detail', array( ! 'TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, *************** *** 794,804 **** 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=114", true)), ! 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, ! 'U_IMG' => append_sid("$img_id"), 'SINGER' => $songrow[$j]['song_singer'], --- 796,806 ---- 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=114", true)), ! 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, ! 'U_IMG' => mx_append_sid("$img_id"), 'SINGER' => $songrow[$j]['song_singer'], *************** *** 810,830 **** 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), ! 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', 'S_ROW_TYPE' => $row_type, --- 812,832 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '85' ), ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . $song_user_ip . '" target="_blank">' . $song_user_ip .'</a><br />' : '', 'S_ROW_TYPE' => $row_type, *************** *** 838,842 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_images, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_images / $songs_per_page )) ) --- 840,844 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_images, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_images / $songs_per_page )) ) *************** *** 854,858 **** // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $music_jumpbox = '<form name="jumpbox" action="'. append_sid(this_mo_mxurl("music_mode=music_pic_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) --- 856,860 ---- // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $music_jumpbox = '<form name="jumpbox" action="'. mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) *************** *** 914,921 **** $template->assign_vars(array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT_VIRTUAL' => append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'CAT_TITLE_VIRTUAL' => $lang['Images'], --- 916,923 ---- $template->assign_vars(array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT_VIRTUAL' => mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'CAT_TITLE_VIRTUAL' => $lang['Images'], *************** *** 923,927 **** 'MODERATORS' => $moderators_list, ! 'U_UPLOAD_SONG' => append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], --- 925,929 ---- 'MODERATORS' => $moderators_list, ! 'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], *************** *** 943,947 **** 'MUSIC_JUMPBOX' => $music_jumpbox, ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], --- 945,949 ---- 'MUSIC_JUMPBOX' => $music_jumpbox, ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], *************** *** 975,983 **** 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '114' ), --- 977,985 ---- 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '114' ), Index: music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_cat.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_cat.php 16 Jan 2008 19:53:11 -0000 1.1.2.1 --- music_cat.php 31 Jan 2008 04:16:58 -0000 1.1.2.2 *************** *** 87,92 **** $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']) --- 87,92 ---- $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => mx_append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), ! 'U_NAV_CAT_PARENT' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . mx_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']) *************** *** 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(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_cat&cat_id=$cat_id"), true)); } else *************** *** 145,149 **** if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // --- 145,149 ---- if( ($userdata['user_level'] == ADMIN) or ($auth_data['moderator'] == 1) ) { ! $auth_list .= sprintf($lang['Music_moderate_can'], '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&cat_id=$cat_id")) .'">', '</a>'); } // *************** *** 182,186 **** for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. append_sid($phpbb_root_path . "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; --- 182,186 ---- for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. mx_append_sid($phpbb_root_path . "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; *************** *** 391,395 **** $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link .= '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; --- 391,395 ---- $approval_mode = ($songrow[$j]['song_approval'] == 0) ? 'approval' : 'unapproval'; ! $approval_link .= '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=$approval_mode&song_id=". $songrow[$j]['song_id'])) .'">'; $approval_link .= ($songrow[$j]['song_approval'] == 0) ? '<b>'. $lang['Approve'] .'</b>' : $lang['Unapprove']; *************** *** 400,404 **** $template->assign_block_vars('songrow.songcol', array( ! 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, --- 400,404 ---- $template->assign_block_vars('songrow.songcol', array( ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])), 'DESC' => $songrow[$j]['song_desc'], 'APPROVAL' => $approval_link, *************** *** 412,416 **** else { ! $song_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } --- 412,416 ---- else { ! $song_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$j]['user_id']) .'">'. $songrow[$j]['username'] .'</a>'; } *************** *** 480,484 **** { $template->assign_block_vars('songrow.flash', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; --- 480,484 ---- { $template->assign_block_vars('songrow.flash', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'flash'; *************** *** 487,491 **** { $template->assign_block_vars('songrow.ram', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; --- 487,491 ---- { $template->assign_block_vars('songrow.ram', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'ram'; *************** *** 494,498 **** { $template->assign_block_vars('songrow.rm', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; --- 494,498 ---- { $template->assign_block_vars('songrow.rm', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'rm'; *************** *** 501,505 **** { $template->assign_block_vars('songrow.qt', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; --- 501,505 ---- { $template->assign_block_vars('songrow.qt', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'qt'; *************** *** 516,520 **** $template->assign_block_vars('songrow.flv', array()); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; $row_type = 'flv'; --- 516,520 ---- $template->assign_block_vars('songrow.flv', array()); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $music_root_path . 'music_player.swf'; $row_type = 'flv'; *************** *** 522,526 **** else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; --- 522,526 ---- else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; *************** *** 533,537 **** else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; --- 533,537 ---- else if ( ( $song_filetype == 'jpg' ) || ( $song_filetype == 'gif' ) || ( $song_filetype == 'png' ) ) { ! $url_download = !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id")); $url_video = $url_download; $row_type = 'img'; *************** *** 545,549 **** { $template->assign_block_vars('songrow.media', array()); ! $url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; --- 545,549 ---- { $template->assign_block_vars('songrow.media', array()); ! $url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_stream&song_id=' . $song_id); $lang['Download'] = ( !empty($lang['Listen']) ? $lang['Listen'] : 'Listen URL' ); $url_video = $url_download; *************** *** 666,670 **** } ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; --- 666,670 ---- } ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Share']) ? $lang['Share'] : 'Share URL' ); $img_id = !empty($thissong['song_imagename']) ? $thissong['song_imagename'] : 'http://img.' . $domain . '/vi/' . $videoid['song_url'][1] . '/default.jpg'; *************** *** 681,685 **** $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' ); $url_video = $url_download; --- 681,685 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 703,707 **** $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' ); $url_video = $url_download; --- 703,707 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 728,732 **** $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' ); $url_video = $url_download; --- 728,732 ---- $template->assign_block_vars('songrow.flashvideo', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 757,761 **** { $template->assign_block_vars('songrow.media', array()); ! $url_download = append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; --- 757,761 ---- { $template->assign_block_vars('songrow.media', array()); ! $url_download = mx_append_sid($thissong['song_url']); $lang['Download'] = ( !empty($lang['Direct_url']) ? $lang['Direct_url'] : 'Direct URL' ); $url_video = $url_download; *************** *** 766,771 **** { $template->assign_block_vars('songrow.media', array()); ! //$url_download = append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); ! $url_download = append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; --- 766,771 ---- { $template->assign_block_vars('songrow.media', array()); ! //$url_download = mx_append_sid($module_root_path . 'galerie_media.' . $phpEx . '?music_mode=music_download&song_id=' . $song_id); ! $url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=" . $song_id)); $url_video = $url_download; $row_type = 'media'; *************** *** 788,796 **** else { ! $url_song = append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } $template->assign_block_vars('songrow.song_detail', array( ! 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, --- 788,798 ---- else { ! $url_song = mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'], true)); } + $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($songrow[$j]['song_user_ip']) : phpBB2::decode_ip($songrow[$j]['song_user_ip']); + $template->assign_block_vars('songrow.song_detail', array( ! 'TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['song_title'] . '</a>', 'U_SONG' => $url_song, *************** *** 800,810 **** 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=425", true)), ! 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, ! 'U_IMG' => append_sid("$img_id"), 'SINGER' => $songrow[$j]['song_singer'], --- 802,812 ---- 'SONG_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : $url_song, ! 'SONG_THUMB_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=425", true)), ! 'SONG_FULL_URL' => !empty($thissong['song_url']) ? $thissong['song_url'] : mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=" . $songrow[$j]['song_id'] . "&item_size=800", true)), 'VIDEO_URL' => !empty($url_player) ? $url_player : $url_video, ! 'U_IMG' => mx_append_sid("$img_id"), 'SINGER' => $songrow[$j]['song_singer'], *************** *** 816,836 **** 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! 'TIME' => create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip($songrow[$j]['song_user_ip']) . '" target="_blank">' . decode_ip($songrow[$j]['song_user_ip']) .'</a><br />' : '', 'S_ROW_TYPE' => $row_type, --- 818,838 ---- 'HEIGHT' => ( !empty($media_height) ? $media_height : '350' ), ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $songrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $songrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $songrow[$j]['song_id']) . '">' . $songrow[$j]['rating'] . '</a>')) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_comment&song_id=". $songrow[$j]['song_id'])) . '">' . $songrow[$j]['comments'] . '</a>' ) : '', ! 'EDIT' => ( ( $auth_data['edit'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_edit&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Edit_song'] . '</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($songrow[$j]['song_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != MUSIC_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_delete&song_id=". $songrow[$j]['song_id'])) . '">' . $lang['Delete_song'] . '</a>' : '', ! 'MOVE' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=move&song_id=". $songrow[$j]['song_id'])) .'">'. $lang['Move'] .'</a>' : '', ! 'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_modcp&mode=". (($songrow[$j]['song_lock'] == 0) ? 'lock' : 'unlock') ."&song_id=". $songrow[$j]['song_id'])) .'">'. (($songrow[$j]['song_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '', ! 'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . $song_user_ip . '" target="_blank">' . $song_user_ip .'</a><br />' : '', 'S_ROW_TYPE' => $row_type, *************** *** 842,846 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_songs, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_songs / $songs_per_page )) ) --- 844,848 ---- $template->assign_vars(array( ! 'PAGINATION' => mx_generate_pagination(mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id&sort_method=$sort_method&sort_order=$sort_order")), $total_songs, $songs_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $songs_per_page ) + 1 ), ceil( $total_songs / $songs_per_page )) ) *************** *** 858,862 **** // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $music_jumpbox = '<form name="jumpbox" action="'. append_sid(this_mo_mxurl("music_mode=music_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) --- 860,864 ---- // Build Jumpbox - based on $catrows which was created at the top of this file // ------------------------------------ ! $music_jumpbox = '<form name="jumpbox" action="'. mx_append_sid(this_mo_mxurl("music_mode=music_cat")) .'" method="get">'; $music_jumpbox .= $lang['Jump_to'] . ': <select name="cat_id" onChange="forms[\'jumpbox\'].submit()">'; for ($i = 0; $i < count($catrows); $i++) *************** *** 920,924 **** $template->assign_vars(array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], --- 922,926 ---- $template->assign_vars(array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'CAT_TITLE' => $thiscat['cat_title'], *************** *** 926,930 **** 'MODERATORS' => $moderators_list, ! 'U_UPLOAD_SONG' => append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], --- 928,932 ---- 'MODERATORS' => $moderators_list, ! 'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")), 'UPLOAD_SONG_IMG' => $mx_images['upload_song'], 'L_UPLOAD_SONG' => $lang['Upload_Song'], *************** *** 945,949 **** 'MUSIC_JUMPBOX' => $music_jumpbox, ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], --- 947,951 ---- 'MUSIC_JUMPBOX' => $music_jumpbox, ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=$cat_id")), 'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'], *************** *** 977,985 **** 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), --- 979,987 ---- 'MUSIC_VERSION' => '2' . $music_config['music_version'], 'L_INDEX' => '<<', ! 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), ! 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()), 'WIDTH' => ( !empty($media_width) ? $media_width : '425' ), *************** *** 996,1000 **** 'L_RSS' => ( !empty($lang['Rss_Feed']) ? $lang['Rss_Feed'] : 'RSS Feed' ), ! 'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss&cat_id=" . $cat_id . "&sid=" . $userdata['session_id'], true)), 'S_AUTH_LIST' => $auth_list) --- 998,1002 ---- 'L_RSS' => ( !empty($lang['Rss_Feed']) ? $lang['Rss_Feed'] : 'RSS Feed' ), ! 'U_RSS' => mx_append_sid(this_mo_mxurl("music_mode=music_rss&cat_id=" . $cat_id . "&sid=" . $userdata['session_id'], true)), 'S_AUTH_LIST' => $auth_list) Index: music_modcp.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_modcp.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_modcp.php 16 Jan 2008 19:53:14 -0000 1.1.2.1 --- music_modcp.php 31 Jan 2008 04:16:59 -0000 1.1.2.2 *************** *** 156,160 **** if (!$userdata['session_logged_in']) { ! mx_redirect(append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_modcp&cat_id=$cat_id"), true)); } else --- 156,160 ---- if (!$userdata['session_logged_in']) { ! mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_mo_loginurl("music_mode=music_modcp&cat_id=$cat_id"), true)); } else *************** *** 334,345 **** else { ! $song_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$i]['user_id']) .'">'. $songrow[$i]['username'] .'</a>'; } $template->assign_block_vars('songrow', array( 'SONG_ID' => $songrow[$i]['song_id'], ! 'SONG_TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_song&song_id=". $songrow[$i]['song_id'])) .'" target="_blank">'. $songrow[$i]['song_title'] .'</a>', 'POSTER' => $song_poster, ! 'TIME' => create_date($board_config['default_dateformat'], $songrow[$i]['song_time'], $board_config['board_timezone']), 'RATING' => ($songrow[$i]['rating'] == 0) ? $lang['Not_rated'] : round($songrow[$i]['rating'], 2), 'COMMENTS' => $songrow[$i]['comments'], --- 334,345 ---- else { ! $song_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $songrow[$i]['user_id']) .'">'. $songrow[$i]['username'] .'</a>'; } $template->assign_block_vars('songrow', array( 'SONG_ID' => $songrow[$i]['song_id'], ! 'SONG_TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_song&song_id=". $songrow[$i]['song_id'])) .'" target="_blank">'. $songrow[$i]['song_title'] .'</a>', 'POSTER' => $song_poster, ... [truncated message content] |
|
From: OryNider <ory...@us...> - 2008-01-31 04:17:02
|
Update of /cvsroot/mxbb/mx_music/music_box/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5442/includes Modified Files: Tag: core28x music_constants.php music_functions.php music_integration.php Log Message: ready for 2.8.1 release. Index: music_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_functions.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_functions.php 16 Jan 2008 19:53:10 -0000 1.1.2.1 --- music_functions.php 31 Jan 2008 04:16:58 -0000 1.1.2.2 *************** *** 66,70 **** if ($cat_id < 0) { ! message_die(GENERAL_ERROR, 'Bad cat_id arguments for function music_user_access()'); } // --- 66,70 ---- if ($cat_id < 0) { ! mx_message_die(GENERAL_ERROR, 'Bad cat_id arguments for function music_user_access()'); } // *************** *** 207,211 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not query music Category information' ,'' , __LINE__, __FILE__, $sql); } --- 207,211 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Category information' ,'' , __LINE__, __FILE__, $sql); } *************** *** 300,304 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not query User-Group information' ,'' , __LINE__, __FILE__, $sql); } --- 300,304 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query User-Group information' ,'' , __LINE__, __FILE__, $sql); } Index: music_integration.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/includes/music_integration.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** music_integration.php 16 Jan 2008 19:53:11 -0000 1.1.2.1 --- music_integration.php 31 Jan 2008 04:16:58 -0000 1.1.2.2 *************** *** 22,26 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't query radio config table", "", __LINE__, __FILE__, $sql); } else --- 22,26 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't query radio config table", "", __LINE__, __FILE__, $sql); } else |
|
From: OryNider <ory...@us...> - 2008-01-31 04:16:41
|
Update of /cvsroot/mxbb/mx_music/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5417/lang_romanian Modified Files: Tag: core28x lang_admin_music.php Log Message: ready for 2.8.1 release. |
|
From: OryNider <ory...@us...> - 2008-01-31 04:16:41
|
Update of /cvsroot/mxbb/mx_music/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5417/lang_english Modified Files: Tag: core28x lang_admin_music.php lang_main_music.php Log Message: ready for 2.8.1 release. |
|
From: OryNider <ory...@us...> - 2008-01-31 04:16:30
|
Update of /cvsroot/mxbb/mx_music In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5371 Modified Files: Tag: core28x db_install.php db_upgrade.php music.php music_lists.php mx_install_readme.htm Log Message: ready for 2.8.1 release. Index: music.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music.php,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** music.php 16 Jan 2008 19:49:26 -0000 1.8.2.3 --- music.php 31 Jan 2008 04:16:25 -0000 1.8.2.4 *************** *** 13,17 **** // //error_reporting( E_ALL ); ! ini_set( 'display_errors', '1' ); if ( file_exists( './viewtopic.php' ) ) // -------------------------------------------- phpBB MOD MODE --- 13,17 ---- // //error_reporting( E_ALL ); ! @ini_set( 'display_errors', '1' ); if ( file_exists( './viewtopic.php' ) ) // -------------------------------------------- phpBB MOD MODE *************** *** 82,86 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Could not query Music Center module information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 82,86 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Could not query Music Center module information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 237,244 **** $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), ! 'SUBCAT_NAV' => ' ' . $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'], ! 'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss&c=" . $thiscat_parent['cat_id'] . "&sid=" . $userdata['session_id'], true)), 'CAT_PARENT' => $thiscat_parent['cat_id']) ); --- 237,244 ---- $template->assign_vars(array( ! 'U_VIEW_CAT_PARENT' => mx_append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])), ! 'SUBCAT_NAV' => ' ' . $lang['Nav_Separator'] . ' <a class="nav" href="' . mx_append_sid(this_mo_mxurl("c=" . $thiscat_parent['cat_id'])) . '">' . $thiscat_parent['cat_title'] . '</a>', 'CAT_PARENT_TITLE' => $thiscat_parent['cat_title'], ! 'U_RSS' => mx_append_sid(this_mo_mxurl("music_mode=music_rss&c=" . $thiscat_parent['cat_id'] . "&sid=" . $userdata['session_id'], true)), 'CAT_PARENT' => $thiscat_parent['cat_id']) ); *************** *** 248,252 **** { $template->assign_vars(array( ! 'U_RSS' => append_sid(this_mo_mxurl("music_mode=music_rss" . "&sid=" . $userdata['session_id'], true)) )); --- 248,252 ---- { $template->assign_vars(array( ! 'U_RSS' => mx_append_sid(this_mo_mxurl("music_mode=music_rss" . "&sid=" . $userdata['session_id'], true)) )); *************** *** 324,328 **** for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. append_sid($phpbb_root_path. "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; --- 324,328 ---- for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. mx_append_sid($phpbb_root_path. "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; *************** *** 380,386 **** // Write the Date // ---------------------------- ! ! $last_song_info = create_date($board_config['default_dateformat'], $lastrow['song_time'], $board_config['board_timezone']); ! $last_song_info .= '<br />'; --- 380,384 ---- // Write the Date // ---------------------------- ! $last_song_info = (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $lastrow['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $lastrow['song_time'], $board_config['board_timezone']); $last_song_info .= '<br />'; *************** *** 396,400 **** else { ! $last_song_info .= $lang['Poster'] .': <a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $lastrow['user_id']) .'">'. $lastrow['username'] .'</a>'; } --- 394,398 ---- else { ! $last_song_info .= $lang['Poster'] .': <a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $lastrow['user_id']) .'">'. $lastrow['username'] .'</a>'; } *************** *** 419,423 **** $last_song_info .= '<br />'. $lang['Song_Title'] .': <a href="'; ! $last_song_info .= append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $lastrow['song_id'])) .'">' ; $last_song_info .= $lastrow['song_title'] .'</a>'; --- 417,421 ---- $last_song_info .= '<br />'. $lang['Song_Title'] .': <a href="'; ! $last_song_info .= mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $lastrow['song_id'])) .'">' ; $last_song_info .= $lastrow['song_title'] .'</a>'; *************** *** 426,432 **** $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])), ! 'U_VIEW_PIC_CAT' => append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=". $catrows[$i]['cat_id'])), ! 'U_VIEW_MEDIA_CAT' => append_sid(this_mo_mxurl("music_mode=music_media_cat&cat_id=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], --- 424,430 ---- $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])), ! 'U_VIEW_PIC_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_pic_cat&cat_id=". $catrows[$i]['cat_id'])), ! 'U_VIEW_MEDIA_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_media_cat&cat_id=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], *************** *** 514,518 **** if ( !($sc_result = $db->sql_query($sc_sql)) ) { ! message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql); } --- 512,516 ---- if ( !($sc_result = $db->sql_query($sc_sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not query sub categories', '', __LINE__, __FILE__, $sql); } *************** *** 533,542 **** while ( $subcatrow = $db->sql_fetchrow($sc_result) ) { ! $subcats .= ' - <a class="gensmall" href="' . append_sid(this_mo_mxurl('music_mode=music_cat&cat_id='. $subcatrow['cat_id'])) . '">' . $subcatrow['cat_title'] . '</a><br />'; } $subcats .= '</span><br />'; $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], --- 531,540 ---- while ( $subcatrow = $db->sql_fetchrow($sc_result) ) { ! $subcats .= ' - <a class="gensmall" href="' . mx_append_sid(this_mo_mxurl('music_mode=music_cat&cat_id='. $subcatrow['cat_id'])) . '">' . $subcatrow['cat_title'] . '</a><br />'; } $subcats .= '</span><br />'; $template->assign_block_vars('catrow', array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_index&c=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], *************** *** 723,727 **** $template->assign_block_vars('top_songs.top_row', array( ! 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])), 'DESC' => $topsongrow[$j]['song_desc'] ) --- 721,725 ---- $template->assign_block_vars('top_songs.top_row', array( ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])), 'DESC' => $topsongrow[$j]['song_desc'] ) *************** *** 734,753 **** else { ! $top_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } $template->assign_block_vars('top_songs.top_detail', array( ! 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['song_title'] . '</a>', 'SINGER' => $topsongrow[$j]['song_singer'], 'POSTER' => $top_poster, ! 'TIME' => create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! '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 />' : '' ) ); --- 732,757 ---- else { ! $top_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } + $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($topsongrow[$j]['song_user_ip']) : phpBB2::decode_ip($topsongrow[$j]['song_user_ip']); + + $template->assign_block_vars('top_songs.top_detail', array( ! 'TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['song_title'] . '</a>', ! 'SINGER' => $topsongrow[$j]['song_singer'], + 'POSTER' => $top_poster, ! ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. mx_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=' . $song_user_ip . '" target="_blank">' . $song_user_ip .'</a><br />' : '' ) ); *************** *** 836,840 **** $template->assign_block_vars('top_songs.top_row', array( ! 'U_SONG' => append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])), 'DESC' => $topsongrow[$j]['song_desc'] ) --- 840,844 ---- $template->assign_block_vars('top_songs.top_row', array( ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])), 'DESC' => $topsongrow[$j]['song_desc'] ) *************** *** 847,866 **** else { ! $top_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } $template->assign_block_vars('top_songs.top_detail', array( ! 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['song_title'] . '</a>', 'SINGER' => $topsongrow[$j]['song_singer'], 'POSTER' => $top_poster, ! 'TIME' => create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! '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 />' : '' ) ); --- 851,875 ---- else { ! $top_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } + $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($topsongrow[$j]['song_user_ip']) : phpBB2::decode_ip($topsongrow[$j]['song_user_ip']); + $template->assign_block_vars('top_songs.top_detail', array( ! 'TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['song_title'] . '</a>', ! 'SINGER' => $topsongrow[$j]['song_singer'], + 'POSTER' => $top_poster, ! ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. mx_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=' . $song_user_ip . '" target="_blank">' . $song_user_ip .'</a><br />' : '' ) ); *************** *** 947,951 **** 'L_LAST_SONG' => $lang['Last_Song'], ! 'S_MUSIC_ACTION' => append_sid(this_mo_mxurl()), 'S_ROWS' => $music_config['rows_per_page'], --- 956,960 ---- 'L_LAST_SONG' => $lang['Last_Song'], ! 'S_MUSIC_ACTION' => mx_append_sid(this_mo_mxurl()), 'S_ROWS' => $music_config['rows_per_page'], *************** *** 963,967 **** 'L_PUBLIC_CATS' => $lang['Public_Categories'], 'L_SEARCH_SONGS' => $lang['Search_song'], ! 'S_MUSIC_LIST' => append_sid(this_mo_mxurl("music_mode=music_list")), 'L_TIME' => $lang['Time'], --- 972,976 ---- 'L_PUBLIC_CATS' => $lang['Public_Categories'], 'L_SEARCH_SONGS' => $lang['Search_song'], ! 'S_MUSIC_LIST' => mx_append_sid(this_mo_mxurl("music_mode=music_list")), 'L_TIME' => $lang['Time'], Index: music_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_lists.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** music_lists.php 1 Aug 2007 23:33:27 -0000 1.1 --- music_lists.php 31 Jan 2008 04:16:25 -0000 1.1.2.1 *************** *** 140,144 **** for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. append_sid($phpbb_root_path. "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; --- 140,144 ---- for ($j = 0; $j < count($grouprows); $j++) { ! $group_link = '<a href="'. mx_append_sid($phpbb_root_path. "groupcp.$phpEx?". POST_GROUPS_URL .'='. $grouprows[$j]['group_id']) .'">'. $grouprows[$j]['group_name'] .'</a>'; $moderators_list .= ($moderators_list == '') ? $group_link : ', ' . $group_link; *************** *** 195,201 **** // Write the Date // ---------------------------- ! ! $last_song_info = create_date($board_config['default_dateformat'], $lastrow['song_time'], $board_config['board_timezone']); ! $last_song_info .= '<br />'; --- 195,199 ---- // Write the Date // ---------------------------- ! $last_song_info = (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $lastrow['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $lastrow['song_time'], $board_config['board_timezone']); $last_song_info .= '<br />'; *************** *** 211,215 **** else { ! $last_song_info .= $lang['Poster'] .': <a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $lastrow['user_id']) .'">'. $lastrow['username'] .'</a>'; } --- 209,213 ---- else { ! $last_song_info .= $lang['Poster'] .': <a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $lastrow['user_id']) .'">'. $lastrow['username'] .'</a>'; } *************** *** 234,238 **** $last_song_info .= '<br />'. $lang['Song_Title'] .': <a href="'; ! $last_song_info .= append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $lastrow['song_id'])) .'">' ; $last_song_info .= $lastrow['song_title'] .'</a>'; --- 232,236 ---- $last_song_info .= '<br />'. $lang['Song_Title'] .': <a href="'; ! $last_song_info .= mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $lastrow['song_id'])) .'">' ; $last_song_info .= $lastrow['song_title'] .'</a>'; *************** *** 246,250 **** $template->assign_block_vars('catrow_lists', array( ! 'U_VIEW_CAT' => append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], --- 244,248 ---- $template->assign_block_vars('catrow_lists', array( ! 'U_VIEW_CAT' => mx_append_sid(this_mo_mxurl("music_mode=music_cat&cat_id=". $catrows[$i]['cat_id'])), 'CAT_TITLE' => $catrows[$i]['cat_title'], 'CAT_DESC' => $catrows[$i]['cat_desc'], *************** *** 418,428 **** else { ! $top_poster = '<a href="'. append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } $template->assign_block_vars('music_recent_lists', array( 'BULLET' => $bullet_full, ! 'TITLE' => '<a href="'. append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['song_title'] . '</a>', 'SINGER' => $topsongrow[$j]['song_singer'], --- 416,428 ---- else { ! $top_poster = '<a href="'. mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $topsongrow[$j]['user_id']) .'">'. $topsongrow[$j]['username'] .'</a>'; } + $song_user_ip = (@function_exists( 'decode_ip' )) ? decode_ip($topsongrow[$j]['song_user_ip']) : phpBB2::decode_ip($topsongrow[$j]['song_user_ip']); + $template->assign_block_vars('music_recent_lists', array( 'BULLET' => $bullet_full, ! 'TITLE' => '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['song_title'] . '</a>', 'SINGER' => $topsongrow[$j]['song_singer'], *************** *** 446,465 **** 'L_COMMENTS' => $lang['Comments'], ! 'TIME' => create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! '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'])), 'DESC' => $topsongrow[$j]['song_desc'], 'S_ROW_COUNT' => $j) ! ); } } --- 446,465 ---- 'L_COMMENTS' => $lang['Comments'], ! 'TIME' => (@function_exists( 'create_date' )) ? create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']) : phpBB2::create_date($board_config['default_dateformat'], $topsongrow[$j]['song_time'], $board_config['board_timezone']), 'VIEW' => $topsongrow[$j]['song_view_count'], ! 'RATING' => ($music_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_mo_mxurl("music_mode=music_rate&song_id=". $topsongrow[$j]['song_id'])) . '">' . $topsongrow[$j]['rating'] . '</a>' ) : '', ! 'COMMENTS' => ($music_config['comment'] == 1) ? ( '<a href="'. mx_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=' . $song_user_ip . '" target="_blank">' . $song_user_ip .'</a><br />' : '', ! 'U_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_page&song_id=". $topsongrow[$j]['song_id'])), 'DESC' => $topsongrow[$j]['song_desc'], 'S_ROW_COUNT' => $j) ! ); } } |
|
From: OryNider <ory...@us...> - 2008-01-31 04:16:30
|
Update of /cvsroot/mxbb/mx_music/music_box In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5371/music_box Modified Files: Tag: core28x music_common.php Log Message: ready for 2.8.1 release. Index: music_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_box/music_common.php,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** music_common.php 16 Jan 2008 19:49:26 -0000 1.5.2.1 --- music_common.php 31 Jan 2008 04:16:25 -0000 1.5.2.2 *************** *** 69,73 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(CRITICAL_ERROR, 'Could not query database for theme info'); } --- 69,73 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info'); } *************** *** 89,93 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(CRITICAL_ERROR, 'Could not query database for theme info'); } --- 89,93 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info'); } *************** *** 99,108 **** else { ! message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]"); } } else { ! message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]"); } } --- 99,108 ---- else { ! mx_message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]"); } } else { ! mx_message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]"); } } *************** *** 173,177 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) --- 173,177 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) *************** *** 236,245 **** 'MUSIC_COPYRIGHT' => $music_module_copyright, 'L_INDEX' => '<<', ! 'U_INDEX' => append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => append_sid(this_mo_mxurl()), 'L_SEARCH' => $lang['Search'], ! 'U_MX_MUSIC' => append_sid(this_mo_portalurl()) ) ); --- 236,245 ---- 'MUSIC_COPYRIGHT' => $music_module_copyright, 'L_INDEX' => '<<', ! 'U_INDEX' => mx_append_sid($mx_root_path . "index.".$phpEx), 'L_MUSIC_INDEX' => $lang['Music'], 'L_MUSIC' => $lang['Music'], ! 'U_MUSIC' => mx_append_sid(this_mo_mxurl()), 'L_SEARCH' => $lang['Search'], ! 'U_MX_MUSIC' => mx_append_sid(this_mo_portalurl()) ) ); |
|
From: OryNider <ory...@us...> - 2008-01-31 04:16:30
|
Update of /cvsroot/mxbb/mx_music/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5371/admin Modified Files: Tag: core28x admin_music_auth.php admin_music_cat.php admin_music_cfg.php admin_music_ext.php Log Message: ready for 2.8.1 release. Index: admin_music_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_ext.php,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** admin_music_ext.php 21 Sep 2007 22:25:18 -0000 1.2.2.3 --- admin_music_ext.php 31 Jan 2008 04:16:24 -0000 1.2.2.4 *************** *** 85,89 **** if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['music_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_music_config'], "<a href=\"" . append_sid( "admin_music_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 85,89 ---- if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['music_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_music_config'], "<a href=\"" . mx_append_sid( "admin_music_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 114,118 **** $template->assign_vars( array( ! 'S_MUSIC_ACTION' => append_sid( "admin_music_ext.$phpEx" ), 'L_MUSIC_TITLE' => $lang['mx_music_admin'], --- 114,118 ---- $template->assign_vars( array( ! 'S_MUSIC_ACTION' => mx_append_sid( "admin_music_ext.$phpEx" ), 'L_MUSIC_TITLE' => $lang['mx_music_admin'], Index: admin_music_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cat.php,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -d -r1.3.2.3 -r1.3.2.4 *** admin_music_cat.php 21 Sep 2007 22:25:17 -0000 1.3.2.3 --- admin_music_cat.php 31 Jan 2008 04:16:24 -0000 1.3.2.4 *************** *** 66,70 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get list of Categories', '', __LINE__, __FILE__, $sql); } --- 66,70 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get list of Categories', '', __LINE__, __FILE__, $sql); } *************** *** 78,82 **** if( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update order fields', '', __LINE__, __FILE__, $sql); } $i += 10; --- 78,82 ---- if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update order fields', '', __LINE__, __FILE__, $sql); } $i += 10; *************** *** 98,102 **** 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_cat.$phpEx"), 'L_MOVE_UP' => $lang['Move_up'], 'L_MOVE_DOWN' => $lang['Move_down'], --- 98,102 ---- 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_cat.$phpEx"), 'L_MOVE_UP' => $lang['Move_up'], 'L_MOVE_DOWN' => $lang['Move_down'], *************** *** 114,118 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) --- 114,118 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) *************** *** 127,131 **** $colspan = 1; $add_sc = "<td class=\"" . (($i % 2) ? 'row1' : 'row2') . "\" align=\"center\">" . ! "<form action=\"" . append_sid("admin_music_cat.$phpEx") . "\" method=\"post\"><input type=\"hidden\" value=\"new\" name=\"mode\" /><input type=\"hidden\" value=\"" . $catrow[$i]['cat_id'] . "\" name=\"cat_parent\"><input name=\"submit\" type=\"submit\" value=\"" . $lang['Create_sub_music'] . "\" class=\"liteoption\">" . "</form></td>"; } --- 127,131 ---- $colspan = 1; $add_sc = "<td class=\"" . (($i % 2) ? 'row1' : 'row2') . "\" align=\"center\">" . ! "<form action=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\" method=\"post\"><input type=\"hidden\" value=\"new\" name=\"mode\" /><input type=\"hidden\" value=\"" . $catrow[$i]['cat_id'] . "\" name=\"cat_parent\"><input name=\"submit\" type=\"submit\" value=\"" . $lang['Create_sub_music'] . "\" class=\"liteoption\">" . "</form></td>"; } *************** *** 142,149 **** 'COLSPAN' => $colspan, 'ADD_SC' => $add_sc, ! 'S_MOVE_UP' => append_sid("admin_music_cat.$phpEx?action=move&move=-15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_MOVE_DOWN' => append_sid("admin_music_cat.$phpEx?action=move&move=15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_EDIT_ACTION' => append_sid("admin_music_cat.$phpEx?action=edit&cat_id=" . $catrow[$i]['cat_id']), ! 'S_DELETE_ACTION' => append_sid("admin_music_cat.$phpEx?action=delete&cat_id=" . $catrow[$i]['cat_id']) ) ); --- 142,149 ---- 'COLSPAN' => $colspan, 'ADD_SC' => $add_sc, ! 'S_MOVE_UP' => mx_append_sid("admin_music_cat.$phpEx?action=move&move=-15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_MOVE_DOWN' => mx_append_sid("admin_music_cat.$phpEx?action=move&move=15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_EDIT_ACTION' => mx_append_sid("admin_music_cat.$phpEx?action=edit&cat_id=" . $catrow[$i]['cat_id']), ! 'S_DELETE_ACTION' => mx_append_sid("admin_music_cat.$phpEx?action=delete&cat_id=" . $catrow[$i]['cat_id']) ) ); *************** *** 171,178 **** 'TITLE' => " " . $subcatrow['cat_title'], 'DESC' => " " . preg_replace("#\n#", "<br> ", $subcatrow['cat_desc']), ! 'S_MOVE_UP' => append_sid("admin_music_cat.$phpEx?action=move&move=-15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_MOVE_UP' => append_sid("admin_music_cat.$phpEx?action=move&move=15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_EDIT_ACTION' => append_sid("admin_music_cat.$phpEx?action=edit&cat_id=" . $subcatrow['cat_id']), ! 'S_DELETE_ACTION' => append_sid("admin_music_cat.$phpEx?action=delete&cat_id=" . $subcatrow['cat_id']) ) ); --- 171,178 ---- 'TITLE' => " " . $subcatrow['cat_title'], 'DESC' => " " . preg_replace("#\n#", "<br> ", $subcatrow['cat_desc']), ! 'S_MOVE_UP' => mx_append_sid("admin_music_cat.$phpEx?action=move&move=-15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_MOVE_UP' => mx_append_sid("admin_music_cat.$phpEx?action=move&move=15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_EDIT_ACTION' => mx_append_sid("admin_music_cat.$phpEx?action=edit&cat_id=" . $subcatrow['cat_id']), ! 'S_DELETE_ACTION' => mx_append_sid("admin_music_cat.$phpEx?action=delete&cat_id=" . $subcatrow['cat_id']) ) ); *************** *** 196,204 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } if( $db->sql_numrows($result) == 0 ) { ! message_die(GENERAL_ERROR, 'The requested category is not existed'); } $catrow = $db->sql_fetchrow($result); --- 196,204 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } if( $db->sql_numrows($result) == 0 ) { ! mx_message_die(GENERAL_ERROR, 'The requested category is not existed'); } $catrow = $db->sql_fetchrow($result); *************** *** 211,215 **** 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], --- 211,215 ---- 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], *************** *** 295,299 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } --- 295,299 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } *************** *** 313,317 **** if( $cat_found == FALSE ) { ! message_die(GENERAL_ERROR, 'The requested category is not existed'); } --- 313,317 ---- if( $cat_found == FALSE ) { ! mx_message_die(GENERAL_ERROR, 'The requested category is not existed'); } *************** *** 328,332 **** $template->assign_vars(array( ! 'S_MUSIC_ACTION' => append_sid("admin_music_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], --- 328,332 ---- $template->assign_vars(array( ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], *************** *** 352,356 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not change category order', '', __LINE__, __FILE__, $sql); } --- 352,356 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not change category order', '', __LINE__, __FILE__, $sql); } *************** *** 358,364 **** // Return a message... ! $message = $lang['Category_changed_order'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } } --- 358,364 ---- // Return a message... ! $message = $lang['Category_changed_order'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 391,395 **** 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], --- 391,395 ---- 'L_MUSIC_CAT_TITLE' => $lang['Music_Categories_Title'], 'L_MUSIC_CAT_EXPLAIN' => $lang['Music_Categories_Explain'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], *************** *** 473,477 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 473,477 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music Categories information', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 484,494 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not create new music Category', '', __LINE__, __FILE__, $sql); } // Return a message... ! $message = $lang['New_category_created'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } } --- 484,494 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not create new music Category', '', __LINE__, __FILE__, $sql); } // Return a message... ! $message = $lang['New_category_created'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } } *************** *** 513,523 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not update this music Category', '', __LINE__, __FILE__, $sql); } // Return a message... ! $message = $lang['Category_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } else if( $HTTP_POST_VARS['mode'] == 'delete' ) --- 513,523 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not update this music Category', '', __LINE__, __FILE__, $sql); } // Return a message... ! $message = $lang['Category_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } else if( $HTTP_POST_VARS['mode'] == 'delete' ) *************** *** 534,538 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not query music information', '', __LINE__, __FILE__, $sql); } $songrow = array(); --- 534,538 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not query music information', '', __LINE__, __FILE__, $sql); } $songrow = array(); *************** *** 558,562 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete Ratings information', '', __LINE__, __FILE__, $sql); } --- 558,562 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete Ratings information', '', __LINE__, __FILE__, $sql); } *************** *** 566,570 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete Comments information', '', __LINE__, __FILE__, $sql); } --- 566,570 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete Comments information', '', __LINE__, __FILE__, $sql); } *************** *** 574,578 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete song entries in the DB', '', __LINE__, __FILE__, $sql); } } --- 574,578 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete song entries in the DB', '', __LINE__, __FILE__, $sql); } } *************** *** 583,587 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql); } --- 583,587 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql); } *************** *** 590,596 **** // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } else // Move content... --- 590,596 ---- // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } else // Move content... *************** *** 601,605 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not update this Category content', '', __LINE__, __FILE__, $sql); } --- 601,605 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not update this Category content', '', __LINE__, __FILE__, $sql); } *************** *** 609,613 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql); } --- 609,613 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Could not delete this Category', '', __LINE__, __FILE__, $sql); } *************** *** 616,622 **** // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); } } --- 616,622 ---- // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_music_category'], "<a href=\"" . mx_append_sid("admin_music_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); } } Index: admin_music_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_auth.php,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** admin_music_auth.php 21 Sep 2007 22:25:16 -0000 1.2.2.3 --- admin_music_auth.php 31 Jan 2008 04:16:24 -0000 1.2.2.4 *************** *** 61,65 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get Category list', '', __LINE__, __FILE__, $sql); } --- 61,65 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get Category list', '', __LINE__, __FILE__, $sql); } *************** *** 85,89 **** 'L_MUSIC_AUTH_EXPLAIN' => $lang['Music_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_auth.$phpEx"), 'L_LOOK_UP_CAT' => $lang['Look_up_Category']) ); --- 85,89 ---- 'L_MUSIC_AUTH_EXPLAIN' => $lang['Music_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_auth.$phpEx"), 'L_LOOK_UP_CAT' => $lang['Look_up_Category']) ); *************** *** 119,123 **** 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_MUSIC_ACTION' => append_sid("admin_music_auth.$phpEx?cat_id=$cat_id"), ) ); --- 119,123 ---- 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_MUSIC_ACTION' => mx_append_sid("admin_music_auth.$phpEx?cat_id=$cat_id"), ) ); *************** *** 130,134 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql); } --- 130,134 ---- if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql); } *************** *** 144,148 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not get Category information', '', __LINE__, __FILE__, $sql); } --- 144,148 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not get Category information', '', __LINE__, __FILE__, $sql); } *************** *** 202,212 **** if ( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update music config table', '', __LINE__, __FILE__, $sql); } // okay, return a message... ! $message = $lang['Music_Auth_successfully'] . '<br /><br />' . sprintf($lang['Click_return_music_auth'], '<a href="' . append_sid("admin_music_auth.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); ! message_die(GENERAL_MESSAGE, $message); } } --- 202,212 ---- if ( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update music config table', '', __LINE__, __FILE__, $sql); } // okay, return a message... ! $message = $lang['Music_Auth_successfully'] . '<br /><br />' . sprintf($lang['Click_return_music_auth'], '<a href="' . mx_append_sid("admin_music_auth.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } } Index: admin_music_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/admin/admin_music_cfg.php,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -C2 -d -r1.4.2.5 -r1.4.2.6 *** admin_music_cfg.php 16 Jan 2008 19:49:25 -0000 1.4.2.5 --- admin_music_cfg.php 31 Jan 2008 04:16:24 -0000 1.4.2.6 *************** *** 59,63 **** if(!$result = $db->sql_query($sql)) { ! message_die(CRITICAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql); } else --- 59,63 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, "Could not query music config information", "", __LINE__, __FILE__, $sql); } else *************** *** 78,82 **** if( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Failed to update music configuration for $config_name", "", __LINE__, __FILE__, $sql); } } --- 78,82 ---- if( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Failed to update music configuration for $config_name", "", __LINE__, __FILE__, $sql); } } *************** *** 85,89 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Music_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_config'], "<a href=\"" . append_sid("admin_music_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 85,89 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Music_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_music_config'], "<a href=\"" . mx_append_sid("admin_music_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 98,102 **** 'L_MUSIC_CONFIG' => $lang['Music_config'], 'L_MUSIC_CONFIG_EXPLAIN' => $lang['Music_config_explain'], ! 'S_MUSIC_CONFIG_ACTION' => append_sid('admin_music_cfg.'.$phpEx), 'MAX_SONGS' => $new['max_songs'], --- 98,102 ---- 'L_MUSIC_CONFIG' => $lang['Music_config'], 'L_MUSIC_CONFIG_EXPLAIN' => $lang['Music_config_explain'], ! 'S_MUSIC_CONFIG_ACTION' => mx_append_sid('admin_music_cfg.'.$phpEx), 'MAX_SONGS' => $new['max_songs'], |
|
From: OryNider <ory...@us...> - 2008-01-31 03:38:29
|
Update of /cvsroot/mxbb/mx_blogs/weblogs/templates/ljDigitalMultiplex/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23964 Added Files: icon_aim.gif icon_edit.gif icon_email.gif icon_icq_add.gif icon_ip.gif icon_msnm.gif icon_pm.gif icon_profile.gif icon_quote.gif icon_search.gif icon_weblog.gif icon_www.gif icon_yim.gif newentry.gif reply-locked.gif reply.gif Log Message: --- NEW FILE: icon_edit.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_email.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_quote.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: newentry.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_icq_add.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_yim.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_pm.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_profile.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_search.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_aim.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: reply-locked.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_msnm.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: reply.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_www.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_weblog.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_ip.gif --- (This appears to be a binary file; contents omitted.) |
|
From: OryNider <ory...@us...> - 2008-01-31 03:38:11
|
Update of /cvsroot/mxbb/mx_blogs/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23877 Added Files: weblog_group_edit_body.tpl weblog_group_select_body.tpl Log Message: --- NEW FILE: weblog_group_select_body.tpl --- <h1>{L_GROUP_TITLE}</h1> <p>{L_GROUP_EXPLAIN}</p> <form method="post" action="{S_GROUP_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline"> <tr> <th class="thHead" align="center">{L_GROUP_SELECT}</th> </tr> <!-- BEGIN select_box --> <tr> <td class="row1" align="center">{S_GROUP_SELECT} <input type="submit" name="edit" value="{L_LOOK_UP}" class="mainoption" /> </td> </tr> <!-- END select_box --> <tr> <td class="catBottom" align="center">{S_HIDDEN_FIELDS}<input type="submit" class="liteoption" name="new" value="{L_CREATE_NEW_GROUP}" /></td> </tr> </table></form> --- NEW FILE: weblog_group_edit_body.tpl --- <h1>{L_GROUP_TITLE}</h1> <form action="{S_GROUP_ACTION}" method="post" name="post"><table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center"> <tr> <th class="thHead" colspan="2">{L_GROUP_EDIT_DELETE}</th> </tr> <tr> <td class="row1" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td> <td class="row2" width="62%"> <input class="post" type="text" name="group_name" size="35" maxlength="40" value="{GROUP_NAME}" /> </td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td> <td class="row2" width="62%"> <textarea class="post" name="group_description" rows="5" cols="51">{GROUP_DESCRIPTION}</textarea> </td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td> <td class="row2" width="62%"><input class="post" type="text" class="post" name="username" maxlength="50" size="20" value="{GROUP_MODERATOR}" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td> <td class="row2" width="62%"> <input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} <input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} <input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN}</td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_WEBLOG_GROUP}:</span></td> <td class="row2" width="62%"> <input type="radio" name="group_allow_weblogs" value="1" {S_GROUP_ALLOW_WEBLOGS_YES} /> {L_YES} <input type="radio" name="group_allow_weblogs" value="0" {S_GROUP_ALLOW_WEBLOGS_NO} /> {L_NO}</td> </tr> <!-- BEGIN group_edit --> <tr> <td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}</span> <br /> <span class="gensmall">{L_DELETE_MODERATOR_EXPLAIN}</span></td> <td class="row2" width="62%"> <input type="checkbox" name="delete_old_moderator" value="1"> {L_YES}</td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td> <td class="row2" width="62%"> <input type="checkbox" name="group_delete" value="1"> {L_GROUP_DELETE_CHECK}</td> </tr> <!-- END group_edit --> <tr> <td class="catBottom" colspan="2" align="center"><span class="cattitle"> <input type="submit" name="group_update" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" name="reset" class="liteoption" /> </span></td> </tr> </table>{S_HIDDEN_FIELDS}</form> |
|
From: OryNider <ory...@us...> - 2008-01-31 03:37:59
|
Update of /cvsroot/mxbb/mx_blogs/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23550 Added Files: admin_weblog_groups.php Log Message: --- NEW FILE: admin_weblog_groups.php --- <?php /*************************************************************************** * admin_weblog_groups.php * ------------------- * begin : Saturday, Feb 13, 2001 * copyright : (C) 2001 The phpBB Group * email : su...@ph... * * $Id: admin_weblog_groups.php,v 1.2 2008/01/31 03:37:54 orynider Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ @define('IN_PORTAL', 1); if( !empty($setmodules) ) { $file = basename(__FILE__); $module['Blog_admin']['Groups'] = "modules/mx_blogs/admin/" . "$file"; return; } // // Load default header // $module_root_path = '../'; $mx_root_path = '../../../'; $music_root_path = $module_root_path . 'music_box/'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); // ********************************************************************** // Read language definition // ********************************************************************** if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) { include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); } else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) { include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); } if ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) ) { $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]); } else { $group_id = 0; } if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $mode = htmlspecialchars($mode); } else { $mode = ''; } if ( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) ) { // // Ok they are editing a group or creating a new group // $template->set_filenames(array( 'body' => 'admin/weblog_group_edit_body.tpl') ); if ( isset($HTTP_POST_VARS['edit']) ) { // // They're editing. Grab the vars. // $sql = "SELECT * FROM " . GROUPS_TABLE . " WHERE group_single_user <> " . TRUE . " AND group_id = $group_id"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); } if ( !($group_info = $db->sql_fetchrow($result)) ) { mx_message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); } $mode = 'editgroup'; $template->assign_block_vars('group_edit', array()); } else if ( isset($HTTP_POST_VARS['new']) ) { $group_info = array ( 'group_name' => '', 'group_description' => '', 'group_moderator' => '', 'group_allow_weblogs' => 0, 'group_type' => GROUP_OPEN); $group_open = ' checked="checked"'; $mode = 'newgroup'; } // // Ok, now we know everything about them, let's show the page. // if ($group_info['group_moderator'] != '') { $sql = "SELECT user_id, username FROM " . USERS_TABLE . " WHERE user_id = " . $group_info['group_moderator']; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql); } if ( !($row = $db->sql_fetchrow($result)) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql); } $group_moderator = $row['username']; } else { $group_moderator = ''; } $group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? ' checked="checked"' : ''; $group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? ' checked="checked"' : ''; $group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? ' checked="checked"' : ''; $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />'; $template->assign_vars(array( 'GROUP_NAME' => $group_info['group_name'], 'GROUP_DESCRIPTION' => $group_info['group_description'], 'GROUP_MODERATOR' => $group_moderator, 'L_GROUP_TITLE' => $lang['Group_administration'], 'L_GROUP_EDIT_DELETE' => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'], 'L_GROUP_NAME' => $lang['group_name'], 'L_GROUP_DESCRIPTION' => $lang['group_description'], 'L_GROUP_MODERATOR' => $lang['group_moderator'], 'L_FIND_USERNAME' => $lang['Find_username'], 'L_GROUP_STATUS' => $lang['group_status'], 'L_GROUP_OPEN' => $lang['group_open'], 'L_GROUP_CLOSED' => $lang['group_closed'], 'L_GROUP_HIDDEN' => $lang['group_hidden'], 'L_GROUP_DELETE' => $lang['group_delete'], 'L_GROUP_DELETE_CHECK' => $lang['group_delete_check'], 'L_SUBMIT' => $lang['Submit'], 'L_RESET' => $lang['Reset'], 'L_DELETE_MODERATOR' => $lang['delete_group_moderator'], 'L_DELETE_MODERATOR_EXPLAIN' => $lang['delete_moderator_explain'], 'L_YES' => $lang['Yes'], 'U_SEARCH_USER' => mx_append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), 'L_WEBLOG_GROUP' => $lang['Group_allow_weblogs'], 'L_NO' => $lang['No'], 'S_GROUP_ALLOW_WEBLOGS_YES' => ( $group_info['group_allow_weblogs'] ) ? ' checked="checked"' : '', 'S_GROUP_ALLOW_WEBLOGS_NO' => ( !$group_info['group_allow_weblogs'] ) ? ' checked="checked"' : '', 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, 'S_GROUP_OPEN_CHECKED' => $group_open, 'S_GROUP_CLOSED_CHECKED' => $group_closed, 'S_GROUP_HIDDEN_CHECKED' => $group_hidden, 'S_GROUP_ACTION' => mx_append_sid("admin_weblog_groups.$phpEx"), 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); $template->pparse('body'); } else if ( isset($HTTP_POST_VARS['group_update']) ) { // // Ok, they are submitting a group, let's save the data based on if it's new or editing // if ( isset($HTTP_POST_VARS['group_delete']) ) { // // Reset User Moderator Level // // Is Group moderating a forum ? $sql = "SELECT auth_mod FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = " . $group_id; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not select auth_access', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); if (intval($row['auth_mod']) == 1) { // Yes, get the assigned users and update their Permission if they are no longer moderator of one of the forums $sql = "SELECT user_id FROM " . USER_GROUP_TABLE . " WHERE group_id = " . $group_id; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not select user_group', '', __LINE__, __FILE__, $sql); } $rows = $db->sql_fetchrowset($result); for ($i = 0; $i < count($rows); $i++) { $sql = "SELECT g.group_id FROM " . AUTH_ACCESS_TABLE . " a, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE (a.auth_mod = 1) AND (g.group_id = a.group_id) AND (a.group_id = ug.group_id) AND (g.group_id = ug.group_id) AND (ug.user_id = " . intval($rows[$i]['user_id']) . ") AND (ug.group_id <> " . $group_id . ")"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain moderator permissions', '', __LINE__, __FILE__, $sql); } if ($db->sql_numrows($result) == 0) { $sql = "UPDATE " . USERS_TABLE . " SET user_level = " . USER . " WHERE user_level = " . MOD . " AND user_id = " . intval($rows[$i]['user_id']); if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update moderator permissions', '', __LINE__, __FILE__, $sql); } } } } // // Delete Group // $sql = "DELETE FROM " . GROUPS_TABLE . " WHERE group_id = " . $group_id; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . USER_GROUP_TABLE . " WHERE group_id = " . $group_id; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update user_group', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = " . $group_id; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update auth_access', '', __LINE__, __FILE__, $sql); } $message = $lang['Deleted_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . mx_append_sid("admin_weblog_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); } else { $group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN; $group_name = isset($HTTP_POST_VARS['group_name']) ? htmlspecialchars(trim($HTTP_POST_VARS['group_name'])) : ''; $group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : ''; $group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : ''; $group_allow_weblogs = ( isset($HTTP_POST_VARS['group_allow_weblogs']) ) ? intval($HTTP_POST_VARS['group_allow_weblogs']) : 0; $delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? true : false; if ( $group_name == '' ) { mx_message_die(GENERAL_MESSAGE, $lang['No_group_name']); } else if ( $group_moderator == '' ) { mx_message_die(GENERAL_MESSAGE, $lang['No_group_moderator']); } $this_userdata = get_userdata($group_moderator, true); $group_moderator = $this_userdata['user_id']; if ( !$group_moderator ) { mx_message_die(GENERAL_MESSAGE, $lang['No_group_moderator']); } if( $mode == "editgroup" ) { $sql = "SELECT * FROM " . GROUPS_TABLE . " WHERE group_single_user <> " . TRUE . " AND group_id = " . $group_id; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); } if( !($group_info = $db->sql_fetchrow($result)) ) { mx_message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); } if ( $group_info['group_moderator'] != $group_moderator ) { if ( $delete_old_moderator ) { $sql = "DELETE FROM " . USER_GROUP_TABLE . " WHERE user_id = " . $group_info['group_moderator'] . " AND group_id = " . $group_id; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql); } } $sql = "SELECT user_id FROM " . USER_GROUP_TABLE . " WHERE user_id = $group_moderator AND group_id = $group_id"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Failed to obtain current group moderator info', '', __LINE__, __FILE__, $sql); } if ( !($row = $db->sql_fetchrow($result)) ) { $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) VALUES (" . $group_id . ", " . $group_moderator . ", 0)"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql); } } } $sql = "UPDATE " . GROUPS_TABLE . " SET group_type = $group_type, group_name = '" . str_replace("\'", "''", $group_name) . "', group_description = '" . str_replace("\'", "''", $group_description) . "', group_moderator = $group_moderator, group_allow_weblogs = $group_allow_weblogs WHERE group_id = $group_id"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql); } $message = $lang['Updated_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . mx_append_sid("admin_weblog_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid("index.$phpEx?pane=right") . '">', '</a>');; mx_message_die(GENERAL_MESSAGE, $message); } else if( $mode == 'newgroup' ) { $sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user, group_allow_weblogs) VALUES ($group_type, '" . str_replace("\'", "''", $group_name) . "', '" . str_replace("\'", "''", $group_description) . "', $group_moderator, '0', $group_allow_weblogs)"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not insert new group', '', __LINE__, __FILE__, $sql); } $new_group_id = $db->sql_nextid(); $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) VALUES ($new_group_id, $group_moderator, 0)"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not insert new user-group info', '', __LINE__, __FILE__, $sql); } $message = $lang['Added_new_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . mx_append_sid("admin_weblog_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid("index.$phpEx?pane=right") . '">', '</a>');; mx_message_die(GENERAL_MESSAGE, $message); } else { mx_message_die(GENERAL_MESSAGE, $lang['No_group_action']); } } } else { $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " WHERE group_single_user <> " . TRUE . " ORDER BY group_name"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain group list', '', __LINE__, __FILE__, $sql); } $select_list = ''; if ( $row = $db->sql_fetchrow($result) ) { $select_list .= '<select name="' . POST_GROUPS_URL . '">'; do { $select_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>'; } while ( $row = $db->sql_fetchrow($result) ); $select_list .= '</select>'; } $template->set_filenames(array( 'body' => 'admin/weblog_group_select_body.tpl') ); $template->assign_vars(array( 'L_GROUP_TITLE' => $lang['Group_administration'], 'L_GROUP_EXPLAIN' => $lang['Group_admin_explain'], 'L_GROUP_SELECT' => $lang['Select_group'], 'L_LOOK_UP' => $lang['Look_up_group'], 'L_CREATE_NEW_GROUP' => $lang['New_group'], 'S_GROUP_ACTION' => mx_append_sid("admin_weblog_groups.$phpEx"), 'S_GROUP_SELECT' => $select_list) ); if ( $select_list != '' ) { $template->assign_block_vars('select_box', array()); } $template->pparse('body'); } include($mx_root_path . 'admin/page_footer_admin.'.$phpEx); ?> |
|
From: OryNider <ory...@us...> - 2008-01-31 03:36:45
|
Update of /cvsroot/mxbb/mx_blogs/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23056/admin Modified Files: admin_weblog_action.php admin_weblog_cfg.php admin_weblog_mood.php admin_weblog_templates.php admin_weblog_tools.php Log Message: finished porting this to 2.8.1 here porting should continue :D Index: admin_weblog_action.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_action.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_weblog_action.php 28 Jan 2008 21:42:53 -0000 1.2 --- admin_weblog_action.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); // --- 20,29 ---- ***************************************************************************/ ! // ! // ERROR HANDLING ! // ! //error_reporting( E_ALL ); ! ! @define('IN_PORTAL', 1); // *************** *** 33,44 **** } ! $mx_root_path = "./../../../"; ! $module_root_path ="./../"; ! //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'admin/pagestart.' . $phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 38,62 ---- } ! // ! // Load default header ! // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! require($mx_root_path . 'admin/pagestart.' . $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 50,54 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); --- 68,72 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); *************** *** 64,68 **** else { ! $mode = ""; } --- 82,86 ---- else { ! $mode = false; } *************** *** 74,78 **** while($file = @readdir($dir)) { ! if( !@is_dir(phpBB2::phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); --- 92,96 ---- while($file = @readdir($dir)) { ! if( !@is_dir($module_root_path . 'images/weblogs/' . $file) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); *************** *** 84,90 **** } } - @closedir($dir); // // Select main mode --- 102,108 ---- } } @closedir($dir); + // // Select main mode *************** *** 119,123 **** "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_images[0], ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 137,141 ---- "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_images[0], ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 126,130 **** $template->pparse("body"); } ! else if ( $mode != "" ) { switch( $mode ) --- 144,148 ---- $template->pparse("body"); } ! else if (!empty($mode)) { switch( $mode ) *************** *** 142,151 **** if( !$result ) { ! message_die(GENERAL_ERROR, "Couldn't delete action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_del_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; --- 160,169 ---- if( !$result ) { ! mx_message_die(GENERAL_ERROR, "Couldn't delete action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_del_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; *************** *** 163,167 **** if( !$result ) { ! message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql); } $currently_data = $db->sql_fetchrow($result); --- 181,185 ---- if( !$result ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql); } $currently_data = $db->sql_fetchrow($result); *************** *** 201,205 **** "CURRENTLY_CURRENTLY" => $currently_data['action_text'], ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 219,223 ---- "CURRENTLY_CURRENTLY" => $currently_data['action_text'], ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 225,229 **** if ( $currently_url == '') { ! message_die(MESSAGE, $lang['Fields_empty']); } --- 243,247 ---- if ( $currently_url == '') { ! mx_message_die(MESSAGE, $lang['Fields_empty']); } *************** *** 236,245 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't update action info", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; --- 254,263 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't update action info", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; *************** *** 259,263 **** if ($currently_url == '') { ! message_die(MESSAGE, $lang['Fields_empty']); } --- 277,281 ---- if ($currently_url == '') { ! mx_message_die(MESSAGE, $lang['Fields_empty']); } *************** *** 269,278 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't insert new action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_add_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; } --- 287,296 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't insert new action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_add_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; } *************** *** 280,284 **** else { - // // This is the main display of the page before the admin has selected --- 298,301 ---- *************** *** 301,305 **** "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx")) ); --- 318,322 ---- "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx")) ); *************** *** 319,324 **** "CURRENTLY" => $action_data[$i]['action_text'], ! "U_CURRENTLY_EDIT" => append_sid("admin_weblog_action.$phpEx?mode=edit&id=" . $action_data[$i]['action_id']), ! "U_CURRENTLY_DELETE" => append_sid("admin_weblog_action.$phpEx?mode=delete&id=" . $action_data[$i]['action_id'])) ); } --- 336,341 ---- "CURRENTLY" => $action_data[$i]['action_text'], ! "U_CURRENTLY_EDIT" => mx_append_sid("admin_weblog_action.$phpEx?mode=edit&id=" . $action_data[$i]['action_id']), ! "U_CURRENTLY_DELETE" => mx_append_sid("admin_weblog_action.$phpEx?mode=delete&id=" . $action_data[$i]['action_id'])) ); } Index: admin_weblog_templates.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_templates.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_weblog_templates.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_templates.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); // --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); // *************** *** 40,44 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 40,55 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 109,113 **** "L_RESET" => $lang['Reset'], ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx?mode=savenew"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 120,124 ---- "L_RESET" => $lang['Reset'], ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx?mode=savenew"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 155,159 **** } ! $message = $lang['Weblog_template_del_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 166,170 ---- } ! $message = $lang['Weblog_template_del_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 208,212 **** "TEMPLATE_NOT_PRIVATE_CHECKED" => ( !$templates_data['template_private'] ) ? ' checked="checked"' : '', ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx?mode=edit&id=$template_id"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 219,223 ---- "TEMPLATE_NOT_PRIVATE_CHECKED" => ( !$templates_data['template_private'] ) ? ' checked="checked"' : '', ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx?mode=edit&id=$template_id"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 250,254 **** } ! $message = $lang['Weblog_template_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 261,265 ---- } ! $message = $lang['Weblog_template_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 312,316 **** } ! $message = $lang['Weblog_template_add_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 323,327 ---- } ! $message = $lang['Weblog_template_add_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 342,346 **** "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx")) ); --- 353,357 ---- "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx")) ); *************** *** 360,365 **** "TEMPLATE_IMAGE" => '<img src="' . $module_root_path . 'weblogs/templates/' . $template_data[$i]['template_dir'] . '/preview_img.gif" border="0">', "TEMPLATE_PRIVATE" => ( $template_data[$i]['template_private'] ) ? $lang['Yes'] : $lang['No'], ! "U_TEMPLATE_EDIT" => append_sid("admin_weblog_templates.$phpEx?mode=edit&id=" . $template_data[$i]['template_id']), ! "U_TEMPLATE_DELETE" => append_sid("admin_weblog_templates.$phpEx?mode=delete&id=" . $template_data[$i]['template_id'])) ); } --- 371,376 ---- "TEMPLATE_IMAGE" => '<img src="' . $module_root_path . 'weblogs/templates/' . $template_data[$i]['template_dir'] . '/preview_img.gif" border="0">', "TEMPLATE_PRIVATE" => ( $template_data[$i]['template_private'] ) ? $lang['Yes'] : $lang['No'], ! "U_TEMPLATE_EDIT" => mx_append_sid("admin_weblog_templates.$phpEx?mode=edit&id=" . $template_data[$i]['template_id']), ! "U_TEMPLATE_DELETE" => mx_append_sid("admin_weblog_templates.$phpEx?mode=delete&id=" . $template_data[$i]['template_id'])) ); } Index: admin_weblog_tools.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_tools.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_weblog_tools.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_tools.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 19,24 **** * ***************************************************************************/ ! define('IN_PORTAL',1); ! define('IN_PHPBB', 1); if( !empty($setmodules) ) --- 19,23 ---- * ***************************************************************************/ ! @define('IN_PORTAL',1); if( !empty($setmodules) ) *************** *** 39,43 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); $html_entities_match = array('#<#', '#>#'); --- 38,53 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } $html_entities_match = array('#<#', '#>#'); *************** *** 73,79 **** 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_USER_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=user_admin"), 'S_USER_SELECT' => $select_list) ); --- 83,89 ---- 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => mx_append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_USER_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=user_admin"), 'S_USER_SELECT' => $select_list) ); *************** *** 94,98 **** 'L_LOOK_UP' => $lang['Look_up_weblog'], ! 'S_USER_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=weblog_admin"), 'S_USER_SELECT' => $select_list) ); --- 104,108 ---- 'L_LOOK_UP' => $lang['Look_up_weblog'], ! 'S_USER_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=weblog_admin"), 'S_USER_SELECT' => $select_list) ); *************** *** 151,155 **** // That's all, Folks! ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 161,165 ---- // That's all, Folks! ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 167,171 **** // That's all, Folks! ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 177,181 ---- // That's all, Folks! ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 188,192 **** } ! $message = $lang['Weblogs_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 198,202 ---- } ! $message = $lang['Weblogs_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 209,213 **** } ! $message = $lang['Entries_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 219,223 ---- } ! $message = $lang['Entries_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 230,234 **** } ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 240,244 ---- } ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 251,255 **** } ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 261,265 ---- } ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 263,267 **** 'ROW_CLASS' => $row_class, 'WEBLOG' => $del_weblogs[$i]['weblog_name'], ! 'U_PROFILE' => append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_weblogs[$i]['user_id']), 'OWNER' => $del_weblogs[$i]['username'], 'WEBLOG_DESC' => $del_weblogs[$i]['weblog_desc'], --- 273,277 ---- 'ROW_CLASS' => $row_class, 'WEBLOG' => $del_weblogs[$i]['weblog_name'], ! 'U_PROFILE' => mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_weblogs[$i]['user_id']), 'OWNER' => $del_weblogs[$i]['username'], 'WEBLOG_DESC' => $del_weblogs[$i]['weblog_desc'], *************** *** 279,284 **** 'ENTRY' => $del_entries[$i]['entry_subject'], 'WEBLOG' => $del_entries[$i]['weblog_name'], ! 'U_PROFILE' => append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_entries[$i]['user_id']), ! 'U_WEBLOG' => append_sid($module_root_path . "weblog.$phpEx?" . POST_WEBLOG_URL . "=" . $del_entries[$i]['weblog_id']), 'OWNER' => $del_entries[$i]['username'], 'WEBLOG_DESC' => $del_entries[$i]['weblog_desc'], --- 289,294 ---- 'ENTRY' => $del_entries[$i]['entry_subject'], 'WEBLOG' => $del_entries[$i]['weblog_name'], ! 'U_PROFILE' => mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_entries[$i]['user_id']), ! 'U_WEBLOG' => mx_append_sid($module_root_path . "weblog.$phpEx?" . POST_WEBLOG_URL . "=" . $del_entries[$i]['weblog_id']), 'OWNER' => $del_entries[$i]['username'], 'WEBLOG_DESC' => $del_entries[$i]['weblog_desc'], *************** *** 301,307 **** 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_PURGE_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=purge"), 'S_USER_SELECT' => $select_list) --- 311,317 ---- 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => mx_append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_PURGE_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=purge"), 'S_USER_SELECT' => $select_list) *************** *** 369,373 **** 'S_HIDDEN_FIELDS' => '<input type="hidden" name="user_id" value="' . $weblog_user_data['user_id'] . '" />', ! 'S_CONFIG_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=edit")) ); } --- 379,383 ---- 'S_HIDDEN_FIELDS' => '<input type="hidden" name="user_id" value="' . $weblog_user_data['user_id'] . '" />', ! 'S_CONFIG_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=edit")) ); } *************** *** 395,399 **** $template->assign_vars(array( ! 'S_SELECT_ACTION' => append_sid("admin_weblog_tools.$phpEx")) ); } --- 405,409 ---- $template->assign_vars(array( ! 'S_SELECT_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx")) ); } Index: admin_weblog_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_cfg.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_weblog_cfg.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_cfg.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 1,5 **** <?php /*************************************************************************** ! * admin_weblog_config.php * ----------------------------- * begin : Monday, September 5, 2004 --- 1,5 ---- <?php /*************************************************************************** ! * admin_weblog_cfg.php * ----------------------------- * begin : Monday, September 5, 2004 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); if( !empty($setmodules) ) --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); if( !empty($setmodules) ) *************** *** 41,45 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 41,56 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 50,54 **** if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, "Could not query config information in admin_weblog_config", "", __LINE__, __FILE__, $sql); } else --- 61,65 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, "Could not query config information in admin_weblog_cfg", "", __LINE__, __FILE__, $sql); } else *************** *** 81,85 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Weblog_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_weblog_config'], "<a href=\"" . append_sid("admin_weblog_config.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 92,96 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Weblog_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_weblog_config'], "<a href=\"" . mx_append_sid("admin_weblog_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 151,155 **** // $template->assign_vars(array( ! 'S_CONFIG_ACTION' => append_sid("admin_weblog_cfg.$phpEx"), 'L_YES' => $lang['Yes'], --- 162,166 ---- // $template->assign_vars(array( ! 'S_CONFIG_ACTION' => mx_append_sid("admin_weblog_cfg.$phpEx"), 'L_YES' => $lang['Yes'], Index: admin_weblog_mood.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_mood.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_weblog_mood.php 28 Jan 2008 21:42:53 -0000 1.2 --- admin_weblog_mood.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 20,25 **** ***************************************************************************/ ! define('IN_PORTAL', 1); ! // --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); // *************** *** 41,45 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 40,55 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 83,87 **** while($file = @readdir($dir)) { ! if( !@is_dir(phpBB2::phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); --- 93,97 ---- while($file = @readdir($dir)) { ! if( !@is_dir($module_root_path . 'images/weblogs/' . $file) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); *************** *** 93,97 **** } } - @closedir($dir); --- 103,106 ---- *************** *** 138,142 **** "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_images[0], ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 147,151 ---- "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_images[0], ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 168,172 **** "MOOD_SET" => '', ! "S_MOOD_SET_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); --- 177,181 ---- "MOOD_SET" => '', ! "S_MOOD_SET_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); *************** *** 189,193 **** } ! $message = $lang['Weblog_mood_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 198,202 ---- } ! $message = $lang['Weblog_mood_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 215,219 **** } ! $message = $lang['Weblog_mood_set_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 224,228 ---- } ! $message = $lang['Weblog_mood_set_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 271,275 **** "MOOD_MOOD" => $mood_data['mood_text'], ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 280,284 ---- "MOOD_MOOD" => $mood_data['mood_text'], ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 311,315 **** "MOOD_SET" => $mood_set_data['set_name'], ! "S_MOOD_SET_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 320,324 ---- "MOOD_SET" => $mood_set_data['set_name'], ! "S_MOOD_SET_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 350,354 **** } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 359,363 ---- } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 385,389 **** } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 394,398 ---- } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 433,437 **** } ! $message = $lang['Weblog_mood_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 442,446 ---- } ! $message = $lang['Weblog_mood_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 481,485 **** } ! $message = $lang['Weblog_mood_set_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 490,494 ---- } ! $message = $lang['Weblog_mood_set_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 513,517 **** "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx?mode=addset")) ); --- 522,526 ---- "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx?mode=addset")) ); *************** *** 528,534 **** "SET_NAME" => $mood_set_data[$i]['set_name'], ! "U_SET_ADD" => append_sid("admin_weblog_mood.$phpEx?mode=addmood&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editset&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deleteset&id=" . $mood_set_data[$i]['set_id'])) ); --- 537,543 ---- "SET_NAME" => $mood_set_data[$i]['set_name'], ! "U_SET_ADD" => mx_append_sid("admin_weblog_mood.$phpEx?mode=addmood&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_EDIT" => mx_append_sid("admin_weblog_mood.$phpEx?mode=editset&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_DELETE" => mx_append_sid("admin_weblog_mood.$phpEx?mode=deleteset&id=" . $mood_set_data[$i]['set_id'])) ); *************** *** 547,552 **** "MOOD" => $mood_data[$j]['mood_text'], ! "U_MOOD_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editmood&id=" . $mood_data[$j]['mood_id']), ! "U_MOOD_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deletemood&id=" . $mood_data[$j]['mood_id'])) ); } --- 556,561 ---- "MOOD" => $mood_data[$j]['mood_text'], ! "U_MOOD_EDIT" => mx_append_sid("admin_weblog_mood.$phpEx?mode=editmood&id=" . $mood_data[$j]['mood_id']), ! "U_MOOD_DELETE" => mx_append_sid("admin_weblog_mood.$phpEx?mode=deletemood&id=" . $mood_data[$j]['mood_id'])) ); } |
|
From: OryNider <ory...@us...> - 2008-01-31 03:36:40
|
Update of /cvsroot/mxbb/mx_blogs/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23056/includes Modified Files: weblogs_common.php weblogs_constants.php Log Message: finished porting this to 2.8.1 here porting should continue :D Index: weblogs_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/includes/weblogs_common.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weblogs_common.php 28 Jun 2007 18:04:21 -0000 1.2 --- weblogs_common.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 19,53 **** * ***************************************************************************/ ! if ( !defined('IN_PHPBB') ) { die("Hacking attempt"); } if ( !isset($mx_root_path)) { $mx_root_path = '../../../'; } - include($mx_root_path . 'modules/mx_blogs/includes/weblogs_constants.'.$phpEx); - //include($phpbb_root_path . 'includes/functions_weblog.'.$phpEx); - include($mx_root_path . 'modules/mx_blogs/includes/functions_weblog.'.$phpEx); - //include($mx_root_path . 'includes/mx_functions.'.$phpEx); - // The Blog Mod version 0.2.5 - define('WEBLOGS_MOD_VERSION', '0.2.6'); - - // Weblog Constants (Constants used all over the place) - define('SORT_NEWEST_ENTRIES', 0); - define('SORT_WEBLOG_NAME', 1); - define('SORT_NUM_ENTRIES', 2); - define('SORT_WEBLOG_START_DATE', 3); - define('SORT_WEBLOG_VIEWS', 4); - define('SORT_WEBLOG_OWNER_NAME', 5); ! define('ACTION_DO_NOTHING', 0); ! define('ACTION_LOAD_TEMPLATE', 1); ! define('ACTION_SWITCH_MODE', 2); ! ! define('WEBLOG_AUTH_ALL', 0); ! define('WEBLOG_AUTH_REGISTERED', 1); ! define('WEBLOG_AUTH_FRIENDS', 2); ! define('WEBLOG_AUTH_OWNER', 3); // ********************************************************************** --- 19,35 ---- * ***************************************************************************/ ! ! if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } + if ( !isset($mx_root_path)) { $mx_root_path = '../../../'; } ! include_once($module_root_path . 'includes/weblogs_constants.'.$phpEx); ! include_once($module_root_path . 'includes/functions_weblog.'.$phpEx); // ********************************************************************** *************** *** 68,81 **** } - - - - - - - // include the weblog language file $use_lang = ( !file_exists($mx_root_path . 'modules/mx_blogs/language/lang_' . $board_config['default_lang'] . '/lang_weblog_main.'.$phpEx) ) ? 'english' : $board_config['default_lang']; ! include($mx_root_path . 'modules/mx_blogs/language/lang_' . $use_lang . '/lang_weblog_main.' . $phpEx); // --- 50,66 ---- } // include the weblog language file $use_lang = ( !file_exists($mx_root_path . 'modules/mx_blogs/language/lang_' . $board_config['default_lang'] . '/lang_weblog_main.'.$phpEx) ) ? 'english' : $board_config['default_lang']; ! ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_main.' . $phpEx ) ) ! { ! include_once( $module_root_path . 'language/lang_english/lang_weblog_main.' . $phpEx ); ! $link_language='lang_english'; ! } ! else ! { ! include_once( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_main.' . $phpEx ); ! $link_language='lang_' . $board_config['default_lang']; ! } // Index: weblogs_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/includes/weblogs_constants.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblogs_constants.php 7 Jun 2007 22:01:33 -0000 1.1 --- weblogs_constants.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 1,7 **** <?php if (!isset($mx_table_prefix)) { ! $mx_table_prefix = 'mx_'; } define('POST_WEBLOG_URL', 'w'); define('POST_ENTRY_URL', 'e'); --- 1,12 ---- <?php + if (!isset($mx_table_prefix)) { ! $mx_table_prefix = 'mx_'; } + + // The Blog Mod version 0.2.5 + define('WEBLOGS_MOD_VERSION', '0.2.6'); + define('POST_WEBLOG_URL', 'w'); define('POST_ENTRY_URL', 'e'); *************** *** 20,23 **** --- 25,31 ---- define('WEBLOG_TRACKBACKS_TABLE', $mx_table_prefix.'weblog_trackbacks'); define('WEBLOGS_TABLE', $mx_table_prefix.'weblogs'); + + + // Weblog Constants (Constants used all over the place) define('SORT_NEWEST_ENTRIES', 0); define('SORT_WEBLOG_NAME', 1); |
Update of /cvsroot/mxbb/mx_blogs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23056 Modified Files: Weblogs.pak weblog.php weblog_allentries.php weblog_config.php weblog_entry.php weblog_posting.php weblog_rss.php weblogs.php Log Message: finished porting this to 2.8.1 here porting should continue :D Index: weblog_posting.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_posting.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblog_posting.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_posting.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 32,36 **** include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } ! $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; if (!defined('PHPBB_URL')) { --- 32,36 ---- include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } ! //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; if (!defined('PHPBB_URL')) { *************** *** 1112,1116 **** if ( $smilies_on ) { ! $preview_message = smilies_pass($preview_message); } } --- 1112,1116 ---- if ( $smilies_on ) { ! $preview_message = mx_smilies_pass($preview_message); } } *************** *** 1330,1334 **** if ( $entry_data['enable_smilies'] ) { ! $entry_message = smilies_pass($entry_message); } } --- 1330,1334 ---- if ( $entry_data['enable_smilies'] ) { ! $entry_message = mx_smilies_pass($entry_message); } } *************** *** 1424,1428 **** if ( $reply_data[$i]['enable_smilies'] ) { ! $reply_message = smilies_pass($reply_message); } } --- 1424,1428 ---- if ( $reply_data[$i]['enable_smilies'] ) { ! $reply_message = mx_smilies_pass($reply_message); } } Index: weblog_entry.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_entry.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblog_entry.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_entry.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 22,32 **** define('IN_PHPBB', true); define('IN_PORTAL', true); - //$phpbb_root_path = './'; $mx_root_path = '../../'; $module_root_path = './'; - //include($phpbb_root_path . 'extension.inc'); - //include($phpbb_root_path . 'common.'.$phpEx); - //include($phpbb_root_path . 'includes/bbcode.'.$phpEx); - //include($mx_root_path . 'extension.inc'); $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); --- 22,27 ---- *************** *** 35,47 **** // Start session management // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! init_userprefs($userdata); // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'. $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; // // Start initial var setup --- 30,41 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; // // Start initial var setup *************** *** 403,408 **** if ( $entry_data['enable_smilies'] ) { ! ! $message = smilies_pass($message); } } --- 397,401 ---- if ( $entry_data['enable_smilies'] ) { ! $message = mx_smilies_pass($message); } } *************** *** 849,858 **** if ( $reply_data[$i]['user_allowsmile'] && $user_sig != '' ) { ! $user_sig = smilies_pass($user_sig); } if ( $reply_data[$i]['enable_smilies'] ) { ! $message = smilies_pass($message); } } --- 842,851 ---- if ( $reply_data[$i]['user_allowsmile'] && $user_sig != '' ) { ! $user_sig = mx_smilies_pass($user_sig); } if ( $reply_data[$i]['enable_smilies'] ) { ! $message = mx_smilies_pass($message); } } Index: weblog_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_config.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weblog_config.php 28 Jun 2007 18:04:21 -0000 1.2 --- weblog_config.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 20,57 **** ***************************************************************************/ ! define('IN_PHPBB', true); ! //$phpbb_root_path = './'; ! //include($phpbb_root_path . 'extension.inc'); ! //include($phpbb_root_path . 'common.'.$phpEx); ! //include($phpbb_root_path . 'includes/bbcode.'.$phpEx); ! //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.'.$phpEx); if (!function_exists('prepare_message')) { ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } if (!function_exists('smilies_pass')) { ! include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); } ! // ! // Start session management ! // ! //$userdata = session_pagestart($user_ip, PAGE_INDEX); ! //init_userprefs($userdata); ! $mx_user->init($user_ip, PAGE_INDEX); ! // ! // End session management ! // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); - // - // Include the Header - // - $page_title = $lang['Weblog_CP']; - include($mx_root_path . 'includes/page_header.'.$phpEx); // Check to see if the user is allowed to have a weblog. --- 20,52 ---- ***************************************************************************/ ! // ! // ERROR HANDLING ! // ! //error_reporting( E_ALL ); ! @ini_set( 'display_errors', '1' ); ! ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! die("Hacking attempt"); ! } ! else ! { ! define( 'MXBB_MODULE', true ); ! ! $is_block = TRUE; ! } ! if (!function_exists('prepare_message')) { ! @include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } if (!function_exists('smilies_pass')) { ! @include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); } ! ! //include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); // Check to see if the user is allowed to have a weblog. *************** *** 154,158 **** $template->set_filenames(array( ! "body" => $module_root_path . "templates/subSilver/weblog_cp_body.tpl") ); --- 149,153 ---- $template->set_filenames(array( ! "body" => "weblog_cp_body.tpl") ); *************** *** 167,174 **** if ( !$weblog_exists ) { ! $template_dir = get_template_dir ( $template_data[0]['template_id'] ); // if ( @file_exists($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) ! if ( @file_exists($module_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) { // include($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg"); --- 162,169 ---- if ( !$weblog_exists ) { ! $template_dir = get_template_dir($template_data[0]['template_id']); // if ( @file_exists($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) ! if ( @file_exists($module_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) { // include($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg"); *************** *** 261,265 **** $custom_block = ( isset($HTTP_POST_VARS['custom_block']) ) ? trim($HTTP_POST_VARS['custom_block']) : $custom_block; ! $template_dir = get_template_dir ( $weblog_template ); // --- 256,260 ---- $custom_block = ( isset($HTTP_POST_VARS['custom_block']) ) ? trim($HTTP_POST_VARS['custom_block']) : $custom_block; ! $template_dir = get_template_dir( $weblog_template ); // *************** *** 327,334 **** if ( !empty($error_msg) ) { ! mx_message_die (GENERAL_ERROR, $lang['Errors_occured'] . $error_msg); } ! $template_dir = get_template_dir ($weblog_template); if ( isset($HTTP_POST_VARS['create']) ) --- 322,329 ---- if ( !empty($error_msg) ) { ! mx_message_die(GENERAL_ERROR, $lang['Errors_occured'] . $error_msg); } ! $template_dir = get_template_dir($weblog_template); if ( isset($HTTP_POST_VARS['create']) ) *************** *** 530,534 **** ! $message = sprintf($lang['Weblog_created'], '<a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog.$phpEx?" . POST_WEBLOG_URL . "=" . ($maximum+1)) . '">', '</a>', '<a href="' . append_sid($mx_root_path . "index$phpEx?page=" . $weblog_config['mx_weblog_config_page']) . '">', '</a>'); } else --- 525,529 ---- ! $message = sprintf($lang['Weblog_created'], '<a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog.$phpEx?" . POST_WEBLOG_URL . "=" . ($maximum+1)) . '">', '</a>', '<a href="' . append_sid($mx_root_path . "index.$phpEx?page=" . $weblog_config['mx_weblog_config_page']) . '">', '</a>'); } else *************** *** 904,908 **** 'L_TITLE' => $lang['Title'], 'L_SHOW_ENABLE_SHOUTBOX' => $lang['Show_enable_shoutbox'], ! 'L_SHOW_ENABLE_CATEGORYBOX' => $lang['Show_enable_categorybox'], 'L_SHOUTBOX_DESC' => $lang['Shoutbox_desc'], 'L_ASCENDING' => $lang['Sort_Ascending'], --- 899,903 ---- 'L_TITLE' => $lang['Title'], 'L_SHOW_ENABLE_SHOUTBOX' => $lang['Show_enable_shoutbox'], ! 'L_SHOW_ENABLE_CATEGORYBOX' => $lang['Show_enable_categorybox'], 'L_SHOUTBOX_DESC' => $lang['Shoutbox_desc'], 'L_ASCENDING' => $lang['Sort_Ascending'], *************** *** 978,983 **** 'SHOW_SHOUTBOX_YES' => ( $weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', 'SHOW_SHOUTBOX_NO' => ( !$weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_YES' => ( $weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_NO' => ( !$weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', 'REPLY_IN_POPUP_YES' => ( $weblog_data['reply_in_popup'] ) ? ' checked="checked"' : '', --- 973,978 ---- 'SHOW_SHOUTBOX_YES' => ( $weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', 'SHOW_SHOUTBOX_NO' => ( !$weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_YES' => ( $weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_NO' => ( !$weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', 'REPLY_IN_POPUP_YES' => ( $weblog_data['reply_in_popup'] ) ? ' checked="checked"' : '', *************** *** 985,994 **** 'SHOUTBOX_DESC' => ( $weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', 'SHOUTBOX_ASC' => ( !$weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', ! 'PREVIEW_IMG' => ( $weblog_exists ) ? $mx_root_path . 'modules/mx_blogs/weblogs/templates/' . get_template_dir ($template_id) . '/preview_img.gif' : 'weblogs/templates/' . $template_data[0]['template_dir'] . '/preview_img.gif', 'DELETE_NAME' => ( $weblog_data['deleted'] ) ? 'undelete' : 'delete', 'L_DELETE_WEBLOG' => ( $weblog_data['deleted'] ) ? $lang['Weblog_undelete'] : $lang['Weblog_delete'], ! 'MX_ROOT' => $mx_root_path, 'MOOD_SET_PREVIEW' => $preview_mood, 'SWITCH_RADIO' => ( $userdata['user_allowadvweblog'] ) ? '<input type="radio" id="action_switch_mode" name="weblog_action" value="2" />' : '', --- 980,989 ---- 'SHOUTBOX_DESC' => ( $weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', 'SHOUTBOX_ASC' => ( !$weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', ! 'PREVIEW_IMG' => $module_root_path . 'weblogs/templates/' . get_template_dir($template_data[0]['template_id']) . '/preview_img.gif', 'DELETE_NAME' => ( $weblog_data['deleted'] ) ? 'undelete' : 'delete', 'L_DELETE_WEBLOG' => ( $weblog_data['deleted'] ) ? $lang['Weblog_undelete'] : $lang['Weblog_delete'], ! 'MX_ROOT' => $mx_root_path, 'MOOD_SET_PREVIEW' => $preview_mood, 'SWITCH_RADIO' => ( $userdata['user_allowadvweblog'] ) ? '<input type="radio" id="action_switch_mode" name="weblog_action" value="2" />' : '', *************** *** 1003,1014 **** ); - $template->pparse("body"); - $template->assign_vars(array( 'L_POWERED_BY' => sprintf($lang['Weblog_powered_by'], WEBLOGS_MOD_VERSION)) ); ! //include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ! include($mx_root_path . 'includes/page_tail.'.$phpEx); ?> --- 998,1008 ---- ); $template->assign_vars(array( 'L_POWERED_BY' => sprintf($lang['Weblog_powered_by'], WEBLOGS_MOD_VERSION)) ); ! $template->pparse("body"); ! ! //include($mx_root_path . 'includes/page_tail.'.$phpEx); ?> Index: weblogs.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblogs.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** weblogs.php 28 Jun 2007 18:04:21 -0000 1.3 --- weblogs.php 31 Jan 2008 03:36:34 -0000 1.4 *************** *** 10,44 **** ***************************************************************************/ ! define('IN_PHPBB', true); ! define('IN_PORTAL', true); ! //$phpbb_root_path = './'; ! //include($phpbb_root_path . 'extension.inc'); ! //include($phpbb_root_path . 'common.'.$phpEx); ! //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.'.$phpEx); ! ! if( is_object($mx_block)) { ! $is_block = TRUE; } ! // ! // Start session management ! // ! //$userdata = session_pagestart($user_ip, PAGE_INDEX); ! //init_userprefs($userdata); ! ! $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); - include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); - // // Begin initial var setup --- 10,32 ---- ***************************************************************************/ + // + // ERROR HANDLING + // + //error_reporting( E_ALL ); + @ini_set( 'display_errors', '1' ); ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { ! die("Hacking attempt"); } + else + { + define( 'MXBB_MODULE', true ); ! $is_block = TRUE; ! } include($module_root_path . 'includes/weblogs_common.'.$phpEx); // // Begin initial var setup *************** *** 93,107 **** // - // End initial var setup - // - - // - // Start page proper - // - $page_title = $lang['Weblog_index']; - - include($mx_root_path . 'includes/page_header.'.$phpEx); - - // // Get the moods data // --- 81,84 ---- *************** *** 165,169 **** { $template->set_filenames(array( ! 'user' =>$module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 142,146 ---- { $template->set_filenames(array( ! 'user' => 'weblog_faceplate_body.tpl') ); } *************** *** 183,187 **** // Otherwise show a default face image. $template->set_filenames(array( ! 'user' => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 160,164 ---- // Otherwise show a default face image. $template->set_filenames(array( ! 'user' => 'weblog_faceplate_body.tpl') ); } *************** *** 189,193 **** else { ! $template_dir = get_template_dir ($user_weblog_data['template_id']); $template->set_filenames(array( --- 166,170 ---- else { ! $template_dir = get_template_dir($user_weblog_data['template_id']); $template->set_filenames(array( *************** *** 263,267 **** $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="' . $phpbb_root_path . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; --- 240,244 ---- $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; *************** *** 430,434 **** { $template->set_filenames(array( ! 'top' => $module_root_path . 'templates/subSilver/weblog_index_top.tpl') ); } --- 407,411 ---- { $template->set_filenames(array( ! 'top' => 'weblog_index_top.tpl') ); } *************** *** 436,440 **** { $template->set_filenames(array( ! 'top' => $module_root_path . 'templates/subSilver/weblog_index_top_small.tpl') ); } --- 413,417 ---- { $template->set_filenames(array( ! 'top' => 'weblog_index_top_small.tpl') ); } *************** *** 498,502 **** { $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_small_body.tpl') ); } --- 475,479 ---- { $template->set_filenames(array( ! $i => 'weblog_faceplate_small_body.tpl') ); } *************** *** 504,508 **** { $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 481,485 ---- { $template->set_filenames(array( ! $i => 'weblog_faceplate_body.tpl') ); } *************** *** 522,526 **** // Otherwise use a default faceplate. $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 499,503 ---- // Otherwise use a default faceplate. $template->set_filenames(array( ! $i => 'weblog_faceplate_body.tpl') ); } *************** *** 587,591 **** $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="'. $phpbb_root_path . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; --- 564,568 ---- $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="'. $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; *************** *** 678,682 **** $template->set_filenames(array( ! 'bottom' => $module_root_path . 'templates/subSilver/weblog_index_bottom.tpl') ); --- 655,659 ---- $template->set_filenames(array( ! 'bottom' => 'weblog_index_bottom.tpl') ); *************** *** 690,695 **** $template->pparse('bottom'); - //echo $mx_root_path ; - include($mx_root_path . 'includes/page_tail.'.$phpEx); - ?> --- 667,669 ---- Index: weblog.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weblog.php 20 Jun 2007 19:18:50 -0000 1.2 --- weblog.php 31 Jan 2008 03:36:34 -0000 1.3 *************** *** 49,57 **** // End session management // - //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); - include($module_root_path . 'includes/weblogs_constants.'. $phpEx); - include($module_root_path . 'includes/weblogs_common.'.$phpEx); - $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; --- 49,55 ---- // End session management // + include($module_root_path . 'includes/weblogs_common.'.$phpEx); + //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; *************** *** 723,727 **** if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = smilies_pass($entry_data[$i]['entry_text']); } } --- 721,725 ---- if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = mx_smilies_pass($entry_data[$i]['entry_text']); } } *************** *** 1040,1044 **** if ( $board_config['allow_smilies'] ) { ! $message = smilies_pass($message); } --- 1038,1042 ---- if ( $board_config['allow_smilies'] ) { ! $message = mx_smilies_pass($message); } Index: weblog_allentries.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_allentries.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblog_allentries.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_allentries.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 35,46 **** //$userdata = session_pagestart($user_ip, PAGE_INDEX); //init_userprefs($userdata); - $mx_user->init($user_ip, PAGE_INDEX); - // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'. $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); --- 35,44 ---- //$userdata = session_pagestart($user_ip, PAGE_INDEX); //init_userprefs($userdata); $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); *************** *** 85,94 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain weblog information.", "", __LINE__, __FILE__, $sql); } } else { ! message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } --- 83,92 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain weblog information.", "", __LINE__, __FILE__, $sql); } } else { ! mx_message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } *************** *** 103,112 **** else { ! message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } if ( $weblog_data['deleted'] ) { ! message_die(GENERAL_ERROR, sprintf($lang['Weblog_deactivated'], $weblog_data['weblog_name'])); } --- 101,110 ---- else { ! mx_message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } if ( $weblog_data['deleted'] ) { ! mx_message_die(GENERAL_ERROR, sprintf($lang['Weblog_deactivated'], $weblog_data['weblog_name'])); } *************** *** 118,122 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't get weblog owner information.", "", __LINE__, __FILE__, $sql); } --- 116,120 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get weblog owner information.", "", __LINE__, __FILE__, $sql); } *************** *** 162,166 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain limited entries count information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 160,164 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain limited entries count information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 202,206 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't get template directory information.", "", __LINE__, __FILE__, $sql); } --- 200,204 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get template directory information.", "", __LINE__, __FILE__, $sql); } *************** *** 274,278 **** if(!($result = $db->sql_query($sql))) { ! message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } --- 272,276 ---- if(!($result = $db->sql_query($sql))) { ! mx_message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } *************** *** 296,300 **** if(!($result = $db->sql_query($sql))) { ! message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } --- 294,298 ---- if(!($result = $db->sql_query($sql))) { ! mx_message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } *************** *** 313,317 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain mood data from database", "", __LINE__, __FILE__, $sql); } $mood_data = $db->sql_fetchrowset($result); --- 311,315 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain mood data from database", "", __LINE__, __FILE__, $sql); } $mood_data = $db->sql_fetchrowset($result); *************** *** 325,329 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); --- 323,327 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); Index: weblog_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_rss.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** weblog_rss.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_rss.php 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 32,48 **** // - // Get all the data - // - - // // Start session management // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! init_userprefs($userdata); // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); --- 32,42 ---- // // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); *************** *** 215,219 **** if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = smilies_pass($entry_data[$i]['entry_text']); } --- 209,213 ---- if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = mx_smilies_pass($entry_data[$i]['entry_text']); } Index: Weblogs.pak =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/Weblogs.pak,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Weblogs.pak 7 Jun 2007 22:01:31 -0000 1.1 --- Weblogs.pak 31 Jan 2008 03:36:34 -0000 1.2 *************** *** 1,5 **** ! module=+:71=+:MX Weblog=+:modules/mx_blogs/=+:Mx Weblog=+:1 ! function=+:71=+:57=+:Weblog List=+:Weblog List Block=+:weblogs.php=+: ! block=+:55=+:Weblog List=+:=+:57=+:0=+:0=+:0 ! function=+:71=+:59=+:Weblog Config=+:Weblog Config Block=+:weblog_config.php=+: ! block=+:54=+:Weblog Config=+:=+:59=+:0=+:0=+:0 --- 1,10 ---- ! module=+:87=+:MX Weblog=+:modules/mx_blogs/=+:Mx Weblog=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:87=+:96=+:Weblog List=+:Weblog List Block=+:weblogs.php=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Weblog List=+:Demo block=+:96=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:87=+:97=+:Weblog Config=+:Weblog Config Block=+:weblog_config.php=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Weblog Config=+:Demo block=+:97=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 \ No newline at end of file |
Update of /cvsroot/mxbb/mx_blogs/weblogs/templates/ljDigitalMultiplex/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22262 Added Files: Tag: core28x icon_aim.gif icon_edit.gif icon_email.gif icon_icq_add.gif icon_ip.gif icon_msnm.gif icon_pm.gif icon_profile.gif icon_quote.gif icon_search.gif icon_weblog.gif icon_www.gif icon_yim.gif newentry.gif reply-locked.gif reply.gif Log Message: new files --- NEW FILE: icon_edit.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_email.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_quote.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: newentry.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_icq_add.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_yim.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_pm.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_profile.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_search.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_aim.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: reply-locked.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_msnm.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: reply.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_www.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_weblog.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: icon_ip.gif --- (This appears to be a binary file; contents omitted.) |
|
From: OryNider <ory...@us...> - 2008-01-31 03:34:32
|
Update of /cvsroot/mxbb/mx_blogs/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22245 Added Files: Tag: core28x weblog_group_edit_body.tpl weblog_group_select_body.tpl Log Message: new files --- NEW FILE: weblog_group_select_body.tpl --- <h1>{L_GROUP_TITLE}</h1> <p>{L_GROUP_EXPLAIN}</p> <form method="post" action="{S_GROUP_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline"> <tr> <th class="thHead" align="center">{L_GROUP_SELECT}</th> </tr> <!-- BEGIN select_box --> <tr> <td class="row1" align="center">{S_GROUP_SELECT} <input type="submit" name="edit" value="{L_LOOK_UP}" class="mainoption" /> </td> </tr> <!-- END select_box --> <tr> <td class="catBottom" align="center">{S_HIDDEN_FIELDS}<input type="submit" class="liteoption" name="new" value="{L_CREATE_NEW_GROUP}" /></td> </tr> </table></form> --- NEW FILE: weblog_group_edit_body.tpl --- <h1>{L_GROUP_TITLE}</h1> <form action="{S_GROUP_ACTION}" method="post" name="post"><table border="0" cellpadding="3" cellspacing="1" class="forumline" align="center"> <tr> <th class="thHead" colspan="2">{L_GROUP_EDIT_DELETE}</th> </tr> <tr> <td class="row1" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_NAME}:</span></td> <td class="row2" width="62%"> <input class="post" type="text" name="group_name" size="35" maxlength="40" value="{GROUP_NAME}" /> </td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_DESCRIPTION}:</span></td> <td class="row2" width="62%"> <textarea class="post" name="group_description" rows="5" cols="51">{GROUP_DESCRIPTION}</textarea> </td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_MODERATOR}:</span></td> <td class="row2" width="62%"><input class="post" type="text" class="post" name="username" maxlength="50" size="20" value="{GROUP_MODERATOR}" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_STATUS}:</span></td> <td class="row2" width="62%"> <input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} <input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} <input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN}</td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_WEBLOG_GROUP}:</span></td> <td class="row2" width="62%"> <input type="radio" name="group_allow_weblogs" value="1" {S_GROUP_ALLOW_WEBLOGS_YES} /> {L_YES} <input type="radio" name="group_allow_weblogs" value="0" {S_GROUP_ALLOW_WEBLOGS_NO} /> {L_NO}</td> </tr> <!-- BEGIN group_edit --> <tr> <td class="row1" width="38%"><span class="gen">{L_DELETE_MODERATOR}</span> <br /> <span class="gensmall">{L_DELETE_MODERATOR_EXPLAIN}</span></td> <td class="row2" width="62%"> <input type="checkbox" name="delete_old_moderator" value="1"> {L_YES}</td> </tr> <tr> <td class="row1" width="38%"><span class="gen">{L_GROUP_DELETE}:</span></td> <td class="row2" width="62%"> <input type="checkbox" name="group_delete" value="1"> {L_GROUP_DELETE_CHECK}</td> </tr> <!-- END group_edit --> <tr> <td class="catBottom" colspan="2" align="center"><span class="cattitle"> <input type="submit" name="group_update" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" name="reset" class="liteoption" /> </span></td> </tr> </table>{S_HIDDEN_FIELDS}</form> |
|
From: OryNider <ory...@us...> - 2008-01-31 03:34:25
|
Update of /cvsroot/mxbb/mx_blogs/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22227 Added Files: Tag: core28x admin_weblog_groups.php Log Message: new files --- NEW FILE: admin_weblog_groups.php --- <?php /*************************************************************************** * admin_weblog_groups.php * ------------------- * begin : Saturday, Feb 13, 2001 * copyright : (C) 2001 The phpBB Group * email : su...@ph... * * $Id: admin_weblog_groups.php,v 1.1.2.1 2008/01/31 03:34:15 orynider Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ @define('IN_PORTAL', 1); if( !empty($setmodules) ) { $file = basename(__FILE__); $module['Blog_admin']['Groups'] = "modules/mx_blogs/admin/" . "$file"; return; } // // Load default header // $module_root_path = '../'; $mx_root_path = '../../../'; $music_root_path = $module_root_path . 'music_box/'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($mx_root_path . 'admin/pagestart.' . $phpEx); // ********************************************************************** // Read language definition // ********************************************************************** if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) { include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); } else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) { include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); } if ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) ) { $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]); } else { $group_id = 0; } if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) { $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $mode = htmlspecialchars($mode); } else { $mode = ''; } if ( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) ) { // // Ok they are editing a group or creating a new group // $template->set_filenames(array( 'body' => 'admin/weblog_group_edit_body.tpl') ); if ( isset($HTTP_POST_VARS['edit']) ) { // // They're editing. Grab the vars. // $sql = "SELECT * FROM " . GROUPS_TABLE . " WHERE group_single_user <> " . TRUE . " AND group_id = $group_id"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); } if ( !($group_info = $db->sql_fetchrow($result)) ) { mx_message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); } $mode = 'editgroup'; $template->assign_block_vars('group_edit', array()); } else if ( isset($HTTP_POST_VARS['new']) ) { $group_info = array ( 'group_name' => '', 'group_description' => '', 'group_moderator' => '', 'group_allow_weblogs' => 0, 'group_type' => GROUP_OPEN); $group_open = ' checked="checked"'; $mode = 'newgroup'; } // // Ok, now we know everything about them, let's show the page. // if ($group_info['group_moderator'] != '') { $sql = "SELECT user_id, username FROM " . USERS_TABLE . " WHERE user_id = " . $group_info['group_moderator']; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql); } if ( !($row = $db->sql_fetchrow($result)) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql); } $group_moderator = $row['username']; } else { $group_moderator = ''; } $group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? ' checked="checked"' : ''; $group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? ' checked="checked"' : ''; $group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? ' checked="checked"' : ''; $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />'; $template->assign_vars(array( 'GROUP_NAME' => $group_info['group_name'], 'GROUP_DESCRIPTION' => $group_info['group_description'], 'GROUP_MODERATOR' => $group_moderator, 'L_GROUP_TITLE' => $lang['Group_administration'], 'L_GROUP_EDIT_DELETE' => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'], 'L_GROUP_NAME' => $lang['group_name'], 'L_GROUP_DESCRIPTION' => $lang['group_description'], 'L_GROUP_MODERATOR' => $lang['group_moderator'], 'L_FIND_USERNAME' => $lang['Find_username'], 'L_GROUP_STATUS' => $lang['group_status'], 'L_GROUP_OPEN' => $lang['group_open'], 'L_GROUP_CLOSED' => $lang['group_closed'], 'L_GROUP_HIDDEN' => $lang['group_hidden'], 'L_GROUP_DELETE' => $lang['group_delete'], 'L_GROUP_DELETE_CHECK' => $lang['group_delete_check'], 'L_SUBMIT' => $lang['Submit'], 'L_RESET' => $lang['Reset'], 'L_DELETE_MODERATOR' => $lang['delete_group_moderator'], 'L_DELETE_MODERATOR_EXPLAIN' => $lang['delete_moderator_explain'], 'L_YES' => $lang['Yes'], 'U_SEARCH_USER' => mx_append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), 'L_WEBLOG_GROUP' => $lang['Group_allow_weblogs'], 'L_NO' => $lang['No'], 'S_GROUP_ALLOW_WEBLOGS_YES' => ( $group_info['group_allow_weblogs'] ) ? ' checked="checked"' : '', 'S_GROUP_ALLOW_WEBLOGS_NO' => ( !$group_info['group_allow_weblogs'] ) ? ' checked="checked"' : '', 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, 'S_GROUP_OPEN_CHECKED' => $group_open, 'S_GROUP_CLOSED_CHECKED' => $group_closed, 'S_GROUP_HIDDEN_CHECKED' => $group_hidden, 'S_GROUP_ACTION' => mx_append_sid("admin_weblog_groups.$phpEx"), 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); $template->pparse('body'); } else if ( isset($HTTP_POST_VARS['group_update']) ) { // // Ok, they are submitting a group, let's save the data based on if it's new or editing // if ( isset($HTTP_POST_VARS['group_delete']) ) { // // Reset User Moderator Level // // Is Group moderating a forum ? $sql = "SELECT auth_mod FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = " . $group_id; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not select auth_access', '', __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); if (intval($row['auth_mod']) == 1) { // Yes, get the assigned users and update their Permission if they are no longer moderator of one of the forums $sql = "SELECT user_id FROM " . USER_GROUP_TABLE . " WHERE group_id = " . $group_id; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not select user_group', '', __LINE__, __FILE__, $sql); } $rows = $db->sql_fetchrowset($result); for ($i = 0; $i < count($rows); $i++) { $sql = "SELECT g.group_id FROM " . AUTH_ACCESS_TABLE . " a, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE (a.auth_mod = 1) AND (g.group_id = a.group_id) AND (a.group_id = ug.group_id) AND (g.group_id = ug.group_id) AND (ug.user_id = " . intval($rows[$i]['user_id']) . ") AND (ug.group_id <> " . $group_id . ")"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain moderator permissions', '', __LINE__, __FILE__, $sql); } if ($db->sql_numrows($result) == 0) { $sql = "UPDATE " . USERS_TABLE . " SET user_level = " . USER . " WHERE user_level = " . MOD . " AND user_id = " . intval($rows[$i]['user_id']); if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update moderator permissions', '', __LINE__, __FILE__, $sql); } } } } // // Delete Group // $sql = "DELETE FROM " . GROUPS_TABLE . " WHERE group_id = " . $group_id; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . USER_GROUP_TABLE . " WHERE group_id = " . $group_id; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update user_group', '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . " WHERE group_id = " . $group_id; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update auth_access', '', __LINE__, __FILE__, $sql); } $message = $lang['Deleted_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . mx_append_sid("admin_weblog_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); } else { $group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN; $group_name = isset($HTTP_POST_VARS['group_name']) ? htmlspecialchars(trim($HTTP_POST_VARS['group_name'])) : ''; $group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : ''; $group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : ''; $group_allow_weblogs = ( isset($HTTP_POST_VARS['group_allow_weblogs']) ) ? intval($HTTP_POST_VARS['group_allow_weblogs']) : 0; $delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? true : false; if ( $group_name == '' ) { mx_message_die(GENERAL_MESSAGE, $lang['No_group_name']); } else if ( $group_moderator == '' ) { mx_message_die(GENERAL_MESSAGE, $lang['No_group_moderator']); } $this_userdata = get_userdata($group_moderator, true); $group_moderator = $this_userdata['user_id']; if ( !$group_moderator ) { mx_message_die(GENERAL_MESSAGE, $lang['No_group_moderator']); } if( $mode == "editgroup" ) { $sql = "SELECT * FROM " . GROUPS_TABLE . " WHERE group_single_user <> " . TRUE . " AND group_id = " . $group_id; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql); } if( !($group_info = $db->sql_fetchrow($result)) ) { mx_message_die(GENERAL_MESSAGE, $lang['Group_not_exist']); } if ( $group_info['group_moderator'] != $group_moderator ) { if ( $delete_old_moderator ) { $sql = "DELETE FROM " . USER_GROUP_TABLE . " WHERE user_id = " . $group_info['group_moderator'] . " AND group_id = " . $group_id; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql); } } $sql = "SELECT user_id FROM " . USER_GROUP_TABLE . " WHERE user_id = $group_moderator AND group_id = $group_id"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Failed to obtain current group moderator info', '', __LINE__, __FILE__, $sql); } if ( !($row = $db->sql_fetchrow($result)) ) { $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) VALUES (" . $group_id . ", " . $group_moderator . ", 0)"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql); } } } $sql = "UPDATE " . GROUPS_TABLE . " SET group_type = $group_type, group_name = '" . str_replace("\'", "''", $group_name) . "', group_description = '" . str_replace("\'", "''", $group_description) . "', group_moderator = $group_moderator, group_allow_weblogs = $group_allow_weblogs WHERE group_id = $group_id"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql); } $message = $lang['Updated_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . mx_append_sid("admin_weblog_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid("index.$phpEx?pane=right") . '">', '</a>');; mx_message_die(GENERAL_MESSAGE, $message); } else if( $mode == 'newgroup' ) { $sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user, group_allow_weblogs) VALUES ($group_type, '" . str_replace("\'", "''", $group_name) . "', '" . str_replace("\'", "''", $group_description) . "', $group_moderator, '0', $group_allow_weblogs)"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not insert new group', '', __LINE__, __FILE__, $sql); } $new_group_id = $db->sql_nextid(); $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending) VALUES ($new_group_id, $group_moderator, 0)"; if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not insert new user-group info', '', __LINE__, __FILE__, $sql); } $message = $lang['Added_new_group'] . '<br /><br />' . sprintf($lang['Click_return_groupsadmin'], '<a href="' . mx_append_sid("admin_weblog_groups.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid("index.$phpEx?pane=right") . '">', '</a>');; mx_message_die(GENERAL_MESSAGE, $message); } else { mx_message_die(GENERAL_MESSAGE, $lang['No_group_action']); } } } else { $sql = "SELECT group_id, group_name FROM " . GROUPS_TABLE . " WHERE group_single_user <> " . TRUE . " ORDER BY group_name"; if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not obtain group list', '', __LINE__, __FILE__, $sql); } $select_list = ''; if ( $row = $db->sql_fetchrow($result) ) { $select_list .= '<select name="' . POST_GROUPS_URL . '">'; do { $select_list .= '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>'; } while ( $row = $db->sql_fetchrow($result) ); $select_list .= '</select>'; } $template->set_filenames(array( 'body' => 'admin/weblog_group_select_body.tpl') ); $template->assign_vars(array( 'L_GROUP_TITLE' => $lang['Group_administration'], 'L_GROUP_EXPLAIN' => $lang['Group_admin_explain'], 'L_GROUP_SELECT' => $lang['Select_group'], 'L_LOOK_UP' => $lang['Look_up_group'], 'L_CREATE_NEW_GROUP' => $lang['New_group'], 'S_GROUP_ACTION' => mx_append_sid("admin_weblog_groups.$phpEx"), 'S_GROUP_SELECT' => $select_list) ); if ( $select_list != '' ) { $template->assign_block_vars('select_box', array()); } $template->pparse('body'); } include($mx_root_path . 'admin/page_footer_admin.'.$phpEx); ?> |
|
From: OryNider <ory...@us...> - 2008-01-31 03:33:36
|
Update of /cvsroot/mxbb/mx_blogs/weblogs/templates/ljDigitalMultiplex/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21825/lang_english Log Message: Directory /cvsroot/mxbb/mx_blogs/weblogs/templates/ljDigitalMultiplex/lang_english added to the repository --> Using per-directory sticky tag `core28x' |
|
From: OryNider <ory...@us...> - 2008-01-31 03:32:02
|
Update of /cvsroot/mxbb/mx_blogs/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20965/includes Modified Files: Tag: core28x weblogs_common.php weblogs_constants.php Log Message: finished porting this module :) Index: weblogs_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/includes/weblogs_common.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** weblogs_common.php 28 Jun 2007 18:04:21 -0000 1.2 --- weblogs_common.php 31 Jan 2008 03:31:55 -0000 1.2.2.1 *************** *** 19,53 **** * ***************************************************************************/ ! if ( !defined('IN_PHPBB') ) { die("Hacking attempt"); } if ( !isset($mx_root_path)) { $mx_root_path = '../../../'; } - include($mx_root_path . 'modules/mx_blogs/includes/weblogs_constants.'.$phpEx); - //include($phpbb_root_path . 'includes/functions_weblog.'.$phpEx); - include($mx_root_path . 'modules/mx_blogs/includes/functions_weblog.'.$phpEx); - //include($mx_root_path . 'includes/mx_functions.'.$phpEx); - // The Blog Mod version 0.2.5 - define('WEBLOGS_MOD_VERSION', '0.2.6'); - - // Weblog Constants (Constants used all over the place) - define('SORT_NEWEST_ENTRIES', 0); - define('SORT_WEBLOG_NAME', 1); - define('SORT_NUM_ENTRIES', 2); - define('SORT_WEBLOG_START_DATE', 3); - define('SORT_WEBLOG_VIEWS', 4); - define('SORT_WEBLOG_OWNER_NAME', 5); ! define('ACTION_DO_NOTHING', 0); ! define('ACTION_LOAD_TEMPLATE', 1); ! define('ACTION_SWITCH_MODE', 2); ! ! define('WEBLOG_AUTH_ALL', 0); ! define('WEBLOG_AUTH_REGISTERED', 1); ! define('WEBLOG_AUTH_FRIENDS', 2); ! define('WEBLOG_AUTH_OWNER', 3); // ********************************************************************** --- 19,35 ---- * ***************************************************************************/ ! ! if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } + if ( !isset($mx_root_path)) { $mx_root_path = '../../../'; } ! include_once($module_root_path . 'includes/weblogs_constants.'.$phpEx); ! include_once($module_root_path . 'includes/functions_weblog.'.$phpEx); // ********************************************************************** *************** *** 68,81 **** } - - - - - - - // include the weblog language file $use_lang = ( !file_exists($mx_root_path . 'modules/mx_blogs/language/lang_' . $board_config['default_lang'] . '/lang_weblog_main.'.$phpEx) ) ? 'english' : $board_config['default_lang']; ! include($mx_root_path . 'modules/mx_blogs/language/lang_' . $use_lang . '/lang_weblog_main.' . $phpEx); // --- 50,66 ---- } // include the weblog language file $use_lang = ( !file_exists($mx_root_path . 'modules/mx_blogs/language/lang_' . $board_config['default_lang'] . '/lang_weblog_main.'.$phpEx) ) ? 'english' : $board_config['default_lang']; ! ! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_main.' . $phpEx ) ) ! { ! include_once( $module_root_path . 'language/lang_english/lang_weblog_main.' . $phpEx ); ! $link_language='lang_english'; ! } ! else ! { ! include_once( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_main.' . $phpEx ); ! $link_language='lang_' . $board_config['default_lang']; ! } // Index: weblogs_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/includes/weblogs_constants.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** weblogs_constants.php 7 Jun 2007 22:01:33 -0000 1.1 --- weblogs_constants.php 31 Jan 2008 03:31:55 -0000 1.1.2.1 *************** *** 1,7 **** <?php if (!isset($mx_table_prefix)) { ! $mx_table_prefix = 'mx_'; } define('POST_WEBLOG_URL', 'w'); define('POST_ENTRY_URL', 'e'); --- 1,12 ---- <?php + if (!isset($mx_table_prefix)) { ! $mx_table_prefix = 'mx_'; } + + // The Blog Mod version 0.2.5 + define('WEBLOGS_MOD_VERSION', '0.2.6'); + define('POST_WEBLOG_URL', 'w'); define('POST_ENTRY_URL', 'e'); *************** *** 20,23 **** --- 25,31 ---- define('WEBLOG_TRACKBACKS_TABLE', $mx_table_prefix.'weblog_trackbacks'); define('WEBLOGS_TABLE', $mx_table_prefix.'weblogs'); + + + // Weblog Constants (Constants used all over the place) define('SORT_NEWEST_ENTRIES', 0); define('SORT_WEBLOG_NAME', 1); |
Update of /cvsroot/mxbb/mx_blogs/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20965/admin Modified Files: Tag: core28x admin_weblog_action.php admin_weblog_cfg.php admin_weblog_mood.php admin_weblog_templates.php admin_weblog_tools.php Log Message: finished porting this module :) Index: admin_weblog_action.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_action.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_weblog_action.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_action.php 31 Jan 2008 03:31:55 -0000 1.1.2.1 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); // --- 20,29 ---- ***************************************************************************/ ! // ! // ERROR HANDLING ! // ! //error_reporting( E_ALL ); ! ! @define('IN_PORTAL', 1); // *************** *** 33,44 **** } ! $mx_root_path = "./../../../"; ! $module_root_path ="./../"; ! //include($mx_root_path . 'extension.inc'); $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'admin/pagestart.' . $phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 38,62 ---- } ! // ! // Load default header ! // ! $module_root_path = '../'; ! $mx_root_path = '../../../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); ! ! require($mx_root_path . 'admin/pagestart.' . $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 50,54 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); --- 68,72 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); *************** *** 64,68 **** else { ! $mode = ""; } --- 82,86 ---- else { ! $mode = false; } *************** *** 74,78 **** while($file = @readdir($dir)) { ! if( !@is_dir(phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); --- 92,96 ---- while($file = @readdir($dir)) { ! if( !@is_dir($module_root_path . 'images/weblogs/' . $file) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); *************** *** 84,90 **** } } - @closedir($dir); // // Select main mode --- 102,108 ---- } } @closedir($dir); + // // Select main mode *************** *** 117,124 **** "L_RESET" => $lang['Reset'], ! "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_images[0], ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); --- 135,142 ---- "L_RESET" => $lang['Reset'], ! "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_images[0], ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); *************** *** 126,130 **** $template->pparse("body"); } ! else if ( $mode != "" ) { switch( $mode ) --- 144,148 ---- $template->pparse("body"); } ! else if (!empty($mode)) { switch( $mode ) *************** *** 142,151 **** if( !$result ) { ! message_die(GENERAL_ERROR, "Couldn't delete action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_del_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; --- 160,169 ---- if( !$result ) { ! mx_message_die(GENERAL_ERROR, "Couldn't delete action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_del_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; *************** *** 163,167 **** if( !$result ) { ! message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql); } $currently_data = $db->sql_fetchrow($result); --- 181,185 ---- if( !$result ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql); } $currently_data = $db->sql_fetchrow($result); *************** *** 198,206 **** "L_RESET" => $lang['Reset'], ! "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_edit_img, "CURRENTLY_CURRENTLY" => $currently_data['action_text'], ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); --- 216,224 ---- "L_RESET" => $lang['Reset'], ! "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_edit_img, "CURRENTLY_CURRENTLY" => $currently_data['action_text'], ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); *************** *** 225,229 **** if ( $currently_url == '') { ! message_die(MESSAGE, $lang['Fields_empty']); } --- 243,247 ---- if ( $currently_url == '') { ! mx_message_die(MESSAGE, $lang['Fields_empty']); } *************** *** 236,245 **** if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't update action info", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; --- 254,263 ---- if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't update action info", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; *************** *** 259,263 **** if ($currently_url == '') { ! message_die(MESSAGE, $lang['Fields_empty']); } --- 277,281 ---- if ($currently_url == '') { ! mx_message_die(MESSAGE, $lang['Fields_empty']); } *************** *** 269,278 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't insert new action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_add_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! message_die(GENERAL_MESSAGE, $message); break; } --- 287,296 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't insert new action", "", __LINE__, __FILE__, $sql); } ! $message = $lang['Weblog_currently_add_success'] . "<br /><br />" . sprintf($lang['Click_return_currentlyadmin'], "<a href=\"" . mx_append_sid("admin_weblog_action.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); ! mx_message_die(GENERAL_MESSAGE, $message); break; } *************** *** 280,284 **** else { - // // This is the main display of the page before the admin has selected --- 298,301 ---- *************** *** 299,305 **** "L_IMAGE" => $lang['Weblog_image'], "L_CURRENTLY" => $lang['Weblog_currently'], ! ! "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx")) ); --- 316,322 ---- "L_IMAGE" => $lang['Weblog_image'], "L_CURRENTLY" => $lang['Weblog_currently'], ! ! "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_CURRENTLY_ACTION" => mx_append_sid("admin_weblog_action.$phpEx")) ); *************** *** 315,324 **** "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! ! "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $action_data[$i]['action_url'], "CURRENTLY" => $action_data[$i]['action_text'], ! ! "U_CURRENTLY_EDIT" => append_sid("admin_weblog_action.$phpEx?mode=edit&id=" . $action_data[$i]['action_id']), ! "U_CURRENTLY_DELETE" => append_sid("admin_weblog_action.$phpEx?mode=delete&id=" . $action_data[$i]['action_id'])) ); } --- 332,341 ---- "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! ! "CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $action_data[$i]['action_url'], "CURRENTLY" => $action_data[$i]['action_text'], ! ! "U_CURRENTLY_EDIT" => mx_append_sid("admin_weblog_action.$phpEx?mode=edit&id=" . $action_data[$i]['action_id']), ! "U_CURRENTLY_DELETE" => mx_append_sid("admin_weblog_action.$phpEx?mode=delete&id=" . $action_data[$i]['action_id'])) ); } Index: admin_weblog_templates.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_templates.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_weblog_templates.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_templates.php 31 Jan 2008 03:31:55 -0000 1.1.2.1 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); // --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); // *************** *** 40,44 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 40,55 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 109,113 **** "L_RESET" => $lang['Reset'], ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx?mode=savenew"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 120,124 ---- "L_RESET" => $lang['Reset'], ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx?mode=savenew"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 155,159 **** } ! $message = $lang['Weblog_template_del_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 166,170 ---- } ! $message = $lang['Weblog_template_del_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 208,212 **** "TEMPLATE_NOT_PRIVATE_CHECKED" => ( !$templates_data['template_private'] ) ? ' checked="checked"' : '', ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx?mode=edit&id=$template_id"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) --- 219,223 ---- "TEMPLATE_NOT_PRIVATE_CHECKED" => ( !$templates_data['template_private'] ) ? ' checked="checked"' : '', ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx?mode=edit&id=$template_id"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) *************** *** 250,254 **** } ! $message = $lang['Weblog_template_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 261,265 ---- } ! $message = $lang['Weblog_template_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 312,316 **** } ! $message = $lang['Weblog_template_add_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 323,327 ---- } ! $message = $lang['Weblog_template_add_success'] . "<br /><br />" . sprintf($lang['Click_return_templateadmin'], "<a href=\"" . mx_append_sid("admin_weblog_templates.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 342,346 **** "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_TEMPLATE_ACTION" => append_sid("admin_weblog_templates.$phpEx")) ); --- 353,357 ---- "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_TEMPLATE_ACTION" => mx_append_sid("admin_weblog_templates.$phpEx")) ); *************** *** 360,365 **** "TEMPLATE_IMAGE" => '<img src="' . $module_root_path . 'weblogs/templates/' . $template_data[$i]['template_dir'] . '/preview_img.gif" border="0">', "TEMPLATE_PRIVATE" => ( $template_data[$i]['template_private'] ) ? $lang['Yes'] : $lang['No'], ! "U_TEMPLATE_EDIT" => append_sid("admin_weblog_templates.$phpEx?mode=edit&id=" . $template_data[$i]['template_id']), ! "U_TEMPLATE_DELETE" => append_sid("admin_weblog_templates.$phpEx?mode=delete&id=" . $template_data[$i]['template_id'])) ); } --- 371,376 ---- "TEMPLATE_IMAGE" => '<img src="' . $module_root_path . 'weblogs/templates/' . $template_data[$i]['template_dir'] . '/preview_img.gif" border="0">', "TEMPLATE_PRIVATE" => ( $template_data[$i]['template_private'] ) ? $lang['Yes'] : $lang['No'], ! "U_TEMPLATE_EDIT" => mx_append_sid("admin_weblog_templates.$phpEx?mode=edit&id=" . $template_data[$i]['template_id']), ! "U_TEMPLATE_DELETE" => mx_append_sid("admin_weblog_templates.$phpEx?mode=delete&id=" . $template_data[$i]['template_id'])) ); } Index: admin_weblog_tools.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_tools.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_weblog_tools.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_tools.php 31 Jan 2008 03:31:55 -0000 1.1.2.1 *************** *** 19,24 **** * ***************************************************************************/ ! define('IN_PORTAL',1); ! define('IN_PHPBB', 1); if( !empty($setmodules) ) --- 19,23 ---- * ***************************************************************************/ ! @define('IN_PORTAL',1); if( !empty($setmodules) ) *************** *** 39,43 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); $html_entities_match = array('#<#', '#>#'); --- 38,53 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } $html_entities_match = array('#<#', '#>#'); *************** *** 73,79 **** 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_USER_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=user_admin"), 'S_USER_SELECT' => $select_list) ); --- 83,89 ---- 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => mx_append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_USER_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=user_admin"), 'S_USER_SELECT' => $select_list) ); *************** *** 94,98 **** 'L_LOOK_UP' => $lang['Look_up_weblog'], ! 'S_USER_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=weblog_admin"), 'S_USER_SELECT' => $select_list) ); --- 104,108 ---- 'L_LOOK_UP' => $lang['Look_up_weblog'], ! 'S_USER_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=weblog_admin"), 'S_USER_SELECT' => $select_list) ); *************** *** 151,155 **** // That's all, Folks! ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 161,165 ---- // That's all, Folks! ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 167,171 **** // That's all, Folks! ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 177,181 ---- // That's all, Folks! ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 188,192 **** } ! $message = $lang['Weblogs_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 198,202 ---- } ! $message = $lang['Weblogs_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 209,213 **** } ! $message = $lang['Entries_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 219,223 ---- } ! $message = $lang['Entries_restored'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 230,234 **** } ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 240,244 ---- } ! $message = $lang['Weblogs_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 251,255 **** } ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 261,265 ---- } ! $message = $lang['Entries_purged'] . "<br /><br />" . sprintf($lang['Click_return_weblog_tools'], '<a href="' . mx_append_sid("admin_weblog_tools.$phpEx") . '">', '</a>') . "<br /><br />" . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 263,267 **** 'ROW_CLASS' => $row_class, 'WEBLOG' => $del_weblogs[$i]['weblog_name'], ! 'U_PROFILE' => append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_weblogs[$i]['user_id']), 'OWNER' => $del_weblogs[$i]['username'], 'WEBLOG_DESC' => $del_weblogs[$i]['weblog_desc'], --- 273,277 ---- 'ROW_CLASS' => $row_class, 'WEBLOG' => $del_weblogs[$i]['weblog_name'], ! 'U_PROFILE' => mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_weblogs[$i]['user_id']), 'OWNER' => $del_weblogs[$i]['username'], 'WEBLOG_DESC' => $del_weblogs[$i]['weblog_desc'], *************** *** 279,284 **** 'ENTRY' => $del_entries[$i]['entry_subject'], 'WEBLOG' => $del_entries[$i]['weblog_name'], ! 'U_PROFILE' => append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_entries[$i]['user_id']), ! 'U_WEBLOG' => append_sid($module_root_path . "weblog.$phpEx?" . POST_WEBLOG_URL . "=" . $del_entries[$i]['weblog_id']), 'OWNER' => $del_entries[$i]['username'], 'WEBLOG_DESC' => $del_entries[$i]['weblog_desc'], --- 289,294 ---- 'ENTRY' => $del_entries[$i]['entry_subject'], 'WEBLOG' => $del_entries[$i]['weblog_name'], ! 'U_PROFILE' => mx_append_sid($phpbb_root_path . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $del_entries[$i]['user_id']), ! 'U_WEBLOG' => mx_append_sid($module_root_path . "weblog.$phpEx?" . POST_WEBLOG_URL . "=" . $del_entries[$i]['weblog_id']), 'OWNER' => $del_entries[$i]['username'], 'WEBLOG_DESC' => $del_entries[$i]['weblog_desc'], *************** *** 301,307 **** 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_PURGE_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=purge"), 'S_USER_SELECT' => $select_list) --- 311,317 ---- 'L_FIND_USERNAME' => $lang['Find_username'], ! 'U_SEARCH_USER' => mx_append_sid($phpbb_root_path . "search.$phpEx?mode=searchuser"), ! 'S_PURGE_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=purge"), 'S_USER_SELECT' => $select_list) *************** *** 369,373 **** 'S_HIDDEN_FIELDS' => '<input type="hidden" name="user_id" value="' . $weblog_user_data['user_id'] . '" />', ! 'S_CONFIG_ACTION' => append_sid("admin_weblog_tools.$phpEx?mode=edit")) ); } --- 379,383 ---- 'S_HIDDEN_FIELDS' => '<input type="hidden" name="user_id" value="' . $weblog_user_data['user_id'] . '" />', ! 'S_CONFIG_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx?mode=edit")) ); } *************** *** 395,399 **** $template->assign_vars(array( ! 'S_SELECT_ACTION' => append_sid("admin_weblog_tools.$phpEx")) ); } --- 405,409 ---- $template->assign_vars(array( ! 'S_SELECT_ACTION' => mx_append_sid("admin_weblog_tools.$phpEx")) ); } Index: admin_weblog_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_cfg.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_weblog_cfg.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_cfg.php 31 Jan 2008 03:31:55 -0000 1.1.2.1 *************** *** 1,5 **** <?php /*************************************************************************** ! * admin_weblog_config.php * ----------------------------- * begin : Monday, September 5, 2004 --- 1,5 ---- <?php /*************************************************************************** ! * admin_weblog_cfg.php * ----------------------------- * begin : Monday, September 5, 2004 *************** *** 20,24 **** ***************************************************************************/ ! define('IN_PORTAL', 1); if( !empty($setmodules) ) --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); if( !empty($setmodules) ) *************** *** 41,45 **** include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 41,56 ---- include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 50,54 **** if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, "Could not query config information in admin_weblog_config", "", __LINE__, __FILE__, $sql); } else --- 61,65 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(CRITICAL_ERROR, "Could not query config information in admin_weblog_cfg", "", __LINE__, __FILE__, $sql); } else *************** *** 81,85 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Weblog_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_weblog_config'], "<a href=\"" . append_sid("admin_weblog_config.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 92,96 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Weblog_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_weblog_config'], "<a href=\"" . mx_append_sid("admin_weblog_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 151,155 **** // $template->assign_vars(array( ! 'S_CONFIG_ACTION' => append_sid("admin_weblog_cfg.$phpEx"), 'L_YES' => $lang['Yes'], --- 162,166 ---- // $template->assign_vars(array( ! 'S_CONFIG_ACTION' => mx_append_sid("admin_weblog_cfg.$phpEx"), 'L_YES' => $lang['Yes'], Index: admin_weblog_mood.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_mood.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_weblog_mood.php 7 Jun 2007 22:01:32 -0000 1.1 --- admin_weblog_mood.php 31 Jan 2008 03:31:55 -0000 1.1.2.1 *************** *** 20,25 **** ***************************************************************************/ ! define('IN_PORTAL', 1); ! // --- 20,24 ---- ***************************************************************************/ ! @define('IN_PORTAL', 1); // *************** *** 37,45 **** $module_root_path = "./../"; //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'admin/pagestart.' . $phpEx); include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'language/lang_' . $use_lang . '/lang_weblog_admin.' . $phpEx); // --- 36,55 ---- $module_root_path = "./../"; //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'admin/pagestart.' . $phpEx); include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! ! // ********************************************************************** ! // Read language definition ! // ********************************************************************** ! if ( file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_weblog_admin.' . $phpEx ); ! } ! else if ( file_exists( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ) ) ! { ! include( $module_root_path . 'language/lang_english/lang_weblog_admin.' . $phpEx ); ! } // *************** *** 83,87 **** while($file = @readdir($dir)) { ! if( !@is_dir(phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); --- 93,97 ---- while($file = @readdir($dir)) { ! if( !@is_dir($module_root_path . 'images/weblogs/' . $file) ) { $img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file); *************** *** 93,97 **** } } - @closedir($dir); --- 103,106 ---- *************** *** 136,143 **** "L_RESET" => $lang['Reset'], ! "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_images[0], ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); --- 145,152 ---- "L_RESET" => $lang['Reset'], ! "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_images[0], ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); *************** *** 168,172 **** "MOOD_SET" => '', ! "S_MOOD_SET_ACTION" => append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); --- 177,181 ---- "MOOD_SET" => '', ! "S_MOOD_SET_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); *************** *** 189,193 **** } ! $message = $lang['Weblog_mood_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 198,202 ---- } ! $message = $lang['Weblog_mood_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 215,219 **** } ! $message = $lang['Weblog_mood_set_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 224,228 ---- } ! $message = $lang['Weblog_mood_set_del_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 268,276 **** "L_RESET" => $lang['Reset'], ! "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_edit_img, "MOOD_MOOD" => $mood_data['mood_text'], ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); --- 277,285 ---- "L_RESET" => $lang['Reset'], ! "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_edit_img, "MOOD_MOOD" => $mood_data['mood_text'], ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); *************** *** 311,316 **** "MOOD_SET" => $mood_set_data['set_name'], ! "S_MOOD_SET_ACTION" => append_sid("admin_weblog_mood.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); --- 320,325 ---- "MOOD_SET" => $mood_set_data['set_name'], ! "S_MOOD_SET_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx"), ! "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list) ); *************** *** 350,354 **** } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 359,363 ---- } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 385,389 **** } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 394,398 ---- } ! $message = $lang['Weblog_mood_edit_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 433,437 **** } ! $message = $lang['Weblog_mood_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 442,446 ---- } ! $message = $lang['Weblog_mood_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 481,485 **** } ! $message = $lang['Weblog_mood_set_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 490,494 ---- } ! $message = $lang['Weblog_mood_set_add_success'] . "<br /><br />" . sprintf($lang['Click_return_moodadmin'], "<a href=\"" . mx_append_sid("admin_weblog_mood.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 493,497 **** // any options. // ! $template->set_filenames(array( "body" => "admin/weblog_mood_list_body.tpl") --- 502,506 ---- // any options. // ! $template->set_filenames(array( "body" => "admin/weblog_mood_list_body.tpl") *************** *** 499,503 **** $s_hidden_fields = '<input type="hidden" name="type" value="set" />'; ! $template->assign_vars(array( "L_ACTION" => $lang['Action'], --- 508,512 ---- $s_hidden_fields = '<input type="hidden" name="type" value="set" />'; ! $template->assign_vars(array( "L_ACTION" => $lang['Action'], *************** *** 511,519 **** "L_MOOD" => $lang['Weblog_mood'], "L_MOOD_SET_ADD" => $lang['Weblog_mood_set_add'], ! "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx?mode=addset")) ); ! // Organize Everything for ( $i = 0; $i < count($mood_set_data); $i++) --- 520,528 ---- "L_MOOD" => $lang['Weblog_mood'], "L_MOOD_SET_ADD" => $lang['Weblog_mood_set_add'], ! "S_HIDDEN_FIELDS" => $s_hidden_fields, ! "S_MOOD_ACTION" => mx_append_sid("admin_weblog_mood.$phpEx?mode=addset")) ); ! // Organize Everything for ( $i = 0; $i < count($mood_set_data); $i++) *************** *** 521,541 **** $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; ! $template->assign_block_vars("mood_set", array( "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! "SET_NAME" => $mood_set_data[$i]['set_name'], ! ! "U_SET_ADD" => append_sid("admin_weblog_mood.$phpEx?mode=addmood&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editset&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deleteset&id=" . $mood_set_data[$i]['set_id'])) ); ! for ($j = 0; $j < count($mood_data); $j++) { $row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2']; ! if ( $mood_data[$j]['mood_set'] == $mood_set_data[$i]['set_id'] ) { --- 530,550 ---- $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; ! $template->assign_block_vars("mood_set", array( "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! "SET_NAME" => $mood_set_data[$i]['set_name'], ! ! "U_SET_ADD" => mx_append_sid("admin_weblog_mood.$phpEx?mode=addmood&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_EDIT" => mx_append_sid("admin_weblog_mood.$phpEx?mode=editset&id=" . $mood_set_data[$i]['set_id']), ! "U_SET_DELETE" => mx_append_sid("admin_weblog_mood.$phpEx?mode=deleteset&id=" . $mood_set_data[$i]['set_id'])) ); ! for ($j = 0; $j < count($mood_data); $j++) { $row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2']; ! if ( $mood_data[$j]['mood_set'] == $mood_set_data[$i]['set_id'] ) { *************** *** 543,552 **** "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! ! "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_data[$j]['mood_url'], "MOOD" => $mood_data[$j]['mood_text'], ! ! "U_MOOD_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editmood&id=" . $mood_data[$j]['mood_id']), ! "U_MOOD_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deletemood&id=" . $mood_data[$j]['mood_id'])) ); } --- 552,561 ---- "ROW_COLOR" => "#" . $row_color, "ROW_CLASS" => $row_class, ! ! "MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_data[$j]['mood_url'], "MOOD" => $mood_data[$j]['mood_text'], ! ! "U_MOOD_EDIT" => mx_append_sid("admin_weblog_mood.$phpEx?mode=editmood&id=" . $mood_data[$j]['mood_id']), ! "U_MOOD_DELETE" => mx_append_sid("admin_weblog_mood.$phpEx?mode=deletemood&id=" . $mood_data[$j]['mood_id'])) ); } |
|
From: OryNider <ory...@us...> - 2008-01-31 03:32:02
|
Update of /cvsroot/mxbb/mx_blogs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20965 Modified Files: Tag: core28x Weblogs.pak weblog.php weblog_allentries.php weblog_config.php weblog_entry.php weblog_posting.php weblog_rss.php weblogs.php Log Message: finished porting this module :) Index: weblog_posting.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_posting.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** weblog_posting.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_posting.php 31 Jan 2008 03:31:54 -0000 1.1.2.1 *************** *** 32,36 **** include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } ! $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; if (!defined('PHPBB_URL')) { --- 32,36 ---- include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } ! //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; if (!defined('PHPBB_URL')) { *************** *** 1112,1116 **** if ( $smilies_on ) { ! $preview_message = smilies_pass($preview_message); } } --- 1112,1116 ---- if ( $smilies_on ) { ! $preview_message = mx_smilies_pass($preview_message); } } *************** *** 1330,1334 **** if ( $entry_data['enable_smilies'] ) { ! $entry_message = smilies_pass($entry_message); } } --- 1330,1334 ---- if ( $entry_data['enable_smilies'] ) { ! $entry_message = mx_smilies_pass($entry_message); } } *************** *** 1424,1428 **** if ( $reply_data[$i]['enable_smilies'] ) { ! $reply_message = smilies_pass($reply_message); } } --- 1424,1428 ---- if ( $reply_data[$i]['enable_smilies'] ) { ! $reply_message = mx_smilies_pass($reply_message); } } Index: weblog_entry.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_entry.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** weblog_entry.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_entry.php 31 Jan 2008 03:31:54 -0000 1.1.2.1 *************** *** 22,32 **** define('IN_PHPBB', true); define('IN_PORTAL', true); - //$phpbb_root_path = './'; $mx_root_path = '../../'; $module_root_path = './'; - //include($phpbb_root_path . 'extension.inc'); - //include($phpbb_root_path . 'common.'.$phpEx); - //include($phpbb_root_path . 'includes/bbcode.'.$phpEx); - //include($mx_root_path . 'extension.inc'); $phpEx = substr(strrchr(__FILE__, '.'), 1); include($mx_root_path . 'common.'.$phpEx); --- 22,27 ---- *************** *** 35,47 **** // Start session management // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! init_userprefs($userdata); // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'. $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; // // Start initial var setup --- 30,41 ---- // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); ! //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; // // Start initial var setup *************** *** 403,408 **** if ( $entry_data['enable_smilies'] ) { ! ! $message = smilies_pass($message); } } --- 397,401 ---- if ( $entry_data['enable_smilies'] ) { ! $message = mx_smilies_pass($message); } } *************** *** 849,858 **** if ( $reply_data[$i]['user_allowsmile'] && $user_sig != '' ) { ! $user_sig = smilies_pass($user_sig); } if ( $reply_data[$i]['enable_smilies'] ) { ! $message = smilies_pass($message); } } --- 842,851 ---- if ( $reply_data[$i]['user_allowsmile'] && $user_sig != '' ) { ! $user_sig = mx_smilies_pass($user_sig); } if ( $reply_data[$i]['enable_smilies'] ) { ! $message = mx_smilies_pass($message); } } Index: weblog_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_config.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** weblog_config.php 28 Jun 2007 18:04:21 -0000 1.2 --- weblog_config.php 31 Jan 2008 03:31:54 -0000 1.2.2.1 *************** *** 20,57 **** ***************************************************************************/ ! define('IN_PHPBB', true); ! //$phpbb_root_path = './'; ! //include($phpbb_root_path . 'extension.inc'); ! //include($phpbb_root_path . 'common.'.$phpEx); ! //include($phpbb_root_path . 'includes/bbcode.'.$phpEx); ! //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.'.$phpEx); if (!function_exists('prepare_message')) { ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } if (!function_exists('smilies_pass')) { ! include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); } ! // ! // Start session management ! // ! //$userdata = session_pagestart($user_ip, PAGE_INDEX); ! //init_userprefs($userdata); ! $mx_user->init($user_ip, PAGE_INDEX); ! // ! // End session management ! // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); - // - // Include the Header - // - $page_title = $lang['Weblog_CP']; - include($mx_root_path . 'includes/page_header.'.$phpEx); // Check to see if the user is allowed to have a weblog. --- 20,52 ---- ***************************************************************************/ ! // ! // ERROR HANDLING ! // ! //error_reporting( E_ALL ); ! @ini_set( 'display_errors', '1' ); ! ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! die("Hacking attempt"); ! } ! else ! { ! define( 'MXBB_MODULE', true ); ! ! $is_block = TRUE; ! } ! if (!function_exists('prepare_message')) { ! @include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); } if (!function_exists('smilies_pass')) { ! @include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); } ! ! //include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); // Check to see if the user is allowed to have a weblog. *************** *** 154,158 **** $template->set_filenames(array( ! "body" => $module_root_path . "templates/subSilver/weblog_cp_body.tpl") ); --- 149,153 ---- $template->set_filenames(array( ! "body" => "weblog_cp_body.tpl") ); *************** *** 167,174 **** if ( !$weblog_exists ) { ! $template_dir = get_template_dir ( $template_data[0]['template_id'] ); // if ( @file_exists($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) ! if ( @file_exists($module_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) { // include($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg"); --- 162,169 ---- if ( !$weblog_exists ) { ! $template_dir = get_template_dir($template_data[0]['template_id']); // if ( @file_exists($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) ! if ( @file_exists($module_root_path . "weblogs/templates/$template_dir/$template_dir.cfg") ) { // include($phpbb_root_path . "weblogs/templates/$template_dir/$template_dir.cfg"); *************** *** 261,265 **** $custom_block = ( isset($HTTP_POST_VARS['custom_block']) ) ? trim($HTTP_POST_VARS['custom_block']) : $custom_block; ! $template_dir = get_template_dir ( $weblog_template ); // --- 256,260 ---- $custom_block = ( isset($HTTP_POST_VARS['custom_block']) ) ? trim($HTTP_POST_VARS['custom_block']) : $custom_block; ! $template_dir = get_template_dir( $weblog_template ); // *************** *** 327,334 **** if ( !empty($error_msg) ) { ! mx_message_die (GENERAL_ERROR, $lang['Errors_occured'] . $error_msg); } ! $template_dir = get_template_dir ($weblog_template); if ( isset($HTTP_POST_VARS['create']) ) --- 322,329 ---- if ( !empty($error_msg) ) { ! mx_message_die(GENERAL_ERROR, $lang['Errors_occured'] . $error_msg); } ! $template_dir = get_template_dir($weblog_template); if ( isset($HTTP_POST_VARS['create']) ) *************** *** 530,534 **** ! $message = sprintf($lang['Weblog_created'], '<a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog.$phpEx?" . POST_WEBLOG_URL . "=" . ($maximum+1)) . '">', '</a>', '<a href="' . append_sid($mx_root_path . "index$phpEx?page=" . $weblog_config['mx_weblog_config_page']) . '">', '</a>'); } else --- 525,529 ---- ! $message = sprintf($lang['Weblog_created'], '<a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog.$phpEx?" . POST_WEBLOG_URL . "=" . ($maximum+1)) . '">', '</a>', '<a href="' . append_sid($mx_root_path . "index.$phpEx?page=" . $weblog_config['mx_weblog_config_page']) . '">', '</a>'); } else *************** *** 904,908 **** 'L_TITLE' => $lang['Title'], 'L_SHOW_ENABLE_SHOUTBOX' => $lang['Show_enable_shoutbox'], ! 'L_SHOW_ENABLE_CATEGORYBOX' => $lang['Show_enable_categorybox'], 'L_SHOUTBOX_DESC' => $lang['Shoutbox_desc'], 'L_ASCENDING' => $lang['Sort_Ascending'], --- 899,903 ---- 'L_TITLE' => $lang['Title'], 'L_SHOW_ENABLE_SHOUTBOX' => $lang['Show_enable_shoutbox'], ! 'L_SHOW_ENABLE_CATEGORYBOX' => $lang['Show_enable_categorybox'], 'L_SHOUTBOX_DESC' => $lang['Shoutbox_desc'], 'L_ASCENDING' => $lang['Sort_Ascending'], *************** *** 978,983 **** 'SHOW_SHOUTBOX_YES' => ( $weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', 'SHOW_SHOUTBOX_NO' => ( !$weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_YES' => ( $weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_NO' => ( !$weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', 'REPLY_IN_POPUP_YES' => ( $weblog_data['reply_in_popup'] ) ? ' checked="checked"' : '', --- 973,978 ---- 'SHOW_SHOUTBOX_YES' => ( $weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', 'SHOW_SHOUTBOX_NO' => ( !$weblog_data['show_shoutbox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_YES' => ( $weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', ! 'SHOW_CATEGORYBOX_NO' => ( !$weblog_data['show_categorybox'] ) ? ' checked="checked"' : '', 'REPLY_IN_POPUP_YES' => ( $weblog_data['reply_in_popup'] ) ? ' checked="checked"' : '', *************** *** 985,994 **** 'SHOUTBOX_DESC' => ( $weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', 'SHOUTBOX_ASC' => ( !$weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', ! 'PREVIEW_IMG' => ( $weblog_exists ) ? $mx_root_path . 'modules/mx_blogs/weblogs/templates/' . get_template_dir ($template_id) . '/preview_img.gif' : 'weblogs/templates/' . $template_data[0]['template_dir'] . '/preview_img.gif', 'DELETE_NAME' => ( $weblog_data['deleted'] ) ? 'undelete' : 'delete', 'L_DELETE_WEBLOG' => ( $weblog_data['deleted'] ) ? $lang['Weblog_undelete'] : $lang['Weblog_delete'], ! 'MX_ROOT' => $mx_root_path, 'MOOD_SET_PREVIEW' => $preview_mood, 'SWITCH_RADIO' => ( $userdata['user_allowadvweblog'] ) ? '<input type="radio" id="action_switch_mode" name="weblog_action" value="2" />' : '', --- 980,989 ---- 'SHOUTBOX_DESC' => ( $weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', 'SHOUTBOX_ASC' => ( !$weblog_data['weblog_shoutbox_desc'] ) ? ' checked="checked"' : '', ! 'PREVIEW_IMG' => $module_root_path . 'weblogs/templates/' . get_template_dir($template_data[0]['template_id']) . '/preview_img.gif', 'DELETE_NAME' => ( $weblog_data['deleted'] ) ? 'undelete' : 'delete', 'L_DELETE_WEBLOG' => ( $weblog_data['deleted'] ) ? $lang['Weblog_undelete'] : $lang['Weblog_delete'], ! 'MX_ROOT' => $mx_root_path, 'MOOD_SET_PREVIEW' => $preview_mood, 'SWITCH_RADIO' => ( $userdata['user_allowadvweblog'] ) ? '<input type="radio" id="action_switch_mode" name="weblog_action" value="2" />' : '', *************** *** 1003,1014 **** ); - $template->pparse("body"); - $template->assign_vars(array( 'L_POWERED_BY' => sprintf($lang['Weblog_powered_by'], WEBLOGS_MOD_VERSION)) ); ! //include($phpbb_root_path . 'includes/page_tail.'.$phpEx); ! include($mx_root_path . 'includes/page_tail.'.$phpEx); ?> --- 998,1008 ---- ); $template->assign_vars(array( 'L_POWERED_BY' => sprintf($lang['Weblog_powered_by'], WEBLOGS_MOD_VERSION)) ); ! $template->pparse("body"); ! ! //include($mx_root_path . 'includes/page_tail.'.$phpEx); ?> Index: weblogs.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblogs.php,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** weblogs.php 28 Jun 2007 18:04:21 -0000 1.3 --- weblogs.php 31 Jan 2008 03:31:54 -0000 1.3.2.1 *************** *** 10,44 **** ***************************************************************************/ ! define('IN_PHPBB', true); ! define('IN_PORTAL', true); ! //$phpbb_root_path = './'; ! //include($phpbb_root_path . 'extension.inc'); ! //include($phpbb_root_path . 'common.'.$phpEx); ! //include($mx_root_path . 'extension.inc'); ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include($mx_root_path . 'common.'.$phpEx); ! ! if( is_object($mx_block)) { ! $is_block = TRUE; } ! // ! // Start session management ! // ! //$userdata = session_pagestart($user_ip, PAGE_INDEX); ! //init_userprefs($userdata); ! ! $mx_user->init($user_ip, PAGE_INDEX); - // - // End session management - // - //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); - include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); - // // Begin initial var setup --- 10,32 ---- ***************************************************************************/ + // + // ERROR HANDLING + // + //error_reporting( E_ALL ); + @ini_set( 'display_errors', '1' ); ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { ! die("Hacking attempt"); } + else + { + define( 'MXBB_MODULE', true ); ! $is_block = TRUE; ! } include($module_root_path . 'includes/weblogs_common.'.$phpEx); // // Begin initial var setup *************** *** 93,107 **** // - // End initial var setup - // - - // - // Start page proper - // - $page_title = $lang['Weblog_index']; - - include($mx_root_path . 'includes/page_header.'.$phpEx); - - // // Get the moods data // --- 81,84 ---- *************** *** 165,169 **** { $template->set_filenames(array( ! 'user' =>$module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 142,146 ---- { $template->set_filenames(array( ! 'user' => 'weblog_faceplate_body.tpl') ); } *************** *** 183,187 **** // Otherwise show a default face image. $template->set_filenames(array( ! 'user' => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 160,164 ---- // Otherwise show a default face image. $template->set_filenames(array( ! 'user' => 'weblog_faceplate_body.tpl') ); } *************** *** 189,193 **** else { ! $template_dir = get_template_dir ($user_weblog_data['template_id']); $template->set_filenames(array( --- 166,170 ---- else { ! $template_dir = get_template_dir($user_weblog_data['template_id']); $template->set_filenames(array( *************** *** 263,267 **** $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="' . $phpbb_root_path . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; --- 240,244 ---- $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; *************** *** 430,434 **** { $template->set_filenames(array( ! 'top' => $module_root_path . 'templates/subSilver/weblog_index_top.tpl') ); } --- 407,411 ---- { $template->set_filenames(array( ! 'top' => 'weblog_index_top.tpl') ); } *************** *** 436,440 **** { $template->set_filenames(array( ! 'top' => $module_root_path . 'templates/subSilver/weblog_index_top_small.tpl') ); } --- 413,417 ---- { $template->set_filenames(array( ! 'top' => 'weblog_index_top_small.tpl') ); } *************** *** 498,502 **** { $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_small_body.tpl') ); } --- 475,479 ---- { $template->set_filenames(array( ! $i => 'weblog_faceplate_small_body.tpl') ); } *************** *** 504,508 **** { $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 481,485 ---- { $template->set_filenames(array( ! $i => 'weblog_faceplate_body.tpl') ); } *************** *** 522,526 **** // Otherwise use a default faceplate. $template->set_filenames(array( ! $i => $module_root_path . 'templates/subSilver/weblog_faceplate_body.tpl') ); } --- 499,503 ---- // Otherwise use a default faceplate. $template->set_filenames(array( ! $i => 'weblog_faceplate_body.tpl') ); } *************** *** 587,591 **** $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="'. $phpbb_root_path . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; --- 564,568 ---- $last_entry_time = create_date($board_config['default_dateformat'], $last_entry_data['entry_time'], $board_config['board_timezone']); ! $last_entry_time .= ' <a href="' . append_sid($mx_root_path . "modules/mx_blogs/weblog_entry.$phpEx?" . POST_ENTRY_URL . "=$entry_id") . '"><img src="'. $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_entry'] . '" title="' . $lang['View_newest_entry'] . '" border="0" /></a>'; $last_entry = $last_entry_time; *************** *** 678,682 **** $template->set_filenames(array( ! 'bottom' => $module_root_path . 'templates/subSilver/weblog_index_bottom.tpl') ); --- 655,659 ---- $template->set_filenames(array( ! 'bottom' => 'weblog_index_bottom.tpl') ); *************** *** 690,695 **** $template->pparse('bottom'); - //echo $mx_root_path ; - include($mx_root_path . 'includes/page_tail.'.$phpEx); - ?> --- 667,669 ---- Index: weblog.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** weblog.php 20 Jun 2007 19:18:50 -0000 1.2 --- weblog.php 31 Jan 2008 03:31:54 -0000 1.2.2.1 *************** *** 49,57 **** // End session management // - //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); - include($module_root_path . 'includes/weblogs_constants.'. $phpEx); - include($module_root_path . 'includes/weblogs_common.'.$phpEx); - $board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; --- 49,55 ---- // End session management // + include($module_root_path . 'includes/weblogs_common.'.$phpEx); + //$board_config['smilies_path'] = $phpbb_root_path . $board_config['smilies_path']; *************** *** 723,727 **** if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = smilies_pass($entry_data[$i]['entry_text']); } } --- 721,725 ---- if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = mx_smilies_pass($entry_data[$i]['entry_text']); } } *************** *** 1040,1044 **** if ( $board_config['allow_smilies'] ) { ! $message = smilies_pass($message); } --- 1038,1042 ---- if ( $board_config['allow_smilies'] ) { ! $message = mx_smilies_pass($message); } Index: weblog_allentries.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_allentries.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** weblog_allentries.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_allentries.php 31 Jan 2008 03:31:54 -0000 1.1.2.1 *************** *** 35,46 **** //$userdata = session_pagestart($user_ip, PAGE_INDEX); //init_userprefs($userdata); - $mx_user->init($user_ip, PAGE_INDEX); - // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'. $phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); --- 35,44 ---- //$userdata = session_pagestart($user_ip, PAGE_INDEX); //init_userprefs($userdata); $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); *************** *** 85,94 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain weblog information.", "", __LINE__, __FILE__, $sql); } } else { ! message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } --- 83,92 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain weblog information.", "", __LINE__, __FILE__, $sql); } } else { ! mx_message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } *************** *** 103,112 **** else { ! message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } if ( $weblog_data['deleted'] ) { ! message_die(GENERAL_ERROR, sprintf($lang['Weblog_deactivated'], $weblog_data['weblog_name'])); } --- 101,110 ---- else { ! mx_message_die(GENERAL_MESSAGE, $lang['Weblog_not_exist']); } if ( $weblog_data['deleted'] ) { ! mx_message_die(GENERAL_ERROR, sprintf($lang['Weblog_deactivated'], $weblog_data['weblog_name'])); } *************** *** 118,122 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't get weblog owner information.", "", __LINE__, __FILE__, $sql); } --- 116,120 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get weblog owner information.", "", __LINE__, __FILE__, $sql); } *************** *** 162,166 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain limited entries count information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); --- 160,164 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain limited entries count information", "", __LINE__, __FILE__, $sql); } $row = $db->sql_fetchrow($result); *************** *** 202,206 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't get template directory information.", "", __LINE__, __FILE__, $sql); } --- 200,204 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get template directory information.", "", __LINE__, __FILE__, $sql); } *************** *** 274,278 **** if(!($result = $db->sql_query($sql))) { ! message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } --- 272,276 ---- if(!($result = $db->sql_query($sql))) { ! mx_message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } *************** *** 296,300 **** if(!($result = $db->sql_query($sql))) { ! message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } --- 294,298 ---- if(!($result = $db->sql_query($sql))) { ! mx_message_die(GENERAL_ERROR, 'Could not query weblog entry information', '', __LINE__, __FILE__, $sql); } *************** *** 313,317 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain mood data from database", "", __LINE__, __FILE__, $sql); } $mood_data = $db->sql_fetchrowset($result); --- 311,315 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain mood data from database", "", __LINE__, __FILE__, $sql); } $mood_data = $db->sql_fetchrowset($result); *************** *** 325,329 **** if( !$result = $db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); --- 323,327 ---- if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain action data from database", "", __LINE__, __FILE__, $sql); } $action_data = $db->sql_fetchrowset($result); Index: weblog_rss.php =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/weblog_rss.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** weblog_rss.php 7 Jun 2007 22:01:32 -0000 1.1 --- weblog_rss.php 31 Jan 2008 03:31:54 -0000 1.1.2.1 *************** *** 32,48 **** // - // Get all the data - // - - // // Start session management // ! $userdata = session_pagestart($user_ip, PAGE_INDEX); ! init_userprefs($userdata); // // End session management // ! //include($phpbb_root_path . 'includes/weblogs_common.'.$phpEx); ! include($module_root_path . 'includes/weblogs_constants.'.$phpEx); include($module_root_path . 'includes/weblogs_common.'.$phpEx); --- 32,42 ---- // // Start session management // ! $mx_user->init($user_ip, PAGE_INDEX); // // End session management // ! include($module_root_path . 'includes/weblogs_common.'.$phpEx); *************** *** 215,219 **** if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = smilies_pass($entry_data[$i]['entry_text']); } --- 209,213 ---- if ( $entry_data[$i]['enable_smilies'] ) { ! $entry_data[$i]['entry_text'] = mx_smilies_pass($entry_data[$i]['entry_text']); } Index: Weblogs.pak =================================================================== RCS file: /cvsroot/mxbb/mx_blogs/Weblogs.pak,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Weblogs.pak 7 Jun 2007 22:01:31 -0000 1.1 --- Weblogs.pak 31 Jan 2008 03:31:54 -0000 1.1.2.1 *************** *** 1,5 **** ! module=+:71=+:MX Weblog=+:modules/mx_blogs/=+:Mx Weblog=+:1 ! function=+:71=+:57=+:Weblog List=+:Weblog List Block=+:weblogs.php=+: ! block=+:55=+:Weblog List=+:=+:57=+:0=+:0=+:0 ! function=+:71=+:59=+:Weblog Config=+:Weblog Config Block=+:weblog_config.php=+: ! block=+:54=+:Weblog Config=+:=+:59=+:0=+:0=+:0 --- 1,10 ---- ! module=+:87=+:MX Weblog=+:modules/mx_blogs/=+:Mx Weblog=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:87=+:96=+:Weblog List=+:Weblog List Block=+:weblogs.php=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Weblog List=+:Demo block=+:96=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:87=+:97=+:Weblog Config=+:Weblog Config Block=+:weblog_config.php=+: ! parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Weblog Config=+:Demo block=+:97=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 ! function=+:0=+:0=+:0=+:endoflist=+:0=+:0 \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2008-01-30 09:11:46
|
Update of /cvsroot/mxbb/core/templates/mxSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/templates/mxSilver Modified Files: overall_footer.tpl Log Message: BlockCP - updated what features should be adminCP options only Schemas - no point updating the module INSERTS with full spec Sitelog - updated sitemap and pagination mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom ...more to come ;) Tinymce updates wherever needed - admin has full interface, users less options. mx_users - bugfix for renaming users Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxSilver/overall_footer.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** overall_footer.tpl 9 Sep 2007 16:50:46 -0000 1.1 --- overall_footer.tpl 30 Jan 2008 09:11:01 -0000 1.2 *************** *** 1,2 **** --- 1,5 ---- + <!-- BEGIN page_last_updated --> + <div align="right"><span class="copyright">{page_last_updated.L_PAGE_UPDATED} {page_last_updated.TIME} {page_last_updated.NAME} </div> + <!-- END page_last_updated --> <div align="center"> <span class="copyright"> |
|
From: Jon O. <jon...@us...> - 2008-01-30 09:11:45
|
Update of /cvsroot/mxbb/core/modules/mx_users/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7690/modules/mx_users/admin Modified Files: admin_groupcp.php Log Message: BlockCP - updated what features should be adminCP options only Schemas - no point updating the module INSERTS with full spec Sitelog - updated sitemap and pagination mod_rewrite - exceptions when in need of technical full paths...eg for module editing actions Nav menu - intial fixes while simplifying this module with less parameters and more tpl freedom ...more to come ;) Tinymce updates wherever needed - admin has full interface, users less options. mx_users - bugfix for renaming users Index: admin_groupcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_users/admin/admin_groupcp.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_groupcp.php 21 Sep 2007 19:04:39 -0000 1.2 --- admin_groupcp.php 30 Jan 2008 09:11:00 -0000 1.3 *************** *** 493,497 **** if ( isset($HTTP_POST_VARS['add']) ) { ! $username = ( isset($HTTP_POST_VARS['username']) ) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; $sql = "SELECT * --- 493,497 ---- if ( isset($HTTP_POST_VARS['add']) ) { ! $username = ( isset($HTTP_POST_VARS['username']) ) ? phpBB2::phpbb_clean_username($HTTP_POST_VARS['username']) : ''; $sql = "SELECT * |
2 messages has been excluded from this view by a project administrator.
