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: FlorinCB <ory...@us...> - 2008-11-05 23:03:24
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27454 Modified Files: mx_functions_core.php Log Message: fixed index Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** mx_functions_core.php 5 Nov 2008 08:20:30 -0000 1.110 --- mx_functions_core.php 5 Nov 2008 23:03:13 -0000 1.111 *************** *** 556,560 **** $temp_row['virtual'] = true; } ! // // Compose the pages config array --- 556,563 ---- $temp_row['virtual'] = true; } ! else ! { ! $temp_row['virtual'] = false; ! } // // Compose the pages config array *************** *** 3101,3105 **** $this->editcp_show = ( $userdata['user_level'] == ADMIN && isset($_COOKIE['editCP_switch']) ) ? $_COOKIE['editCP_switch'] == 1 : true; ! $this->is_virtual = $this->page_config[$this->page_id]['virtual']; } --- 3104,3108 ---- $this->editcp_show = ( $userdata['user_level'] == ADMIN && isset($_COOKIE['editCP_switch']) ) ? $_COOKIE['editCP_switch'] == 1 : true; ! $this->is_virtual = isset($this->page_config[$this->page_id]['virtual']) ? $this->page_config[$this->page_id]['virtual'] : false; } |
|
From: FlorinCB <ory...@us...> - 2008-11-05 08:20:37
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30498 Modified Files: mx_functions_core.php Log Message: undefined index fixed with isset() Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** mx_functions_core.php 31 Oct 2008 19:02:21 -0000 1.109 --- mx_functions_core.php 5 Nov 2008 08:20:30 -0000 1.110 *************** *** 3086,3090 **** $this->total_block = count($this->blocks); ! $this->block_border_graphics = $theme['border_graphics']; $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; --- 3086,3090 ---- $this->total_block = count($this->blocks); ! $this->block_border_graphics = isset($theme['border_graphics']) ? $theme['border_graphics'] : false; $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; |
|
From: FlorinCB <ory...@us...> - 2008-11-05 06:23:43
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24543 Modified Files: session.php Log Message: there is no such $this->lang['user_lang'] should be $this->data['user_lang'] Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** session.php 1 Nov 2008 18:41:58 -0000 1.40 --- session.php 5 Nov 2008 06:23:35 -0000 1.41 *************** *** 1292,1296 **** if ($this->data['session_logged_in']) { ! $this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->encode_lang($this->lang['user_lang']) . "/common.$phpEx")) ? $this->encode_lang($this->lang['user_lang']) : ((file_exists($phpbb_root_path . 'language/' . $this->encode_lang($this->lang['default_lang']) . "/common.$phpEx")) ? $this->encode_lang($this->lang['default_lang']) : 'en'); $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; --- 1292,1296 ---- if ($this->data['session_logged_in']) { ! $this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->encode_lang($this->data['user_lang']) . "/common.$phpEx")) ? $this->encode_lang($this->data['user_lang']) : ((file_exists($phpbb_root_path . 'language/' . $this->encode_lang($this->lang['default_lang']) . "/common.$phpEx")) ? $this->encode_lang($this->lang['default_lang']) : 'en'); $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; |
|
From: FlorinCB <ory...@us...> - 2008-11-05 06:13:50
|
Update of /cvsroot/mxbb/core/install In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23907 Modified Files: mx_install.php Log Message: added note Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** mx_install.php 30 Sep 2008 07:04:45 -0000 1.113 --- mx_install.php 5 Nov 2008 06:13:41 -0000 1.114 *************** *** 1279,1282 **** --- 1279,1284 ---- '; dbuser:'.$phpbb_info['dbuser'].'; prefix:'.$phpbb_info['table_prefix'].';' ); + + //If we have a old forum wtih databse deleted we should delete config.php to detect other installtions correct // |
|
From: Jon O. <jon...@us...> - 2008-11-01 21:12:36
|
Update of /cvsroot/mxbb/core/templates/subSilver In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32405/subSilver Modified Files: overall_header.tpl overall_header_navigation.tpl overall_header_navigation_phpbb.tpl Log Message: A bunch of minor template updates, solving minor bugs and other typhos... Index: overall_header_navigation.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_header_navigation.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** overall_header_navigation.tpl 7 Sep 2008 22:30:30 -0000 1.13 --- overall_header_navigation.tpl 1 Nov 2008 21:12:26 -0000 1.14 *************** *** 88,92 **** </td> </tr> ! <!-- BEGIN editcp --> <tr> --- 88,92 ---- </td> </tr> ! <!-- BEGIN editcp --> <tr> *************** *** 106,119 **** </td> </tr> ! <!-- END editcp --> ! ! <!-- BEGIN switch_view --> ! <tr> ! <td align="left" valign="bottom" colspan="3" ><span class="gensmall">{CURRENT_TIME}</span></td> ! </tr> ! <tr> ! <td align="left" valign="bottom" colspan="3" ><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> ! </tr> ! <!-- END switch_view --> </table> --- 106,110 ---- </td> </tr> ! <!-- END editcp --> </table> Index: overall_header_navigation_phpbb.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_header_navigation_phpbb.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overall_header_navigation_phpbb.tpl 7 Sep 2008 22:30:31 -0000 1.2 --- overall_header_navigation_phpbb.tpl 1 Nov 2008 21:12:26 -0000 1.3 *************** *** 128,132 **** </td> </tr> ! <!-- BEGIN editcp --> <tr> --- 128,132 ---- </td> </tr> ! <!-- BEGIN editcp --> <tr> *************** *** 146,159 **** </td> </tr> ! <!-- END editcp --> ! ! <!-- BEGIN switch_view --> ! <tr> ! <td align="left" valign="bottom" colspan="3" ><span class="gensmall">{CURRENT_TIME}</span></td> ! </tr> ! <tr> ! <td align="left" valign="bottom" colspan="3" ><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> ! </tr> ! <!-- END switch_view --> </table> --- 146,150 ---- </td> </tr> ! <!-- END editcp --> </table> Index: overall_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/overall_header.tpl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** overall_header.tpl 7 Sep 2008 22:30:30 -0000 1.32 --- overall_header.tpl 1 Nov 2008 21:12:26 -0000 1.33 *************** *** 122,135 **** </table> </td> - </tr> - - <!-- BEGIN switch_view --> - <tr> - <td align="left" valign="bottom" colspan="3" ><span class="gensmall">{CURRENT_TIME}</span></td> </tr> - <tr> - <td align="left" valign="bottom" colspan="3" ><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> - </tr> - <!-- END switch_view --> </table> --- 122,126 ---- |
|
From: Jon O. <jon...@us...> - 2008-11-01 21:12:36
|
Update of /cvsroot/mxbb/core/templates/mxBase2 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32405/mxBase2 Modified Files: overall_header.tpl Log Message: A bunch of minor template updates, solving minor bugs and other typhos... Index: overall_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase2/overall_header.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** overall_header.tpl 27 Apr 2008 18:40:24 -0000 1.3 --- overall_header.tpl 1 Nov 2008 21:12:25 -0000 1.4 *************** *** 6,11 **** --- 6,13 ---- <meta http-equiv="Content-Style-Type" content="text/css"> <!-- IF SET_BASE --><base href="{U_PORTAL_ROOT_PATH}" ><!-- ENDIF --> + {META} {NAV_LINKS} + <title>{SITENAME} :: {PAGE_TITLE}</title> <!-- IF PHPBB --> *************** *** 20,23 **** --- 22,26 ---- <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" > <!-- ENDIF --> + {MX_ADDITIONAL_CSS_FILES} {MX_ICON_CSS} |
Update of /cvsroot/mxbb/core/templates/mxSilver In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32405/mxSilver Modified Files: mxSilver.css overall_header.tpl overall_header_navigation.tpl overall_header_navigation_phpbb.tpl overall_noheader.tpl Log Message: A bunch of minor template updates, solving minor bugs and other typhos... Index: overall_noheader.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxSilver/overall_noheader.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** overall_noheader.tpl 21 Feb 2008 20:04:17 -0000 1.3 --- overall_noheader.tpl 1 Nov 2008 21:12:25 -0000 1.4 *************** *** 4,9 **** --- 4,11 ---- <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}"> <meta http-equiv="Content-Style-Type" content="text/css"> + {META} {NAV_LINKS} + <title>{SITENAME} :: {PAGE_TITLE}</title> <!-- IF PHPBB --> Index: mxSilver.css =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxSilver/mxSilver.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mxSilver.css 29 Aug 2008 04:23:31 -0000 1.4 --- mxSilver.css 1 Nov 2008 21:12:25 -0000 1.5 *************** *** 5,18 **** */ - - /* Layout - ------------ */ - * { - /* Reset browsers default margin, padding and font sizes */ - margin: 0; - padding: 0; - } - - html { font-size: 100%; --- 5,8 ---- *************** *** 30,34 **** scrollbar-arrow-color: #006699; scrollbar-track-color: #EFEFEF; ! scrollbar-darkshadow-color: #98AAB1; font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */ } --- 20,24 ---- scrollbar-arrow-color: #006699; scrollbar-track-color: #EFEFEF; ! scrollbar-darkshadow-color: #98AAB1; font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */ } Index: overall_header_navigation.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxSilver/overall_header_navigation.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** overall_header_navigation.tpl 21 Feb 2008 20:04:17 -0000 1.3 --- overall_header_navigation.tpl 1 Nov 2008 21:12:25 -0000 1.4 *************** *** 5,10 **** --- 5,12 ---- <meta http-equiv="Content-Style-Type" content="text/css"> <!-- IF SET_BASE --><base href="{U_PORTAL_ROOT_PATH}" ><!-- ENDIF --> + {META} {NAV_LINKS} + <title>{SITENAME} :: {PAGE_TITLE}</title> <!-- IF PHPBB --> *************** *** 19,22 **** --- 21,25 ---- <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" > <!-- ENDIF --> + {MX_ADDITIONAL_CSS_FILES} {MX_ICON_CSS} Index: overall_header_navigation_phpbb.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxSilver/overall_header_navigation_phpbb.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** overall_header_navigation_phpbb.tpl 21 Feb 2008 20:04:17 -0000 1.4 --- overall_header_navigation_phpbb.tpl 1 Nov 2008 21:12:25 -0000 1.5 *************** *** 5,10 **** --- 5,12 ---- <meta http-equiv="Content-Style-Type" content="text/css"> <!-- IF SET_BASE --><base href="{U_PORTAL_ROOT_PATH}" ><!-- ENDIF --> + {META} {NAV_LINKS} + <title>{SITENAME} :: {PAGE_TITLE}</title> <!-- IF PHPBB --> *************** *** 19,22 **** --- 21,25 ---- <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" > <!-- ENDIF --> + {MX_ADDITIONAL_CSS_FILES} {MX_ICON_CSS} Index: overall_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxSilver/overall_header.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** overall_header.tpl 21 Feb 2008 20:04:17 -0000 1.3 --- overall_header.tpl 1 Nov 2008 21:12:25 -0000 1.4 *************** *** 5,10 **** --- 5,12 ---- <meta http-equiv="Content-Style-Type" content="text/css"> <!-- IF SET_BASE --><base href="{U_PORTAL_ROOT_PATH}" ><!-- ENDIF --> + {META} {NAV_LINKS} + <title>{SITENAME} :: {PAGE_TITLE}</title> <!-- IF PHPBB --> *************** *** 19,22 **** --- 21,25 ---- <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" > <!-- ENDIF --> + {MX_ADDITIONAL_CSS_FILES} {MX_ICON_CSS} |
|
From: Jon O. <jon...@us...> - 2008-11-01 21:12:32
|
Update of /cvsroot/mxbb/core/templates/mxBase1 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32405/mxBase1 Modified Files: overall_header.tpl Log Message: A bunch of minor template updates, solving minor bugs and other typhos... Index: overall_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase1/overall_header.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overall_header.tpl 21 Feb 2008 20:03:35 -0000 1.2 --- overall_header.tpl 1 Nov 2008 21:12:25 -0000 1.3 *************** *** 6,11 **** --- 6,13 ---- <meta http-equiv="Content-Style-Type" content="text/css"> <!-- IF SET_BASE --><base href="{U_PORTAL_ROOT_PATH}" ><!-- ENDIF --> + {META} {NAV_LINKS} + <title>{SITENAME} :: {PAGE_TITLE}</title> <!-- IF PHPBB --> *************** *** 20,23 **** --- 22,26 ---- <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" > <!-- ENDIF --> + {MX_ADDITIONAL_CSS_FILES} {MX_ICON_CSS} |
|
From: Jon O. <jon...@us...> - 2008-11-01 21:12:23
|
Update of /cvsroot/mxbb/core/templates/_core/admin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32380/admin Modified Files: admin_message_body.tpl Log Message: A bunch of minor template updates, solving minor bugs and other typhos... Index: admin_message_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/admin/admin_message_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_message_body.tpl 9 Sep 2007 16:54:25 -0000 1.1 --- admin_message_body.tpl 1 Nov 2008 21:12:11 -0000 1.2 *************** *** 11,13 **** </table> ! <br /> --- 11,13 ---- </table> ! <br /> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2008-11-01 21:12:22
|
Update of /cvsroot/mxbb/core/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32380 Modified Files: overall_header.tpl overall_header_navigation.tpl overall_header_navigation_phpbb.tpl Log Message: A bunch of minor template updates, solving minor bugs and other typhos... Index: overall_header_navigation.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/overall_header_navigation.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** overall_header_navigation.tpl 7 Sep 2008 22:07:10 -0000 1.6 --- overall_header_navigation.tpl 1 Nov 2008 21:12:11 -0000 1.7 *************** *** 88,92 **** </td> </tr> ! <!-- BEGIN editcp --> <tr> --- 88,92 ---- </td> </tr> ! <!-- BEGIN editcp --> <tr> *************** *** 106,119 **** </td> </tr> ! <!-- END editcp --> ! ! <!-- BEGIN switch_view --> ! <tr> ! <td align="left" valign="bottom" colspan="3" ><span class="gensmall">{CURRENT_TIME}</span></td> ! </tr> ! <tr> ! <td align="left" valign="bottom" colspan="3" ><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> ! </tr> ! <!-- END switch_view --> </table> --- 106,110 ---- </td> </tr> ! <!-- END editcp --> </table> Index: overall_header_navigation_phpbb.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/overall_header_navigation_phpbb.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** overall_header_navigation_phpbb.tpl 7 Sep 2008 22:07:11 -0000 1.8 --- overall_header_navigation_phpbb.tpl 1 Nov 2008 21:12:11 -0000 1.9 *************** *** 128,132 **** </td> </tr> ! <!-- BEGIN editcp --> <tr> --- 128,132 ---- </td> </tr> ! <!-- BEGIN editcp --> <tr> *************** *** 146,159 **** </td> </tr> ! <!-- END editcp --> ! ! <!-- BEGIN switch_view --> ! <tr> ! <td align="left" valign="bottom" colspan="3" ><span class="gensmall">{CURRENT_TIME}</span></td> ! </tr> ! <tr> ! <td align="left" valign="bottom" colspan="3" ><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> ! </tr> ! <!-- END switch_view --> </table> --- 146,150 ---- </td> </tr> ! <!-- END editcp --> </table> Index: overall_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/overall_header.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** overall_header.tpl 7 Sep 2008 22:07:09 -0000 1.8 --- overall_header.tpl 1 Nov 2008 21:12:11 -0000 1.9 *************** *** 122,135 **** </table> </td> - </tr> - - <!-- BEGIN switch_view --> - <tr> - <td align="left" valign="bottom" colspan="3" ><span class="gensmall">{CURRENT_TIME}</span></td> </tr> - <tr> - <td align="left" valign="bottom" colspan="3" ><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> - </tr> - <!-- END switch_view --> </table> --- 122,126 ---- |
|
From: Jon O. <jon...@us...> - 2008-11-01 21:12:06
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32365 Modified Files: mx_menu_overall_navigation.tpl Log Message: A bunch of minor template updates, solving minor bugs and other typhos... Index: mx_menu_overall_navigation.tpl =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/mx_menu_overall_navigation.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_menu_overall_navigation.tpl 29 Aug 2008 04:27:59 -0000 1.2 --- mx_menu_overall_navigation.tpl 1 Nov 2008 21:12:01 -0000 1.3 *************** *** 1,17 **** ! <table cellpadding="0" cellspacing="0" border="0" align="center"> <tr> ! <!-- BEGIN catrow --> ! <td class="nav" align="center" valign="middle"> ! <div class="cat-button{catrow.CURRENT}" onmouseout="this.className='cat-button{catrow.CURRENT}';" onmouseover="this.className='cat-button-current';">{catrow.U_MENU_ICON}<a href="{catrow.U_CATEGORY_URL}">{catrow.CATEGORY_NAME}</a></div> </td> - <!-- END catrow --> </tr> </table> ! ! <table cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <!-- BEGIN menurow --> ! <td class="nav"align="center" valign="middle"> <div class="nav-button{menurow.CURRENT}" onmouseout="this.className='nav-button{menurow.CURRENT}';" onmouseover="this.className='nav-button-current';">{menurow.U_MENU_ICON}<a href="{menurow.U_MENU_URL}" target="{menurow.U_MENU_URL_TARGET}">{menurow.MENU_NAME}</a></div> </td> --- 1,55 ---- ! <style type="text/css"> ! <!-- ! .nav-cat .nav-button { ! border-width: 1px; ! border-color: {T_TH_COLOR1}; ! border-style: none none solid none; ! position: relative; ! } ! .nav-cat .nav-button-current { ! background-color: {T_TR_COLOR1}; ! border-width: 1px; ! border-color: {T_TH_COLOR1}; ! border-style: solid solid none solid; ! position: relative; ! } ! td.nav-button { ! background-color: {T_TR_COLOR1}; ! } ! td.nav-button-current { ! background-color: {T_TR_COLOR2}; ! } ! * html .nav-cat td { position: relative; } /* ie 5.0 fix */ ! --> ! </style> ! ! <table width="100%" cellpadding="0" cellspacing="1" border="0"> <tr> ! <td class="cat"> ! <table cellpadding="0" cellspacing="0" border="0" class="nav-cat" align="center" valign="top"> ! <tr> ! <!-- BEGIN catrow --> ! <td align="left" valign="top"> ! <div class="nav-button{catrow.CURRENT}"> ! <table cellpadding="5" cellspacing="0" border="0"> ! <tr> ! <td width="100%" height="30" style="border:none; text-align:center;"> ! {catrow.U_MENU_ICON}{catrow.CATEGORY} ! </td> ! </tr> ! </table> ! </div> ! </td> ! <!-- END catrow --> ! </tr> ! </table> </td> </tr> </table> ! <table cellpadding="5" cellspacing="0" border="0" align="center"> <tr> <!-- BEGIN menurow --> ! <td align="center" valign="middle"> <div class="nav-button{menurow.CURRENT}" onmouseout="this.className='nav-button{menurow.CURRENT}';" onmouseover="this.className='nav-button-current';">{menurow.U_MENU_ICON}<a href="{menurow.U_MENU_URL}" target="{menurow.U_MENU_URL_TARGET}">{menurow.MENU_NAME}</a></div> </td> |
|
From: Jon O. <jon...@us...> - 2008-11-01 20:35:38
|
Update of /cvsroot/mxbb/core/templates/mxBase1 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30454 Removed Files: full_page_body.tpl Log Message: changed my mind --- full_page_body.tpl DELETED --- |
|
From: Jon O. <jon...@us...> - 2008-11-01 20:33:18
|
Update of /cvsroot/mxbb/core/templates/mxBase1 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30254 Added Files: full_page_body.tpl Log Message: forgotten file --- NEW FILE: full_page_body.tpl --- <table border="0" cellspacing="50" cellpadding="0" width="100%" align="center"> <tr valign="top"> <td align="center">{MESSAGE_TEXT}</td> </tr> </table> <br clear="all" /> |
|
From: Jon O. <jon...@us...> - 2008-11-01 20:31:53
|
Update of /cvsroot/mxbb/core/templates/_core/images/phpbb2 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30167 Added Files: logo_phpBB.gif logo_phpBB_med.gif msg_inbox.gif msg_outbox.gif msg_savebox.gif msg_sentbox.gif topic_delete.gif topic_lock.gif topic_move.gif topic_split.gif topic_unlock.gif Log Message: left over icons...should probably be added too --- NEW FILE: topic_move.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: msg_outbox.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: topic_delete.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: msg_sentbox.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: topic_split.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo_phpBB.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: msg_inbox.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: topic_unlock.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: msg_savebox.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: logo_phpBB_med.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: topic_lock.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Jon O. <jon...@us...> - 2008-11-01 18:42:03
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24532 Modified Files: session.php Log Message: Cleanup Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** session.php 31 Oct 2008 18:54:23 -0000 1.39 --- session.php 1 Nov 2008 18:41:58 -0000 1.40 *************** *** 1345,1350 **** else { ! $style = $this->style; if(!$board_config['override_user_style'] && ($this->data['user_id'] != ANONYMOUS)) { --- 1345,1351 ---- else { ! $style = $this->style; // From main style init. Should be correct and valid. + /* if(!$board_config['override_user_style'] && ($this->data['user_id'] != ANONYMOUS)) { *************** *** 1373,1380 **** } } // Set up style Temp code should be removed after bugtraking $style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']); - } --- 1374,1381 ---- } } + */ // Set up style Temp code should be removed after bugtraking $style = ($style) ? $style : ((!$board_config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $this->phpbb_style['style_id']); } |
|
From: Jon O. <jon...@us...> - 2008-11-01 18:13:36
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23206 Modified Files: template.php Log Message: minor stuff Index: template.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/template.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** template.php 1 Sep 2008 02:14:18 -0000 1.34 --- template.php 1 Nov 2008 18:13:32 -0000 1.35 *************** *** 817,822 **** foreach($filename_array as $handle => $filename) ! { ! $this->set_filename($handle, $filename); } --- 817,821 ---- foreach($filename_array as $handle => $filename) ! { $this->set_filename($handle, $filename); } *************** *** 831,835 **** function set_filename($handle, $filename, $xs_include = false, $quiet = false) { ! global $board_config, $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block; $can_cache = $this->use_cache; if(strpos($filename, '..') !== false) --- 830,834 ---- function set_filename($handle, $filename, $xs_include = false, $quiet = false) { ! global $board_config; $can_cache = $this->use_cache; if(strpos($filename, '..') !== false) *************** *** 857,861 **** } } ! // creating cache filename if($can_cache != '') --- 856,860 ---- } } ! // creating cache filename if($can_cache != '') *************** *** 940,944 **** { echo '<!-- template ', $this->files[$handle], ' start -->'; ! } if ($filename) --- 939,943 ---- { echo '<!-- template ', $this->files[$handle], ' start -->'; ! } if ($filename) *************** *** 994,999 **** } $this->xs_startup(); ! $force_recompile = empty($this->uncompiled_code[$handle]) ? false : true; ! // checking if php file exists. if (!empty($this->files_cache[$handle]) && !$force_recompile) --- 993,998 ---- } $this->xs_startup(); ! $force_recompile = empty($this->uncompiled_code[$handle]) ? false : true; ! // checking if php file exists. if (!empty($this->files_cache[$handle]) && !$force_recompile) *************** *** 1019,1024 **** $this->compiled_code[$handle] = $this->compile2($this->uncompiled_code[$handle], '', ''); } ! } ! // Run the compiled code. if (empty($this->files_cache[$handle]) || $force_recompile) --- 1018,1023 ---- $this->compiled_code[$handle] = $this->compile2($this->uncompiled_code[$handle], '', ''); } ! } ! // Run the compiled code. if (empty($this->files_cache[$handle]) || $force_recompile) *************** *** 1030,1034 **** $this->execute($this->files_cache[$handle], '', $handle); } ! return true; } --- 1029,1033 ---- $this->execute($this->files_cache[$handle], '', $handle); } ! return true; } *************** *** 1078,1082 **** } } ! //if ($filename = $this->_tpl_load($handle)) --- 1077,1081 ---- } } ! //if ($filename = $this->_tpl_load($handle)) |
|
From: Jon O. <jon...@us...> - 2008-11-01 18:01:03
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22439 Modified Files: mx_functions_style.php Log Message: Here we go. Updated style init, with less code, hopefully doing the same ;) Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** mx_functions_style.php 1 Nov 2008 15:30:27 -0000 1.106 --- mx_functions_style.php 1 Nov 2008 18:00:59 -0000 1.107 *************** *** 231,235 **** if (!empty($this->module_template_path)) { ! // ?? if (!file_exists($mx_root_path . $this->module_template_path . 'gecko.css')) { --- 231,238 ---- if (!empty($this->module_template_path)) { ! // ! // for mx_phpbb3 ! // ! /* if (!file_exists($mx_root_path . $this->module_template_path . 'gecko.css')) { *************** *** 238,241 **** --- 241,245 ---- $temppath = str_replace('overall_footer', 'overall_footer_plugin', $temppath); } + */ return $temppath; *************** *** 692,760 **** // ! // Setup style // if ( !$init_override ) { if ( $this->data['user_id'] != ANONYMOUS && $this->data['user_style'] > 0 ) { ! // ! // Get Style data. ! // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! $style = $mx_request_vars->post('user_style', MX_TYPE_INT, $this->data['user_style']); ! break; ! case 'phpbb2': ! $user_style = $mx_request_vars->post('user_style', MX_TYPE_INT, $this->data['user_style']); ! //If user have other style in mxp then the one from phpBB not to have forum page and modules graphics will be messaed up ! //Anonymouse users should see all block graphic corect ! //Query MXP style_id corepondent to phpBB themes_id ! $sql = "SELECT m.themes_id ! FROM " . MX_THEMES_TABLE . " AS m, " . THEMES_TABLE . " AS t ! WHERE t.themes_id = " . (int) $user_style . " ! AND t.template_name = m.template_name"; ! ! if ($row = $db->sql_fetchrow($db->sql_query($sql))) ! { ! $style = $row['themes_id']; //User style ! } ! else ! { ! $style = $portal_config['default_style']; ! } ! break; ! case 'phpbb3': ! $user_style = $mx_request_vars->post('user_style', MX_TYPE_INT, $this->data['user_style']); ! //If user have other style in mxp then the one from phpBB not to have forum page and modules graphics will be messaed up ! //Anonymouse users should see all block graphic corect ! //Query phpBB style_id corepondent to mxp themes_id ! $sql = "SELECT m.themes_id ! FROM " . MX_THEMES_TABLE . " AS m, " . STYLES_TABLE . " AS s, " . STYLES_TEMPLATE_TABLE . " AS t ! WHERE s.style_id = " . (int) $user_style . " ! AND t.template_path = m.template_name ! AND t.template_id = s.template_id"; ! ! if ($row = $db->sql_fetchrow($db->sql_query($sql))) ! { ! $style = $row['themes_id']; //User style ! } ! else ! { ! $style = $portal_config['default_style']; ! } ! break; ! } ! ! if ( $theme = $this->_setup_style($style) ) ! { ! return; ! } } } - $style = $mx_request_vars->post('default_style', MX_TYPE_INT, $init_style); - $theme = $this->_setup_style($style); ! return; } --- 696,713 ---- // ! // Setup MXP Style // + $user_style = 0; if ( !$init_override ) { if ( $this->data['user_id'] != ANONYMOUS && $this->data['user_style'] > 0 ) { ! $user_style = $mx_request_vars->post('user_style', MX_TYPE_INT, $this->data['user_style']); } } ! $init_style = $mx_request_vars->post('default_style', MX_TYPE_INT, $init_style); ! ! $theme = $this->_setup_style($init_style, $user_style); } *************** *** 766,933 **** * @return unknown */ ! function _setup_style($style) { global $db, $board_config, $portal_config, $template, $phpbb_root_path, $mx_root_path, $theme; // ! // Get Style data. // ! switch (PORTAL_BACKEND) { ! case 'internal': ! $sql = "SELECT * ! FROM " . MX_THEMES_TABLE . " ! WHERE portal_backend = '" . PORTAL_BACKEND . "' ! AND themes_id = " . (int) $style; ! break; ! case 'phpbb2': ! $sql = "SELECT bbt.* ! FROM " . MX_THEMES_TABLE . " mxt, " . THEMES_TABLE . " bbt ! WHERE mxt.template_name = bbt.template_name ! AND mxt.portal_backend = '" . PORTAL_BACKEND . "' ! AND mxt.themes_id = " . (int) $style; ! break; ! case 'phpbb3': ! $sql = "SELECT mxt . *, stt . * , bbt . * ! FROM " . MX_THEMES_TABLE . " AS mxt, " . STYLES_TEMPLATE_TABLE . " AS stt, " . STYLES_TABLE . " AS bbt ! WHERE mxt.themes_id = " . (int) $style . " ! AND mxt.portal_backend = '" . PORTAL_BACKEND . "' ! AND stt.template_id = bbt.template_id ! AND bbt.style_name = mxt.template_name"; ! break; } ! if ( !($result = $db->sql_query($sql, 120)) ) { ! mx_message_die(CRITICAL_ERROR, "Could not query database for theme info", '', __LINE__, __FILE__, $sql); } // ! // Use default style if custom style doesn't exist. // ! if ( !($row = $db->sql_fetchrow($result)) ) { switch (PORTAL_BACKEND) { case 'internal': ! $sql = "SELECT * ! FROM " . MX_THEMES_TABLE . " ! WHERE portal_backend = '" . PORTAL_BACKEND . "' ! AND themes_id = " . (int) $style; ! break; case 'phpbb2': ! $sql = "SELECT mxt.*, bbt.* ! FROM " . MX_THEMES_TABLE . " mxt, " . THEMES_TABLE . " bbt ! WHERE mxt.style_name = bbt.template_name ! AND mxt.portal_backend = '" . PORTAL_BACKEND . "' ! AND bbt.themes_id = " . (int) $style; ! break; case 'phpbb3': ! //Try standard style name ! $sql = "SELECT mxt . *, stt . * , bbt . * ! FROM " . MX_THEMES_TABLE . " AS mxt, " . STYLES_TEMPLATE_TABLE . " AS stt, " . STYLES_TABLE . " AS bbt ! WHERE mxt.themes_id = " . (int) $style . " ! AND mxt.portal_backend = '" . PORTAL_BACKEND . "' ! AND stt.template_id = bbt.template_id ! AND bbt.style_name = mxt.template_name"; ! //If not standard style name or with spaces try someting else ! if ( !$db->sql_fetchrow($db->sql_query($sql) ) ) ! { ! $sql = "SELECT mxt . *, stt . * , bbt . * ! FROM " . MX_THEMES_TABLE . " AS mxt, " . STYLES_TEMPLATE_TABLE . " AS stt, " . STYLES_TABLE . " AS bbt ! WHERE mxt.themes_id = " . (int) $style . " ! AND mxt.portal_backend = '" . PORTAL_BACKEND . "' ! AND stt.template_id = bbt.template_id ! AND stt.template_path = mxt.template_name"; ! } ! break; } ! if ( !($result = $db->sql_query($sql)) ) { ! mx_message_die(CRITICAL_ERROR, "Could not query database for theme info", '', __LINE__, __FILE__, $sql); } if ( !($row = $db->sql_fetchrow($result)) ) { ! $style = $portal_config['default_style']; ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! $sql = "SELECT * ! FROM " . MX_THEMES_TABLE . " ! WHERE portal_backend = '" . PORTAL_BACKEND . "' ! AND themes_id = " . (int) $style; ! break; ! case 'phpbb2': ! $sql = "SELECT bbt.* ! FROM " . MX_THEMES_TABLE . " mxt, " . THEMES_TABLE . " bbt ! WHERE mxt.style_name = bbt.style_name ! AND mxt.portal_backend = '" . PORTAL_BACKEND . "' ! AND mxt.themes_id = " . (int) $style; ! break; ! case 'phpbb3': ! //Try standard style name ! $sql = "SELECT mxt . *, stt . * , bbt . * ! FROM " . MX_THEMES_TABLE . " AS mxt, " . STYLES_TEMPLATE_TABLE . " AS stt, " . STYLES_TABLE . " AS bbt ! WHERE mxt.themes_id = " . (int) $style . " ! AND mxt.portal_backend = '" . PORTAL_BACKEND . "' ! AND stt.template_id = bbt.template_id ! AND bbt.style_name = mxt.template_name"; ! //If not standard style name or with spaces try someting else ! if ( !$db->sql_fetchrow($db->sql_query($sql) ) ) ! { ! $sql = "SELECT mxt . *, stt . * , bbt . * ! FROM " . MX_THEMES_TABLE . " AS mxt, " . STYLES_TEMPLATE_TABLE . " AS stt, " . STYLES_TABLE . " AS bbt ! WHERE mxt.themes_id = " . (int) $style . " ! AND mxt.portal_backend = '" . PORTAL_BACKEND . "' ! AND stt.template_id = bbt.template_id ! AND stt.template_path = mxt.template_name"; ! } ! break; ! } ! ! if ( !($result = $db->sql_query($sql, 120)) ) ! { ! mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info'); ! } ! ! // ! // Last desperate try... ! // ! if ( !($row = $db->sql_fetchrow($result)) ) ! { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! $sql = 'SELECT * ! FROM ' . MX_THEMES_TABLE; ! break; ! case 'phpbb2': ! $sql = 'SELECT * ! FROM ' . THEMES_TABLE; ! break; ! case 'phpbb3': ! $sql = "SELECT mxt.*, bbt.*, stt.* ! FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt, " . STYLES_TEMPLATE_TABLE . " stt ! WHERE mxt.template_name = stt.template_path"; ! break; ! } ! ! if ( !($result = $db->sql_query_limit($sql, 1)) ) ! { ! mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info'); ! } ! ! if ( !($row = $db->sql_fetchrow($result)) ) ! { ! mx_message_die(CRITICAL_ERROR, "Could not get MX-Publisher style data for themes_id [$style]"); ! } ! } } - } ! $db->sql_freeresult($result); // --- 719,786 ---- * @return unknown */ ! function _setup_style($init_style, $user_style = 0) { global $db, $board_config, $portal_config, $template, $phpbb_root_path, $mx_root_path, $theme; + $row = false; + // ! // Are we trying a userstyle? // ! if ($user_style) { ! $row = $this->_style_query($user_style); } ! // ! // ...or a Custom Page/AdminCP Style ! // ! if (!$row) { ! $row = $this->_style_query($init_style); } // ! // Seems like we need to try the default style // ! if (!$row) ! { ! $row = $this->_style_query($portal_config['default_style']); ! } ! ! // ! // Last desperate try... ! // ! if (!$row) { switch (PORTAL_BACKEND) { case 'internal': ! $sql = 'SELECT * ! FROM ' . MX_THEMES_TABLE; ! break; case 'phpbb2': ! $sql = 'SELECT * ! FROM ' . THEMES_TABLE; ! break; case 'phpbb3': ! $sql = "SELECT bbt.*, stt.* ! FROM " . MX_THEMES_TABLE . " mxt, " . STYLES_TABLE . " bbt, " . STYLES_TEMPLATE_TABLE . " stt ! WHERE mxt.template_name = stt.template_path"; ! break; } ! if ( !($result = $db->sql_query_limit($sql, 1)) ) { ! mx_message_die(CRITICAL_ERROR, 'Could not query database for theme info - desperate try'); } if ( !($row = $db->sql_fetchrow($result)) ) { ! mx_message_die(CRITICAL_ERROR, "Could not get MX-Publisher style data for themes_id [$init_style]"); } ! $db->sql_freeresult($result); ! } // *************** *** 995,998 **** --- 848,852 ---- } } + // // Load images *************** *** 1000,1003 **** --- 854,858 ---- $this->_load_phpbb_images(); $this->_load_mxbb_images(); + // // Load backend specific style defs. *************** *** 1011,1014 **** --- 866,914 ---- * Enter description here... * + * @param unknown_type $style + * @return unknown + */ + function _style_query($style) + { + global $db, $board_config, $portal_config, $template, $phpbb_root_path, $mx_root_path, $theme; + + switch (PORTAL_BACKEND) + { + case 'internal': + $sql = "SELECT * + FROM " . MX_THEMES_TABLE . " + WHERE portal_backend = '" . PORTAL_BACKEND . "' + AND themes_id = " . (int) $style; + break; + case 'phpbb2': + $sql = "SELECT bbt.* + FROM " . MX_THEMES_TABLE . " mxt, " . THEMES_TABLE . " bbt + WHERE mxt.style_name = bbt.style_name + AND mxt.portal_backend = '" . PORTAL_BACKEND . "' + AND mxt.themes_id = " . (int) $style; + break; + case 'phpbb3': + $sql = "SELECT stt . * , bbt . * + FROM " . MX_THEMES_TABLE . " AS mxt, " . STYLES_TEMPLATE_TABLE . " AS stt, " . STYLES_TABLE . " AS bbt + WHERE bbt.style_name = mxt.style_name + AND mxt.portal_backend = '" . PORTAL_BACKEND . "' + AND stt.template_id = bbt.template_id + AND mxt.themes_id = " . (int) $style; + break; + } + + if ( !($result = $db->sql_query($sql, 120)) ) + { + mx_message_die(CRITICAL_ERROR, "Could not query database for theme info", '', __LINE__, __FILE__, $sql); + } + + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + return $row; + } + + /** + * Enter description here... + * * @access private * @return unknown |
|
From: Jon O. <jon...@us...> - 2008-11-01 15:30:31
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14534 Modified Files: mx_functions_style.php Log Message: for mx_phpbb3 Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** mx_functions_style.php 1 Nov 2008 15:12:28 -0000 1.105 --- mx_functions_style.php 1 Nov 2008 15:30:27 -0000 1.106 *************** *** 244,247 **** --- 244,248 ---- /* // MOVED HERE FROM SET_FILENAME(), NEED TO BE MERGED APPROPRIATELY. + // For mx_phpbb3 // // Do not include phpBB3 overall header and footer files using xs_include inside forum integration |
|
From: Jon O. <jon...@us...> - 2008-11-01 15:12:32
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13795 Modified Files: mx_functions_style.php Log Message: Removing set_filename(). I have moved code to make_filename(). Need to be debugged. Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** mx_functions_style.php 31 Oct 2008 19:02:21 -0000 1.104 --- mx_functions_style.php 1 Nov 2008 15:12:28 -0000 1.105 *************** *** 114,135 **** global $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block; ! /* ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $style_path = $theme['template_name']; ! break; ! case 'phpbb3': ! $style_path = $theme['style_name']; ! break; ! } ! */ ! if($this->subtemplates) { $filename = $this->subtemplates_make_filename($filename); } // Check replacements list if(!$xs_include && isset($this->replace[$filename])) { --- 114,128 ---- global $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block; ! // ! // ? ! // if($this->subtemplates) { $filename = $this->subtemplates_make_filename($filename); } + + // // Check replacements list + // if(!$xs_include && isset($this->replace[$filename])) { *************** *** 238,242 **** if (!empty($this->module_template_path)) { ! if (!file_exists($root_path . $this->module_template_path . 'gecko.css')) { //Do not include phpBB3 overall header and footer files. --- 231,236 ---- if (!empty($this->module_template_path)) { ! // ?? ! if (!file_exists($mx_root_path . $this->module_template_path . 'gecko.css')) { //Do not include phpBB3 overall header and footer files. *************** *** 248,251 **** --- 242,284 ---- } + /* + // MOVED HERE FROM SET_FILENAME(), NEED TO BE MERGED APPROPRIATELY. + // + // Do not include phpBB3 overall header and footer files using xs_include inside forum integration + // Does this code need to be here? + // + if (PORTAL_BACKEND == 'phpbb3' && $xs_include && defined('MX_PHPBB3_BLOCK') && $module_root_path) + { + if (strpos($this->files[$handle],'overall_header.')) + { + //$this->files[$handle] = str_replace('overall_header', 'overall_header_plugin', $this->files[$handle]); + $filename2 = 'overall_header_plugin.html'; + $filename3 = 'index.htm'; + $this->debug_paths .= '<br>Module'; + $fileSearch = array(); + $fileSearch[] = $style_path; // First check current template + $fileSearch[] = $mx_user->cloned_template_name; // Then check Cloned template + $fileSearch[] = $moduleDefault; // Finally check Default template + $fileSearch[] = './'; // Compatibility with primitive modules + + $this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path); + } + + if (strpos($this->files[$handle],'overall_footer.')) + { + $filename2 = 'overall_footer_plugin.html'; + $filename3 = 'index.htm'; + $this->debug_paths .= '<br>Module'; + $fileSearch = array(); + $fileSearch[] = $style_path; // First check current template + $fileSearch[] = $mx_user->cloned_template_name; // Then check Cloned template + $fileSearch[] = $moduleDefault; // Finally check Default template + $fileSearch[] = './'; // Compatibility with primitive modules + + $this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path); + } + } + */ + // // This doesn't fit in...so left as is. *************** *** 346,473 **** } - /** - * Assigns template filename for handle. - */ - function set_filename($handle, $filename, $xs_include = false, $quiet = false) - { - global $board_config, $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block; - $can_cache = $this->use_cache; - if(strpos($filename, '..') !== false) - { - $can_cache = false; - } - $this->files[$handle] = $this->make_filename($filename, $xs_include); - $this->files_cache[$handle] = ''; - $this->files_cache2[$handle] = ''; - // check if we are in admin control panel and override extreme styles mod controls if needed - if(defined('XS_ADMIN_OVERRIDE') && XS_ADMIN_OVERRIDE === true && @function_exists('xs_admin_override')) - { - xs_admin_override(); - } - // checking if we have valid filename - if(!$this->files[$handle]) - { - if($xs_include || $quiet) - { - return false; - } - else - { - die("Template->make_filename(): Error - invalid template $filename"); - } - } - - //Do not include phpBB3 overall header and footer files using xs_include inside forum integration - if ($xs_include && defined('MX_PHPBB3_BLOCK') && $module_root_path) - { - if (strpos($this->files[$handle],'overall_header.')) - { - //$this->files[$handle] = str_replace('overall_header', 'overall_header_plugin', $this->files[$handle]); - $filename2 = 'overall_header_plugin.html'; - $filename3 = 'index.htm'; - $this->debug_paths .= '<br>Module'; - $fileSearch = array(); - $fileSearch[] = $style_path; // First check current template - $fileSearch[] = $mx_user->cloned_template_name; // Then check Cloned template - $fileSearch[] = $moduleDefault; // Finally check Default template - $fileSearch[] = './'; // Compatibility with primitive modules - - $this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path); - } - - if (strpos($this->files[$handle],'overall_footer.')) - { - $filename2 = 'overall_footer_plugin.html'; - $filename3 = 'index.htm'; - $this->debug_paths .= '<br>Module'; - $fileSearch = array(); - $fileSearch[] = $style_path; // First check current template - $fileSearch[] = $mx_user->cloned_template_name; // Then check Cloned template - $fileSearch[] = $moduleDefault; // Finally check Default template - $fileSearch[] = './'; // Compatibility with primitive modules - - $this->files[$handle] = $this->doFileSearch($fileSearch, $filename3, $filename2, 'templates/', $module_root_path); - } - } - - - // creating cache filename - if($can_cache != '') - { - $this->files_cache2[$handle] = $this->make_filename_cache($this->files[$handle]); - if(@file_exists($this->files_cache2[$handle])) - { - $this->files_cache[$handle] = $this->files_cache2[$handle]; - } - } - // checking if tpl and/or php file exists - if(empty($this->files_cache[$handle]) && !@file_exists($this->files[$handle])) - { - // trying to load alternative filename (usually subSilver) - if(!empty($this->tpldef) && !empty($this->tpl) && ($this->tpldef !== $this->tpl)) - { - $this->files[$handle] = ''; - // save old configuration - $root = $this->root; - $tpl_name = $this->tpl; - // set temporary configuration - $this->root = $this->tpldir . $this->tpldef; - $this->tpl = $this->tpldef; - // recursively run set_filename - $res = $this->set_filename($handle, $filename, $xs_include, $quiet); - // restore old configuration - $this->root = $root; - $this->tpl = $tpl_name; - return $res; - } - if($quiet) - { - return false; - } - if($xs_include) - { - if($board_config['xs_warn_includes']) - { - die('Template->make_filename(): Error - included template file not found: ' . $filename); - } - return false; - } - else - { - die('Template->make_filename(): Error - template file not found: ' . $filename); - } - } - // checking if we should recompile cache - if(!empty($this->files_cache[$handle]) && !empty($board_config['xs_auto_recompile'])) - { - $cache_time = @filemtime($this->files_cache[$handle]); - if(@filemtime($this->files[$handle]) > $cache_time || $board_config['xs_template_time'] > $cache_time) - { - // file was changed. don't use cache file (will be recompled if configuration allowes it) - $this->files_cache[$handle] = ''; - } - } - return true; - } } // class mx_Template --- 379,382 ---- *************** *** 576,580 **** // ! // Clean up and ensure we are using mxp internal lang format // $board_config['phpbb_lang'] = $board_config['default_lang']; // Handy switch --- 485,489 ---- // ! // Clean up and ensure we are using mxp internal (long) lang format // $board_config['phpbb_lang'] = $board_config['default_lang']; // Handy switch *************** *** 582,585 **** --- 491,495 ---- $this->data['user_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($this->decode_lang($this->data['user_lang']))), "'"); + //if ( $this->data['session_logged_in'] ) // Old code if ( $this->data['user_id'] != ANONYMOUS ) { *************** *** 689,693 **** // Core Main Translation after shared phpBB keys so we can overwrite some settings ! require($mx_root_path . "language/lang_" . $this->lang['default_lang'] . "/lang_main.$phpEx"); // --- 599,603 ---- // Core Main Translation after shared phpBB keys so we can overwrite some settings ! include($mx_root_path . 'language/lang_' . $this->lang['default_lang'] . '/lang_main.' . $phpEx); // |
|
From: FlorinCB <ory...@us...> - 2008-11-01 15:12:01
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb2 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13747/includes/sessions/phpbb2 Modified Files: core.php Log Message: fixed user link for phpbb2 mode Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb2/core.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** core.php 31 Oct 2008 18:54:23 -0000 1.19 --- core.php 1 Nov 2008 15:11:48 -0000 1.20 *************** *** 863,867 **** function get_username_string($mode, $user_id, $username = false, $user_color = false, $guest_username = false, $custom_profile_url = false) { ! global $lang, $userdata; $lang['Guest'] = !$guest_username ? $lang['Guest'] : $guest_username; --- 863,867 ---- function get_username_string($mode, $user_id, $username = false, $user_color = false, $guest_username = false, $custom_profile_url = false) { ! global $lang, $userdata, $phpEx; $lang['Guest'] = !$guest_username ? $lang['Guest'] : $guest_username; |
|
From: FlorinCB <ory...@us...> - 2008-11-01 15:11:56
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13747/modules/mx_coreblocks Modified Files: mx_online.php Log Message: fixed user link for phpbb2 mode Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** mx_online.php 1 Nov 2008 13:55:22 -0000 1.35 --- mx_online.php 1 Nov 2008 15:11:48 -0000 1.36 *************** *** 275,284 **** $total_users = phpBB2::get_db_stat('usercount'); $newest_userdata = phpBB2::get_db_stat('newestuser'); ! $newest_username = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_username'] : $newest_userdata['username']; ! $newest_uid = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_user_id'] : $newest_userdata['user_id']; switch (PORTAL_BACKEND) { case 'internal': if ( $newest_userdata['user_level'] == ADMIN ) { --- 275,297 ---- $total_users = phpBB2::get_db_stat('usercount'); $newest_userdata = phpBB2::get_db_stat('newestuser'); ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $newest_username = $newest_userdata['username']; ! $newest_uid = $newest_userdata['user_id']; ! break; ! ! case 'phpbb3': ! $newest_username = $board_config['newest_username']; ! $newest_uid = $board_config['newest_user_id']; ! break; ! } ! switch (PORTAL_BACKEND) { case 'internal': + case 'phpbb2': if ( $newest_userdata['user_level'] == ADMIN ) { *************** *** 294,311 **** //This is not used in internal mode template, but here only added $newest_user = "The newest registered user is " . $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color); - break; - case 'phpbb2': - if ( $newest_userdata['user_level'] == ADMIN ) - { - $newest_color = $theme['fontcolor3']; - $newest_username = '<b>' . $newest_username . '</b>'; - } - else if ( $newest_userdata['user_level'] == MOD ) - { - $newest_color = $theme['fontcolor2']; - $newest_username = '<b>' . $newest_username . '</b>'; - } - $newest_style_color = 'style="color:#' . $newest_color . '"'; - $newest_user = sprintf($lang['Newest_user'], $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color)); break; --- 307,310 ---- *************** *** 461,464 **** --- 460,467 ---- 'L_ONLINE_LEGEND' => !empty($mx_user->lang['LEGEND']) ? $mx_user->lang['LEGEND'] : 'Legend', 'ONLINE_BIRTHDAY_LIST' => $birthday_list, + + //For comp. with phpBB2 backend + 'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'), + 'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'), 'L_ONLINE_EXPLAIN' => $lang['Online_explain'], |
|
From: FlorinCB <ory...@us...> - 2008-11-01 14:59:21
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12714 Modified Files: Tag: core28x mx_includex.php Log Message: Index: mx_includex.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -C2 -d -r1.12.2.2 -r1.12.2.3 *** mx_includex.php 3 Jun 2008 21:01:43 -0000 1.12.2.2 --- mx_includex.php 1 Nov 2008 14:59:08 -0000 1.12.2.3 *************** *** 4,8 **** * @package MX-Publisher Module - mx_coreblocks * @version $Id$ ! * @copyright (c) 2002-2006 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com --- 4,8 ---- * @package MX-Publisher Module - mx_coreblocks * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com *************** *** 22,30 **** $iframe_mode = $mx_block->get_parameters( 'x_mode' ); ! $x_mode = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_mode']) ? $HTTP_GET_VARS['x_mode'] : $iframe_mode ); ! $x_1 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_1']) ? $HTTP_GET_VARS['x_1'] : $mx_block->get_parameters( 'x_1' ) ); ! $x_2 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_2']) ? $HTTP_GET_VARS['x_2'] : $mx_block->get_parameters( 'x_2' ) ); ! $x_3 = ( $iframe_mode == 'x_listen' && !empty($HTTP_GET_VARS['x_3']) ? $HTTP_GET_VARS['x_3'] : $mx_block->get_parameters( 'x_3' ) ); // --- 22,30 ---- $iframe_mode = $mx_block->get_parameters( 'x_mode' ); ! $x_mode = ( ($iframe_mode == 'x_listen') ? $mx_request_vars->get('x_mode', MX_TYPE_NO_TAGS, $iframe_mode) : $iframe_mode ); ! $x_1 = ( $iframe_mode == 'x_listen' ? $mx_request_vars->get('x_1', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_1')) : $mx_block->get_parameters( 'x_1' )); ! $x_2 = ( $iframe_mode == 'x_listen' ? $mx_request_vars->get('x_2', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_2')) : $mx_block->get_parameters( 'x_2' )); ! $x_3 = ( $iframe_mode == 'x_listen' ? $mx_request_vars->get('x_3', MX_TYPE_NO_TAGS, $mx_block->get_parameters('x_3')) : $mx_block->get_parameters( 'x_3' )); // |
|
From: FlorinCB <ory...@us...> - 2008-11-01 13:55:28
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9329/includes/sessions/internal Modified Files: core.php Log Message: fixed user link for internal mode were we do not have a profile script Index: core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/core.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** core.php 31 Oct 2008 18:54:23 -0000 1.14 --- core.php 1 Nov 2008 13:55:22 -0000 1.15 *************** *** 589,593 **** } ! $profile_url = ''; $full_url = (($user_id == ANONYMOUS) || ($user_id == MUSIC_GUEST)) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<span ' . $topic_poster_style . '>' . $username . '</span>'; --- 589,593 ---- } ! $profile_url = $username; $full_url = (($user_id == ANONYMOUS) || ($user_id == MUSIC_GUEST)) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<span ' . $topic_poster_style . '>' . $username . '</span>'; *************** *** 612,615 **** --- 612,616 ---- break; } + return $username; } |
|
From: FlorinCB <ory...@us...> - 2008-11-01 13:55:26
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9329/modules/mx_coreblocks Modified Files: mx_online.php Log Message: fixed user link for internal mode were we do not have a profile script Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** mx_online.php 1 Nov 2008 13:24:26 -0000 1.34 --- mx_online.php 1 Nov 2008 13:55:22 -0000 1.35 *************** *** 109,112 **** --- 109,115 ---- { case 'internal': + $user_online_link = '<a href="' . PORTAL_URL . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; + $logged_hidden_online++; + break; case 'phpbb2': $user_online_link = '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; *************** *** 274,278 **** $newest_username = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_username'] : $newest_userdata['username']; $newest_uid = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_user_id'] : $newest_userdata['user_id']; - $newest_user = ''; switch (PORTAL_BACKEND) --- 277,280 ---- *************** *** 290,294 **** } $newest_style_color = 'style="color:#' . $newest_color . '"'; ! //$newest_user = sprintf($lang['Newest_user'], $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color)); break; case 'phpbb2': --- 292,297 ---- } $newest_style_color = 'style="color:#' . $newest_color . '"'; ! //This is not used in internal mode template, but here only added ! $newest_user = "The newest registered user is " . $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color); break; case 'phpbb2': |
|
From: FlorinCB <ory...@us...> - 2008-11-01 13:24:33
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7766 Modified Files: mx_online.php Log Message: fix in switch for internal mode Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** mx_online.php 1 Nov 2008 13:14:42 -0000 1.33 --- mx_online.php 1 Nov 2008 13:24:26 -0000 1.34 *************** *** 274,283 **** $newest_username = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_username'] : $newest_userdata['username']; $newest_uid = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_user_id'] : $newest_userdata['user_id']; ! switch (PORTAL_BACKEND) { case 'internal': - case 'phpbb2': if ( $newest_userdata['user_level'] == ADMIN ) { --- 274,282 ---- $newest_username = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_username'] : $newest_userdata['username']; $newest_uid = (PORTAL_BACKEND == 'phpbb3') ? $board_config['newest_user_id'] : $newest_userdata['user_id']; ! $newest_user = ''; switch (PORTAL_BACKEND) { case 'internal': if ( $newest_userdata['user_level'] == ADMIN ) { *************** *** 292,295 **** --- 291,308 ---- $newest_style_color = 'style="color:#' . $newest_color . '"'; //$newest_user = sprintf($lang['Newest_user'], $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color)); + break; + case 'phpbb2': + if ( $newest_userdata['user_level'] == ADMIN ) + { + $newest_color = $theme['fontcolor3']; + $newest_username = '<b>' . $newest_username . '</b>'; + } + else if ( $newest_userdata['user_level'] == MOD ) + { + $newest_color = $theme['fontcolor2']; + $newest_username = '<b>' . $newest_username . '</b>'; + } + $newest_style_color = 'style="color:#' . $newest_color . '"'; + $newest_user = sprintf($lang['Newest_user'], $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color)); break; |
2 messages has been excluded from this view by a project administrator.
