Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Jon O. <jon...@us...> - 2005-12-09 23:22:13
|
Update of /cvsroot/mxbb/core/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9047/templates/subSilver Modified Files: overall_header.tpl Log Message: - phpbb_stats per page - updated schemas - site search optimization (in progress) - code cleanup in index.php, common.php and page_header.php - gzip fixes in progress Index: overall_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_header.tpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** overall_header.tpl 20 Sep 2005 15:30:59 -0000 1.20 --- overall_header.tpl 9 Dec 2005 23:22:04 -0000 1.21 *************** *** 187,195 **** </table> ! <!-- BEGIN portal_top_links_off --> ! <!-- ! /* ! <!-- END portal_top_links_off --> ! <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> <tr> --- 187,191 ---- </table> ! <!-- BEGIN phpbb_stats --> <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> <tr> *************** *** 208,214 **** </tr> </table> ! ! <!-- BEGIN portal_top_links_off --> ! */ ! --> ! <!-- END portal_top_links_off --> \ No newline at end of file --- 204,207 ---- </tr> </table> ! <!-- END phpbb_stats --> ! \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2005-12-09 23:22:12
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9047/language/lang_english Modified Files: lang_admin.php lang_main.php Log Message: - phpbb_stats per page - updated schemas - site search optimization (in progress) - code cleanup in index.php, common.php and page_header.php - gzip fixes in progress Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_main.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** lang_main.php 22 Oct 2005 21:40:08 -0000 1.22 --- lang_main.php 9 Dec 2005 23:22:03 -0000 1.23 *************** *** 86,90 **** // New for v. 2.7.4 - 2.8 // ! $lang['Show_admin_options'] = "Show/Hide admin options: "; $lang['Hidden_block'] = "Hidden block..."; $lang['Hidden_block_explain'] = "This block is 'hidden', but visible since you're an admin/moderator."; --- 86,90 ---- // New for v. 2.7.4 - 2.8 // ! $lang['Show_admin_options'] = "Show/Hide Page Admin Options: "; $lang['Hidden_block'] = "Hidden block..."; $lang['Hidden_block_explain'] = "This block is 'hidden', but visible since you're an admin/moderator."; Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** lang_admin.php 9 Dec 2005 00:22:23 -0000 1.54 --- lang_admin.php 9 Dec 2005 23:22:03 -0000 1.55 *************** *** 80,83 **** --- 80,84 ---- $lang['Permissions_adv'] = "Advanced Permissions"; $lang['return_to_page'] = "Back to Portal Page"; + $lang['Use_default'] = 'Use default setting'; $lang['AdminCP_status'] = "<b>Progress report</b>"; *************** *** 119,123 **** $lang['MX_Modules'] = "mxBB-Modules"; $lang['Phpbb'] = "phpBB"; ! $lang['Top_phpbb_links'] = "Show phpBB header links <br /> - new/unread posts etc on the portal front page"; $lang['Portal_version'] = "mxBB-Portal Version:"; $lang['Mx_use_cache'] = "Use mxBB Block Cache"; --- 120,124 ---- $lang['MX_Modules'] = "mxBB-Modules"; $lang['Phpbb'] = "phpBB"; ! $lang['Top_phpbb_links'] = "phpBB Stats in Header (default value)<br /> - links to new/unread posts etc"; $lang['Portal_version'] = "mxBB-Portal Version:"; $lang['Mx_use_cache'] = "Use mxBB Block Cache"; *************** *** 301,304 **** --- 302,307 ---- $lang['Mx_IP_filter'] = "IP Filter"; $lang['Mx_IP_filter_explain'] = "To restrict access to this page by IP, enter the valid IP adresses - one IP address per line.<br>Eg 127.0.0.1 or 127.1.*.*"; + $lang['Mx_phpBB_stats'] = "phpBB Stats in Header"; + $lang['Mx_phpBB_stats_explain'] = "- links to new/unread posts etc"; $lang['Column_admin'] = "Page Column Administration"; $lang['Column_admin_explain'] = "Administer Page Columns"; |
|
From: Jon O. <jon...@us...> - 2005-12-09 23:22:12
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9047/templates/subSilver/admin Modified Files: mx_pagecp_admin_body.tpl Log Message: - phpbb_stats per page - updated schemas - site search optimization (in progress) - code cleanup in index.php, common.php and page_header.php - gzip fixes in progress Index: mx_pagecp_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/mx_pagecp_admin_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_pagecp_admin_body.tpl 22 Oct 2005 10:51:03 -0000 1.4 --- mx_pagecp_admin_body.tpl 9 Dec 2005 23:22:04 -0000 1.5 *************** *** 654,657 **** --- 654,661 ---- </tr> <tr> + <td width="50%" align="right">{L_PHPBB_STATS}<br /><span class="gensmall">{L_PHPBB_STATS_EXPLAIN}</span></td> + <td><input type="radio" name="phpbb_stats" value="-1" {pages.S_PHPBB_STATS_DEFAULT} /> {L_DEFAULT} <input type="radio" name="phpbb_stats" value="1" {pages.S_PHPBB_STATS_YES} /> {L_YES} <input type="radio" name="phpbb_stats" value="0" {pages.S_PHPBB_STATS_NO} /> {L_NO}</td> + </tr> + <tr> <td width="50%" align="right" >{L_IP_FILTER}<br /><span class="gensmall">{L_IP_FILTER_EXPLAIN}</span></td> <td><textarea rows="5" cols="50" wrap="virtual" name="ip_filter" class="post" />{pages.IP_FILTER}</textarea></td> |
|
From: Jon O. <jon...@us...> - 2005-12-09 23:22:12
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9047/includes Modified Files: mx_functions.php mx_functions_admincp.php mx_functions_core.php page_header.php page_tail.php Log Message: - phpbb_stats per page - updated schemas - site search optimization (in progress) - code cleanup in index.php, common.php and page_header.php - gzip fixes in progress Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** page_header.php 8 Dec 2005 14:41:48 -0000 1.27 --- page_header.php 9 Dec 2005 23:22:03 -0000 1.28 *************** *** 68,72 **** // ! // If mxBB frane template is not set, instantiate it // if (!is_object($layouttemplate)) --- 68,72 ---- // ! // If mxBB frame template is not set, instantiate it // if (!is_object($layouttemplate)) *************** *** 83,87 **** // $layouttemplate->set_filenames(array( ! 'overall_header' => ( $page_ov_header == '' ? ( empty($gen_simple_header) ? 'overall_header.tpl' : 'simple_header.tpl' ) : ( file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $page_ov_header) ? $page_ov_header : 'overall_header.tpl' ) ) ) ); --- 83,87 ---- // $layouttemplate->set_filenames(array( ! 'overall_header' => ( $mx_page->page_ov_header == '' ? ( empty($gen_simple_header) ? 'overall_header.tpl' : 'simple_header.tpl' ) : ( file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $mx_page->page_ov_header) ? $mx_page->page_ov_header : 'overall_header.tpl' ) ) ) ); *************** *** 146,150 **** $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; $l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']); - // $mx_priv_msg = $lang['Private_Messages'] . ' (' . $userdata['user_unread_privmsg'] . ')'; } else --- 146,149 ---- *************** *** 192,196 **** $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $board_config['board_timezone'] )] : $lang[number_format( $board_config['board_timezone'] )]; ! $page_icon_img = ( !empty($page_icon) && $page_icon != 'none' ) ? '<img align="absmiddle" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/page_icons/' . $page_icon . '" alt="" /> ' : ''; $option_search_site = '<option value="site">' . $lang['Mx_search_site'] . '</option>'; --- 191,195 ---- $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $board_config['board_timezone'] )] : $lang[number_format( $board_config['board_timezone'] )]; ! $page_icon_img = ( !empty($mx_page->page_icon) && $mx_page->page_icon != 'none' ) ? '<img align="absmiddle" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/page_icons/' . $mx_page->page_icon . '" alt="" /> ' : ''; $option_search_site = '<option value="site">' . $lang['Mx_search_site'] . '</option>'; *************** *** 206,210 **** 'SITENAME' => $board_config['sitename'], 'SITE_DESCRIPTION' => $board_config['site_desc'], ! 'PAGE_TITLE' => $mx_page_title, 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), 'CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), --- 205,209 ---- 'SITENAME' => $board_config['sitename'], 'SITE_DESCRIPTION' => $board_config['site_desc'], ! 'PAGE_TITLE' => $mx_page->page_title, 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), 'CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), *************** *** 324,336 **** // ! // Show portal front page info/links? ! // ! if ( $page_id != 1 || $portal_config['top_phpbb_links'] == 0 ) ! { ! $layouttemplate->assign_block_vars('portal_top_links_off', array()); ! } ! ! // ! // Login box? // if ( !$userdata['session_logged_in'] ) --- 323,327 ---- // ! // Login box & swithes for logged in users? // if ( !$userdata['session_logged_in'] ) *************** *** 346,349 **** --- 337,349 ---- $layouttemplate->assign_block_vars('switch_user_logged_out.switch_allow_autologin', array()); } + + // + // Show phpbb stats? + // + if ( $mx_page->phpbb_stats ) + { + $layouttemplate->assign_block_vars('phpbb_stats', array()); + $layouttemplate->assign_block_vars('phpbb_stats.switch_user_logged_out', array()); + } } else *************** *** 355,362 **** $layouttemplate->assign_block_vars('switch_enable_pm_popup', array()); } } // ! // Do NOT set basedir when in EDIT mode - NEEDED ANYMORE?????????????????????????????? // if ( !(isset($HTTP_POST_VARS['portalpage']) || isset($HTTP_GET_VARS['portalpage'])) ) --- 355,371 ---- $layouttemplate->assign_block_vars('switch_enable_pm_popup', array()); } + + // + // Show phpbb stats? + // + if ( $mx_page->phpbb_stats ) + { + $layouttemplate->assign_block_vars('phpbb_stats', array()); + $layouttemplate->assign_block_vars('phpbb_stats.switch_user_logged_in', array()); + } } // ! // Do NOT set basedir when in EDIT mode // if ( !(isset($HTTP_POST_VARS['portalpage']) || isset($HTTP_GET_VARS['portalpage'])) ) *************** *** 369,374 **** // $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); ! $is_gecko = ( strstr($useragent, 'Gecko') ); ! if ( $is_gecko ) { $layouttemplate->assign_block_vars('switch_gecko', array()); --- 378,382 ---- // $useragent = (isset($HTTP_SERVER_VARS['HTTP_USER_AGENT'])) ? $HTTP_SERVER_VARS['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT'); ! if ( strstr($useragent, 'Gecko') ) { $layouttemplate->assign_block_vars('switch_gecko', array()); *************** *** 391,395 **** header ('Pragma: no-cache'); - include($mx_root_path . 'mx_meta.inc'); $meta_str = '<meta name="title" content="' . $title .'" />' . "\n"; --- 399,402 ---- Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mx_functions_admincp.php 8 Dec 2005 14:41:48 -0000 1.13 --- mx_functions_admincp.php 9 Dec 2005 23:22:03 -0000 1.14 *************** *** 359,362 **** --- 359,363 ---- $ipfilter = $mx_request_vars->post('ip_filter', MX_TYPE_POST_VARS, ''); + $phpbb_stats = $mx_request_vars->post('phpbb_stats', MX_TYPE_INT, '-1'); // *************** *** 385,389 **** } ! $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header, ip_filter ) VALUES ( '" . $page_id_new . "', '" . $page_name . "', --- 386,390 ---- } ! $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header, ip_filter, phpbb_stats ) VALUES ( '" . $page_id_new . "', '" . $page_name . "', *************** *** 393,397 **** '" . $auth_view . "', '" . $page_header . "', ! '" . $ipfilter . "' )"; if( !($result = $db->sql_query($sql)) ) --- 394,399 ---- '" . $auth_view . "', '" . $page_header . "', ! '" . $ipfilter . "', ! '" . $phpbb_stats . "' )"; if( !($result = $db->sql_query($sql)) ) *************** *** 932,935 **** --- 934,938 ---- $auth_view = $mx_request_vars->post('auth_view', MX_TYPE_INT, 0); $ipfilter = $mx_request_vars->post('ip_filter', MX_TYPE_POST_VARS, ''); + $phpbb_stats = $mx_request_vars->post('phpbb_stats', MX_TYPE_INT, '-1'); // *************** *** 951,955 **** page_graph_border = '$page_graph_border', auth_view = '$auth_view', ! ip_filter = '$ipfilter' WHERE page_id = $page_id"; if( !($result = $db->sql_query($sql)) ) --- 954,959 ---- page_graph_border = '$page_graph_border', auth_view = '$auth_view', ! ip_filter = '$ipfilter', ! phpbb_stats = '$phpbb_stats' WHERE page_id = $page_id"; if( !($result = $db->sql_query($sql)) ) Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** page_tail.php 8 Dec 2005 14:41:48 -0000 1.19 --- page_tail.php 9 Dec 2005 23:22:03 -0000 1.20 *************** *** 38,44 **** // Generate the fold/unfold categories switches // ! if ( $mx_page->editcp_switch ) { ! $template->assign_block_vars('switch_edit_' . ( $mx_show_edit_blocks_on ? 'on' : 'off' ), array()); } --- 38,44 ---- // Generate the fold/unfold categories switches // ! if ( $mx_page->editcp_switch_show ) { ! $template->assign_block_vars('switch_edit_' . ( $mx_page->editcp_switch_on ? 'on' : 'off' ), array()); } Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mx_functions_core.php 9 Dec 2005 00:22:18 -0000 1.17 --- mx_functions_core.php 9 Dec 2005 23:22:03 -0000 1.18 *************** *** 598,601 **** --- 598,602 ---- pag.auth_moderator_group AS pag_auth_moderator_group, pag.ip_filter, + pag.phpbb_stats, bct.column_id, col.column_title, *************** *** 640,644 **** "page_auth_view_group" => $row['page_auth_view_group'], "page_auth_moderator_group" => $row['page_auth_moderator_group'], ! "ip_filter" => $row['ip_filter'] ); --- 641,646 ---- "page_auth_view_group" => $row['page_auth_view_group'], "page_auth_moderator_group" => $row['page_auth_moderator_group'], ! "ip_filter" => $row['ip_filter'], ! "phpbb_stats" => $row['phpbb_stats'] ); *************** *** 795,799 **** | $mx_block->output_hidden_indicator() : Switch for displaying 'hidden' indicator | $mx_block->output_title() : Switch for displaying block title ! | $mx_block->output_cp_button($edit_on) : Switch for displaying block CP indicator | | // --- 797,801 ---- | $mx_block->output_hidden_indicator() : Switch for displaying 'hidden' indicator | $mx_block->output_title() : Switch for displaying block title ! | $mx_block->output_cp_button() : Switch for displaying block CP indicator | | // *************** *** 1043,1047 **** } ! function output_cp_button( $edit_on ) { global $layouttemplate, $userdata, $mx_root_path, $mx_page, $lang, $block_size, $title_class; --- 1045,1049 ---- } ! function output_cp_button() { global $layouttemplate, $userdata, $mx_root_path, $mx_page, $lang, $block_size, $title_class; *************** *** 1097,1101 **** // Switch: Edit Block state // ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array() ); } --- 1099,1103 ---- // Switch: Edit Block state // ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_' . ( $mx_page->editcp_switch_on ? 'on' : 'off' ), array() ); } *************** *** 1887,1890 **** --- 1889,1896 ---- var $blocks = array(); + var $page_title = ''; + var $page_icon = ''; + var $page_ov_header = ''; + var $total_column = ''; var $total_block = ''; *************** *** 1892,1898 **** var $auth_view = false; var $auth_ip = false; var $block_border_graphics = false; ! var $editcp_switch = false; // ------------------------------ --- 1898,1907 ---- var $auth_view = false; var $auth_ip = false; + var $phpbb_stats = '-1'; var $block_border_graphics = false; ! ! var $editcp_switch_show = false; ! var $editcp_switch_on = false; // ------------------------------ *************** *** 1912,1916 **** function _set_all( $page_id ) { ! global $userdata, $mx_root_path, $HTTP_GET_VARS; $this->info = $this->page_config[$page_id]['page_info']; --- 1921,1925 ---- function _set_all( $page_id ) { ! global $userdata, $mx_root_path, $HTTP_GET_VARS, $HTTP_COOKIE_VARS, $portal_config; $this->info = $this->page_config[$page_id]['page_info']; *************** *** 1928,1931 **** --- 1937,1948 ---- // + // General + // + $this->page_title = $this->info['page_name']; + $this->page_icon = $this->info['page_icon']; + $this->page_ov_header = $this->info['page_header']; + $this->phpbb_stats = $this->info['phpbb_stats'] == -1 ? ($portal_config['top_phpbb_links'] == 1 ? true : false ) : ( $this->info['phpbb_stats'] == 1 ? true : false ); + + // // Set the public view auth // *************** *** 1948,1951 **** --- 1965,1980 ---- $s_hidden_fields .= '<input type="hidden" name="p" value="' . intval( $HTTP_GET_VARS['p'] ) . '" />'; $this->s_hidden_fields = $s_hidden_fields; + + // + // Generate the fold/unfold menu navigation switches (cookie based) + // + if ( $userdata['user_level'] == ADMIN && isset($HTTP_COOKIE_VARS['phpbbEdit_Blocks']) ) + { + $this->editcp_switch_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks']; + } + else + { + $this->editcp_switch_on = true; + } } *************** *** 1997,2001 **** function show_editcp_switch() { ! $this->editcp_switch = true; } --- 2026,2035 ---- function show_editcp_switch() { ! global $userdata; ! ! if ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ! { ! $this->editcp_switch_show = true; ! } } Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** mx_functions.php 8 Dec 2005 14:41:48 -0000 1.52 --- mx_functions.php 9 Dec 2005 23:22:03 -0000 1.53 *************** *** 517,524 **** // ! // ! // declared in common.php, just before calling mx_session_start. ;-) ! // ! // $do_gzip_compress = FALSE; if ( $board_config['gzip_compress'] && !defined('MX_GZIP_DISABLED') ) --- 517,524 ---- // ! // ! // declared in common.php, just before calling mx_session_start. ;-) ! // ! // $do_gzip_compress = FALSE; if ( $board_config['gzip_compress'] && !defined('MX_GZIP_DISABLED') ) *************** *** 556,560 **** // session_start(); - } --- 556,559 ---- *************** *** 646,649 **** --- 645,689 ---- } + + if( empty($p_row['page_id']) ) + { + $sql = "SELECT pag.page_id, sys.parameter_value + FROM " . COLUMN_BLOCK_TABLE . " bct, + " . PAGE_TABLE . " pag, + " . COLUMN_TABLE . " col, + " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, + " . PARAMETER_TABLE . " par + WHERE pag.page_id = col.page_id + AND bct.column_id = col.column_id + AND bct.block_id = sys.block_id + AND sys.parameter_id = par.parameter_id + AND par.parameter_name = 'block_ids' + ORDER BY sys.block_id"; + + if( !($p_result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, "Could not query column list", '', __LINE__, __FILE__, $sql); + } + + while( $temp_row = $db->sql_fetchrow($p_result) ) + { + $block_ids_array = explode(',' , $temp_row['parameter_value']); + + foreach($block_ids_array as $key => $block_id) + { + if ($block_id = $search_item) + { + $p_row['page_id'] = $temp_row['page_id']; + continue; + } + } + + if (!empty($p_row['page_id'])) + { + continue; + } + } + } + $page_id = ( !empty($p_row['page_id']) ) ? $p_row['page_id'] : ''; |
|
From: Jon O. <jon...@us...> - 2005-12-09 23:22:12
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9047/modules/mx_coreblocks Modified Files: mx_blockcp.php mx_login.php mx_search.php Log Message: - phpbb_stats per page - updated schemas - site search optimization (in progress) - code cleanup in index.php, common.php and page_header.php - gzip fixes in progress Index: mx_login.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_login.php 23 Oct 2005 18:48:21 -0000 1.9 --- mx_login.php 9 Dec 2005 23:22:04 -0000 1.10 *************** *** 40,44 **** )); ! $template->assign_block_vars('switch_user_logged_out', array()); $template->pparse('body_login'); --- 40,63 ---- )); ! // ! // Login box? ! // ! if ( !$userdata['session_logged_in'] ) ! { ! $template->assign_block_vars('switch_user_logged_out', array()); ! ! // ! // Allow autologin? ! // ! if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] ) ! { ! $template->assign_block_vars('switch_allow_autologin', array()); ! } ! } ! else ! { ! $template->assign_block_vars('switch_user_logged_in', array()); ! } ! $template->pparse('body_login'); Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_blockcp.php 30 Oct 2005 19:01:36 -0000 1.7 --- mx_blockcp.php 9 Dec 2005 23:22:04 -0000 1.8 *************** *** 20,26 **** define( 'IN_PORTAL', 1 ); - $mx_root_path = "./../../"; - include($mx_root_path . 'extension.inc'); include($mx_root_path . 'common.' . $phpEx); --- 20,24 ---- *************** *** 32,37 **** include_once($phpbb_root_path . "includes/functions_post.$phpEx"); // required by mx_generate_smilies - $view_page = false; - // // Start session management --- 30,33 ---- *************** *** 39,43 **** $userdata = session_pagestart($user_ip, '-999'); mx_init_userprefs($userdata); - // // End session management --- 35,38 ---- *************** *** 258,262 **** $mx_blockcp->generate_cp($block_id, $new_block); ! $page_title = $lang['Block_admin']; include( $mx_root_path . 'includes/page_header.' . $phpEx ); --- 253,257 ---- $mx_blockcp->generate_cp($block_id, $new_block); ! $mx_page->page_title = $lang['Block_admin']; include( $mx_root_path . 'includes/page_header.' . $phpEx ); Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_search.php 1 Oct 2005 14:10:45 -0000 1.7 --- mx_search.php 9 Dec 2005 23:22:04 -0000 1.8 *************** *** 318,325 **** // Look up data ... ! if ( $search_results != '' ) { $sql = "SELECT * FROM " . PAGE_TABLE; - if ( !( $result = $db->sql_query( $sql ) ) ) { --- 318,327 ---- // Look up data ... ! if ( count($search_ids) > 0 ) { + // + // Get all pages with view access + // $sql = "SELECT * FROM " . PAGE_TABLE; if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 327,332 **** } - $searchset = ''; while ( $page_row = $db->sql_fetchrow( $result )) { --- 329,334 ---- } + $valid_page_ids = ''; while ( $page_row = $db->sql_fetchrow( $result )) { *************** *** 337,344 **** if ( $page_auth_ary[auth_view] ) { ! $searchset[] = $page_row['page_id']; } } $valid_page_ids = implode( ', ', $searchset ); --- 339,360 ---- if ( $page_auth_ary[auth_view] ) { ! $valid_page_ids[] = $page_row['page_id']; } } + // + // Now find the associated pages + // + $page_ids = array(); + foreach($search_ids as $key => $block_id) + { + $temp_page_id = get_page_id($block_id); + if (in_array($temp_page_id, $valid_page_ids)) + { + $page_ids[$block_id] = $temp_page_id; + } + } + + /* $valid_page_ids = implode( ', ', $searchset ); *************** *** 412,415 **** --- 428,432 ---- $replacement_word = array(); obtain_word_list( $orig_word, $replacement_word ); + */ } *************** *** 417,426 **** // Output header ! $page_title = $lang['Search']; include( $mx_root_path . 'includes/page_header.' . $phpEx ); ! $template->set_filenames( array( 'body' => 'mx_search_results.tpl' ) ! ); $total_match_count = count( $searchset ); --- 434,442 ---- // Output header ! $mx_page->page_title = $lang['Search']; include( $mx_root_path . 'includes/page_header.' . $phpEx ); ! $template->set_filenames( array( 'body' => 'mx_search_results.tpl' ) ); $total_match_count = count( $searchset ); *************** *** 428,434 **** $l_search_matches = ( $total_match_count == 1 ) ? sprintf( $lang['Found_search_match'], $total_match_count ) : sprintf( $lang['Found_search_matches'], $total_match_count ); ! $template->assign_vars( array( 'L_SEARCH_MATCHES' => $l_search_matches, ! 'L_ARTICLE' => $lang['Mx_Page'] ) ! ); $highlight_active = ''; --- 444,451 ---- $l_search_matches = ( $total_match_count == 1 ) ? sprintf( $lang['Found_search_match'], $total_match_count ) : sprintf( $lang['Found_search_matches'], $total_match_count ); ! $template->assign_vars( array( ! 'L_SEARCH_MATCHES' => $l_search_matches, ! 'L_ARTICLE' => $lang['Mx_Page'] ) ! ); $highlight_active = ''; *************** *** 519,528 **** // Output the basic page ! $page_title = $lang['Search']; include( $mx_root_path . 'includes/page_header.' . $phpEx ); ! $template->set_filenames( array( 'body' => 'mx_search_body.tpl' ) ! ); $template->assign_vars( array( 'L_SEARCH_QUERY' => $lang['Search_query'], --- 536,544 ---- // Output the basic page ! $mx_page->page_title = $lang['Search']; include( $mx_root_path . 'includes/page_header.' . $phpEx ); ! $template->set_filenames( array( 'body' => 'mx_search_body.tpl' ) ); $template->assign_vars( array( 'L_SEARCH_QUERY' => $lang['Search_query'], |
|
From: Jon O. <jon...@us...> - 2005-12-09 23:22:11
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9047/install/schemas Modified Files: mysql_schema_install.sql mysql_schema_upgrade_to_2.8_rc7.sql Log Message: - phpbb_stats per page - updated schemas - site search optimization (in progress) - code cleanup in index.php, common.php and page_header.php - gzip fixes in progress Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mysql_schema_install.sql 8 Dec 2005 21:41:28 -0000 1.10 --- mysql_schema_install.sql 9 Dec 2005 23:22:03 -0000 1.11 *************** *** 394,402 **** `page_graph_border` varchar(255) NOT NULL default '', `ip_filter` varchar(255) NOT NULL default '', PRIMARY KEY (`page_id`) ); - # # Dumping data for table 'mx_table_page' --- 394,402 ---- `page_graph_border` varchar(255) NOT NULL default '', `ip_filter` varchar(255) NOT NULL default '', + `phpbb_stats` tinyint(2) NOT NULL default '-1', PRIMARY KEY (`page_id`) ); # # Dumping data for table 'mx_table_page' Index: mysql_schema_upgrade_to_2.8_rc7.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_upgrade_to_2.8_rc7.sql,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mysql_schema_upgrade_to_2.8_rc7.sql 9 Dec 2005 00:22:23 -0000 1.5 --- mysql_schema_upgrade_to_2.8_rc7.sql 9 Dec 2005 23:22:03 -0000 1.6 *************** *** 37,40 **** --- 37,41 ---- ALTER TABLE mx_table_page MODIFY auth_view_group smallint(5) NOT NULL default '0'; ALTER TABLE mx_table_page MODIFY auth_moderator_group smallint(5) NOT NULL default '0'; + ALTER TABLE mx_table_page ADD phpbb_stats smallint(2) NOT NULL DEFAULT '-1'; # ------------------------------------------------------------ |
|
From: Jon O. <jon...@us...> - 2005-12-09 23:22:11
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9047 Modified Files: common.php index.php login.php Log Message: - phpbb_stats per page - updated schemas - site search optimization (in progress) - code cleanup in index.php, common.php and page_header.php - gzip fixes in progress Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** login.php 8 Dec 2005 14:41:48 -0000 1.14 --- login.php 9 Dec 2005 23:22:03 -0000 1.15 *************** *** 166,170 **** if( !$userdata['session_logged_in'] || (isset($HTTP_GET_VARS['admin']) && $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN)) { ! $page_title = $lang['Login']; include($mx_root_path . 'includes/page_header.'.$phpEx); --- 166,170 ---- if( !$userdata['session_logged_in'] || (isset($HTTP_GET_VARS['admin']) && $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN)) { ! $mx_page->page_title = $lang['Login']; include($mx_root_path . 'includes/page_header.'.$phpEx); Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** common.php 8 Dec 2005 21:41:27 -0000 1.44 --- common.php 9 Dec 2005 23:22:03 -0000 1.45 *************** *** 23,27 **** die("Hacking attempt"); } - define('IN_PHPBB', 1); --- 23,26 ---- *************** *** 197,202 **** include_once($phpbb_root_path . 'includes/functions.' . $phpEx); include_once($phpbb_root_path . 'includes/db.' . $phpEx); ! // We do not need this any longer, unset for safety purposes ! unset($dbpasswd); include_once($phpbb_root_path . 'includes/functions_selects.' . $phpEx); include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); --- 196,200 ---- include_once($phpbb_root_path . 'includes/functions.' . $phpEx); include_once($phpbb_root_path . 'includes/db.' . $phpEx); ! include_once($phpbb_root_path . 'includes/functions_selects.' . $phpEx); include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); *************** *** 293,302 **** } - // - // Initialize GZIP handler (if necessary) and PHP sessions - // - $do_gzip_compress = FALSE; - mx_session_start(); // Note: this needs $board_config populated! - if( file_exists($phpbb_root_path . 'attach_mod') ) { --- 291,294 ---- *************** *** 316,318 **** --- 308,318 ---- mx_message_die(GENERAL_MESSAGE, 'Board_disable', 'Information'); } + + // + // Initialize GZIP handler (if necessary) and PHP sessions + // Note! This is a tweak, modding the standard page_header.php file + // + $do_gzip_compress = FALSE; + mx_session_start(); // Note: this needs $board_config populated! + ?> \ No newline at end of file Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** index.php 12 Oct 2005 15:37:32 -0000 1.45 --- index.php 9 Dec 2005 23:22:03 -0000 1.46 *************** *** 19,37 **** */ - //define('MX_DEBUG', 1); define( 'IN_PORTAL', 1 ); - $mx_root_path = "./"; - include($mx_root_path . 'extension.inc'); include($mx_root_path . 'common.' . $phpEx); - $view_page = false; - - // - // Page selector - // - $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); - // // Start session management --- 19,27 ---- *************** *** 39,46 **** $userdata = session_pagestart($user_ip, - ( 1000 + $page_id )); mx_init_userprefs($userdata); - // // End session management // if ( $mx_request_vars->is_request('mx_copy') ) { --- 29,44 ---- $userdata = session_pagestart($user_ip, - ( 1000 + $page_id )); mx_init_userprefs($userdata); // // End session management // + + // + // Page selector + // + $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); + + // + // Show copyrights + // if ( $mx_request_vars->is_request('mx_copy') ) { *************** *** 49,53 **** // ! // Load page and block classes // $mx_page = new mx_page(); --- 47,51 ---- // ! // Load and instatiate page and block classes // $mx_page = new mx_page(); *************** *** 56,67 **** // ! // ...and define some basic vars ! // ! $mx_page_title .= $mx_page->info['page_name']; ! $page_icon = $mx_page->info['page_icon']; ! $page_ov_header = $mx_page->info['page_header']; ! ! // ! // Page auth // if ( !$mx_page->auth_view && $userdata['session_logged_in'] ) --- 54,58 ---- // ! // Page Auth and IP filter // if ( !$mx_page->auth_view && $userdata['session_logged_in'] ) *************** *** 80,86 **** } - // ! // Initialize template // $layouttemplate = new mx_Template( $mx_root_path . 'templates/'. $theme['template_name'], $board_config, $db ); --- 71,76 ---- } // ! // Initialize page layout template // $layouttemplate = new mx_Template( $mx_root_path . 'templates/'. $theme['template_name'], $board_config, $db ); *************** *** 91,111 **** // ! // Generate the fold/unfold menu navigation switches (cookie based) ! // ! if ( !empty($HTTP_COOKIE_VARS['phpbbEdit_Blocks']) ) ! { ! $edit_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks']; ! } ! elseif ( $userdata['user_level'] == ADMIN ) ! { ! $edit_on = true; ! } ! else ! { ! $edit_on = false; ! } ! ! // ! // Start output of page --------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------------------------------ // --- 81,85 ---- // ! // Start output of page blocks --------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------------------------------ // *************** *** 174,178 **** // ! // View Auth ------------------------------------------------------------------------------- START // if ( ( $mx_block->auth_view && $mx_block->show_block ) || $mx_block->auth_mod ) --- 148,152 ---- // ! // View Auth ------------------------------------------------------------------------------- // if ( ( $mx_block->auth_view && $mx_block->show_block ) || $mx_block->auth_mod ) *************** *** 220,228 **** // ! // View Auth --------------------------------------------------------------------------------- END ! // ! ! // ! // Edit Auth --------------------------------------------------------------------------------- START // if ( ( ( $mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block ) || $mx_block->auth_mod ) ) --- 194,198 ---- // ! // Edit Auth --------------------------------------------------------------------------------- // if ( ( ( $mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block ) || $mx_block->auth_mod ) ) *************** *** 238,250 **** if ( $mx_dynamic_block->dynamic_block_id > 0 && $subblock == $total_subs - 1 && $mx_dynamic_block->auth_edit ) { ! $mx_dynamic_block->output_cp_button( $edit_on ); } if ( is_object($mx_parent_block) && $subblock == $total_subs - 1 && $mx_parent_block->auth_edit ) { ! $mx_parent_block->output_cp_button( $edit_on ); } ! $mx_block->output_cp_button( $edit_on ); // --- 208,220 ---- if ( $mx_dynamic_block->dynamic_block_id > 0 && $subblock == $total_subs - 1 && $mx_dynamic_block->auth_edit ) { ! $mx_dynamic_block->output_cp_button(); } if ( is_object($mx_parent_block) && $subblock == $total_subs - 1 && $mx_parent_block->auth_edit ) { ! $mx_parent_block->output_cp_button(); } ! $mx_block->output_cp_button(); // *************** *** 258,268 **** // ! // Edit Auth ----------------------------------------------------------------------------------- END ! // ! ! // ! // Block header -------------------------------------------------------------------------------- START // ! if ( $mx_block->auth_view && $mx_block->show_block && ( $mx_page->editcp_switch || $mx_block->show_title ) || $mx_block->auth_mod ) { $layouttemplate->assign_block_vars('layout_column.blocks.block_header', array()); --- 228,234 ---- // ! // Block header -------------------------------------------------------------------------------- // ! if ( $mx_block->auth_view && $mx_block->show_block && ( $mx_page->editcp_switch_on || $mx_block->show_title ) || $mx_block->auth_mod ) { $layouttemplate->assign_block_vars('layout_column.blocks.block_header', array()); *************** *** 278,285 **** // - // Block header ---------------------------------------------------------------------------------- END - // - - // // Output some subblock wrappers // --- 244,247 ---- |
|
From: Jon O. <jon...@us...> - 2005-12-09 23:22:11
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9047/admin Modified Files: admin_mx_page_cp.php Log Message: - phpbb_stats per page - updated schemas - site search optimization (in progress) - code cleanup in index.php, common.php and page_header.php - gzip fixes in progress Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** admin_mx_page_cp.php 22 Oct 2005 10:51:02 -0000 1.8 --- admin_mx_page_cp.php 9 Dec 2005 23:22:03 -0000 1.9 *************** *** 237,240 **** --- 237,241 ---- 'L_DELETE' => $lang['Delete'], 'L_CREATE_PAGE' => $lang['Add_Page'], + 'L_DEFAULT' => $lang['Use_default'], 'L_QUICK_NAV' => $lang['Quick_nav'], *************** *** 268,271 **** --- 269,274 ---- "L_IP_FILTER" => $lang['Mx_IP_filter'], "L_IP_FILTER_EXPLAIN" => $lang['Mx_IP_filter_explain'], + "L_PHPBB_STATS" => $lang['Mx_phpBB_stats'], + "L_PHPBB_STATS_EXPLAIN" => $lang['Mx_phpBB_stats_explain'], // *************** *** 661,664 **** --- 664,671 ---- $ip_filter = !empty($page_rows[$page_count]['ip_filter']) ? implode( "\n", unserialize( stripslashes( $page_rows[$page_count]['ip_filter'] ))) : '' ; + $phpbb_stats_yes = ( $page_rows[$page_count]['phpbb_stats'] == 1 ) ? "checked=\"checked\"" : ""; + $phpbb_stats_no = ( $page_rows[$page_count]['phpbb_stats'] == 0 ) ? "checked=\"checked\"" : ""; + $phpbb_stats_default = ( $page_rows[$page_count]['phpbb_stats'] == -1 ) ? "checked=\"checked\"" : ""; + // // Page subpanel - edit *************** *** 736,739 **** --- 743,750 ---- "IP_FILTER" => $ip_filter, + 'S_PHPBB_STATS_YES' => $phpbb_stats_yes, + 'S_PHPBB_STATS_NO' => $phpbb_stats_no, + 'S_PHPBB_STATS_DEFAULT' => $phpbb_stats_default, + // Main 'U_PHPBB_ROOT_PATH' => PHPBB_URL, |
|
From: Jon O. <jon...@us...> - 2005-12-09 00:22:58
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12821/includes Modified Files: mx_functions_core.php Log Message: schemas and upgrade data are validated Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_functions_core.php 8 Dec 2005 14:41:48 -0000 1.16 --- mx_functions_core.php 9 Dec 2005 00:22:18 -0000 1.17 *************** *** 2138,2157 **** } ! if ($id == MX_ALL_DATA) { ! $mx_cache->update( MX_ALL_BLOCKS ); ! $mx_cache->update( MX_ALL_PAGES ); } ! else if ($id == MX_ALL_BLOCKS) { ! $mx_cache->update( MX_ALL_BLOCKS ); } ! else if ($id == MX_ALL_PAGES) { ! $mx_cache->update( MX_ALL_PAGES ); } else { ! $mx_cache->update( MX_BLOCK, $id ); } } --- 2138,2157 ---- } ! if ($id == MX_CACHE_ALL) { ! $mx_cache->update( MX_CACHE_PAGE_TYPE ); ! $mx_cache->update( MX_CACHE_BLOCK_TYPE ); } ! else if ($id == MX_CACHE_BLOCK_TYPE) { ! $mx_cache->update( MX_CACHE_BLOCK_TYPE ); } ! else if ($id == MX_CACHE_PAGE_TYPE) { ! $mx_cache->update( MX_CACHE_PAGE_TYPE ); } else { ! $mx_cache->update( MX_CACHE_BLOCK_TYPE, $id ); } } |
|
From: Jon O. <jon...@us...> - 2005-12-09 00:22:31
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12821/language/lang_english Modified Files: lang_admin.php Log Message: schemas and upgrade data are validated Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** lang_admin.php 8 Dec 2005 21:41:28 -0000 1.53 --- lang_admin.php 9 Dec 2005 00:22:23 -0000 1.54 *************** *** 390,394 **** $lang['Portal_install_done'][2] = "Remember to make backups as often as possible ;-)"; $lang['Portal_install_done'][3] = "Press the button below and use your Administrator username and password to login to the system."; ! $lang['Portal_install_done'][4] = "Please be sure to check the Portal Configurations and make any required changes."; $lang['Thanks_for_choosing'] = "Thank you for choosing mxBB-Portal."; $lang['Critical_Error'] = "CRITICAL ERROR"; --- 390,396 ---- $lang['Portal_install_done'][2] = "Remember to make backups as often as possible ;-)"; $lang['Portal_install_done'][3] = "Press the button below and use your Administrator username and password to login to the system."; ! $lang['Portal_install_done'][4] = "Enter the Admin Control Panel - Management, and upgrade ALL modules - one by one!"; ! $lang['Portal_install_done'][5] = "Please be sure to check the Portal Configurations and make any required changes."; ! $lang['Go_to_admincp'] = "Now visit the Admin Control Panel and upgrade modules"; $lang['Thanks_for_choosing'] = "Thank you for choosing mxBB-Portal."; $lang['Critical_Error'] = "CRITICAL ERROR"; |
|
From: Jon O. <jon...@us...> - 2005-12-09 00:22:31
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12821/install/schemas Modified Files: mysql_schema_upgrade_to_2.8_rc5.sql mysql_schema_upgrade_to_2.8_rc7.sql Log Message: schemas and upgrade data are validated Index: mysql_schema_upgrade_to_2.8_rc5.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_upgrade_to_2.8_rc5.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mysql_schema_upgrade_to_2.8_rc5.sql 20 Sep 2005 15:36:47 -0000 1.2 --- mysql_schema_upgrade_to_2.8_rc5.sql 9 Dec 2005 00:22:23 -0000 1.3 *************** *** 30,33 **** --- 30,35 ---- ALTER TABLE mx_table_block_system_parameter CHANGE bbcode_uid parameter_opt TEXT; ALTER TABLE mx_table_block_system_parameter ADD sub_id INT(255) UNSIGNED NOT NULL DEFAULT '0'; + ALTER TABLE mx_table_block_system_parameter DROP INDEX block_id; + ALTER TABLE mx_table_block_system_parameter DROP INDEX parameter_id; ALTER TABLE mx_table_block_system_parameter DROP PRIMARY KEY, ADD PRIMARY KEY (block_id, parameter_id, sub_id); *************** *** 36,41 **** # New Fields in Table `mx_page` (update for new permissions) # ! ALTER TABLE mx_table_page ADD page_desc varchar(255) default NULL; ! ALTER TABLE mx_table_page ADD auth_moderator_group varchar(255) NOT NULL default '0'; ALTER TABLE mx_table_page ADD page_graph_border varchar(255) NOT NULL default ''; --- 38,43 ---- # New Fields in Table `mx_page` (update for new permissions) # ! ALTER TABLE mx_table_page ADD page_desc varchar(255) default NULL AFTER page_name; ! ALTER TABLE mx_table_page ADD auth_moderator_group varchar(255) NOT NULL default '0' AFTER auth_view_group; ALTER TABLE mx_table_page ADD page_graph_border varchar(255) NOT NULL default ''; *************** *** 113,117 **** # ALTER TABLE mx_table_portal ADD portal_recached VARCHAR(255) BINARY NOT NULL DEFAULT ''; ! ALTER TABLE mx_table_portal ADD mx_use_cache smallint(5) unsigned NOT NULL default '1'; # --- 115,119 ---- # ALTER TABLE mx_table_portal ADD portal_recached VARCHAR(255) BINARY NOT NULL DEFAULT ''; ! ALTER TABLE mx_table_portal ADD mx_use_cache smallint(5) unsigned NOT NULL default '1' AFTER top_phpbb_links; # *************** *** 213,217 **** UPDATE mx_table_module SET module_name = 'Core Blocks', ! SET module_desc = 'mxBB Core (standard) Module', ! SET module_path = 'modules/mx_coreblocks/', ! WHERE module_id = '{module.module_id}'; \ No newline at end of file --- 215,230 ---- UPDATE mx_table_module SET module_name = 'Core Blocks', ! module_desc = 'mxBB Core (standard) Module', ! module_path = 'modules/mx_coreblocks/', ! module_include_admin = '0' ! WHERE module_id = '{module.module_id}'; ! ! # ! # Minor mistake for the textblocks ! # ! SET module = SELECT * FROM mx_table_module WHERE module_path = 'modules/mx_textblocks/'; ! ! UPDATE mx_table_module ! SET module_include_admin = '0' ! WHERE module_id = '{module.module_id}'; ! \ No newline at end of file Index: mysql_schema_upgrade_to_2.8_rc7.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_upgrade_to_2.8_rc7.sql,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mysql_schema_upgrade_to_2.8_rc7.sql 8 Dec 2005 21:41:28 -0000 1.4 --- mysql_schema_upgrade_to_2.8_rc7.sql 9 Dec 2005 00:22:23 -0000 1.5 *************** *** 22,27 **** # ALTER TABLE mx_table_block MODIFY auth_view tinyint(2) NOT NULL default '0'; ! ALTER TABLE mx_table_block MODIFY auth_view tinyint(2) NOT NULL default '0'; ! ALTER TABLE mx_table_block MODIFY auth_view tinyint(2) NOT NULL default '0'; ALTER TABLE mx_table_block MODIFY auth_view_group smallint(5) NOT NULL default '0'; --- 22,27 ---- # ALTER TABLE mx_table_block MODIFY auth_view tinyint(2) NOT NULL default '0'; ! ALTER TABLE mx_table_block MODIFY auth_edit tinyint(2) NOT NULL default '0'; ! ALTER TABLE mx_table_block MODIFY auth_delete tinyint(2) NOT NULL default '0'; ALTER TABLE mx_table_block MODIFY auth_view_group smallint(5) NOT NULL default '0'; *************** *** 36,39 **** --- 36,40 ---- ALTER TABLE mx_table_page MODIFY auth_view tinyint(2) NOT NULL default '0'; ALTER TABLE mx_table_page MODIFY auth_view_group smallint(5) NOT NULL default '0'; + ALTER TABLE mx_table_page MODIFY auth_moderator_group smallint(5) NOT NULL default '0'; # ------------------------------------------------------------ |
|
From: Jon O. <jon...@us...> - 2005-12-09 00:22:30
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12821/install Modified Files: mx_install.php Log Message: schemas and upgrade data are validated Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** mx_install.php 27 Nov 2005 02:14:47 -0000 1.55 --- mx_install.php 9 Dec 2005 00:22:20 -0000 1.56 *************** *** 587,591 **** $portal_config = $db->sql_fetchrow($result); include($mx_root_path . "includes/mx_functions_core.$phpEx"); ! update_session_cache(MX_ALL_DATA); $process_msgs[] = $lang['Cache_generate']; } --- 587,591 ---- $portal_config = $db->sql_fetchrow($result); include($mx_root_path . "includes/mx_functions_core.$phpEx"); ! update_session_cache(MX_CACHE_ALL); $process_msgs[] = $lang['Cache_generate']; } *************** *** 618,625 **** page_header_install($install_title, $message); $template->set_filenames(array('button' => 'mx_install_button.tpl')); $template->assign_vars(array( ! 'S_FORM_ACTION' => $mx_root_path . "index.$phpEx", 'S_HIDDEN_FIELDS' => '', ! 'L_SUBMIT' => $mx_portal_name, )); $template->pparse('button'); --- 618,628 ---- page_header_install($install_title, $message); $template->set_filenames(array('button' => 'mx_install_button.tpl')); + + $action_label = $install_mode == 'upgrade' ? $lang['Go_to_admincp'] : $mx_portal_name; + $action_url = $install_mode == 'upgrade' ? $mx_root_path . "admin/index.$phpEx" : $mx_root_path . "index.$phpEx"; $template->assign_vars(array( ! 'S_FORM_ACTION' => $action_url, 'S_HIDDEN_FIELDS' => '', ! 'L_SUBMIT' => $action_label, )); $template->pparse('button'); *************** *** 1581,1584 **** --- 1584,1588 ---- if( !($result = parse_cmd_sql($expression)) ) { + //$process_vars[$setvar] = ''; return false; } *************** *** 1680,1684 **** 'portal_phpbb_url' => "'$phpbb_url'", 'portal_url' => "'$portal_url'", ! 'top_phpbb_links' => 1, ); $sql = "INSERT INTO ".PORTAL_TABLE." (". --- 1684,1690 ---- 'portal_phpbb_url' => "'$phpbb_url'", 'portal_url' => "'$portal_url'", ! 'top_phpbb_links' => 0, ! 'mx_use_cache' => 1, ! 'mod_rewrite' => 0, ); $sql = "INSERT INTO ".PORTAL_TABLE." (". |
|
From: Jon O. <jon...@us...> - 2005-12-08 21:41:38
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3429/language/lang_english Modified Files: lang_admin.php Log Message: fix for mod_rewrite updated schemas Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** lang_admin.php 26 Nov 2005 18:24:08 -0000 1.52 --- lang_admin.php 8 Dec 2005 21:41:28 -0000 1.53 *************** *** 121,124 **** --- 121,129 ---- $lang['Top_phpbb_links'] = "Show phpBB header links <br /> - new/unread posts etc on the portal front page"; $lang['Portal_version'] = "mxBB-Portal Version:"; + $lang['Mx_use_cache'] = "Use mxBB Block Cache"; + $lang['Mx_use_cache_explain'] = "Block data is cached to individual cache/block_*.xml files. Block cache files are created when Blocks are edited."; + $lang['Mx_mod_rewrite'] = "Use mod_rewrite"; + $lang['Mx_mod_rewrite_explain'] = "If you're running on an Apache server, with mod_rewrite activated, you may rewrite urls like 'page=x' with more intuitive alternatives. Read further documentation in the mx_mod_rewrite module."; + // *************** *** 398,402 **** $lang['Cache_submit'] = "Generate the cache file?"; $lang['Cache_explain'] = "With this option you can generate all XML files (cache files) at once for all portal blocks. These files allow the reduction of the number of database queries needed, and improves overall portal performance. <br />Note: the mxBB cache must be enabled (in the Portal General Admin CP) for these files to be used by the system.<br>Further note: the cache files are created on the fly when editing blocks as well."; - $lang['Mx_use_cache'] = "Use mxBB Block Cache<br />- Block data is cached to individual cache/block_*.xml files. Block cache files are created when Blocks are edited."; $lang['Generate_mx_cache'] = "Generate Block Cache"; --- 403,406 ---- |
|
From: Jon O. <jon...@us...> - 2005-12-08 21:41:38
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3429/install/schemas Modified Files: mysql_schema_install.sql mysql_schema_upgrade_to_2.8_rc7.sql Log Message: fix for mod_rewrite updated schemas Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mysql_schema_install.sql 8 Dec 2005 14:41:48 -0000 1.9 --- mysql_schema_install.sql 8 Dec 2005 21:41:28 -0000 1.10 *************** *** 515,519 **** `mx_use_cache` smallint(5) unsigned NOT NULL default '1', `portal_recached` varchar(255) NOT NULL default '', ! `mod_rewrite` varchar(255) NOT NULL default '0', PRIMARY KEY (`portal_id`) ); --- 515,519 ---- `mx_use_cache` smallint(5) unsigned NOT NULL default '1', `portal_recached` varchar(255) NOT NULL default '', ! `mod_rewrite` smallint(2) NOT NULL default '0', PRIMARY KEY (`portal_id`) ); Index: mysql_schema_upgrade_to_2.8_rc7.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_upgrade_to_2.8_rc7.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mysql_schema_upgrade_to_2.8_rc7.sql 8 Dec 2005 14:41:48 -0000 1.3 --- mysql_schema_upgrade_to_2.8_rc7.sql 8 Dec 2005 21:41:28 -0000 1.4 *************** *** 15,19 **** # New Fields in Table `mx_portal` # ! ALTER TABLE mx_table_portal ADD mod_rewrite VARCHAR(255) NOT NULL DEFAULT '0'; # ------------------------------------------------------------ --- 15,19 ---- # New Fields in Table `mx_portal` # ! ALTER TABLE mx_table_portal ADD mod_rewrite smallint(2) NOT NULL DEFAULT '0'; # ------------------------------------------------------------ |
|
From: Jon O. <jon...@us...> - 2005-12-08 21:41:38
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3429 Modified Files: common.php Log Message: fix for mod_rewrite updated schemas Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** common.php 8 Dec 2005 14:41:48 -0000 1.43 --- common.php 8 Dec 2005 21:41:27 -0000 1.44 *************** *** 186,190 **** if( !defined('MX_INSTALLED') ) { ! header("Location: ' . $mx_root_path . 'install/mx_install.$phpEx"); exit; } --- 186,190 ---- if( !defined('MX_INSTALLED') ) { ! header("Location: " . $mx_root_path . "install/mx_install.$phpEx"); exit; } |
|
From: Jon O. <jon...@us...> - 2005-12-08 21:41:38
|
Update of /cvsroot/mxbb/core/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3429/templates/subSilver/admin Modified Files: admin_mx_portal.tpl Log Message: fix for mod_rewrite updated schemas Index: admin_mx_portal.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/admin/admin_mx_portal.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_mx_portal.tpl 20 Mar 2005 23:19:18 -0000 1.5 --- admin_mx_portal.tpl 8 Dec 2005 21:41:28 -0000 1.6 *************** *** 25,32 **** </tr> <tr> ! <td class="row1">{L_MX_USE_CACHE}</td> <td class="row2"><input type="radio" name="mx_use_cache" value="1" {S_MX_USE_CACHE_YES} /> {L_YES} <input type="radio" name="mx_use_cache" value="0" {S_MX_USE_CACHE_NO} /> {L_NO}</td> </tr> <tr> <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /> </tr> --- 25,36 ---- </tr> <tr> ! <td class="row1">{L_MX_USE_CACHE}<br /><span class="gensmall">{L_MX_USE_CACHE_EXPLAIN}</span></td> <td class="row2"><input type="radio" name="mx_use_cache" value="1" {S_MX_USE_CACHE_YES} /> {L_YES} <input type="radio" name="mx_use_cache" value="0" {S_MX_USE_CACHE_NO} /> {L_NO}</td> </tr> <tr> + <td class="row1">{L_MX_MOD_REWRITE}<br /><span class="gensmall">{L_MX_MOD_REWRITE_EXPLAIN}</span></td> + <td class="row2"><input type="radio" name="mod_rewrite" value="1" {S_MX_MOD_REWRITE_YES} /> {L_YES} <input type="radio" name="mod_rewrite" value="0" {S_MX_MOD_REWRITE_NO} /> {L_NO}</td> + </tr> + <tr> <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /> </tr> |
|
From: Jon O. <jon...@us...> - 2005-12-08 21:41:38
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3429/admin Modified Files: admin_mx_portal.php Log Message: fix for mod_rewrite updated schemas Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** admin_mx_portal.php 8 Dec 2005 14:41:47 -0000 1.20 --- admin_mx_portal.php 8 Dec 2005 21:41:27 -0000 1.21 *************** *** 51,54 **** --- 51,55 ---- $new['top_phpbb_links'] = $mx_request_vars->post('top_phpbb_links', MX_TYPE_INT, '0'); $new['mx_use_cache'] = $mx_request_vars->post('mx_use_cache', MX_TYPE_INT, '1'); + $new['mod_rewrite'] = $mx_request_vars->post('mod_rewrite', MX_TYPE_INT, '0'); $sql = "UPDATE " . PORTAL_TABLE . " *************** *** 57,61 **** portal_phpbb_url= '" . str_replace("\'", "''", $new['portal_phpbb_url']) . "', top_phpbb_links = '" . str_replace("\'", "''", $new['top_phpbb_links']) . "', ! mx_use_cache = '" . str_replace("\'", "''", $new['mx_use_cache']) . "'"; if( !($db->sql_query($sql)) ) --- 58,63 ---- portal_phpbb_url= '" . str_replace("\'", "''", $new['portal_phpbb_url']) . "', top_phpbb_links = '" . str_replace("\'", "''", $new['top_phpbb_links']) . "', ! mx_use_cache = '" . str_replace("\'", "''", $new['mx_use_cache']) . "', ! mod_rewrite = '" . str_replace("\'", "''", $new['mod_rewrite']) . "'"; if( !($db->sql_query($sql)) ) *************** *** 64,67 **** --- 66,70 ---- } + $mx_config_cache->put( 'config', $new ); $mx_config_cache->unload(); *************** *** 80,83 **** --- 83,89 ---- $mx_use_cache_no = ( $portal_config['mx_use_cache'] == 0 ) ? 'checked="checked"' : ''; + $mx_mod_rewrite_yes = ( $portal_config['mod_rewrite'] == 1 ) ? 'checked="checked"' : ''; + $mx_mod_rewrite_no = ( $portal_config['mod_rewrite'] == 0 ) ? 'checked="checked"' : ''; + $phpbb_rel_path = substr( "$phpbb_root_path", 3 ); *************** *** 131,137 **** "L_MX_USE_CACHE" => $lang['Mx_use_cache'], "S_MX_USE_CACHE_YES" => $mx_use_cache_yes, "S_MX_USE_CACHE_NO" => $mx_use_cache_no, ! "MX_USE_CACHE" => $portal_config['mx_use_cache'] )); --- 137,150 ---- "L_MX_USE_CACHE" => $lang['Mx_use_cache'], + "L_MX_USE_CACHE_EXPLAIN" => $lang['Mx_use_cache_explain'], "S_MX_USE_CACHE_YES" => $mx_use_cache_yes, "S_MX_USE_CACHE_NO" => $mx_use_cache_no, ! "MX_USE_CACHE" => $portal_config['mx_use_cache'], ! ! "L_MX_MOD_REWRITE" => $lang['Mx_mod_rewrite'], ! "L_MX_MOD_REWRITE_EXPLAIN" => $lang['Mx_mod_rewrite_explain'], ! "S_MX_MOD_REWRITE_YES" => $mx_mod_rewrite_yes, ! "S_MX_MOD_REWRITE_NO" => $mx_mod_rewrite_no, ! "MX_MOD_REWRITE" => $portal_config['mod_rewrite'] )); |
|
From: Jon O. <jon...@us...> - 2005-12-08 15:15:59
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb/pafiledb/includes Modified Files: functions.php functions_cache.php functions_comment.php functions_pafiledb.php Added Files: functions_auth.php Log Message: in progress commit for mx_pafiledb Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** functions.php 24 Oct 2005 20:16:56 -0000 1.17 --- functions.php 8 Dec 2005 15:15:12 -0000 1.18 *************** *** 24,41 **** } class pafiledb_functions { function set_config( $config_name, $config_value ) { ! global $cache, $pafiledb_config, $db; $sql = "UPDATE " . PA_CONFIG_TABLE . " SET config_value = '" . str_replace( "\'", "''", $config_value ) . "' [...2195 lines suppressed...] { ! $pafiledb_template->assign_block_vars( 'copy_footer', array() ); } + + if ( !isset( $_GET['explain'] ) ) + { + $pafiledb_template->display( 'body' ); + } + + $pafiledb_cache->unload(); ! if ( $action != 'download' ) { ! if ( !$is_block ) { ! //include( $mx_root_path . 'includes/page_tail.' . $phpEx ); } } } Index: functions_cache.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_cache.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** functions_cache.php 1 Oct 2005 14:15:19 -0000 1.4 --- functions_cache.php 8 Dec 2005 15:15:12 -0000 1.5 *************** *** 24,28 **** } ! class acm { var $vars = ''; --- 24,28 ---- } ! class pafiledb_cache { var $vars = ''; *************** *** 30,40 **** var $modified = false; ! function acm() { global $phpbb_root_path; - /* - orig - $this->cache_dir = $phpbb_root_path . 'pafiledb/cache/'; - */ - // MX global $mx_root_path, $module_root_path, $is_block, $phpEx; $this->cache_dir = $module_root_path . 'pafiledb/cache/'; --- 30,36 ---- var $modified = false; ! function pafiledb_cache() { global $phpbb_root_path; global $mx_root_path, $module_root_path, $is_block, $phpEx; $this->cache_dir = $module_root_path . 'pafiledb/cache/'; Index: functions_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_comment.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** functions_comment.php 24 Oct 2005 20:16:56 -0000 1.14 --- functions_comment.php 8 Dec 2005 15:15:12 -0000 1.15 *************** *** 24,266 **** } ! function display_comments( &$file_data ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; ! global $_REQUEST, $phpbb_root_path, $userdata, $db, $pafiledb, $pafiledb_functions; ! /* - orig ! include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); ! */ ! // MX [...1499 lines suppressed...] + case 'delete': + $this->delete_phpbb_post($this->forum_id, $this->topic_id, $cid ); + break; + + case 'insert': + $this->insert_phpbb_post( $title, $comments_text, $this->forum_id, $user_id, $username, $user_attach_sig, $this->topic_id, '', $title_first, $comments_text_first, $comment_bbcode_uid ); + break; + + case 'update': + $this->insert_phpbb_post( $title, $comments_text, $this->forum_id, $user_id, $username, $user_attach_sig, $this->topic_id, $cid, $title_first, $comments_text_first, $comment_bbcode_uid ); + break; + + default: + mx_message_die(GENERAL_ERROR, 'bad post mode'); + + + } } } --- NEW FILE: functions_auth.php --- <?php /** ------------------------------------------------------------------------ * Subject : mxBB - a fully modular portal and CMS (for phpBB) * Author : Jon Ohlsson and the mxBB Team * Credits : The phpBB Group & Marc Morisette, wGeric * Copyright : (C) 2002-2005 mxBB Portal * Email : jo...@mx... * Project site : www.mxbb-portal.com * ------------------------------------------------------------------------- * * $Id: functions_auth.php,v 1.1 2005/12/08 15:15:12 jonohlsson Exp $ */ /** * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ if ( !defined( 'IN_PORTAL' ) ) { die( 'Hacking attempt' ); } // =================================================== // pafiledb Auth class // =================================================== class mx_pafiledb_auth { var $auth = array(); var $auth_global = array(); // // $c_access :: category access row // $u_access :: private access row // function auth( $c_access ) { global $db, $db, $lang, $userdata, $pafiledb_config; $a_sql = 'a.auth_view, a.auth_read, a.auth_view_file, a.auth_edit_file, a.auth_delete_file, a.auth_upload, a.auth_download, a.auth_rate, a.auth_email, a.auth_view_comment, a.auth_post_comment, a.auth_edit_comment, a.auth_delete_comment, a.auth_mod, a.auth_search, a.auth_stats, a.auth_toplist, a.auth_viewall, a.auth_approval'; $auth_fields = array( 'auth_view', 'auth_read', 'auth_view_file', 'auth_edit_file', 'auth_delete_file', 'auth_upload', 'auth_download', 'auth_rate', 'auth_email', 'auth_view_comment', 'auth_post_comment', 'auth_edit_comment', 'auth_delete_comment', 'auth_approval' ); $auth_fields_global = array( 'auth_search', 'auth_stats', 'auth_toplist', 'auth_viewall' ); // If the user isn't logged on then all we need do is check if the forum // has the type set to ALL, if yes they are good to go, if not then they // are denied access $u_access = array(); $global_u_access = array(); if ( $userdata['session_logged_in'] ) { $sql = "SELECT a.cat_id, a.group_id, $a_sql FROM " . PA_AUTH_ACCESS_TABLE . " a, " . USER_GROUP_TABLE . " ug WHERE ug.user_id = {$userdata['user_id']} AND ug.user_pending = 0 AND a.group_id = ug.group_id"; if ( !( $result = $db->sql_query( $sql ) ) ) { mx_message_die( GENERAL_ERROR, 'Failed obtaining category access control lists', '', __LINE__, __FILE__, $sql ); } if ( $row = $db->sql_fetchrow( $result ) ) { do { if ( $row['cat_id'] ) { $u_access[$row['cat_id']][] = $row; } else { $global_u_access = $row; } } while ( $row = $db->sql_fetchrow( $result ) ); } } $is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? true : 0; for( $i = 0; $i < count( $auth_fields ); $i++ ) { $key = $auth_fields[$i]; // If the user is logged on and the forum type is either ALL or REG then the user has access // If the type if ACL, MOD or ADMIN then we need to see if the user has specific permissions // to do whatever it is they want to do ... to do this we pull relevant information for the // user (and any groups they belong to) // Now we compare the users access level against the forums. We assume here that a moderator // and admin automatically have access to an ACL forum, similarly we assume admins meet an // auth requirement of MOD for( $k = 0; $k < count( $c_access ); $k++ ) { $value = $c_access[$k][$key]; $c_cat_id = $c_access[$k]['cat_id']; global $lang; switch ( $value ) { case AUTH_ALL: $this->auth[$c_cat_id][$key] = true; $this->auth[$c_cat_id][$key . '_type'] = $lang['Auth_Anonymous_users']; break; case AUTH_REG: $this->auth[$c_cat_id][$key] = ( $userdata['session_logged_in'] ) ? true : 0; $this->auth[$c_cat_id][$key . '_type'] = $lang['Auth_Registered_Users']; break; case AUTH_ACL: $this->auth[$c_cat_id][$key] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user( AUTH_ACL, $key, $u_access[$c_cat_id], $is_admin ) : 0; $this->auth[$c_cat_id][$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: $this->auth[$c_cat_id][$key] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user( AUTH_MOD, 'auth_mod', $u_access[$c_cat_id], $is_admin ) : 0; $this->auth[$c_cat_id][$key . '_type'] = $lang['Auth_Moderators']; break; case AUTH_ADMIN: $this->auth[$c_cat_id][$key] = $is_admin; $this->auth[$c_cat_id][$key . '_type'] = $lang['Auth_Administrators']; break; default: $this->auth[$c_cat_id][$key] = 0; break; } } } for( $k = 0; $k < count( $c_access ); $k++ ) { $c_cat_id = $c_access[$k]['cat_id']; $this->auth[$c_cat_id]['auth_mod'] = ( $userdata['session_logged_in'] ) ? $this->auth_check_user( AUTH_MOD, 'auth_mod', $u_access[$c_cat_id], $is_admin ) : 0; } for( $i = 0; $i < count( $auth_fields_global ); $i++ ) { $key = $auth_fields_global[$i]; $value = $pafiledb_config[$auth_fields_global[$i]]; global $lang; switch ( $value ) { case AUTH_ALL: $this->auth_global[$key] = true; $this->auth_global[$key . '_type'] = $lang['Auth_Anonymous_users']; break; case AUTH_REG: $this->auth_global[$key] = ( $userdata['session_logged_in'] ) ? true : 0; $this->auth_global[$key . '_type'] = $lang['Auth_Registered_Users']; break; case AUTH_ACL: $this->auth_global[$key] = ( $userdata['session_logged_in'] ) ? $this->global_auth_check_user( AUTH_ACL, $key, $global_u_access, $is_admin ) : 0; $this->auth_global[$key . '_type'] = $lang['Auth_Users_granted_access']; break; case AUTH_MOD: $this->auth_global[$key] = ( $userdata['session_logged_in'] ) ? $this->global_auth_check_user( AUTH_MOD, 'auth_mod', $global_u_access, $is_admin ) : 0; $this->auth_global[$key . '_type'] = $lang['Auth_Moderators']; break; case AUTH_ADMIN: $this->auth_global[$key] = $is_admin; $this->auth_global[$key . '_type'] = $lang['Auth_Administrators']; break; default: $this->auth_global[$key] = 0; break; } } } function auth_check_user( $type, $key, $u_access, $is_admin ) { $auth_user = 0; if ( count( $u_access ) ) { for( $j = 0; $j < count( $u_access ); $j++ ) { $result = 0; switch ( $type ) { case AUTH_ACL: $result = $u_access[$j][$key]; case AUTH_MOD: $result = $result || $u_access[$j]['auth_mod']; case AUTH_ADMIN: $result = $result || $is_admin; break; } $auth_user = $auth_user || $result; } } else { $auth_user = $is_admin; } return $auth_user; } function global_auth_check_user( $type, $key, $global_u_access, $is_admin ) { $auth_user = 0; if ( !empty( $global_u_access ) ) { $result = 0; switch ( $type ) { case AUTH_ACL: $result = $global_u_access[$key]; case AUTH_MOD: $result = $result || $this->is_moderator(); case AUTH_ADMIN: $result = $result || $is_admin; break; } $auth_user = $auth_user || $result; } else { $auth_user = $is_admin; } return $auth_user; } function is_moderator() { if ( !empty( $this->auth ) ) { foreach( $this->auth as $cat_id => $auth_fields ) { if ( $auth_fileds['auth_mod'] ) { return true; } } return false; } return false; } } ?> Index: functions_pafiledb.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** functions_pafiledb.php 24 Oct 2005 20:16:56 -0000 1.21 --- functions_pafiledb.php 8 Dec 2005 15:15:12 -0000 1.22 *************** *** 23,33 **** die( "Hacking attempt" ); } // =================================================== // public pafiledb class // =================================================== ! class pafiledb_public extends pafiledb { var $modules = array(); var $module_name = ''; // =================================================== [...1409 lines suppressed...] + + $this->auth_can_list = '<br />' . ( ( $this->auth[$cat_id]['auth_upload'] ) ? $lang['PA_Rules_upload_can'] : $lang['PA_Rules_upload_cannot'] ) . '<br />'; + $this->auth_can_list .= ( ( $this->auth[$cat_id]['auth_view_file'] ) ? $lang['PA_Rules_view_file_can'] : $lang['PA_Rules_view_file_cannot'] ) . '<br />'; + $this->auth_can_list .= ( ( $this->auth[$cat_id]['auth_edit_file'] ) ? $lang['PA_Rules_edit_file_can'] : $lang['PA_Rules_edit_file_cannot'] ) . '<br />'; + $this->auth_can_list .= ( ( $this->auth[$cat_id]['auth_delete_file'] ) ? $lang['PA_Rules_delete_file_can'] : $lang['PA_Rules_delete_file_cannot'] ) . '<br />'; + $this->auth_can_list .= ( ( $this->comments[$cat_id]['activated'] ? ( ( $this->auth[$cat_id]['auth_view_comment'] ? $lang['PA_Rules_view_comment_can'] : $lang['PA_Rules_view_comment_cannot'] ) . '<br />') : '')); + $this->auth_can_list .= ( ( $this->comments[$cat_id]['activated'] ? ( ( $this->auth[$cat_id]['auth_post_comment'] ? $lang['PA_Rules_post_comment_can'] : $lang['PA_Rules_post_comment_cannot'] ) . '<br />') : '')); + $this->auth_can_list .= ( ( $this->ratings[$cat_id]['activated'] ? ( ( $this->auth[$cat_id]['auth_rate'] ? $lang['PA_Rules_rate_can'] : $lang['PA_Rules_rate_cannot'] ) . '<br />') : '')); + $this->auth_can_list .= ( ( $this->auth[$cat_id]['auth_download'] ) ? $lang['PA_Rules_download_can'] : $lang['PA_Rules_download_cannot'] ) . '<br />'; + + if ( $this->auth[$cat_id]['auth_mod'] ) + { + $this->auth_can_list .= $lang['PA_Rules_moderate_can']; + } + } } + ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2005-12-08 15:15:54
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb/pafiledb Modified Files: pafiledb_common.php Log Message: in progress commit for mx_pafiledb Index: pafiledb_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/pafiledb_common.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pafiledb_common.php 1 Oct 2005 14:15:20 -0000 1.11 --- pafiledb_common.php 8 Dec 2005 15:15:13 -0000 1.12 *************** *** 24,27 **** --- 24,28 ---- } + /* // =================================================== // addslashes to vars if magic_quotes_gpc is off *************** *** 67,70 **** --- 68,72 ---- $_REQUEST = slash_input_data( $_REQUEST ); } + */ // =================================================== *************** *** 75,105 **** include_once( $module_root_path . 'pafiledb/includes/functions.' . $phpEx ); include_once( $module_root_path . 'pafiledb/includes/functions_cache.' . $phpEx ); include_once( $module_root_path . 'pafiledb/includes/functions_mx.' . $phpEx ); - include_once( $module_root_path . 'pafiledb/includes/template.' . $phpEx ); include_once( $module_root_path . 'pafiledb/includes/functions_pafiledb.' . $phpEx ); ! $cache = new acm(); $pafiledb_functions = new pafiledb_functions(); ! if ( $cache->exists( 'config' ) ) { ! $pafiledb_config = $cache->get( 'config' ); } else { $pafiledb_config = $pafiledb_functions->pafiledb_config(); ! $cache->put( 'config', $pafiledb_config ); } - $pafiledb_user = new user_info(); $pafiledb_template = new pafiledb_template(); $pafiledb_template->set_template( $theme['template_name'] ); $pafiledb = new pafiledb_public(); ! // MX add-on ! // Generate paths for page and standalone mode ! // ...function based on original function written by Markus :-) ! function pa_this_mxurl( $args = '', $force_standalone_mode = false ) { global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block; --- 77,108 ---- include_once( $module_root_path . 'pafiledb/includes/functions.' . $phpEx ); include_once( $module_root_path . 'pafiledb/includes/functions_cache.' . $phpEx ); + include_once( $module_root_path . 'pafiledb/includes/functions_auth.' . $phpEx ); include_once( $module_root_path . 'pafiledb/includes/functions_mx.' . $phpEx ); include_once( $module_root_path . 'pafiledb/includes/functions_pafiledb.' . $phpEx ); + include_once( $module_root_path . 'pafiledb/includes/template.' . $phpEx ); ! $pafiledb_cache = new pafiledb_cache(); $pafiledb_functions = new pafiledb_functions(); ! if ( $pafiledb_cache->exists( 'config' ) ) { ! $pafiledb_config = $pafiledb_cache->get( 'config' ); } else { $pafiledb_config = $pafiledb_functions->pafiledb_config(); ! $pafiledb_cache->put( 'config', $pafiledb_config ); } $pafiledb_template = new pafiledb_template(); $pafiledb_template->set_template( $theme['template_name'] ); + $pafiledb_user = new pafiledb_user_info(); $pafiledb = new pafiledb_public(); ! // =================================================== ! // url rewrites ! // =================================================== ! function pa_this_mxurl( $args = '', $force_standalone_mode = false, $non_html_amp = false ) { global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block; *************** *** 112,118 **** { $mxurl = $mx_root_path . 'index.' . $phpEx; if ( is_numeric( $page_id ) ) { ! $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : '&' . $args ); } else --- 115,122 ---- { $mxurl = $mx_root_path . 'index.' . $phpEx; + if ( is_numeric( $page_id ) ) { ! $mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args ); } else |
|
From: Jon O. <jon...@us...> - 2005-12-08 15:15:54
|
Update of /cvsroot/mxbb/mx_pafiledb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb Modified Files: db_install.php db_upgrade.php dload.php dload_lists.php dload_quickdl.php Log Message: in progress commit for mx_pafiledb Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_upgrade.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** db_upgrade.php 1 Oct 2005 14:15:19 -0000 1.10 --- db_upgrade.php 8 Dec 2005 15:15:11 -0000 1.11 *************** *** 41,45 **** } ! $mx_module_version = 'mxBB pafileDB Module 2.0.1'; $mx_module_copy = 'Based on <a href="http://www.phparena.net/" target="_phpbb" >PHP Arena, pafileDB 3.0</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=56035" target="_phpbb" >Mohd pafileDB 0.0.9d</a>'; --- 41,45 ---- } ! $mx_module_version = 'mxBB pafileDB Module 2.0.2'; $mx_module_copy = 'Based on <a href="http://www.phparena.net/" target="_phpbb" >PHP Arena, pafileDB 3.0</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=56035" target="_phpbb" >Mohd pafileDB 0.0.9d</a>'; *************** *** 83,86 **** --- 83,98 ---- $message .= "<b>Validating v. 2.0.1...ok</b><br/><br/>"; } + + // validate before 2.0.2 + $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "pa_config WHERE config_name = 'internal_comments'" ); + if ( $db->sql_numrows( $result ) == 0 || true) + { + $upgrade_202 = 1; + $message .= "<b>Upgrading to v. 2.0.2...ok</b><br/><br/>"; + } + else + { + $message .= "<b>Validating v. 2.0.2...ok</b><br/><br/>"; + } // ------------------------------------------------------------------------------------------------------ *************** *** 109,118 **** // Upgrade the config table to avoid duplicate entries ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_config MODIFY config_name VARCHAR(255) NOT NULL default '' "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_config MODIFY config_value VARCHAR(255) NOT NULL default '' "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_config DROP PRIMARY KEY, ADD PRIMARY KEY (config_name) "; } if ( !MXBB_27x ) { --- 121,206 ---- // Upgrade the config table to avoid duplicate entries ! /* ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_config MODIFY config_name VARCHAR(255) NOT NULL default '' "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_config MODIFY config_value VARCHAR(255) NOT NULL default '' "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_config DROP PRIMARY KEY, ADD PRIMARY KEY (config_name) "; ! */ } + + if ( $upgrade_202 == 1 ) + { + // Upgrade the config table to avoid duplicate entries + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_config MODIFY config_name VARCHAR(255) NOT NULL default '' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_config MODIFY config_value VARCHAR(255) NOT NULL default '' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_config DROP PRIMARY KEY, ADD PRIMARY KEY (config_name) "; + + // Configs + $sql[] = "UPDATE " . $mx_table_prefix . "pa_config" . " SET config_name = 'enable_module' WHERE config_name = 'settings_disable'"; + $sql[] = "UPDATE " . $mx_table_prefix . "pa_config" . " SET config_name = 'module_name' WHERE config_name = 'settings_dbname'"; + $sql[] = "UPDATE " . $mx_table_prefix . "pa_config" . " SET config_name = 'pagination' WHERE config_name = 'settings_file_page'"; + + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'art_pagination'"; + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'comments_show'"; + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'pm_notify'"; + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'allow_wysiwyg_comments'"; + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'allow_wysiwyg'"; + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'formatting_fixup'"; + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'formatting_comment_fixup'"; + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'need_validation'"; + $sql[] = "DELETE FROM " . $mx_table_prefix . "pa_config" . " WHERE config_name = 'validator'"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('wysiwyg_path', 'modules/')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('use_comments', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('internal_comments', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('formatting_comment_wordwrap', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('formatting_comment_image_resize', '300')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('formatting_comment_truncate_links', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('max_comment_subject_chars', '50')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('max_comment_chars', '5000')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_wysiwyg', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_html', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_bbcode', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_smilies', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_links', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_images', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('no_comment_image_message', '[No image please]')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('no_comment_link_message', '[No links please]')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allowed_comment_html_tags', 'b,i,u,a')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('del_topic', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('autogenerate_comments', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('comments_pagination', '5')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('use_ratings', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('votes_check_userid', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('votes_check_ip', '1')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('notify', '0')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('notify_group', '0')"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('show_pretext', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('pt_header', 'File Submission Instructions')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('pt_body', 'Please check your references and include as much information as you can.')"; + + + // add fields to pa_category table + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD internal_comments tinyint(2) NOT NULL DEFAULT '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD autogenerate_comments tinyint(2) NOT NULL DEFAULT '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD comments_forum_id mediumint(8) NOT NULL DEFAULT '-1' "; + + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD show_pretext tinyint(2) NOT NULL default '-1' "; + + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD notify tinyint(2) NOT NULL DEFAULT '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD notify_group mediumint(8) NOT NULL DEFAULT '-1' "; + + // auth + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_approval_groups tinyint(2) NOT NULL default '0' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth ADD auth_approval_groups tinyint(1) DEFAULT '0' NOT NULL "; + // add fields to pa_files table + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_files ADD topic_id mediumint(8) unsigned NOT NULL default '0'"; + } + if ( !MXBB_27x ) { Index: dload_lists.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload_lists.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** dload_lists.php 24 Oct 2005 20:16:56 -0000 1.13 --- dload_lists.php 8 Dec 2005 15:15:11 -0000 1.14 *************** *** 18,22 **** * (at your option) any later version. */ ! function this_pa_mxurl( $args = '', $force_standalone_mode = false, $page_id = 1 ) { --- 18,22 ---- * (at your option) any later version. */ ! function this_pa_mxurl( $args = '', $force_standalone_mode = false, $page_id = 1 ) { *************** *** 96,106 **** include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx ); include_once( $module_root_path . 'pafiledb/includes/functions_pafiledb.' . $phpEx ); ! // Set ALBUM Version ! ! // Read block Configuration ! $album_sp_config['img_rows'] = $mx_block->get_parameters( 'num_of_rows' ); $album_sp_config['img_cols'] = $mx_block->get_parameters( 'num_of_cols' ); --- 96,105 ---- include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx ); + include_once( $module_root_path . 'pafiledb/includes/functions_auth.' . $phpEx ); include_once( $module_root_path . 'pafiledb/includes/functions_pafiledb.' . $phpEx ); ! // // Read block Configuration ! // $album_sp_config['img_rows'] = $mx_block->get_parameters( 'num_of_rows' ); $album_sp_config['img_cols'] = $mx_block->get_parameters( 'num_of_cols' ); *************** *** 142,146 **** $catrows = array(); ! $pafiledb = new pafiledb(); $pafiledb->init(); --- 141,145 ---- $catrows = array(); ! $pafiledb = new pafiledb_public(); $pafiledb->init(); Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_install.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** db_install.php 1 Oct 2005 14:15:19 -0000 1.16 --- db_install.php 8 Dec 2005 15:15:11 -0000 1.17 *************** *** 41,45 **** } ! $mx_module_version = 'mxBB pafileDB Module 2.0.1'; $mx_module_copy = 'Based on <a href="http://www.phparena.net/" target="_phpbb" >PHP Arena, pafileDB 3.0</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=56035" target="_phpbb" >Mohd pafileDB 0.0.9d</a>'; --- 41,45 ---- } ! $mx_module_version = 'mxBB pafileDB Module 2.0.2'; $mx_module_copy = 'Based on <a href="http://www.phparena.net/" target="_phpbb" >PHP Arena, pafileDB 3.0</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=56035" target="_phpbb" >Mohd pafileDB 0.0.9d</a>'; *************** *** 57,61 **** $message = "<b>This is a fresh install!</b><br/><br/>"; ! $sql = array( "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_cat ", "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_auth ", "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_comments ", --- 57,62 ---- $message = "<b>This is a fresh install!</b><br/><br/>"; ! $sql = array( ! "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_cat ", "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_auth ", "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_comments ", *************** *** 71,280 **** // Table structure for table `pa_auth` "CREATE TABLE " . $mx_table_prefix . "pa_auth ( ! group_id mediumint(8) DEFAULT '0' NOT NULL, ! cat_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL, ! auth_view tinyint(1) DEFAULT '0' NOT NULL, ! auth_read tinyint(1) DEFAULT '0' NOT NULL, ! auth_view_file tinyint(1) DEFAULT '0' NOT NULL, ! auth_edit_file tinyint(1) DEFAULT '0' NOT NULL, ! auth_delete_file tinyint(1) DEFAULT '0' NOT NULL, ! auth_upload tinyint(1) DEFAULT '0' NOT NULL, ! auth_download tinyint(1) DEFAULT '0' NOT NULL, ! auth_rate tinyint(1) DEFAULT '0' NOT NULL, ! auth_email tinyint(1) DEFAULT '0' NOT NULL, ! auth_view_comment tinyint(1) DEFAULT '0' NOT NULL, ! auth_post_comment tinyint(1) DEFAULT '0' NOT NULL, ! auth_edit_comment tinyint(1) DEFAULT '0' NOT NULL, ! auth_delete_comment tinyint(1) DEFAULT '0' NOT NULL, ! auth_approval tinyint(1) DEFAULT '0' NOT NULL, ! auth_mod tinyint(1) DEFAULT '1' NOT NULL, ! auth_search tinyint(1) DEFAULT '1' NOT NULL, ! auth_stats tinyint(1) DEFAULT '1' NOT NULL, ! auth_toplist tinyint(1) DEFAULT '1' NOT NULL, ! auth_viewall tinyint(1) DEFAULT '1' NOT NULL, ! KEY group_id (group_id), ! KEY cat_id (cat_id) ! )", // Table structure for table `pa_cat` "CREATE TABLE " . $mx_table_prefix . "pa_cat ( ! cat_id int(10) NOT NULL auto_increment, ! cat_name text, ! cat_desc text, ! cat_parent int(50) default NULL, ! parents_data text NOT NULL, ! cat_order int(50) default NULL, ! cat_allow_file tinyint(2) NOT NULL default '0', ! cat_allow_ratings tinyint(2) NOT NULL default '1', ! cat_allow_comments tinyint(2) NOT NULL default '1', ! cat_files mediumint(8) NOT NULL default '-1', ! cat_last_file_id mediumint(8) unsigned NOT NULL default '0', ! cat_last_file_name varchar(255) NOT NULL default '', ! cat_last_file_time INT(50) UNSIGNED DEFAULT '0' NOT NULL, ! auth_view tinyint(2) NOT NULL default '0', ! auth_read tinyint(2) NOT NULL default '0', ! auth_view_file tinyint(2) NOT NULL default '0', ! auth_edit_file tinyint(2) DEFAULT '0' NOT NULL, ! auth_delete_file tinyint(2) DEFAULT '0' NOT NULL, ! auth_upload tinyint(2) NOT NULL default '0', ! auth_download tinyint(2) NOT NULL default '0', ! auth_rate tinyint(2) NOT NULL default '0', ! auth_email tinyint(2) NOT NULL default '0', ! auth_view_comment tinyint(2) NOT NULL default '0', ! auth_post_comment tinyint(2) NOT NULL default '0', ! auth_edit_comment tinyint(2) NOT NULL default '0', ! auth_delete_comment tinyint(2) NOT NULL default '0', ! auth_approval tinyint(2) NOT NULL default '0', ! PRIMARY KEY (cat_id) ! )", // -------------------------------------------------------- // Table structure for table `phpbb_pa_comments` "CREATE TABLE " . $mx_table_prefix . "pa_comments ( ! comments_id int(10) NOT NULL auto_increment, ! file_id int(10) NOT NULL default '0', ! comments_text text NOT NULL, ! comments_title text NOT NULL, ! comments_time int(50) NOT NULL default '0', ! comment_bbcode_uid varchar(10) default NULL, ! poster_id mediumint(8) NOT NULL default '0', ! PRIMARY KEY (comments_id), ! KEY comments_id (comments_id), ! FULLTEXT KEY comment_bbcode_uid (comment_bbcode_uid) ! )", // -------------------------------------------------------- // Table structure for table `phpbb_pa_config` "CREATE TABLE " . $mx_table_prefix . "pa_config ( ! config_name varchar(255) NOT NULL default '', ! config_value varchar(255) NOT NULL default '', ! PRIMARY KEY (config_name) ! )", // -------------------------------------------------------- // Table structure for table `phpbb_pa_custom` "CREATE TABLE " . $mx_table_prefix . "pa_custom ( ! custom_id int(50) NOT NULL auto_increment, ! custom_name text NOT NULL, ! custom_description text NOT NULL, ! data text NOT NULL, ! field_order int(20) NOT NULL default '0', ! field_type tinyint(2) NOT NULL default '0', ! regex varchar(255) NOT NULL default '', ! PRIMARY KEY (custom_id) ! )", // -------------------------------------------------------- // Table structure for table `phpbb_pa_customdata` "CREATE TABLE " . $mx_table_prefix . "pa_customdata ( ! customdata_file int(50) NOT NULL default '0', ! customdata_custom int(50) NOT NULL default '0', ! data text NOT NULL ! )", // -------------------------------------------------------- // Table structure for table `phpbb_pa_download_info` "CREATE TABLE " . $mx_table_prefix . "pa_download_info ( ! file_id mediumint(8) NOT NULL default '0', ! user_id mediumint(8) NOT NULL default '0', ! downloader_ip varchar(8) NOT NULL default '', ! downloader_os varchar(255) NOT NULL default '', ! downloader_browser varchar(255) NOT NULL default '', ! browser_version varchar(255) NOT NULL default '' ! )", // -------------------------------------------------------- // Table structure for table `phpbb_pa_files` "CREATE TABLE " . $mx_table_prefix . "pa_files ( ! file_id int(10) NOT NULL auto_increment, ! user_id mediumint(8) NOT NULL default '0', ! poster_ip varchar(8) NOT NULL default '', ! file_name text, ! file_size int(20) NOT NULL default '0', ! unique_name varchar(255) NOT NULL default '', ! real_name VARCHAR(255) NOT NULL, ! file_dir VARCHAR(255) NOT NULL, ! file_desc text, ! file_creator text, ! file_version text, ! file_longdesc text, ! file_ssurl text, ! file_sshot_link tinyint(2) NOT NULL default '0', ! file_dlurl text, ! file_time int(50) default NULL, ! file_update_time int(50) NOT NULL default '0', ! file_catid int(10) default NULL, ! file_posticon text, ! file_license int(10) default NULL, ! file_dls int(10) DEFAULT '0' NOT NULL, ! file_last int(50) default NULL, ! file_pin int(2) default NULL, ! file_docsurl text, ! file_approved TINYINT(1) DEFAULT '1' NOT NULL, ! file_broken TINYINT(1) DEFAULT '0' NOT NULL, ! PRIMARY KEY (file_id) ! )", // -------------------------------------------------------- "CREATE TABLE " . $mx_table_prefix . "pa_mirrors ( ! mirror_id mediumint(8) NOT NULL auto_increment, ! file_id int(10) NOT NULL, ! unique_name varchar(255) NOT NULL default '', ! file_dir VARCHAR(255) NOT NULL, ! file_dlurl varchar(255) NOT NULL default '', ! mirror_location VARCHAR(255) NOT NULL default '', ! PRIMARY KEY (mirror_id), ! KEY file_id (file_id) ! )", // Table structure for table `phpbb_pa_license` "CREATE TABLE " . $mx_table_prefix . "pa_license ( ! license_id int(10) NOT NULL auto_increment, ! license_name text, ! license_text text, ! PRIMARY KEY (license_id) ! )", // -------------------------------------------------------- // Table structure for table `phpbb_pa_votes` "CREATE TABLE " . $mx_table_prefix . "pa_votes ( ! user_id mediumint(8) NOT NULL default '0', ! votes_ip varchar(50) NOT NULL default '0', ! votes_file int(50) NOT NULL default '0', ! rate_point tinyint(3) unsigned NOT NULL default '0', ! voter_os varchar(255) NOT NULL default '', ! voter_browser varchar(255) NOT NULL default '', ! browser_version varchar(8) NOT NULL default '', ! KEY user_id (user_id), ! KEY votes_file (votes_file), ! KEY votes_ip (votes_ip), ! KEY voter_os (voter_os), ! KEY voter_browser (voter_browser), ! KEY browser_version (browser_version), ! KEY rate_point (rate_point) ! )", ! ! "INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (1, 'My Category', '', 0, '', 1, 0, 1, 1, 0, 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)", ! "INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (2, 'Test Cagegory', 'Just a test category', 1, '', 2, 1, 1, 1, 0, 0, '', 0, 0, 0, 0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0)", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_images', '0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('no_comment_image_message', '[No image please]')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_smilies', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_links', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('no_comment_link_message', '[No links please]')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_disable', '0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_html', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_bbcode', '1')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_topnumber', '10')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_newdays', '1')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_stats', '')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_viewall', '1')", - "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_dbname', 'Download Database')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_dbdescription', '')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('max_comment_chars', '5000')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('tpl_php', '0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_file_page', '20')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('hotlink_prevent', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('hotlink_allowed', '')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('sort_method', 'file_time')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('sort_order', 'DESC')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('pm_notify', '0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('auth_search','0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('auth_stats','0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('auth_toplist','0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('auth_viewall','0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('max_file_size','262144')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('upload_dir','pafiledb/uploads/')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('screenshots_dir','pafiledb/images/screenshots/')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('forbidden_extensions','php, php3, php4, phtml, pl, asp, aspx, cgi')", ); --- 72,350 ---- // Table structure for table `pa_auth` "CREATE TABLE " . $mx_table_prefix . "pa_auth ( ! group_id mediumint(8) DEFAULT '0' NOT NULL, ! cat_id smallint(5) UNSIGNED DEFAULT '0' NOT NULL, ! auth_view tinyint(1) DEFAULT '0' NOT NULL, ! auth_read tinyint(1) DEFAULT '0' NOT NULL, ! auth_view_file tinyint(1) DEFAULT '0' NOT NULL, ! auth_edit_file tinyint(1) DEFAULT '0' NOT NULL, ! auth_delete_file tinyint(1) DEFAULT '0' NOT NULL, ! auth_upload tinyint(1) DEFAULT '0' NOT NULL, ! auth_download tinyint(1) DEFAULT '0' NOT NULL, ! auth_rate tinyint(1) DEFAULT '0' NOT NULL, ! auth_email tinyint(1) DEFAULT '0' NOT NULL, ! auth_view_comment tinyint(1) DEFAULT '0' NOT NULL, ! auth_post_comment tinyint(1) DEFAULT '0' NOT NULL, ! auth_edit_comment tinyint(1) DEFAULT '0' NOT NULL, ! auth_delete_comment tinyint(1) DEFAULT '0' NOT NULL, ! auth_approval tinyint(1) DEFAULT '0' NOT NULL, ! auth_approval_groups tinyint(1) DEFAULT '0' NOT NULL, ! auth_mod tinyint(1) DEFAULT '1' NOT NULL, ! auth_search tinyint(1) DEFAULT '1' NOT NULL, ! auth_stats tinyint(1) DEFAULT '1' NOT NULL, ! auth_toplist tinyint(1) DEFAULT '1' NOT NULL, ! auth_viewall tinyint(1) DEFAULT '1' NOT NULL, ! KEY group_id (group_id), ! KEY cat_id (cat_id) ! )", ! // Table structure for table `pa_cat` "CREATE TABLE " . $mx_table_prefix . "pa_cat ( ! cat_id int(10) NOT NULL auto_increment, ! cat_name text, ! cat_desc text, ! cat_parent int(50) default NULL, ! parents_data text NOT NULL, ! cat_order int(50) default NULL, ! cat_allow_file tinyint(2) NOT NULL default '0', ! ! cat_allow_comments tinyint(2) NOT NULL default '1', ! internal_comments tinyint(2) NOT NULL default '-1', ! autogenerate_comments tinyint(2) NOT NULL default '-1', ! comments_forum_id mediumint(8) NOT NULL DEFAULT '-1', ! ! cat_allow_ratings tinyint(2) NOT NULL default '-1', ! ! show_pretext tinyint(2) NOT NULL default '-1', ! ! notify tinyint(2) NOT NULL default '-1', ! notify_group mediumint(8) unsigned NOT NULL default '-1', ! ! cat_files mediumint(8) NOT NULL default '-1', ! cat_last_file_id mediumint(8) unsigned NOT NULL default '0', ! cat_last_file_name varchar(255) NOT NULL default '', ! cat_last_file_time INT(50) UNSIGNED DEFAULT '0' NOT NULL, ! ! auth_view tinyint(2) NOT NULL default '0', ! auth_read tinyint(2) NOT NULL default '0', ! auth_view_file tinyint(2) NOT NULL default '0', ! auth_edit_file tinyint(2) DEFAULT '0' NOT NULL, ! auth_delete_file tinyint(2) DEFAULT '0' NOT NULL, ! auth_upload tinyint(2) NOT NULL default '0', ! auth_download tinyint(2) NOT NULL default '0', ! auth_rate tinyint(2) NOT NULL default '0', ! auth_email tinyint(2) NOT NULL default '0', ! auth_view_comment tinyint(2) NOT NULL default '0', ! auth_post_comment tinyint(2) NOT NULL default '0', ! auth_edit_comment tinyint(2) NOT NULL default '0', ! auth_delete_comment tinyint(2) NOT NULL default '0', ! auth_approval tinyint(2) NOT NULL default '0', ! auth_approval_groups tinyint(2) NOT NULL default '0', ! PRIMARY KEY (cat_id) ! )", ! ! // ! // Insert ! // ! "INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (1, 'My Category', '', 0, '', 1, 0, 1, 1, 0, 0, '', '-1', '-1', '-1', '-1', '-1', '-1', '-1', '-1', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)", ! "INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (2, 'Test Cagegory', 'Just a test category', 1, '', 2, 1, '-1', '-1', '-1', '-1', '-1', '-1', '-1', '-1', 1, 1, 0, 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)", ! ! // -------------------------------------------------------- // Table structure for table `phpbb_pa_comments` "CREATE TABLE " . $mx_table_prefix . "pa_comments ( ! comments_id int(10) NOT NULL auto_increment, ! file_id int(10) NOT NULL default '0', ! comments_text text NOT NULL, ! comments_title text NOT NULL, ! comments_time int(50) NOT NULL default '0', ! comment_bbcode_uid varchar(10) default NULL, ! poster_id mediumint(8) NOT NULL default '0', ! PRIMARY KEY (comments_id), ! KEY comments_id (comments_id), ! FULLTEXT KEY comment_bbcode_uid (comment_bbcode_uid) ! )", ! // -------------------------------------------------------- // Table structure for table `phpbb_pa_config` "CREATE TABLE " . $mx_table_prefix . "pa_config ( ! config_name varchar(255) NOT NULL default '', ! config_value varchar(255) NOT NULL default '', ! PRIMARY KEY (config_name) ! )", ! // -------------------------------------------------------- // Table structure for table `phpbb_pa_custom` "CREATE TABLE " . $mx_table_prefix . "pa_custom ( ! custom_id int(50) NOT NULL auto_increment, ! custom_name text NOT NULL, ! custom_description text NOT NULL, ! data text NOT NULL, ! field_order int(20) NOT NULL default '0', ! field_type tinyint(2) NOT NULL default '0', ! regex varchar(255) NOT NULL default '', ! PRIMARY KEY (custom_id) ! )", ! // -------------------------------------------------------- // Table structure for table `phpbb_pa_customdata` "CREATE TABLE " . $mx_table_prefix . "pa_customdata ( ! customdata_file int(50) NOT NULL default '0', ! customdata_custom int(50) NOT NULL default '0', ! data text NOT NULL ! )", ! // -------------------------------------------------------- // Table structure for table `phpbb_pa_download_info` "CREATE TABLE " . $mx_table_prefix . "pa_download_info ( ! file_id mediumint(8) NOT NULL default '0', ! user_id mediumint(8) NOT NULL default '0', ! downloader_ip varchar(8) NOT NULL default '', ! downloader_os varchar(255) NOT NULL default '', ! downloader_browser varchar(255) NOT NULL default '', ! browser_version varchar(255) NOT NULL default '' ! )", ! // -------------------------------------------------------- // Table structure for table `phpbb_pa_files` "CREATE TABLE " . $mx_table_prefix . "pa_files ( ! file_id int(10) NOT NULL auto_increment, ! user_id mediumint(8) NOT NULL default '0', ! poster_ip varchar(8) NOT NULL default '', ! file_name text, ! file_size int(20) NOT NULL default '0', ! unique_name varchar(255) NOT NULL default '', ! real_name VARCHAR(255) NOT NULL, ! file_dir VARCHAR(255) NOT NULL, ! file_desc text, ! file_creator text, ! file_version text, ! file_longdesc text, ! file_ssurl text, ! file_sshot_link tinyint(2) NOT NULL default '0', ! file_dlurl text, ! file_time int(50) default NULL, ! file_update_time int(50) NOT NULL default '0', ! file_catid int(10) default NULL, ! file_posticon text, ! file_license int(10) default NULL, ! file_dls int(10) DEFAULT '0' NOT NULL, ! file_last int(50) default NULL, ! file_pin int(2) default NULL, ! file_docsurl text, ! file_approved TINYINT(1) DEFAULT '1' NOT NULL, ! file_broken TINYINT(1) DEFAULT '0' NOT NULL, ! topic_id mediumint(8) unsigned NOT NULL default '0', ! PRIMARY KEY (file_id) ! )", ! // -------------------------------------------------------- "CREATE TABLE " . $mx_table_prefix . "pa_mirrors ( ! mirror_id mediumint(8) NOT NULL auto_increment, ! file_id int(10) NOT NULL, ! unique_name varchar(255) NOT NULL default '', ! file_dir VARCHAR(255) NOT NULL, ! file_dlurl varchar(255) NOT NULL default '', ! mirror_location VARCHAR(255) NOT NULL default '', ! PRIMARY KEY (mirror_id), ! KEY file_id (file_id) ! )", ! // Table structure for table `phpbb_pa_license` "CREATE TABLE " . $mx_table_prefix . "pa_license ( ! license_id int(10) NOT NULL auto_increment, ! license_name text, ! license_text text, ! PRIMARY KEY (license_id) ! )", ! // -------------------------------------------------------- // Table structure for table `phpbb_pa_votes` "CREATE TABLE " . $mx_table_prefix . "pa_votes ( ! user_id mediumint(8) NOT NULL default '0', ! votes_ip varchar(50) NOT NULL default '0', ! votes_file int(50) NOT NULL default '0', ! rate_point tinyint(3) unsigned NOT NULL default '0', ! voter_os varchar(255) NOT NULL default '', ! voter_browser varchar(255) NOT NULL default '', ! browser_version varchar(8) NOT NULL default '', ! KEY user_id (user_id), ! KEY votes_file (votes_file), ! KEY votes_ip (votes_ip), ! KEY voter_os (voter_os), ! KEY voter_browser (voter_browser), ! KEY browser_version (browser_version), ! KEY rate_point (rate_point) ! )", ! // ! // Config values ! // ! ! // General ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('enable_module', '0')", // settings_disable ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('module_name', 'Download Database')", // settings_dbname ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('wysiwyg_path', 'modules/')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('upload_dir','pafiledb/uploads/')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('screenshots_dir','pafiledb/images/screenshots/')", ! ! // Files ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('max_file_size','262144')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('forbidden_extensions','php, php3, php4, phtml, pl, asp, aspx, cgi')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('hotlink_prevent', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('hotlink_allowed', '')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('tpl_php', '0')", ! ! // Appearance "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_topnumber', '10')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_newdays', '1')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_stats', '')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_viewall', '1')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('settings_dbdescription', '')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('sort_method', 'file_time')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('sort_order', 'DESC')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('pagination', '20')", // art_pagination & settings_file_page ! ! // Comments ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('use_comments', '1')", // comments_show ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('internal_comments', '1')", // NEW ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('formatting_comment_wordwrap', '1')", // formatting_comment_fixup ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('formatting_comment_image_resize', '300')", // NEW ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('formatting_comment_truncate_links', '1')", // NEW ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('max_comment_subject_chars', '50')", // NEW ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('max_comment_chars', '5000')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_wysiwyg', '0')", // allow_wysiwyg_comments & allow_wysiwyg ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_html', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_bbcode', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_smilies', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_links', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_images', '0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('no_comment_image_message', '[No image please]')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('no_comment_link_message', '[No links please]')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allowed_comment_html_tags', 'b,i,u,a')", // NEW ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('del_topic', '1')", // NEW ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('autogenerate_comments', '1')", // NEW ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('comments_pagination', '5')", ! ! // Ratings ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('use_ratings', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('votes_check_userid', '1')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('votes_check_ip', '1')", ! ! // Instructions ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('show_pretext', '0')", // NEW ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('pt_header', 'File Submission Instructions')", // NEW ! "INSERT INTO " . $mx_table_prefix . "pa_config values ('pt_body', 'Please check your references and include as much information as you can.')", // NEW ! ! // Notifications ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('notify', 'pm')", // pm_notify ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('notify_group', '0')", // NEW ! ! // Permissions ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('auth_search','0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('auth_stats','0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('auth_toplist','0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('auth_viewall','0')", ! ); Index: dload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** dload.php 24 Oct 2005 20:16:56 -0000 1.15 --- dload.php 8 Dec 2005 15:15:11 -0000 1.16 *************** *** 18,22 **** * (at your option) any later version. */ ! if ( file_exists( './viewtopic.php' ) ) // -------------------------------------------- phpBB MOD MODE { --- 18,22 ---- * (at your option) any later version. */ ! if ( file_exists( './viewtopic.php' ) ) // -------------------------------------------- phpBB MOD MODE { *************** *** 38,45 **** // Start session management - $userdata = session_pagestart( $user_ip, PAGE_DOWNLOAD ); init_userprefs( $userdata ); - // End session management } --- 38,43 ---- *************** *** 61,68 **** // Start session management - $userdata = session_pagestart( $user_ip, PAGE_INDEX ); mx_init_userprefs( $userdata ); - // End session management --- 59,64 ---- *************** *** 83,87 **** { // ! // Read Block Settings // $title = $mx_block->block_info['block_title']; --- 79,83 ---- { // ! // Read Block Settings (default mode) // $title = $mx_block->block_info['block_title']; *************** *** 94,107 **** } list( $trash, $mx_script_name_temp ) = split ( trim( $board_config['server_name'] ), PORTAL_URL ); $mx_script_name = preg_replace( '#^\/?(.*?)\/?$#', '\1', trim( $mx_script_name_temp ) ); // =================================================== // Include the common file // =================================================== - /* - orig - include($phpbb_root_path . 'pafiledb/pafiledb_common.'.$phpEx); - */ - // MX - include_once( $module_root_path . 'pafiledb/pafiledb_common.' . $phpEx ); --- 90,106 ---- } + // ------------------------------------------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------------------------------------------------------- + + // =================================================== + // ? + // =================================================== list( $trash, $mx_script_name_temp ) = split ( trim( $board_config['server_name'] ), PORTAL_URL ); $mx_script_name = preg_replace( '#^\/?(.*?)\/?$#', '\1', trim( $mx_script_name_temp ) ); + // =================================================== // Include the common file // =================================================== include_once( $module_root_path . 'pafiledb/pafiledb_common.' . $phpEx ); *************** *** 109,124 **** // Get action variable other wise set it to the main // =================================================== ! $action = ( isset( $_REQUEST['action'] ) ) ? htmlspecialchars( $_REQUEST['action'] ) : 'main'; // =================================================== // if the database disabled give them a nice message // =================================================== ! if ( intval( $pafiledb_config['settings_disable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); } // =================================================== // an array of all expected actions // =================================================== ! $actions = array( 'download' => 'download', 'category' => 'category', 'file' => 'file', --- 108,128 ---- // Get action variable other wise set it to the main // =================================================== ! $action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, 'main'); ! ! $is_admin = ( ( $userdata['user_level'] == ADMIN ) && $userdata['session_logged_in'] ) ? true : 0; ! // =================================================== // if the database disabled give them a nice message // =================================================== ! if ( intval( $pafiledb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); } + // =================================================== // an array of all expected actions // =================================================== ! $actions = array( ! 'download' => 'download', 'category' => 'category', 'file' => 'file', *************** *** 135,148 **** 'ucp' => 'ucp', 'main' => 'main' ); // =================================================== // Lets Build the page // =================================================== $page_title = $lang['Download']; if ( $action != 'download' ) { - /* - orig - include($phpbb_root_path . 'includes/page_header.'.$phpEx); - */ - // MX if ( !$is_block ) { --- 139,150 ---- 'ucp' => 'ucp', 'main' => 'main' ); + // =================================================== // Lets Build the page // =================================================== $page_title = $lang['Download']; + if ( $action != 'download' ) { if ( !$is_block ) { *************** *** 156,163 **** if ( $action != 'download' ) { - /* - orig - include($phpbb_root_path . 'includes/page_tail.'.$phpEx); - */ - // MX if ( !$is_block ) { --- 158,161 ---- *************** *** 165,168 **** } } - ?> \ No newline at end of file --- 163,165 ---- Index: dload_quickdl.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload_quickdl.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dload_quickdl.php 24 Oct 2005 20:16:56 -0000 1.5 --- dload_quickdl.php 8 Dec 2005 15:15:11 -0000 1.6 *************** *** 85,89 **** // if the database disabled give them a nice message // =================================================== ! if ( intval( $pafiledb_config['settings_disable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); --- 85,89 ---- // if the database disabled give them a nice message // =================================================== ! if ( intval( $pafiledb_config['module_enable'] ) ) { mx_message_die( GENERAL_MESSAGE, $lang['pafiledb_disable'] ); |
|
From: Jon O. <jon...@us...> - 2005-12-08 15:15:53
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb/pafiledb/modules Modified Files: pa_category.php pa_download.php pa_email.php pa_file.php pa_license.php pa_main.php pa_mcp.php pa_post_comment.php pa_quickdl.php pa_rate.php pa_search.php pa_stats.php pa_toplist.php pa_user_upload.php pa_viewall.php Log Message: in progress commit for mx_pafiledb Index: pa_viewall.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_viewall.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pa_viewall.php 24 Oct 2005 20:16:56 -0000 1.11 --- pa_viewall.php 8 Dec 2005 15:15:13 -0000 1.12 *************** *** 99,122 **** } ! $pafiledb_template->assign_vars( array( 'L_VIEWALL' => $lang['Viewall'], ! /* - orig ! 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), ! */ ! // MX 'L_INDEX' => "<<", - /* - orig - 'U_INDEX' => append_sid('index.'.$phpEx), - 'U_DOWNLOAD' => append_sid('dload.'.$phpEx), - */ - // MX 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), 'U_DOWNLOAD' => append_sid( pa_this_mxurl() ), ! 'DOWNLOAD' => $pafiledb_config['settings_dbname'] ) ); $this->display_files( $sort_method, $sort_order, $start, true ); $this->display( $lang['Download'], 'pa_viewall_body.tpl' ); } --- 99,118 ---- } ! $pafiledb_template->assign_vars( array( ! 'L_VIEWALL' => $lang['Viewall'], 'L_INDEX' => "<<", 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), 'U_DOWNLOAD' => append_sid( pa_this_mxurl() ), ! 'DOWNLOAD' => $pafiledb_config['module_name'] ) ); $this->display_files( $sort_method, $sort_order, $start, true ); + // =================================================== + // assign var for navigation + // =================================================== + $this->display( $lang['Download'], 'pa_viewall_body.tpl' ); } Index: pa_download.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_download.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pa_download.php 24 Oct 2005 20:16:56 -0000 1.12 --- pa_download.php 8 Dec 2005 15:15:13 -0000 1.13 *************** *** 35,39 **** global $_REQUEST, $lang, $db, $pafiledb_user, $pafiledb_config, $board_config, $phpEx, $userdata; global $phpbb_root_path, $_SERVER, $pafiledb_functions; - // MX global $mx_script_name, $module_root_path; --- 35,38 ---- *************** *** 73,80 **** if ( !$userdata['session_logged_in'] ) { - /* - orig - redirect(append_sid("login.$phpEx?redirect=dload.$phpEx?action=download&file_id=$file_id", true)); - */ - // MX // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".pa_this_mxurl("action=download&file_id=" . $file_id), true)); } --- 72,75 ---- *************** *** 105,114 **** } - /* - orig $good_referers[] = $board_config['server_name']; - */ - // MX - $good_referers[] = $board_config['server_name']; - // $good_referers[] = $board_config['server_name'] . '/' . $mx_script_name; $errored = true; --- 100,104 ---- *************** *** 152,162 **** global $template, $db, $theme, $gen_simple_header, $starttime; - $this->generate_category_nav( $file_data['file_catid'] ); - $pafiledb_template->assign_vars( array( - /* - orig - 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), - */ - // MX 'L_INDEX' => "<<", 'L_MIRRORS' => $lang['Mirrors'], --- 142,146 ---- *************** *** 164,184 **** 'L_DOWNLOAD' => $lang['Download_file'], - /* - orig - 'U_INDEX' => append_sid('index.'.$phpEx), - 'U_DOWNLOAD_HOME' => append_sid('dload.'.$phpEx), - */ - // MX 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), 'U_DOWNLOAD_HOME' => append_sid( pa_this_mxurl() ), 'FILE_NAME' => $file_data['file_name'], ! 'DOWNLOAD' => $pafiledb_config['settings_dbname'] ) ); $pafiledb_template->assign_block_vars( 'mirror_row', array( - /* - orig - 'U_DOWNLOAD' => append_sid('dload.php?action=download&file_id=' . $file_id . '&mirror_id=-1'), - */ - // MX 'U_DOWNLOAD' => append_sid( $pa_this_mxurl( 'action=download&file_id=' . $file_id . '&mirror_id=-1' ) ), 'MIRROR_LOCATION' => $board_config['sitename'] ) --- 148,159 ---- 'L_DOWNLOAD' => $lang['Download_file'], 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), 'U_DOWNLOAD_HOME' => append_sid( pa_this_mxurl() ), 'FILE_NAME' => $file_data['file_name'], ! 'DOWNLOAD' => $pafiledb_config['module_name'] ) ); $pafiledb_template->assign_block_vars( 'mirror_row', array( 'U_DOWNLOAD' => append_sid( $pa_this_mxurl( 'action=download&file_id=' . $file_id . '&mirror_id=-1' ) ), 'MIRROR_LOCATION' => $board_config['sitename'] ) *************** *** 188,195 **** { $pafiledb_template->assign_block_vars( 'mirror_row', array( - /* - orig - 'U_DOWNLOAD' => append_sid('dload.php?action=download&file_id=' . $file_id . '&mirror_id=' . $mir_id), - */ - // MX 'U_DOWNLOAD' => append_sid( pa_this_mxurl( 'action=download&file_id=' . $file_id . '&mirror_id=' . $mir_id ) ), 'MIRROR_LOCATION' => $mirror_data['mirror_location'] ) --- 163,166 ---- *************** *** 197,206 **** } ! /* - orig ! include($phpbb_root_path . 'includes/page_header.'.$phpEx); ! $this->display($lang['Download'], 'pa_mirrors_body.tpl'); ! include_once($phpbb_root_path . 'includes/page_tail.'.$phpEx); ! */ ! // MX include( $mx_root_path . 'includes/page_header.' . $phpEx ); $this->display( $lang['Download'], 'pa_mirrors_body.tpl' ); --- 168,176 ---- } ! // =================================================== ! // assign var for navigation ! // =================================================== ! $this->generate_navigation( $file_data['file_catid'] ); ! include( $mx_root_path . 'includes/page_header.' . $phpEx ); $this->display( $lang['Download'], 'pa_mirrors_body.tpl' ); *************** *** 401,405 **** function pa_redirect( $file_url ) { ! global $cache, $db; if ( isset( $db ) ) { --- 371,375 ---- function pa_redirect( $file_url ) { ! global $pafiledb_cache, $db; if ( isset( $db ) ) { *************** *** 407,413 **** } ! if ( isset( $cache ) ) { ! $cache->unload(); } // Redirect via an HTML form for PITA webservers --- 377,383 ---- } ! if ( isset( $pafiledb_cache ) ) { ! $pafiledb_cache->unload(); } // Redirect via an HTML form for PITA webservers Index: pa_post_comment.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_post_comment.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pa_post_comment.php 24 Oct 2005 20:16:56 -0000 1.11 --- pa_post_comment.php 8 Dec 2005 15:15:13 -0000 1.12 *************** *** 23,43 **** function main( $action ) { ! global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata; ! global $_REQUEST, $_POST, $phpbb_root_path, $bbcode_tpl; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; ! /* - orig ! include($phpbb_root_path . 'includes/bbcode.'.$phpEx); ! */ ! // BUGFIX ! global $pafiledb_functions; ! // MX ! global $mx_root_path, $module_root_path, $is_block, $phpEx; ! // MX FIX include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); ! if ( isset( $_REQUEST['file_id'] ) ) { ! $file_id = intval( $_REQUEST['file_id'] ); } else --- 23,45 ---- function main( $action ) { ! global $pafiledb_template, $pafiledb_functions, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images, $userdata, $_POST; global $html_entities_match, $html_entities_replace, $unhtml_specialchars_match, $unhtml_specialchars_replace; ! global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars; ! ! // ! // Includes ! // include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); ! // ! // Request vars ! // ! $cid = $mx_request_vars->request('cid', MX_TYPE_INT, ''); ! ! if ( $mx_request_vars->is_request('item_id') && $mx_request_vars->is_request('cat_id') ) { ! $item_id = $mx_request_vars->request('item_id', MX_TYPE_INT, 0); ! $cat_id = $mx_request_vars->request('cat_id', MX_TYPE_INT, 0); } else *************** *** 46,58 **** } ! if ( isset( $_REQUEST['cid'] ) ) ! { ! $cid = intval( $_REQUEST['cid'] ); ! } ! ! $delete = ( isset( $_REQUEST['delete'] ) ) ? intval( $_REQUEST['delete'] ) : ''; ! ! $submit = ( isset( $_POST['submit'] ) ) ? true : 0; ! $preview = ( isset( $_POST['preview'] ) ) ? true : 0; $subject = ( !empty( $_POST['subject'] ) ) ? htmlspecialchars( trim( stripslashes( $_POST['subject'] ) ) ) : ''; --- 48,54 ---- } ! $delete = $mx_request_vars->request('delete', MX_TYPE_NO_TAGS, ''); ! $submit = $mx_request_vars->is_request('submit'); ! $preview = $mx_request_vars->is_request('preview'); $subject = ( !empty( $_POST['subject'] ) ) ? htmlspecialchars( trim( stripslashes( $_POST['subject'] ) ) ) : ''; *************** *** 61,65 **** $sql = "SELECT file_name, file_catid FROM " . PA_FILES_TABLE . " ! WHERE file_id = '" . $file_id . "'"; if ( !( $result = $db->sql_query( $sql ) ) ) --- 57,61 ---- $sql = "SELECT file_name, file_catid FROM " . PA_FILES_TABLE . " ! WHERE file_id = '" . $item_id . "'"; if ( !( $result = $db->sql_query( $sql ) ) ) *************** *** 79,87 **** if ( !$userdata['session_logged_in'] ) { ! /* - orig ! redirect(append_sid("login.$phpEx?redirect=dload.$phpEx?action=post_comment&file_id=" . $file_id, true)); ! */ ! // MX ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".pa_this_mxurl("action=post_comment&file_id=" . $file_id), true)); } --- 75,79 ---- if ( !$userdata['session_logged_in'] ) { ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".pa_this_mxurl("action=post_comment&item_id=" . $item_id), true)); } *************** *** 90,98 **** } ! $html_on = ( $userdata['user_allowhtml'] && $pafiledb_config['allow_html'] ) ? true : 0; ! $bbcode_on = ( $userdata['user_allowbbcode'] && $pafiledb_config['allow_bbcode'] ) ? true : 0; ! $smilies_on = ( $userdata['user_allowsmile'] && $pafiledb_config['allow_smilies'] ) ? true : 0; // ======================================================= ! // MX Addon // ======================================================= if ( $delete == 'do' ) --- 82,93 ---- } ! $html_on = ( $pafiledb_config['allow_comment_html'] ) ? true : 0; ! $bbcode_on = ( $pafiledb_config['allow_comment_bbcode'] ) ? true : 0; ! $smilies_on = ( $pafiledb_config['allow_comment_smilies'] ) ? true : 0; ! $links_on = ( $pafiledb_config['allow_comment_links'] ) ? true : 0; ! $images_on = ( $pafiledb_config['allow_comment_images'] ) ? true : 0; ! // ======================================================= ! // Delete // ======================================================= if ( $delete == 'do' ) *************** *** 100,104 **** $sql = 'SELECT * FROM ' . PA_FILES_TABLE . " ! WHERE file_id = $file_id"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 95,100 ---- $sql = 'SELECT * FROM ' . PA_FILES_TABLE . " ! WHERE file_id = $item_id"; ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 109,122 **** if ( ( $this->auth[$file_info['file_catid']]['auth_delete_comment'] && $file_info['user_id'] == $userdata['user_id'] ) || $this->auth[$file_info['file_catid']]['auth_mod'] ) { ! $sql = 'DELETE FROM ' . PA_COMMENTS_TABLE . " ! WHERE comments_id = $cid"; ! ! if ( !( $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Couldnt delete comment', '', __LINE__, __FILE__, $sql ); } $this->_pafiledb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( pa_this_mxurl( "action=file&file_id=$file_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 105,128 ---- if ( ( $this->auth[$file_info['file_catid']]['auth_delete_comment'] && $file_info['user_id'] == $userdata['user_id'] ) || $this->auth[$file_info['file_catid']]['auth_mod'] ) { ! if ( $this->comments[$file_data['file_catid']]['internal_comments'] ) ! { ! $sql = 'DELETE FROM ' . PA_COMMENTS_TABLE . " ! WHERE comments_id = $cid"; ! ! if ( !( $db->sql_query( $sql ) ) ) ! { ! mx_message_die( GENERAL_ERROR, 'Couldnt delete comment', '', __LINE__, __FILE__, $sql ); ! } ! } ! else { ! include( $module_root_path . 'pafiledb/includes/functions_comment.' . $phpEx ); ! $pafiledb_comments = new pafiledb_comments(); ! $pafiledb_comments->init( $file_info, 'phpbb' ); ! $pafiledb_comments->post('delete', $cid); } $this->_pafiledb(); ! $message = $lang['Comment_deleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( pa_this_mxurl( "action=file&file_id=$item_id" ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 128,242 **** } if ( !$submit ) { // Generate smilies listing for page output ! /* - orig ! pa_generate_smilies('inline', PAGE_POSTING); ! */ ! // BUGFIX $pafiledb_functions->pa_generate_smilies( 'inline', PAGE_POSTING ); - $html_status = ( $userdata['user_allowhtml'] && $pafiledb_config['allow_html'] ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF']; - $bbcode_status = ( $userdata['user_allowbbcode'] && $pafiledb_config['allow_bbcode'] ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF']; - $smilies_status = ( $userdata['user_allowsmile'] && $pafiledb_config['allow_smilies'] ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF']; - $links_status = ( $pafiledb_config['allow_comment_links'] ) ? $lang['Links_are_ON'] : $lang['Links_are_OFF']; - $images_status = ( $pafiledb_config['allow_comment_images'] ) ? $lang['Images_are_ON'] : $lang['Images_are_OFF']; - $hidden_form_fields = '<input type="hidden" name="action" value="post_comment"> - <input type="hidden" name="file_id" value="' . $file_id . '"> - <input type="hidden" name="comment" value="post">'; // Output the data to the template ! ! $this->generate_category_nav( $file_data['file_catid'] ); ! ! $pafiledb_template->assign_vars( array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf( $bbcode_status, '<a href="' . append_sid( "faq.$phpEx?mode=bbcode" ) . '" target="_phpbbcode">', '</a>' ), ! 'SMILIES_STATUS' => $smilies_status, ! 'LINKS_STATUS' => $links_status, ! 'IMAGES_STATUS' => $images_status, ! 'FILE_NAME' => $file_data['file_name'], ! 'DOWNLOAD' => $pafiledb_config['settings_dbname'], ! 'MESSAGE_LENGTH' => $pafiledb_config['max_comment_chars'], ! ! 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'L_COMMENT' => $lang['Message_body'], ! 'L_COMMENT_TITLE' => $lang['Subject'], ! 'L_OPTIONS' => $lang['Options'], ! 'L_COMMENT_EXPLAIN' => sprintf( $lang['Comment_explain'], $pafiledb_config['max_comment_chars'] ), ! 'L_PREVIEW' => $lang['Preview'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_DOWNLOAD' => $lang['Download'], ! /* - orig ! 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), ! */ ! // MX ! 'L_INDEX' => "<<", ! 'L_CHECK_MSG_LENGTH' => $lang['Check_message_length'], ! 'L_MSG_LENGTH_1' => $lang['Msg_length_1'], ! 'L_MSG_LENGTH_2' => $lang['Msg_length_2'], ! 'L_MSG_LENGTH_3' => $lang['Msg_length_3'], ! 'L_MSG_LENGTH_4' => $lang['Msg_length_4'], ! 'L_MSG_LENGTH_5' => $lang['Msg_length_5'], ! 'L_MSG_LENGTH_6' => $lang['Msg_length_6'], ! 'L_BBCODE_B_HELP' => $lang['bbcode_b_help'], ! 'L_BBCODE_I_HELP' => $lang['bbcode_i_help'], ! 'L_BBCODE_U_HELP' => $lang['bbcode_u_help'], ! 'L_BBCODE_Q_HELP' => $lang['bbcode_q_help'], ! 'L_BBCODE_C_HELP' => $lang['bbcode_c_help'], ! 'L_BBCODE_L_HELP' => $lang['bbcode_l_help'], ! 'L_BBCODE_O_HELP' => $lang['bbcode_o_help'], ! 'L_BBCODE_P_HELP' => $lang['bbcode_p_help'], ! 'L_BBCODE_W_HELP' => $lang['bbcode_w_help'], ! 'L_BBCODE_A_HELP' => $lang['bbcode_a_help'], ! 'L_BBCODE_S_HELP' => $lang['bbcode_s_help'], ! 'L_BBCODE_F_HELP' => $lang['bbcode_f_help'], ! 'L_EMPTY_MESSAGE' => $lang['Empty_message'], ! 'L_FONT_COLOR' => $lang['Font_color'], ! 'L_COLOR_DEFAULT' => $lang['color_default'], ! 'L_COLOR_DARK_RED' => $lang['color_dark_red'], ! 'L_COLOR_RED' => $lang['color_red'], ! 'L_COLOR_ORANGE' => $lang['color_orange'], ! 'L_COLOR_BROWN' => $lang['color_brown'], ! 'L_COLOR_YELLOW' => $lang['color_yellow'], ! 'L_COLOR_GREEN' => $lang['color_green'], ! 'L_COLOR_OLIVE' => $lang['color_olive'], ! 'L_COLOR_CYAN' => $lang['color_cyan'], ! 'L_COLOR_BLUE' => $lang['color_blue'], ! 'L_COLOR_DARK_BLUE' => $lang['color_dark_blue'], ! 'L_COLOR_INDIGO' => $lang['color_indigo'], ! 'L_COLOR_VIOLET' => $lang['color_violet'], ! 'L_COLOR_WHITE' => $lang['color_white'], ! 'L_COLOR_BLACK' => $lang['color_black'], ! 'L_FONT_SIZE' => $lang['Font_size'], ! 'L_FONT_TINY' => $lang['font_tiny'], ! 'L_FONT_SMALL' => $lang['font_small'], ! 'L_FONT_NORMAL' => $lang['font_normal'], ! 'L_FONT_LARGE' => $lang['font_large'], ! 'L_FONT_HUGE' => $lang['font_huge'], ! 'L_BBCODE_CLOSE_TAGS' => $lang['Close_Tags'], ! 'L_STYLES_TIP' => $lang['Styles_tip'], ! /* - orig ! 'U_INDEX' => append_sid('index.'.$phpEx), ! 'U_DOWNLOAD_HOME' => append_sid('dload.'.$phpEx), ! 'U_FILE_NAME' => append_sid('dload.php?action=file&file_id=' . $file_id), ! 'S_POST_ACTION' => append_sid('dload.'.$phpEx), ! */ ! // MX ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( pa_this_mxurl() ), ! 'U_FILE_NAME' => append_sid( pa_this_mxurl( 'action=file&file_id=' . $file_id ) ), ! 'S_POST_ACTION' => append_sid( pa_this_mxurl() ), ! 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ! ); // Show preview stuff if user clicked preview ! if ( $preview ) { --- 134,320 ---- } + // ======================================================= + // Main + // ======================================================= if ( !$submit ) { + // + // Instatiate text tools + // + $mx_pa_text_tools = new mx_pa_text_tools(); + + // // Generate smilies listing for page output ! // $pafiledb_functions->pa_generate_smilies( 'inline', PAGE_POSTING ); + $html_status = ( $html_on ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF']; + $bbcode_status = ( $bbcode_on ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF']; + $smilies_status = ( $smilies_on ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF']; + $links_status = ( $links_on ) ? $lang['Links_are_ON'] : $lang['Links_are_OFF']; + $images_status = ( $images_on ) ? $lang['Images_are_ON'] : $lang['Images_are_OFF']; + + if ( $mx_request_vars->is_get('cid') ) + { + if ( $this->comments[$file_data['file_catid']]['internal_comments'] ) + { + // + // Query internal comment to edit + // + $sql = 'SELECT c.*, u.* + FROM ' . PA_COMMENTS_TABLE . ' AS c + LEFT JOIN ' . USERS_TABLE . " AS u ON c.poster_id = u.user_id + WHERE c.file_id = '" . $item_id . "' + AND c.comments_id = '" . $mx_request_vars->request('cid', MX_TYPE_INT, '') . "'"; + + $comment_arg_title = 'comments_title'; + $comment_arg_message = 'comments_text'; + $comment_arg_bbcode_uid = 'comment_bbcode_uid'; + } + else + { + // + // Query internal comment to edit + // Note: cid = post_id + // + $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, u.user_allowsmile, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid + FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt + WHERE pt.post_id = p.post_id + AND u.user_id = p.poster_id + AND p.post_id = '" . $mx_request_vars->request('cid', MX_TYPE_INT, '') . "'"; + + $comment_arg_title = 'post_subject'; + $comment_arg_message = 'post_text'; + $comment_arg_bbcode_uid = 'bbcode_uid'; + + } + + if ( !( $result = $db->sql_query( $sql ) ) ) + { + mx_message_die( GENERAL_ERROR, 'Couldnt select comments', '', __LINE__, __FILE__, $sql ); + } + + $comment_row = $db->sql_fetchrow( $result ); + + // + // Edit comment + // + $comment_title = stripslashes($comment_row[$comment_arg_title]); + $comment_body = $comment_row[$comment_arg_message]; + + if ( $comment_row[$comment_arg_bbcode_uid] != '' ) + { + $comment_body = preg_replace('/\:(([a-z0-9]:)?)' . $comment_row[$comment_arg_bbcode_uid] . '/s', '', $comment_body); + } + + $comment_body = str_replace('<', '<', $comment_body); + $comment_body = str_replace('>', '>', $comment_body); + $comment_body = str_replace('<br />', "\n", $comment_body); + + $hidden_form_fields = '<input type="hidden" name="action" value="post_comment"> + <input type="hidden" name="cat_id" value="' . $cat_id . '"> + <input type="hidden" name="item_id" value="' . $item_id . '"> + <input type="hidden" name="cid" value="' . $mx_request_vars->request('cid', MX_TYPE_INT, '') . '"> + <input type="hidden" name="comment" value="post">'; + } + else + { + // + // New comment + // + $comment_title = ''; + $comment_body = ''; + + $hidden_form_fields = '<input type="hidden" name="action" value="post_comment"> + <input type="hidden" name="cat_id" value="' . $cat_id . '"> + <input type="hidden" name="item_id" value="' . $item_id . '"> + <input type="hidden" name="comment" value="post">'; + } + // // Output the data to the template ! // ! $pafiledb_template->assign_vars( array( ! 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf( $bbcode_status, '<a href="' . append_sid( "faq.$phpEx?mode=bbcode" ) . '" target="_phpbbcode">', '</a>' ), ! 'SMILIES_STATUS' => $smilies_status, ! 'LINKS_STATUS' => $links_status, ! 'IMAGES_STATUS' => $images_status, ! 'FILE_NAME' => $file_data['file_name'], ! 'DOWNLOAD' => $pafiledb_config['module_name'], ! 'MESSAGE_LENGTH' => $pafiledb_config['max_comment_chars'], ! ! 'TITLE' => $comment_title, ! 'COMMENT' => $comment_body, ! 'L_COMMENT_ADD' => $lang['Comment_add'], ! 'L_COMMENT' => $lang['Message_body'], ! 'L_COMMENT_TITLE' => $lang['Subject'], ! 'L_OPTIONS' => $lang['Options'], ! 'L_COMMENT_EXPLAIN' => sprintf( $lang['Comment_explain'], $pafiledb_config['max_comment_chars'] ), ! 'L_PREVIEW' => $lang['Preview'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_DOWNLOAD' => $lang['Download'], ! 'L_INDEX' => "<<", ! 'L_CHECK_MSG_LENGTH' => $lang['Check_message_length'], ! 'L_MSG_LENGTH_1' => $lang['Msg_length_1'], ! 'L_MSG_LENGTH_2' => $lang['Msg_length_2'], ! 'L_MSG_LENGTH_3' => $lang['Msg_length_3'], ! 'L_MSG_LENGTH_4' => $lang['Msg_length_4'], ! 'L_MSG_LENGTH_5' => $lang['Msg_length_5'], ! 'L_MSG_LENGTH_6' => $lang['Msg_length_6'], ! 'L_BBCODE_B_HELP' => $lang['bbcode_b_help'], ! 'L_BBCODE_I_HELP' => $lang['bbcode_i_help'], ! 'L_BBCODE_U_HELP' => $lang['bbcode_u_help'], ! 'L_BBCODE_Q_HELP' => $lang['bbcode_q_help'], ! 'L_BBCODE_C_HELP' => $lang['bbcode_c_help'], ! 'L_BBCODE_L_HELP' => $lang['bbcode_l_help'], ! 'L_BBCODE_O_HELP' => $lang['bbcode_o_help'], ! 'L_BBCODE_P_HELP' => $lang['bbcode_p_help'], ! 'L_BBCODE_W_HELP' => $lang['bbcode_w_help'], ! 'L_BBCODE_A_HELP' => $lang['bbcode_a_help'], ! 'L_BBCODE_S_HELP' => $lang['bbcode_s_help'], ! 'L_BBCODE_F_HELP' => $lang['bbcode_f_help'], ! 'L_EMPTY_MESSAGE' => $lang['Empty_message'], ! 'L_FONT_COLOR' => $lang['Font_color'], ! 'L_COLOR_DEFAULT' => $lang['color_default'], ! 'L_COLOR_DARK_RED' => $lang['color_dark_red'], ! 'L_COLOR_RED' => $lang['color_red'], ! 'L_COLOR_ORANGE' => $lang['color_orange'], ! 'L_COLOR_BROWN' => $lang['color_brown'], ! 'L_COLOR_YELLOW' => $lang['color_yellow'], ! 'L_COLOR_GREEN' => $lang['color_green'], ! 'L_COLOR_OLIVE' => $lang['color_olive'], ! 'L_COLOR_CYAN' => $lang['color_cyan'], ! 'L_COLOR_BLUE' => $lang['color_blue'], ! 'L_COLOR_DARK_BLUE' => $lang['color_dark_blue'], ! 'L_COLOR_INDIGO' => $lang['color_indigo'], ! 'L_COLOR_VIOLET' => $lang['color_violet'], ! 'L_COLOR_WHITE' => $lang['color_white'], ! 'L_COLOR_BLACK' => $lang['color_black'], ! 'L_FONT_SIZE' => $lang['Font_size'], ! 'L_FONT_TINY' => $lang['font_tiny'], ! 'L_FONT_SMALL' => $lang['font_small'], ! 'L_FONT_NORMAL' => $lang['font_normal'], ! 'L_FONT_LARGE' => $lang['font_large'], ! 'L_FONT_HUGE' => $lang['font_huge'], ! 'L_BBCODE_CLOSE_TAGS' => $lang['Close_Tags'], ! 'L_STYLES_TIP' => $lang['Styles_tip'], ! 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), ! 'U_DOWNLOAD_HOME' => append_sid( pa_this_mxurl() ), ! 'U_FILE_NAME' => append_sid( pa_this_mxurl( 'action=file&item_id=' . $item_id ) ), ! 'S_POST_ACTION' => append_sid( pa_this_mxurl() ), ! 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields ) ! ); + // // Show preview stuff if user clicked preview ! // if ( $preview ) { *************** *** 252,262 **** if ( !$html_on ) { ! // $comments_text = comment_suite($comments_text); $comments_text = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $comments_text ); } if ( $bbcode_on ) { ! // $comments_text = comment_suite($comments_text); $comments_text = bbencode_second_pass( $comments_text, $comment_bbcode_uid ); // : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $comments_text); } --- 330,354 ---- if ( !$html_on ) { ! // ! // ! // $comments_text = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $comments_text ); } + // Now we run comment suite before checking for smilies + // so admins can add them in messages if they like + // and so smilies are not counted as images in sigs. + // this is done here again incase above conditions are + // not met. + if (!$pafiledb_config['allow_comment_images'] || !$pafiledb_config['allow_comment_links']) + { + $comments_text = $mx_kb_text_tools->remove_images_links( $comments_text, $pafiledb_config['allow_comment_images'], $pafiledb_config['no_comment_image_message'], $pafiledb_config['allow_comment_links'], $pafiledb_config['no_comment_link_message'] ); + } + if ( $bbcode_on ) { ! // ! // ! // $comments_text = bbencode_second_pass( $comments_text, $comment_bbcode_uid ); // : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $comments_text); } *************** *** 268,282 **** } ! // Now we run comment suite before checking for smilies ! // so admins can add them in messages if they like ! // and so smilies are not counted as images in sigs. ! // this is done here again incase above conditions are ! // not met. ! ! // $comments_text = comment_suite($comments_text); $comments_text = make_clickable( $comments_text ); // Parse smilies ! if ( $smilies_on ) { --- 360,371 ---- } ! // ! // Make Clickable ! // $comments_text = make_clickable( $comments_text ); + // // Parse smilies ! // if ( $smilies_on ) { *************** *** 286,308 **** $comments_text = str_replace( "\n", '<br />', $comments_text ); ! $pafiledb_template->assign_vars( array( 'PREVIEW' => true, ! 'COMMENT' => stripslashes( $_POST['message'] ), ! 'SUBJECT' => stripslashes( $_POST['subject'] ), ! 'PRE_COMMENT' => $comments_text ) ! ); } } if ( $submit ) { $length = strlen( $_POST['message'] ); ! $comments_text = str_replace( '<br />', "\n", $_POST['message'] ); $comment_bbcode_uid = make_bbcode_uid(); ! $comments_text = prepare_message( $comments_text, $html_on, $bbcode_on, $smilies_on, $comment_bbcode_uid ); $comments_text = bbencode_first_pass( $comments_text, $comment_bbcode_uid ); ! ! $poster_id = intval( $userdata['user_id'] ); ! $title = stripslashes( $_POST['subject'] ); ! $time = time(); if ( $length > $pafiledb_config['max_comment_chars'] ) { --- 375,404 ---- $comments_text = str_replace( "\n", '<br />', $comments_text ); ! $pafiledb_template->assign_vars( array( ! 'PREVIEW' => true, ! 'COMMENT' => stripslashes( $_POST['message'] ), ! 'SUBJECT' => stripslashes( $_POST['subject'] ), ! 'PRE_COMMENT' => $comments_text ) ! ); } } + // ======================================================= + // Submit + // ======================================================= if ( $submit ) { + // + // vars + // $length = strlen( $_POST['message'] ); ! ! $title = ( !empty( $_POST['subject'] ) ) ? htmlspecialchars( trim ( $_POST['subject'] ) ) : ''; ! $comment_bbcode_uid = make_bbcode_uid(); ! $comments_text = str_replace( '<br />', "\n", $_POST['message'] ); ! $comments_text = prepare_message( trim($comments_text), $html_on, $bbcode_on, $smilies_on, $comment_bbcode_uid ); $comments_text = bbencode_first_pass( $comments_text, $comment_bbcode_uid ); ! if ( $length > $pafiledb_config['max_comment_chars'] ) { *************** *** 310,315 **** } ! $sql = "INSERT INTO " . PA_COMMENTS_TABLE . "(file_id, comments_text, comments_title, comments_time, comment_bbcode_uid, poster_id) ! VALUES('$file_id','" . str_replace( "\'", "''", $comments_text ) . "','" . str_replace( "\'", "''", $title ) . "','$time', '$comment_bbcode_uid','$poster_id')"; if ( !( $db->sql_query( $sql ) ) ) { --- 406,461 ---- } ! if ( $mx_request_vars->is_request('cid') ) ! { ! if ( $this->comments[$file_data['file_catid']]['internal_comments'] ) ! { ! $sql = "UPDATE " . PA_COMMENTS_TABLE . " ! SET comments_text = '" . str_replace( "\'", "''", $comments_text ) . "', ! comments_title = '" . str_replace( "\'", "''", $title ) . "', ! comment_bbcode_uid = '" . $comment_bbcode_uid . "' ! WHERE comments_id = " . $mx_request_vars->request('cid', MX_TYPE_INT, 0) . " ! AND file_id = ". $item_id; ! } ! else ! { ! include( $module_root_path . 'pafiledb/includes/functions_comment.' . $phpEx ); ! $pafiledb_comments = new pafiledb_comments(); ! $pafiledb_comments->init( $item_id ); ! ! $pafiledb_comments->post( 'update', $cid, $title, $comments_text, $userdata['user_id'], $userdata['username'], 0, '', '', $comment_bbcode_uid); ! //$pafiledb_comments->insert_phpbb_post( $title, $comments_text, $forum_id, $userdata['user_id'], $userdata['username'], 0, $topic_id, $cid, '', '', $comment_bbcode_uid ); ! } ! ! } ! else ! { ! if ( $this->comments[$file_data['file_catid']]['internal_comments'] ) ! { ! $time = time(); ! $poster_id = intval( $userdata['user_id'] ); ! $sql = "INSERT INTO " . PA_COMMENTS_TABLE . "(file_id, comments_text, comments_title, comments_time, comment_bbcode_uid, poster_id) ! VALUES('$item_id','" . str_replace( "\'", "''", $comments_text ) . "','" . str_replace( "\'", "''", $title ) . "','$time', '$comment_bbcode_uid','$poster_id')"; ! } ! else ! { ! include( $module_root_path . 'pafiledb/includes/functions_comment.' . $phpEx ); ! $pafiledb_comments = new pafiledb_comments(); ! $pafiledb_comments->init( $item_id ); ! ! $pafiledb_comments->post( 'insert', '', $title, $comments_text, $userdata['user_id'], $userdata['username'], 0, '', '', $comment_bbcode_uid); ! //$pafiledb_comments->insert_phpbb_post( $title, $comments_text, $forum_id, $userdata['user_id'], $userdata['username'], 0, $topic_id, '', '', '', $comment_bbcode_uid ); ! ! } ! ! } ! ! // ! // Notification ! // ! ! ! // ! // Done ! // if ( !( $db->sql_query( $sql ) ) ) { *************** *** 317,329 **** } ! /* - orig ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf($lang['Click_return'], '<a href="' . append_sid('dload.php?action=file&file_id=' . $file_id) . '">', '</a>'); ! */ ! // MX ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( pa_this_mxurl( 'action=file&file_id=' . $file_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } $this->display( $lang['Download'], 'pa_comment_posting.tpl' ); } } --- 463,478 ---- } ! $message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( pa_this_mxurl( 'action=file&file_id=' . $item_id ) ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } + + // =================================================== + // assign var for navigation + // =================================================== + $this->generate_navigation( $file_data['file_catid'] ); + $this->display( $lang['Download'], 'pa_comment_posting.tpl' ); } + } Index: pa_user_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_user_upload.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pa_user_upload.php 24 Oct 2005 20:16:56 -0000 1.13 --- pa_user_upload.php 8 Dec 2005 15:15:13 -0000 1.14 *************** *** 35,47 **** global $_REQUEST, $_POST, $pafiledb_config, $phpbb_root_path; global $pafiledb_template, $db, $lang, $userdata, $user_ip, $phpEx, $pafiledb_functions; - // MX global $mx_root_path, $module_root_path, $is_block, $phpEx; // ======================================================= // Get Vars // ======================================================= - /* - orig - include($phpbb_root_path . 'pafiledb/includes/functions_field.'.$phpEx); - */ - // MX include( $module_root_path . 'pafiledb/includes/functions_field.' . $phpEx ); --- 35,43 ---- global $_REQUEST, $_POST, $pafiledb_config, $phpbb_root_path; global $pafiledb_template, $db, $lang, $userdata, $user_ip, $phpEx, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $phpEx; + // ======================================================= // Get Vars // ======================================================= include( $module_root_path . 'pafiledb/includes/functions_field.' . $phpEx ); *************** *** 54,58 **** $mirrors = ( isset( $_POST['mirrors'] ) ) ? true : 0; ! $dropmenu = ( !$cat_id ) ? $this->jumpmenu_option( 0, 0, '', true, true ) : $this->jumpmenu_option( 0, 0, array( $cat_id => 1 ), true, true ); if ( !empty( $cat_id ) ) --- 50,54 ---- $mirrors = ( isset( $_POST['mirrors'] ) ) ? true : 0; ! $dropmenu = ( !$cat_id ) ? $this->generate_jumpbox( 0, 0, '', true, true ) : $this-generate_jumpboxn( 0, 0, array( $cat_id => 1 ), true, true ); if ( !empty( $cat_id ) ) *************** *** 62,69 **** if ( !$userdata['session_logged_in'] ) { - /* - orig - redirect(append_sid("login.$phpEx?redirect=dload.$phpEx?action=user_upload&cat_id=" . $cat_id, true)); - */ - // MX // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".pa_this_mxurl("action=user_upload&cat_id=" . $cat_id), true)); } --- 58,61 ---- *************** *** 79,86 **** if ( !$userdata['session_logged_in'] ) { - /* - orig - redirect(append_sid("login.$phpEx?redirect=dload.$phpEx?action=user_upload", true)); - */ - // MX // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".pa_this_mxurl("action=user_upload"), true)); } --- 71,74 ---- *************** *** 140,157 **** $pa_pm = array(); // Populate the pa_pm variable $pa_pm = pa_get_pm_data( $temp_id ); // Compose post header $pa_message_tmp = pa_compose_pm( $pa_pm ); $pa_message = $pa_message_tmp['message']; $pa_update_message = $pa_message_tmp['update_message']; // PM notify $pa_admins = pa_get_admins( true ); for ($i = 0; $i < count($pa_admins) || $i < 10; $i++) { ! pa_notify( $pafiledb_config['pm_notify'], $pa_message, $pa_admins[$i]['user_id'], $pa_pm['file_editor_id'], $info = 'new' ); } } --- 128,151 ---- $pa_pm = array(); + // // Populate the pa_pm variable + // $pa_pm = pa_get_pm_data( $temp_id ); + // // Compose post header + // $pa_message_tmp = pa_compose_pm( $pa_pm ); $pa_message = $pa_message_tmp['message']; $pa_update_message = $pa_message_tmp['update_message']; + // // PM notify + // $pa_admins = pa_get_admins( true ); for ($i = 0; $i < count($pa_admins) || $i < 10; $i++) { ! pa_notify( $pafiledb_config['notify'], $pa_message, $pa_admins[$i]['user_id'], $pa_pm['file_editor_id'], $info = 'new' ); } } *************** *** 164,181 **** $pa_pm = array(); // Populate the pa_pm variable $pa_pm = pa_get_pm_data( $file_id ); // Compose post header $pa_message_tmp = pa_compose_pm( $pa_pm ); $pa_message = $pa_message_tmp['message']; $pa_update_message = $pa_message_tmp['update_message']; // PM notify $pa_admins = pa_get_admins( true); for ($i = 0; $i < count($pa_admins) || $i < 10; $i++) { ! pa_notify( $pafiledb_config['pm_notify'], $pa_message, $pa_admins[$i]['user_id'], $pa_pm['file_editor_id'], $info = 'edited' ); } --- 158,181 ---- $pa_pm = array(); + // // Populate the pa_pm variable + // $pa_pm = pa_get_pm_data( $file_id ); + // // Compose post header + // $pa_message_tmp = pa_compose_pm( $pa_pm ); $pa_message = $pa_message_tmp['message']; $pa_update_message = $pa_message_tmp['update_message']; + // // PM notify + // $pa_admins = pa_get_admins( true); for ($i = 0; $i < count($pa_admins) || $i < 10; $i++) { ! pa_notify( $pafiledb_config['notify'], $pa_message, $pa_admins[$i]['user_id'], $pa_pm['file_editor_id'], $info = 'edited' ); } *************** *** 183,190 **** } - /* - orig - $message = $lang['Fileadded'] . '<br /><br />' . sprintf($lang['Click_return'], '<a href="' . append_sid("dload.php?action=user_upload") . '">', '</a>'); - */ - // MX mx_message_die( GENERAL_MESSAGE, $message ); } --- 183,186 ---- *************** *** 203,207 **** $file_website = ''; $file_posticons = $pafiledb_functions->post_icons(); ! $file_cat_list = ( !$cat_id ) ? $this->jumpmenu_option( 0, 0, '', true ) : $this->jumpmenu_option( 0, 0, array( $cat_id => 1 ), true, true ); $file_license = $pafiledb_functions->license_list(); $pin_checked_yes = ''; --- 199,203 ---- $file_website = ''; $file_posticons = $pafiledb_functions->post_icons(); ! $file_cat_list = ( !$cat_id ) ? $this->generate_jumpbox( 0, 0, '', true ) : $this-generate_jumpbox( 0, 0, array( $cat_id => 1 ), true, true ); $file_license = $pafiledb_functions->license_list(); $pin_checked_yes = ''; *************** *** 243,247 **** $file_website = $file_info['file_docsurl']; $file_posticons = $pafiledb_functions->post_icons( $file_info['file_posticon'] ); ! $file_cat_list = $this->jumpmenu_option( 0, 0, array( $file_info['file_catid'] => 1 ), true ); $file_license = $pafiledb_functions->license_list( $file_info['file_license'] ); $pin_checked_yes = ( $file_info['file_pin'] ) ? ' checked' : ''; --- 239,243 ---- $file_website = $file_info['file_docsurl']; $file_posticons = $pafiledb_functions->post_icons( $file_info['file_posticon'] ); ! $file_cat_list = $this->generate_jumpbox( 0, 0, array( $file_info['file_catid'] => 1 ), true ); $file_license = $pafiledb_functions->license_list( $file_info['file_license'] ); $pin_checked_yes = ( $file_info['file_pin'] ) ? ' checked' : ''; *************** *** 266,276 **** $pafiledb_template->assign_vars( array( - /* - orig - 'S_ADD_FILE_ACTION' => append_sid("dload.$phpEx"), - */ - // MX 'S_ADD_FILE_ACTION' => append_sid( pa_this_mxurl() ), ! 'DOWNLOAD' => $pafiledb_config['settings_dbname'], 'FILESIZE' => intval( $pafiledb_config['max_file_size'] ), 'FILE_NAME' => $file_name, --- 262,268 ---- $pafiledb_template->assign_vars( array( 'S_ADD_FILE_ACTION' => append_sid( pa_this_mxurl() ), ! 'DOWNLOAD' => $pafiledb_config['module_name'], 'FILESIZE' => intval( $pafiledb_config['max_file_size'] ), 'FILE_NAME' => $file_name, *************** *** 292,299 **** 'PIN_CHECKED_NO' => $pin_checked_no, - /* - orig - 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), - */ - // MX 'L_INDEX' => "<<", 'L_UPLOAD' => $lang['User_upload'], --- 284,287 ---- *************** *** 345,353 **** 'S_HIDDEN_FIELDS' => $s_hidden_fields, - /* - orig - 'U_INDEX' => append_sid('index.'.$phpEx), - 'U_DOWNLOAD' => append_sid('dload.'.$phpEx)) - */ - // MX 'MODE' => $mode, 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), --- 333,336 ---- *************** *** 360,362 **** } ! ?> \ No newline at end of file --- 343,345 ---- } ! ?> \ No newline at end of file Index: pa_file.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_file.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pa_file.php 24 Oct 2005 20:16:56 -0000 1.14 --- pa_file.php 8 Dec 2005 15:15:13 -0000 1.15 *************** *** 28,31 **** --- 28,32 ---- Please read the license included with this script for more information. */ + class pafiledb_file extends pafiledb_public { *************** *** 33,48 **** { global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; ! global $_REQUEST, $phpbb_root_path, $userdata, $db, $pafiledb_functions; ! // MX ! global $mx_root_path, $module_root_path, $is_block, $phpEx; ! if ( isset( $_REQUEST['file_id'] ) ) ! { ! $file_id = intval( $_REQUEST['file_id'] ); ! } ! else { mx_message_die( GENERAL_MESSAGE, $lang['File_not_exist'] ); ! } // ======================================================= // file id is not set, give him/her a nice error message --- 34,50 ---- { global $pafiledb_template, $lang, $board_config, $phpEx, $pafiledb_config, $db, $images; ! global $phpbb_root_path, $userdata, $db, $pafiledb_functions; ! global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars; ! // ======================================================= ! // Request vars ! // ======================================================= ! $file_id = $mx_request_vars->request('file_id', MX_TYPE_INT, ''); ! ! if ( empty( $file_id ) ) { mx_message_die( GENERAL_MESSAGE, $lang['File_not_exist'] ); ! } ! // ======================================================= // file id is not set, give him/her a nice error message *************** *** 79,82 **** --- 81,85 ---- mx_message_die( GENERAL_ERROR, 'Couldnt Query file info', '', __LINE__, __FILE__, $sql ); } + // =================================================== // file doesn't exist' *************** *** 87,90 **** --- 90,94 ---- } $db->sql_freeresult( $result ); + // =================================================== // Pafiledb auth for viewing file *************** *** 92,262 **** if ( ( !$this->auth[$file_data['file_catid']]['auth_view_file'] ) ) { ! // if ( !$userdata['session_logged_in'] ) ! // { ! /* - orig ! redirect(append_sid("login.$phpEx?redirect=dload.$phpEx?action=file&file_id=" . $file_id, true)); ! */ ! // MX ! // mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".pa_this_mxurl("action=file&file_id=" . $file_id), true)); ! // } $message = sprintf( $lang['Sorry_auth_view'], $this->auth[$file_data['file_catid']]['auth_view_file_type'] ); mx_message_die( GENERAL_MESSAGE, $message ); } - // - // - // User authorisation levels output - // - $pa_auth_can = '<br />' . ( ( $this->auth[$file_data['file_catid']]['auth_upload'] ) ? $lang['PA_Rules_upload_can'] : $lang['PA_Rules_upload_cannot'] ) . '<br />'; - $pa_auth_can .= ( ( $this->auth[$file_data['file_catid']]['auth_view_file'] ) ? $lang['PA_Rules_view_file_can'] : $lang['PA_Rules_view_file_cannot'] ) . '<br />'; - $pa_auth_can .= ( ( $this->auth[$file_data['file_catid']]['auth_edit_file'] ) ? $lang['PA_Rules_edit_file_can'] : $lang['PA_Rules_edit_file_cannot'] ) . '<br />'; - $pa_auth_can .= ( ( $this->auth[$file_data['file_catid']]['auth_delete_file'] ) ? $lang['PA_Rules_delete_file_can'] : $lang['PA_Rules_delete_file_cannot'] ) . '<br />'; - $pa_auth_can .= ( ( $this->auth[$file_data['file_catid']]['auth_view_comment'] ) ? $lang['PA_Rules_view_comment_can'] : $lang['PA_Rules_view_comment_cannot'] ) . '<br />'; - $pa_auth_can .= ( ( $this->auth[$file_data['file_catid']]['auth_post_comment'] ) ? $lang['PA_Rules_post_comment_can'] : $lang['PA_Rules_post_comment_cannot'] ) . '<br />'; - $pa_auth_can .= ( ( $this->auth[$file_data['file_catid']]['auth_rate'] ) ? $lang['PA_Rules_rate_can'] : $lang['PA_Rules_rate_cannot'] ) . '<br />'; - $pa_auth_can .= ( ( $this->auth[$file_data['file_catid']]['auth_download'] ) ? $lang['PA_Rules_download_can'] : $lang['PA_Rules_download_cannot'] ) . '<br />'; - - if ( $this->auth[$file_data['file_catid']]['auth_mod'] ) - { - $pa_auth_can .= $lang['PA_Rules_moderate_can']; - } - - $this->generate_category_nav( $file_data['file_catid'] ); - $pafiledb_template->assign_vars( array( - /* - orig - 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), - */ - // MX 'L_INDEX' => "<<", - - 'S_AUTH_LIST' => $pa_auth_can, - /* - orig - 'U_INDEX' => append_sid('index.'.$phpEx), - 'U_DOWNLOAD_HOME' => append_sid('dload.'.$phpEx), - */ - // MX 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), 'U_DOWNLOAD_HOME' => append_sid( pa_this_mxurl() ), 'FILE_NAME' => $file_data['file_name'], ! 'DOWNLOAD' => $pafiledb_config['settings_dbname'] ) ! ); // =================================================== // Prepare file info to display them // =================================================== $file_time = create_date( $board_config['default_dateformat'], $file_data['file_time'], $board_config['board_timezone'] ); - $file_last_download = ( $file_data['file_last'] ) ? create_date( $board_config['default_dateformat'], $file_data['file_last'], $board_config['board_timezone'] ) : $lang['never']; - $file_update_time = ( $file_data['file_update_time'] ) ? create_date( $board_config['default_dateformat'], $file_data['file_update_time'], $board_config['board_timezone'] ) : $lang['never']; - $file_author = trim( $file_data['file_creator'] ); - $file_version = trim( $file_data['file_version'] ); - $file_screenshot_url = trim( $file_data['file_ssurl'] ); - $file_website_url = trim( $file_data['file_docsurl'] ); - - $file_rating = ( $file_data['rating'] != 0 ) ? round( $file_data['rating'], 2 ) . ' / 10' : $lang['Not_rated']; - - /* - orig - $file_download_link = ($file_data['file_license'] > 0) ? append_sid('dload.php?action=license&license_id=' . $file_data['file_license'] . '&file_id=' . $file_id) : append_sid('dload.php?action=download&file_id=' . $file_id); - */ - // MX $file_download_link = ( $file_data['file_license'] > 0 ) ? append_sid( pa_this_mxurl( 'action=license&license_id=' . $file_data['file_license'] . '&file_id=' . $file_id ) ) : append_sid( pa_this_mxurl( 'action=download&file_id=' . $file_id, 1 ) ); - $file_size = $pafiledb_functions->get_file_size( $file_id, $file_data ); - /* - orig - $file_poster = ( $file_data['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid('profile.'.$phpEx.'?mode=viewprofile&' . POST_USERS_URL . '=' . $file_data['user_id']) . '">' : ''; - */ - // MX $file_poster = ( $file_data['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $file_data['user_id'] ) . '">' : ''; $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? $file_data['username'] : $lang['Guest']; $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! if ( $file_data['cat_allow_ratings'] ) ! { ! $pafiledb_template->assign_block_vars( 'show_ratings', array( ) ); ! } ! ! $pafiledb_template->assign_vars( array( 'L_CLICK_HERE' => $lang['Click_here'], ! 'L_AUTHOR' => $lang['Creator'], ! 'L_VERSION' => $lang['Version'], ! 'L_SCREENSHOT' => $lang['Scrsht'], ! 'L_WEBSITE' => $lang['Docs'], ! 'L_FILE' => $lang['File'], ! 'L_DESC' => $lang['Desc'], ! 'L_VOTES' => $lang['Votes'], ! 'L_DATE' => $lang['Date'], ! 'L_UPDATE_TIME' => $lang['Update_time'], ! 'L_LASTTDL' => $lang['Lastdl'], ! 'L_DLS' => $lang['Dls'], ! 'L_RATING' => $lang['DlRating'], ! 'L_SIZE' => $lang['File_size'], ! 'L_EDIT' => $lang['Editfile'], ! 'L_DELETE' => $lang['Deletefile'], ! 'L_DOWNLOAD' => $lang['Downloadfile'], ! 'L_RATE' => $lang['Rate'], ! 'L_EMAIL' => $lang['Emailfile'], ! 'L_SUBMITED_BY' => $lang['Submiter'], ! ! 'SHOW_AUTHOR' => ( !empty( $file_author ) ) ? true : false, ! 'SHOW_VERSION' => ( !empty( $file_version ) ) ? true : false, ! 'SHOW_SCREENSHOT' => ( !empty( $file_screenshot_url ) ) ? true : false, ! 'SHOW_WEBSITE' => ( !empty( $file_website_url ) ) ? true : false, ! 'SS_AS_LINK' => ( $file_data['file_sshot_link'] ) ? true : false, ! 'FILE_NAME' => $file_data['file_name'], ! 'FILE_LONGDESC' => nl2br( $file_data['file_longdesc'] ), ! 'FILE_SUBMITED_BY' => $file_poster, ! 'FILE_AUTHOR' => $file_author, ! /* - orig ! 'FILE_VERSION' => $file_author, ! */ ! // BUGFIX ! 'FILE_VERSION' => $file_version, ! 'FILE_SCREENSHOT' => $file_screenshot_url, ! 'FILE_WEBSITE' => $file_website_url, ! 'AUTH_EDIT' => ( ( $this->auth[$file_data['file_catid']]['auth_edit_file'] && $file_data['user_id'] == $userdata['user_id'] ) || $this->auth[$file_data['file_catid']]['auth_mod'] ) ? true : false, ! 'AUTH_DELETE' => ( ( $this->auth[$file_data['file_catid']]['auth_delete_file'] && $file_data['user_id'] == $userdata['user_id'] ) || $this->auth[$file_data['file_catid']]['auth_mod'] ) ? true : false, ! 'AUTH_DOWNLOAD' => ( $this->auth[$file_data['file_catid']]['auth_download'] ) ? true : false, ! 'AUTH_RATE' => ( $this->auth[$file_data['file_catid']]['auth_rate'] && $file_data['cat_allow_ratings'] ) ? true : false, ! 'AUTH_EMAIL' => ( $this->auth[$file_data['file_catid']]['auth_email'] ) ? true : false, ! 'INCLUDE_COMMENTS' => ( $this->auth[$file_data['file_catid']]['auth_view_comment'] && $file_data['cat_allow_comments'] ) ? true : false, ! 'DELETE_IMG' => $phpbb_root_path . $images['icon_delpost'], ! 'EDIT_IMG' => $phpbb_root_path . $images['icon_edit'], ! 'DOWNLOAD_IMG' => $images['pa_download'], ! 'RATE_IMG' => $images['pa_rate'], ! 'EMAIL_IMG' => $images['pa_email'], ! 'FILE_VOTES' => $file_data['total_votes'], ! 'TIME' => $file_time, ! 'UPDATE_TIME' => ( $file_data['file_update_time'] != $file_data['file_time'] ) ? $file_update_time : $lang['never'], ! 'RATING' => $file_rating, ! 'FILE_DLS' => intval( $file_data['file_dls'] ), ! 'FILE_SIZE' => $file_size, ! 'LAST' => $file_last_download, ! 'U_DOWNLOAD' => $file_download_link, ! /* - orig ! 'U_RATE' => append_sid('dload.php?action=rate&file_id=' . $file_id), ! 'U_EMAIL' => append_sid('dload.php?action=email&file_id=' . $file_id)) ! */ ! // MX ! 'U_DELETE' => append_sid( pa_this_mxurl( 'action=user_upload&do=delete&file_id=' . $file_id ) ), ! 'U_EDIT' => append_sid( pa_this_mxurl( 'action=user_upload&file_id=' . $file_id ) ), ! 'U_RATE' => append_sid( pa_this_mxurl( 'action=rate&file_id=' . $file_id ) ), ! 'U_EMAIL' => append_sid( pa_this_mxurl( 'action=email&file_id=' . $file_id ) ) ) ! ); - /* - orig - include($phpbb_root_path . 'pafiledb/includes/functions_field.'.$phpEx); - */ - // MX include( $module_root_path . 'pafiledb/includes/functions_field.' . $phpEx ); $custom_field = new custom_field(); --- 96,190 ---- if ( ( !$this->auth[$file_data['file_catid']]['auth_view_file'] ) ) { ! /* ! if ( !$userdata['session_logged_in'] ) ! { ! mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".pa_this_mxurl("action=file&file_id=" . $file_id), true)); ! } ! */ $message = sprintf( $lang['Sorry_auth_view'], $this->auth[$file_data['file_catid']]['auth_view_file_type'] ); mx_message_die( GENERAL_MESSAGE, $message ); } $pafiledb_template->assign_vars( array( 'L_INDEX' => "<<", 'U_INDEX' => append_sid( $mx_root_path . 'index.' . $phpEx ), 'U_DOWNLOAD_HOME' => append_sid( pa_this_mxurl() ), 'FILE_NAME' => $file_data['file_name'], ! 'DOWNLOAD' => $pafiledb_config['module_name'] ) ! ); ! // =================================================== // Prepare file info to display them // =================================================== $file_time = create_date( $board_config['default_dateformat'], $file_data['file_time'], $board_config['board_timezone'] ); $file_last_download = ( $file_data['file_last'] ) ? create_date( $board_config['default_dateformat'], $file_data['file_last'], $board_config['board_timezone'] ) : $lang['never']; $file_update_time = ( $file_data['file_update_time'] ) ? create_date( $board_config['default_dateformat'], $file_data['file_update_time'], $board_config['board_timezone'] ) : $lang['never']; $file_author = trim( $file_data['file_creator'] ); $file_version = trim( $file_data['file_version'] ); $file_screenshot_url = trim( $file_data['file_ssurl'] ); $file_website_url = trim( $file_data['file_docsurl'] ); $file_download_link = ( $file_data['file_license'] > 0 ) ? append_sid( pa_this_mxurl( 'action=license&license_id=' . $file_data['file_license'] . '&file_id=' . $file_id ) ) : append_sid( pa_this_mxurl( 'action=download&file_id=' . $file_id, 1 ) ); $file_size = $pafiledb_functions->get_file_size( $file_id, $file_data ); $file_poster = ( $file_data['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid( $phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $file_data['user_id'] ) . '">' : ''; $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? $file_data['username'] : $lang['Guest']; $file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? '</a>' : ''; ! $pafiledb_template->assign_vars( array( ! 'L_CLICK_HERE' => $lang['Click_here'], ! 'L_AUTHOR' => $lang['Creator'], ! 'L_VERSION' => $lang['Version'], ! 'L_SCREENSHOT' => $lang['Scrsht'], ! 'L_WEBSITE' => $lang['Docs'], ! 'L_FILE' => $lang['File'], ! 'L_DESC' => $lang['Desc'], ! 'L_DATE' => $lang['Date'], ! 'L_UPDATE_TIME' => $lang['Update_time'], ! 'L_LASTTDL' => $lang['Lastdl'], ! 'L_DLS' => $lang['Dls'], ! 'L_SIZE' => $lang['File_size'], ! 'L_EDIT' => $lang['Editfile'], ! 'L_DELETE' => $lang['Deletefile'], ! 'L_DOWNLOAD' => $lang['Downloadfile'], ! 'L_EMAIL' => $lang['Emailfile'], ! 'L_SUBMITED_BY' => $lang['Submiter'], ! 'SHOW_AUTHOR' => ( !empty( $file_author ) ) ? true : false, ! 'SHOW_VERSION' => ( !empty( $file_version ) ) ? true : false, ! 'SHOW_SCREENSHOT' => ( !empty( $file_screenshot_url ) ) ? true : false, ! 'SHOW_WEBSITE' => ( !empty( $file_website_url ) ) ? true : false, ! 'SS_AS_LINK' => ( $file_data['file_sshot_link'] ) ? true : false, ! 'FILE_NAME' => $file_data['file_name'], ! 'FILE_LONGDESC' => nl2br( $file_data['file_longdesc'] ), ! 'FILE_SUBMITED_BY' => $file_poster, ! 'FILE_AUTHOR' => $file_author, ! 'FILE_VERSION' => $file_version, ! 'FILE_SCREENSHOT' => $file_screenshot_url, ! 'FILE_WEBSITE' => $file_website_url, ! 'AUTH_EDIT' => ( ( $this->auth[$file_data['file_catid']]['auth_edit_file'] && $file_data['user_id'] == $userdata['user_id'] ) || $this->auth[$file_data['file_catid']]['auth_mod'] ) ? true : false, ! 'AUTH_DELETE' => ( ( $this->auth[$file_data['file_catid']]['auth_delete_file'] && $file_data['user_id'] == $userdata['user_id'] ) || $this->auth[$file_data['file_catid']]['auth_mod'] ) ? true : false, ! 'AUTH_DOWNLOAD' => ( $this->auth[$file_data['file_catid']]['auth_download'] ) ? true : false, ! 'AUTH_EMAIL' => ( $this->auth[$file_data['file_catid']]['auth_email'] ) ? true : false, ! ! 'DELETE_IMG' => $phpbb_root_path . $images['icon_delpost'], ! 'EDIT_IMG' => $phpbb_root_path . $images['icon_edit'], ! 'DOWNLOAD_IMG' => $images['pa_download'], ! 'EMAIL_IMG' => $images['pa_email'], ! 'TIME' => $file_time, ! 'UPDATE_TIME' => ( $file_data['file_update_time'] != $file_data['file_time'] ) ? $file_update_time : $lang['never'], ! 'FILE_DLS' => intval( $file_data['file_dls'] ), ! 'FILE_SIZE' => $file_size, ! 'LAST' => $file_last_download, ! 'U_DOWNLOAD' => $file_download_link, ! 'U_DELETE' => append_sid( pa_this_mxurl( 'action=user_upload&do=delete&file_id=' . $file_id ) ), ! 'U_EDIT' => append_sid( pa_this_mxurl( 'action=user_upload&file_id=' . $file_id ) ), ! 'U_EMAIL' => append_sid( pa_this_mxurl( 'action=email&file_id=' . $file_id ) ) ) ! ); include( $module_root_path . 'pafiledb/includes/functions_field.' . $phpEx ); $custom_field = new custom_field(); *************** *** 264,276 **** $custom_field->display_data( $file_id ); ! if ( $this->auth[$file_data['file_catid']]['auth_view_comment'] && $file_data['cat_allow_comments'] ) { ! /* - orig ! include($phpbb_root_path . 'pafiledb/includes/functions_comment.'.$phpEx); !... [truncated message content] |
|
From: Jon O. <jon...@us...> - 2005-12-08 15:15:53
|
Update of /cvsroot/mxbb/mx_pafiledb/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb/language/lang_english Modified Files: lang_admin.php Log Message: in progress commit for mx_pafiledb Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/language/lang_english/lang_admin.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_admin.php 23 Oct 2005 20:52:01 -0000 1.4 --- lang_admin.php 8 Dec 2005 15:15:11 -0000 1.5 *************** *** 159,163 **** $lang['MB'] = 'MB'; - // Custom Field $lang['Fieldselecttitle'] = 'Select what to do'; --- 159,162 ---- |
Update of /cvsroot/mxbb/mx_pafiledb/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb/admin Modified Files: admin_pa_catauth.php admin_pa_category.php admin_pa_custom.php admin_pa_file.php admin_pa_settings.php admin_pa_ug_auth.php mx_module_defs.php Log Message: in progress commit for mx_pafiledb Index: admin_pa_category.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_category.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin_pa_category.php 1 Oct 2005 14:15:19 -0000 1.12 --- admin_pa_category.php 8 Dec 2005 15:15:11 -0000 1.13 *************** *** 134,151 **** case 'sync': default: - /* - orig - $template_file = 'admin/pa_admin_cat.tpl'; - */ - // MX $template_file = 'admin/pa_admin_cat.tpl'; ! $l_title = $lang['Cat_manage_title']; ! $l_explain = $lang['Catexplain']; $s_hidden_fields = '<input type="hidden" name="mode" value="add">'; break; case 'add': - /* - orig - $template_file = 'admin/pa_admin_cat_edit.tpl'; - */ - // MX $template_file = 'admin/pa_admin_cat_edit.tpl'; $l_title = $lang['Acattitle']; --- 134,143 ---- case 'sync': default: $template_file = 'admin/pa_admin_cat.tpl'; ! $l_title = $lang['Panel_cat_title']; ! $l_explain = $lang['Panel_cat_explain']; $s_hidden_fields = '<input type="hidden" name="mode" value="add">'; break; case 'add': $template_file = 'admin/pa_admin_cat_edit.tpl'; $l_title = $lang['Acattitle']; *************** *** 154,161 **** break; case 'edit': - /* - orig - $template_file = 'admin/pa_admin_cat_edit.tpl'; - */ - // MX $template_file = 'admin/pa_admin_cat_edit.tpl'; $l_title = $lang['Ecattitle']; --- 146,149 ---- *************** *** 165,172 **** break; case 'delete': - /* - orig - $template_file = 'admin/pa_admin_cat_delete.tpl'; - */ - // MX $template_file = 'admin/pa_admin_cat_delete.tpl'; $l_title = $lang['Dcattitle']; --- 153,156 ---- *************** *** 179,200 **** ); ! $pafiledb_template->assign_vars( array( 'L_CAT_TITLE' => $l_title, ! 'L_CAT_EXPLAIN' => $l_explain, ! 'ERROR' => ( sizeof( $pafiledb->error ) ) ? implode( '<br />', $pafiledb->error ) : '', ! ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_CAT_ACTION' => append_sid( "admin_pa_category.$phpEx" ) ) ! ); if ( $mode == '' || $mode == 'cat_order' || $mode == 'sync' || $mode == 'sync_all' ) { ! $pafiledb_template->assign_vars( array( 'L_CREATE_CATEGORY' => $lang['Create_category'], ! 'L_EDIT' => $lang['Edit'], ! 'L_DELETE' => $lang['Delete'], ! 'L_MOVE_UP' => $lang['Move_up'], ! 'L_MOVE_DOWN' => $lang['Move_down'], ! 'L_SUB_CAT' => $lang['Sub_category'], ! 'L_RESYNC' => $lang['Resync'] ) ! ); admin_cat_main( $cat_id ); } --- 163,186 ---- ); ! $pafiledb_template->assign_vars( array( ! 'L_CAT_TITLE' => $l_title, ! 'L_CAT_EXPLAIN' => $l_explain, ! ! 'ERROR' => ( sizeof( $pafiledb->error ) ) ? implode( '<br />', $pafiledb->error ) : '', ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_CAT_ACTION' => append_sid( "admin_pa_category.$phpEx" ) ) ! ); if ( $mode == '' || $mode == 'cat_order' || $mode == 'sync' || $mode == 'sync_all' ) { ! $pafiledb_template->assign_vars( array( ! 'L_CREATE_CATEGORY' => $lang['Create_category'], ! 'L_EDIT' => $lang['Edit'], ! 'L_DELETE' => $lang['Delete'], ! 'L_MOVE_UP' => $lang['Move_up'], ! 'L_MOVE_DOWN' => $lang['Move_down'], ! 'L_SUB_CAT' => $lang['Sub_category'], ! 'L_RESYNC' => $lang['Resync'] ) ! ); admin_cat_main( $cat_id ); } *************** *** 211,224 **** $cat_list .= '<option value="0">' . $lang['None'] . '</option>'; } ! $cat_list .= ( !$_POST['cat_parent'] ) ? $pafiledb->jumpmenu_option() : $pafiledb->jumpmenu_option( 0, 0, array( $_POST['cat_parent'] => 1 ) ); $checked_yes = ( $_POST['cat_allow_file'] ) ? ' checked' : ''; $checked_no = ( !$_POST['cat_allow_file'] ) ? ' checked' : ''; - // MX Addon - $checked_comments_yes = ( $_POST['cat_allow_comments'] ) ? ' checked' : ''; - $checked_comments_no = ( !$_POST['cat_allow_comments'] ) ? ' checked' : ''; - $checked_ratings_yes = ( $_POST['cat_allow_ratings'] ) ? ' checked' : ''; - $checked_ratings_no = ( !$_POST['cat_allow_ratings'] ) ? ' checked' : ''; $cat_name = ( !empty( $_POST['cat_name'] ) ) ? $_POST['cat_name'] : ''; $cat_desc = ( !empty( $_POST['cat_desc'] ) ) ? $_POST['cat_desc'] : ''; } else --- 197,247 ---- $cat_list .= '<option value="0">' . $lang['None'] . '</option>'; } ! ! $cat_list .= ( !$_POST['cat_parent'] ) ? $pafiledb->generate_jumpbox() : $pafiledb-generate_jumpboxn( 0, 0, array( $_POST['cat_parent'] => 1 ) ); $checked_yes = ( $_POST['cat_allow_file'] ) ? ' checked' : ''; $checked_no = ( !$_POST['cat_allow_file'] ) ? ' checked' : ''; $cat_name = ( !empty( $_POST['cat_name'] ) ) ? $_POST['cat_name'] : ''; $cat_desc = ( !empty( $_POST['cat_desc'] ) ) ? $_POST['cat_desc'] : ''; + + // + // Comments + // + $use_comments_yes = ""; + $use_comments_no = ""; + $use_comments_default = "checked=\"checked\""; + + $internal_comments_internal = ""; + $internal_comments_phpbb = ""; + $internal_comments_default = "checked=\"checked\""; + + $autogenerate_comments_yes = ""; + $autogenerate_comments_no = ""; + $autogenerate_comments_default = "checked=\"checked\""; + + $comments_forum_id = 0; + + // + // Ratings + // + $use_ratings_yes = ""; + $use_ratings_no = ""; + $use_ratings_default = "checked=\"checked\""; + + // + // Instructions + // + $pretext_show = ""; + $pretext_hide = ""; + $pretext_default = "checked=\"checked\""; + + // + // Notification + // + $notify_none = ""; + $notify_pm = ""; + $notify_email = ""; + $notify_default = "checked=\"checked\""; + + $notify_group_list = mx_get_groups('', 'notify_group'); } else *************** *** 232,236 **** $cat_list .= '<option value="0">' . $lang['None'] . '</option>\n'; } ! $cat_list .= $pafiledb->jumpmenu_option( 0, 0, array( $pafiledb->cat_rowset[$cat_id]['cat_parent'] => 1 ) ); if ( $pafiledb->cat_rowset[$cat_id]['cat_allow_file'] ) --- 255,259 ---- $cat_list .= '<option value="0">' . $lang['None'] . '</option>\n'; } ! $cat_list .= $pafiledb->generate_jumpbox( 0, 0, array( $pafiledb->cat_rowset[$cat_id]['cat_parent'] => 1 ) ); if ( $pafiledb->cat_rowset[$cat_id]['cat_allow_file'] ) *************** *** 245,321 **** } - if ( $pafiledb->cat_rowset[$cat_id]['cat_allow_comments'] ) - { - $checked_comments_yes = ' checked'; - $checked_comments_no = ''; - } - else - { - $checked_comments_yes = ''; - $checked_comments_no = ' checked'; - } - - if ( $pafiledb->cat_rowset[$cat_id]['cat_allow_ratings'] ) - { - $checked_ratings_yes = ' checked'; - $checked_ratings_no = ''; - } - else - { - $checked_ratings_yes = ''; - $checked_ratings_no = ' checked'; - } - $cat_name = $pafiledb->cat_rowset[$cat_id]['cat_name']; $cat_desc = $pafiledb->cat_rowset[$cat_id]['cat_desc']; } ! $pafiledb_template->assign_vars( array( 'CAT_NAME' => $cat_name, ! 'CAT_DESC' => $cat_desc, ! 'CHECKED_YES' => $checked_yes, ! 'CHECKED_NO' => $checked_no, ! // MX ADDON ! 'CHECKED_ALLOWCOMMENTS_YES' => $checked_comments_yes, ! 'CHECKED_ALLOWCOMMENTS_NO' => $checked_comments_no, ! 'CHECKED_ALLOWRATINGS_YES' => $checked_ratings_yes, ! 'CHECKED_ALLOWRATINGS_NO' => $checked_ratings_no, ! 'L_CAT_NAME' => $lang['Catname'], ! 'L_CAT_NAME_INFO' => $lang['Catnameinfo'], ! 'L_CAT_DESC' => $lang['Catdesc'], ! 'L_CAT_DESC_INFO' => $lang['Catdescinfo'], ! 'L_CAT_PARENT' => $lang['Catparent'], ! 'L_CAT_PARENT_INFO' => $lang['Catparentinfo'], ! 'L_CAT_ALLOWFILE' => $lang['Allow_file'], ! 'L_CAT_ALLOWFILE_INFO' => $lang['Allow_file_info'], ! // MX Addon ! 'L_CAT_ALLOWCOMMENTS' => $lang['Allow_comments'], ! 'L_CAT_ALLOWCOMMENTS_INFO' => $lang['Allow_comments_info'], ! 'L_CAT_ALLOWRATINGS' => $lang['Allow_ratings'], ! 'L_CAT_ALLOWRATINGS_INFO' => $lang['Allow_ratings_info'], ! 'L_NONE' => $lang['None'], ! 'L_YES' => $lang['Yes'], ! 'L_NO' => $lang['No'], ! 'L_CAT_NAME_FIELD_EMPTY' => $lang['Cat_name_missing'], ! 'S_CAT_LIST' => $cat_list ) ! ); } elseif ( $mode == 'delete' ) { ! $select_cat = $pafiledb->jumpmenu_option( 0, 0, array( $cat_id => 1 ) ); ! $file_to_select_cat = $pafiledb->jumpmenu_option( 0, 0, '', true ); ! $pafiledb_template->assign_vars( array( 'S_SELECT_CAT' => $select_cat, ! 'S_FILE_SELECT_CAT' => $file_to_select_cat, ! 'L_DELETE' => $lang['Delete'], ! 'L_DO_FILE' => $lang['Delfiles'], ! 'L_DO_CAT' => $lang['Do_cat'], ! 'L_MOVE_TO' => $lang['Move_to'], ! 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'L_DELETE' => $lang['Delete'], ! 'L_MOVE' => $lang['Move'] ) ! ); } --- 268,433 ---- } $cat_name = $pafiledb->cat_rowset[$cat_id]['cat_name']; $cat_desc = $pafiledb->cat_rowset[$cat_id]['cat_desc']; + + // + // Comments + // + $use_comments_yes = ( $pafiledb->cat_rowset[$cat_id]['cat_allow_comments'] == 1 ) ? "checked=\"checked\"" : ""; + $use_comments_no = ( $pafiledb->cat_rowset[$cat_id]['cat_allow_comments'] == 0 ) ? "checked=\"checked\"" : ""; + $use_comments_default = ( $pafiledb->cat_rowset[$cat_id]['cat_allow_comments'] == -1 ) ? "checked=\"checked\"" : ""; + + $internal_comments_internal = ( $pafiledb->cat_rowset[$cat_id]['internal_comments'] == 1 ) ? "checked=\"checked\"" : ""; + $internal_comments_phpbb = ( $pafiledb->cat_rowset[$cat_id]['internal_comments'] == 0 ) ? "checked=\"checked\"" : ""; + $internal_comments_default = ( $pafiledb->cat_rowset[$cat_id]['internal_comments'] == -1 ) ? "checked=\"checked\"" : ""; + + $comments_forum_id = $pafiledb->cat_rowset[$cat_id]['comments_forum_id']; + + $autogenerate_comments_yes = ( $pafiledb->cat_rowset[$cat_id]['autogenerate_comments'] == 1 ) ? "checked=\"checked\"" : ""; + $autogenerate_comments_no = ( $pafiledb->cat_rowset[$cat_id]['autogenerate_comments'] == 0 ) ? "checked=\"checked\"" : ""; + $autogenerate_comments_default = ( $pafiledb->cat_rowset[$cat_id]['autogenerate_comments'] == -1 ) ? "checked=\"checked\"" : ""; + + // + // Ratings + // + $use_ratings_yes = ( $pafiledb->cat_rowset[$cat_id]['cat_allow_ratings'] == 1 ) ? "checked=\"checked\"" : ""; + $use_ratings_no = ( $pafiledb->cat_rowset[$cat_id]['cat_allow_ratings'] == 0 ) ? "checked=\"checked\"" : ""; + $use_ratings_default = ( $pafiledb->cat_rowset[$cat_id]['cat_allow_ratings'] == -1 ) ? "checked=\"checked\"" : ""; + + // + // Instructions + // + $pretext_show = ( $pafiledb->cat_rowset[$cat_id]['show_pretext'] == 1 ) ? "checked=\"checked\"" : ""; + $pretext_hide = ( $pafiledb->cat_rowset[$cat_id]['show_pretext'] == 0 ) ? "checked=\"checked\"" : ""; + $pretext_default = ( $pafiledb->cat_rowset[$cat_id]['show_pretext'] == -1 ) ? "checked=\"checked\"" : ""; + + // + // Notification + // + $notify_none = ( $pafiledb->cat_rowset[$cat_id]['notify'] == 0 ) ? "checked=\"checked\"" : ""; + $notify_pm = ( $pafiledb->cat_rowset[$cat_id]['notify'] == 1 ) ? "checked=\"checked\"" : ""; + $notify_email = ( $pafiledb->cat_rowset[$cat_id]['notify'] == 2 ) ? "checked=\"checked\"" : ""; + $notify_default = ( $pafiledb->cat_rowset[$cat_id]['notify'] == -1 ) ? "checked=\"checked\"" : ""; + + $notify_group_list = mx_get_groups($pafiledb->cat_rowset[$cat_id]['notify_group'], 'notify_group'); } ! $pafiledb_template->assign_vars( array( ! 'CAT_NAME' => $cat_name, ! 'CAT_DESC' => $cat_desc, ! 'CHECKED_YES' => $checked_yes, ! 'CHECKED_NO' => $checked_no, ! ! // ! // Comments ! // ! 'L_COMMENTS_TITLE' => $lang['Comments_title'], ! ! 'L_USE_COMMENTS' => $lang['Use_comments'], ! 'L_USE_COMMENTS_EXPLAIN' => $lang['Use_comments_explain'], ! 'S_USE_COMMENTS_YES' => $use_comments_yes, ! 'S_USE_COMMENTS_NO' => $use_comments_no, ! 'S_USE_COMMENTS_DEFAULT' => $use_comments_default, ! ! 'L_INTERNAL_COMMENTS' => $lang['Internal_comments'], ! 'L_INTERNAL_COMMENTS_EXPLAIN' => $lang['Internal_comments_explain'], ! 'S_INTERNAL_COMMENTS_INTERNAL' => $internal_comments_internal, ! 'S_INTERNAL_COMMENTS_PHPBB' => $internal_comments_phpbb, ! 'S_INTERNAL_COMMENTS_DEFAULT' => $internal_comments_default, ! 'L_INTERNAL_COMMENTS_INTERNAL' => $lang['Internal_comments_internal'], ! 'L_INTERNAL_COMMENTS_PHPBB' => $lang['Internal_comments_phpBB'], ! 'L_FORUM_ID' => $lang['Forum_id'], ! 'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'], ! 'FORUM_LIST' => get_forums( $comments_forum_id ), ! ! 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], ! 'L_AUTOGENERATE_COMMENTS_EXPLAIN' => $lang['Autogenerate_comments_explain'], ! 'S_AUTOGENERATE_COMMENTS_YES' => $autogenerate_comments_yes, ! 'S_AUTOGENERATE_COMMENTS_NO' => $autogenerate_comments_no, ! 'S_AUTOGENERATE_COMMENTS_DEFAULT' => $autogenerate_comments_default, ! ! // ! // Ratings ! // ! 'L_RATINGS_TITLE' => $lang['Ratings_title'], ! ! 'L_USE_RATINGS' => $lang['Use_ratings'], ! 'L_USE_RATINGS_EXPLAIN' => $lang['Use_ratings_explain'], ! 'S_USE_RATINGS_YES' => $use_ratings_yes, ! 'S_USE_RATINGS_NO' => $use_ratings_no, ! 'S_USE_RATINGS_DEFAULT' => $use_ratings_default, ! ! // ! // Instructions ! // ! 'L_INSTRUCTIONS_TITLE' => $lang['Instructions_title'], ! ! 'L_PRE_TEXT_NAME' => $lang['Pre_text_name'], ! 'L_PRE_TEXT_EXPLAIN' => $lang['Pre_text_explain'], ! 'S_SHOW_PRETEXT' => $pretext_show, ! 'S_HIDE_PRETEXT' => $pretext_hide, ! 'S_DEFAULT_PRETEXT' => $pretext_default, ! ! 'L_SHOW' => $lang['Show'], ! 'L_HIDE' => $lang['Hide'], ! // ! // Notifications ! // ! 'L_NOTIFICATIONS_TITLE' => $lang['Notifications_title'], ! ! 'L_NOTIFY' => $lang['Notify'], ! 'L_NOTIFY_EXPLAIN' => $lang['Notify_explain'], ! 'L_EMAIL' => $lang['Email'], ! 'L_PM' => $lang['PM'], ! ! 'S_NOTIFY_NONE' => $notify_none, ! 'S_NOTIFY_EMAIL' => $notify_email, ! 'S_NOTIFY_PM' => $notify_pm, ! 'S_NOTIFY_DEFAULT' => $notify_default, ! ! 'L_NOTIFY_GROUP' => $lang['Notify_group'], ! 'L_NOTIFY_GROUP_EXPLAIN' => $lang['Notify_group_explain'], ! 'NOTIFY_GROUP' => $notify_group_list, ! ! 'L_CAT_NAME' => $lang['Catname'], ! 'L_CAT_NAME_INFO' => $lang['Catnameinfo'], ! 'L_CAT_DESC' => $lang['Catdesc'], ! 'L_CAT_DESC_INFO' => $lang['Catdescinfo'], ! 'L_CAT_PARENT' => $lang['Catparent'], ! 'L_CAT_PARENT_INFO' => $lang['Catparentinfo'], ! 'L_CAT_ALLOWFILE' => $lang['Allow_file'], ! 'L_CAT_ALLOWFILE_INFO' => $lang['Allow_file_info'], ! 'L_CAT_ALLOWCOMMENTS' => $lang['Allow_comments'], ! 'L_CAT_ALLOWCOMMENTS_INFO' => $lang['Allow_comments_info'], ! 'L_CAT_ALLOWRATINGS' => $lang['Allow_ratings'], ! 'L_CAT_ALLOWRATINGS_INFO' => $lang['Allow_ratings_info'], ! ! 'L_DEFAULT' => $lang['Use_default'], ! 'L_NONE' => $lang['None'], ! 'L_YES' => $lang['Yes'], ! 'L_NO' => $lang['No'], ! 'L_CAT_NAME_FIELD_EMPTY' => $lang['Cat_name_missing'], ! 'S_CAT_LIST' => $cat_list ) ! ); } elseif ( $mode == 'delete' ) { ! $select_cat = $pafiledb->generate_jumpbox( 0, 0, array( $cat_id => 1 ) ); ! $file_to_select_cat = $pafiledb->generate_jumpbox( 0, 0, '', true ); ! $pafiledb_template->assign_vars( array( ! 'S_SELECT_CAT' => $select_cat, ! 'S_FILE_SELECT_CAT' => $file_to_select_cat, ! 'L_DELETE' => $lang['Delete'], ! 'L_DO_FILE' => $lang['Delfiles'], ! 'L_DO_CAT' => $lang['Do_cat'], ! 'L_MOVE_TO' => $lang['Move_to'], ! 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'L_DELETE' => $lang['Delete'], ! 'L_MOVE' => $lang['Move'] ) ! ); } *************** *** 324,328 **** $pafiledb->_pafiledb(); ! $cache->unload(); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 436,440 ---- $pafiledb->_pafiledb(); ! $pafiledb_cache->unload(); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); *************** *** 354,356 **** --- 466,505 ---- } + function get_forums( $sel_id = 0 ) + { + global $db; + + $sql = "SELECT forum_id, forum_name + FROM " . FORUMS_TABLE; + + if ( !$result = $db->sql_query( $sql ) ) + { + mx_message_die( GENERAL_ERROR, "Couldn't get list of forums", "", __LINE__, __FILE__, $sql ); + } + + $forumlist = '<select name="forum_id">'; + + if ( $sel_id == 0 ) + { + $forumlist .= '<option value="0" selected > Select a Forum !</option>'; + } + + while ( $row = $db->sql_fetchrow( $result ) ) + { + if ( $sel_id == $row['forum_id'] ) + { + $status = "selected"; + } + else + { + $status = ''; + } + $forumlist .= '<option value="' . $row['forum_id'] . '" ' . $status . '>' . $row['forum_name'] . '</option>'; + } + + $forumlist .= '</select>'; + + return $forumlist; + } + ?> \ No newline at end of file Index: admin_pa_file.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_file.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_pa_file.php 1 Oct 2005 14:15:19 -0000 1.15 --- admin_pa_file.php 8 Dec 2005 15:15:11 -0000 1.16 *************** *** 303,307 **** } ! if ( !( $result = $pafiledb_functions->sql_query_limit( $sql, $pafiledb_config['settings_file_page'], $start ) ) ) { mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info', '', __LINE__, __FILE__, $sql ); --- 303,307 ---- } ! if ( !( $result = $pafiledb_functions->sql_query_limit( $sql, $pafiledb_config['pagination'], $start ) ) ) { mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info', '', __LINE__, __FILE__, $sql ); *************** *** 322,326 **** else { ! $limit = $pafiledb_config['settings_file_page']; $temp_start = $start; } --- 322,326 ---- else { ! $limit = $pafiledb_config['pagination']; $temp_start = $start; } *************** *** 431,435 **** $cat_list .= '<option value="0">' . $lang['None'] . '</option>\n'; } ! $cat_list .= $pafiledb->jumpmenu_option( 0, 0, array( $cat_id => 1 ), true ); $cat_list .= '</select>'; --- 431,435 ---- $cat_list .= '<option value="0">' . $lang['None'] . '</option>\n'; } ! $cat_list .= $pafiledb->generate_jumpbox( 0, 0, array( $cat_id => 1 ), true ); $cat_list .= '</select>'; *************** *** 446,451 **** 'L_NO_FILES' => $lang['No_file'], ! 'PAGINATION' => generate_pagination( append_sid( "admin_pa_file.$phpEx?mode=$mode&sort_method=$sort_method&sort_order=$sort_order&cat_id=$cat_id" ), $total_files, $pafiledb_config['settings_file_page'], $start ), ! 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $pafiledb_config['settings_file_page'] ) + 1 ), ceil( $total_files / $pafiledb_config['settings_file_page'] ) ), 'S_CAT_LIST' => $cat_list, --- 446,451 ---- 'L_NO_FILES' => $lang['No_file'], ! 'PAGINATION' => generate_pagination( append_sid( "admin_pa_file.$phpEx?mode=$mode&sort_method=$sort_method&sort_order=$sort_order&cat_id=$cat_id" ), $total_files, $pafiledb_config['pagination'], $start ), ! 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $pafiledb_config['pagination'] ) + 1 ), ceil( $total_files / $pafiledb_config['pagination'] ) ), 'S_CAT_LIST' => $cat_list, *************** *** 507,511 **** $file_website = ''; $file_posticons = $pafiledb_functions->post_icons(); ! $file_cat_list = $pafiledb->jumpmenu_option( 0, 0, '', true ); $file_license = $pafiledb_functions->license_list(); $pin_checked_yes = ''; --- 507,511 ---- $file_website = ''; $file_posticons = $pafiledb_functions->post_icons(); ! $file_cat_list = $pafiledb->generate_jumpbox( 0, 0, '', true ); $file_license = $pafiledb_functions->license_list(); $pin_checked_yes = ''; *************** *** 538,542 **** $file_website = $file_info['file_docsurl']; $file_posticons = $pafiledb_functions->post_icons( $file_info['file_posticon'] ); ! $file_cat_list = $pafiledb->jumpmenu_option( 0, 0, array( $file_info['file_catid'] => 1 ), true ); $file_license = $pafiledb_functions->license_list( $file_info['file_license'] ); $pin_checked_yes = ( $file_info['file_pin'] ) ? ' checked' : ''; --- 538,542 ---- $file_website = $file_info['file_docsurl']; $file_posticons = $pafiledb_functions->post_icons( $file_info['file_posticon'] ); ! $file_cat_list = $pafiledb->generate_jumpbox( 0, 0, array( $file_info['file_catid'] => 1 ), true ); $file_license = $pafiledb_functions->license_list( $file_info['file_license'] ); $pin_checked_yes = ( $file_info['file_pin'] ) ? ' checked' : ''; *************** *** 750,754 **** $pafiledb_template->display( 'admin' ); $pafiledb->_pafiledb(); ! $cache->unload(); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 750,754 ---- $pafiledb_template->display( 'admin' ); $pafiledb->_pafiledb(); ! $pafiledb_cache->unload(); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); Index: admin_pa_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_settings.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_pa_settings.php 1 Oct 2005 14:15:19 -0000 1.13 --- admin_pa_settings.php 8 Dec 2005 15:15:11 -0000 1.14 *************** *** 93,103 **** $config_name = $row['config_name']; $config_value = $row['config_value']; ! $default_config[$config_name] = $config_value; ! $new[$config_name] = ( isset( $_POST[$config_name] ) ) ? $_POST[$config_name] : $default_config[$config_name]; if ( ( empty( $size ) ) && ( !$submit ) && ( $config_name == 'max_file_size' ) ) { ! $size = ( intval( $default_config[$config_name] ) >= 1048576 ) ? 'mb' : ( ( intval( $default_config[$config_name] ) >= 1024 ) ? 'kb' : 'b' ); } --- 93,103 ---- $config_name = $row['config_name']; $config_value = $row['config_value']; ! $pa_config[$config_name] = $config_value; ! $new[$config_name] = ( isset( $_POST[$config_name] ) ) ? $_POST[$config_name] : $pa_config[$config_name]; if ( ( empty( $size ) ) && ( !$submit ) && ( $config_name == 'max_file_size' ) ) { ! $size = ( intval( $pa_config[$config_name] ) >= 1048576 ) ? 'mb' : ( ( intval( $pa_config[$config_name] ) >= 1024 ) ? 'kb' : 'b' ); } *************** *** 121,125 **** } ! if ( $config_name == 'tpl_php' && isset( $_POST[$config_name] ) && $new[$config_name] != $default_config[$config_name] ) { $pafiledb_template->compile_cache_clear(); --- 121,125 ---- } ! if ( $config_name == 'tpl_php' && isset( $_POST[$config_name] ) && $new[$config_name] != $pa_config[$config_name] ) { $pafiledb_template->compile_cache_clear(); *************** *** 132,136 **** if ( $submit ) { ! $cache->unload(); $message = $lang['Settings_changed'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pa_settings.$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 ); --- 132,136 ---- if ( $submit ) { ! $pafiledb_cache->unload(); $message = $lang['Settings_changed'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pa_settings.$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 ); *************** *** 138,148 **** } ! $template->set_filenames( array( ! /* - orig ! 'admin' => 'admin/pa_admin_settings.tpl') ! */ ! // MX ! 'admin' => 'admin/pa_admin_settings.tpl' ) ! ); $cat_auth_levels = array( 'ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN' ); --- 138,142 ---- } ! $template->set_filenames( array( 'admin' => 'admin/pa_admin_settings.tpl' ) ); $cat_auth_levels = array( 'ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN' ); *************** *** 162,322 **** } ! $view_all_yes = ( $new['settings_viewall'] ) ? ' selected' : ''; ! $view_all_no = ( !$new['settings_viewall'] ) ? ' selected' : ''; ! $download_disable_yes = ( $new['settings_disable'] ) ? ' selected' : ''; ! $download_disable_no = ( !$new['settings_disable'] ) ? ' selected' : ''; ! $hotlink_prevent_yes = ( $new['hotlink_prevent'] ) ? ' selected' : ''; ! $hotlink_prevent_no = ( !$new['hotlink_prevent'] ) ? ' selected' : ''; ! $php_template_yes = ( $new['settings_tpl_php'] ) ? ' selected' : ''; ! $php_template_no = ( !$new['settings_tpl_php'] ) ? ' selected' : ''; ! $allow_html_yes = ( $new['allow_html'] ) ? ' selected' : ''; ! $allow_html_no = ( !$new['allow_html'] ) ? ' selected' : ''; ! $allow_bbcode_yes = ( $new['allow_bbcode'] ) ? ' selected' : ''; ! $allow_bbcode_no = ( !$new['allow_bbcode'] ) ? ' selected' : ''; ! $allow_smilies_yes = ( $new['allow_smilies'] ) ? ' selected' : ''; ! $allow_smilies_no = ( !$new['allow_smilies'] ) ? ' selected' : ''; ! $allow_comment_links_yes = ( $new['allow_comment_links'] ) ? ' selected' : ''; ! $allow_comment_links_no = ( !$new['allow_comment_links'] ) ? ' selected' : ''; ! $allow_comment_images_yes = ( $new['allow_comment_images'] ) ? ' selected' : ''; ! $allow_comment_images_no = ( !$new['allow_comment_images'] ) ? ' selected' : ''; ! $pm_notify_yes = ( $new['pm_notify'] ) ? ' selected' : ''; ! $pm_notify_no = ( !$new['pm_notify'] ) ? ' selected' : ''; $template->assign_vars( array( ! 'S_SETTINGS_ACTION' => append_sid( "admin_pa_settings.$phpEx" ), ! 'L_MAX_FILE_SIZE' => $lang['Max_filesize'], ! 'L_MAX_FILE_SIZE_INFO' => $lang['Max_filesize_explain'], ! 'L_UPLOAD_DIR' => $lang['Upload_directory'], ! 'L_UPLOAD_DIR_EXPLAIN' => $lang['Upload_directory_explain'], ! 'L_SCREENSHOT_DIR' => $lang['Screenshots_directory'], ! 'L_SCREENSHOT_DIR_EXPLAIN' => $lang['Screenshots_directory_explain'], ! 'L_FORBIDDEN_EXTENSIONS' => $lang['Forbidden_extensions'], ! 'L_FORBIDDEN_EXTENSIONS_EXPLAIN' => $lang['Forbidden_extensions_explain'], ! 'L_PERMISSION_SETTINGS' => $lang['Permission_settings'], ! 'L_ATUH_SEARCH' => $lang['Auth_search'], ! 'L_ATUH_SEARCH_INFO' => $lang['Auth_search_explain'], ! 'L_ATUH_STATS' => $lang['Auth_stats'], ! 'L_ATUH_STATS_INFO' => $lang['Auth_stats_explain'], ! 'L_ATUH_TOPLIST' => $lang['Auth_toplist'], ! 'L_ATUH_TOPLIST_INFO' => $lang['Auth_toplist_explain'], ! 'L_ATUH_VIEWALL' => $lang['Auth_viewall'], ! 'L_ATUH_VIEWALL_INFO' => $lang['Auth_viewall_explain'], ! 'L_FILE_IN_PAGE' => $lang['File_per_page'], ! 'L_FILE_IN_PAGE_INFO' => $lang['File_per_page_info'], ! 'L_HOTLINK' => $lang['Hotlink_prevent'], ! 'L_HOTLINK_INFO' => $lang['Hotlinl_prevent_info'], ! 'L_HOTLINK_ALLOWED' => $lang['Hotlink_allowed'], ! 'L_HOTLINK_ALLOWED_INFO' => $lang['Hotlink_allowed_info'], ! 'L_SETTINGS' => $lang['Settings'], ! 'L_SETTINGSTITLE' => $lang['Settingstitle'], ! 'L_SETTINGSEXPLAIN' => $lang['Settingsexplain'], ! 'L_PHP_TPL' => $lang['Php_template'], ! 'L_PHP_TPL_INFO' => $lang['Php_template_info'], ! 'L_DBNAME' => $lang['Dbname'], ! 'L_DBNAMEINFO' => $lang['Dbnameinfo'], ! 'L_TOPNUM' => $lang['Topnum'], ! 'L_TOPNUMINFO' => $lang['Topnuminfo'], ! 'L_NFDAYS' => $lang['Nfdays'], ! 'L_NFDAYSINFO' => $lang['Nfdaysinfo'], ! 'L_COMMENT_SETTINGS' => $lang['Com_settings'], ! 'L_SHOW_VIEWALL' => $lang['Showva'], ! 'L_VIEWALL_INFO' => $lang['Showvainfo'], ! 'L_DISABLE' => $lang['Dbdl'], ! 'L_DISABLE_INFO' => $lang['Dbdlinfo'], ! 'L_ALLOW_HTML' => $lang['Com_allowh'], ! 'L_ALLOW_BBCODE' => $lang['Com_allowb'], ! 'L_ALLOW_SMILIES' => $lang['Com_allows'], ! 'L_ALLOW_LINKS' => $lang['Com_allowl'], ! 'L_LINKS_MESSAGE' => $lang['Com_messagel'], ! 'L_LINKS_MESSAGE_INFO' => $lang['Com_messagel_info'], ! 'L_ALLOW_IMAGE' => $lang['Com_allowi'], ! 'L_IMAGE_MESSAGE' => $lang['Com_messagei'], ! 'L_MAX_CHAR' => $lang['Max_char'], ! 'L_MAX_CHAR_INFO' => $lang['Max_char_info'], ! 'L_IMAGE_MESSAGE_INFO' => $lang['Com_messagei_info'], ! 'L_RESET' => $lang['Reset'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_YES' => $lang['Yes'], ! 'L_NO' => $lang['No'], ! 'L_DEFAULT_SORT_METHOD' => $lang['Default_sort_method'], ! 'L_DEFAULT_SORT_ORDER' => $lang['Default_sort_order'], ! 'L_RATING' => $lang['DlRating'], ! 'L_DOWNLOADS' => $lang['Dls'], ! 'L_DATE' => $lang['Date'], ! 'L_NAME' => $lang['Name'], ! 'L_UPDATE_TIME' => $lang['Update_time'], ! 'L_ASC' => $lang['Sort_Ascending'], ! 'L_DESC' => $lang['Sort_Descending'], ! 'L_VALIDATION_SETTINGS' => $lang['Validation_settings'], ! 'L_PM_NOTIFY' => $lang['PM_notify'], ! 'SETTINGS_DBNAME' => $new['settings_dbname'], ! 'SETTINGS_FILE_PAGE' => $new['settings_file_page'], ! 'HOTLINK_ALLOWED' => $new['hotlink_allowed'], ! 'SETTINGS_TOPNUMBER' => $new['settings_topnumber'], ! 'SETTINGS_NEWDAYS' => $new['settings_newdays'], ! 'SETTINGS_TOPNUMBER' => $new['settings_topnumber'], ! 'MESSAGE_LINK' => $new['no_comment_link_message'], ! 'MAX_CHAR' => $new['max_comment_chars'], ! 'MESSAGE_IMAGE' => $new['no_comment_image_message'], ! 'SORT_NAME' => ( $new['sort_method'] == 'file_name' ) ? 'selected="selected"' : '', ! 'SORT_TIME' => ( $new['sort_method'] == 'file_time' ) ? 'selected="selected"' : '', ! 'SORT_RATING' => ( $new['sort_method'] == 'file_rating' ) ? 'selected="selected"' : '', ! 'SORT_DOWNLOADS' => ( $new['sort_method'] == 'file_dls' ) ? 'selected="selected"' : '', ! 'SORT_UPDATE_TIME' => ( $new['sort_method'] == 'file_update_time' ) ? 'selected="selected"' : '', ! 'SORT_ASC' => ( $new['sort_order'] == 'ASC' ) ? 'selected="selected"' : '', ! 'SORT_DESC' => ( $new['sort_order'] == 'DESC' ) ? 'selected="selected"' : '', ! 'MAX_FILE_SIZE' => $new['max_file_size'], ! 'UPLOAD_DIR' => $new['upload_dir'], ! 'SCREENSHOT_DIR' => $new['screenshots_dir'], ! 'FORBIDDEN_EXTENSIONS' => $new['forbidden_extensions'], ! 'S_FILESIZE' => pa_size_select( 'max_size', $size ), ! 'S_ATUH_SEARCH' => $auth_select['auth_search'], ! 'S_ATUH_STATS' => $auth_select['auth_stats'], ! 'S_ATUH_TOPLIST' => $auth_select['auth_toplist'], ! 'S_ATUH_VIEWALL' => $auth_select['auth_viewall'], ! 'S_VIEW_ALL_YES' => $view_all_yes, ! 'S_VIEW_ALL_NO' => $view_all_no, ! 'S_DISABLE_YES' => $download_disable_yes, ! 'S_DISABLE_NO' => $download_disable_no, ! 'S_PHP_TPL_YES' => $php_template_yes, ! 'S_PHP_TPL_NO' => $php_template_no, ! 'S_HOTLINK_YES' => $hotlink_prevent_yes, ! 'S_HOTLINK_NO' => $hotlink_prevent_no, ! 'S_ALLOW_HTML_YES' => $allow_html_yes, ! 'S_ALLOW_HTML_NO' => $allow_html_no, ! 'S_ALLOW_BBCODE_YES' => $allow_bbcode_yes, ! 'S_ALLOW_BBCODE_NO' => $allow_bbcode_no, ! 'S_ALLOW_SMILIES_YES' => $allow_smilies_yes, ! 'S_ALLOW_SMILIES_NO' => $allow_smilies_no, ! 'S_ALLOW_LINKS_YES' => $allow_comment_links_yes, ! 'S_ALLOW_LINKS_NO' => $allow_comment_links_no, ! 'S_PM_NOTIFY_YES' => $pm_notify_yes, ! 'S_PM_NOTIFY_NO' => $pm_notify_no, ! ! 'S_ALLOW_IMAGES_YES' => $allow_comment_images_yes, ! 'S_ALLOW_IMAGES_NO' => $allow_comment_images_no ) ! ); // Output include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'admin' ); --- 156,588 ---- } ! // ! // General Settings ! // ! $module_name = $new['module_name']; ! $enable_module_yes = ( $new['enable_module'] ) ? "checked=\"checked\"" : ""; ! $enable_module_no = ( !$new['enable_module'] ) ? "checked=\"checked\"" : ""; ! $wysiwyg_path = $new['wysiwyg_path']; ! $upload_dir = $new['upload_dir']; ! $screenshots_dir = $new['screenshots_dir']; ! // ! // File ! // ! $hotlink_prevent_yes = ( $new['hotlink_prevent'] ) ? "checked=\"checked\"" : ""; ! $hotlink_prevent_no = ( !$new['hotlink_prevent'] ) ? "checked=\"checked\"" : ""; ! $hotlink_allowed = $new['hotlink_allowed']; ! $php_template_yes = ( $new['settings_tpl_php'] ) ? "checked=\"checked\"" : ""; ! $php_template_no = ( !$new['settings_tpl_php'] ) ? "checked=\"checked\"" : ""; ! $max_file_size = $new['max_file_size']; ! $forbidden_extensions = $new['forbidden_extensions']; ! // ! // Appearance ! // ! $pagination = $new['pagination']; ! $sort_method_options = array(); ! $sort_method_options = array( "file_name", "file_time", "file_rating", "file_dls", "file_update_time" ); ! ! $sort_method_list = '<select name="sort_method">'; ! for( $j = 0; $j < count( $sort_method_options ); $j++ ) ! { ! if ( $new['sort_method'] == $sort_method_options[$j] ) ! { ! $status = "selected"; ! } ! else ! { ! $status = ''; ! } ! $sort_method_list .= '<option value="' . $sort_method_options[$j] . '" ' . $status . '>' . $sort_method_options[$j] . '</option>'; ! } ! $sort_method_list .= '</select>'; ! ! $sort_order_options = array(); ! $sort_order_options = array( "DESC", "ASC" ); ! ! $sort_order_list = '<select name="sort_order">'; ! ! for( $j = 0; $j < count( $sort_order_options ); $j++ ) ! { ! if ( $new['sort_order'] == $sort_order_options[$j] ) ! { ! $status = "selected"; ! } ! else ! { ! $status = ''; ! } ! $sort_order_list .= '<option value="' . $sort_order_options[$j] . '" ' . $status . '>' . $sort_order_options[$j] . '</option>'; ! } ! $sort_order_list .= '</select>'; ! ! $settings_topnumber = $new['settings_topnumber']; ! $settings_newdays = $new['settings_newdays']; ! ! $view_all_yes = ( $new['settings_viewall'] ) ? "checked=\"checked\"" : ""; ! $view_all_no = ( !$new['settings_viewall'] ) ? "checked=\"checked\"" : ""; ! ! // ! // Instructions ! // ! $pretext_show = ( $new['show_pretext'] ) ? "checked=\"checked\"" : ""; ! $pretext_hide = ( !$new['show_pretext'] ) ? "checked=\"checked\"" : ""; ! ! $pt_header = $new['pt_header']; ! $pt_body = $new['pt_body']; ! ! ! // ! // Comments (default settings) ! // ! $use_comments_yes = ( $new['use_comments'] ) ? "checked=\"checked\"" : ""; ! $use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : ""; ! ! $internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! $internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : ""; ! ! $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : ""; ! $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : ""; ! ! $autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! $autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : ""; ! ! $allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : ""; ! $allow_comment_wysiwyg_no = ( !$new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : ""; ! ! $allow_comment_html_yes = ( $new['allow_comment_html'] ) ? "checked=\"checked\"" : ""; ! $allow_comment_html_no = ( !$new['allow_comment_html'] ) ? "checked=\"checked\"" : ""; ! ! $allowed_comment_html_tags = $new['allowed_comment_html_tags']; ! ! $allow_comment_bbcode_yes = ( $new['allow_comment_bbcode'] ) ? "checked=\"checked\"" : ""; ! $allow_comment_bbcode_no = ( !$new['allow_comment_bbcode'] ) ? "checked=\"checked\"" : ""; ! ! $allow_comment_smilies_yes = ( $new['allow_comment_smilies'] ) ? "checked=\"checked\"" : ""; ! $allow_comment_smilies_no = ( !$new['allow_comment_smilies'] ) ? "checked=\"checked\"" : ""; ! ! $allow_comment_links_yes = ( $new['allow_comment_links'] ) ? "checked=\"checked\"" : ""; ! $allow_comment_links_no = ( !$new['allow_comment_links'] ) ? "checked=\"checked\"" : ""; ! ! $allow_comment_images_yes = ( $new['allow_comment_images'] ) ? "checked=\"checked\"" : ""; ! $allow_comment_images_no = ( !$new['allow_comment_images'] ) ? "checked=\"checked\"" : ""; ! ! $no_comment_link_message = $new['no_comment_link_message']; ! $no_comment_image_message = $new['no_comment_image_message']; ! ! $max_comment_chars = $new['max_comment_chars']; ! $max_comment_subject_chars = $new['max_comment_subject_chars']; ! ! $format_comment_truncate_links_yes = ( $new['formatting_comment_truncate_links'] ) ? "checked=\"checked\"" : ""; ! $format_comment_truncate_links_no = ( !$new['formatting_comment_truncate_links'] ) ? "checked=\"checked\"" : ""; ! ! $format_comment_image_resize = $new['formatting_comment_image_resize']; ! ! $format_comment_wordwrap_yes = ( $new['formatting_comment_wordwrap'] ) ? "checked=\"checked\"" : ""; ! $format_comment_wordwrap_no = ( !$new['formatting_comment_wordwrap'] ) ? "checked=\"checked\"" : ""; ! ! $comments_pag = $new['comments_pagination']; ! ! // ! // Ratings (default settings) ! // ! $use_ratings_yes = ( $new['use_ratings'] ) ? "checked=\"checked\"" : ""; ! $use_ratings_no = ( !$new['use_ratings'] ) ? "checked=\"checked\"" : ""; ! ! $votes_check_ip_yes = ( $new['votes_check_ip'] ) ? "checked=\"checked\"" : ""; ! $votes_check_ip_no = ( !$new['votes_check_ip'] ) ? "checked=\"checked\"" : ""; ! ! $votes_check_userid_yes = ( $new['votes_check_userid'] ) ? "checked=\"checked\"" : ""; ! $votes_check_userid_no = ( !$new['votes_check_userid'] ) ? "checked=\"checked\"" : ""; ! ! // ! // Notifications ! // ! $notify_none = ( $new['notify'] == 0 ) ? "checked=\"checked\"" : ""; ! $notify_pm = ( $new['notify'] == 1 ) ? "checked=\"checked\"" : ""; ! $notify_email = ( $new['notify'] == 2 ) ? "checked=\"checked\"" : ""; ! ! $notify_group_list = mx_get_groups($new['notify_group'], 'notify_group'); $template->assign_vars( array( ! 'S_SETTINGS_ACTION' => append_sid( "admin_pa_settings.$phpEx" ), ! 'L_CONFIGURATION_TITLE' => $lang['Panel_config_title'], ! 'L_CONFIGURATION_EXPLAIN' => $lang['Panel_config_explain'], ! ! 'L_RESET' => $lang['Reset'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_YES' => $lang['Yes'], ! 'L_NO' => $lang['No'], ! // ! // General ! // ! 'L_GENERAL_TITLE' => $lang['General_title'], ! 'L_MODULE_NAME' => $lang['Module_name'], ! 'L_MODULE_NAME_EXPLAIN' => $lang['Module_name_explain'], ! 'MODULE_NAME' => $module_name, ! ! 'L_ENABLE_MODULE' => $lang['Enable_module'], ! 'L_ENABLE_MODULE_EXPLAIN' => $lang['Enable_module_explain'], ! 'S_ENABLE_MODULE_YES' => $enable_module_yes, ! 'S_ENABLE_MODULE_NO' => $enable_module_no, ! ! 'L_WYSIWYG_PATH' => $lang['Wysiwyg_path'], ! 'L_WYSIWYG_PATH_EXPLAIN' => $lang['Wysiwyg_path_explain'], ! 'WYSIWYG_PATH' => $wysiwyg_path, ! ! 'L_UPLOAD_DIR' => $lang['Upload_directory'], ! 'L_UPLOAD_DIR_EXPLAIN' => $lang['Upload_directory_explain'], ! 'UPLOAD_DIR' => $upload_dir, ! 'L_SCREENSHOT_DIR' => $lang['Screenshots_directory'], ! 'L_SCREENSHOT_DIR_EXPLAIN' => $lang['Screenshots_directory_explain'], ! 'SCREENSHOT_DIR' => $screenshots_dir, ! ! // ! // FILE ! // ! 'L_FILE_TITLE' => $lang['File_title'], ! ! 'L_HOTLINK' => $lang['Hotlink_prevent'], ! 'L_HOTLINK_INFO' => $lang['Hotlinl_prevent_info'], ! 'S_HOTLINK_YES' => $hotlink_prevent_yes, ! 'S_HOTLINK_NO' => $hotlink_prevent_no, ! ! 'L_HOTLINK_ALLOWED' => $lang['Hotlink_allowed'], ! 'L_HOTLINK_ALLOWED_INFO' => $lang['Hotlink_allowed_info'], ! 'HOTLINK_ALLOWED' => $hotlink_allowed, ! ! 'L_PHP_TPL' => $lang['Php_template'], ! 'L_PHP_TPL_INFO' => $lang['Php_template_info'], ! 'S_PHP_TPL_YES' => $php_template_yes, ! 'S_PHP_TPL_NO' => $php_template_no, ! ! 'L_MAX_FILE_SIZE' => $lang['Max_filesize'], ! 'L_MAX_FILE_SIZE_INFO' => $lang['Max_filesize_explain'], ! 'MAX_FILE_SIZE' => $max_file_size, ! 'S_FILESIZE' => pa_size_select( 'max_size', $size ), ! ! 'L_FORBIDDEN_EXTENSIONS' => $lang['Forbidden_extensions'], ! 'L_FORBIDDEN_EXTENSIONS_EXPLAIN' => $lang['Forbidden_extensions_explain'], ! 'FORBIDDEN_EXTENSIONS' => $forbidden_extensions, ! ! ! // ! // Appearance ! // ! 'L_APPEARANCE_TITLE' => $lang['Appearance_title'], ! ! 'L_PAGINATION' => $lang['Article_pag'], ! 'L_PAGINATION_EXPLAIN' => $lang['Article_pag_explain'], ! 'PAGINATION' => $pagination, ! ! 'L_SORT_METHOD' => $lang['Sort_method'], ! 'L_SORT_METHOD_EXPLAIN' => $lang['Sort_method_explain'], ! 'SORT_METHOD' => $sort_method_list, ! 'L_SORT_ORDER' => $lang['Sort_order'], ! 'L_SORT_ORDER_EXPLAIN' => $lang['Sort_order_explain'], ! 'SORT_ORDER' => $sort_order_list, ! ! 'L_TOPNUM' => $lang['Topnum'], ! 'L_TOPNUMINFO' => $lang['Topnuminfo'], ! 'SETTINGS_TOPNUMBER' => $settings_topnumber, ! ! 'L_NFDAYS' => $lang['Nfdays'], ! 'L_NFDAYSINFO' => $lang['Nfdaysinfo'], ! 'SETTINGS_NEWDAYS' => $settings_newdays, ! 'L_SHOW_VIEWALL' => $lang['Showva'], ! 'L_VIEWALL_INFO' => $lang['Showvainfo'], ! 'S_VIEW_ALL_YES' => $view_all_yes, ! 'S_VIEW_ALL_NO' => $view_all_no, ! ! // ! // Comments ! // ! 'L_COMMENTS_TITLE' => $lang['Comments_title'], ! 'L_COMMENTS_TITLE_EXPLAIN' => $lang['Comments_title_explain'], ! ! 'L_USE_COMMENTS' => $lang['Use_comments'], ! 'L_USE_COMMENTS_EXPLAIN' => $lang['Use_comments_explain'], ! 'S_USE_COMMENTS_YES' => $use_comments_yes, ! 'S_USE_COMMENTS_NO' => $use_comments_no, ! ! 'L_INTERNAL_COMMENTS' => $lang['Internal_comments'], ! 'L_INTERNAL_COMMENTS_EXPLAIN' => $lang['Internal_comments_explain'], ! 'S_INTERNAL_COMMENTS_INTERNAL' => $internal_comments_internal, ! 'S_INTERNAL_COMMENTS_PHPBB' => $internal_comments_phpbb, ! 'L_INTERNAL_COMMENTS_INTERNAL' => $lang['Internal_comments_internal'], ! 'L_INTERNAL_COMMENTS_PHPBB' => $lang['Internal_comments_phpBB'], ! 'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'], ! 'L_AUTOGENERATE_COMMENTS_EXPLAIN' => $lang['Autogenerate_comments_explain'], ! 'S_AUTOGENERATE_COMMENTS_YES' => $autogenerate_comments_yes, ! 'S_AUTOGENERATE_COMMENTS_NO' => $autogenerate_comments_no, ! ! 'L_ALLOW_COMMENT_WYSIWYG' => $lang['Allow_Wysiwyg'], ! 'L_ALLOW_COMMENT_WYSIWYG_EXPLAIN' => $lang['Allow_Wysiwyg_explain'], ! 'S_ALLOW_COMMENT_WYSIWYG_YES' => $allow_comment_wysiwyg_yes, ! 'S_ALLOW_COMMENT_WYSIWYG_NO' => $allow_comment_wysiwyg_no, ! 'L_ALLOW_COMMENT_HTML' => $lang['Allow_HTML'], ! 'L_ALLOW_COMMENT_HTML_EXPLAIN' => $lang['Allow_html_explain'], ! 'S_ALLOW_COMMENT_HTML_YES' => $allow_comment_html_yes, ! 'S_ALLOW_COMMENT_HTML_NO' => $allow_comment_html_no, ! 'L_ALLOW_COMMENT_BBCODE' => $lang['Allow_BBCode'], ! 'L_ALLOW_COMMENT_BBCODE_EXPLAIN' => $lang['Allow_bbcode_explain'], ! 'S_ALLOW_COMMENT_BBCODE_YES' => $allow_comment_bbcode_yes, ! 'S_ALLOW_COMMENT_BBCODE_NO' => $allow_comment_bbcode_no, ! 'L_ALLOW_COMMENT_SMILIES' => $lang['Allow_smilies'], ! 'L_ALLOW_COMMENT_SMILIES_EXPLAIN' => $lang['Allow_smilies_explain'], ! 'S_ALLOW_COMMENT_SMILIES_YES' => $allow_comment_smilies_yes, ! 'S_ALLOW_COMMENT_SMILIES_NO' => $allow_comment_smilies_no, ! ! 'L_ALLOWED_COMMENT_HTML_TAGS' => $lang['Allowed_tags'], ! 'L_ALLOWED_COMMENT_HTML_TAGS_EXPLAIN' => $lang['Allowed_tags_explain'], ! 'ALLOWED_COMMENT_HTML_TAGS' => $allowed_comment_html_tags, ! ! 'L_ALLOW_COMMENT_IMAGES' => $lang['Allow_images'], ! 'L_ALLOW_COMMENT_IMAGES_EXPLAIN' => $lang['Allow_images_explain'], ! 'S_ALLOW_COMMENT_IMAGES_YES' => $allow_comment_images_yes, ! 'S_ALLOW_COMMENT_IMAGES_NO' => $allow_comment_images_no, ! ! 'L_ALLOW_COMMENT_LINKS' => $lang['Allow_links'], ! 'L_ALLOW_COMMENT_LINKS_EXPLAIN' => $lang['Allow_links_explain'], ! 'S_ALLOW_COMMENT_LINKS_YES' => $allow_comment_links_yes, ! 'S_ALLOW_COMMENT_LINKS_NO' => $allow_comment_links_no, ! ! 'L_COMMENT_LINKS_MESSAGE' => $lang['Allow_links_message'], ! 'L_COMMENT_LINKS_MESSAGE_EXPLAIN' => $lang['Allow_links_message_explain'], ! 'COMMENT_MESSAGE_LINK' => $no_comment_link_message, ! ! 'L_COMMENT_IMAGES_MESSAGE' => $lang['Allow_images_message'], ! 'L_COMMENT_IMAGES_MESSAGE_EXPLAIN' => $lang['Allow_images_message_explain'], ! 'COMMENT_MESSAGE_IMAGE' => $no_comment_image_message, ! ! 'L_COMMENT_MAX_SUBJECT_CHAR' => $lang['Max_subject_char'], ! 'L_COMMENT_MAX_SUBJECT_CHAR_EXPLAIN' => $lang['Max_subject_char_explain'], ! 'COMMENT_MAX_SUBJECT_CHAR' => $max_comment_subject_chars, ! ! 'L_COMMENT_MAX_CHAR' => $lang['Max_char'], ! 'L_COMMENT_MAX_CHAR_EXPLAIN' => $lang['Max_char_explain'], ! 'COMMENT_MAX_CHAR' => $max_comment_chars, ! ! 'L_COMMENT_FORMAT_WORDWRAP' => $lang['Format_wordwrap'], ! 'L_COMMENT_FORMAT_WORDWRAP_EXPLAIN' => $lang['Format_wordwrap_explain'], ! 'S_COMMENT_FORMAT_WORDWRAP_YES' => $format_comment_wordwrap_yes, ! 'S_COMMENT_FORMAT_WORDWRAP_NO' => $format_comment_wordwrap_no, ! ! 'L_COMMENT_FORMAT_IMAGE_RESIZE' => $lang['Format_image_resize'], ! 'L_COMMENT_FORMAT_IMAGE_RESIZE_EXPLAIN' => $lang['Format_image_resize_explain'], ! 'COMMENT_FORMAT_IMAGE_RESIZE' => $format_comment_image_resize, ! ! 'L_COMMENT_FORMAT_TRUNCATE_LINKS' => $lang['Format_truncate_links'], ! 'L_COMMENT_FORMAT_TRUNCATE_LINKS_EXPLAIN' => $lang['Format_truncate_links_explain'], ! 'S_COMMENT_FORMAT_TRUNCATE_LINKS_YES' => $format_comment_truncate_links_yes, ! 'S_COMMENT_FORMAT_TRUNCATE_LINKS_NO' => $format_comment_truncate_links_no, ! ! 'L_COMMENTS_PAG' => $lang['Comments_pag'], ! 'L_COMMENTS_PAG_EXPLAIN' => $lang['Comments_pag_explain'], ! 'COMMENTS_PAG' => $comments_pag, ! ! 'L_DEL_TOPIC' => $lang['Del_topic'], ! 'L_DEL_TOPIC_EXPLAIN' => $lang['Del_topic_explain'], ! 'S_DEL_TOPIC_YES' => $del_topic_yes, ! 'S_DEL_TOPIC_NO' => $del_topic_no, ! // ! // Ratings ! // ! 'L_RATINGS_TITLE' => $lang['Ratings_title'], ! 'L_RATINGS_TITLE_EXPLAIN' => $lang['Ratings_title_explain'], + 'L_USE_RATINGS' => $lang['Use_ratings'], + 'L_USE_RATINGS_EXPLAIN' => $lang['Use_ratings_explain'], + 'S_USE_RATINGS_YES' => $use_ratings_yes, + 'S_USE_RATINGS_NO' => $use_ratings_no, + + 'L_VOTES_CHECK_IP' => $lang['Votes_check_ip'], + 'L_VOTES_CHECK_IP_EXPLAIN' => $lang['Votes_check_ip_explain'], + 'S_VOTES_CHECK_IP_YES' => $votes_check_ip_yes, + 'S_VOTES_CHECK_IP_NO' => $votes_check_ip_no, + + 'L_VOTES_CHECK_USERID' => $lang['Votes_check_userid'], + 'L_VOTES_CHECK_USERID_EXPLAIN' => $lang['Votes_check_userid_explain'], + 'S_VOTES_CHECK_USERID_YES' => $votes_check_userid_yes, + 'S_VOTES_CHECK_USERID_NO' => $votes_check_userid_no, + + // + // Instructions + // + 'L_INSTRUCTIONS_TITLE' => $lang['Instructions_title'], + + 'L_SHOW' => $lang['Show'], + 'L_HIDE' => $lang['Hide'], + 'L_PRE_TEXT_NAME' => $lang['Pre_text_name'], + 'L_PRE_TEXT_HEADER' => $lang['Pre_text_header'], + 'L_PRE_TEXT_BODY' => $lang['Pre_text_body'], + 'L_PRE_TEXT_EXPLAIN' => $lang['Pre_text_explain'], + 'S_SHOW_PRETEXT' => $pretext_show, + 'S_HIDE_PRETEXT' => $pretext_hide, + 'L_PT_HEADER' => $pt_header, + 'L_PT_BODY' => $pt_body, + + // + // Notifications + // + 'L_NOTIFICATIONS_TITLE' => $lang['Notifications_title'], + + 'L_NOTIFY' => $lang['Notify'], + 'L_NOTIFY_EXPLAIN' => $lang['Notify_explain'], + 'L_EMAIL' => $lang['Email'], + 'L_PM' => $lang['PM'], + 'S_NOTIFY_NONE' => $notify_none, + 'S_NOTIFY_EMAIL' => $notify_email, + 'S_NOTIFY_PM' => $notify_pm, + + 'L_NOTIFY_GROUP' => $lang['Notify_group'], + 'L_NOTIFY_GROUP_EXPLAIN' => $lang['Notify_group_explain'], + 'NOTIFY_GROUP' => $notify_group_list, + + // + // Permissions + // + 'L_PERMISSION_SETTINGS' => $lang['Permission_settings'], + + 'L_ATUH_SEARCH' => $lang['Auth_search'], + 'L_ATUH_SEARCH_INFO' => $lang['Auth_search_explain'], + 'S_ATUH_SEARCH' => $auth_select['auth_search'], + + 'L_ATUH_STATS' => $lang['Auth_stats'], + 'L_ATUH_STATS_INFO' => $lang['Auth_stats_explain'], + 'S_ATUH_STATS' => $auth_select['auth_stats'], + + 'L_ATUH_TOPLIST' => $lang['Auth_toplist'], + 'S_ATUH_TOPLIST' => $auth_select['auth_toplist'], + 'L_ATUH_TOPLIST_INFO' => $lang['Auth_toplist_explain'], + + 'L_ATUH_VIEWALL' => $lang['Auth_viewall'], + 'L_ATUH_VIEWALL_INFO' => $lang['Auth_viewall_explain'], + 'S_ATUH_VIEWALL' => $auth_select['auth_viewall'], + + )); + + // // Output + // include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); $template->pparse( 'admin' ); Index: admin_pa_catauth.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_catauth.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin_pa_catauth.php 1 Oct 2005 14:15:19 -0000 1.11 --- admin_pa_catauth.php 8 Dec 2005 15:15:11 -0000 1.12 *************** *** 226,230 **** $pafiledb_template->display( 'body' ); $pafiledb->_pafiledb(); ! $cache->unload(); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 226,230 ---- $pafiledb_template->display( 'body' ); $pafiledb->_pafiledb(); ! $pafiledb_cache->unload(); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/admin/mx_module_defs.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_module_defs.php 24 Oct 2005 20:16:56 -0000 1.3 --- mx_module_defs.php 8 Dec 2005 15:15:11 -0000 1.4 *************** *** 121,125 **** // $data = ( !empty( $parameter_data['parameter_value'] ) ) ? $parameter_data['parameter_value'] : ''; ! $parameter_datas = $this->jumpmenu_option( 0, 0, array( $data => 1 ), false ); // --- 121,125 ---- // $data = ( !empty( $parameter_data['parameter_value'] ) ) ? $parameter_data['parameter_value'] : ''; ! $parameter_datas = $this->generate_jumpbox( 0, 0, array( $data => 1 ), false ); // *************** *** 237,241 **** // Get varaibles // ! $pa_map_cat = $this->jumpmenu_option( 0, 0, '', true ); $pa_map_dynid = get_list_formatted( 'block_list', 0, 'map_dyn_id' ); --- 237,241 ---- // Get varaibles // ! $pa_map_cat = $this->generate_jumpbox( 0, 0, '', true ); $pa_map_dynid = get_list_formatted( 'block_list', 0, 'map_dyn_id' ); *************** *** 292,296 **** for( $i = 0; $i < $total_maps; $i++ ) { ! $pa_map_cat_tmp = $this->jumpmenu_option( 0, 0, array( $pa_mapping_data[$i]['map_cat_id'] => 1 ), false ); $pa_map_dynid_id = 'map_dyn_id_'.$i; $pa_map_dynid_tmp = get_list_formatted( 'block_list', $pa_mapping_data[$i]['map_dyn_id'], $pa_map_dynid_id ); --- 292,296 ---- for( $i = 0; $i < $total_maps; $i++ ) { ! $pa_map_cat_tmp = $this->generate_jumpbox( 0, 0, array( $pa_mapping_data[$i]['map_cat_id'] => 1 ), false ); $pa_map_dynid_id = 'map_dyn_id_'.$i; $pa_map_dynid_tmp = get_list_formatted( 'block_list', $pa_mapping_data[$i]['map_dyn_id'], $pa_map_dynid_id ); *************** *** 460,464 **** // $check_upload: if true permission for upload will be checked // =================================================== ! function jumpmenu_option( $cat_id = 0, $depth = 0, $default = '', $for_file = false, $check_upload = false ) { global $db; --- 460,464 ---- // $check_upload: if true permission for upload will be checked // =================================================== ! function generate_jumpbox( $cat_id = 0, $depth = 0, $default = '', $for_file = false, $check_upload = false ) { global $db; *************** *** 515,519 **** $cat_class = ( !$cat['cat_allow_file'] ) ? 'class="greyed"' : ''; $cat_list .= '<option value="' . $sub_cat_id . '"' . $sel . ' ' . $cat_class . ' />' . $pre . $cat_pre . $cat['cat_name'] . '</option>'; ! $cat_list .= $this->jumpmenu_option( $cat['cat_id'], $depth + 1, $default, $for_file, $check_upload ); } } --- 515,519 ---- $cat_class = ( !$cat['cat_allow_file'] ) ? 'class="greyed"' : ''; $cat_list .= '<option value="' . $sub_cat_id . '"' . $sel . ' ' . $cat_class . ' />' . $pre . $cat_pre . $cat['cat_name'] . '</option>'; ! $cat_list .= $this->generate_jumpbox( $cat['cat_id'], $depth + 1, $default, $for_file, $check_upload ); } } Index: admin_pa_custom.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_custom.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_pa_custom.php 1 Oct 2005 14:15:19 -0000 1.13 --- admin_pa_custom.php 8 Dec 2005 15:15:11 -0000 1.14 *************** *** 247,251 **** $pafiledb_template->display( 'admin' ); $pafiledb->_pafiledb(); ! $cache->unload(); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 247,251 ---- $pafiledb_template->display( 'admin' ); $pafiledb->_pafiledb(); ! $pafiledb_cache->unload(); include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); Index: admin_pa_ug_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_ug_auth.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_pa_ug_auth.php 1 Oct 2005 14:15:19 -0000 1.9 --- admin_pa_ug_auth.php 8 Dec 2005 15:15:11 -0000 1.10 *************** *** 941,945 **** $pafiledb->_pafiledb(); ! $cache->unload(); /* - orig --- 941,945 ---- $pafiledb->_pafiledb(); ! $pafiledb_cache->unload(); /* - orig |
|
From: Jon O. <jon...@us...> - 2005-12-08 15:15:33
|
Update of /cvsroot/mxbb/mx_pafiledb/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb/templates/subSilver/admin Modified Files: pa_admin_cat.tpl pa_admin_cat_edit.tpl pa_admin_settings.tpl Log Message: in progress commit for mx_pafiledb Index: pa_admin_settings.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/admin/pa_admin_settings.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pa_admin_settings.tpl 11 Apr 2005 17:55:43 -0000 1.7 --- pa_admin_settings.tpl 8 Dec 2005 15:15:13 -0000 1.8 *************** *** 1,88 **** ! <h1>{L_SETTINGSTITLE}</h1> ! <p>{L_SETTINGSEXPLAIN}</p> ! <form action="{S_SETTINGS_ACTION}" method="post" name="form"> ! <table width="100%" cellpadding="3" cellspacing="1" class="forumline"> ! <tr> ! <th colspan="2" class="thHead">{L_SETTINGS}</th> ! </tr> ! <tr> ! <td width="50%" class="row1">{L_DBNAME}<br><span class="gensmall">{L_DBNAMEINFO}</span></td> ! <td class="row2"><input type="text" class="post" size="50" name="settings_dbname" value="{SETTINGS_DBNAME}" /></td> ! </tr> ! <tr> ! <td class="row1">{L_TOPNUM}<br><span class="gensmall">{L_TOPNUMINFO}</span></td> ! <td class="row2"><input type="text" class="post" size="5" maxlength="5" name="settings_topnumber" value="{SETTINGS_TOPNUMBER}" /></td> ! </tr> ! <tr> ! <td class="row1">{L_NFDAYS}<br><span class="gensmall">{L_NFDAYSINFO}</span></td> ! <td class="row2"><input type="text" class="post" size="5" maxlength="5" name="settings_newdays" value="{SETTINGS_NEWDAYS}" /></td> ! </tr> ! <tr> ! <td class="row1">{L_FILE_IN_PAGE}<br><span class="gensmall">{L_FILE_IN_PAGE_INFO}</span></td> ! <td class="row2"><input type="text" class="post" size="5" maxlength="5" name="settings_file_page" value="{SETTINGS_FILE_PAGE}" /></td> ! </tr> ! <tr> ! <td class="row1">{L_SHOW_VIEWALL}<br><span class="gensmall">{L_VIEWALL_INFO}</span></td> ! <td class="row2"> ! <select name="settings_viewall" class="forminput"> ! <option value="1"{S_VIEW_ALL_YES}>{L_YES}</option> ! <option value="0"{S_VIEW_ALL_NO}>{L_NO}</option> ! </select></td> ! </tr> ! <tr> ! <td class="row1">{L_DISABLE}<br><span class="gensmall">{L_DISABLE_INFO}</span></td> ! <td class="row2"> ! <select name="settings_disable" class="forminput"> ! <option value="1"{S_DISABLE_YES}>{L_YES}</option> ! <option value="0"{S_DISABLE_NO}>{L_NO}</option> ! </select></td> ! </tr> ! <tr> ! <td class="row1">{L_HOTLINK}<br><span class="gensmall">{L_HOTLINK_INFO}</span></td> ! <td class="row2"> ! <select name="hotlink_prevent" class="forminput"> ! <option value="1"{S_HOTLINK_YES}>{L_YES}</option> ! <option value="0"{S_HOTLINK_NO}>{L_NO}</option> ! </select></td> ! </tr> <tr> ! <td class="row1">{L_HOTLINK_ALLOWED}<br><span class="gensmall">{L_HOTLINK_ALLOWED_INFO}</span></td> ! <td class="row2"><input class="post" type="text" size="40" name="hotlink_allowed" value="{HOTLINK_ALLOWED}" /></td> ! </tr> <tr> ! <td class="row1">{L_DEFAULT_SORT_METHOD}</td> ! <td class="row2"> ! <select name="sort_method"> ! <option {SORT_NAME} value='file_name'>{L_NAME}</option> ! <option {SORT_TIME} value='file_time'>{L_DATE}</option> ! <option {SORT_RATING} value='file_rating'>{L_RATING}</option> ! <option {SORT_DOWNLOADS} value='file_dls'>{L_DOWNLOADS}</option> ! <option {SORT_UPDATE_TIME} value='file_update_time'>{L_UPDATE_TIME}</option> ! </select> ! </td> </tr> <tr> ! <td class="row1">{L_DEFAULT_SORT_ORDER}</td> ! <td class="row2"> ! <select name="sort_order"> ! <option {SORT_ASC} value='ASC'>{L_ASC}</option> ! <option {SORT_DESC} value='DESC'>{L_DESC}</option> ! </select> ! </td> </tr> - <tr> - <td class="row1">{L_PHP_TPL}<br><span class="gensmall">{L_PHP_TPL_INFO}</span></td> - <td class="row2"> - <select name="settings_tpl_php" class="forminput"> - <option value="1"{S_PHP_TPL_YES}>{L_YES}</option> - <option value="0"{S_PHP_TPL_NO}>{L_NO}</option> - </select></td> - </tr> - <tr> - <td class="row1">{L_MAX_FILE_SIZE}<br><span class="gensmall">{L_MAX_FILE_SIZE_INFO}</span></td> - <td class="row2"><input type="text" class="post" size="8" maxlength="15" name="max_file_size" value="{MAX_FILE_SIZE}" /> {S_FILESIZE}</td> - </tr> <tr> <td class="row1">{L_UPLOAD_DIR}<br /><span class="gensmall">{L_UPLOAD_DIR_EXPLAIN}</span></td> --- 1,24 ---- ! <h1>{L_CONFIGURATION_TITLE}</h1> ! <p>{L_CONFIGURATION_EXPLAIN}</p> ! <form action="{S_ACTION}" method="post"> ! <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline"> <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_GENERAL_TITLE}</th> ! </tr> <tr> ! <td class="row1" width="50%">{L_MODULE_NAME}<br /><span class="gensmall">{L_MODULE_NAME_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input text="text" name="module_name" value="{MODULE_NAME}" size="20" maxlength="50" /></td> </tr> <tr> ! <td class="row1" width="50%">{L_ENABLE_MODULE}<br /><span class="gensmall">{L_ENABLE_MODULE_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="enable_module" value="1" {S_ENABLE_MODULE_YES} /> {L_YES} <input type="radio" name="enable_module" value="0" {S_ENABLE_MODULE_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_WYSIWYG_PATH}<br /><span class="gensmall">{L_WYSIWYG_PATH_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input text="text" name="wysiwyg_path" value="{WYSIWYG_PATH}" size="20" maxlength="50" /></td> </tr> <tr> <td class="row1">{L_UPLOAD_DIR}<br /><span class="gensmall">{L_UPLOAD_DIR_EXPLAIN}</span></td> *************** *** 94,208 **** </tr> <tr> <td class="row1">{L_FORBIDDEN_EXTENSIONS}<br /><span class="gensmall">{L_FORBIDDEN_EXTENSIONS_EXPLAIN}</span></td> <td class="row2"><input type="text" size="25" maxlength="100" name="forbidden_extensions" class="post" value="{FORBIDDEN_EXTENSIONS}" /></td> </tr> - <tr> - <th colspan="2" class="thHead">{L_PERMISSION_SETTINGS}</th> - </tr> - <tr> - <td class="row1">{L_ATUH_SEARCH}<br><span class="gensmall">{L_ATUH_SEARCH_INFO}</span></td> - <td class="row2">{S_ATUH_SEARCH}</td> - </tr> - <tr> - <td class="row1">{L_ATUH_STATS}<br><span class="gensmall">{L_ATUH_STATS_INFO}</span></td> - <td class="row2">{S_ATUH_STATS}</td> - </tr> - <tr> - <td class="row1">{L_ATUH_TOPLIST}<br><span class="gensmall">{L_ATUH_TOPLIST_INFO}</span></td> - <td class="row2">{S_ATUH_TOPLIST}</td> - </tr> - <tr> - <td class="row1">{L_ATUH_VIEWALL}<br><span class="gensmall">{L_ATUH_VIEWALL_INFO}</span></td> - <td class="row2">{S_ATUH_VIEWALL}</td> - </tr> - <tr> - <th colspan="2" class="thHead">{L_COMMENT_SETTINGS}</th> - </tr> - <tr> - <td class="row1">{L_ALLOW_HTML}</td> - <td class="row2"> - <select name="allow_html" class="forminput"> - <option value="1"{S_ALLOW_HTML_YES}>{L_YES}</option> - <option value="0"{S_ALLOW_HTML_NO}>{L_NO}</option> - </select></td> - </tr> - <tr> - <td class="row1">{L_ALLOW_BBCODE}</td> - <td class="row2"> - <select name="allow_bbcode" class="forminput"> - <option value="1"{S_ALLOW_BBCODE_YES}>{L_YES}</option> - <option value="0"{S_ALLOW_BBCODE_NO}>{L_NO}</option> - </select></td> - </tr> - <tr> - <td class="row1">{L_ALLOW_SMILIES}</span></td> - <td class="row2"> - <select name="allow_smilies" class="forminput"> - <option value="1"{S_ALLOW_SMILIES_YES}>{L_YES}</option> - <option value="0"{S_ALLOW_SMILIES_NO}>{L_NO}</option> - </select></td> - </tr> - <tr> - <td class="row1">{L_ALLOW_LINKS}</td> - <td class="row2"> - <select name="allow_comment_links" class="forminput"> - <option value="1"{S_ALLOW_LINKS_YES}>{L_YES}</option> - <option value="0"{S_ALLOW_LINKS_NO}>{L_NO}</option> - </select></td> - </tr> - <tr> - <td class="row1">{L_LINKS_MESSAGE}<br><span class="gensmall">{L_LINKS_MESSAGE_INFO}</span></td> - <td class="row2"><input type="text" class="post" size="50" name="no_comment_link_message" value="{MESSAGE_LINK}" /></td> - </tr> - <tr> - <td class="row1">{L_ALLOW_IMAGE}</span></td> - <td class="row2"> - <select name="allow_comment_images" class="forminput"> - <option value="1"{S_ALLOW_IMAGES_YES}>{L_YES}</option> - <option value="0"{S_ALLOW_IMAGES_NO}>{L_NO}</option> - </select></td> - </tr> - <tr> - <td class="row1">{L_IMAGE_MESSAGE}<br><span class="gensmall">{L_IMAGE_MESSAGE_INFO}</span></td> - <td class="row2"><input type="text" class="post" size="50" name="no_comment_image_message" value="{MESSAGE_IMAGE}" /></td> - </tr> - <tr> - <td class="row1">{L_MAX_CHAR}<br><span class="gensmall">{L_MAX_CHAR_INFO}</span></td> - <td class="row2"><input type="text" class="post" size="6" name="max_comment_chars" value="{MAX_CHAR}" /></td> - </tr> - <tr> - <th colspan="2" class="thHead">{L_VALIDATION_SETTINGS}</th> - </tr> - <!-- - <tr> - <td class="row1">{L_NEED_VALIDATION}</td> - <td class="row2"> - <select name="need_validation" class="forminput"> - <option value="1"{S_NEED_VALIDATION_YES}>{L_YES}</option> - <option value="0"{S_NEED_VALIDATION_NO}>{L_NO}</option> - </select></td> - </tr> <tr> ! <td class="row1">{L_VALIDATOR}</td> ! <td class="row2"> ! <select name="validator"> ! <option {VALIDATOR_ADMIN} value='validator_admin'>{L_VALIDATOR_ADMIN_OPTION}</option> ! <option {VALIDATOR_MOD} value='validator_mod'>{L_VALIDATOR_MOD_OPTION}</option> ! </select> ! </td> </tr> ! --> ! <tr> ! <td class="row1">{L_PM_NOTIFY}</td> ! <td class="row2"> ! <select name="pm_notify" class="forminput"> ! <option value="1"{S_PM_NOTIFY_YES}>{L_YES}</option> ! <option value="0"{S_PM_NOTIFY_NO}>{L_NO}</option> ! </select></td> ! </tr> ! <tr> ! <td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" /> <input type="reset" value="{L_RESET}" class="liteoption" /> ! </td> ! </tr> ! </table> ! </form> --- 30,232 ---- </tr> <tr> + <!-- TITLE ------------------------------------------------------------------------------------------- --> + <th class="thHead" colspan="2"> {L_FILE_TITLE}</th> + </tr> + <tr> + <td class="row1">{L_HOTLINK}<br><span class="gensmall">{L_HOTLINK_INFO}</span></td> + <td class="row2" width="50%"><input type="radio" name="hotlink_prevent" value="1" {S_HOTLINK_YES} /> {L_YES} <input type="radio" name="hotlink_prevent" value="0" {S_HOTLINK_NO} /> {L_NO}</td> + </tr> + <tr> + <td class="row1">{L_HOTLINK_ALLOWED}<br><span class="gensmall">{L_HOTLINK_ALLOWED_INFO}</span></td> + <td class="row2"><input class="post" type="text" size="40" name="hotlink_allowed" value="{HOTLINK_ALLOWED}" /></td> + </tr> + <tr> + <td class="row1">{L_PHP_TPL}<br><span class="gensmall">{L_PHP_TPL_INFO}</span></td> + <td class="row2" width="50%"><input type="radio" name="settings_tpl_php" value="1" {S_PHP_TPL_YES} /> {L_YES} <input type="radio" name="settings_tpl_php" value="0" {S_PHP_TPL_NO} /> {L_NO}</td> + </tr> + <tr> + <td class="row1">{L_MAX_FILE_SIZE}<br><span class="gensmall">{L_MAX_FILE_SIZE_INFO}</span></td> + <td class="row2"><input type="text" class="post" size="8" maxlength="15" name="max_file_size" value="{MAX_FILE_SIZE}" /> {S_FILESIZE}</td> + </tr> + <tr> <td class="row1">{L_FORBIDDEN_EXTENSIONS}<br /><span class="gensmall">{L_FORBIDDEN_EXTENSIONS_EXPLAIN}</span></td> <td class="row2"><input type="text" size="25" maxlength="100" name="forbidden_extensions" class="post" value="{FORBIDDEN_EXTENSIONS}" /></td> </tr> <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_APPEARANCE_TITLE}</th> </tr> ! <tr> ! <td class="row1" width="50%">{L_PAGINATION}<br /><span class="gensmall">{L_PAGINATION_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input class="post" type="text" name="pagination" value="{PAGINATION}" size="5" maxlength="4" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_SORT_METHOD}<br /><span class="gensmall">{L_SORT_METHOD_EXPLAIN}</span></td> ! <td class="row2" width="50%">{SORT_METHOD} </td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_SORT_ORDER}<br /><span class="gensmall">{L_SORT_ORDER_EXPLAIN}</span></td> ! <td class="row2" width="50%">{SORT_ORDER} </td> ! </tr> ! <tr> ! <td class="row1">{L_TOPNUM}<br><span class="gensmall">{L_TOPNUMINFO}</span></td> ! <td class="row2"><input type="text" class="post" size="5" maxlength="5" name="settings_topnumber" value="{SETTINGS_TOPNUMBER}" /></td> ! </tr> ! <tr> ! <td class="row1">{L_NFDAYS}<br><span class="gensmall">{L_NFDAYSINFO}</span></td> ! <td class="row2"><input type="text" class="post" size="5" maxlength="5" name="settings_newdays" value="{SETTINGS_NEWDAYS}" /></td> ! </tr> ! <tr> ! <td class="row1">{L_SHOW_VIEWALL}<br><span class="gensmall">{L_VIEWALL_INFO}</span></td> ! <td class="row2" width="50%"><input type="radio" name="settings_viewall" value="1" {S_VIEW_ALL_YES} /> {L_YES} <input type="radio" name="settings_viewall" value="0" {S_VIEW_ALL_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_COMMENTS_TITLE}<br /><span class="gensmall">{L_COMMENTS_TITLE_EXPLAIN}</span></th> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_USE_COMMENTS}<br /><span class="gensmall">{L_USE_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="use_comments" value="1" {S_USE_COMMENTS_YES} /> {L_YES} <input type="radio" name="use_comments" value="0" {S_USE_COMMENTS_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} /> {L_INTERNAL_COMMENTS_PHPBB}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_COMMENTS_PAG}<br /><span class="gensmall">{L_COMMENTS_PAG_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input class="post" type="text" name="comments_pagination" value="{COMMENTS_PAG}" size="5" maxlength="4" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_AUTOGENERATE_COMMENTS}<br /><span class="gensmall">{L_AUTOGENERATE_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="autogenerate_comments" value="1" {S_AUTOGENERATE_COMMENTS_YES} /> {L_YES} <input type="radio" name="autogenerate_comments" value="0" {S_AUTOGENERATE_COMMENTS_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_DEL_TOPIC}<br /><span class="gensmall">{L_DEL_TOPIC_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="del_topic" value="1" {S_DEL_TOPIC_YES} /> {L_YES} <input type="radio" name="del_topic" value="0" {S_DEL_TOPIC_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ALLOW_COMMENT_WYSIWYG}<br /><span class="gensmall">{L_ALLOW_COMMENT_WYSIWYG_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="allow_comment_wysiwyg" value="1" {S_ALLOW_COMMENT_WYSIWYG_YES} /> {L_YES} <input type="radio" name="allow_comment_wysiwyg" value="0" {S_ALLOW_COMMENT_WYSIWYG_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ALLOW_COMMENT_HTML}<br /><span class="gensmall">{L_ALLOW_COMMENT_HTML_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input class="radio" type="radio" name="allow_comment_html" value="1" {S_ALLOW_COMMENT_HTML_YES} /> {L_YES} <input type="radio" name="allow_comment_html" value="0" {S_ALLOW_COMMENT_HTML_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ALLOWED_COMMENT_HTML_TAGS}<br /><span class="gensmall">{L_ALLOWED_HTML_TAGS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input text="text" name="allowed_comment_html_tags" value="{ALLOWED_COMMENT_HTML_TAGS}" size="15" maxlength="50" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ALLOW_COMMENT_BBCODE}<br /><span class="gensmall">{L_ALLOW_BBCODE_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="allow_comment_bbcode" value="1" {S_ALLOW_COMMENT_BBCODE_YES} /> {L_YES} <input type="radio" name="allow_comment_bbcode" value="0" {S_ALLOW_COMMENT_BBCODE_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ALLOW_COMMENT_SMILIES}<br /><span class="gensmall">{L_ALLOW_SMILIES_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="allow_comment_smilies" value="1" {S_ALLOW_COMMENT_SMILIES_YES} /> {L_YES} <input type="radio" name="allow_comment_smilies" value="0" {S_ALLOW_COMMENT_SMILIES_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ALLOW_COMMENT_IMAGES}<br /><span class="gensmall">{L_ALLOW_IMAGES_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="allow_comment_images" value="1" {S_ALLOW_COMMENT_IMAGES_YES} /> {L_YES} <input type="radio" name="allow_comment_images" value="0" {S_ALLOW_COMMENT_IMAGES_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1">{L_COMMENT_IMAGES_MESSAGE}<br><span class="gensmall">{L_COMMENT_IMAGES_MESSAGE_EXPLAIN}</span></td> ! <td class="row2"><input type="text" class="post" size="50" name="no_comment_image_message" value="{COMMENT_MESSAGE_IMAGE}" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ALLOW_COMMENT_LINKS}<br /><span class="gensmall">{L_ALLOW_COMMENT_LINKS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="allow_comment_links" value="1" {S_ALLOW_COMMENT_LINKS_YES} /> {L_YES} <input type="radio" name="allow_comment_links" value="0" {S_ALLOW_COMMENT_LINKS_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1">{L_COMMENT_LINKS_MESSAGE}<br><span class="gensmall">{L_COMMENT_LINKS_MESSAGE_EXPLAIN}</span></td> ! <td class="row2"><input type="text" class="post" size="50" name="no_comment_link_message" value="{COMMENT_MESSAGE_LINK}" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_COMMENT_FORMAT_WORDWRAP}<br /><span class="gensmall">{L_COMMENT_FORMAT_WORDWRAP_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="formatting_comment_wordwrap" value="1" {S_COMMENT_FORMAT_WORDWRAP_YES} /> {L_YES} <input type="radio" name="formatting_comment_wordwrap" value="0" {S_COMMENT_FORMAT_WORDWRAP_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1">{L_COMMENT_FORMAT_IMAGE_RESIZE}<br><span class="gensmall">{L_COMMENT_FORMAT_IMAGE_RESIZE_EXPLAIN}</span></td> ! <td class="row2"><input type="text" class="post" size="50" name="formatting_comment_image_resize" value="{COMMENT_FORMAT_IMAGE_RESIZE}" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_COMMENT_FORMAT_TRUNCATE_LINKS}<br /><span class="gensmall">{L_COMMENT_FORMAT_TRUNCATE_LINKS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="formatting_comment_truncate_links" value="1" {S_COMMENT_FORMAT_TRUNCATE_LINKS_YES} /> {L_YES} <input type="radio" name="formatting_comment_truncate_links" value="0" {S_COMMENT_FORMAT_TRUNCATE_LINKS_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1">{L_COMMENT_MAX_SUBJECT_CHAR}<br><span class="gensmall">{L_COMMENT_MAX_SUBJECT_CHAR_EXPLAIN}</span></td> ! <td class="row2"><input type="text" class="post" size="50" name="max_comment_subject_chars" value="{COMMENT_MAX_SUBJECT_CHAR}" /></td> ! </tr> ! <tr> ! <td class="row1">{L_COMMENT_MAX_CHAR}<br><span class="gensmall">{L_COMMENT_MAX_CHAR_EXPLAIN}</span></td> ! <td class="row2"><input type="text" class="post" size="50" name="max_comment_chars" value="{COMMENT_MAX_CHAR}" /></td> ! </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_RATINGS_TITLE}<br /><span class="gensmall">{L_RATINGS_TITLE_EXPLAIN}</span></th> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_USE_RATINGS}<br /><span class="gensmall">{L_USE_RATINGS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="use_ratings" value="1" {S_USE_RATINGS_YES} /> {L_YES} <input type="radio" name="use_ratings" value="0" {S_USE_RATINGS_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_VOTES_CHECK_IP}<br /><span class="gensmall">{L_VOTES_CHECK_IP_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="votes_check_ip" value="1" {S_VOTES_CHECK_IP_YES} /> {L_YES} <input type="radio" name="votes_check_ip" value="0" {S_VOTES_CHECK_IP_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_VOTES_CHECK_USERID}<br /><span class="gensmall">{L_VOTES_CHECK_USERID_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="votes_check_userid" value="1" {S_VOTES_CHECK_USERID_YES} /> {L_YES} <input type="radio" name="votes_check_userid" value="0" {S_VOTES_CHECK_USERID_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_INSTRUCTIONS_TITLE}</th> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_PRE_TEXT_NAME}<br /><span class="gensmall">{L_PRE_TEXT_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="show_pretext" value="1" {S_SHOW_PRETEXT} /> {L_SHOW} <input type="radio" name="show_pretext" value="0" {S_HIDE_PRETEXT} /> {L_HIDE}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_PRE_TEXT_HEADER}</td> ! <td class="row2" width="50%"><input text="text" name="pt_header" value="{L_PT_HEADER}" size="40" maxlength="100" /></td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_PRE_TEXT_BODY}</td> ! <td class="row2" width="50%"><textarea name="pt_body" cols="40" rows="5">{L_PT_BODY}</textarea></td> ! </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_NOTIFICATIONS_TITLE}</th> ! </tr> ! ! <tr> ! <td class="row1" width="50%">{L_NOTIFY}<br /><span class="gensmall">{L_NOTIFY_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="notify" value="0" {S_NOTIFY_NONE} />{L_NONE} <input type="radio" name="notify" value="2" {S_NOTIFY_EMAIL} />{L_EMAIL} <input type="radio" name="notify" value="1" {S_NOTIFY_PM} />{L_PM}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_NOTIFY_GROUP}<br /><span class="gensmall">{L_NOTIFY_GROUP_EXPLAIN}</span></td> ! <td class="row2" width="50%">{NOTIFY_GROUP}</td> ! </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th colspan="2" class="thHead"> {L_PERMISSION_SETTINGS}</th> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ATUH_SEARCH}<br><span class="gensmall">{L_ATUH_SEARCH_INFO}</span></td> ! <td class="row2" width="50%">{S_ATUH_SEARCH}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ATUH_STATS}<br><span class="gensmall">{L_ATUH_STATS_INFO}</span></td> ! <td class="row2" width="50%">{S_ATUH_STATS}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ATUH_TOPLIST}<br><span class="gensmall">{L_ATUH_TOPLIST_INFO}</span></td> ! <td class="row2" width="50%">{S_ATUH_TOPLIST}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_ATUH_VIEWALL}<br><span class="gensmall">{L_ATUH_VIEWALL_INFO}</span></td> ! <td class="row2" width="50%">{S_ATUH_VIEWALL}</td> ! </tr> ! <tr> ! <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> <input type="reset" value="{L_RESET}" class="liteoption" /></td> ! </tr> ! </table> ! </form> \ No newline at end of file Index: pa_admin_cat_edit.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/admin/pa_admin_cat_edit.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pa_admin_cat_edit.tpl 1 May 2004 23:29:16 -0000 1.4 --- pa_admin_cat_edit.tpl 8 Dec 2005 15:15:13 -0000 1.5 *************** *** 64,81 **** </td> </tr> ! <tr> ! <td class="row1">{L_CAT_ALLOWCOMMENTS}<br><span class="gensmall">{L_CAT_ALLOWCOMMENTS_INFO}</span></td> ! <td class="row2"> ! <input type="radio" name="cat_allow_comments" value="1" {CHECKED_ALLOWCOMMENTS_YES}>{L_YES} ! <input type="radio" name="cat_allow_comments" value="0" {CHECKED_ALLOWCOMMENTS_NO}>{L_NO} ! </td> ! </tr> ! <tr> ! <td class="row1">{L_CAT_ALLOWRATINGS}<br><span class="gensmall">{L_CAT_ALLOWRATINGS_INFO}</span></td> ! <td class="row2"> ! <input type="radio" name="cat_allow_ratings" value="1" {CHECKED_ALLOWRATINGS_YES}>{L_YES} ! <input type="radio" name="cat_allow_ratings" value="0" {CHECKED_ALLOWRATINGS_NO}>{L_NO} ! </td> ! </tr> <tr> <td align="center" class="cat" colspan="2"> --- 64,115 ---- </td> </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_COMMENTS_TITLE}</th> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_USE_COMMENTS}<br /><span class="gensmall">{L_USE_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="cat_allow_comments" value="-1" {S_USE_COMMENTS_DEFAULT} /> {L_DEFAULT} <input type="radio" name="cat_allow_comments" value="1" {S_USE_COMMENTS_YES} /> {L_YES} <input type="radio" name="cat_allow_comments" value="0" {S_USE_COMMENTS_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_INTERNAL_COMMENTS}<br /><span class="gensmall">{L_INTERNAL_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="internal_comments" value="-1" {S_INTERNAL_COMMENTS_DEFAULT} /> {L_DEFAULT} <input type="radio" name="internal_comments" value="1" {S_INTERNAL_COMMENTS_INTERNAL} /> {L_INTERNAL_COMMENTS_INTERNAL} <input type="radio" name="internal_comments" value="0" {S_INTERNAL_COMMENTS_PHPBB} /> {L_INTERNAL_COMMENTS_PHPBB}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_FORUM_ID}<br /><span class="gensmall">{L_FORUM_ID_EXPLAIN}</span></td> ! <td class="row2" width="50%">{FORUM_LIST}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_AUTOGENERATE_COMMENTS}<br /><span class="gensmall">{L_AUTOGENERATE_COMMENTS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="autogenerate_comments" value="-1" {S_AUTOGENERATE_COMMENTS_DEFAULT} /> {L_DEFAULT} <input type="radio" name="autogenerate_comments" value="1" {S_AUTOGENERATE_COMMENTS_YES} /> {L_YES} <input type="radio" name="autogenerate_comments" value="0" {S_AUTOGENERATE_COMMENTS_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_RATINGS_TITLE}</th> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_USE_RATINGS}<br /><span class="gensmall">{L_USE_RATINGS_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="cat_allow_ratings" value="-1" {S_USE_RATINGS_DEFAULT} /> {L_DEFAULT} <input type="radio" name="cat_allow_ratings" value="1" {S_USE_RATINGS_YES} /> {L_YES} <input type="radio" name="cat_allow_ratings" value="0" {S_USE_RATINGS_NO} /> {L_NO}</td> ! </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_INSTRUCTIONS_TITLE}</th> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_PRE_TEXT_NAME}<br /><span class="gensmall">{L_PRE_TEXT_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="show_pretext" value="-1" {S_DEFAULT_PRETEXT} /> {L_DEFAULT} <input type="radio" name="show_pretext" value="1" {S_SHOW_PRETEXT} /> {L_SHOW} <input type="radio" name="show_pretext" value="0" {S_HIDE_PRETEXT} /> {L_HIDE}</td> ! </tr> ! <tr> ! <!-- TITLE ------------------------------------------------------------------------------------------- --> ! <th class="thHead" colspan="2"> {L_NOTIFICATIONS_TITLE}</th> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_NOTIFY}<br /><span class="gensmall">{L_NOTIFY_EXPLAIN}</span></td> ! <td class="row2" width="50%"><input type="radio" name="notify" value="-1" {S_NOTIFY_DEFAULT} />{L_DEFAULT} <input type="radio" name="notify" value="0" {S_NOTIFY_NONE} />{L_NONE} <input type="radio" name="notify" value="2" {S_NOTIFY_EMAIL} />{L_EMAIL} <input type="radio" name="notify" value="1" {S_NOTIFY_PM} />{L_PM}</td> ! </tr> ! <tr> ! <td class="row1" width="50%">{L_NOTIFY_GROUP}<br /><span class="gensmall">{L_NOTIFY_GROUP_EXPLAIN}</span></td> ! <td class="row2" width="50%">{NOTIFY_GROUP}</td> ! </tr> <tr> <td align="center" class="cat" colspan="2"> Index: pa_admin_cat.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/admin/pa_admin_cat.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pa_admin_cat.tpl 8 Dec 2003 00:24:39 -0000 1.2 --- pa_admin_cat.tpl 8 Dec 2005 15:15:13 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- <p>{L_CAT_EXPLAIN}</p> + <form method="post" action="{S_CAT_ACTION}"> <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> |
|
From: Jon O. <jon...@us...> - 2005-12-08 15:15:29
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb/pafiledb/docs Removed Files: index.htm install.txt pafiledb_installer.php pafiledb_mysql.sql update.txt update_0.0.8_0.0.9a.txt update_0.0.8_0.0.9b.txt update_008_009d.sql update_009a_009d.sql update_009b_009d.sql update_009d_mx10.sql update_009d_mx201.sql Log Message: in progress commit for mx_pafiledb --- update_009b_009d.sql DELETED --- --- update_008_009d.sql DELETED --- --- update_009d_mx10.sql DELETED --- --- update.txt DELETED --- --- install.txt DELETED --- --- update_009d_mx201.sql DELETED --- --- update_009a_009d.sql DELETED --- --- update_0.0.8_0.0.9a.txt DELETED --- --- pafiledb_installer.php DELETED --- --- update_0.0.8_0.0.9b.txt DELETED --- --- pafiledb_mysql.sql DELETED --- --- index.htm DELETED --- |
2 messages has been excluded from this view by a project administrator.
