|
From: Jon O. <jon...@us...> - 2006-06-17 20:11:27
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21631/modules/mx_kb Modified Files: db_install.php db_upgrade.php kb.php Log Message: Finalizing this module Index: kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** kb.php 2 May 2006 23:27:19 -0000 1.30 --- kb.php 17 Jun 2006 20:11:23 -0000 1.31 *************** *** 114,117 **** --- 114,119 ---- // ------------------------------------------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------------------------------------------- + // Start + // ------------------------------------------------------------------------------------------------------------------------- // ------------------------------------------------------------------------------------------------------------------------- *************** *** 122,136 **** // =================================================== ! // Get action variable other wise set it to the main // =================================================== $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, 'main'); - - // - // Get more variables - // $print_version = $mx_request_vars->request('print', MX_TYPE_NO_TAGS, ''); $is_admin = ( ( $userdata['user_level'] == ADMIN ) && $userdata['session_logged_in'] ) ? true : 0; - $reader_mode = false; // =================================================== --- 124,137 ---- // =================================================== ! // Get mode variables, otherwise set it to the main // =================================================== $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, 'main'); $print_version = $mx_request_vars->request('print', MX_TYPE_NO_TAGS, ''); + $reader_mode = false; + // =================================================== + // Is admin? + // =================================================== $is_admin = ( ( $userdata['user_level'] == ADMIN ) && $userdata['session_logged_in'] ) ? true : 0; // =================================================== Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** db_install.php 2 May 2006 23:27:19 -0000 1.37 --- db_install.php 17 Jun 2006 20:11:23 -0000 1.38 *************** *** 30,34 **** } ! $mx_module_version = '2.0.2'; $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon</a> :: Adapted for mxBB by <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; --- 30,34 ---- } ! $mx_module_version = '2.8.0'; $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon</a> :: Adapted for mxBB by <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; *************** *** 136,140 **** "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('enable_module', '1')", // allow_new "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('module_name', 'Knowledge Base')", // NEW ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg_path', 'modules/')", // Articles --- 136,140 ---- "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('enable_module', '1')", // allow_new "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('module_name', 'Knowledge Base')", // NEW ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg_path', 'modules/mx_shared/')", // Articles *************** *** 182,185 **** --- 182,186 ---- "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('autogenerate_comments', '1')", // bump_post "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('comments_pagination', '5')", + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('comments_forum_id', '0')", // New // Ratings Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** db_upgrade.php 2 May 2006 23:27:19 -0000 1.30 --- db_upgrade.php 17 Jun 2006 20:11:23 -0000 1.31 *************** *** 30,34 **** } ! $mx_module_version = '2.0.2'; $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon</a> :: Adapted for mxBB by <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; --- 30,34 ---- } ! $mx_module_version = '2.8.0'; $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon</a> :: Adapted for mxBB by <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; *************** *** 58,61 **** --- 58,62 ---- $upgrade_201 = 0; $upgrade_202 = 0; + $upgrade_280 = 0; // mxBB 2.8 branch -> $message = "<b>Upgrading!</b><br/><br/>"; *************** *** 152,155 **** --- 153,168 ---- } + // validate before 2.8.0 + $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "kb_config WHERE config_name = 'comments_forum_id'" ); + if ( $db->sql_numrows( $result ) == 0 ) + { + $upgrade_280 = 1; + $message .= "<b>Upgrading to v. 2.8.0...ok</b><br/><br/>"; + } + else + { + $message .= "<b>Validating v. 2.8.0...ok</b><br/><br/>"; + } + // ------------------------------------------------------------------------------------------------------ if ( $upgrade_105 == 1 ) *************** *** 380,383 **** --- 393,408 ---- $sql[] = "DROP TABLE " . $mx_table_prefix . "kb_wordmatch "; + // + // New + // + $sql[] = "UPDATE " . $mx_table_prefix . "kb_config" . " + SET config_value = 'modules/mx_shared/' + WHERE config_name = 'wysiwyg_path'"; + + } + + if ( $upgrade_280 == 1 ) + { + $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('comments_forum_id', '0')"; } else |