|
From: Jon O. <jon...@us...> - 2005-10-02 20:36:18
|
Update of /cvsroot/mxbb/mx_forum In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv892/modules/mx_forum_ Modified Files: db_install.php db_upgrade.php index.php mx_forum.php mx_install_readme.htm viewtopic.php Log Message: updated all file headers Index: index.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/index.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** index.php 15 Sep 2005 17:59:19 -0000 1.5 --- index.php 1 Oct 2005 14:12:41 -0000 1.6 *************** *** 91,94 **** --- 91,97 ---- // removing them // + //+mxbb_module + /* + //-mxbb_module $total_posts = get_db_stat('postcount'); $total_users = get_db_stat('usercount'); *************** *** 122,126 **** $l_total_user_s = $lang['Registered_users_total']; } ! // --- 125,131 ---- $l_total_user_s = $lang['Registered_users_total']; } ! //+mxbb_module ! */ ! //-mxbb_module // *************** *** 284,291 **** $template->assign_vars(array( ! 'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), ! 'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! 'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . $mx_forum->append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), ! 'FORUM_IMG' => $mx_forum->images['forum'], 'FORUM_NEW_IMG' => $mx_forum->images['forum_new'], --- 289,298 ---- $template->assign_vars(array( ! //+mxbb_module ! //'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), ! //'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! //'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . $mx_forum->append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), ! //-mxbb_module ! 'FORUM_IMG' => $mx_forum->images['forum'], 'FORUM_NEW_IMG' => $mx_forum->images['forum_new'], Index: mx_install_readme.htm =================================================================== RCS file: /cvsroot/mxbb/mx_forum/mx_install_readme.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_install_readme.htm 15 Jan 2005 23:45:37 -0000 1.2 --- mx_install_readme.htm 1 Oct 2005 14:12:41 -0000 1.3 *************** *** 219,227 **** <table> <tr> ! <td colspan="2"><p><b><font size="5">MX Module - mx_forum<br> ! <font size="2">v. 0.9x BETA</font></font></b></p> <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span> <br /> ! - for Mx Portal v. 2.7.5+</p> <p><strong>Author</strong><br /> Haplo<br /> --- 219,227 ---- <table> <tr> ! <td colspan="2"><p><b><font size="5">mxBB Module - phpBB Integration<br> ! <font size="2">v. 1.0.3</font></font></b></p> <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span> <br /> ! - for Mx Portal v. 2.8.1+</p> <p><strong>Author</strong><br /> Haplo<br /> Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/db_upgrade.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** db_upgrade.php 15 Sep 2005 17:59:19 -0000 1.6 --- db_upgrade.php 1 Oct 2005 14:12:41 -0000 1.7 *************** *** 42,55 **** } ! $mx_module_version = 'mxBB phpBB Module 1.0.0'; $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb" >phpBB</a>'; $sql = array(); // Precheck ! if ( $result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "phpbb_plugin_config" ) ) { // Upgrade checks $upgrade_101 = 0; $upgrade_102 = 0; --- 42,58 ---- } ! $mx_module_version = 'mxBB - phpBB Integration Module 1.0.3'; $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb" >phpBB</a>'; $sql = array(); + // // Precheck ! // if ( $result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "phpbb_plugin_config" ) ) { + // // Upgrade checks + // $upgrade_101 = 0; $upgrade_102 = 0; *************** *** 59,76 **** $upgrade_106 = 0; $upgrade_107 = 0; ! /* ! // validate before 1.01 ! if( !$result = $db->sql_query("SELECT article_rating from ".$mx_table_prefix."kb_articles")) ! { ! $upgrade_105 = 1; ! } ! ! // validate before 1.02 ! if( !$result = $db->sql_query("SELECT votes_userid from ".$mx_table_prefix."kb_votes")) ! { ! $upgrade_106 = 1; ! } ! */ // validate before 1.01 $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "phpbb_plugin_config WHERE config_name = 'override_default_pages'" ); if ( $db->sql_numrows( $result ) == 0 ) --- 62,69 ---- $upgrade_106 = 0; $upgrade_107 = 0; ! ! // // validate before 1.01 + // $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "phpbb_plugin_config WHERE config_name = 'override_default_pages'" ); if ( $db->sql_numrows( $result ) == 0 ) *************** *** 106,112 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('profile', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('search', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewforum', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewonline', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewtopic', '0')"; } else if ( $upgrade_102 == 1 ) --- 99,105 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('profile', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('search', '0')"; ! //$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewforum', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewonline', '0')"; ! //$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewtopic', '0')"; } else if ( $upgrade_102 == 1 ) *************** *** 142,148 **** else { ! // If not installed ! $message = "<b>Module is not installed...and thus cannot be upgraded ;)</b><br/><br/>"; } --- 135,141 ---- else { ! // // If not installed ! // $message = "<b>Module is not installed...and thus cannot be upgraded ;)</b><br/><br/>"; } Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/db_install.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** db_install.php 15 Sep 2005 17:59:19 -0000 1.7 --- db_install.php 1 Oct 2005 14:12:41 -0000 1.8 *************** *** 42,46 **** } ! $mx_module_version = 'mxBB phpBB Module 1.0.0'; $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a>'; --- 42,46 ---- } ! $mx_module_version = 'mxBB - phpBB Integration Module 1.0.3'; $mx_module_copy = 'Based on <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a>'; *************** *** 72,78 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('profile', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('search', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewforum', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewonline', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewtopic', '0')"; $sql[] = "CREATE TABLE " . $mx_table_prefix . "topic_add_type ( --- 72,78 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('profile', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('search', '0')"; ! //$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewforum', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewonline', '0')"; ! //$sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('viewtopic', '0')"; $sql[] = "CREATE TABLE " . $mx_table_prefix . "topic_add_type ( Index: viewtopic.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/viewtopic.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** viewtopic.php 15 Sep 2005 17:59:19 -0000 1.7 --- viewtopic.php 1 Oct 2005 14:12:41 -0000 1.8 *************** *** 1063,1067 **** 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_POLL_ACTION' => $mx_forum->append_sid("posting.$phpEx?mode=vote&" . POST_TOPIC_URL . "=$topic_id")) ); --- 1063,1067 ---- 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_POLL_ACTION' => $mx_forum->append_sid("posting.$phpEx?mode=vote&" . POST_TOPIC_URL . "=$topic_id",false, true)) ); *************** *** 1410,1413 **** --- 1410,1418 ---- // + // Do some text formatting - fixup (truncates) urls, images and words (wrapping) for a narrow column layout + // + $message = $mx_forum->mxbb_magic( $message ); + + // // Again this will be handled by the templating // code at some point Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/mx_forum.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_forum.php 15 Sep 2005 17:59:19 -0000 1.1 --- mx_forum.php 1 Oct 2005 14:12:41 -0000 1.2 *************** *** 40,43 **** --- 40,46 ---- include($mx_root_path . "modules/mx_forum/viewtopic.$phpEx"); break; + case 'posting': + include($mx_root_path . "modules/mx_forum/posting.$phpEx"); + break; } ?> \ No newline at end of file |