Menu
▾
▴
[mxbb-commits] mx_pafiledb db_install.php,1.12,1.13 db_upgrade.php,1.5,1.6 dload.php,1.8,1.9
|
From: Jon O. <jon...@us...> - 2005-04-11 17:56:21
|
Update of /cvsroot/mxbb/mx_pafiledb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2875/modules/mx_pafiledb Modified Files: db_install.php db_upgrade.php dload.php Log Message: finally upgrading this module/mod - merging phpBB mod, mxBB module (2.7.x and 2.8) -.permissions reviewed - pm notification added - and many many minor fixes all over the place Index: dload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dload.php 6 Mar 2005 15:17:50 -0000 1.8 --- dload.php 11 Apr 2005 17:55:40 -0000 1.9 *************** *** 16,65 **** * (at your option) any later version. */ ! /* - orig ! define('IN_PHPBB', true); ! define('IN_DOWNLOAD', true); ! $phpbb_root_path = './'; ! include($phpbb_root_path . 'extension.inc'); ! include($phpbb_root_path . 'common.'.$phpEx); ! */ ! // MX ! if ( !function_exists( 'read_block_config' ) ) { define( 'IN_PORTAL', true ); ! $mx_root_path = '../../'; ! include_once( $mx_root_path . 'extension.inc' ); ! include_once( $mx_root_path . 'common.' . $phpEx ); // Start session management ! $userdata = session_pagestart( $user_ip, PAGE_INDEX ); ! mx_init_userprefs( $userdata ); // End session management ! ! $block_id = ( !empty( $HTTP_GET_VARS['block_id'] ) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id']; ! if ( empty( $block_id ) ) { ! $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE block_title = 'PafileDB' LIMIT 1"; ! if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, "Could not query PafileDB module information", "", __LINE__, __FILE__, $sql ); } ! $row = $db->sql_fetchrow( $result ); ! $block_id = $row['block_id']; } ! $is_block = false; ! } ! else ! { ! ! // Read block Configuration ! $block_config = read_block_config( $block_id ); ! $title = $block_config[$block_id]['block_title']; ! $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' ); ! ! $is_block = true; ! global $images; } --- 16,89 ---- * (at your option) any later version. */ ! ! // Switch for making this run as a phpBB MOD or mxBB module ! ! if ( file_exists( './viewtopic.php' ) ) // -------------------------------------------- phpBB MOD MODE { + define( 'MXBB_MODULE', false ); + define( 'IN_PHPBB', true ); define( 'IN_PORTAL', true ); ! define( 'IN_DOWNLOAD', true ); ! ! // When run as a phpBB mod these paths are identical ;) ! $phpbb_root_path = $module_root_path = $mx_root_path = './'; ! ! include( $phpbb_root_path . 'extension.inc' ); ! include( $phpbb_root_path . 'common.' . $phpEx ); ! ! include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); ! ! define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;) // Start session management ! $userdata = session_pagestart( $user_ip, PAGE_DOWNLOAD ); ! init_userprefs( $userdata ); // End session management ! } ! else ! { ! define( 'MXBB_MODULE', true ); ! ! if ( !function_exists( 'read_block_config' ) ) { ! define( 'IN_PORTAL', true ); ! $mx_root_path = '../../'; ! include_once( $mx_root_path . 'extension.inc' ); ! include_once( $mx_root_path . 'common.' . $phpEx ); ! ! // Start session management ! ! $userdata = session_pagestart( $user_ip, PAGE_INDEX ); ! mx_init_userprefs( $userdata ); ! ! // End session management ! ! $block_id = ( !empty( $HTTP_GET_VARS['block_id'] ) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id']; ! if ( empty( $block_id ) ) { ! $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE block_title = 'PafileDB' LIMIT 1"; ! if ( !$result = $db->sql_query( $sql ) ) ! { ! message_die( GENERAL_ERROR, "Could not query PafileDB module information", "", __LINE__, __FILE__, $sql ); ! } ! $row = $db->sql_fetchrow( $result ); ! $block_id = $row['block_id']; } ! $is_block = false; } ! else ! { ! // Read block Configuration ! $block_config = read_block_config( $block_id ); ! $title = $block_config[$block_id]['block_title']; ! $block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' ); ! $is_block = true; ! global $images; ! } ! define( 'MXBB_27x', file_exists( $mx_root_path . 'more_smilies.php' ) ); } Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_install.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** db_install.php 18 Mar 2005 18:14:38 -0000 1.12 --- db_install.php 11 Apr 2005 17:55:39 -0000 1.13 *************** *** 22,32 **** define( 'IN_PORTAL', true ); ! $mx_module_version = 'mxBB pafileDB Module 2.0.0'; ! $mx_module_copy = 'Based on <a href="http://www.phparena.net/" target="_phpbb" >PHP Arena, pafileDB 3.1</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=56035" target="_phpbb" >Mohd pafileDB 0.0.9d</a>'; if ( !defined( 'IN_ADMIN' ) ) { - $mx_root_path = '../../'; include( $mx_root_path . 'extension.inc' ); include( $mx_root_path . 'common.' . $phpEx ); --- 22,32 ---- define( 'IN_PORTAL', true ); + $mx_root_path = './../'; ! $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>'; if ( !defined( 'IN_ADMIN' ) ) { include( $mx_root_path . 'extension.inc' ); include( $mx_root_path . 'common.' . $phpEx ); *************** *** 46,49 **** --- 46,58 ---- // End session management } + + // For compatibility with core 2.7.+ + define( 'MXBB_27x', file_exists( $mx_root_path . 'more_smilies.php' ) ); + + if ( MXBB_27x ) + { + include_once( $mx_root_path . 'modules/mx_pafiledb/pafiledb/includes/functions_mx.' . $phpEx ); + } + // If fresh install if ( !$result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "pa_config" ) ) *************** *** 62,240 **** "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_mirrors ", "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_files ", // 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_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(1) DEFAULT '0' NOT NULL, ! auth_delete_file tinyint(1) 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', ! 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)", ! "INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (2, 'Test Category', '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)", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('allow_comment_images', '0')", --- 71,252 ---- "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_mirrors ", "DROP TABLE IF EXISTS " . $mx_table_prefix . "pa_files ", + // 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')", *************** *** 259,268 **** "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('sort_method', 'file_time')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('sort_order', 'DESC')", - // Added by Haplo - // "INSERT INTO ".$mx_table_prefix."pa_config VALUES ('user_approval','1')", - "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('need_validation', '0')", - "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('validator', 'validator_admin')", "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')", --- 271,275 ---- *************** *** 275,282 **** ); ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " SET module_version = '" . $mx_module_version . "', module_copy = '" . $mx_module_copy . "' WHERE module_id = '" . $mx_module_id . "'"; $message .= mx_do_install_upgrade( $sql ); --- 282,292 ---- ); ! if ( !MXBB_27x ) ! { ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " SET module_version = '" . $mx_module_version . "', module_copy = '" . $mx_module_copy . "' WHERE module_id = '" . $mx_module_id . "'"; + } $message .= mx_do_install_upgrade( $sql ); Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_upgrade.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** db_upgrade.php 6 Mar 2005 01:13:11 -0000 1.5 --- db_upgrade.php 11 Apr 2005 17:55:40 -0000 1.6 *************** *** 22,28 **** define( 'IN_PORTAL', true ); ! $mx_module_version = 'mxBB pafileDB Module 2.0.0'; ! $mx_module_copy = 'Based on <a href="http://www.phparena.net/" target="_phpbb" >PHP Arena, pafileDB 3.1</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=56035" target="_phpbb" >Mohd pafileDB 0.0.9d</a>'; if ( !defined( 'IN_ADMIN' ) ) --- 22,29 ---- define( 'IN_PORTAL', true ); + $mx_root_path = './../'; ! $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>'; if ( !defined( 'IN_ADMIN' ) ) *************** *** 46,72 **** // End session management } // Precheck if ( $result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "pa_config" ) ) { - $message = "<b>Upgrading! ...</b><br/><br/>"; - $sql = array( - // MX Addon 1.0 - "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_edit_file tinyint(1) DEFAULT '0' NOT NULL AFTER auth_view_file", - "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_delete_file tinyint(1) DEFAULT '0' NOT NULL AFTER auth_edit_file", - "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD cat_allow_ratings tinyint(2) NOT NULL default '1' AFTER cat_allow_file", - "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD cat_allow_comments tinyint(2) NOT NULL default '1' AFTER cat_allow_ratings", ! "ALTER TABLE " . $mx_table_prefix . "pa_auth ADD auth_edit_file tinyint(1) DEFAULT '0' NOT NULL AFTER auth_view_file", ! "ALTER TABLE " . $mx_table_prefix . "pa_auth ADD auth_delete_file tinyint(1) DEFAULT '0' NOT NULL AFTER auth_edit_file", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('need_validation', '0')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('validator', 'validator_admin')", ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('pm_notify', '0')" ! ); ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " SET module_version = '" . $mx_module_version . "', module_copy = '" . $mx_module_copy . "' WHERE module_id = '" . $mx_module_id . "'"; $message .= mx_do_install_upgrade( $sql ); --- 47,129 ---- // End session management } + + // For compatibility with core 2.7.+ + define( 'MXBB_27x', file_exists( $mx_root_path . 'more_smilies.php' ) ); + + if ( MXBB_27x ) + { + include_once( $mx_root_path . 'modules/mx_pafiledb/pafiledb/includes/functions_mx.' . $phpEx ); + } + + $sql = array(); // Precheck if ( $result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "pa_config" ) ) { ! // Upgrade checks ! $upgrade_103 = 0; ! $upgrade_201 = 0; ! ! $message = "<b>Upgrading!</b><br/><br/>"; ! // validate before 1.0.3 ! if ( !$result = $db->sql_query( "SELECT auth_edit_file from " . $mx_table_prefix . "pa_cat" ) ) ! { ! $upgrade_103 = 1; ! $message .= "<b>Upgrading to v. 1.0.3...</b><br/><br/>"; ! } ! else ! { ! $message .= "<b>Validating v. 1.0.3...ok</b><br/><br/>"; ! } ! ! // validate before 2.0.1 ! if ( !$result = $db->sql_query( "SELECT auth_approval from " . $mx_table_prefix . "pa_cat" ) ) ! { ! $upgrade_201 = 1; ! $message .= "<b>Validating v. 2.0.1...ok</b><br/><br/>"; ! } ! else ! { ! $message .= "<b>Validating v. 2.0.1...ok</b><br/><br/>"; ! } ! // ------------------------------------------------------------------------------------------------------ ! if ( $upgrade_103 == 1 ) ! { ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_edit_file tinyint(1) DEFAULT '0' NOT NULL AFTER auth_view_file "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_delete_file tinyint(1) DEFAULT '0' NOT NULL AFTER auth_edit_file "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD cat_allow_ratings tinyint(2) NOT NULL default '1' AFTER cat_allow_file "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD cat_allow_comments tinyint(2) NOT NULL default '1' AFTER cat_allow_ratings "; ! ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth ADD auth_edit_file tinyint(1) DEFAULT '0' NOT NULL AFTER auth_view_file "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth ADD auth_delete_file tinyint(1) DEFAULT '0' NOT NULL AFTER auth_edit_file "; ! ! $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('pm_notify', '0')"; ! } ! ! if ( $upgrade_201 == 1 ) ! { ! ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_approval tinyint(1) DEFAULT '0' NOT NULL AFTER auth_delete_comment "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth ADD auth_approval tinyint(2) DEFAULT '0' NOT NULL AFTER auth_delete_comment "; ! ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth MODIFY auth_edit_file tinyint(2) DEFAULT '0' NOT NULL "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth MODIFY auth_delete_file tinyint(2) DEFAULT '0' NOT NULL "; ! ! // 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 ) ! { ! $sql[] = "UPDATE " . $mx_table_prefix . "module" . " SET module_version = '" . $mx_module_version . "', module_copy = '" . $mx_module_copy . "' WHERE module_id = '" . $mx_module_id . "'"; + } $message .= mx_do_install_upgrade( $sql ); |
