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...> - 2008-06-16 10:50:10
|
Update of /cvsroot/mxbb/core/templates/subsilver2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8039/subsilver2 Modified Files: overall_footer.html Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: overall_footer.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/subsilver2/overall_footer.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** overall_footer.html 16 Feb 2008 22:06:46 -0000 1.3 --- overall_footer.html 16 Jun 2008 10:49:33 -0000 1.4 *************** *** 7,20 **** {ADMIN_LINK}<br /> <!-- ! We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of phpBB 2.0. If you cannot (for good reason) retain the full copyright we request you at least leave in place the ! Powered by phpBB line, with phpBB linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. ! The phpBB Group : 2002 & MX-Publisher Team : 2002 // --> ! {POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2007 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> </div> </td> --- 7,20 ---- {ADMIN_LINK}<br /> <!-- ! We request you retain the full copyright notice below including the link to www.mx-publisher.com (and www.phpbb.com if you are using MXP with phpbb). This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of MXP. If you cannot (for good reason) retain the full copyright we request you at least leave in place the ! Powered by MXP line, with MXP linked to www.mx-publisher.com. If you refuse to include even this then support on our forums may be affected. ! The MX-Publisher Team : 2008 & The phpBB Group : 2002 // --> ! {POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2008 <!-- IF PHPBB_BACKEND --> & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> </div> </td> |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:50:09
|
Update of /cvsroot/mxbb/core/templates/mxBase2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8039/mxBase2 Modified Files: overall_footer.tpl Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase2/overall_footer.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overall_footer.tpl 16 Feb 2008 22:05:49 -0000 1.2 --- overall_footer.tpl 16 Jun 2008 10:49:29 -0000 1.3 *************** *** 1,3 **** ! <div id="footer"> <div class="globalNav" align="center"> <!-- BEGIN editcp_exists --> --- 1,6 ---- ! <!-- BEGIN page_last_updated --> ! <div align="right"><span class="copyright">{page_last_updated.L_PAGE_UPDATED} {page_last_updated.TIME} {page_last_updated.NAME} </div> ! <!-- END page_last_updated --> ! <div id="footer"> <div class="globalNav" align="center"> <!-- BEGIN editcp_exists --> *************** *** 7,23 **** {ADMIN_LINK} <!-- ! We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of phpBB 2.0. If you cannot (for good reason) retain the full copyright we request you at least leave in place the ! Powered by phpBB line, with phpBB linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. ! The phpBB Group : 2002 & mxBB Team : 2002 // --> ! {POWERED_BY} <a href="http://www.mxbb.net/" target="_mx-system" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2007 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> ! <!-- BEGIN page_last_updated --> ! <div class="pageStats" align="center">{page_last_updated.L_PAGE_UPDATED} {page_last_updated.TIME} {page_last_updated.NAME} </div> ! <!-- END page_last_updated --> </div> </div> --- 10,23 ---- {ADMIN_LINK} <!-- ! We request you retain the full copyright notice below including the link to www.mx-publisher.com (and www.phpbb.com if you are using MXP with phpbb). This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of MXP. If you cannot (for good reason) retain the full copyright we request you at least leave in place the ! Powered by MXP line, with MXP linked to www.mx-publisher.com. If you refuse to include even this then support on our forums may be affected. ! The MX-Publisher Team : 2008 & The phpBB Group : 2002 // --> ! {POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2008 <!-- IF PHPBB_BACKEND --> & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> </div> </div> |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:50:09
|
Update of /cvsroot/mxbb/core/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8039/prosilver Modified Files: overall_footer.html Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: overall_footer.html =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_footer.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** overall_footer.html 16 Feb 2008 22:06:19 -0000 1.6 --- overall_footer.html 16 Jun 2008 10:49:32 -0000 1.7 *************** *** 21,35 **** <!-- ! We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain ! the full copyright we ask you at least leave in place the "Powered by phpBB" line, with ! "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our ! forums may be affected. ! The phpBB Group : 2006 ! //--> ! <div class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2008 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2000, 2002, 2005, 2007 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> --- 21,35 ---- <!-- ! We request you retain the full copyright notice below including the link to www.mx-publisher.com (and www.phpbb.com if you are using MXP with phpbb). This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of MXP. If you cannot (for good ! reason) retain the full copyright we request you at least leave in place the ! Powered by MXP line, with MXP linked to www.mx-publisher.com. If you refuse ! to include even this then support on our forums may be affected. ! The MX-Publisher Team : 2008 & The phpBB Group : 2002 ! // --> ! <div class="copyright">{POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2008 <!-- IF PHPBB_BACKEND --> & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:50:09
|
Update of /cvsroot/mxbb/core/templates/mxBase1 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8039/mxBase1 Modified Files: overall_footer.tpl Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase1/overall_footer.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overall_footer.tpl 16 Feb 2008 22:05:32 -0000 1.2 --- overall_footer.tpl 16 Jun 2008 10:49:29 -0000 1.3 *************** *** 10,23 **** {ADMIN_LINK} <!-- ! We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of phpBB 2.0. If you cannot (for good reason) retain the full copyright we request you at least leave in place the ! Powered by phpBB line, with phpBB linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. ! The phpBB Group : 2002 & mxBB Team : 2002 // --> ! {POWERED_BY} <a href="http://www.mxbb.net/" target="_mx-system" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2007 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> </div> </div> --- 10,23 ---- {ADMIN_LINK} <!-- ! We request you retain the full copyright notice below including the link to www.mx-publisher.com (and www.phpbb.com if you are using MXP with phpbb). This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of MXP. If you cannot (for good reason) retain the full copyright we request you at least leave in place the ! Powered by MXP line, with MXP linked to www.mx-publisher.com. If you refuse to include even this then support on our forums may be affected. ! The MX-Publisher Team : 2008 & The phpBB Group : 2002 // --> ! {POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2008 <!-- IF PHPBB_BACKEND --> & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> </div> </div> |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:49:18
|
Update of /cvsroot/mxbb/core/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7198/admin Modified Files: admin_mx_portal.tpl index_navigate.tpl Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: admin_mx_portal.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/admin/admin_mx_portal.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_mx_portal.tpl 10 Feb 2008 21:24:03 -0000 1.2 --- admin_mx_portal.tpl 16 Jun 2008 10:48:37 -0000 1.3 *************** *** 215,226 **** --- 215,229 ---- <th class="thHead" colspan="2">{L_GENERAL_CONFIG_INFO}</th> </tr> + <!-- IF PHPBB_BACKEND --> <tr> <td class="row1">{L_PHPBB_RELATIVE_PATH}</td> <td class="row2">{PHPBB_RELATIVE_PATH}</td> </tr> + <!-- ENDIF --> <tr> <td class="row1">{L_PORTAL_VERSION}</td> <td class="row2">{PORTAL_VERSION}</td> </tr> + <!-- IF PHPBB_BACKEND --> <tr> <th class="thHead" colspan="2">{L_PHPBB_INFO}</th> *************** *** 238,241 **** --- 241,245 ---- <td class="row2">{PHPBB_SCRIPT_PATH}</td> </tr> + <!-- ENDIF --> </table> </form> Index: index_navigate.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/admin/index_navigate.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index_navigate.tpl 4 Feb 2008 15:59:56 -0000 1.2 --- index_navigate.tpl 16 Jun 2008 10:48:38 -0000 1.3 *************** *** 239,248 **** <td class="row1"><span class="genmed"><a href="{U_PORTAL_INDEX}" target="_parent" class="genmed">{L_PORTAL_INDEX}</a></span></td> </tr> <tr> ! <td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="_parent" class="genmed">{L_FORUM_INDEX}</a></span></td> </tr> <tr> ! <td class="row1"><span class="genmed"><a href="{U_FORUM_INDEX}" target="main" class="genmed">{L_PREVIEW_FORUM}</a></span></td> </tr> <tr> <td class="row1"><span class="genmed"><a href="{U_PORTAL_INDEX}" target="main" class="genmed">{L_PREVIEW_PORTAL}</a></span></td> --- 239,250 ---- <td class="row1"><span class="genmed"><a href="{U_PORTAL_INDEX}" target="_parent" class="genmed">{L_PORTAL_INDEX}</a></span></td> </tr> + <!-- BEGIN module_phpbb --> <tr> ! <td class="row1"><span class="genmed"><a href="{module_phpbb.U_FORUM_INDEX}" target="_parent" class="genmed">{module_phpbb.L_FORUM_INDEX}</a></span></td> </tr> <tr> ! <td class="row1"><span class="genmed"><a href="{module_phpbb.U_FORUM_INDEX}" target="main" class="genmed">{module_phpbb.L_PREVIEW_FORUM}</a></span></td> </tr> + <!-- END module_phpbb --> <tr> <td class="row1"><span class="genmed"><a href="{U_PORTAL_INDEX}" target="main" class="genmed">{L_PREVIEW_PORTAL}</a></span></td> |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:48:48
|
Update of /cvsroot/mxbb/core/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7198 Modified Files: overall_footer.tpl Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: overall_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/overall_footer.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** overall_footer.tpl 16 Feb 2008 22:05:19 -0000 1.4 --- overall_footer.tpl 16 Jun 2008 10:48:39 -0000 1.5 *************** *** 10,23 **** {ADMIN_LINK}<br /> <!-- ! We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of phpBB 2.0. If you cannot (for good reason) retain the full copyright we request you at least leave in place the ! Powered by phpBB line, with phpBB linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. ! The phpBB Group : 2002 & MX-Publisher Team : 2002 // --> ! {POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2007 & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> </div> </td> --- 10,23 ---- {ADMIN_LINK}<br /> <!-- ! We request you retain the full copyright notice below including the link to www.mx-publisher.com (and www.phpbb.com if you are using MXP with phpbb). This not only gives respect to the large amount of time given freely by the developers ! but also helps build interest, traffic and use of MXP. If you cannot (for good reason) retain the full copyright we request you at least leave in place the ! Powered by MXP line, with MXP linked to www.mx-publisher.com. If you refuse to include even this then support on our forums may be affected. ! The MX-Publisher Team : 2008 & The phpBB Group : 2002 // --> ! {POWERED_BY} <a href="http://www.mx-publisher.com/" target="_mx-publisher" class="copyright">MX-Publisher (MXP)</a> {MX_VERSION} © 2001-2008 <!-- IF PHPBB_BACKEND --> & <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} © 2001, 2003 phpBB Group <!-- ENDIF --> | <a href="{MXBB_EXTRA_URL}" target="_phpbb" class="copyright">{MXBB_EXTRA}</a> </div> </td> |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:48:22
|
Update of /cvsroot/mxbb/core/install/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6687 Modified Files: lang_admin.php Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/install/language/lang_english/lang_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang_admin.php 10 Feb 2008 20:59:08 -0000 1.3 --- lang_admin.php 16 Jun 2008 10:47:39 -0000 1.4 *************** *** 34,38 **** $lang['Install_Instruction_phpBB'] = 'Please note, even if you plan to use MX-Publisher with phpBB, this installation does not modify your phpBB database in any way.'; $lang['Upgrade_Instruction'] = 'MX-Publisher is already installed. Please make backups of your database now !<br /><br />The next step will modify the structure of your database (please note MX-Publisher does not modify your phpBB database in any way). If for whatever reason this upgrade procedure fails, there would be no other way to return to your current state. Please make backups of your database BEFORE proceeding !<br /><br />Once done, click the button below to start the upgrade procedure.'; ! $lang['Install_moreinfo'] = '%sRelease Notes%s | %sWelcome Pack%s | %sOnline FAQ%s | %sSupport Forums%s | %sTerms Of Use%s'; $lang['Install_settings'] = 'Installation Settings'; $lang['Choose_lang_explain'] = 'Please use the form below to select the language you wish to use throughout the installation process.'; --- 34,38 ---- $lang['Install_Instruction_phpBB'] = 'Please note, even if you plan to use MX-Publisher with phpBB, this installation does not modify your phpBB database in any way.'; $lang['Upgrade_Instruction'] = 'MX-Publisher is already installed. Please make backups of your database now !<br /><br />The next step will modify the structure of your database (please note MX-Publisher does not modify your phpBB database in any way). If for whatever reason this upgrade procedure fails, there would be no other way to return to your current state. Please make backups of your database BEFORE proceeding !<br /><br />Once done, click the button below to start the upgrade procedure.'; ! $lang['Install_moreinfo'] = '%sRelease Notes%s | %sOnline Manual%s | %sOnline KB%s | %sSupport Forums%s | %sTerms Of Use%s'; $lang['Install_settings'] = 'Installation Settings'; $lang['Choose_lang_explain'] = 'Please use the form below to select the language you wish to use throughout the installation process.'; |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:47:30
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6618 Modified Files: functions_install.php Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** functions_install.php 10 Feb 2008 20:58:47 -0000 1.7 --- functions_install.php 16 Jun 2008 10:47:24 -0000 1.8 *************** *** 36,41 **** $install_moreinfo = sprintf($lang['Install_moreinfo'], '<a href="'.U_RELEASE_NOTES.'" target="_blank">', '</a>', ! '<a href="'.U_WELCOME_PACK.'" target="_blank">', '</a>', ! '<a href="'.U_ONLINE_FAQ.'" target="_blank">', '</a>', '<a href="'.U_ONLINE_SUPPORT.'" target="_blank">', '</a>', '<a href="'.U_TERMS_OF_USE.'" target="_blank">', '</a>' --- 36,41 ---- $install_moreinfo = sprintf($lang['Install_moreinfo'], '<a href="'.U_RELEASE_NOTES.'" target="_blank">', '</a>', ! '<a href="'.U_ONLINE_MANUAL.'" target="_blank">', '</a>', ! '<a href="'.U_ONLINE_KB.'" target="_blank">', '</a>', '<a href="'.U_ONLINE_SUPPORT.'" target="_blank">', '</a>', '<a href="'.U_TERMS_OF_USE.'" target="_blank">', '</a>' *************** *** 1267,1270 **** --- 1267,1281 ---- { $portal_table['default_style'] = "'1'"; + $portal_table['default_admin_style'] = "'3'"; + } + else if (!$_POST['mxbb'] && $portal_backend = 'phpbb2') // phpBB2 install + { + $portal_table['default_style'] = "'4'"; + $portal_table['default_admin_style'] = "'4'"; + } + else + { + $portal_table['default_style'] = "'6'"; + $portal_table['default_admin_style'] = "'5'"; } *************** *** 1281,1285 **** $sql = "UPDATE " . USERS_TABLE . " SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "' ! WHERE username = 'Admin'"; parse_cmd_sql($sql); --- 1292,1296 ---- $sql = "UPDATE " . USERS_TABLE . " SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "' ! WHERE username = 'admin'"; parse_cmd_sql($sql); |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:47:15
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6050/admin Modified Files: admin_mx_portal.php index.php Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** admin_mx_portal.php 11 Feb 2008 11:13:16 -0000 1.41 --- admin_mx_portal.php 16 Jun 2008 10:46:36 -0000 1.42 *************** *** 381,386 **** --- 381,399 ---- //"PORTAL_PHPBB_URL" => $portal_config['portal_phpbb_url'], + 'PHPBB_BACKEND' => PORTAL_BACKEND != 'internal', + )); + switch (PORTAL_BACKEND) + { + case 'internal': + break; + + case 'phpbb2': + case 'phpbb3': + $template->assign_block_vars('phpbb_backend', array()); + break; + } + $template->pparse('admin_portal'); include_once('page_footer_admin.' . $phpEx); Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** index.php 15 Jun 2008 21:59:42 -0000 1.48 --- index.php 16 Jun 2008 10:46:37 -0000 1.49 *************** *** 118,123 **** "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], ! "L_PREVIEW_FORUM" => $lang['Preview_forum']) ! ); // --- 118,122 ---- "L_FORUM_INDEX" => $lang['Main_index'], "L_ADMIN_INDEX" => $lang['Admin_Index'], ! )); // *************** *** 187,191 **** $module_phpbb = read_admin($phpbb_root_path . 'admin/'); $template->assign_block_vars('module_phpbb', array( ! 'L_PHPBB' => $lang['Phpbb'] )); --- 186,193 ---- $module_phpbb = read_admin($phpbb_root_path . 'admin/'); $template->assign_block_vars('module_phpbb', array( ! 'L_PHPBB' => $lang['Phpbb'], ! "L_FORUM_INDEX" => $lang['Main_index'], ! "L_PREVIEW_FORUM" => $lang['Preview_forum'], ! "U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"), )); *************** *** 239,243 **** $template->assign_block_vars('module_phpbb', array( ! 'L_PHPBB' => $lang['Phpbb'] )); --- 241,248 ---- $template->assign_block_vars('module_phpbb', array( ! 'L_PHPBB' => $lang['Phpbb'], ! "L_FORUM_INDEX" => $lang['Main_index'], ! "L_PREVIEW_FORUM" => $lang['Preview_forum'], ! "U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"), )); *************** *** 1008,1012 **** if ($fsock = @fsockopen('www.mx-publisher.com', 80, $errno, $errstr)) { ! @fputs($fsock, "GET /updatecheck/28x.txt HTTP/1.1\r\n"); @fputs($fsock, "HOST: www.mx-publisher.com\r\n"); @fputs($fsock, "Connection: close\r\n\r\n"); --- 1013,1017 ---- if ($fsock = @fsockopen('www.mx-publisher.com', 80, $errno, $errstr)) { ! @fputs($fsock, "GET /updatecheck/30x.txt HTTP/1.1\r\n"); @fputs($fsock, "HOST: www.mx-publisher.com\r\n"); @fputs($fsock, "Connection: close\r\n\r\n"); *************** *** 1032,1035 **** --- 1037,1042 ---- $latest_mxbb_head_revision = (int) $mxbb_version_info[0]; $latest_mxbb_minor_revision = (int) $mxbb_version_info[2]; + $latest_mxbb_patch_revision = (int) $mxbb_version_info[3]; // For betas/RC + $latest_mxbb_version = (int) $mxbb_version_info[0] . '.' . (int) $mxbb_version_info[1] . '.' . (int) $mxbb_version_info[2]; |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:47:15
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6050/includes Modified Files: page_tail.php Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** page_tail.php 4 Feb 2008 15:56:43 -0000 1.37 --- page_tail.php 16 Jun 2008 10:46:38 -0000 1.38 *************** *** 123,126 **** --- 123,127 ---- $template->assign_vars(array( + 'PHPBB_BACKEND' => PORTAL_BACKEND != 'internal', 'U_PORTAL_ROOT_PATH' => PORTAL_URL, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:47:15
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6050/install Modified Files: mx_install.php Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** mx_install.php 15 Jun 2008 21:00:06 -0000 1.96 --- mx_install.php 16 Jun 2008 10:46:39 -0000 1.97 *************** *** 46,54 **** // These URLs are used in the footer installation panels. // ! define('U_RELEASE_NOTES', 'http://www.mx-publisher.com/forum/viewtopic.php?t=1224'); ! define('U_WELCOME_PACK', 'http://www.mx-publisher.com/index.php?page=136'); ! define('U_ONLINE_FAQ', 'http://www.mx-publisher.com/index.php?page=117'); ! define('U_ONLINE_SUPPORT', 'http://www.mx-publisher.com/index.php?page=2'); ! define('U_TERMS_OF_USE', 'http://www.mx-publisher.com/index.php?page=126&dynamic_block=133'); // --- 46,55 ---- // These URLs are used in the footer installation panels. // ! define('U_RELEASE_NOTES', 'http://www.mx-publisher.com/phpBB2/viewtopic.php?t=10812'); ! //define('U_WELCOME_PACK', 'http://www.mx-publisher.com/index.php?page=136'); ! define('U_ONLINE_MANUAL', 'http://www.mx-publisher.com/docs/manual'); ! define('U_ONLINE_KB', 'http://www.mx-publisher.com/docs/kb'); ! define('U_ONLINE_SUPPORT', 'http://www.mx-publisher.com/forum'); ! define('U_TERMS_OF_USE', 'http://www.mx-publisher.com/toe'); // *************** *** 552,558 **** $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! $admin_name = $mx_request_vars->post('admin_name_mxbb', MX_TYPE_NO_TAGS, 'admin'); ! $admin_pass1 = $mx_request_vars->post('admin_pass1_mxbb', MX_TYPE_NO_TAGS, 'admin'); ! $admin_pass2 = $mx_request_vars->post('admin_pass2_mxbb', MX_TYPE_NO_TAGS, 'admin'); $portal_backend = 'internal'; --- 553,559 ---- $mx_table_prefix = $mx_request_vars->post('mx_prefix', MX_TYPE_NO_TAGS); ! $admin_name = !$mx_request_vars->is_empty_post('admin_name_mxbb') ? $mx_request_vars->post('admin_name_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; ! $admin_pass1 = !$mx_request_vars->is_empty_post('admin_pass1_mxbb') ? $mx_request_vars->post('admin_pass1_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; ! $admin_pass2 = !$mx_request_vars->is_empty_post('admin_pass2_mxbb') ? $mx_request_vars->post('admin_pass2_mxbb', MX_TYPE_NO_TAGS, 'admin') : 'admin'; $portal_backend = 'internal'; *************** *** 571,576 **** $admin_name = !$mx_request_vars->is_empty_post('admin_name') ? $mx_request_vars->post('admin_name', MX_TYPE_NO_TAGS) : 'admin'; ! $admin_pass1 = $mx_request_vars->post('admin_pass1', MX_TYPE_NO_TAGS, 'admin'); ! $admin_pass2 = $mx_request_vars->post('admin_pass2', MX_TYPE_NO_TAGS, 'admin'); $portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; --- 572,577 ---- $admin_name = !$mx_request_vars->is_empty_post('admin_name') ? $mx_request_vars->post('admin_name', MX_TYPE_NO_TAGS) : 'admin'; ! $admin_pass1 = !$mx_request_vars->is_empty_post('admin_pass1') ? $mx_request_vars->post('admin_pass1', MX_TYPE_NO_TAGS, 'admin') : 'admin'; ! $admin_pass2 = !$mx_request_vars->is_empty_post('admin_pass2') ? $mx_request_vars->post('admin_pass2', MX_TYPE_NO_TAGS, 'admin') : 'admin'; $portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; |
|
From: Jon O. <jon...@us...> - 2008-06-16 10:46:45
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6050 Modified Files: common.php login.php Log Message: Updated install wizard, with new references to new site Fixed the creation of default user Updated all tpl footer, with updated copyrights etc New validation check when switching backend, to ensure you can always manage the system Cleanup when in internal mode. phpbb settings are hidden Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** login.php 26 Feb 2008 18:36:45 -0000 1.28 --- login.php 16 Jun 2008 10:46:37 -0000 1.29 *************** *** 124,128 **** 'L_ENTER_PASSWORD' => $mx_request_vars->is_get('admin') ? $lang['Admin_reauthenticate'] : $lang['Enter_password'], ! 'L_SEND_PASSWORD' => $lang['Forgotten_password'], 'U_SEND_PASSWORD' => mx3_append_sid($phpbb_root_path . "profile.$phpEx", "mode=sendpassword"), --- 124,128 ---- 'L_ENTER_PASSWORD' => $mx_request_vars->is_get('admin') ? $lang['Admin_reauthenticate'] : $lang['Enter_password'], ! 'L_SEND_PASSWORD' => PORTAL_BACKEND != 'internal' ? $lang['Forgotten_password'] : '', 'U_SEND_PASSWORD' => mx3_append_sid($phpbb_root_path . "profile.$phpEx", "mode=sendpassword"), Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** common.php 15 Jun 2008 09:15:42 -0000 1.92 --- common.php 16 Jun 2008 10:46:37 -0000 1.93 *************** *** 241,244 **** --- 241,246 ---- @include_once($phpbb_root_path . 'config.' . $phpEx); $tplEx = 'tpl'; + $_result = $db->sql_query( "SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'" ); + $portal_backend_valid_db = $db->sql_numrows( $_result ) != 0; break; case 'phpbb3': *************** *** 248,255 **** @include_once($phpbb_root_path . 'config.' . $phpEx); $tplEx = 'html'; break; } ! if (!$portal_backend_valid_file || empty($table_prefix)) { // --- 250,259 ---- @include_once($phpbb_root_path . 'config.' . $phpEx); $tplEx = 'html'; + $_result = $db->sql_query( "SELECT config_value from " . $table_prefix . "config WHERE config_name = 'cookie_domain'" ); + $portal_backend_valid_db = $db->sql_numrows( $_result ) != 0; break; } ! if (!$portal_backend_valid_file || empty($table_prefix) || !$portal_backend_valid_db) { // |
|
From: Jon O. <jon...@us...> - 2008-06-16 08:30:34
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14455 Modified Files: mx_functions_bbcode.php mx_functions_phpbb.php mx_functions_tools.php Log Message: I've updated your bbcodes file, NO code updates, i have only reordered functions, so it's easier to file compare with original phpbb bbcode.php. Also, i have updated a few load_file() calls to ensure we are loading from phpbb2 shared folder. i know this is not needed with your standalone bbcodes, but for our own info. Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** mx_functions_phpbb.php 15 Jun 2008 22:44:07 -0000 1.63 --- mx_functions_phpbb.php 16 Jun 2008 08:30:26 -0000 1.64 *************** *** 1577,1581 **** { global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/bbcode.' . $phpEx); } --- 1577,1582 ---- { global $phpbb_root_path, $phpEx; ! mx_page::load_file('bbcode', 'phpbb3'); ! //include($phpbb_root_path . 'includes/bbcode.' . $phpEx); } Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** mx_functions_tools.php 16 Jun 2008 05:28:28 -0000 1.30 --- mx_functions_tools.php 16 Jun 2008 08:30:26 -0000 1.31 *************** *** 155,159 **** if (!class_exists('bbcode')) { ! mx_page::load_file('bbcode'); } --- 155,159 ---- if (!class_exists('bbcode')) { ! mx_page::load_file('bbcode', 'phpbb3'); } *************** *** 163,167 **** } */ - //require($mx_root_path . 'includes/shared/phpbb2/includes/bbcode.'.$phpEx); } --- 163,166 ---- Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mx_functions_bbcode.php 16 Jun 2008 05:28:28 -0000 1.5 --- mx_functions_bbcode.php 16 Jun 2008 08:30:25 -0000 1.6 *************** *** 15,426 **** } ! /** ! * phpBB Smilies pass. ! * ! * Hacking smilies_pass from phpbb/includes/bbcode.php ! * ! * @param string $message ! * @return string ! */ [...1092 lines suppressed...] + //What we do here with forum_id versus page_id ? + if ($mode == 'inline' && $display_link) + { + $template->assign_vars(array( + 'S_SHOW_SMILEY_LINK' => true, + 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", 'mode=smilies&f=' . $forum_id)) + ); + } + */ + break; + } + + if ($mode == 'window') + { + $template->pparse('smiliesbody'); + include($mx_root_path . 'includes/page_tail.'.$phpEx); + } + } ?> \ No newline at end of file |
|
From: FlorinCB <ory...@us...> - 2008-06-16 05:28:33
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28251 Modified Files: mx_functions_bbcode.php mx_functions_tools.php Log Message: bbcode fix Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** mx_functions_tools.php 15 Jun 2008 21:00:03 -0000 1.29 --- mx_functions_tools.php 16 Jun 2008 05:28:28 -0000 1.30 *************** *** 317,321 **** if (!empty($text)) { ! $this->bbcode_uid = ($this->bbcode_on) ? make_bbcode_uid() : ''; $text = $this->prepare_message(trim($text), $this->html_on, $this->bbcode_on, $this->smilies_on, $this->bbcode_uid); } --- 317,321 ---- if (!empty($text)) { ! $this->bbcode_uid = ($this->bbcode_on) ? mx_make_bbcode_uid() : ''; $text = $this->prepare_message(trim($text), $this->html_on, $this->bbcode_on, $this->smilies_on, $this->bbcode_uid); } *************** *** 403,407 **** $text = ( !empty($text) ) ? htmlspecialchars(trim(stripslashes($text))) : ''; ! $bbcode_uid = ( $this->bbcode_on ) ? make_bbcode_uid() : ''; $text = stripslashes($this->prepare_message(addslashes($this->unprepare_message($text)), $this->html_on, $this->bbcode_on, $this->smilies_on, $bbcode_uid)); --- 403,407 ---- $text = ( !empty($text) ) ? htmlspecialchars(trim(stripslashes($text))) : ''; ! $bbcode_uid = ( $this->bbcode_on ) ? mx_make_bbcode_uid() : ''; $text = stripslashes($this->prepare_message(addslashes($this->unprepare_message($text)), $this->html_on, $this->bbcode_on, $this->smilies_on, $bbcode_uid)); *************** *** 507,511 **** if($bbcode_on && $bbcode_uid != '') { ! $message = bbencode_first_pass($message, $bbcode_uid); } --- 507,511 ---- if($bbcode_on && $bbcode_uid != '') { ! $message = mx_bbencode_first_pass($message, $bbcode_uid); } *************** *** 1857,1861 **** if ( $this->bbcode_on ) { ! $bbcode_uid = make_bbcode_uid(); } --- 1857,1861 ---- if ( $this->bbcode_on ) { ! $bbcode_uid = mx_make_bbcode_uid(); } *************** *** 2040,2044 **** if ( $this->bbcode_on ) { ! $bbcode_uid = make_bbcode_uid(); } --- 2040,2044 ---- if ( $this->bbcode_on ) { ! $bbcode_uid = mx_make_bbcode_uid(); } Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_functions_bbcode.php 15 Jun 2008 21:08:18 -0000 1.4 --- mx_functions_bbcode.php 16 Jun 2008 05:28:28 -0000 1.5 *************** *** 508,511 **** --- 508,830 ---- } + function mx_make_bbcode_uid() + { + // Unique ID for this message.. + + $uid = mx_dss_rand(); + $uid = substr($uid, 0, BBCODE_UID_LEN); + + return $uid; + } + + function mx_bbencode_first_pass($text, $uid) + { + // pad it with a space so we can distinguish between FALSE and matching the 1st char (index 0). + // This is important; bbencode_quote(), bbencode_list(), and bbencode_code() all depend on it. + $text = " " . $text; + + // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. + $text = mx_bbencode_first_pass_pda($text, $uid, '[code]', '[/code]', '', true, ''); + + // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. + $text = mx_bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, ''); + $text = mx_bbencode_first_pass_pda($text, $uid, '/\[quote=\\\\"(.*?)\\\\"\]/is', '[/quote]', '', false, '', "[quote:$uid=\\\"\\1\\\"]"); + + // [list] and [list=x] for (un)ordered lists. + $open_tag = array(); + $open_tag[0] = "[list]"; + + // unordered.. + $text = mx_bbencode_first_pass_pda($text, $uid, $open_tag, "[/list]", "[/list:u]", false, 'replace_listitems'); + + $open_tag[0] = "[list=1]"; + $open_tag[1] = "[list=a]"; + + // ordered. + $text = mx_bbencode_first_pass_pda($text, $uid, $open_tag, "[/list]", "[/list:o]", false, 'replace_listitems'); + + // [color] and [/color] for setting text color + $text = preg_replace("#\[color=(\#[0-9A-F]{6}|[a-z\-]+)\](.*?)\[/color\]#si", "[color=\\1:$uid]\\2[/color:$uid]", $text); + + // [size] and [/size] for setting text size + $text = preg_replace("#\[size=([1-2]?[0-9])\](.*?)\[/size\]#si", "[size=\\1:$uid]\\2[/size:$uid]", $text); + + // [b] and [/b] for bolding text. + $text = preg_replace("#\[b\](.*?)\[/b\]#si", "[b:$uid]\\1[/b:$uid]", $text); + + // [u] and [/u] for underlining text. + $text = preg_replace("#\[u\](.*?)\[/u\]#si", "[u:$uid]\\1[/u:$uid]", $text); + + // [i] and [/i] for italicizing text. + $text = preg_replace("#\[i\](.*?)\[/i\]#si", "[i:$uid]\\1[/i:$uid]", $text); + + // [img]image_url_here[/img] code.. + $text = preg_replace("#\[img\]((http|ftp|https|ftps)://)([^ \?&=\#\"\n\r\t<]*?(\.(jpg|jpeg|gif|png)))\[/img\]#sie", "'[img:$uid]\\1' . str_replace(' ', '%20', '\\3') . '[/img:$uid]'", $text); + + // Remove our padding from the string.. + return substr($text, 1);; + + } // bbencode_first_pass() + + /** + * $text - The text to operate on. + * $uid - The UID to add to matching tags. + * $open_tag - The opening tag to match. Can be an array of opening tags. + * $close_tag - The closing tag to match. + * $close_tag_new - The closing tag to replace with. + * $mark_lowest_level - boolean - should we specially mark the tags that occur + * at the lowest level of nesting? (useful for [code], because + * we need to match these tags first and transform HTML tags + * in their contents.. + * $func - This variable should contain a string that is the name of a function. + * That function will be called when a match is found, and passed 2 + * parameters: ($text, $uid). The function should return a string. + * This is used when some transformation needs to be applied to the + * text INSIDE a pair of matching tags. If this variable is FALSE or the + * empty string, it will not be executed. + * If open_tag is an array, then the pda will try to match pairs consisting of + * any element of open_tag followed by close_tag. This allows us to match things + * like [list=A]...[/list] and [list=1]...[/list] in one pass of the PDA. + * + * NOTES: - this function assumes the first character of $text is a space. + * - every opening tag and closing tag must be of the [...] format. + */ + function mx_bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_new, $mark_lowest_level, $func, $open_regexp_replace = false) + { + $open_tag_count = 0; + + if (!$close_tag_new || ($close_tag_new == '')) + { + $close_tag_new = $close_tag; + } + + $close_tag_length = strlen($close_tag); + $close_tag_new_length = strlen($close_tag_new); + $uid_length = strlen($uid); + + $use_function_pointer = ($func && ($func != '')); + + $stack = array(); + + if (is_array($open_tag)) + { + if (0 == count($open_tag)) + { + // No opening tags to match, so return. + return $text; + } + $open_tag_count = count($open_tag); + } + else + { + // only one opening tag. make it into a 1-element array. + $open_tag_temp = $open_tag; + $open_tag = array(); + $open_tag[0] = $open_tag_temp; + $open_tag_count = 1; + } + + $open_is_regexp = false; + + if ($open_regexp_replace) + { + $open_is_regexp = true; + if (!is_array($open_regexp_replace)) + { + $open_regexp_temp = $open_regexp_replace; + $open_regexp_replace = array(); + $open_regexp_replace[0] = $open_regexp_temp; + } + } + + if ($mark_lowest_level && $open_is_regexp) + { + mx_message_die(GENERAL_ERROR, "Unsupported operation for bbcode_first_pass_pda()."); + } + + // Start at the 2nd char of the string, looking for opening tags. + $curr_pos = 1; + while ($curr_pos && ($curr_pos < strlen($text))) + { + $curr_pos = strpos($text, "[", $curr_pos); + + // If not found, $curr_pos will be 0, and the loop will end. + if ($curr_pos) + { + // We found a [. It starts at $curr_pos. + // check if it's a starting or ending tag. + $found_start = false; + $which_start_tag = ""; + $start_tag_index = -1; + + for ($i = 0; $i < $open_tag_count; $i++) + { + // Grab everything until the first "]"... + $possible_start = substr($text, $curr_pos, strpos($text, ']', $curr_pos + 1) - $curr_pos + 1); + + // + // We're going to try and catch usernames with "[' characters. + // + if( preg_match('#\[quote=\\\"#si', $possible_start, $match) && !preg_match('#\[quote=\\\"(.*?)\\\"\]#si', $possible_start) ) + { + // OK we are in a quote tag that probably contains a ] bracket. + // Grab a bit more of the string to hopefully get all of it.. + if ($close_pos = strpos($text, '"]', $curr_pos + 14)) + { + if (strpos(substr($text, $curr_pos + 14, $close_pos - ($curr_pos + 14)), '[quote') === false) + { + $possible_start = substr($text, $curr_pos, $close_pos - $curr_pos + 7); + } + } + } + + // Now compare, either using regexp or not. + if ($open_is_regexp) + { + $match_result = array(); + if (preg_match($open_tag[$i], $possible_start, $match_result)) + { + $found_start = true; + $which_start_tag = $match_result[0]; + $start_tag_index = $i; + break; + } + } + else + { + // straightforward string comparison. + if (0 == strcasecmp($open_tag[$i], $possible_start)) + { + $found_start = true; + $which_start_tag = $open_tag[$i]; + $start_tag_index = $i; + break; + } + } + } + + if ($found_start) + { + // We have an opening tag. + // Push its position, the text we matched, and its index in the open_tag array on to the stack, and then keep going to the right. + $match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index); + array_push($stack, $match); + // + // Rather than just increment $curr_pos + // Set it to the ending of the tag we just found + // Keeps error in nested tag from breaking out + // of table structure.. + // + $curr_pos += strlen($possible_start); + } + else + { + // check for a closing tag.. + $possible_end = substr($text, $curr_pos, $close_tag_length); + if (0 == strcasecmp($close_tag, $possible_end)) + { + // We have an ending tag. + // Check if we've already found a matching starting tag. + if (sizeof($stack) > 0) + { + // There exists a starting tag. + $curr_nesting_depth = sizeof($stack); + // We need to do 2 replacements now. + $match = array_pop($stack); + $start_index = $match['pos']; + $start_tag = $match['tag']; + $start_length = strlen($start_tag); + $start_tag_index = $match['index']; + + if ($open_is_regexp) + { + $start_tag = preg_replace($open_tag[$start_tag_index], $open_regexp_replace[$start_tag_index], $start_tag); + } + + // everything before the opening tag. + $before_start_tag = substr($text, 0, $start_index); + + // everything after the opening tag, but before the closing tag. + $between_tags = substr($text, $start_index + $start_length, $curr_pos - $start_index - $start_length); + + // Run the given function on the text between the tags.. + if ($use_function_pointer) + { + $between_tags = $func($between_tags, $uid); + } + + // everything after the closing tag. + $after_end_tag = substr($text, $curr_pos + $close_tag_length); + + // Mark the lowest nesting level if needed. + if ($mark_lowest_level && ($curr_nesting_depth == 1)) + { + if ($open_tag[0] == '[code]') + { + $code_entities_match = array('#<#', '#>#', '#"#', '#:#', '#\[#', '#\]#', '#\(#', '#\)#', '#\{#', '#\}#'); + $code_entities_replace = array('<', '>', '"', ':', '[', ']', '(', ')', '{', '}'); + $between_tags = preg_replace($code_entities_match, $code_entities_replace, $between_tags); + } + $text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$curr_nesting_depth:$uid]"; + $text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$curr_nesting_depth:$uid]"; + } + else + { + if ($open_tag[0] == '[code]') + { + $text = $before_start_tag . '[code]'; + $text .= $between_tags . '[/code]'; + } + else + { + if ($open_is_regexp) + { + $text = $before_start_tag . $start_tag; + } + else + { + $text = $before_start_tag . substr($start_tag, 0, $start_length - 1) . ":$uid]"; + } + $text .= $between_tags . substr($close_tag_new, 0, $close_tag_new_length - 1) . ":$uid]"; + } + } + + $text .= $after_end_tag; + + // Now.. we've screwed up the indices by changing the length of the string. + // So, if there's anything in the stack, we want to resume searching just after it. + // otherwise, we go back to the start. + if (sizeof($stack) > 0) + { + $match = array_pop($stack); + $curr_pos = $match['pos']; + // bbcode_array_push($stack, $match); + // ++$curr_pos; + } + else + { + $curr_pos = 1; + } + } + else + { + // No matching start tag found. Increment pos, keep going. + ++$curr_pos; + } + } + else + { + // No starting tag or ending tag.. Increment pos, keep looping., + ++$curr_pos; + } + } + } + } // while + + return $text; + + } // mx_bbencode_first_pass_pda() + + /** * Does second-pass bbencoding. This should be used before displaying the message in |
|
From: FlorinCB <ory...@us...> - 2008-06-16 04:47:51
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5046 Modified Files: mx_functions_style.php Log Message: debuging code Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** mx_functions_style.php 15 Jun 2008 21:00:03 -0000 1.72 --- mx_functions_style.php 16 Jun 2008 04:47:43 -0000 1.73 *************** *** 581,585 **** if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->get_old_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not locate valid language pack'); } } --- 581,585 ---- if ( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'language/lang_' . $this->get_old_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not locate valid language pack: ' . $mx_root_path . 'language/lang_' . $this->get_old_lang($this->lang['default_lang']) . '/lang_main.'.$phpEx); } } |
|
From: Jon O. <jon...@us...> - 2008-06-15 22:44:11
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18434/includes Modified Files: mx_functions_phpbb.php Log Message: This will fix the adminCP for phpbb3, the SIDS and mxp forms Note: i updated your fix. since $mx_user->session_id is not set in internal mode Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** mx_functions_phpbb.php 15 Jun 2008 22:32:20 -0000 1.62 --- mx_functions_phpbb.php 15 Jun 2008 22:44:07 -0000 1.63 *************** *** 684,688 **** function mx_append_sid($url, $non_html_amp = false, $mod_rewrite_only = false) { ! global $SID, $_SID, $mx_mod_rewrite, $mx_user; // Is mod_rewrite enabled? If so, do some url rewrites... --- 684,688 ---- function mx_append_sid($url, $non_html_amp = false, $mod_rewrite_only = false) { ! global $SID, $_SID, $mx_mod_rewrite, $userdata; // Is mod_rewrite enabled? If so, do some url rewrites... *************** *** 698,712 **** } ! //Do we relay need this? ! if ( empty($SID) ) { ! $SID = $mx_user->session_id; } ! //Will this make troble if it's correct? if ( !empty($_SID) && !preg_match('#sid=#', $url) ) { ! $url .= ( (strpos($url, '?') === false) ? '?' : (( $non_html_amp ) ? '&' : '&' ) ) . $_SID; } --- 698,712 ---- } ! /* ! if ( !empty($_SID) && !preg_match('#sid=#', $url) ) { ! $url .= ( ( strpos($url, '?') !== false ) ? ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $SID; } ! */ //Will this make troble if it's correct? if ( !empty($_SID) && !preg_match('#sid=#', $url) ) { ! $url .= ( (strpos($url, '?') === false) ? '?' : (( $non_html_amp ) ? '&' : '&' ) ) . 'sid=' . $_SID; } *************** *** 716,722 **** } return $url; } - /** * Redirect. --- 716,726 ---- } + if (defined('IN_ADMIN') && !preg_match('#sid=#', $url)) + { + $url .= ( (strpos($url, '?') === false) ? '?' : (( $non_html_amp ) ? '&' : '&' ) ) . 'sid=' . $userdata['session_id']; + } + return $url; } /** * Redirect. |
|
From: FlorinCB <ory...@us...> - 2008-06-15 22:32:23
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10883 Modified Files: mx_functions_phpbb.php Log Message: temporary fix Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** mx_functions_phpbb.php 14 Jun 2008 20:41:08 -0000 1.61 --- mx_functions_phpbb.php 15 Jun 2008 22:32:20 -0000 1.62 *************** *** 684,688 **** function mx_append_sid($url, $non_html_amp = false, $mod_rewrite_only = false) { ! global $SID, $_SID, $mx_mod_rewrite; // Is mod_rewrite enabled? If so, do some url rewrites... --- 684,688 ---- function mx_append_sid($url, $non_html_amp = false, $mod_rewrite_only = false) { ! global $SID, $_SID, $mx_mod_rewrite, $mx_user; // Is mod_rewrite enabled? If so, do some url rewrites... *************** *** 698,707 **** } ! /* ! if ( !empty($_SID) && !preg_match('#sid=#', $url) ) { ! $url .= ( ( strpos($url, '?') !== false ) ? ( ( $non_html_amp ) ? '&' : '&' ) : '?' ) . $SID; } ! */ //Will this make troble if it's correct? --- 698,707 ---- } ! //Do we relay need this? ! if ( empty($SID) ) { ! $SID = $mx_user->session_id; } ! //Will this make troble if it's correct? |
|
From: FlorinCB <ory...@us...> - 2008-06-15 22:26:31
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6713 Modified Files: admin_mx_smilies.php Log Message: fix for phpBB3 backend (partial support) Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_mx_smilies.php 11 Jun 2008 22:24:52 -0000 1.9 --- admin_mx_smilies.php 15 Jun 2008 22:26:25 -0000 1.10 *************** *** 101,104 **** --- 101,105 ---- $smiley_root_path = $phpbb_root_path; //same here $smiley_url = 'smile_url'; + $smiley_id = 'smilies_id'; break; case 'phpbb2': *************** *** 106,109 **** --- 107,111 ---- $smiley_root_path = $phpbb_root_path; $smiley_url = 'smile_url'; + $smiley_id = 'smilies_id'; break; case 'phpbb3': *************** *** 111,114 **** --- 113,117 ---- $smiley_root_path = $phpbb_root_path; $smiley_url = 'smiley_url'; + $smiley_id = 'smiley_id'; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); break; *************** *** 207,213 **** if( !empty($replace_existing) ) { ! $sql = "UPDATE " . SMILIES_TABLE . " ! SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' ! WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; } else --- 210,228 ---- if( !empty($replace_existing) ) { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "UPDATE " . SMILIES_TABLE . " ! SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' ! WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; ! break; ! ! case 'phpbb3': ! $sql = "UPDATE " . SMILIES_TABLE . " ! SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' ! WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; ! break; ! } } else *************** *** 218,223 **** else { ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) ! VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; } --- 233,249 ---- else { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) ! VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; ! break; ! ! case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emoticon) ! VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; ! break; ! } } *************** *** 297,301 **** for($i = 0; $i < count($resultset); $i++ ) { ! $smile_pak .= $resultset[$i]['smile_url'] . $delimeter; $smile_pak .= $resultset[$i]['emoticon'] . $delimeter; $smile_pak .= $resultset[$i]['code'] . "\n"; --- 323,327 ---- for($i = 0; $i < count($resultset); $i++ ) { ! $smile_pak .= $resultset[$i][$smiley_url] . $delimeter; $smile_pak .= $resultset[$i]['emoticon'] . $delimeter; $smile_pak .= $resultset[$i]['code'] . "\n"; *************** *** 407,414 **** $smiley_id = $mx_request_vars->request('id', MX_TYPE_INT); ! $sql = "SELECT * ! FROM " . SMILIES_TABLE . " ! WHERE smilies_id = " . $smiley_id; $result = $db->sql_query($sql); if( !$result ) --- 433,454 ---- $smiley_id = $mx_request_vars->request('id', MX_TYPE_INT); + + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql = "SELECT * + FROM " . SMILIES_TABLE . " + WHERE smilies_id = " . $smiley_id; + break; + + case 'phpbb3': + $sql = "SELECT * + FROM " . SMILIES_TABLE . " + WHERE smiley_id = " . $smiley_id; + break; + } ! $result = $db->sql_query($sql); if( !$result ) *************** *** 421,425 **** for( $i = 0; $i < count($smiley_images); $i++ ) { ! if( $smiley_images[$i] == $smile_data['smile_url'] ) { $smiley_selected = "selected=\"selected\""; --- 461,465 ---- for( $i = 0; $i < count($smiley_images); $i++ ) { ! if( $smiley_images[$i] == $smile_data[$smiley_url] ) { $smiley_selected = "selected=\"selected\""; *************** *** 496,502 **** // Proceed with updating the smiley table. // ! $sql = "UPDATE " . SMILIES_TABLE . " ! SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' ! WHERE smilies_id = $smile_id"; if( !($result = $db->sql_query($sql)) ) { --- 536,555 ---- // Proceed with updating the smiley table. // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "UPDATE " . SMILIES_TABLE . " ! SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' ! WHERE smilies_id = $smile_id"; ! break; ! ! case 'phpbb3': ! $sql = "UPDATE " . SMILIES_TABLE . " ! SET code = '" . str_replace("\'", "''", $smile_code) . "', smiley_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' ! WHERE smiley_id = $smile_id"; ! break; ! } ! if( !($result = $db->sql_query($sql)) ) { *************** *** 540,546 **** // Save the data to the smiley table. // ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) ! VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; ! $result = $db->sql_query($sql); if( !$result ) { --- 593,613 ---- // Save the data to the smiley table. // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) ! VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; ! $result = $db->sql_query($sql); ! break; ! ! case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emoticon) ! VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; ! $result = $db->sql_query($sql); ! break; ! } ! ! if( !$result ) { *************** *** 610,619 **** "ROW_CLASS" => $row_class, ! "SMILEY_IMG" => $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'], "CODE" => $smilies[$i]['code'], "EMOT" => $smilies[$i]['emoticon'], ! "U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&id=" . $smilies[$i]['smilies_id']), ! "U_SMILEY_DELETE" => mx_append_sid("admin_mx_smilies.$phpEx?mode=delete&id=" . $smilies[$i]['smilies_id'])) ); } --- 677,686 ---- "ROW_CLASS" => $row_class, ! "SMILEY_IMG" => $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url], "CODE" => $smilies[$i]['code'], "EMOT" => $smilies[$i]['emoticon'], ! "U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&id=" . $smilies[$i][$smiley_id]), ! "U_SMILEY_DELETE" => mx_append_sid("admin_mx_smilies.$phpEx?mode=delete&id=" . $smilies[$i][$smiley_id])) ); } |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:59:47
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21747 Modified Files: index.php Log Message: forgotten? Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** index.php 28 Apr 2008 05:48:21 -0000 1.47 --- index.php 15 Jun 2008 21:59:42 -0000 1.48 *************** *** 103,107 **** "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "LOGO" => $images['mx_logo'], --- 103,107 ---- "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "LOGO" => $images['mx_logo'], *************** *** 915,918 **** --- 915,920 ---- case 'internal': + break; + case 'phpbb2': |
|
From: FlorinCB <ory...@us...> - 2008-06-15 21:08:21
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29426 Modified Files: mx_functions_bbcode.php Log Message: function mx_generate_smilies() upgraded for MXP3 Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_functions_bbcode.php 15 Jun 2008 21:00:01 -0000 1.3 --- mx_functions_bbcode.php 15 Jun 2008 21:08:18 -0000 1.4 *************** *** 117,141 **** * Generate phpBB smilies. * ! * Hacking generate_smilies from phpbb/includes/functions_post.php * * @param string $mode * @param integer $page_id ! */ ! function mx_generate_smilies($mode, $page_id) { global $mx_page, $board_config, $template, $mx_root_path, $phpbb_root_path, $phpEx; ! if( !function_exists('generate_smilies') ) { ! mx_page::load_file('functions_post', 'phpbb2'); } ! $smilies_path = $board_config['smilies_path']; ! $board_config['smilies_path'] = PHPBB_URL . $board_config['smilies_path']; ! generate_smilies($mode, $page_id); ! $board_config['smilies_path'] = $smilies_path; ! $template->assign_vars(array( ! 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", "mode=smilies")) ! ); } --- 117,423 ---- * Generate phpBB smilies. * ! * Hacking generate_smilies from phpbb/includes/functions_post(ing).php * * @param string $mode * @param integer $page_id ! * ! * Fill smiley templates (or just the variables) with smilies, either in a window or inline ! */ ! function mx_generate_smilies($mode, $forum_id) { + global $mx_page, $board_config, $template, $mx_root_path, $phpbb_root_path, $phpEx; + global $db, $lang, $images, $theme; + global $user_ip, $session_length, $starttime; + global $userdata, $phpbb_auth, $mx_user; ! $inline_columns = 4; ! $inline_rows = 5; ! $window_columns = 8; ! ! switch (PORTAL_BACKEND) { ! case 'internal': ! $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed ! $smiley_root_path = $phpbb_root_path; //same here ! $smiley_url = 'smile_url'; ! break; ! case 'phpbb2': ! $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; ! $smiley_url = 'smile_url'; ! break; ! case 'phpbb3': ! $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; ! $smiley_url = 'smiley_url'; ! $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); ! break; ! } ! ! if ($mode == 'window') ! { ! $mx_user->init($user_ip, PAGE_INDEX); ! ! $gen_simple_header = TRUE; ! $page_title = $lang['Emoticons']; ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! include($mx_root_path . 'includes/page_header.'.$phpEx); ! ! $template->set_filenames(array( ! 'smiliesbody' => 'posting_smilies.tpl') ! ); ! break; ! ! case 'phpbb3': ! if ($forum_id) ! { ! $sql = 'SELECT forum_style ! FROM ' . FORUMS_TABLE . " ! WHERE forum_id = $forum_id"; ! $result = $db->sql_query_limit($sql, 1); ! $row = $db->sql_fetchrow($result); ! $db->sql_freeresult($result); ! ! $mx_user->setup('posting', (int) $row['forum_style']); ! } ! else ! { ! $mx_user->setup('posting'); ! } ! ! include($mx_root_path . 'includes/page_header.'.$phpEx); ! ! $template->set_filenames(array( ! 'smiliesbody' => 'posting_smilies.html') ! ); ! break; ! } } + + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $sql = "SELECT emoticon, code, smile_url + FROM " . SMILIES_TABLE . " + ORDER BY smilies_id"; + if ($result = $db->sql_query($sql)) + { + $num_smilies = 0; + $rowset = array(); + while ($row = $db->sql_fetchrow($result)) + { + if (empty($rowset[$row['smile_url']])) + { + $rowset[$row['smile_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code'])); + $rowset[$row['smile_url']]['emoticon'] = $row['emoticon']; + $num_smilies++; + } + } ! if ($num_smilies) ! { ! $smilies_count = ($mode == 'inline') ? min(19, $num_smilies) : $num_smilies; ! $smilies_split_row = ($mode == 'inline') ? $inline_columns - 1 : $window_columns - 1; ! ! $s_colspan = 0; ! $row = 0; ! $col = 0; ! ! while (list($smile_url, $data) = @each($rowset)) ! { ! if (!$col) ! { ! $template->assign_block_vars('smilies_row', array()); ! } ! ! $template->assign_block_vars('smilies_row.smilies_col', array( ! 'SMILEY_CODE' => $data['code'], ! 'SMILEY_IMG' => $smiley_path_url . $board_config['smilies_path'] . '/' . $smile_url, ! 'SMILEY_DESC' => $data['emoticon']) ! ); ! ! $s_colspan = max($s_colspan, $col + 1); ! ! if ($col == $smilies_split_row) ! { ! if ($mode == 'inline' && $row == $inline_rows - 1) ! { ! break; ! } ! $col = 0; ! $row++; ! } ! else ! { ! $col++; ! } ! } ! ! if ($mode == 'inline' && $num_smilies > $inline_rows * $inline_columns) ! { ! $template->assign_block_vars('switch_smilies_extra', array()); ! ! $template->assign_vars(array( ! 'L_MORE_SMILIES' => $lang['More_emoticons'], ! 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", "mode=smilies")) ! ); ! } ! ! $template->assign_vars(array( ! 'L_EMOTICONS' => $lang['Emoticons'], ! 'L_CLOSE_WINDOW' => $lang['Close_window'], ! 'S_SMILIES_COLSPAN' => $s_colspan) ! ); ! } ! } ! break; ! ! case 'phpbb3': ! $display_link = false; ! if ($mode == 'inline') ! { ! $sql = 'SELECT smiley_id ! FROM ' . SMILIES_TABLE . ' ! WHERE display_on_posting = 0'; ! $result = $db->sql_query_limit($sql, 1, 0, 3600); ! ! if ($row = $db->sql_fetchrow($result)) ! { ! $display_link = true; ! } ! $db->sql_freeresult($result); ! } ! ! $last_url = ''; ! ! $sql = 'SELECT * ! FROM ' . SMILIES_TABLE . ! (($mode == 'inline') ? ' WHERE display_on_posting = 1 ' : '') . ' ! ORDER BY smiley_order'; ! ! //phpBB2 code start ! if ($result = $db->sql_query($sql)) ! { ! $num_smilies = 0; ! $rowset = array(); ! while ($row = $db->sql_fetchrow($result)) ! { ! if (empty($rowset[$row['smiley_url']])) ! { ! $rowset[$row['smiley_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code'])); ! $rowset[$row['smiley_url']]['emoticon'] = $row['emoticon']; ! $num_smilies++; ! } ! } ! ! if ($num_smilies) ! { ! $smilies_count = ($mode == 'inline') ? min(19, $num_smilies) : $num_smilies; ! $smilies_split_row = ($mode == 'inline') ? $inline_columns - 1 : $window_columns - 1; ! ! $s_colspan = 0; ! $row = 0; ! $col = 0; ! ! while (list($smile_url, $data) = @each($rowset)) ! { ! if (!$col) ! { ! $template->assign_block_vars('smilies_row', array()); ! } ! ! $template->assign_block_vars('smilies_row.smilies_col', array( ! 'SMILEY_CODE' => $data['code'], ! 'SMILEY_IMG' => $smiley_path_url . $board_config['smilies_path'] . '/' . $smile_url, ! 'SMILEY_DESC' => $data['emoticon']) ! ); ! ! $s_colspan = max($s_colspan, $col + 1); ! ! if ($col == $smilies_split_row) ! { ! if ($mode == 'inline' && $row == $inline_rows - 1) ! { ! break; ! } ! $col = 0; ! $row++; ! } ! else ! { ! $col++; ! } ! } ! ! if ($mode == 'inline' && $num_smilies > $inline_rows * $inline_columns) ! { ! $template->assign_block_vars('switch_smilies_extra', array()); ! ! $template->assign_vars(array( ! 'L_MORE_SMILIES' => $lang['More_emoticons'], ! 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", "mode=smilies")) ! ); ! } ! ! $template->assign_vars(array( ! 'L_EMOTICONS' => $lang['Emoticons'], ! 'L_CLOSE_WINDOW' => $lang['Close_window'], ! 'S_SMILIES_COLSPAN' => $s_colspan) ! ); ! } ! } ! //phpBB2 code end ! ! /* ! $result = $db->sql_query($sql, 3600); ! ! $smilies = array(); ! while ($row = $db->sql_fetchrow($result)) ! { ! if (empty($smilies[$row['smiley_url']])) ! { ! $smilies[$row['smiley_url']] = $row; ! } ! } ! $db->sql_freeresult($result); ! ! if (sizeof($smilies)) ! { ! foreach ($smilies as $row) ! { ! $template->assign_block_vars('smiley', array( ! 'SMILEY_CODE' => $row['code'], ! 'A_SMILEY_CODE' => addslashes($row['code']), ! 'SMILEY_IMG' => $smiley_root_path . $board_config['smilies_path'] . '/' . $row['smiley_url'], ! 'SMILEY_WIDTH' => $row['smiley_width'], ! 'SMILEY_HEIGHT' => $row['smiley_height'], ! 'SMILEY_DESC' => $row['emotion']) ! ); ! } ! } ! ! //What we do here with forum_id versus page_id ? ! if ($mode == 'inline' && $display_link) ! { ! $template->assign_vars(array( ! 'S_SHOW_SMILEY_LINK' => true, ! 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", 'mode=smilies&f=' . $forum_id)) ! ); ! } ! */ ! break; ! } ! ! if ($mode == 'window') ! { ! $template->pparse('smiliesbody'); ! include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } } |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:05:31
|
Update of /cvsroot/mxbb/mx_phpbb/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27754/includes Modified Files: forum_hack.php Log Message: do not remember :( Index: forum_hack.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** forum_hack.php 13 Jun 2008 03:58:22 -0000 1.58 --- forum_hack.php 15 Jun 2008 21:05:25 -0000 1.59 *************** *** 31,35 **** // ! // Include phpbb functions (in 2.9.x, since they are not already loaded) // if(!function_exists('auth_check_user')) --- 31,35 ---- // ! // Include phpbb functions (in 3.0.x, since they are not already loaded) // if(!function_exists('auth_check_user')) *************** *** 246,250 **** { // ! // Core 2.9.x // $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($row['script_path'])); --- 246,250 ---- { // ! // Core 3.0.x // $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($row['script_path'])); *************** *** 784,788 **** } } ! // Do we really need this one? /** --- 784,788 ---- } } ! // Do we really need this one? /** *************** *** 1773,1777 **** $code = preg_replace('#^(.?//).*(Start|Set).*(session).*(\r\n?|\n)#m','/*' . "\n", $code); $code = preg_replace('#^(.?//).*(End).*(session).*(\r\n?|\n)#m', '*/' . "\n", $code); ! // // Replace common phpBB functions with MXP alternatives --- 1773,1777 ---- $code = preg_replace('#^(.?//).*(Start|Set).*(session).*(\r\n?|\n)#m','/*' . "\n", $code); $code = preg_replace('#^(.?//).*(End).*(session).*(\r\n?|\n)#m', '*/' . "\n", $code); ! // // Replace common phpBB functions with MXP alternatives *************** *** 1876,1883 **** $code = str_replace('$board_config[\'avatar_gallery_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_gallery_path\']', $code); $code = str_replace('$board_config[\'avatar_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_path\']', $code); ! //This should fix the url when users try to activate the accont $code = str_replace('$server_url . \'?mode=activate&\'', 'PHPBB_URL .\'profile.\'.$phpEx.\'?mode=activate&\'', $code); ! break; case 'includes/usercp_avatar': --- 1876,1883 ---- $code = str_replace('$board_config[\'avatar_gallery_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_gallery_path\']', $code); $code = str_replace('$board_config[\'avatar_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_path\']', $code); ! //This should fix the url when users try to activate the accont $code = str_replace('$server_url . \'?mode=activate&\'', 'PHPBB_URL .\'profile.\'.$phpEx.\'?mode=activate&\'', $code); ! break; case 'includes/usercp_avatar': |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:05:31
|
Update of /cvsroot/mxbb/mx_phpbb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27754 Modified Files: mx_phpbb.php Log Message: do not remember :( Index: mx_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/mx_phpbb/mx_phpbb.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** mx_phpbb.php 27 Apr 2008 18:53:42 -0000 1.21 --- mx_phpbb.php 15 Jun 2008 21:05:26 -0000 1.22 *************** *** 75,79 **** // ! // For core 2.9.x+ // if (file_exists( $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx")) --- 75,79 ---- // ! // For core 3.0.x+ // if (file_exists( $mx_root_path . "includes/shared/phpbb2/language/lang_" . $default_lang . "/lang_main.$phpEx")) |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:05:12
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27261/pafiledb/admin Modified Files: admin_cat_manage.php admin_catauth_manage.php admin_custom_manage.php admin_fchecker_manage.php admin_license_manage.php admin_settings.php admin_ug_auth_manage.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_cat_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_cat_manage.php 3 Jun 2008 20:17:01 -0000 1.6 --- admin_cat_manage.php 15 Jun 2008 21:05:04 -0000 1.7 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $mode = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( $_REQUEST['mode'] ) : ''; --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $mode = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( $_REQUEST['mode'] ) : ''; Index: admin_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_settings.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_settings.php 3 Jun 2008 20:17:03 -0000 1.7 --- admin_settings.php 15 Jun 2008 21:05:05 -0000 1.8 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $submit = ( isset( $_POST['submit'] ) ) ? true : false; --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $submit = ( isset( $_POST['submit'] ) ) ? true : false; Index: admin_ug_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_ug_auth_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_ug_auth_manage.php 3 Jun 2008 20:17:04 -0000 1.6 --- admin_ug_auth_manage.php 15 Jun 2008 21:05:05 -0000 1.7 *************** *** 25,29 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $params = array( 'mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL ); --- 25,30 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $params = array( 'mode' => 'mode', 'user_id' => POST_USERS_URL, 'group_id' => POST_GROUPS_URL ); Index: admin_custom_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_custom_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_custom_manage.php 3 Jun 2008 20:17:02 -0000 1.6 --- admin_custom_manage.php 15 Jun 2008 21:05:05 -0000 1.7 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); // Index: admin_fchecker_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_fchecker_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_fchecker_manage.php 3 Jun 2008 20:17:03 -0000 1.4 --- admin_fchecker_manage.php 15 Jun 2008 21:05:05 -0000 1.5 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $this_dir = $module_root_path . 'pafiledb/uploads/'; --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $this_dir = $module_root_path . 'pafiledb/uploads/'; Index: admin_catauth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_catauth_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_catauth_manage.php 3 Jun 2008 20:17:02 -0000 1.6 --- admin_catauth_manage.php 15 Jun 2008 21:05:04 -0000 1.7 *************** *** 25,29 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $custom_auth_approval = array(); --- 25,30 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); $custom_auth_approval = array(); Index: admin_license_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_license_manage.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_license_manage.php 3 Jun 2008 20:17:03 -0000 1.5 --- admin_license_manage.php 15 Jun 2008 21:05:05 -0000 1.6 *************** *** 23,27 **** // Includes // ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); if ( isset( $_GET['license'] ) || isset( $_POST['license'] ) ) --- 23,28 ---- // Includes // ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); if ( isset( $_GET['license'] ) || isset( $_POST['license'] ) ) |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:05:10
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27261/pafiledb/modules Modified Files: pa_search.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: pa_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_search.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** pa_search.php 3 Jun 2008 20:17:11 -0000 1.24 --- pa_search.php 15 Jun 2008 21:05:05 -0000 1.25 *************** *** 42,46 **** } ! include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); if ( isset( $_REQUEST['search_keywords'] ) ) --- 42,47 ---- } ! mx_page::load_file('functions_search', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); if ( isset( $_REQUEST['search_keywords'] ) ) |
|
From: Jon O. <jon...@us...> - 2008-06-15 21:05:09
|
Update of /cvsroot/mxbb/mx_pafiledb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27261 Modified Files: dload.php Log Message: using new load_file to ensure we are including phpbb2 bbcodes/smilies Index: dload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/dload.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** dload.php 3 Jun 2008 20:21:56 -0000 1.29 --- dload.php 15 Jun 2008 21:05:04 -0000 1.30 *************** *** 60,65 **** $tplEx = 'tpl'; ! include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management --- 60,67 ---- $tplEx = 'tpl'; ! mx_page::load_file('bbcode', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx ); ! mx_page::load_file('functions_post', 'phpbb2'); ! //include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx ); // Start session management *************** *** 75,81 **** $tplEx = 'html'; - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx ); - //include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx ); - // // Start session management --- 77,80 ---- |
2 messages has been excluded from this view by a project administrator.
