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...> - 2006-06-27 21:36:10
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12123/includes Modified Files: mx_functions_admincp.php Log Message: Cache related... security: added main htaccess file Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mx_functions_admincp.php 27 Jun 2006 18:12:22 -0000 1.24 --- mx_functions_admincp.php 27 Jun 2006 21:36:05 -0000 1.25 *************** *** 510,513 **** --- 510,515 ---- // $mx_cache->update(MX_CACHE_PAGE_TYPE, $page_id); + $mx_cache->destroy('_pagemap_block' . $block_id); + // We also need to destroy the cache for the function file...later // *************** *** 1536,1539 **** --- 1538,1543 ---- // $mx_cache->update(MX_CACHE_PAGE_TYPE, $page_id); + $mx_cache->destroy('_pagemap_block' . $block_id); + // We also need to destroy the cache for the function file...later } } |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:14:35
|
Update of /cvsroot/mxbb/mx_pafiledb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8800/modules/mx_pafiledb Modified Files: db_install.php db_upgrade.php Log Message: Updating install schemas etc Minor fresh install tweaks Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_install.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** db_install.php 17 Jun 2006 20:13:22 -0000 1.21 --- db_install.php 27 Jun 2006 18:14:28 -0000 1.22 *************** *** 93,101 **** 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', --- 93,101 ---- cat_desc text, cat_parent int(50) default NULL, ! parents_data text NOT NULL default '', 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', *************** *** 107,122 **** 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', --- 107,122 ---- notify tinyint(2) NOT NULL default '-1', ! notify_group mediumint(8) 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 NOT NULL default '0', 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) NOT NULL default '0', ! auth_delete_file tinyint(2) NOT NULL default '2', auth_upload tinyint(2) NOT NULL default '0', auth_download tinyint(2) NOT NULL default '0', *************** *** 135,140 **** // 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)", --- 135,140 ---- // Insert // ! "INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (1, 'My Category', '', '', '', '', 0, '-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)", ! "INSERT INTO " . $mx_table_prefix . "pa_cat VALUES (2, 'Test Cagegory', 'Just a test category', 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)", *************** *** 312,317 **** "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')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('comments_forum_id', '0')", // New --- 312,317 ---- "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 . "pa_config VALUES ('del_topic', '1')", // NEW ! "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('autogenerate_comments', '1')", // NEW "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('comments_pagination', '5')", "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('comments_forum_id', '0')", // New Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_upgrade.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** db_upgrade.php 17 Jun 2006 20:13:22 -0000 1.15 --- db_upgrade.php 27 Jun 2006 18:14:28 -0000 1.16 *************** *** 102,109 **** { ! $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 "; --- 102,109 ---- { ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_edit_file tinyint(2) NOT NULL default '0' AFTER auth_view_file "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_delete_file tinyint(2) NOT NULL default '0' 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 "; *************** *** 116,124 **** { ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_approval tinyint(2) DEFAULT '0' NOT NULL AFTER auth_delete_comment "; $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth ADD auth_approval tinyint(1) DEFAULT '0' NOT NULL AFTER auth_delete_comment "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat MODIFY auth_edit_file tinyint(2) DEFAULT '0' NOT NULL "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat MODIFY auth_delete_file tinyint(2) DEFAULT '0' NOT NULL "; // Upgrade the config table to avoid duplicate entries --- 116,124 ---- { ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat ADD auth_approval tinyint(2) NOT NULL default '0' AFTER auth_delete_comment "; $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth ADD auth_approval tinyint(1) DEFAULT '0' NOT NULL AFTER auth_delete_comment "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat MODIFY auth_edit_file tinyint(2) NOT NULL default '0' "; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat MODIFY auth_delete_file tinyint(2) NOT NULL default '0' "; // Upgrade the config table to avoid duplicate entries *************** *** 188,194 **** // 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' "; --- 188,194 ---- // 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' "; *************** *** 199,203 **** // 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 --- 199,203 ---- // 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) NOT NULL default '0' "; // add fields to pa_files table *************** *** 209,212 **** --- 209,217 ---- { $sql[] = "INSERT INTO " . $mx_table_prefix . "pa_config VALUES ('comments_forum_id', '0')"; + + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat MODIFY cat_allow_ratings tinyint(2) NOT NULL default '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat MODIFY cat_allow_comments tinyint(2) NOT NULL default '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat MODIFY notify_group mediumint(8) NOT NULL default '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_cat MODIFY auth_delete_file tinyint(2) NOT NULL default '2' "; } else |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:13:52
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8125/modules/mx_kb Modified Files: db_install.php db_uninstall.php db_upgrade.php Log Message: Updating install schemas etc Minor fresh install tweaks Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_uninstall.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** db_uninstall.php 2 May 2006 23:27:19 -0000 1.17 --- db_uninstall.php 27 Jun 2006 18:13:45 -0000 1.18 *************** *** 47,55 **** "DROP TABLE " . $mx_table_prefix . "kb_types ", ! "DROP TABLE " . $mx_table_prefix . "kb_wordlist ", ! "DROP TABLE " . $mx_table_prefix . "kb_results ", ! "DROP TABLE " . $mx_table_prefix . "kb_wordmatch ", "DROP TABLE " . $mx_table_prefix . "kb_votes ", --- 47,55 ---- "DROP TABLE " . $mx_table_prefix . "kb_types ", ! //"DROP TABLE " . $mx_table_prefix . "kb_wordlist ", ! //"DROP TABLE " . $mx_table_prefix . "kb_results ", ! //"DROP TABLE " . $mx_table_prefix . "kb_wordmatch ", "DROP TABLE " . $mx_table_prefix . "kb_votes ", Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** db_install.php 17 Jun 2006 20:11:23 -0000 1.38 --- db_install.php 27 Jun 2006 18:13:45 -0000 1.39 *************** *** 77,88 **** category_id mediumint(8) unsigned NOT NULL auto_increment, category_name VARCHAR(255) binary NOT NULL, ! category_details VARCHAR(255) binary NOT NULL, parent mediumint(8) unsigned, cat_order mediumint(8) unsigned NOT NULL, ! 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', --- 77,88 ---- category_id mediumint(8) unsigned NOT NULL auto_increment, category_name VARCHAR(255) binary NOT NULL, ! category_details text, parent mediumint(8) unsigned, cat_order mediumint(8) unsigned NOT NULL, ! 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', *************** *** 91,97 **** notify tinyint(2) NOT NULL default '-1', ! notify_group mediumint(8) unsigned NOT NULL default '-1', ! number_articles mediumint(8) NOT NULL, cat_last_article_id mediumint(8) unsigned NOT NULL default '0', cat_last_article_name varchar(255) NOT NULL default '', --- 91,97 ---- notify tinyint(2) NOT NULL default '-1', ! notify_group mediumint(8) NOT NULL default '-1', ! number_articles mediumint(8) NOT NULL default '-1', cat_last_article_id mediumint(8) unsigned NOT NULL default '0', cat_last_article_name varchar(255) NOT NULL default '', *************** *** 121,125 **** )", ! "INSERT INTO " . $mx_table_prefix . "kb_categories VALUES (1, 'Test Category 1', 'This is a test category', '0', '10', '-1', '-1','-1','-1','-1','-1','-1','-1', '', '0', '', '0', '0', '0', '0', '0', '0', '2', '0', '0', '', '', '', '', '', '', '', '', '0' )", "CREATE TABLE " . $mx_table_prefix . "kb_config ( --- 121,125 ---- )", ! "INSERT INTO " . $mx_table_prefix . "kb_categories VALUES (1, 'Test Category', 'Just a test category', '0', '10', '-1', '-1','-1','-1','-1','-1','-1','-1', '-1', '0', '', '0', '0', '0', '0', '0', '0', '2', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0' )", "CREATE TABLE " . $mx_table_prefix . "kb_config ( *************** *** 157,162 **** // Appearance "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('stats_list', '1')", ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('header_banner', '1')", ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('pagination', '5')", // art_pagination "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('sort_method', 'Alphabetic')", // news_sort "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('sort_order', 'ASC')", // news_sort_par --- 157,162 ---- // Appearance "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('stats_list', '1')", ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('header_banner', '0')", ! "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('pagination', '10')", // art_pagination "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('sort_method', 'Alphabetic')", // news_sort "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('sort_order', 'ASC')", // news_sort_par Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** db_upgrade.php 17 Jun 2006 20:11:23 -0000 1.31 --- db_upgrade.php 27 Jun 2006 18:13:45 -0000 1.32 *************** *** 405,408 **** --- 405,413 ---- { $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('comments_forum_id', '0')"; + + $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories MODIFY cat_allow_comments tinyint(2) NOT NULL default '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories MODIFY notify_group mediumint(8) NOT NULL default '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories MODIFY number_articles mediumint(8) NOT NULL default '-1' "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_categories MODIFY category_details text "; } else |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:13:52
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8125/modules/mx_kb/templates/subSilver Modified Files: kb_footer.tpl kb_header.tpl kb_index_body.tpl Log Message: Updating install schemas etc Minor fresh install tweaks Index: kb_header.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_header.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kb_header.tpl 5 Apr 2006 21:19:50 -0000 1.8 --- kb_header.tpl 27 Jun 2006 18:13:46 -0000 1.9 *************** *** 1,22 **** ! <table width="100%" cellspacing="1" cellpadding="2" border="0" class="forumline" style="border-top:none;"> ! <tr> ! {L_KB_TITLE} ! </tr> ! <tr> ! <td align="center" class="row2"> ! <!-- BEGIN switch_add_article --> ! <span class="nav">{L_ADD_ARTICLE}</span> ! <!-- END switch_add_article --> ! <span class="nav">{L_SEARCH_MODULE}</span></td> ! </tr> <tr> ! <td align="center" class="row2"> ! <span class="nav">:: ! <a href="{U_MOST_POPULAR}" class="nav">{L_MOST_POPULAR}</a> :: ! <a href="{U_TOPRATED}" class="nav">{L_TOPRATED}</a> :: ! <a href="{U_LATEST}" class="nav">{L_LATEST}</a> :: ! </span> </td> ! </tr> </table> --- 1,28 ---- ! <table width="100%" cellspacing="1" cellpadding="0" border="0" class="forumline" style="border-top:none;"> <tr> ! <td> ! <table width="100%" cellspacing="0" cellpadding="2" border="0"> ! <tr> ! {L_KB_TITLE} ! </tr> ! <tr> ! <td align="center" class="row1"> ! <!-- BEGIN switch_add_article --> ! <span class="nav">{L_ADD_ARTICLE}</span> ! <!-- END switch_add_article --> ! <span class="nav">{L_SEARCH_MODULE}</span></td> ! </tr> ! <tr> ! <td align="center" class="row2"> ! <span class="nav">:: ! <a href="{U_MOST_POPULAR}" class="nav">{L_MOST_POPULAR}</a> :: ! <a href="{U_TOPRATED}" class="nav">{L_TOPRATED}</a> :: ! <a href="{U_LATEST}" class="nav">{L_LATEST}</a> :: ! </span> ! </td> ! </tr> ! </table> </td> ! </tr> </table> *************** *** 41,45 **** </tr> <!-- END switch_quick_stats --> ! <tr valign="top"> <td> --- 47,51 ---- </tr> <!-- END switch_quick_stats --> ! <tr valign="top"> <td> Index: kb_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_footer.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** kb_footer.tpl 5 Apr 2006 21:19:50 -0000 1.10 --- kb_footer.tpl 27 Jun 2006 18:13:45 -0000 1.11 *************** *** 3,12 **** <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> ! <td align="left" valign="top"> <!-- BEGIN jumpbox --> <form method="get" name="jumpbox" action="{QUICK_JUMP_ACTION}" onSubmit="if(document.jumpbox.cat.value == -1){return false;}"> <table cellspacing="0" cellpadding="0" border="0"> <tr> ! <td align="left" valign="middle" height="35" width="50%"><span class="gensmall"> <select name="cat" onchange="if(this.options[this.selectedIndex].value != 0){ forms['jumpbox'].submit() }"> <option value="0">{L_QUICK_JUMP}</otpion> --- 3,12 ---- <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> ! <td align="left" valign="top"> <!-- BEGIN jumpbox --> <form method="get" name="jumpbox" action="{QUICK_JUMP_ACTION}" onSubmit="if(document.jumpbox.cat.value == -1){return false;}"> <table cellspacing="0" cellpadding="0" border="0"> <tr> ! <td align="left" valign="middle" height="35" width="50%"><span class="gensmall"> <select name="cat" onchange="if(this.options[this.selectedIndex].value != 0){ forms['jumpbox'].submit() }"> <option value="0">{L_QUICK_JUMP}</otpion> *************** *** 25,34 **** <span class="gensmall">{S_AUTH_LIST}</span> <!-- END auth_can_list --> ! </td> </tr> </table> </td> </tr> ! </table> {DEBUG} <!-- BEGIN copy_footer --> --- 25,34 ---- <span class="gensmall">{S_AUTH_LIST}</span> <!-- END auth_can_list --> ! </td> </tr> </table> </td> </tr> ! </table> {DEBUG} <!-- BEGIN copy_footer --> Index: kb_index_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_index_body.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kb_index_body.tpl 5 Apr 2006 21:19:50 -0000 1.6 --- kb_index_body.tpl 27 Jun 2006 18:13:46 -0000 1.7 *************** *** 6,10 **** <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" > ! <tr> <th class="thCornerL" width="6%"> </th> <th class="thTop" nowrap="nowrap"> {L_CATEGORY} </th> --- 6,10 ---- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" > ! <tr> <th class="thCornerL" width="6%"> </th> <th class="thTop" nowrap="nowrap"> {L_CATEGORY} </th> *************** *** 12,16 **** </tr> <!-- BEGIN catrow --> ! <tr> <td class="row1" align="center" valign="middle"><img src="{catrow.CAT_IMAGE}" border="0" alt="{catrow.CAT_DESCRIPTION}"></td> <td class="row1" onmouseout="this.className='row1';" onmouseover="this.className='row2';" ><span class="forumlink">{catrow.CATEGORY}</span><br /><span class="genmed">{catrow.CAT_DESCRIPTION}</span></td> --- 12,16 ---- </tr> <!-- BEGIN catrow --> ! <tr> <td class="row1" align="center" valign="middle"><img src="{catrow.CAT_IMAGE}" border="0" alt="{catrow.CAT_DESCRIPTION}"></td> <td class="row1" onmouseout="this.className='row1';" onmouseover="this.className='row2';" ><span class="forumlink">{catrow.CATEGORY}</span><br /><span class="genmed">{catrow.CAT_DESCRIPTION}</span></td> *************** *** 18,28 **** </tr> <!-- BEGIN sub --> ! <tr> <td class="row2" width="6%"> </td> <td class="row2" ><span class="genmed"><b>{catrow.L_SUB_CAT}:</b> {catrow.sub.SUB_CAT_LIST}</span></td> <td class="row2" align="center" valign="middle"> </td> ! </tr> <!-- END sub --> <!-- END catrow --> <tr> <td class="cat" colspan="3"> </td> --- 18,34 ---- </tr> <!-- BEGIN sub --> ! <tr> <td class="row2" width="6%"> </td> <td class="row2" ><span class="genmed"><b>{catrow.L_SUB_CAT}:</b> {catrow.sub.SUB_CAT_LIST}</span></td> <td class="row2" align="center" valign="middle"> </td> ! </tr> <!-- END sub --> <!-- END catrow --> + + <!-- BEGIN no_cats --> + <tr> + <td class="row1" align="center" colspan="3" height="50"><span class="genmed">{no_cats.COMMENT}</span></td> + </tr> + <!-- END no_cats --> <tr> <td class="cat" colspan="3"> </td> |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:13:50
|
Update of /cvsroot/mxbb/mx_kb/kb/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8125/modules/mx_kb/kb/includes Modified Files: functions.php functions_kb.php Log Message: Updating install schemas etc Minor fresh install tweaks Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** functions.php 17 Jun 2006 20:11:23 -0000 1.6 --- functions.php 27 Jun 2006 18:13:45 -0000 1.7 *************** *** 1513,1517 **** { $temp_url = append_sid( this_kb_mxurl() ); ! $block_title = '<td align="center"><a href="' . $temp_url . '"><img src="' . $images['kb_title'] . '" width="285" height="45" border="0" alt="' . $title . '"></a></td>'; } else --- 1513,1517 ---- { $temp_url = append_sid( this_kb_mxurl() ); ! $block_title = '<td align="center" class="row1"><a href="' . $temp_url . '"><img src="' . $images['kb_title'] . '" width="285" height="45" border="0" alt="' . $title . '"></a></td>'; } else *************** *** 1599,1603 **** 'L_MODULE_ORIG_AUTHOR' => $kb_module_orig_author, 'L_MODULE_AUTHOR' => $kb_module_author, ! 'DEBUG' => !empty($debug_message) ? '<div style="overflow:auto; height:100px;"><span class="gensmall">' . $debug_message . '<br/> -::-</span></div>': '', )); --- 1599,1603 ---- 'L_MODULE_ORIG_AUTHOR' => $kb_module_orig_author, 'L_MODULE_AUTHOR' => $kb_module_author, ! 'DEBUG' => !empty($debug_message) && $mx_kb->debug ? '<div style="overflow:auto; height:100px;"><span class="gensmall">' . $debug_message . '<br/> -::-</span></div>': '', )); Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_kb.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** functions_kb.php 25 Jun 2006 21:55:12 -0000 1.7 --- functions_kb.php 27 Jun 2006 18:13:45 -0000 1.8 *************** *** 87,91 **** var $navigation = ''; ! var $debug = true; var $debug_msg = array(); --- 87,91 ---- var $navigation = ''; ! var $debug = false; // Toggle debug output on/off var $debug_msg = array(); *************** *** 1057,1060 **** --- 1057,1066 ---- $this->debug('mx_kb->display_categories', basename( __FILE__ )); + if ( $this->cat_empty() ) + { + mx_message_die( GENERAL_ERROR, 'Either you are not allowed to view any category, or there is no category in the database' ); + } + + $num_of_cats = 0; foreach( $this->subcat_rowset[$parent] as $category_id => $category ) { *************** *** 1067,1070 **** --- 1073,1077 ---- $show_sub_categories = false; + // // Auth *************** *** 1072,1075 **** --- 1079,1083 ---- if ( $this->ns_auth_cat( $category_id ) && $this->auth_user[$category_id]['auth_view']) { + $num_of_cats++; $show_sub_categories = true; *************** *** 1108,1111 **** --- 1116,1126 ---- } + if ( $num_of_cats == 0 ) + { + $template->assign_block_vars( 'no_cats', array( + 'COMMENT' => 'Either you are not allowed to view any category, or you haven\'t selected any KB categories to use in this block. Admin should validate the blockCP settings. ', + )); + } + if ($show_sub_categories) { |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:12:27
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7357/includes Modified Files: mx_functions_admincp.php mx_functions_style.php page_header.php page_tail.php Log Message: Further minor tweaks... Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** page_header.php 17 Jun 2006 20:09:07 -0000 1.37 --- page_header.php 27 Jun 2006 18:12:22 -0000 1.38 *************** *** 490,497 **** $meta_str .= $header . "\n"; ! $layouttemplate->assign_vars(array( ! 'META' => $meta_str) ! ); ! $layouttemplate->pparse('overall_header'); ?> \ No newline at end of file --- 490,494 ---- $meta_str .= $header . "\n"; ! $layouttemplate->assign_vars(array( 'META' => $meta_str) ); $layouttemplate->pparse('overall_header'); ?> \ No newline at end of file Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_functions_style.php 18 Jun 2006 10:46:03 -0000 1.6 --- mx_functions_style.php 27 Jun 2006 18:12:22 -0000 1.7 *************** *** 20,23 **** --- 20,28 ---- include_once($phpbb_root_path . 'includes/template.' . $phpEx); + // + // Including phpBB session functions + // + include_once($phpbb_root_path . 'includes/sessions.' . $phpEx); + /** * Class: mx_Template Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_functions_admincp.php 26 Jun 2006 21:32:22 -0000 1.23 --- mx_functions_admincp.php 27 Jun 2006 18:12:22 -0000 1.24 *************** *** 2822,2825 **** --- 2822,2838 ---- $output_message .= !empty($message_tmp) ? '<br /><br />' . $message_tmp : ''; } + + // + // If this is a new demo block, give it parameters (Fix for 2.8 B4) + // + if( $module_data[0] == 'block' ) + { + // + // Now update affected block_id(s) + // ...and cache + // + $message_tmp = $this->update_block_parameter_data($module_data[4]); + $output_message .= !empty($message_tmp) ? '<br /><br />' . $message_tmp : ''; + } } Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** page_tail.php 17 Jun 2006 20:09:07 -0000 1.25 --- page_tail.php 27 Jun 2006 18:12:22 -0000 1.26 *************** *** 35,39 **** 'EDITCP_EXPAND_IMG' => $images['mx_expand'], 'EDITCP_DYNAMIC_IMG' => $mx_page->editcp_show ? $images['mx_contract'] : $images['mx_expand'], ! 'ADMIN_OPTIONS' => $lang['Show_admin_options'], )); } --- 35,39 ---- 'EDITCP_EXPAND_IMG' => $images['mx_expand'], 'EDITCP_DYNAMIC_IMG' => $mx_page->editcp_show ? $images['mx_contract'] : $images['mx_expand'], ! 'ADMIN_OPTIONS' => $lang['Show_admin_options'] )); } *************** *** 86,91 **** 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'ADMIN_LINK' => $admin_link, ! 'EXECUTION_STATS' => (defined('DEBUG')) ? $debug_output : '') ! ); $template->pparse('overall_footer'); --- 86,91 ---- 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', 'ADMIN_LINK' => $admin_link, ! 'EXECUTION_STATS' => (defined('DEBUG')) ? $debug_output : '' ! )); $template->pparse('overall_footer'); *************** *** 126,129 **** --- 126,130 ---- echo pack('V', $gzip_size); } + exit; ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:12:27
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7357/modules/mx_navmenu/admin Modified Files: mx_module_defs.php Log Message: Further minor tweaks... Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_module_defs.php 17 Jun 2006 20:09:07 -0000 1.20 --- mx_module_defs.php 27 Jun 2006 18:12:22 -0000 1.21 *************** *** 698,702 **** function _do_insert($type, $id ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) --- 698,702 ---- function _do_insert($type, $id ) { ! global $mx_root_path, $phpbb_root_path, $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) *************** *** 713,717 **** $block_id = $mx_request_vars->post('block_id', MX_TYPE_INT, ''); - $sql = "SELECT MAX(cat_order) AS max_order FROM " . MENU_CAT_TABLE; --- 713,716 ---- *************** *** 733,744 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! $bbcode_uid = make_bbcode_uid(); ! $message = prepare_message($HTTP_POST_VARS['cat_desc'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); $sql = "INSERT INTO " . MENU_CAT_TABLE . " (block_id, cat_title, cat_order, cat_desc, bbcode_uid, cat_show, cat_url, cat_target) VALUES( '" . $block_id . "', ! '" . $mx_request_vars->post('cat_title', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '') . "', '" . $next_order . "', ! '" . $message . "', '" . $bbcode_uid . "', '" . $mx_request_vars->post('cat_show_sel', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', --- 732,754 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Encode for db storage ! // ! $cat_title = $mx_text->encode_simple($mx_request_vars->post('cat_title', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $cat_desc = $mx_text->encode($mx_request_vars->post('cat_desc', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $bbcode_uid = $mx_text->bbcode_uid; $sql = "INSERT INTO " . MENU_CAT_TABLE . " (block_id, cat_title, cat_order, cat_desc, bbcode_uid, cat_show, cat_url, cat_target) VALUES( '" . $block_id . "', ! '" . $cat_title . "', '" . $next_order . "', ! '" . $cat_desc . "', '" . $bbcode_uid . "', '" . $mx_request_vars->post('cat_show_sel', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', *************** *** 807,821 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! $bbcode_uid = make_bbcode_uid(); ! $message = prepare_message($HTTP_POST_VARS['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); $sql = "INSERT INTO " . MENU_NAV_TABLE . " (menu_id, menu_name, cat_id, function_id, block_id, page_id, menu_desc, menu_links, bbcode_uid, menu_order, menu_icon, auth_view, auth_view_group, link_target) VALUES ('" . $next_id . "', ! '" . $mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '') . "', '" . $cat_id . "', '" . $mx_request_vars->post('function_id', MX_TYPE_INT, '') . "', '" . $mx_request_vars->post('block_nav', MX_TYPE_INT, '') . "', '" . $mx_request_vars->post('page_nav', MX_TYPE_INT, '') . "', ! '" . $message . "' , '" . $mx_request_vars->post('menulinks', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', '" . $bbcode_uid . "' , --- 817,842 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Encode for db storage ! // ! $menu_title = $mx_text->encode_simple($mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $menu_desc = $mx_text->encode($mx_request_vars->post('message', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $bbcode_uid = $mx_text->bbcode_uid; $sql = "INSERT INTO " . MENU_NAV_TABLE . " (menu_id, menu_name, cat_id, function_id, block_id, page_id, menu_desc, menu_links, bbcode_uid, menu_order, menu_icon, auth_view, auth_view_group, link_target) VALUES ('" . $next_id . "', ! '" . $menu_title . "', '" . $cat_id . "', '" . $mx_request_vars->post('function_id', MX_TYPE_INT, '') . "', '" . $mx_request_vars->post('block_nav', MX_TYPE_INT, '') . "', '" . $mx_request_vars->post('page_nav', MX_TYPE_INT, '') . "', ! '" . $menu_desc . "' , '" . $mx_request_vars->post('menulinks', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', '" . $bbcode_uid . "' , *************** *** 850,854 **** function _do_update($type, $id ) { ! global $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) --- 871,875 ---- function _do_update($type, $id ) { ! global $mx_root_path, $phpbb_root_path, $template, $lang, $db, $board_config, $theme, $phpEx, $HTTP_GET_VARS, $HTTP_POST_VARS, $userdata, $mx_request_vars; switch ( $type ) *************** *** 872,882 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! $bbcode_uid = make_bbcode_uid(); ! $message = prepare_message($HTTP_POST_VARS['cat_desc'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); $sql = "UPDATE " . MENU_CAT_TABLE . " SET block_id = '" . $block_id . "', ! cat_title = '" . $mx_request_vars->post('cat_title', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '') . "', ! cat_desc = '" . $message . "', bbcode_uid = '" . $bbcode_uid . "', cat_show = '" . $mx_request_vars->post('cat_show_sel', MX_TYPE_INT, '') . "', --- 893,914 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Encode for db storage ! // ! $cat_title = $mx_text->encode_simple($mx_request_vars->post('cat_title', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $cat_desc = $mx_text->encode($mx_request_vars->post('cat_desc', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $bbcode_uid = $mx_text->bbcode_uid; $sql = "UPDATE " . MENU_CAT_TABLE . " SET block_id = '" . $block_id . "', ! cat_title = '" . $cat_title . "', ! cat_desc = '" . $cat_desc . "', bbcode_uid = '" . $bbcode_uid . "', cat_show = '" . $mx_request_vars->post('cat_show_sel', MX_TYPE_INT, '') . "', *************** *** 911,919 **** $smilies_on = $board_config['allow_smilies'] ? true : false; ! $bbcode_uid = make_bbcode_uid(); ! $message = prepare_message( $HTTP_POST_VARS['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid ); $sql = "UPDATE " . MENU_NAV_TABLE . " ! SET menu_name = '" . $mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '') . "', menu_icon = '" . $mx_request_vars->post('menuicons', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', cat_id = '" . $mx_request_vars->post('cat_id', MX_TYPE_INT, '') . "', --- 943,962 ---- $smilies_on = $board_config['allow_smilies'] ? true : false; ! // ! // Instantiate the mx_text class ! // ! include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx); ! $mx_text = new mx_text(); ! $mx_text->init($html_on, $bbcode_on, $smilies_on); ! ! // ! // Encode for db storage ! // ! $menu_title = $mx_text->encode_simple($mx_request_vars->post('menuname', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $menu_desc = $mx_text->encode($mx_request_vars->post('message', MX_TYPE_NO_STRIP | MX_TYPE_SQL_QUOTED, '')); ! $bbcode_uid = $mx_text->bbcode_uid; $sql = "UPDATE " . MENU_NAV_TABLE . " ! SET menu_name = '" . $menu_title . "', menu_icon = '" . $mx_request_vars->post('menuicons', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', cat_id = '" . $mx_request_vars->post('cat_id', MX_TYPE_INT, '') . "', *************** *** 921,925 **** page_id = '" . $mx_request_vars->post('page_nav', MX_TYPE_INT, '') . "', function_id = '" . $mx_request_vars->post('function_id', MX_TYPE_INT, '') . "', ! menu_desc = '" . $message . "', menu_links = '" . $mx_request_vars->post('menulinks', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', auth_view = '" . $mx_request_vars->post('auth_view', MX_TYPE_INT, '') . "', --- 964,968 ---- page_id = '" . $mx_request_vars->post('page_nav', MX_TYPE_INT, '') . "', function_id = '" . $mx_request_vars->post('function_id', MX_TYPE_INT, '') . "', ! menu_desc = '" . $menu_desc . "', menu_links = '" . $mx_request_vars->post('menulinks', MX_TYPE_NO_TAGS | MX_TYPE_SQL_QUOTED, '') . "', auth_view = '" . $mx_request_vars->post('auth_view', MX_TYPE_INT, '') . "', |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:12:27
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7357/modules/mx_textblocks Modified Files: mx_textblock_multi.php Log Message: Further minor tweaks... Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mx_textblock_multi.php 26 Jun 2006 21:32:23 -0000 1.17 --- mx_textblock_multi.php 27 Jun 2006 18:12:22 -0000 1.18 *************** *** 30,33 **** --- 30,46 ---- $board_config['allow_html_tags'] = $mx_block->get_parameters( 'html_tags' ); + if (is_object($mx_page)) + { + // ------------------------------------------------------------------------- + // Extend User Style with module lang and images + // Usage: $mx_user->extend(LANG, IMAGES) + // Switches: + // - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE + // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE + // ------------------------------------------------------------------------- + $mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE); + $mx_page->add_copyright( 'mxBB Knowledge Base Module' ); + } + // // Block Pages/toc |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:12:27
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7357/admin Modified Files: admin_mx_page_cp.php Log Message: Further minor tweaks... Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** admin_mx_page_cp.php 27 Jun 2006 07:52:03 -0000 1.18 --- admin_mx_page_cp.php 27 Jun 2006 18:12:21 -0000 1.19 *************** *** 671,677 **** $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\"" : ""; // --- 671,677 ---- $ip_filter = !empty($page_rows[$page_count]['ip_filter']) ? implode( "\n", unserialize( stripslashes( $page_rows[$page_count]['ip_filter'] ))) : '' ; ! $phpbb_stats_yes = !$new_page ? ( $page_rows[$page_count]['phpbb_stats'] == 1 ? "checked=\"checked\"" : "" ) : ""; ! $phpbb_stats_no = !$new_page ? ( $page_rows[$page_count]['phpbb_stats'] == 0 ? "checked=\"checked\"" : "" ) : ""; ! $phpbb_stats_default = !$new_page ? ( $page_rows[$page_count]['phpbb_stats'] == -1 ? "checked=\"checked\"" : "" ) : "checked=\"checked\""; // |
|
From: Jon O. <jon...@us...> - 2006-06-27 18:12:27
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7357 Modified Files: common.php Log Message: Further minor tweaks... Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** common.php 26 Jun 2006 21:32:22 -0000 1.56 --- common.php 27 Jun 2006 18:12:22 -0000 1.57 *************** *** 183,188 **** --- 183,194 ---- $gen_simple_header = FALSE; + // + // Read main config file + // @include_once($mx_root_path . 'config.' . $phpEx); + // + // Redirect for fresh mxBB install + // if( !defined('MX_INSTALLED') ) { *************** *** 192,195 **** --- 198,205 ---- str_replace("//", "/", $phpbb_root_path); + + // + // mxBB Includes + // include_once($mx_root_path . 'includes/mx_constants.' . $phpEx); // Also includes phpBB constants include_once($mx_root_path . 'includes/mx_functions_style.' . $phpEx); // Extends the phpBB template class *************** *** 198,205 **** // phpBB Includes // - include_once($phpbb_root_path . 'includes/sessions.' . $phpEx); include_once($phpbb_root_path . 'includes/functions.' . $phpEx); - //include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions --- 208,216 ---- // phpBB Includes // include_once($phpbb_root_path . 'includes/functions.' . $phpEx); + // + // More mxBB Includes + // include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions *************** *** 215,220 **** --- 226,237 ---- $mx_cache = new mx_cache(); + // + // Get mxBB config settings + // $portal_config = $mx_cache->obtain_mxbb_config(); + // + // Define some general Defs + // define('PHPBB_URL', $portal_config['portal_phpbb_url']); define('PORTAL_URL', $portal_config['portal_url']); *************** *** 222,226 **** // ! // instantiate the mx_mod_rewrite class (if activated) // if ($portal_config['mod_rewrite']) --- 239,243 ---- // ! // Instantiate the mx_mod_rewrite class (if activated) // if ($portal_config['mod_rewrite']) *************** *** 262,267 **** // basic forum information is not available // ! if( @file_exists($phpbb_root_path . 'includes/class_config.' . $phpEx) && ! @file_exists($phpbb_root_path . 'includes/class_groups.' . $phpEx) ) { include($mx_root_path . 'includes/mx_functions_ch.'.$phpEx); --- 279,283 ---- // basic forum information is not available // ! if( @file_exists($phpbb_root_path . 'includes/class_config.' . $phpEx) && @file_exists($phpbb_root_path . 'includes/class_groups.' . $phpEx) ) { include($mx_root_path . 'includes/mx_functions_ch.'.$phpEx); *************** *** 269,276 **** --- 285,297 ---- else { + // // Grab phpBB global variables, re-cache if necessary + // $board_config = $mx_cache->obtain_phpbb_config(); } + // + // Is phpBB File Attachment MOD present? + // if( file_exists($phpbb_root_path . 'attach_mod') ) { *************** *** 278,281 **** --- 299,305 ---- } + // + // Remove install and contrib folders + // if( file_exists('install') || file_exists('contrib') ) { *************** *** 283,286 **** --- 307,313 ---- } + // + // Extra admin debug footer + // if (defined('DEBUG_EXTRA')) { *************** *** 306,309 **** $do_gzip_compress = FALSE; mx_session_start(); // Note: this needs $board_config populated! - ?> \ No newline at end of file --- 333,335 ---- |
|
From: Jon O. <jon...@us...> - 2006-06-27 07:52:08
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1878/admin Modified Files: admin_mx_block_cp.php admin_mx_chkobjs.php admin_mx_meta.php admin_mx_module.php admin_mx_module_cp.php admin_mx_page_cp.php admin_mx_phpinfo.php admin_mx_portal.php page_footer_admin.php page_header_admin.php pagestart.php Log Message: minor fixes Index: admin_mx_phpinfo.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_phpinfo.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_mx_phpinfo.php 17 Jun 2006 20:09:06 -0000 1.10 --- admin_mx_phpinfo.php 27 Jun 2006 07:52:03 -0000 1.11 *************** *** 43,46 **** --- 43,47 ---- '<a><pre><blockquote><img><div><span><p><br>'. '<table><tr><td><th><thead><tbody><tfoot>'; + $body_part = strip_tags($body_part, $allowedTags); Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** admin_mx_chkobjs.php 26 Jun 2006 21:32:22 -0000 1.19 --- admin_mx_chkobjs.php 27 Jun 2006 07:52:02 -0000 1.20 *************** *** 28,36 **** require('./pagestart.' . $phpEx); - // ====================================================== // [ GLOBAL DATA ] // ====================================================== - $main_title = "Check mxBB Objects"; $main_desc = "This utility allows you to check mxBB object relationships."; --- 28,34 ---- *************** *** 268,272 **** $html.=tbHead('td', 'catBottom', 5, '<a href="'.append_sid(basename(__FILE__)."?table=$tb").'"><b>Go Back</b></a>'); $html.="\t" . '</tr>' . "\n"; - $html.='</table><br />' . "\n"; --- 266,269 ---- Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_mx_page_cp.php 17 Jun 2006 20:09:06 -0000 1.17 --- admin_mx_page_cp.php 27 Jun 2006 07:52:03 -0000 1.18 *************** *** 89,93 **** $cookie_tmp = $board_config['cookie_name'].'_admincp_pagestates'; $cookie_states = !empty($HTTP_COOKIE_VARS[$cookie_tmp]) ? explode(",", $HTTP_COOKIE_VARS[$cookie_tmp]) : array(); - $sort_cookie = !empty($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) ? explode(",", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_pagesort']) : array(); --- 89,92 ---- *************** *** 159,164 **** $sort_cookie = array($sort_method, $sort_order, $include_all, isset($sort_cookie[3]) ? $sort_cookie[3] : intval($include_all), isset($sort_cookie[4]) ? $sort_cookie[4] : '', isset($sort_cookie[5]) ? $sort_cookie[5] : $include_all); - setcookie($board_config['cookie_name'] . '_pagesort', implode(',', $sort_cookie), time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); // -------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------- --- 158,163 ---- $sort_cookie = array($sort_method, $sort_order, $include_all, isset($sort_cookie[3]) ? $sort_cookie[3] : intval($include_all), isset($sort_cookie[4]) ? $sort_cookie[4] : '', isset($sort_cookie[5]) ? $sort_cookie[5] : $include_all); setcookie($board_config['cookie_name'] . '_pagesort', implode(',', $sort_cookie), time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); + // -------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------- *************** *** 396,408 **** 'L_TEMPLATE_NAME' => $lang['Template_name'], // Page subpanel - edit 'E_TEMPLATE_TITLE' => $template_title, ! // Main 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // Quick Panels 'MESSAGE_DELETE' => $message_delete, --- 395,412 ---- 'L_TEMPLATE_NAME' => $lang['Template_name'], + // // Page subpanel - edit + // 'E_TEMPLATE_TITLE' => $template_title, ! // // Main + // 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, *************** *** 753,757 **** --- 757,763 ---- 'S_PHPBB_STATS_DEFAULT' => $phpbb_stats_default, + // // Main + // 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** admin_mx_module.php 17 Jun 2006 20:09:05 -0000 1.44 --- admin_mx_module.php 27 Jun 2006 07:52:02 -0000 1.45 *************** *** 97,101 **** // Start page proper // - $template->set_filenames(array( 'body' => 'admin/mx_module_admin_body.tpl') ); --- 97,100 ---- *************** *** 332,336 **** --- 331,337 ---- 'MODULE_VERSION' => ( $module_rows[$module_count]['module_version'] != '' ) ? '- ' . $module_rows[$module_count]['module_version'] : '', + // // Module subpanel - edit + // 'E_MODULE_NAME' => $module_rows[$module_count]['module_name'], 'E_MODULE_DESC' => $module_rows[$module_count]['module_desc'], *************** *** 338,342 **** --- 339,345 ---- 'E_MODULE_INCLUDE_CHECK_OPT' => $check_opt, + // // Quick Panels + // 'MESSAGE_UPGRADE' => $message_upgrade, 'MESSAGE_EXPORT' => $message_export, Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** page_header_admin.php 17 Jun 2006 20:09:06 -0000 1.17 --- page_header_admin.php 27 Jun 2006 07:52:03 -0000 1.18 *************** *** 59,63 **** --- 59,65 ---- $template->set_filenames(array( 'header' => 'admin/page_header.tpl') ); + // // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility + // $l_timezone = explode('.', $board_config['board_timezone']); $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'])]; Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_mx_module_cp.php 17 Jun 2006 20:09:05 -0000 1.15 --- admin_mx_module_cp.php 27 Jun 2006 07:52:03 -0000 1.16 *************** *** 145,149 **** $sort_cookie = array(isset($sort_cookie[0]) ? $sort_cookie[0] : '', isset($sort_cookie[1]) ? $sort_cookie[1] : '', isset($sort_cookie[2]) ? $sort_cookie[2] : intval($include_all), intval($mx_modulecp_include_block_quickedit), intval($mx_modulecp_include_block_private), intval($include_all)); - setcookie($board_config['cookie_name'] . '_pagesort', implode(',', $sort_cookie), time() + 10000000, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); --- 145,148 ---- *************** *** 306,310 **** 'S_INCLUDE_BLOCK_PRIVATE_YES' => ( $mx_modulecp_include_block_private == '1' ) ? 'checked="checked"' : '', 'S_INCLUDE_BLOCK_PRIVATE_NO' => ( $mx_modulecp_include_block_private == '0' ) ? 'checked="checked"' : '' - )); --- 305,308 ---- *************** *** 494,498 **** --- 492,498 ---- 'U_MODULE_EDIT' => append_sid(PORTAL_URL . "admin/admin_mx_module.$phpEx?module_id=" . $module_rows[$module_count]['module_id']), + // // Module subpanel - edit + // 'E_MODULE_NAME' => $module_rows[$module_count]['module_name'], 'E_MODULE_DESC' => $module_rows[$module_count]['module_desc'], *************** *** 639,643 **** --- 639,645 ---- 'E_FUNCTION_ADMIN_FILE' => $function_admin_file, + // // Quick Panels + // 'MESSAGE_DELETE' => $message_delete, Index: page_footer_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_footer_admin.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** page_footer_admin.php 17 Jun 2006 20:09:06 -0000 1.13 --- page_footer_admin.php 27 Jun 2006 07:52:03 -0000 1.14 *************** *** 33,38 **** 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), ! 'EXECUTION_STATS' => $execution_stats) ! ); $template->pparse('page_footer'); --- 33,38 ---- 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), ! 'EXECUTION_STATS' => $execution_stats ! )); $template->pparse('page_footer'); Index: pagestart.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** pagestart.php 17 Jun 2006 20:09:06 -0000 1.20 --- pagestart.php 27 Jun 2006 07:52:03 -0000 1.21 *************** *** 22,30 **** $phpEx = substr(strrchr(__FILE__, '.'), 1); - include_once($mx_root_path . 'common.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_admincp.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_blockcp.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx); --- 22,29 ---- $phpEx = substr(strrchr(__FILE__, '.'), 1); + include_once($mx_root_path . 'common.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_admincp.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions_blockcp.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx); *************** *** 41,45 **** } - //if ( !($userdata['user_level'] == ADMIN || $block_edit_auth['auth_edit'] ) ) if ( !($userdata['user_level'] == ADMIN) ) { --- 40,43 ---- *************** *** 56,60 **** $url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $userdata['session_id']; - //mx_redirect("index.$phpEx?sid=" . $userdata['session_id']); mx_redirect("admin/index.$phpEx?sid=" . $userdata['session_id']); } --- 54,57 ---- Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** admin_mx_portal.php 17 Jun 2006 20:09:06 -0000 1.27 --- admin_mx_portal.php 27 Jun 2006 07:52:03 -0000 1.28 *************** *** 148,152 **** $template->pparse('admin_portal'); - include_once('page_footer_admin.' . $phpEx); ?> \ No newline at end of file --- 148,151 ---- Index: admin_mx_block_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin_mx_block_cp.php 17 Jun 2006 20:09:05 -0000 1.11 --- admin_mx_block_cp.php 27 Jun 2006 07:52:02 -0000 1.12 *************** *** 218,225 **** include_once($mx_root_path . 'admin/page_header_admin.' . $phpEx); - $blockcptemplate->pparse('body'); - include_once($mx_root_path . 'admin/page_footer_admin.' . $phpEx); - ?> \ No newline at end of file --- 218,222 ---- Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_meta.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_mx_meta.php 17 Jun 2006 20:09:05 -0000 1.15 --- admin_mx_meta.php 27 Jun 2006 07:52:02 -0000 1.16 *************** *** 41,47 **** if( $mx_request_vars->is_post('submit') ) { // MX_TYPE_NO_TAGS : Because this information is to be part of the HTML output (overall_header). // MX_TYPE_NO_STRIP: Because we need quoted slashes to dynamically build the mx_meta.inc as valid PHP code. ! $title = $mx_request_vars->post('title', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); $author = $mx_request_vars->post('author', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); --- 41,48 ---- if( $mx_request_vars->is_post('submit') ) { + // // MX_TYPE_NO_TAGS : Because this information is to be part of the HTML output (overall_header). // MX_TYPE_NO_STRIP: Because we need quoted slashes to dynamically build the mx_meta.inc as valid PHP code. ! // $title = $mx_request_vars->post('title', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); $author = $mx_request_vars->post('author', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); *************** *** 56,60 **** --- 57,63 ---- $icon = $mx_request_vars->post('icon', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); + // // Note we need to allow HTML Tags for the Extra Meta Settings!!! + // $header = $mx_request_vars->post('header', (MX_TYPE_NO_STRIP), ''); *************** *** 74,82 **** $config_data .= "\n" . '?>'; // Done this to prevent highlighting editors getting confused! // Write out the config file. ! @umask(0111); $fp = @fopen($mx_root_path . 'mx_meta.inc', 'w'); // check if the file was writable if( !$fp ) { --- 77,89 ---- $config_data .= "\n" . '?>'; // Done this to prevent highlighting editors getting confused! + // // Write out the config file. ! // @umask(0111); $fp = @fopen($mx_root_path . 'mx_meta.inc', 'w'); + + // // check if the file was writable + // if( !$fp ) { *************** *** 86,95 **** @fclose($fp); // display a message that the meta file has been updated $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">') ! ); ! $message = sprintf($lang['Meta_data_updated'], '<a href="' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); } --- 93,104 ---- @fclose($fp); + // // display a message that the meta file has been updated + // $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">' ! )); + $message = sprintf($lang['Meta_data_updated'], '<a href="' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); } |
|
From: Jon O. <jon...@us...> - 2006-06-27 07:52:08
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1878/language/lang_english Modified Files: lang_admin.php lang_main.php lang_meta.php Log Message: minor fixes Index: lang_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_meta.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lang_meta.php 5 Apr 2006 20:22:10 -0000 1.4 --- lang_meta.php 27 Jun 2006 07:52:03 -0000 1.5 *************** *** 268,272 **** $lang['mx_meta']['langcode']['zu'] = "Zulu"; - // // Other related META tag entries follow... --- 268,271 ---- *************** *** 283,287 **** $lang['mx_meta']['follow']['nofollow'] = "No follow"; - // // That's all Folks! --- 282,285 ---- Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** lang_admin.php 26 Jun 2006 21:32:23 -0000 1.65 --- lang_admin.php 27 Jun 2006 07:52:03 -0000 1.66 *************** *** 124,128 **** $lang['Portal_Navigation_block_explain'] = "- This is the default template overall_header navigation block."; - // // Module Management --- 124,127 ---- Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_main.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** lang_main.php 2 May 2006 23:22:16 -0000 1.30 --- lang_main.php 27 Jun 2006 07:52:03 -0000 1.31 *************** *** 58,62 **** // New for v. 2.704 // - $lang['Page_Not_Authorised'] = "Sorry, but you are not authorized to access this page."; --- 58,61 ---- *************** *** 64,68 **** // New for v. 2.705 // - $lang['Execution_Stats'] = "Page generated %s queries - Generation time: %s seconds"; --- 63,66 ---- *************** *** 70,74 **** // New for v. 2.7.3 // - $lang['Redirect_login'] = "Click %sHere%s to login."; --- 68,71 ---- |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:35:44
|
Update of /cvsroot/mxbb/mx_phpbb In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13771/modules/mx_phpbb Modified Files: db_install.php db_upgrade.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/db_install.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** db_install.php 2 May 2006 23:28:18 -0000 1.9 --- db_install.php 26 Jun 2006 21:35:40 -0000 1.10 *************** *** 33,37 **** } ! $mx_module_version = '1.0.3'; $mx_module_copy = 'Original mxBB <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; --- 33,37 ---- } ! $mx_module_version = '2.8.0'; $mx_module_copy = 'Original mxBB <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; *************** *** 52,56 **** ) TYPE=MyISAM"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('override_default_pages', 'Block_setup')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('enable_module', '1')"; --- 52,56 ---- ) TYPE=MyISAM"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('override_default_pages', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('enable_module', '1')"; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/db_upgrade.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** db_upgrade.php 2 May 2006 23:28:18 -0000 1.5 --- db_upgrade.php 26 Jun 2006 21:35:40 -0000 1.6 *************** *** 30,34 **** } ! $mx_module_version = '1.0.3'; $mx_module_copy = 'Original mxBB <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; --- 30,34 ---- } ! $mx_module_version = '2.8.0'; $mx_module_copy = 'Original mxBB <i> - phpBB integration</i> module by <a href="http://www.phpmix.com" target="_blank">Markus</a> & <a href="http://www.mxbb-portal.com" target="_blank">Jon</a>'; *************** *** 78,82 **** ) TYPE=MyISAM"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('override_default_pages', 'Block_setup')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('faq', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('groupcp', '0')"; --- 78,82 ---- ) TYPE=MyISAM"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('override_default_pages', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('faq', '0')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "phpbb_plugin_config VALUES ('groupcp', '0')"; |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:35:04
|
Update of /cvsroot/mxbb/mx_newssuite/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13272/modules/mx_newssuite/includes Modified Files: newssuite_functions.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: newssuite_functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_newssuite/includes/newssuite_functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newssuite_functions.php 5 Apr 2006 22:35:24 -0000 1.2 --- newssuite_functions.php 26 Jun 2006 21:35:00 -0000 1.3 *************** *** 8,12 **** * */ ! if ( !defined( 'IN_PORTAL' ) ) { --- 8,12 ---- * */ ! if ( !defined( 'IN_PORTAL' ) ) { *************** *** 73,77 **** break; } ! } // not used? function readmore_link( $i, $newssuite_config, $news, $item_id, $page_id ) --- 73,77 ---- break; } ! } // not used? function readmore_link( $i, $newssuite_config, $news, $item_id, $page_id ) *************** *** 96,100 **** switch ( $newssuite_config['news_source_switch'] ) { ! case 'phpbb': $sql = "SELECT t.topic_id, t.topic_type, t.forum_id, f.forum_name, t.topic_title, t.topic_time, t.topic_replies, t.topic_last_post_id, t.topic_views, t.topic_vote, u.username, u.user_id, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_allowsmile, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid, u2.username as user2, u2.user_id as id2, p2.post_username AS post_username2, p2.post_time, cat.cat_title --- 96,100 ---- switch ( $newssuite_config['news_source_switch'] ) { ! case 'phpbb': $sql = "SELECT t.topic_id, t.topic_type, t.forum_id, f.forum_name, t.topic_title, t.topic_time, t.topic_replies, t.topic_last_post_id, t.topic_views, t.topic_vote, u.username, u.user_id, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_allowsmile, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid, u2.username as user2, u2.user_id as id2, p2.post_username AS post_username2, p2.post_time, cat.cat_title *************** *** 107,124 **** AND t.topic_last_post_id <= t2.topic_last_post_id "; } ! ! $sql .= "WHERE t.forum_id = f.forum_id ! AND p.topic_id = t.topic_id ! AND p.post_id = t.topic_first_post_id ! AND pt.post_id = p.post_id ! AND u.user_id = p.poster_id AND p2.post_id = t.topic_last_post_id ! AND u2.user_id = p2.poster_id ! AND f.cat_id = cat.cat_id AND t.topic_moved_id = 0 AND f.forum_id IN ( $news_auth_data ) "; ! if ( $news_time_filter_lo != 'no' && !empty($news_time_filter_lo) ) ! { $sql .= " AND p2.post_time > " . $news_time_filter_lo ; } --- 107,124 ---- AND t.topic_last_post_id <= t2.topic_last_post_id "; } ! ! $sql .= "WHERE t.forum_id = f.forum_id ! AND p.topic_id = t.topic_id ! AND p.post_id = t.topic_first_post_id ! AND pt.post_id = p.post_id ! AND u.user_id = p.poster_id AND p2.post_id = t.topic_last_post_id ! AND u2.user_id = p2.poster_id ! AND f.cat_id = cat.cat_id AND t.topic_moved_id = 0 AND f.forum_id IN ( $news_auth_data ) "; ! if ( $news_time_filter_lo != 'no' && !empty($news_time_filter_lo) ) ! { $sql .= " AND p2.post_time > " . $news_time_filter_lo ; } *************** *** 128,132 **** $sql .= " AND t.topic_type_active > 0 "; } ! $sql .= $sql_find . " "; --- 128,132 ---- $sql .= " AND t.topic_type_active > 0 "; } ! $sql .= $sql_find . " "; *************** *** 135,139 **** $sql .= " GROUP BY t2.forum_id ASC, t2.topic_type DESC, p2.post_time DESC"; $sql .= " HAVING count(*) >= " . $cat_start[$block_id] . " AND count(*) <= " . intval( $newssuite_config['news_items'] + $cat_start[$block_id] - 1 ); ! } else --- 135,139 ---- $sql .= " GROUP BY t2.forum_id ASC, t2.topic_type DESC, p2.post_time DESC"; $sql .= " HAVING count(*) >= " . $cat_start[$block_id] . " AND count(*) <= " . intval( $newssuite_config['news_items'] + $cat_start[$block_id] - 1 ); ! } else *************** *** 144,148 **** } return $sql; ! break; case 'kb': --- 144,148 ---- } return $sql; ! break; case 'kb': *************** *** 156,171 **** } ! $sql .= "WHERE kbt.article_category_id = kbc.category_id ! AND t.topic_id = kbt.topic_id ! AND u.user_id = kbt.article_author_id ! AND p2.post_id = t.topic_last_post_id ! AND u2.user_id = p2.poster_id ! ! AND kbt.approved = 1 ! ! AND kbc.category_id IN ( $news_auth_data ) ! " . $sql_find . " "; --- 156,171 ---- } ! $sql .= "WHERE kbt.article_category_id = kbc.category_id ! AND t.topic_id = kbt.topic_id ! AND u.user_id = kbt.article_author_id ! AND p2.post_id = t.topic_last_post_id ! AND u2.user_id = p2.poster_id ! ! AND kbt.approved = 1 ! ! AND kbc.category_id IN ( $news_auth_data ) ! " . $sql_find . " "; *************** *** 188,193 **** /** * News auth ! * Authenticates a forum and checks if the user can view/read it. ! * If not, pops the news item out of the array and checks the next * news item. */ --- 188,193 ---- /** * News auth ! * Authenticates a forum and checks if the user can view/read it. ! * If not, pops the news item out of the array and checks the next * news item. */ *************** *** 198,214 **** switch ( $newssuite_config['news_source_switch'] ) { ! case 'phpbb': // Get all forum data (only once) if ( empty( $is_auth ) ) { $is_auth = auth( AUTH_ALL, AUTH_LIST_ALL, $userdata ); ! } // Check permissions // if( !$is_auth[$news[$i]['forum_id']]['auth_view'] || !$is_auth[$news[$i]['forum_id']]['auth_read'] ) // This less strict check lets you have hidden but readable posts displayed by newssuite if ( !$is_auth[$news[$i]['forum_id']]['auth_read'] ) ! { // Pop off unauthorized entry ! array_splice( $news, $i, 1 ); // If an entry still exists, check it if ( isset( $news[$i] ) ) --- 198,214 ---- switch ( $newssuite_config['news_source_switch'] ) { ! case 'phpbb': // Get all forum data (only once) if ( empty( $is_auth ) ) { $is_auth = auth( AUTH_ALL, AUTH_LIST_ALL, $userdata ); ! } // Check permissions // if( !$is_auth[$news[$i]['forum_id']]['auth_view'] || !$is_auth[$news[$i]['forum_id']]['auth_read'] ) // This less strict check lets you have hidden but readable posts displayed by newssuite if ( !$is_auth[$news[$i]['forum_id']]['auth_read'] ) ! { // Pop off unauthorized entry ! array_splice( $news, $i, 1 ); // If an entry still exists, check it if ( isset( $news[$i] ) ) *************** *** 236,245 **** switch ( $newssuite_config['news_source_switch'] ) { ! case 'phpbb': ! // Get array of categories from the database ! $sql = "SELECT cat_id, cat_title ! FROM " . CATEGORIES_TABLE . " ORDER BY cat_order"; if ( !( $result = $db->sql_query( $sql ) ) ) --- 236,245 ---- switch ( $newssuite_config['news_source_switch'] ) { ! case 'phpbb': ! // Get array of categories from the database ! $sql = "SELECT cat_id, cat_title ! FROM " . CATEGORIES_TABLE . " ORDER BY cat_order"; if ( !( $result = $db->sql_query( $sql ) ) ) *************** *** 256,260 **** break; } ! } // get type list for adding and editing articles --- 256,260 ---- break; } ! } // get type list for adding and editing articles *************** *** 264,268 **** global $db, $template; ! $sql = "SELECT * FROM " . KB_TYPES_TABLE; --- 264,268 ---- global $db, $template; ! $sql = "SELECT * FROM " . KB_TYPES_TABLE; *************** *** 290,302 **** { global $board_config, $newssuite_config; ! // $mytext = stripslashes($mytext); // Remove KB markup $search = array ( "'\[toc*?[^\[\]]*?\]'si", "'\[abstract*?[^\[\]]*?\]'si", ! "'\[page*?[^\[\]]*?\]'si" ); $replace = array ( "", "", ! "" ); $mytext = preg_replace( $search, $replace, $mytext ); --- 290,302 ---- { global $board_config, $newssuite_config; ! // $mytext = stripslashes($mytext); // Remove KB markup $search = array ( "'\[toc*?[^\[\]]*?\]'si", "'\[abstract*?[^\[\]]*?\]'si", ! "'\[page*?[^\[\]]*?\]'si" ); $replace = array ( "", "", ! "" ); $mytext = preg_replace( $search, $replace, $mytext ); *************** *** 309,313 **** function ns_decode_BBCODE_fixup( $mytext = '' ) { ! global $board_config, $newssuite_config; // Fix up // This function converts some standard BBCODEs to slicker html equivalents --- 309,313 ---- function ns_decode_BBCODE_fixup( $mytext = '' ) { ! global $board_config, $newssuite_config; // Fix up // This function converts some standard BBCODEs to slicker html equivalents *************** *** 316,322 **** // ------------------------------------------------------------------------ $search = array (); ! $replace = array (); // $mytext = stripslashes($mytext); ! $search = array ( // "'([\r\n])[\s]+'", // Strip out white space "'([\n])[\s]+'", // Strip out white space --- 316,322 ---- // ------------------------------------------------------------------------ $search = array (); ! $replace = array (); // $mytext = stripslashes($mytext); ! $search = array ( // "'([\r\n])[\s]+'", // Strip out white space "'([\n])[\s]+'", // Strip out white space *************** *** 340,344 **** // "'\[\/u*?[^\[\]]*?\]'si", // "'\[i*?[^\[\]]*?\]'si", ! // "'\[\/i*?[^\[\]]*?\]'si", ); $replace = array ( "\\1", --- 340,344 ---- // "'\[\/u*?[^\[\]]*?\]'si", // "'\[i*?[^\[\]]*?\]'si", ! // "'\[\/i*?[^\[\]]*?\]'si", ); $replace = array ( "\\1", *************** *** 363,367 **** // "</i>", // "<i>", ! // "</i>" ); $mytext = preg_replace( $search, $replace, $mytext ); --- 363,367 ---- // "</i>", // "<i>", ! // "</i>" ); $mytext = preg_replace( $search, $replace, $mytext ); *************** *** 374,381 **** function ns_decode_BBCODE( $mytext = '', $bbcode_uid, $remove = false ) { ! global $board_config, $newssuite_config; // remove BBCODE tags $search = array (); ! $replace = array (); // $mytext = stripslashes($mytext); if ( $remove || !$newssuite_config['enable_bbcode_msg'] ) --- 374,381 ---- function ns_decode_BBCODE( $mytext = '', $bbcode_uid, $remove = false ) { ! global $board_config, $newssuite_config; // remove BBCODE tags $search = array (); ! $replace = array (); // $mytext = stripslashes($mytext); if ( $remove || !$newssuite_config['enable_bbcode_msg'] ) *************** *** 384,393 **** ); ! $replace = array ( "" ); // $mytext = preg_replace( $search, $replace, $mytext ); ! } // BBCODE ! $mytext = ( $newssuite_config['enable_bbcode_msg'] ) ? bbencode_second_pass( $mytext, $bbcode_uid ) : preg_replace( "/\:[0-9a-z\:]+\]/si", "]", $mytext ); return $mytext; } --- 384,393 ---- ); ! $replace = array ( "" ); // $mytext = preg_replace( $search, $replace, $mytext ); ! } // BBCODE ! $mytext = ( $newssuite_config['enable_bbcode_msg'] ) ? mx_decode( $mytext, $bbcode_uid ) : preg_replace( "/\:[0-9a-z\:]+\]/si", "]", $mytext ); return $mytext; } *************** *** 395,407 **** function ns_decode_HTML( $mytext = '', $remove = false ) { ! global $board_config, $newssuite_config; // remove BBCODE tags $search = array (); ! $replace = array (); // $mytext = stripslashes($mytext); if ( $remove || !$newssuite_config['enable_html_msg'] ) { ! $search = array ( ! /* "'<script[^>]*?>.*?</script>'si", // Strip out javascript "'([\r\n])[\s]+'", // Strip out white space --- 395,407 ---- function ns_decode_HTML( $mytext = '', $remove = false ) { ! global $board_config, $newssuite_config; // remove BBCODE tags $search = array (); ! $replace = array (); // $mytext = stripslashes($mytext); if ( $remove || !$newssuite_config['enable_html_msg'] ) { ! $search = array ( ! /* "'<script[^>]*?>.*?</script>'si", // Strip out javascript "'([\r\n])[\s]+'", // Strip out white space *************** *** 419,426 **** "'<br />'i", "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags ! "'--br--'i" ); ! $replace = array ( ! /* "", "\\1", --- 419,426 ---- "'<br />'i", "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags ! "'--br--'i" ); ! $replace = array ( ! /* "", "\\1", *************** *** 438,445 **** "--br--", "", ! "<br />" ); $mytext = preg_replace( $search, $replace, $mytext ); ! } // HTML // $mytext = ( !$newssuite_config['enable_html_msg'] ) ? preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $mytext) : $mytext; --- 438,445 ---- "--br--", "", ! "<br />" ); $mytext = preg_replace( $search, $replace, $mytext ); ! } // HTML // $mytext = ( !$newssuite_config['enable_html_msg'] ) ? preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $mytext) : $mytext; *************** *** 449,453 **** function ns_decode_truncate_fixup( $mytext = '' ) { ! global $board_config, $newssuite_config; // ------------------------------------------------------------------------ // $mytext = stripslashes($mytext); --- 449,453 ---- function ns_decode_truncate_fixup( $mytext = '' ) { ! global $board_config, $newssuite_config; // ------------------------------------------------------------------------ // $mytext = stripslashes($mytext); *************** *** 475,479 **** $mytext = substr( $mytext, 0, strrpos( $mytext, ' ' ) ); $mytext = str_replace('<br/>', '<br />', $mytext); ! if ( $add_dots ) { --- 475,479 ---- $mytext = substr( $mytext, 0, strrpos( $mytext, ' ' ) ); $mytext = str_replace('<br/>', '<br />', $mytext); ! if ( $add_dots ) { *************** *** 489,493 **** function magic_url( $url ) { ! global $board_config; // $url = stripslashes($url); if ( $url ) --- 489,493 ---- function magic_url( $url ) { ! global $board_config; // $url = stripslashes($url); if ( $url ) *************** *** 497,511 **** $match = array(); ! $replace = array(); // relative urls for this board $match[] = '#(^|[\n ])' . $server_protocol . trim( $board_config['server_name'] ) . $server_port . preg_replace( '/^\/?(.*?)(\/)?$/', '$1', trim( $board_config['script_path'] ) ) . '/([^ \t\n\r <"\']+)#i'; ! $replace[] = '<a href="$1" target="_blank">$1</a>'; // matches a xxxx://aaaaa.bbb.cccc. ... $match[] = '#(^|[\n ])([\w]+?://.*?[^ \t\n\r<"]*)#ie'; ! $replace[] = "'\$1<a href=\"\$2\" target=\"_blank\">' . ((strlen('\$2') > 20) ? substr(str_replace('http://','','\$2'), 0, 12) . '...' : '\$2') . '</a>'"; // $replace[] = "'\$1<a href=\"\$2\" target=\"_blank\">' . ((strlen('\$2') > 25) ? substr(str_replace('http://','','\$2'), 0, 12) . ' ... ' . substr('\$2', -3) : '\$2') . '</a>'"; // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing $match[] = '#(^|[\n ])(www\.[\w\-]+\.[\w\-.\~]+(?:/[^ \t\n\r<"]*)?)#ie'; ! $replace[] = "'\$1<a href=\"http://\$2\" target=\"_blank\">' . ((strlen('\$2') > 20) ? substr(str_replace(' ', '%20', str_replace('http://','', '\$2')), 0, 12) . '...' : '\$2') . '</a>'"; // $replace[] = "'\$1<a href=\"http://\$2\" target=\"_blank\">' . ((strlen('\$2') > 25) ? substr(str_replace(' ', '%20', str_replace('http://','', '\$2')), 0, 12) . ' ... ' . substr('\$2', -3) : '\$2') . '</a>'"; // matches an email@domain type address at the start of a line, or after a space. --- 497,511 ---- $match = array(); ! $replace = array(); // relative urls for this board $match[] = '#(^|[\n ])' . $server_protocol . trim( $board_config['server_name'] ) . $server_port . preg_replace( '/^\/?(.*?)(\/)?$/', '$1', trim( $board_config['script_path'] ) ) . '/([^ \t\n\r <"\']+)#i'; ! $replace[] = '<a href="$1" target="_blank">$1</a>'; // matches a xxxx://aaaaa.bbb.cccc. ... $match[] = '#(^|[\n ])([\w]+?://.*?[^ \t\n\r<"]*)#ie'; ! $replace[] = "'\$1<a href=\"\$2\" target=\"_blank\">' . ((strlen('\$2') > 20) ? substr(str_replace('http://','','\$2'), 0, 12) . '...' : '\$2') . '</a>'"; // $replace[] = "'\$1<a href=\"\$2\" target=\"_blank\">' . ((strlen('\$2') > 25) ? substr(str_replace('http://','','\$2'), 0, 12) . ' ... ' . substr('\$2', -3) : '\$2') . '</a>'"; // matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing $match[] = '#(^|[\n ])(www\.[\w\-]+\.[\w\-.\~]+(?:/[^ \t\n\r<"]*)?)#ie'; ! $replace[] = "'\$1<a href=\"http://\$2\" target=\"_blank\">' . ((strlen('\$2') > 20) ? substr(str_replace(' ', '%20', str_replace('http://','', '\$2')), 0, 12) . '...' : '\$2') . '</a>'"; // $replace[] = "'\$1<a href=\"http://\$2\" target=\"_blank\">' . ((strlen('\$2') > 25) ? substr(str_replace(' ', '%20', str_replace('http://','', '\$2')), 0, 12) . ' ... ' . substr('\$2', -3) : '\$2') . '</a>'"; // matches an email@domain type address at the start of a line, or after a space. *************** *** 513,517 **** $replace[] = "'\$1<a href=\"mailto:\$2\">' . ((strlen('\$2') > 25) ? substr('\$2', 0, 15) . ' ... ' . substr('\$2', -5) : '\$2') . '</a>'"; ! $url = preg_replace( $match, $replace, $url ); // Also fix already tagged links $url = preg_replace( "/<a href=(.*?)>(.*?)<\/a>/ie", "(strlen(\"\\2\") > 20 && !eregi(\"<\", \"\\2\") ) ? '<a href='.stripslashes(\"\\1\").'>'.substr(str_replace(\"http://\",\"\",\"\\2\"), 0, 12) . '...</a>' : '<a href='.stripslashes(\"\\1\").'>'.\"\\2\".'</a>'", $url ); --- 513,517 ---- $replace[] = "'\$1<a href=\"mailto:\$2\">' . ((strlen('\$2') > 25) ? substr('\$2', 0, 15) . ' ... ' . substr('\$2', -5) : '\$2') . '</a>'"; ! $url = preg_replace( $match, $replace, $url ); // Also fix already tagged links $url = preg_replace( "/<a href=(.*?)>(.*?)<\/a>/ie", "(strlen(\"\\2\") > 20 && !eregi(\"<\", \"\\2\") ) ? '<a href='.stripslashes(\"\\1\").'>'.substr(str_replace(\"http://\",\"\",\"\\2\"), 0, 12) . '...</a>' : '<a href='.stripslashes(\"\\1\").'>'.\"\\2\".'</a>'", $url ); *************** *** 520,533 **** } return $url; ! } // Validates the img for block_size and resizes when needed // run within a div tag to ensure the table layout is not broken function magic_img( $img ) { ! global $board_config, $block_size; // $img = stripslashes($img); $image_size = $block_size - 30; if ( $img ) ! { // Also fix already tagged links // $img = preg_replace("/<img src=(.*?)(|border(.*?)|alt(.*?))>/ie", "'<br /><br /><center><img src='.stripslashes(\"\\1\").' width=\"'.makeImgWidth(trim(stripslashes(\"\\1\"))).'\" ></center><br />'", $img); --- 520,533 ---- } return $url; ! } // Validates the img for block_size and resizes when needed // run within a div tag to ensure the table layout is not broken function magic_img( $img ) { ! global $board_config, $block_size; // $img = stripslashes($img); $image_size = $block_size - 30; if ( $img ) ! { // Also fix already tagged links // $img = preg_replace("/<img src=(.*?)(|border(.*?)|alt(.*?))>/ie", "'<br /><br /><center><img src='.stripslashes(\"\\1\").' width=\"'.makeImgWidth(trim(stripslashes(\"\\1\"))).'\" ></center><br />'", $img); *************** *** 536,540 **** } return $img; ! } // Very slow...not used atm function makeImgWidth( $image ) --- 536,540 ---- } return $img; ! } // Very slow...not used atm function makeImgWidth( $image ) *************** *** 557,561 **** return $newwidth; ! } // Not always working...not used atm function WrapWords( $str, $chars ) --- 557,561 ---- return $newwidth; ! } // Not always working...not used atm function WrapWords( $str, $chars ) *************** *** 563,567 **** $str = preg_replace( '/([^\s\<\>]{' . $chars . ',' . $chars . '})/', '\1 ', $str ); return $str; ! } // Force Word Wrapping (by TerraFrost) function word_wrap_pass( $message ) --- 563,567 ---- $str = preg_replace( '/([^\s\<\>]{' . $chars . ',' . $chars . '})/', '\1 ', $str ); return $str; ! } // Force Word Wrapping (by TerraFrost) function word_wrap_pass( $message ) *************** *** 618,622 **** function addWrap( $curChar, $nextChar, &$finalText, &$tempText, &$curCount, &$tempCount ) { ! $softHyph = "­"; // $softHyph = " "; $maxChars = 10; --- 618,622 ---- function addWrap( $curChar, $nextChar, &$finalText, &$tempText, &$curCount, &$tempCount ) { ! $softHyph = "­"; // $softHyph = " "; $maxChars = 10; *************** *** 639,651 **** $tempText .= $curChar; $curCount++; ! } // the following code takes care of (unicode) characters prohibiting non-mandatory breaks directly before them. // $curChar isn't a " " or "\n" if ( $tempText != "" && $curChar != "" ) ! $tempCount++; // $curChar is " " or "\n", but $nextChar prohibits wrapping. elseif ( ( $curCount == 1 && strstr( $wrapProhibitedChars, $curChar ) !== false ) || ( $curCount == 0 && $nextChar != "" && $nextChar != " " && $nextChar != "\n" && strstr( $wrapProhibitedChars, $nextChar ) !== false ) ) ! $tempCount++; // $curChar and $nextChar aren't both either " " or "\n" elseif ( !( $curCount == 0 && ( $nextChar == " " || $nextChar == "\n" ) ) ) --- 639,651 ---- $tempText .= $curChar; $curCount++; ! } // the following code takes care of (unicode) characters prohibiting non-mandatory breaks directly before them. // $curChar isn't a " " or "\n" if ( $tempText != "" && $curChar != "" ) ! $tempCount++; // $curChar is " " or "\n", but $nextChar prohibits wrapping. elseif ( ( $curCount == 1 && strstr( $wrapProhibitedChars, $curChar ) !== false ) || ( $curCount == 0 && $nextChar != "" && $nextChar != " " && $nextChar != "\n" && strstr( $wrapProhibitedChars, $nextChar ) !== false ) ) ! $tempCount++; // $curChar and $nextChar aren't both either " " or "\n" elseif ( !( $curCount == 0 && ( $nextChar == " " || $nextChar == "\n" ) ) ) *************** *** 671,675 **** if ( $opt &1 ) ! { // Translating single quotes // Add single quote to translation table; --- 671,675 ---- if ( $opt &1 ) ! { // Translating single quotes // Add single quote to translation table; *************** *** 679,683 **** if ( !( $opt &2 ) ) ! { // Not translating double quotes // Remove double quote from translation table --- 679,683 ---- if ( !( $opt &2 ) ) ! { // Not translating double quotes // Remove double quote from translation table |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:34:13
|
Update of /cvsroot/mxbb/mx_kb/kb/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13107/modules/mx_kb/kb/modules Modified Files: kb_article.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: kb_article.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_article.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kb_article.php 25 Jun 2006 21:55:12 -0000 1.6 --- kb_article.php 26 Jun 2006 21:34:11 -0000 1.7 *************** *** 267,340 **** // article pages table of contents // ! if ( count( $art_pages ) > 1 ) { ! $template->assign_block_vars( 'switch_toc', array() ); $i = 0; ! while ( $i < count( $art_pages ) ) { $page_number = $i + 1; ! $art_split = explode( '[toc]', $art_pages[$i] ); ! $article_toc = $art_split[0]; ! ! // ! // Fix up the toc title ! // ! if ( !$html_on ) ! { ! $article_toc = preg_replace( '#(<)([\/]?.*?)(>)#is', "<\\2>", $article_toc ); ! } ! ! // ! // Parse message ! // ! $article_toc = preg_replace( "'\[[\/\!]*?[^\[\]]*?\]'si", "", $article_toc ); // Fixed ! $article_toc = make_clickable( $article_toc ); ! ! // ! // Parse smilies ! // ! if ( $smilies_on ) ! { ! $article_toc = mx_smilies_pass( $article_toc ); ! } ! ! // ! // Replace naughty words ! // ! if ( count( $orig_word ) ) ! { ! $article_toc = str_replace( '\"', '"', substr( preg_replace( '#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $article_toc . '<' ), 1, -1 ) ); ! } ! ! // Replace newlines (we use this rather than nl2br because ! // till recently it wasn't XHTML compliant) ! // $article_toc = str_replace("\n", "\n<br />\n", $article_toc); ! $page_toc = $art_pages[$i]; ! // ! // Sync with comments pagination ! // ! $start_pag = $start > -1 ? "&start=" . $start : ''; ! if ( $page_num != $i ) { ! if ( !$print_version ) ! { ! $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id&page_num=$page_number" . $start_pag . $original_highlight ) ); ! } ! else ! { ! $temp_url = append_sid( this_kb_mxurl( "mode=article&k=$article_id&page_num=$page_number&print=true" . $start_pag . $original_highlight, true ) ); ! } $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } else { ! $page_link = $page_number . ' - ' . $article_toc ; } ! if ( $i < count( $art_pages ) - 1 ) { $page_link .= '<br />'; --- 267,297 ---- // article pages table of contents // ! if( count($art_pages) > 1 ) { ! $template->assign_block_vars('switch_toc', array()); $i = 0; ! while( $i < count($art_pages) ) { $page_number = $i + 1; ! $art_split = explode('[toc]', $art_pages[$i]); ! $article_toc = trim($art_split[0]); ! //$article_toc = preg_replace( "'\[[\/\!]*?[^\[\]]*?\]'si", "", $article_toc ); // Fixed ! $article_toc = $mx_text->display($article_toc, $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS )); ! $article_toc = strip_tags($article_toc); ! if( $page_num != $i ) { ! $temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } else { ! $page_link = $page_number . ' - ' . $article_toc; } ! if( $i < count($art_pages) - 1 ) { $page_link .= '<br />'; |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:33:22
|
Update of /cvsroot/mxbb/mx_calsnails/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12671/modules/mx_calsnails/includes Modified Files: mx_common.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: mx_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/includes/mx_common.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** mx_common.php 25 Jun 2006 21:53:26 -0000 1.14 --- mx_common.php 26 Jun 2006 21:33:17 -0000 1.15 *************** *** 117,128 **** if ( $board_config['allow_bbcode'] ) { ! $mytext = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass( $mytext, $bbcode_uid ) : preg_replace( "/\:[0-9a-z\:]+\]/si", "]", $mytext ); ! } ! if ( $board_config['allow_smilies'] ) ! { ! $smilies_path = $board_config['smilies_path']; ! $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; ! $mytext = smilies_pass( $mytext ); ! $board_config['smilies_path'] = $smilies_path; } --- 117,121 ---- if ( $board_config['allow_bbcode'] ) { ! $mytext = ( $board_config['allow_bbcode'] ) ? mx_decode( $mytext, $bbcode_uid, $board_config['allow_smilies'] ) : preg_replace( "/\:[0-9a-z\:]+\]/si", "]", $mytext ); } |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:28
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/install Modified Files: mx_install.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** mx_install.php 3 May 2006 12:02:44 -0000 1.67 --- mx_install.php 26 Jun 2006 21:32:22 -0000 1.68 *************** *** 32,36 **** // $mx_portal_name = 'mxBB-Portal'; ! $mx_portal_version = '2.8.0B3'; $mx_portal_copy = '<b>mxBB - Modular Portal & CMS for phpBB!</b> <br /><br/> mxBB is a fully modular portal and CMS for phpBB, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It works without touching phpBB by using integrated functions and features. mxBB-Portal is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001. <br /><br />Authors: The mxBB Development Team. <br />Please visit <a href="http://www.mx-system.com/">www.mx-system.com</a> for further information.'; --- 32,36 ---- // $mx_portal_name = 'mxBB-Portal'; ! $mx_portal_version = '2.8.0B4'; $mx_portal_copy = '<b>mxBB - Modular Portal & CMS for phpBB!</b> <br /><br/> mxBB is a fully modular portal and CMS for phpBB, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It works without touching phpBB by using integrated functions and features. mxBB-Portal is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001. <br /><br />Authors: The mxBB Development Team. <br />Please visit <a href="http://www.mx-system.com/">www.mx-system.com</a> for further information.'; |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:28
|
Update of /cvsroot/mxbb/core/install/templates In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/install/templates Modified Files: mx_install_header.tpl Log Message: A few fixes related to new mx_text class, and other minor fixes Index: mx_install_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_header.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_install_header.tpl 29 May 2006 15:37:04 -0000 1.6 --- mx_install_header.tpl 26 Jun 2006 21:32:23 -0000 1.7 *************** *** 249,253 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><a href="http://www.mx-system.com" target="_blank"><img src="../templates/subSilver/images/banner_mx-system.gif" border="0" alt="mxBB-Portal" vspace="1" /></a></td> <td align="center" width="100%" valign="middle"><span class="maintitle">{L_INSTALLATION}</span></td> <td align="center" valign="top" nowrap><span class="gensmall">{L_PORTAL_NAME}<br />v. {L_PORTAL_VERSION}</span></td> --- 249,253 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td><a href="http://www.mx-system.com" target="_blank"><img src="../templates/subSilver/images/logo.gif" border="0" alt="mxBB-Portal" vspace="1" /></a></td> <td align="center" width="100%" valign="middle"><span class="maintitle">{L_INSTALLATION}</span></td> <td align="center" valign="top" nowrap><span class="gensmall">{L_PORTAL_NAME}<br />v. {L_PORTAL_VERSION}</span></td> |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:27
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/includes Modified Files: mx_constants.php mx_functions_admincp.php mx_functions_phpbb.php mx_functions_tools.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mx_functions_admincp.php 17 Jun 2006 20:09:06 -0000 1.22 --- mx_functions_admincp.php 26 Jun 2006 21:32:22 -0000 1.23 *************** *** 2491,2534 **** // - // 0: option 1: option_id, 2: parameter_id, 3: option_code, - // 4: option_desc - // - /* - case 'option': - $module_data[2] = $parameter_id; - - if( $delete_option ) - { - break; - } - - $safe_row = mx_get_info(PARAMETER_OPTION_TABLE, 'parameter_id', $parameter_id, 'option_code', $module_data['3']); - if( $module_data['4'] == 'endoflist' ) - { - $old_items = $this->get_old_items(PARAMETER_OPTION_TABLE, 'parameter_id', $parameter_id, 'option_id', $exists_option_ids); - - for( $f = 0; $f < count($old_items); $f++ ) - { - $insert_array = implode($delimeter, array('option', $old_items[$f]['option_id'], $old_items[$f]['parameter_id'], $old_items[$f]['option_code'], 'delete')); - $fcontents = $this->mx_array_insert($fcontents, $i, $insert_array); - $delete_option = true; - } - } - else if( $safe_row ) - { - $option_id = $safe_row['option_id']; - $module_data[1] = $option_id; - $exists_option_ids[] = $option_id; - } - else - { - $option_id_max++; - $option_id = $option_id_max; - $module_data[1] = $option_id; - } - break; - */ - - // // 0: block, 1: block_id, 2: block_title, 3: block_desc, // 4: function_id, 5: auth_view, 6: auth_edit, 7: auth_delete --- 2491,2494 ---- *************** *** 2695,2721 **** // - // 0: option, 1: option_id, 2: parameter_id, 3: option_code, - // 4: option_desc - // - /* - case 'option': - $table = PARAMETER_OPTION_TABLE; - $fldkey = 'option_id'; - $key = $module_data[1]; - - $sql_add = "INSERT INTO " . PARAMETER_OPTION_TABLE . " (option_id, parameter_id, option_code, option_desc) - VALUES ('$module_data[1]', '$module_data[2]', '$module_data[3]', '$module_data[4]' )"; - - $sql_update = "UPDATE " . PARAMETER_OPTION_TABLE . " - SET parameter_id = '$module_data[2]', - option_code = '$module_data[3]', - option_desc = '$module_data[4]' - WHERE option_id = '$module_data[1]'"; - - $sql_delete = "DELETE FROM " . PARAMETER_OPTION_TABLE . " WHERE option_id = " . $module_data[1] . " AND parameter_id = " . $module_data[2]; - break; - */ - - // // 0: block, 1: block_id, 2: block_title, 3: block_desc, // 4: function_id, 5: auth_view, 6: auth_edit, 7: auth_delete --- 2655,2658 ---- *************** *** 2792,2799 **** } - /* - // Delete all related blocks - $output_message .= pak_modify_block_par('delete', $module_data[2], $pak_error, $pak_debug); - */ } else if( $module_data[0] == 'parameter' ) --- 2729,2732 ---- *************** *** 2815,2822 **** } - /* - // Delete all related block_pars - $output_message .= pak_modify_block_par('delete', $module_data, $pak_error, $pak_debug); - */ } else --- 2748,2751 ---- *************** *** 2825,2842 **** // delete option // - /* - $output_message .= ' - <font color=#0000ff>delete</font> ' . $module_data[0] . ' (' . $module_data[1] . ', ' . $module_data[2] .', ' . ') ' .'<br />'; - $result = $pak_debug == false ? $db->sql_query($sql_delete) : true; - if( !$result ) - { - $output_message .= '<br /><b><font color=#0000FF>[db...error]</font></b> line: ' . __LINE__ . ' , ' . $sql_delete . '<br />'; - $pak_error = true; - } - else - { - $output_message .= '<font color=#00ff00>[db...ok]</font>' . '<br />'; - } - */ } } --- 2754,2758 ---- *************** *** 2863,2879 **** } - /* - // Now add new parameters to old blocks - if( $module_data[0] == 'parameter' ) - { - $output_message .= pak_modify_block_par('add', $module_data, $pak_error, $pak_debug); - } - - // Now insert new parameters to new blocks - if( $module_data[0] == 'block' ) - { - $output_message .= pak_insert_newblock_pars($module_data, $pak_error, $pak_debug); - } - */ } else --- 2779,2782 ---- *************** *** 2945,2956 **** } - /* - else if( file_exists("../install/db_upgrade.php") && $upgrade_module && $module_filerow == './' && !$pak_debug ) - { - include("../install/db_upgrade.php"); - $message = $lang['Module_Config_updated']; - } - */ - $return_message = array(); $return_message['new_module_id'] = $mx_module_id; --- 2848,2851 ---- *************** *** 3042,3070 **** $paramater_id = $resultset_param[$p]['parameter_id']; - - /* - // Parameter Option - $sql = "SELECT * FROM " . PARAMETER_OPTION_TABLE . " WHERE parameter_id = $paramater_id ORDER BY option_id"; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't read Parameter data", "", __LINE__, __FILE__, $sql); - } - $resultset_opt = $db->sql_fetchrowset($result); - - // 0: option, 1: option_id, 2: parameter_id, 3: option_code, - // 4: option_desc - for( $o = 0; $o < count($resultset_opt); $o++ ) - { - $module_pak .= 'option' . $delimeter . $resultset_opt[$o]['option_id'] . $delimeter; - $module_pak .= $resultset_opt[$o]['parameter_id'] . $delimeter; - $module_pak .= $resultset_opt[$o]['option_code'] . $delimeter; - $module_pak .= $resultset_opt[$o]['option_desc'] . "\n"; - } - - $module_pak .= 'option' . $delimeter. '0' . $delimeter; - $module_pak .= '0' . $delimeter; - $module_pak .= '0' . $delimeter; - $module_pak .= 'endoflist' . $delimeter . "\n"; - */ } --- 2937,2940 ---- *************** *** 3076,3107 **** $module_pak .= '0' . "\n"; - /* - // block - $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE function_id = $function_id"; - if( !($result = $db->sql_query($sql)) ) - { - mx_message_die(GENERAL_ERROR, "Couldn't read block data", "", __LINE__, __FILE__, $sql); - } - $resultset_param = $db->sql_fetchrowset($result); - - // 0: block, 1: block_id, 2: block_title, 3: block_desc, - // 4: function_id, 5: auth_view, 6: auth_edit, 7: auth_delete - for( $p = 0; $p < count($resultset_param); $p++ ) - { - $module_pak .= 'block' . $delimeter . $resultset_param[$p]['block_id'] . $delimeter; - $module_pak .= $resultset_param[$p]['block_title'] . $delimeter; - $module_pak .= $resultset_param[$p]['block_desc'] . $delimeter; - $module_pak .= $resultset_param[$p]['function_id'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_view'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_edit'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_delete'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_view_group'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_edit_group'] . $delimeter; - $module_pak .= $resultset_param[$p]['auth_delete_group'] . $delimeter; - $module_pak .= $resultset_param[$p]['show_title'] . $delimeter; - $module_pak .= $resultset_param[$p]['show_block'] . "\n"; - } - */ - // Only output 1 default block --- 2946,2949 ---- *************** *** 3148,3152 **** function mx_add_search_words($mode, $block_id, $post_text, $post_title = '') { ! global $db, $phpbb_root_path, $board_config, $lang; $search_match_table = MX_MATCH_TABLE; --- 2990,2996 ---- function mx_add_search_words($mode, $block_id, $post_text, $post_title = '') { ! global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! ! include($phpbb_root_path . 'includes/functions_search.' . $phpEx); $search_match_table = MX_MATCH_TABLE; Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_constants.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_constants.php 17 Jun 2006 20:09:06 -0000 1.21 --- mx_constants.php 26 Jun 2006 21:32:22 -0000 1.22 *************** *** 61,63 **** --- 61,72 ---- define('MX_SEARCH_TABLE' , $mx_table_prefix . 'search_results'); /**#@-*/ + + /** + * Sick and tired of these variables getting lost... + */ + $html_entities_match = array('#&(?!(\#[0-9]+;))#', '#<#', '#>#', '#"#'); + $html_entities_replace = array('&', '<', '>', '"'); + + $unhtml_specialchars_match = array('#>#', '#<#', '#"#', '#&#'); + $unhtml_specialchars_replace = array('>', '<', '"', '&'); ?> \ No newline at end of file Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mx_functions_phpbb.php 17 Jun 2006 20:09:07 -0000 1.24 --- mx_functions_phpbb.php 26 Jun 2006 21:32:22 -0000 1.25 *************** *** 43,47 **** function mx_generate_smilies($mode, $page_id) { ! global $board_config, $template, $phpEx; $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; --- 43,49 ---- function mx_generate_smilies($mode, $page_id) { ! global $board_config, $template, $phpbb_root_path, $phpEx; ! include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx); ! $smilies_path = $board_config['smilies_path']; $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; *************** *** 65,68 **** --- 67,74 ---- function mx_decode($bbtext, $bbcode_uid, $smilies_on = true) { + global $phpbb_root_path, $phpEx; + + include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); + $mytext = stripslashes($bbtext); if (!empty($bbcode_uid)) *************** *** 75,80 **** } $mytext = str_replace("\n", "\n<br />\n", $mytext); - //$mytext = make_clickable($mytext); - //return $mytext; return make_clickable($mytext); } --- 81,84 ---- Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_functions_tools.php 25 Jun 2006 21:52:41 -0000 1.3 --- mx_functions_tools.php 26 Jun 2006 21:32:22 -0000 1.4 *************** *** 146,150 **** if ( $text != '' ) { ! $text = smilies_pass($text); } } --- 146,150 ---- if ( $text != '' ) { ! $text = mx_smilies_pass($text); } } *************** *** 368,372 **** if( $this->smilies_on ) { ! $text = smilies_pass($text); } --- 368,372 ---- if( $this->smilies_on ) { ! $text = mx_smilies_pass($text); } |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:27
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/modules/mx_textblocks Modified Files: mx_textblock_multi.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_textblock_multi.php 25 Jun 2006 21:52:42 -0000 1.16 --- mx_textblock_multi.php 26 Jun 2006 21:32:23 -0000 1.17 *************** *** 108,112 **** $i = 0; - while( $i < count($art_pages) ) { --- 108,111 ---- *************** *** 114,156 **** $art_split = explode('[toc]', $art_pages[$i]); ! $article_toc = $art_split[0]; ! ! // ! // Fix up the toc title ! // ! ! if( !$allow_html ) ! { ! $article_toc = preg_replace('#(<)([\/]?.*?)(>)#is', "<\\2>", $article_toc); ! } ! ! // ! // Parse message ! // ! $article_toc = preg_replace("/\[(\S+)\]/e", "", $article_toc); ! $article_toc = make_clickable($article_toc); ! ! // ! // Parse smilies ! // ! if( $allow_smilies ) ! { ! $article_toc = mx_smilies_pass($article_toc); ! } ! ! // ! // Replace naughty words ! // ! if( count($orig_word) ) ! { ! $article_toc = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $article_toc . '<'), 1, -1)); ! } ! // ! // Replace newlines (we use this rather than nl2br because ! // till recently it wasn't XHTML compliant) ! // $article_toc = str_replace("\n", "\n<br />\n", $article_toc); ! // ! $page_toc = $art_pages[$i]; if( $page_num != $i ) --- 113,121 ---- $art_split = explode('[toc]', $art_pages[$i]); ! $article_toc = trim($art_split[0]); ! //$article_toc = preg_replace( "'\[[\/\!]*?[^\[\]]*?\]'si", "", $article_toc ); // Fixed ! $article_toc = $mx_text->display($article_toc, $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS )); ! $article_toc = strip_tags($article_toc); if( $page_num != $i ) |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:27
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/modules/mx_coreblocks Modified Files: mx_blockcp.php mx_search.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mx_blockcp.php 2 May 2006 23:22:17 -0000 1.11 --- mx_blockcp.php 26 Jun 2006 21:32:23 -0000 1.12 *************** *** 17,23 **** include($mx_root_path . 'includes/mx_functions_admincp.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx); // required for search tables - include_once($phpbb_root_path . "includes/functions_post.$phpEx"); // required by mx_generate_smilies - // // Start session management --- 17,20 ---- Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mx_search.php 18 Jun 2006 10:46:03 -0000 1.15 --- mx_search.php 26 Jun 2006 21:32:23 -0000 1.16 *************** *** 19,23 **** $title = $mx_block->block_info['block_title']; - include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); --- 19,22 ---- |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:27
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/modules/mx_textblocks/admin Modified Files: mx_module_defs.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_module_defs.php 25 Jun 2006 21:52:42 -0000 1.18 --- mx_module_defs.php 26 Jun 2006 21:32:23 -0000 1.19 *************** *** 276,282 **** // Toggles ????????????????? // ! $bbcode_on = true? true : false; ! $html_on = true? true : false; ! $smilies_on = true? true : false; // --- 276,282 ---- // Toggles ????????????????? // ! $bbcode_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_bbcode']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_bbcode']['parameter_value'] == 'TRUE'; ! $html_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_html']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_html']['parameter_value'] == 'TRUE'; ! $smilies_on = isset($HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']]) ? $HTTP_POST_VARS[$mx_blockcp->block_parameters['allow_smilies']['parameter_id']] == 'TRUE' : $mx_blockcp->block_parameters['allow_smilies']['parameter_value'] == 'TRUE'; // |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:27
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/language/lang_english Modified Files: lang_admin.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** lang_admin.php 3 May 2006 09:17:29 -0000 1.64 --- lang_admin.php 26 Jun 2006 21:32:23 -0000 1.65 *************** *** 39,43 **** $lang['4_1_Cache'] = "Regenerate Cache"; $lang['4_1_Integrity'] = "Integrity Checker"; ! $lang['4_1_Meta'] = "<meta> tags"; $lang['4_1_PHPinfo'] = "phpInfo()"; --- 39,43 ---- $lang['4_1_Cache'] = "Regenerate Cache"; $lang['4_1_Integrity'] = "Integrity Checker"; ! $lang['4_1_Meta'] = "META tags"; $lang['4_1_PHPinfo'] = "phpInfo()"; |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:26
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094/admin Modified Files: admin_mx_chkobjs.php admin_mx_gen_cache.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** admin_mx_chkobjs.php 17 Jun 2006 20:09:05 -0000 1.18 --- admin_mx_chkobjs.php 26 Jun 2006 21:32:22 -0000 1.19 *************** *** 196,200 **** $sql = "SELECT * FROM ".$table." ORDER BY ".implode(',', $fkey); $result = $db->sql_query($sql); - $db->sql_freeresult($result); if( !$result ) --- 196,199 ---- *************** *** 271,274 **** --- 270,275 ---- $html.='</table><br />' . "\n"; + + $db->sql_freeresult($result); echo $html; } Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_gen_cache.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** admin_mx_gen_cache.php 17 Jun 2006 20:09:05 -0000 1.23 --- admin_mx_gen_cache.php 26 Jun 2006 21:32:22 -0000 1.24 *************** *** 50,61 **** // Update mxBB page/block cache // ! $mx_cache->trash(); //Empty cache folder ! $mx_cache->update(); //Rgenerate all page_ and block_ files // // Update config/custom cache // ! $mx_cache->tidy(); //Not really needed ! $mx_cache->unload(); //Regenerate data_global.php $message = $lang['Cache_generate']; --- 50,63 ---- // Update mxBB page/block cache // ! $mx_cache->trash(); // Empty cache folder ! $mx_cache->update(); // Rgenerate all page_ and block_ files // // Update config/custom cache // ! $mx_cache->tidy(); // Not really needed ! $mx_cache->destroy('phpbb_config'); // Not really needed ! $mx_cache->destroy('mxbb_config'); // Not really needed ! $mx_cache->unload(); // Regenerate data_global.php $message = $lang['Cache_generate']; |
|
From: Jon O. <jon...@us...> - 2006-06-26 21:32:26
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12094 Modified Files: common.php Log Message: A few fixes related to new mx_text class, and other minor fixes Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** common.php 18 Jun 2006 10:46:01 -0000 1.55 --- common.php 26 Jun 2006 21:32:22 -0000 1.56 *************** *** 200,204 **** include_once($phpbb_root_path . 'includes/sessions.' . $phpEx); include_once($phpbb_root_path . 'includes/functions.' . $phpEx); ! include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class --- 200,204 ---- include_once($phpbb_root_path . 'includes/sessions.' . $phpEx); include_once($phpbb_root_path . 'includes/functions.' . $phpEx); ! //include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class |
2 messages has been excluded from this view by a project administrator.
