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: OryNider <ory...@us...> - 2008-01-23 17:45:11
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29005 Added Files: mx_textblock_multi.html Log Message: prosilver block templates for some core modules --- NEW FILE: mx_textblock_multi.html --- <div class="clear"></div> <div class="forabg block"> <div id="p1" class="post bg2 online"> <div class="inner"><span class="corners-top"><span></span></span> <!-- BEGIN switch_toc --> <dl class="textbody"> <dt> <br /> <span class="topictitle">{L_TOC}</span><br /><hr /> <span class="nav"> <!-- BEGIN pages --> {switch_toc.pages.TOC_ITEM} <!-- END pages --> </span> </dt> </dl> <!-- END switch_toc --> <dl class="textbody"> <dt class="content" id="message">{U_TEXT}</dt> </dl> <!-- BEGIN switch_pages --> <dl class="textbody"> <dt> <br /> <span class="topictitle"></span><br /><hr />{L_GOTO_PAGE} <span class="nav"> <!-- BEGIN pages --> {switch_pages.pages.PAGE_LINK} <!-- END pages --> </span> </dt> </dl> <!-- END switch_pages --> </div> </div> <span class="corners-bottom"><span></span></span> </div> |
|
From: OryNider <ory...@us...> - 2008-01-23 17:44:58
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28599 Added Files: mx_announce.html mx_forum.html mx_last_msg.html mx_statistics.html Log Message: prosilver block templates for some core modules --- NEW FILE: mx_statistics.html --- <style type="text/css"> h2.stats { margin-top:3px; } </style> <div class="forabg block"> <div class="inner bg1"> <div class="blockbody"> <h2 class="stats">{L_ADMIN_STATISTICS}</h2> <table width="100%" class="blockcp"> <col class="row1" /><col class="row2"><col class="row1"/><col class="row2" /> <thead> <tr> <th width="25%" align="center">{L_STATISTIC}</th> <th width="25%" align="center">{L_VALUE}</th> <th width="25%" align="center">{L_STATISTIC}</th> <th width="25%" align="center">{L_VALUE}</th> </tr> </thead> <tbody> <!-- BEGIN adminrow --> <tr> <td class="row2" align="center"><span class="gen">{adminrow.STATISTIC}</span></td> <td class="row1" align="center"><span class="gen">{adminrow.VALUE}</span></td> <td class="row2" align="center"><span class="gen">{adminrow.STATISTIC2}</span></td> <td class="row1" align="center"><span class="gen">{adminrow.VALUE2}</span></td> </tr> <!-- END adminrow --> </tbody> </table> <h2 class="stats">{L_TOP_POSTERS}</h2> <table width="100%" class="blockcp"> <thead> <tr> <th class="thCornerL" align="center" width="10%"><b>{L_RANK}</b></th> <th class="thTop" align="center" width="20%"><b>{L_USERNAME}</b></th> <th class="thTop" align="center" width="10%"><b>{L_POSTS}</b></th> <th class="thTop" align="center" width="10%"><b>{L_PERCENTAGE}</b></th> <th class="thCornerR" align="center" width="50%"><b>{L_GRAPH}</b></th> </tr> </thead> <tbody> <!-- BEGIN users --> <tr> <td class="{users.CLASS}" align="center"><span class="gen">{users.RANK}</span></td> <td class="{users.CLASS}" align="center"><span class="gen"><a href="{users.URL}">{users.USERNAME}</a></span></td> <td class="{users.CLASS}" align="center"><span class="gen">{users.POSTS}</span></td> <td class="{users.CLASS}" align="center"><span class="gen">{users.PERCENTAGE}%</span></td> <td class="{users.CLASS}" align="left"> <table cellspacing="0" cellpadding="0" border="0" align="left"> <tr> <td align="right"><img src="{LEFT_GRAPH_IMAGE}" width="4" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td> </tr> </table> <table cellspacing="0" cellpadding="0" border="0" align="left" width="{users.BAR}%"> <tr> <td><img src="{GRAPH_IMAGE}" width="100%" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td> </tr> </table> <table cellspacing="0" cellpadding="0" border="0" align="left"> <tr> <td align="left"><img src="{RIGHT_GRAPH_IMAGE}" width="4" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td> </tr> </table> </td> </tr> <!-- END users --> </tbody> </table> <div style="float:left;width:50%"> <h2 class="stats">{L_MOST_VIEWED}</h2> <table width="100%" class="blockcp" style="margin-right:3px;"> <thead> <tr> <th class="thCornerL" align="left" width="5%"><b>{L_RANK}</b></th> <th class="thTop" align="center" width="20%"><b>{L_VIEWS}</b></th> <th class="thCornerR" align="center" width="75%"><b>{L_TOPIC}</b></th> </tr> </thead> <tbody> <!-- BEGIN topicviews --> <tr> <td class="{topicviews.CLASS}" align="left"><span class="gen">{topicviews.RANK}</span></td> <td class="{topicviews.CLASS}" align="center"><span class="gen">{topicviews.VIEWS}</span></td> <td class="{topicviews.CLASS}" align="left"><span class="gen"><a href="{topicviews.URL}">{topicviews.TITLE}</a></span></td> </tr> <!-- END topicviews --> </tbody> </table> </div> <div> <h2 class="stats">{L_MOST_ACTIVE}</h2> <table width="100%" class="blockcp" style="margin-left:3px;"> <thead> <tr> <th class="thCornerL" align="left" width="5%"><b>{L_RANK}</b></th> <th class="thTop" align="center" width="20%"><b>{L_REPLIES}</b></th> <th class="thCornerR" align="center" width="75%"><b>{L_TOPIC}</b></th> </tr> </thead> <tbody> <!-- BEGIN topicreplies --> <tr> <td class="{topicreplies.CLASS}" align="left"><span class="gen">{topicreplies.RANK}</span></td> <td class="{topicreplies.CLASS}" align="center"><span class="gen">{topicreplies.REPLIES}</span></td> <td class="{topicreplies.CLASS}" align="left"><span class="gen"><a href="{topicreplies.URL}">{topicreplies.TITLE}</a></span></td> </tr> <!-- END topicreplies --> </tbody> </table> </div> </div> </div> <span class="corners-bottom"><span></span></span> </div> --- NEW FILE: mx_announce.html --- <!-- BEGIN postrow --> <div class="clear"></div> <div class="forabg block"> <div id="p1" class="post bg2 online"> <div class="inner"><span class="corners-top"><span></span></span> <dl class="textbody"> <dt> <p> <a href="{postrow.U_TOPIC_URL}"> <img src="{postrow.IMAGE}" align="right" hspace="5" vspace="5" border="1" title="{postrow.TITLE}" alt="{postrow.TITLE}" /> </a> <a href="{postrow.U_LAST_POST_URL}" class="topictitle"> <img src="{postrow.FOLDER_IMG}" alt="{postrow.L_TOPIC_FOLDER_ALT}" title="{postrow.L_TOPIC_FOLDER_ALT}" border="0" align="absmiddle" /></a> <a href="{postrow.U_TOPIC_URL}" class="topictitle">{postrow.TITLE}</a> </p> <span class="postbody">{postrow.MESSAGE}</span> </dt> </dl> </div> </div> <div id="p1" class="post bg2 online"> <div class="inner"><span class="corners-top"><span></span></span> <dl class="textbody"> <dt style="vertical-align:middle; text-align:center;"><span class="gensmall">{postrow.L_AUTHOR}: <a href="{postrow.U_PROFILE_POSTER}">{postrow.POSTER_NAME}</a></span></dt> <dt style="vertical-align:middle; text-align:center;"><span class="gensmall">{postrow.L_POSTED}:<br />{postrow.FIRST_POST_TIME}</span></dt> <dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_REPLIES}:<br />{postrow.REPLIES}</span></dt> <dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_VIEWS}:<br />{postrow.VIEWS}</span></dt> <dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_LASTPOST}:<br />{postrow.LAST_POST_TIME} {postrow.LAST_POST_AUTHOR} {postrow.LAST_POST_IMG}</span></dt> </dl> </div> </div> <span class="corners-bottom"><span></span></span> </div> <br clear="all" /> <!-- END postrow --> --- NEW FILE: mx_last_msg.html --- <div class="forabg block"> <div class="inner"> <!-- BEGIN no_row --> <div class="blockbody bg2">{no_row.L_NO_ITEMS}</div> <!-- END no_row --> <!-- BEGIN msg_row --> <div class="blockbody bg2" style="display:block;"> <div> <div style="float:left"> <img src="{msg_row.FOLDER_IMG}" width="19" height="18" alt="{msg_row.L_TOPIC_FOLDER_ALT}" title="{msg_row.L_TOPIC_FOLDER_ALT}" /> </div> <div> <b><a href="{msg_row.U_LAST_MSG}" target="{U_TARGET}" title="{msg_row.LAST_MSG_ALT}" class="genmed">{msg_row.LAST_MSG}</a></b><br /> <a href="{msg_row.U_FORUM}" target="{U_TARGET}" title="{msg_row.FORUM_NAME_ALT}" class="gensmall">{msg_row.FORUM_NAME}</a> </div> <div style="text-align:right"> <span style="white-space:nowrap">{msg_row.LAST_MSG_DATE}</span> <span style="white-space:nowrap">{msg_row.TOPIC_AUTHOR} {msg_row.LAST_POST_AUTHOR}{msg_row.LAST_POST_IMG}</span> </div> </div> </div> <!-- END msg_row --> <div class="bg1">{PAGINATION}</div> </div> <span class="corners-bottom"><span></span></span> </div> --- NEW FILE: mx_forum.html --- <div class="forabg block"> <div class="inner"> <!-- BEGIN catrow --> <ul class="topiclist"> <li class="header"> <dl class="icon"> <dt><a href="{catrow.U_VIEWCAT}">{catrow.CAT_DESC}</a></dt> <dd class="topics">{L_TOPICS}</dd> <dd class="posts">{L_POSTS}</dd> <dd class="lastpost"><span>{L_LASTPOST}</span></dd> </dl> </li> </ul> <ul class="topiclist forums"> <!-- BEGIN forumrow --> <li class="row"> <dl class="icon" style="background-image: url({catrow.forumrow.FORUM_FOLDER_IMG});"> <dt> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumtitle">{catrow.forumrow.FORUM_NAME}</a><br /> {catrow.forumrow.FORUM_DESC} <br />{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS} </dt> <dd class="topics">{catrow.forumrow.TOPICS}</dd> <dd class="posts">{catrow.forumrow.POSTS}</dd> <dd class="lastpost"><span> {catrow.forumrow.LAST_POST}</span> </dd> </dl> </li> <!-- END forumrow --> </ul> <!-- END catrow --> <span class="corners-bottom"><span></span></span></div> </div> |
|
From: OryNider <ory...@us...> - 2008-01-23 17:43:33
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28158/prosilver Log Message: Directory /cvsroot/mxbb/core/modules/mx_phpbb2blocks/templates/prosilver added to the repository |
|
From: OryNider <ory...@us...> - 2008-01-23 08:25:47
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8615 Modified Files: Tag: core28x mx_functions_core.php Log Message: suppress error when search array_shift Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.52.2.2 retrieving revision 1.52.2.3 diff -C2 -d -r1.52.2.2 -r1.52.2.3 *** mx_functions_core.php 13 Jan 2008 18:38:40 -0000 1.52.2.2 --- mx_functions_core.php 23 Jan 2008 08:25:43 -0000 1.52.2.3 *************** *** 844,848 **** function sql_fetchrow($query_id) { ! return array_shift($this->sql_rowset[$query_id]); } --- 844,848 ---- function sql_fetchrow($query_id) { ! return @array_shift($this->sql_rowset[$query_id]); } |
|
From: OryNider <ory...@us...> - 2008-01-23 08:24:54
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8554 Modified Files: mx_functions_core.php Log Message: suppress error when search array_shift Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** mx_functions_core.php 18 Jan 2008 10:28:37 -0000 1.60 --- mx_functions_core.php 23 Jan 2008 08:24:48 -0000 1.61 *************** *** 911,915 **** function sql_fetchrow($query_id) { ! return array_shift($this->sql_rowset[$query_id]); } --- 911,915 ---- function sql_fetchrow($query_id) { ! return @array_shift($this->sql_rowset[$query_id]); } |
|
From: OryNider <ory...@us...> - 2008-01-21 15:58:29
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7153 Modified Files: Tag: core28x mx_functions.php Log Message: @session_start() Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.72 retrieving revision 1.72.2.1 diff -C2 -d -r1.72 -r1.72.2.1 *** mx_functions.php 23 Jul 2007 22:52:43 -0000 1.72 --- mx_functions.php 21 Jan 2008 15:58:12 -0000 1.72.2.1 *************** *** 608,612 **** // Initialize PHP session // ! session_start(); } --- 608,612 ---- // Initialize PHP session // ! @session_start(); } |
|
From: OryNider <ory...@us...> - 2008-01-21 14:44:07
|
Update of /cvsroot/mxbb/core/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3248 Modified Files: mainpage_header.tpl Log Message: $this->lang_path fixed Index: mainpage_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/admin/mainpage_header.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mainpage_header.tpl 21 Jan 2008 01:02:59 -0000 1.1 --- mainpage_header.tpl 21 Jan 2008 14:44:03 -0000 1.2 *************** *** 1,4 **** ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html dir="{S_CONTENT_DIRECTION}"> <head> {META} --- 1,4 ---- ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> <head> {META} |
|
From: OryNider <ory...@us...> - 2008-01-21 14:43:53
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3145/sessions/phpbb3 Modified Files: auth.php session.php Log Message: $this->lang_path fixed Index: auth.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/auth.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** auth.php 9 Sep 2007 16:51:31 -0000 1.1 --- auth.php 21 Jan 2008 14:43:49 -0000 1.2 *************** *** 90,94 **** } ! return; } --- 90,94 ---- } ! return $this->acl[$f]; } *************** *** 742,746 **** function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0) { ! global $board_config, $db, $user, $phpbb_root_path, $phpEx; $method = trim(basename($board_config['auth_method'])); --- 742,746 ---- function login($username, $password, $autologin = false, $viewonline = 1, $admin = 0) { ! global $board_config, $db, $mx_user, $phpbb_root_path, $phpEx; $method = trim(basename($board_config['auth_method'])); *************** *** 789,793 **** if ($login['status'] == LOGIN_SUCCESS) { ! $old_session_id = $user->session_id; if ($admin) --- 789,793 ---- if ($login['status'] == LOGIN_SUCCESS) { ! $old_session_id = $mx_user->session_id; if ($admin) *************** *** 796,808 **** $cookie_expire = time() - 31536000; ! $user->set_cookie('u', '', $cookie_expire); ! $user->set_cookie('sid', '', $cookie_expire); unset($cookie_expire); $SID = '?sid='; ! $user->session_id = $_SID = ''; } ! $result = $user->session_create($login['user_row']['user_id'], $admin, $autologin, $viewonline); // Successful session creation --- 796,808 ---- $cookie_expire = time() - 31536000; ! $mx_user->set_cookie('u', '', $cookie_expire); ! $mx_user->set_cookie('sid', '', $cookie_expire); unset($cookie_expire); $SID = '?sid='; ! $mx_user->session_id = $_SID = ''; } ! $result = $mx_user->session_create($login['user_row']['user_id'], $admin, $autologin, $viewonline); // Successful session creation Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** session.php 18 Jan 2008 10:37:45 -0000 1.6 --- session.php 21 Jan 2008 14:43:49 -0000 1.7 *************** *** 1213,1217 **** if ($this->data['user_id'] != ANONYMOUS) { ! $this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->lang['user_lang'] . "/common.$phpEx")) ? $this->lang['user_lang'] : basename($this->lang['default_lang']); $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; --- 1213,1217 ---- if ($this->data['user_id'] != ANONYMOUS) { ! $this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->lang['user_lang'] . "/common.$phpEx")) ? $this->lang['user_lang'] : (file_exists($phpbb_root_path . 'language/' . $this->lang['default_lang'] . "/common.$phpEx")) ? basename($this->lang['default_lang']) : $board_config['phpbb_lang']; $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; *************** *** 1222,1226 **** else { ! $this->lang_name = basename($this->lang['default_lang']); $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; $this->date_format = $board_config['default_dateformat']; --- 1222,1226 ---- else { ! $this->lang_name = ($this->lang['default_lang']) ? basename($this->lang['default_lang']) : $board_config['phpbb_lang']; $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; $this->date_format = $board_config['default_dateformat']; *************** *** 1275,1279 **** if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false) { ! die('Language file ' . $phpbb_root_path . $this->lang_path . "common.$phpEx" . " couldn't be opened."); } } --- 1275,1279 ---- if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false) { ! die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.'); } } *************** *** 1596,1600 **** function add_lang($lang_set, $use_db = false, $use_help = false) { ! global $lang, $phpEx; if (is_array($lang_set)) --- 1596,1600 ---- function add_lang($lang_set, $use_db = false, $use_help = false) { ! global $phpEx; if (is_array($lang_set)) *************** *** 1666,1674 **** } } ! else if ($use_db) { // Get Database Language Strings // Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed // For example: help:faq, posting } } --- 1666,1675 ---- } } ! else { // Get Database Language Strings // Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed // For example: help:faq, posting + die("You should not use db with mxBB!"); } } *************** *** 1836,2470 **** class user extends session { - var $lang = array(); - var $help = array(); - var $theme = array(); - var $date_format; - var $timezone; - var $dst; - - var $lang_name; - var $lang_id = false; - var $lang_path; - var $img_lang; - var $img_array = array(); - - // Able to add new option (id 7) - var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10); - var $keyvalues = array(); - - /** - * Setup basic user-specific items (style, language, ...) - */ - function setup($lang_set = false, $style = false) - { - global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache; - - if ($this->data['user_id'] != ANONYMOUS) - { - $this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']); - $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; - - $this->date_format = $this->data['user_dateformat']; - $this->timezone = $this->data['user_timezone'] * 3600; - $this->dst = $this->data['user_dst'] * 3600; - } - else - { - $this->lang_name = basename($config['default_lang']); - $this->lang_path = $phpbb_root_path . 'language/' . $this->lang_name . '/'; - $this->date_format = $config['default_dateformat']; - $this->timezone = $config['board_timezone'] * 3600; - $this->dst = $config['board_dst'] * 3600; - - /** - * If a guest user is surfing, we try to guess his/her language first by obtaining the browser language - * If re-enabled we need to make sure only those languages installed are checked - * Commented out so we do not loose the code. - - if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) - { - $accept_lang_ary = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']); - - foreach ($accept_lang_ary as $accept_lang) - { - // Set correct format ... guess full xx_YY form - $accept_lang = substr($accept_lang, 0, 2) . '_' . strtoupper(substr($accept_lang, 3, 2)); - $accept_lang = basename($accept_lang); - - if (file_exists($phpbb_root_path . 'language/' . $accept_lang . "/common.$phpEx")) - { - $this->lang_name = $config['default_lang'] = $accept_lang; - $this->lang_path = $phpbb_root_path . 'language/' . $accept_lang . '/'; - break; - } - else - { - // No match on xx_YY so try xx - $accept_lang = substr($accept_lang, 0, 2); - $accept_lang = basename($accept_lang); - - if (file_exists($phpbb_root_path . 'language/' . $accept_lang . "/common.$phpEx")) - { - $this->lang_name = $config['default_lang'] = $accept_lang; - $this->lang_path = $phpbb_root_path . 'language/' . $accept_lang . '/'; - break; - } - } - } - } - */ - } - - // We include common language file here to not load it every time a custom language file is included - $lang = &$this->lang; - - if ((@include $this->lang_path . "common.$phpEx") === false) - { - die('Language file ' . $this->lang_name . "/common.$phpEx" . " couldn't be opened."); - } - - $this->add_lang($lang_set); - unset($lang_set); - - if (!empty($_GET['style']) && $auth->acl_get('a_styles')) - { - global $SID, $_EXTRA_URL; - - $style = request_var('style', 0); - $SID .= '&style=' . $style; - $_EXTRA_URL = array('style=' . $style); - } - else - { - // Set up style - $style = ($style) ? $style : ((!$config['override_user_style']) ? $this->data['user_style'] : $config['default_style']); - } - - $sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name - FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i - WHERE s.style_id = $style - AND t.template_id = s.template_id - AND c.theme_id = s.theme_id - AND i.imageset_id = s.imageset_id"; - $result = $db->sql_query($sql, 3600); - $this->theme = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - // User has wrong style - if (!$this->theme && $style == $this->data['user_style']) - { - $style = $this->data['user_style'] = $config['default_style']; - - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_style = $style - WHERE user_id = {$this->data['user_id']}"; - $db->sql_query($sql); - - $sql = 'SELECT s.style_id, t.template_storedb, t.template_path, t.template_id, t.bbcode_bitfield, c.theme_path, c.theme_name, c.theme_storedb, c.theme_id, i.imageset_path, i.imageset_id, i.imageset_name - FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i - WHERE s.style_id = $style - AND t.template_id = s.template_id - AND c.theme_id = s.theme_id - AND i.imageset_id = s.imageset_id"; - $result = $db->sql_query($sql, 3600); - $this->theme = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - } - - if (!$this->theme) - { - trigger_error('Could not get style data', E_USER_ERROR); - } - - // Now parse the cfg file and cache it - $parsed_items = $cache->obtain_cfg_items($this->theme); - - // We are only interested in the theme configuration for now - $parsed_items = $parsed_items['theme']; - - $check_for = array( - 'parse_css_file' => (int) 0, - 'pagination_sep' => (string) ', ' - ); - - foreach ($check_for as $key => $default_value) - { - $this->theme[$key] = (isset($parsed_items[$key])) ? $parsed_items[$key] : $default_value; - settype($this->theme[$key], gettype($default_value)); - - if (is_string($default_value)) - { - $this->theme[$key] = htmlspecialchars($this->theme[$key]); - } - } - - // If the style author specified the theme needs to be cached - // (because of the used paths and variables) than make sure it is the case. - // For example, if the theme uses language-specific images it needs to be stored in db. - if (!$this->theme['theme_storedb'] && $this->theme['parse_css_file']) - { - $this->theme['theme_storedb'] = 1; - - $stylesheet = file_get_contents("{$phpbb_root_path}styles/{$this->theme['theme_path']}/theme/stylesheet.css"); - // Match CSS imports - $matches = array(); - preg_match_all('/@import url\(["\'](.*)["\']\);/i', $stylesheet, $matches); - - if (sizeof($matches)) - { - $content = ''; - foreach ($matches[0] as $idx => $match) - { - if ($content = @file_get_contents("{$phpbb_root_path}styles/{$this->theme['theme_path']}/theme/" . $matches[1][$idx])) - { - $content = trim($content); - } - else - { - $content = ''; - } - $stylesheet = str_replace($match, $content, $stylesheet); - } - unset($content); - } - - $stylesheet = str_replace('./', 'styles/' . $this->theme['theme_path'] . '/theme/', $stylesheet); - - $sql_ary = array( - 'theme_data' => $stylesheet, - 'theme_mtime' => time(), - 'theme_storedb' => 1 - ); - - $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE theme_id = ' . $this->theme['theme_id']; - $db->sql_query($sql); - - unset($sql_ary); - } - - $template->set_template(); - - $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang']; - - $sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width - FROM ' . STYLES_IMAGESET_DATA_TABLE . ' - WHERE imageset_id = ' . $this->theme['imageset_id'] . " - AND image_lang IN ('" . $db->sql_escape($this->img_lang) . "', '')"; - $result = $db->sql_query($sql, 3600); - - $localised_images = false; - while ($row = $db->sql_fetchrow($result)) - { - if ($row['image_lang']) - { - $localised_images = true; - } - - $this->img_array[$row['image_name']] = $row; - } - $db->sql_freeresult($result); - - // there were no localised images, try to refresh the localised imageset for the user's language - if (!$localised_images) - { - // Attention: this code ignores the image definition list from acp_styles and just takes everything - // that the config file contains - $sql_ary = array(); - - $db->sql_transaction('begin'); - - $sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . ' - WHERE imageset_id = ' . $this->theme['imageset_id'] . ' - AND image_lang = \'' . $db->sql_escape($this->img_lang) . '\''; - $result = $db->sql_query($sql); - - if (@file_exists("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg")) - { - $cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$this->theme['imageset_path']}/imageset/{$this->img_lang}/imageset.cfg"); - foreach ($cfg_data_imageset_data as $image_name => $value) - { - if (strpos($value, '*') !== false) - { - if (substr($value, -1, 1) === '*') - { - list($image_filename, $image_height) = explode('*', $value); - $image_width = 0; - } - else - { - list($image_filename, $image_height, $image_width) = explode('*', $value); - } - } - else - { - $image_filename = $value; - $image_height = $image_width = 0; - } - - if (strpos($image_name, 'img_') === 0 && $image_filename) - { - $image_name = substr($image_name, 4); - $sql_ary[] = array( - 'image_name' => (string) $image_name, - 'image_filename' => (string) $image_filename, - 'image_height' => (int) $image_height, - 'image_width' => (int) $image_width, - 'imageset_id' => (int) $this->theme['imageset_id'], - 'image_lang' => (string) $this->img_lang, - ); - } - } - } - - if (sizeof($sql_ary)) - { - $db->sql_multi_insert(STYLES_IMAGESET_DATA_TABLE, $sql_ary); - $db->sql_transaction('commit'); - $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); - - add_log('admin', 'LOG_IMAGESET_LANG_REFRESHED', $this->theme['imageset_name'], $this->img_lang); - } - else - { - $db->sql_transaction('commit'); - add_log('admin', 'LOG_IMAGESET_LANG_MISSING', $this->theme['imageset_name'], $this->img_lang); - } - } - - // Call phpbb_user_session_handler() in case external application want to "bend" some variables or replace classes... - // After calling it we continue script execution... - phpbb_user_session_handler(); - - // If this function got called from the error handler we are finished here. - if (defined('IN_ERROR_HANDLER')) - { - return; - } - - // Disable board if the install/ directory is still present - // For the brave development army we do not care about this, else we need to comment out this everytime we develop locally - if (!defined('DEBUG_EXTRA') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install')) - { - // Adjust the message slightly according to the permissions - if ($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) - { - $message = 'REMOVE_INSTALL'; - } - else - { - $message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE'; - } - trigger_error($message); - } - - // Is board disabled and user not an admin or moderator? - if ($config['board_disable'] && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) - { - header('HTTP/1.1 503 Service Unavailable'); - - $message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE'; - trigger_error($message); - } - - // Is load exceeded? - if ($config['limit_load'] && $this->load !== false) - { - if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN')) - { - // Set board disabled to true to let the admins/mods get the proper notification - $config['board_disable'] = '1'; - - if (!$auth->acl_gets('a_', 'm_') && !$auth->acl_getf_global('m_')) - { - header('HTTP/1.1 503 Service Unavailable'); - trigger_error('BOARD_UNAVAILABLE'); - } - } - } - - if (isset($this->data['session_viewonline'])) - { - // Make sure the user is able to hide his session - if (!$this->data['session_viewonline']) - { - // Reset online status if not allowed to hide the session... - if (!$auth->acl_get('u_hideonline')) - { - $sql = 'UPDATE ' . SESSIONS_TABLE . ' - SET session_viewonline = 1 - WHERE session_user_id = ' . $this->data['user_id']; - $db->sql_query($sql); - $this->data['session_viewonline'] = 1; - } - } - else if (!$this->data['user_allow_viewonline']) - { - // the user wants to hide and is allowed to -> cloaking device on. - if ($auth->acl_get('u_hideonline')) - { - $sql = 'UPDATE ' . SESSIONS_TABLE . ' - SET session_viewonline = 0 - WHERE session_user_id = ' . $this->data['user_id']; - $db->sql_query($sql); - $this->data['session_viewonline'] = 0; - } - } - } - - - // Does the user need to change their password? If so, redirect to the - // ucp profile reg_details page ... of course do not redirect if we're already in the ucp - if (!defined('IN_ADMIN') && !defined('ADMIN_START') && $config['chg_passforce'] && $this->data['is_registered'] && $auth->acl_get('u_chgpasswd') && $this->data['user_passchg'] < time() - ($config['chg_passforce'] * 86400)) - { - if (strpos($this->page['query_string'], 'mode=reg_details') === false && $this->page['page_name'] != "ucp.$phpEx") - { - redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=profile&mode=reg_details')); - } - } - - return; - } - - /** - * Add Language Items - use_db and use_help are assigned where needed (only use them to force inclusion) - * - * @param mixed $lang_set specifies the language entries to include - * @param bool $use_db internal variable for recursion, do not use - * @param bool $use_help internal variable for recursion, do not use - * - * Examples: - * <code> - * $lang_set = array('posting', 'help' => 'faq'); - * $lang_set = array('posting', 'viewtopic', 'help' => array('bbcode', 'faq')) - * $lang_set = array(array('posting', 'viewtopic'), 'help' => array('bbcode', 'faq')) - * $lang_set = 'posting' - * $lang_set = array('help' => 'faq', 'db' => array('help:faq', 'posting')) - * </code> - */ - function add_lang($lang_set, $use_db = false, $use_help = false) - { - global $phpEx; - - if (is_array($lang_set)) - { - foreach ($lang_set as $key => $lang_file) - { - // Please do not delete this line. - // We have to force the type here, else [array] language inclusion will not work - $key = (string) $key; - - if ($key == 'db') - { - $this->add_lang($lang_file, true, $use_help); - } - else if ($key == 'help') - { - $this->add_lang($lang_file, $use_db, true); - } - else if (!is_array($lang_file)) - { - $this->set_lang($this->lang, $this->help, $lang_file, $use_db, $use_help); - } - else - { - $this->add_lang($lang_file, $use_db, $use_help); - } - } - unset($lang_set); - } - else if ($lang_set) - { - $this->set_lang($this->lang, $this->help, $lang_set, $use_db, $use_help); - } - } - - /** - * Set language entry (called by add_lang) - * @access private - */ - function set_lang(&$lang, &$help, $lang_file, $use_db = false, $use_help = false) - { - global $phpEx; - - // Make sure the language path is set (if the user setup did not happen it is not set) - if (!$this->lang_path) - { - global $phpbb_root_path, $config; - - $this->lang_path = $phpbb_root_path . 'language/' . basename($config['default_lang']) . '/'; - } - - // $lang == $this->lang - // $help == $this->help - // - add appropriate variables here, name them as they are used within the language file... - if (!$use_db) - { - if ($use_help && strpos($lang_file, '/') !== false) - { - $language_filename = $this->lang_path . substr($lang_file, 0, stripos($lang_file, '/') + 1) . 'help_' . substr($lang_file, stripos($lang_file, '/') + 1) . '.' . $phpEx; - } - else - { - $language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx; - } - - if ((@include $language_filename) === false) - { - trigger_error('Language file ' . basename($language_filename) . ' couldn\'t be opened.', E_USER_ERROR); - } - } - else if ($use_db) - { - // Get Database Language Strings - // Put them into $lang if nothing is prefixed, put them into $help if help: is prefixed - // For example: help:faq, posting - } - } - - /** - * Format user date - */ - function format_date($gmepoch, $format = false, $forcedate = false) - { - static $midnight; - - $lang_dates = $this->lang['datetime']; - $format = (!$format) ? $this->date_format : $format; - - // Short representation of month in format - if ((strpos($format, '\M') === false && strpos($format, 'M') !== false) || (strpos($format, '\r') === false && strpos($format, 'r') !== false)) - { - $lang_dates['May'] = $lang_dates['May_short']; - } - - unset($lang_dates['May_short']); - - if (!$midnight) - { - list($d, $m, $y) = explode(' ', gmdate('j n Y', time() + $this->timezone + $this->dst)); - $midnight = gmmktime(0, 0, 0, $m, $d, $y) - $this->timezone - $this->dst; - } - - if (strpos($format, '|') === false || ($gmepoch < $midnight - 86400 && !$forcedate) || ($gmepoch > $midnight + 172800 && !$forcedate)) - { - return strtr(@gmdate(str_replace('|', '', $format), $gmepoch + $this->timezone + $this->dst), $lang_dates); - } - - if ($gmepoch > $midnight + 86400 && !$forcedate) - { - $format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1); - return str_replace('||', $this->lang['datetime']['TOMORROW'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates)); - } - else if ($gmepoch > $midnight && !$forcedate) - { - $format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1); - return str_replace('||', $this->lang['datetime']['TODAY'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates)); - } - else if ($gmepoch > $midnight - 86400 && !$forcedate) - { - $format = substr($format, 0, strpos($format, '|')) . '||' . substr(strrchr($format, '|'), 1); - return str_replace('||', $this->lang['datetime']['YESTERDAY'], strtr(@gmdate($format, $gmepoch + $this->timezone + $this->dst), $lang_dates)); - } - - return strtr(@gmdate(str_replace('|', '', $format), $gmepoch + $this->timezone + $this->dst), $lang_dates); - } - - /** - * Get language id currently used by the user - */ - function get_iso_lang_id() - { - global $config, $db; - - if (!empty($this->lang_id)) - { - return $this->lang_id; - } - - if (!$this->lang_name) - { - $this->lang_name = $config['default_lang']; - } - - $sql = 'SELECT lang_id - FROM ' . LANG_TABLE . " - WHERE lang_iso = '" . $db->sql_escape($this->lang_name) . "'"; - $result = $db->sql_query($sql); - $this->lang_id = (int) $db->sql_fetchfield('lang_id'); - $db->sql_freeresult($result); - - return $this->lang_id; - } - - /** - * Get users profile fields - */ - function get_profile_fields($user_id) - { - global $db; - - if (isset($this->profile_fields)) - { - return; - } - - $sql = 'SELECT * - FROM ' . PROFILE_FIELDS_DATA_TABLE . " - WHERE user_id = $user_id"; - $result = $db->sql_query_limit($sql, 1); - $this->profile_fields = (!($row = $db->sql_fetchrow($result))) ? array() : $row; - $db->sql_freeresult($result); - } - - /** - * Specify/Get image - */ - function img($img, $alt = '', $width = false, $suffix = '', $type = 'full_tag') - { - static $imgs; - global $phpbb_root_path; - - $img_data = &$imgs[$img]; - - if (empty($img_data)) - { - if (!isset($this->img_array[$img])) - { - // Do not fill the image to let designers decide what to do if the image is empty - $img_data = ''; - return $img_data; - } - - $img_data['src'] = $phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename']; - $img_data['width'] = $this->img_array[$img]['image_width']; - $img_data['height'] = $this->img_array[$img]['image_height']; - } - - $alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt; - - switch ($type) - { - case 'src': - return $img_data['src']; - break; - - case 'width': - return ($width === false) ? $img_data['width'] : $width; - break; - - case 'height': - return $img_data['height']; - break; - - default: - $use_width = ($width === false) ? $img_data['width'] : $width; - - return '<img src="' . $img_data['src'] . '"' . (($use_width) ? ' width="' . $use_width . '"' : '') . (($img_data['height']) ? ' height="' . $img_data['height'] . '"' : '') . ' alt="' . $alt . '" title="' . $alt . '" />'; - break; - } - } - /** * Get option bit field from user options --- 1837,1840 ---- |
|
From: OryNider <ory...@us...> - 2008-01-21 14:43:52
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3145 Modified Files: mx_functions_style.php Log Message: $this->lang_path fixed Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** mx_functions_style.php 16 Jan 2008 04:00:48 -0000 1.33 --- mx_functions_style.php 21 Jan 2008 14:43:49 -0000 1.34 *************** *** 645,649 **** } ! $board_config['phpbb3_lang'] = $this->lang['default_lang']; $board_config['default_lang'] = $this->get_old_lang($this->lang['default_lang']); // This will expand the lang name --- 645,649 ---- } ! $board_config['phpbb_lang'] = $this->lang['default_lang']; $board_config['default_lang'] = $this->get_old_lang($this->lang['default_lang']); // This will expand the lang name |
|
From: OryNider <ory...@us...> - 2008-01-21 01:06:25
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20402 Modified Files: index.php Log Message: Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** index.php 21 Jan 2008 01:02:14 -0000 1.35 --- index.php 21 Jan 2008 01:06:20 -0000 1.36 *************** *** 1,8 **** <?php - /** ! * mxBB Notes: ! * This file is borrowed from phpBB, with some modifications ! */ // Security and Page header define( 'IN_PORTAL', 1 ); --- 1,13 ---- <?php /** ! * ! * @package mxBB Portal Core ! * @version $Id$ ! * @copyright (c) 2002-2006 mxBB Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mxbb.net ! * @origin This file is borrowed from phpBB, with some modifications ! */ ! // Security and Page header define( 'IN_PORTAL', 1 ); |
|
From: OryNider <ory...@us...> - 2008-01-21 01:03:41
|
Update of /cvsroot/mxbb/core/templates/subsilver2/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19185 Added Files: mainpage_header.html Removed Files: index.htm page_footer.html page_header.html Log Message: The NEW mxBB AdminCP !!!!!!!!!!!!!!!!!!!!!!!!!! --- page_header.html DELETED --- --- page_footer.html DELETED --- --- index.htm DELETED --- --- NEW FILE: mainpage_header.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> <head> {META} <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> <title>{SITENAME} - {L_MX_ADMIN}</title> <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" > <!-- BEGIN switch_gecko --> <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" > <!-- END switch_gecko --> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script> {MX_ADDITIONAL_CSS} {MX_ICON_CSS} </head> <body class="{S_CONTENT_DIRECTION}"> <table border="0" width="100%" cellspacing="1" cellpadding="4" class="forumline"> <tr> <td><img src="{LOGO}" alt="logo mxBB" /></td> <td align="right"><h1>{ADMIN_TITLE}</h1></td> </tr> <tr> <td>{L_LOGGED_IN_AS} <strong>{USERNAME}</strong> [ <a href="{U_LOGOUT}">{L_LOGOUT}</a> ]</td> <td align="right"><a href="{U_PORTAL_ADMIN_INDEX}" target="main">{L_ADMIN_INDEX}</a> • <a href="{U_PORTAL_INDEX}">{L_PORTAL_INDEX}</a> </td> </tr> </table> <p id="skip"><a href="#acp">{L_SKIP}</a></p> |
|
From: OryNider <ory...@us...> - 2008-01-21 01:03:28
|
Update of /cvsroot/mxbb/core/templates/prosilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19169 Modified Files: admin.css Added Files: admin_mx_preview.html mainpage_body.html mainpage_footer.html mainpage_header.html Log Message: The NEW mxBB AdminCP !!!!!!!!!!!!!!!!!!!!!!!!!! --- NEW FILE: mainpage_footer.html --- <div id="page-footer" class="copyright">{POWERED_BY} <a href="http://www.mxbb.net/" target="_mx-system" class="copyright">mxBB Portal</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 --> <!-- This displays generation info at the bottom of the page --> <br />{EXECUTION_STATS} <br />{MX_ADDITIONAL_FOOTER_TEXT} </div> </body> </html> Index: admin.css =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/admin/admin.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin.css 20 Dec 2007 13:11:35 -0000 1.2 --- admin.css 21 Jan 2008 01:03:22 -0000 1.3 *************** *** 127,131 **** clear: both; text-align: right; ! background: url("images/phpbb_logo.gif") top left no-repeat; height: 49px; font-size: 0.85em; --- 127,131 ---- clear: both; text-align: right; ! background: url("images/mxbb_logo.gif") top left no-repeat; height: 49px; font-size: 0.85em; *************** *** 135,139 **** .rtl #page-header { text-align: left; ! background: url("images/phpbb_logo.gif") top right no-repeat; } --- 135,139 ---- .rtl #page-header { text-align: left; ! background: url("images/mxbb_logo.gif") top right no-repeat; } --- NEW FILE: mainpage_body.html --- <script type="text/javascript"> // <![CDATA[ var menu_state = 'shown'; /** * Hiding/Showing the side menu */ function switch_menu() { var menu = document.getElementById('menu'); var main = document.getElementById('main'); var toggle = document.getElementById('toggle'); var handle = document.getElementById('toggle-handle'); switch (menu_state) { // hide case 'shown': main.style.width = '93%'; menu_state = 'hidden'; menu.style.display = 'none'; toggle.style.width = '20px'; handle.style.backgroundImage = 'url({U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}admin/images/toggle.gif)'; handle.style.backgroundRepeat = 'no-repeat'; <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> handle.style.backgroundPosition = '0% 50%'; toggle.style.left = '96%'; <!-- ELSE --> handle.style.backgroundPosition = '100% 50%'; toggle.style.left = '0'; <!-- ENDIF --> break; // show case 'hidden': main.style.width = '76%'; menu_state = 'shown'; menu.style.display = 'block'; toggle.style.width = '5%'; handle.style.backgroundImage = 'url({U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}admin/images/toggle.gif)'; handle.style.backgroundRepeat = 'no-repeat'; <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> handle.style.backgroundPosition = '100% 50%'; toggle.style.left = '75%'; <!-- ELSE --> handle.style.backgroundPosition = '0% 50%'; toggle.style.left = '15%'; <!-- ENDIF --> break; } } // ]]> </script> <div id="page-body"> <div id="tabs"> <ul> <!-- BEGIN tab --> <li{tab.ACTIVE_TAB}><a href="{U_PORTAL_ADMIN_INDEX}&cat={tab.CATEGORY}{tab.PARAMS}"><span>{tab.L_TAB}</span></a></li> <!-- END tab --> </ul> </div> <div id="acp"> <div class="panel"> <span class="corners-top"><span></span></span> <div id="content"> <div id="toggle"> <a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a> </div> <div id="menu" style="width:20%"> <p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [ <a href="{U_LOGOUT}">{L_LOGOUT}</a> ]</p> <ul> <!-- BEGIN category --> <li class="header"><div>{category.ADMIN_CATEGORY}</div></li> <!-- BEGIN panel --> <li{category.panel.A_PANEL}><a href="{category.panel.U_PANEL}"><span>{category.panel.L_PANEL}</span></a></li> <!-- END panel --> <!-- END category --> </ul> </div> <div id="main"> <!-- iframe src="" name="main" id="main_frame" width="100%" SCROLLING="no" style="border:none;margin:0px;padding:0px;"></iframe--> <div>{ACTION_SCRIPT}</div> {CONTENT_ACP} </div> </div> <span class="corners-bottom"><span></span></span> </div> </div> </div> --- NEW FILE: admin_mx_preview.html --- <fieldset> <p> <!-- frames --> <frameset> <iframe style="width:100%;height:550px;" name="main" src="{S_PREVIEW_ACTION}" marginwidth="0" marginheight="0" scrolling="auto" frameborder="no"></iframe> </frameset> <!-- frames end --> </p> </fieldset> <br clear="all" /> --- NEW FILE: mainpage_header.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}"> <head> <meta http-equiv="content-type" content="text/html; charset={S_CONTENT_ENCODING}" /> <meta http-equiv="Content-Style-Type" content="text/css" /> {META} <title>{L_ADMIN} • {L_ADMIN_CATEGORY} • {L_ADMIN_PART}</title> <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}admin/admin.css" rel="stylesheet" type="text/css" media="screen" /> <script type="text/javascript"></script> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script> {MX_ADDITIONAL_CSS} {MX_ICON_CSS} </head> <body class="{S_CONTENT_DIRECTION}"> <div id="wrap"> <div id="page-header"> <h1>{ADMIN_TITLE}</h1> <p> <a href="{U_PORTAL_ADMIN_INDEX}" target="main">{L_ADMIN_INDEX}</a> • <a href="{U_PORTAL_INDEX}">{L_PORTAL_INDEX}</a> </p> <p id="skip"><a href="#acp">{L_SKIP}</a></p> <p></p> </div> |
|
From: OryNider <ory...@us...> - 2008-01-21 01:03:08
|
Update of /cvsroot/mxbb/core/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18781 Added Files: admin_mx_preview.tpl mainpage_body.tpl mainpage_footer.tpl mainpage_header.tpl Log Message: The NEW mxBB AdminCP !!!!!!!!!!!!!!!!!!!!!!!!!! --- NEW FILE: admin_mx_preview.tpl --- <table width="99%" cellpadding="4" cellspacing="1" border="0" align="center" class="forumline"> <tr> <td> <!-- frames --> <frameset> <iframe style="width:100%;height:550px;" name="main" src="{S_PREVIEW_ACTION}" marginwidth="0" marginheight="0" scrolling="auto" frameborder="no"></iframe> </frameset> <!-- frames end --> </td> </tr> </table> <br clear="all" /> --- NEW FILE: mainpage_footer.tpl --- <div id="page-footer" class="copyright">{POWERED_BY} <a href="http://www.mxbb.net/" target="_mx-system" class="copyright">mxBB Portal</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 --> <!-- This displays generation info at the bottom of the page --> <br />{EXECUTION_STATS} <br />{MX_ADDITIONAL_FOOTER_TEXT} </div> </body> </html> --- NEW FILE: mainpage_body.tpl --- <script type="text/javascript"> // <![CDATA[ var menu_state = 'shown'; /** * Hiding/Showing the side menu */ function switch_menu() { var menu = document.getElementById('menu'); var main = document.getElementById('main'); var toggle = document.getElementById('toggle'); var handle = document.getElementById('toggle-handle'); switch (menu_state) { // hide case 'shown': main.style.width = '93%'; menu_state = 'hidden'; menu.style.display = 'none'; toggle.style.width = '20px'; handle.style.backgroundImage = 'url({U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}admin/images/toggle.gif)'; handle.style.backgroundRepeat = 'no-repeat'; <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> handle.style.backgroundPosition = '0% 50%'; toggle.style.left = '96%'; <!-- ELSE --> handle.style.backgroundPosition = '100% 50%'; toggle.style.left = '0'; <!-- ENDIF --> break; // show case 'hidden': main.style.width = '76%'; menu_state = 'shown'; menu.style.display = 'block'; toggle.style.width = '5%'; handle.style.backgroundImage = 'url({U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}admin/images/toggle.gif)'; handle.style.backgroundRepeat = 'no-repeat'; <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> handle.style.backgroundPosition = '100% 50%'; toggle.style.left = '75%'; <!-- ELSE --> handle.style.backgroundPosition = '0% 50%'; toggle.style.left = '15%'; <!-- ENDIF --> break; } } // ]]> </script> <table border="1" width="100%" cellspacing="0" cellpadding="0" class="forumline"> <tr><td colspan="2"> <table border="0" width="100%" cellspacing="0" cellpadding="0" class="forumline" style="border:none;"> <tr> <th class="thCornerL"> </th> <!-- BEGIN tab --> <th class="thHead"{tab.ACTIVE_TAB} style="cursor:pointer;white-space:nowrap;" onclick="window.location='{U_ADMIN_INDEX}&cat={tab.CATEGORY}{tab.PARAMS}';">{tab.L_TAB}</th> <!-- END tab --> <th class="thCornetR"> </th> </tr> </table> </td></tr> <tr> <td width="20%" valign="top" class="row1" style="border-left:none;"> <table border="0" width="100%" cellspacing="0" cellpadding="4" class="forumline" style="border:none;"> <!-- BEGIN category --> <tr> <th class="thHead">{category.ADMIN_CATEGORY}</th> </tr> <!-- BEGIN panel --> <tr> <td class="row1"{category.panel.A_PANEL}><a href="{category.panel.U_PANEL}">{category.panel.L_PANEL}</a></td> </tr> <!-- END panel --> <!-- END category --> </table> </td> <td width="80%" style="padding:6px;padding-left:12px;background-color:#E5E5E5;"><div>{ACTION_SCRIPT}</div> {CONTENT_ACP}</td> </tr> </table> --- NEW FILE: mainpage_header.tpl --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html dir="{S_CONTENT_DIRECTION}"> <head> {META} <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" /> <title>{SITENAME} - {L_MX_ADMIN}</title> <!-- First load standard template *.css definition, located in the the phpbb template folder --> <link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}{TEMPLATE_ROOT_PATH}subSilver.css" type="text/css" > <!-- Then load mxBB template *.css definition for mx, located in the the portal template folder --> <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}subSilver.css" type="text/css" > <!-- Optionally, redefine some defintions for gecko browsers --> <!-- BEGIN switch_gecko --> <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}gecko.css" type="text/css" > <!-- END switch_gecko --> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script> <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script> {MX_ADDITIONAL_CSS} {MX_ICON_CSS} </head> <body class="{S_CONTENT_DIRECTION}"> <table border="0" width="100%" cellspacing="1" cellpadding="4" class="forumline"> <tr> <td><img src="{LOGO}" alt="logo mxBB" /></td> <td align="right"><h1>{ADMIN_TITLE}</h1></td> </tr> <tr> <td>{L_LOGGED_IN_AS} <strong>{USERNAME}</strong> [ <a href="{U_LOGOUT}">{L_LOGOUT}</a> ]</td> <td align="right"><a href="{U_PORTAL_ADMIN_INDEX}" target="main">{L_ADMIN_INDEX}</a> • <a href="{U_PORTAL_INDEX}">{L_PORTAL_INDEX}</a> </td> </tr> </table> <p id="skip"><a href="#acp">{L_SKIP}</a></p> |
|
From: OryNider <ory...@us...> - 2008-01-21 01:02:31
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18665 Modified Files: admin_mx_page_cp.php index.php pagestart.php Added Files: index_right.php Log Message: The NEW mxBB AdminCP !!!!!!!!!!!!!!!!!!!!!!!!!! --- NEW FILE: index_right.php --- <?php /** * * @package mxBB Portal Core * @version $Id: index_right.php,v 1.1 2008/01/21 01:02:20 orynider Exp $ * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ /** * mxBB Notes: * This file is borrowed from phpBB, with some modifications */ // // Security and Page header // [...1052 lines suppressed...] // $template->set_filenames(array( "body" => "admin/index_frameset.tpl") ); $template->assign_vars(array( 'ADMIN_TITLE' => $lang['mxBB_adminCP'], "S_FRAME_NAV" => mx_append_sid("index_right.$phpEx?pane=left"), "S_FRAME_MAIN" => mx_append_sid("index_right.$phpEx?pane=right")) ); header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); $template->pparse("body"); $db->sql_close(); exit; } ?> Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** admin_mx_page_cp.php 9 Sep 2007 16:48:15 -0000 1.26 --- admin_mx_page_cp.php 21 Jan 2008 01:02:11 -0000 1.27 *************** *** 247,251 **** 'S_INCLUDE_ALL_YES' => ( $include_all == '1' ) ? 'checked="checked"' : '', ! 'S_INCLUDE_ALL_NO' => ( $include_all == '0' ) ? 'checked="checked"' : '' )); --- 247,251 ---- 'S_INCLUDE_ALL_YES' => ( $include_all == '1' ) ? 'checked="checked"' : '', ! 'S_INCLUDE_ALL_NO' => ( $include_all == '0' ) ? 'checked="checked"' : '', )); Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** index.php 20 Dec 2007 13:10:04 -0000 1.34 --- index.php 21 Jan 2008 01:02:14 -0000 1.35 *************** *** 1,37 **** <?php - /** - * - * @package mxBB Portal Core - * @version $Id$ - * @copyright (c) 2002-2006 mxBB Project Team - * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 - * @link http://www.mxbb.net - * - */ [...1878 lines suppressed...] ! $template->assign_block_vars( 'module_mx', array( 'ACTIVETAB' => $is_module?' id="activetab"':'', ! ) ); ! // error_reporting( E_ALL); ! $menu_params = ''; ! $template->assign_var( 'L_ADMIN_CATEGORY', $lang_category ); ! display_tab_menu( $menu_array, $action_file_id, $allow_menu_sort, $menu_params ); ! $template->pparse( 'adm_header' ); ! $template->assign_var( 'CONTENT_ACP', $admin_html ); ! $template->pparse( 'adm_body' ); ! $template->pparse( 'adm_footer' ); ! // print '<pre>'; ! // print_r( $lang); ! // print '</pre>'; ?> \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2008-01-19 21:35:35
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13930 Modified Files: common.php Log Message: portal_version cache check Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** common.php 18 Jan 2008 10:28:37 -0000 1.74 --- common.php 19 Jan 2008 21:35:30 -0000 1.75 *************** *** 309,318 **** $portal_config = $mx_cache->obtain_mxbb_config(); ! /* ! if (empty($portal_config['portal_version'])) { ! $portal_config = $mx_cache->obtain_mxbb_config(); } - */ // --- 309,316 ---- $portal_config = $mx_cache->obtain_mxbb_config(); ! if ($portal_config['portal_version'] == '') { ! $portal_config = $mx_cache->obtain_mxbb_config(false); } // |
|
From: OryNider <ory...@us...> - 2008-01-18 14:37:35
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24996 Modified Files: mx_functions_admincp.php Log Message: Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** mx_functions_admincp.php 20 Dec 2007 13:10:05 -0000 1.41 --- mx_functions_admincp.php 18 Jan 2008 14:37:28 -0000 1.42 *************** *** 3031,3035 **** global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! include_once($phpbb_root_path . 'includes/functions_search.' . $phpEx); $search_match_table = MX_MATCH_TABLE; --- 3031,3035 ---- global $db, $phpbb_root_path, $board_config, $lang, $phpEx; ! mx_page::load('functions_seach', 'phpbb2'); $search_match_table = MX_MATCH_TABLE; |
|
From: OryNider <ory...@us...> - 2008-01-18 10:39:16
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20338 Modified Files: functions.php functions_admin.php functions_hook.php functions_module.php Log Message: Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions.php 15 Jan 2008 22:27:09 -0000 1.3 --- functions.php 18 Jan 2008 10:39:05 -0000 1.4 *************** *** 4515,4524 **** * Cool function name, eh? We might want to add operations to it later */ ! function garbage_collection() { global $mx_cache, $db; // Unload cache, must be done before the DB connection if closed ! if (!empty($cache)) { $mx_cache->unload(); --- 4515,4524 ---- * Cool function name, eh? We might want to add operations to it later */ ! function garbage_collection($unload_cache = true, $close_db = true) { global $mx_cache, $db; // Unload cache, must be done before the DB connection if closed ! if (!empty($cache) && ($unload_cache)) { $mx_cache->unload(); *************** *** 4526,4530 **** // Close our DB connection. ! if (!empty($db)) { $db->sql_close(); --- 4526,4530 ---- // Close our DB connection. ! if (!empty($db) && ($close_db)) { $db->sql_close(); Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions_hook.php 15 Jan 2008 22:27:09 -0000 1.3 --- functions_hook.php 18 Jan 2008 10:39:05 -0000 1.4 *************** *** 1,12 **** <?php /** ! * ! * @package Functions_phpBB3 ! * @version $Id$ ! * @copyright (c) 2002-2006 mxBB Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mxbb.net ! * ! */ if ( !defined( 'IN_PORTAL' ) ) --- 1,11 ---- <?php /** ! * ! * @package Functions_phpBB3 ! * @version $Id$ ! * @copyright (c) 2002-2006 mxBB Project Team ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mxbb.net ! */ if ( !defined( 'IN_PORTAL' ) ) *************** *** 14,27 **** die( "Hacking attempt" ); } ! ! //error_reporting( E_ALL | !E_NOTICE); ! ! //include_once( $phpbb_root_path . 'adm/index.'. $phpEx); include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx ); include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_module.' . $phpEx ); ! include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.'.$phpEx); ! include_once( $mx_root_path . 'includes/sessions/phpbb3/session.'. $phpEx); ! if ( !function_exists( 'function phpbb_user_session_handler')) { function phpbb_user_session_handler() --- 13,24 ---- die( "Hacking attempt" ); } ! // error_reporting( E_ALL | !E_NOTICE); ! // include_once( $phpbb_root_path . 'adm/index.'. $phpEx); include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx ); include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_module.' . $phpEx ); ! include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); ! include_once( $mx_root_path . 'includes/sessions/phpbb3/session.' . $phpEx ); ! if ( !function_exists( 'function phpbb_user_session_handler' ) ) { function phpbb_user_session_handler() *************** *** 29,37 **** global $phpbb_hook; ! if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__)) { ! if ($phpbb_hook->hook_return(__FUNCTION__)) { ! return $phpbb_hook->hook_return_result(__FUNCTION__); } } --- 26,34 ---- global $phpbb_hook; ! if ( !empty( $phpbb_hook ) && $phpbb_hook->call_hook( __FUNCTION__ ) ) { ! if ( $phpbb_hook->hook_return( __FUNCTION__ ) ) { ! return $phpbb_hook->hook_return_result( __FUNCTION__ ); } } *************** *** 41,128 **** } ! if ( !function_exists( 'request_var')) { ! function request_var( $p1, $p2 = '', $p3 = false, $p4=false) { global $mx_request_vars; ! return $mx_request_vars->request( $p1, $p2, $p3, $p4); } } ! if ( !function_exists( 'append_sid')) { ! function append_sid( $url) { ! return mx_append_sid( $url); } } ! if ( !function_exists( 'adm_page_header')) { ! function adm_page_header($page_title) { global $board_config, $db, $user, $template; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID; ! if (defined('HEADER_INC')) { return; } ! define('HEADER_INC', true); ! // gzip_compression ! if ($board_config['gzip_compress']) { ! if (@extension_loaded('zlib') && !headers_sent()) { ! ob_start('ob_gzhandler'); } } ! $template->assign_vars(array( ! 'PAGE_TITLE' => $page_title, ! 'USERNAME' => $user->data['username'], ! ! 'SID' => $SID, ! '_SID' => $_SID, ! 'SESSION_ID' => $user->session_id, ! 'ROOT_PATH' => $phpbb_admin_path, ! 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), ! 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), ! 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), ! 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", ! 'T_SMILIES_PATH' => "{$phpbb_root_path}{$board_config['smilies_path']}/", ! 'T_AVATAR_PATH' => "{$phpbb_root_path}{$board_config['avatar_path']}/", ! 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$board_config['avatar_gallery_path']}/", ! 'T_ICONS_PATH' => "{$phpbb_root_path}{$board_config['icons_path']}/", ! 'T_RANKS_PATH' => "{$phpbb_root_path}{$board_config['ranks_path']}/", ! 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$board_config['upload_path']}/", ! 'ICON_MOVE_UP' => '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', ! 'ICON_MOVE_UP_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', ! 'ICON_MOVE_DOWN' => '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', ! 'ICON_MOVE_DOWN_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', ! 'ICON_EDIT' => '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', ! 'ICON_EDIT_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', ! 'ICON_DELETE' => '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', ! 'ICON_DELETE_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', ! 'ICON_SYNC' => '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', ! 'ICON_SYNC_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', ! 'S_USER_LANG' => $user->lang['USER_LANG'], ! 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], ! 'S_CONTENT_ENCODING' => 'UTF-8', ! 'S_CONTENT_FLOW_BEGIN' => ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right', ! 'S_CONTENT_FLOW_END' => ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left', ! )); // application/xhtml+xml not used because of IE ! header('Content-type: text/html; charset=UTF-8'); ! header('Cache-Control: private, no-cache="set-cookie"'); ! header('Expires: 0'); ! header('Pragma: no-cache'); return; --- 38,122 ---- } ! if ( !function_exists( 'request_var' ) ) { ! function request_var( $p1, $p2 = '', $p3 = false, $p4 = false ) { global $mx_request_vars; ! return $mx_request_vars->request( $p1, $p2, $p3, $p4 ); } } ! if ( !function_exists( 'append_sid' ) ) { ! function append_sid( $url ) { ! return mx_append_sid( $url ); } } ! if ( !function_exists( 'adm_page_header' ) ) { ! function adm_page_header( $page_title ) { global $board_config, $db, $user, $template; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $SID, $_SID; ! if ( defined( 'HEADER_INC' ) ) { return; } ! define( 'HEADER_INC', true ); // gzip_compression ! if ( $board_config['gzip_compress'] ) { ! if ( @extension_loaded( 'zlib' ) && !headers_sent() ) { ! ob_start( 'ob_gzhandler' ); } } ! $template->assign_vars( array( 'PAGE_TITLE' => $page_title, ! 'USERNAME' => $user->data['username'], ! 'SID' => $SID, ! '_SID' => $_SID, ! 'SESSION_ID' => $user->session_id, ! 'ROOT_PATH' => $phpbb_admin_path, ! 'U_LOGOUT' => append_sid( "{$phpbb_root_path}ucp.$phpEx", 'mode=logout' ), ! 'U_ADM_INDEX' => append_sid( "{$phpbb_admin_path}index.$phpEx" ), ! 'U_INDEX' => append_sid( "{$phpbb_root_path}index.$phpEx" ), ! 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", ! 'T_SMILIES_PATH' => "{$phpbb_root_path}{$board_config['smilies_path']}/", ! 'T_AVATAR_PATH' => "{$phpbb_root_path}{$board_config['avatar_path']}/", ! 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$board_config['avatar_gallery_path']}/", ! 'T_ICONS_PATH' => "{$phpbb_root_path}{$board_config['icons_path']}/", ! 'T_RANKS_PATH' => "{$phpbb_root_path}{$board_config['ranks_path']}/", ! 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$board_config['upload_path']}/", ! 'ICON_MOVE_UP' => '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', ! 'ICON_MOVE_UP_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', ! 'ICON_MOVE_DOWN' => '<img src="' . $phpbb_admin_path . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', ! 'ICON_MOVE_DOWN_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_down_disabled.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', ! 'ICON_EDIT' => '<img src="' . $phpbb_admin_path . 'images/icon_edit.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', ! 'ICON_EDIT_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_edit_disabled.gif" alt="' . $user->lang['EDIT'] . '" title="' . $user->lang['EDIT'] . '" />', ! 'ICON_DELETE' => '<img src="' . $phpbb_admin_path . 'images/icon_delete.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', ! 'ICON_DELETE_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_delete_disabled.gif" alt="' . $user->lang['DELETE'] . '" title="' . $user->lang['DELETE'] . '" />', ! 'ICON_SYNC' => '<img src="' . $phpbb_admin_path . 'images/icon_sync.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', ! 'ICON_SYNC_DISABLED' => '<img src="' . $phpbb_admin_path . 'images/icon_sync_disabled.gif" alt="' . $user->lang['RESYNC'] . '" title="' . $user->lang['RESYNC'] . '" />', + 'S_USER_LANG' => $user->lang['USER_LANG'], + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], + 'S_CONTENT_ENCODING' => 'UTF-8', + 'S_CONTENT_FLOW_BEGIN' => ( $user->lang['DIRECTION'] == 'ltr' ) ? 'left' : 'right', + 'S_CONTENT_FLOW_END' => ( $user->lang['DIRECTION'] == 'ltr' ) ? 'right' : 'left', + ) ); // application/xhtml+xml not used because of IE ! header( 'Content-type: text/html; charset=UTF-8' ); ! header( 'Cache-Control: private, no-cache="set-cookie"' ); ! header( 'Expires: 0' ); ! header( 'Pragma: no-cache' ); return; *************** *** 130,162 **** } ! if ( !function_exists( 'adm_page_footer')) { ! function adm_page_footer($copyright_html = true) { global $db, $board_config, $template, $user, $auth, $cache; global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; - // Output page creation time ! if (defined('DEBUG')) { ! $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; ! if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report')) { ! $db->sql_report('display'); } ! $debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($board_config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime); ! if ($auth->acl_get('a_') && defined('DEBUG_EXTRA')) { ! if (function_exists('memory_get_usage')) { ! if ($memory_usage = memory_get_usage()) { global $base_memory_usage; $memory_usage -= $base_memory_usage; ! $memory_usage = ($memory_usage >= 1048576) ? round((round($memory_usage / 1048576 * 100) / 100), 2) . ' ' . $user->lang['MB'] : (($memory_usage >= 1024) ? round((round($memory_usage / 1024 * 100) / 100), 2) . ' ' . $user->lang['KB'] : $memory_usage . ' ' . $user->lang['BYTES']); $debug_output .= ' | Memory Usage: ' . $memory_usage; --- 124,155 ---- } ! if ( !function_exists( 'adm_page_footer' ) ) { ! function adm_page_footer( $copyright_html = true ) { global $db, $board_config, $template, $user, $auth, $cache; global $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; // Output page creation time ! if ( defined( 'DEBUG' ) ) { ! $mtime = explode( ' ', microtime() ); $totaltime = $mtime[0] + $mtime[1] - $starttime; ! if ( !empty( $_REQUEST['explain'] ) && $auth->acl_get( 'a_' ) && defined( 'DEBUG_EXTRA' ) && method_exists( $db, 'sql_report' ) ) { ! $db->sql_report( 'display' ); } ! $debug_output = sprintf( 'Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . ( ( $board_config['gzip_compress'] ) ? 'On' : 'Off' ) . ( ( $user->load ) ? ' | Load : ' . $user->load : '' ), $totaltime ); ! if ( $auth->acl_get( 'a_' ) && defined( 'DEBUG_EXTRA' ) ) { ! if ( function_exists( 'memory_get_usage' ) ) { ! if ( $memory_usage = memory_get_usage() ) { global $base_memory_usage; $memory_usage -= $base_memory_usage; ! $memory_usage = ( $memory_usage >= 1048576 ) ? round( ( round( $memory_usage / 1048576 * 100 ) / 100 ), 2 ) . ' ' . $user->lang['MB'] : ( ( $memory_usage >= 1024 ) ? round( ( round( $memory_usage / 1024 * 100 ) / 100 ), 2 ) . ' ' . $user->lang['KB'] : $memory_usage . ' ' . $user->lang['BYTES'] ); $debug_output .= ' | Memory Usage: ' . $memory_usage; *************** *** 168,189 **** } ! $template->assign_vars(array( ! 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', ! 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', ! 'S_COPYRIGHT_HTML' => $copyright_html, ! 'VERSION' => $board_config['version']) ! ); ! $template->display('body'); phpBB3::garbage_collection(); ! //phpBB3::exit_handler(); } } - class phpbb3_hook { - var $main_part = ''; var $current_tab = ''; --- 161,179 ---- } ! $template->assign_vars( array( 'DEBUG_OUTPUT' => ( defined( 'DEBUG' ) ) ? $debug_output : '', ! 'TRANSLATION_INFO' => ( !empty( $user->lang['TRANSLATION_INFO'] ) ) ? $user->lang['TRANSLATION_INFO'] : '', ! 'S_COPYRIGHT_HTML' => $copyright_html, ! 'VERSION' => $board_config['version'] ) ! ); ! $template->display( 'body' ); phpBB3::garbage_collection(); ! // phpBB3::exit_handler(); } } class phpbb3_hook { var $main_part = ''; var $current_tab = ''; *************** *** 191,225 **** function phpbb3_hook() { - } ! function hook( $part, $curr_tab = '', $mode = '') { global $lang, $mx_user, $phpEx; ! switch( $part) { case 'forum': case 'admin': $this->main_part = $part; ! ! //print_r( $mx_user);die(); ! //include_once( $mx_user->lang_path . 'acp/common.'.$phpEx); break; case 'tabs': ! if ( $this->main_part == 'admin') { ! return $this->admin_tabs( $curr_tab); } break; case 'menu': ! if( $this->main_part == 'admin') { ! return $this->admin_menu( $curr_tab); } break; case 'panel': ! if ( $this->main_part == 'admin') { ! return $this->admin_panel( $curr_tab, $mode); } break; --- 181,213 ---- function phpbb3_hook() { } ! function hook( $part, $curr_tab = '', $mode = '' ) { global $lang, $mx_user, $phpEx; ! switch ( $part ) { case 'forum': case 'admin': $this->main_part = $part; ! // print_r( $mx_user);die(); ! // include_once( $mx_user->lang_path . 'acp/common.'.$phpEx); break; case 'tabs': ! if ( $this->main_part == 'admin' ) { ! return $this->admin_tabs( $curr_tab ); } break; case 'menu': ! if ( $this->main_part == 'admin' ) { ! return $this->admin_menu( $curr_tab ); } break; case 'panel': ! if ( $this->main_part == 'admin' ) { ! return $this->admin_panel( $curr_tab, $mode ); } break; *************** *** 227,233 **** } ! function admin_menu( $part) { ! if ( $this->main_part != 'admin') { return false; --- 215,221 ---- } ! function admin_menu( $part ) { ! if ( $this->main_part != 'admin' ) { return false; *************** *** 241,255 **** ORDER BY m1.left_id "; ! if( !( $rs=$db->sql_query( $sql))) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain menu data form phpbb3 modules', 'Error', __LINE__, __FILE__, $sql); } ! $header= ''; $menu_ary = array(); ! while( $row = $db->sql_fetchrow( $rs) ) { ! if ( $header != $row['m1_langname']) { $header = $row['m1_langname']; --- 229,243 ---- ORDER BY m1.left_id "; ! if ( !( $rs = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain menu data form phpbb3 modules', 'Error', __LINE__, __FILE__, $sql ); } ! $header = ''; $menu_ary = array(); ! while ( $row = $db->sql_fetchrow( $rs ) ) { ! if ( $header != $row['m1_langname'] ) { $header = $row['m1_langname']; *************** *** 262,268 **** } ! function admin_tabs($curr_tab) { ! if ( $this->main_part != 'admin') { return false; --- 250,256 ---- } ! function admin_tabs( $curr_tab ) { ! if ( $this->main_part != 'admin' ) { return false; *************** *** 272,277 **** $this->current_tab = $curr_tab; ! ! //This sintax is not correct /* $sql = "SELECT m1.*, count(m2.module_id) AS subcount --- 260,264 ---- $this->current_tab = $curr_tab; ! // This sintax is not correct /* $sql = "SELECT m1.*, count(m2.module_id) AS subcount *************** *** 283,312 **** "; */ ! $sql = "SELECT m1.*, count(m1.module_id) AS subcount ! FROM " . MODULES_TABLE . " AS m1 ! WHERE m1.parent_id = 0 AND m1.module_class = 'acp' ! AND m1.module_enabled = 1 ! AND m1.module_display = 1 ! GROUP BY m1.module_id ! HAVING count(m1.module_id) > 0 ! ORDER BY m1.left_id ! "; ! if ( !($rs = $db->sql_query( $sql)) ) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain data form phpbb3 modules', 'Error', __LINE__, __FILE__, $sql); } $return_category = ''; ! while ( $row = $db->sql_fetchrow( $rs)) { ! if( $row['module_id']==$curr_tab) { ! $return_category = isset( $lang[$row['module_langname']])?$lang[$row['module_langname']]:$row['module_langname']; } ! $template->assign_block_vars( 'module_phpbb', array( // ! 'ACTIVETAB' => $row['module_id']==$curr_tab?' id="activetab"':'', ! 'CATEGORY' => PORTAL_BACKEND, ! 'PARAMS' => '&i=' . $row['module_id'], ! 'L_MX_PHPBB' => (isset( $mx_user->lang[$row['module_langname']])?$mx_user->lang[$row['module_langname']]:$row['module_langname']), ! )); } --- 270,326 ---- "; */ ! $sql = 'SELECT * ! FROM ' . MODULES_TABLE . " ! WHERE module_class = '" . $db->sql_escape('acp') . "' ! AND module_enabled = 1 ! AND module_display = 1 ! GROUP BY module_id ! ORDER BY left_id ASC"; ! ! /* ! $sql_array = array(); ! $sql_array['SELECT'] = 'm1.*, count(m2.module_id) AS subcount'; ! $sql_array['FROM'][MODULES_TABLE] = 'AS m1'; ! $sql_array['LEFT_JOIN'][] = array( ! 'FROM' => array( MODULES_TABLE => 'AS m2' ), ! 'ON' => 'm1.module_id = m2.parent_id AND m2.module_enabled = 1 AND m2.module_display = 1', ! ); ! $sql_array['GROUP_BY'] = 'm1.module_id'; ! $sql_array['WHERE'] = "m1.parent_id = 0 AND m1.module_class = 'acp'"; ! $sql_array['ORDER_BY'] = 'm1.left_id ASC'; ! ! $sql = $db->sql_build_query( 'SELECT', $sql_array ); ! */ ! ! if ( !( $rs = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, 'Could not obtain tabs data form phpbb3 modules', 'Error', __LINE__, __FILE__, $sql ); } $return_category = ''; ! while ( $row = $db->sql_fetchrow( $rs ) ) { ! if ( isset( $mx_user->lang[$row['module_langname']] ) ) { ! $l_mx_phpbb = $mx_user->lang[$row['module_langname']]; } ! else if ( isset( $lang[$row['module_langname']] ) ) ! { ! $l_mx_phpbb = $lang[$row['module_langname']]; ! } ! else ! { ! $l_mx_phpbb = $row['module_langname']; ! } ! ! if ( $row['module_id'] == $curr_tab ) ! { ! $return_category = $l_mx_phpbb; ! } ! $template->assign_block_vars( 'module_phpbb', array( ! 'ACTIVETAB' => $row['module_id'] == $curr_tab?' id="activetab"':'', ! 'CATEGORY' => PORTAL_BACKEND, ! 'PARAMS' => '&i=' . $row['module_id'], ! 'L_MX_PHPBB' => $l_mx_phpbb, ! ) ); } *************** *** 314,318 **** } ! function admin_panel( $acp_panel, $mode = '') { global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $mx_user, $mx_cache, $cache, $template; --- 328,332 ---- } ! function admin_panel( $acp_panel, $mode = '' ) { global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $mx_user, $mx_cache, $cache, $template; *************** *** 322,369 **** $phpbb_admin_html .= "<p>ACP Panel: <strong>$acp_panel</strong></p>"; ! include_once( $phpbb_root_path . 'includes/acp/acp_' . $acp_panel . '.'. $phpEx); $cache = $mx_cache; $user = $mx_user; $auth = $phpbb_auth; ! //$auth = new phpbb_auth_base(); ! //$user->session_begin(); ! //$auth->acl($user->data); ! //$user->setup('acp/common'); ! ! //$phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : 'adm/'; $module_id = $acp_panel; $user->theme['template_storedb'] = false; ! //$template->set_custom_template($phpbb_admin_path . 'style', 'admin'); $module = new p_master(); - // Instantiate new module $module = new p_master(); - // Instantiate module system and generate list of available modules ! $module->list_modules('acp'); $module->p_name = $acp_panel; // Select the active module ! $module->set_active($acp_panel, $mode); ! // Assign data to the template engine for the list of modules // We do this before loading the active module for correct menu display in trigger_error ! $module->assign_tpl_vars(append_sid("{$phpbb_admin_path}index.$phpEx")); ! // Load and execute the relevant module $module->load_active(); ! ob_start(); ! adm_page_header($module->get_page_title()); ! $template->set_filenames(array( ! 'body' => $phpbb_root_path . 'adm/style/acp_' . $acp_panel . '.html', ! )); adm_page_footer(); $phpbb_admin_html .= ob_get_contents(); ob_end_clean(); ! return $phpbb_admin_html; } } ?> \ No newline at end of file --- 336,378 ---- $phpbb_admin_html .= "<p>ACP Panel: <strong>$acp_panel</strong></p>"; ! include_once( $phpbb_root_path . 'includes/acp/acp_' . $acp_panel . '.' . $phpEx ); $cache = $mx_cache; $user = $mx_user; $auth = $phpbb_auth; ! // $auth = new phpbb_auth_base(); ! // $user->session_begin(); ! // $auth->acl($user->data); ! // $user->setup('acp/common'); ! // $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : 'adm/'; $module_id = $acp_panel; $user->theme['template_storedb'] = false; ! // $template->set_custom_template($phpbb_admin_path . 'style', 'admin'); $module = new p_master(); // Instantiate new module $module = new p_master(); // Instantiate module system and generate list of available modules ! $module->list_modules( 'acp' ); $module->p_name = $acp_panel; // Select the active module ! $module->set_active( $acp_panel, $mode ); // Assign data to the template engine for the list of modules // We do this before loading the active module for correct menu display in trigger_error ! $module->assign_tpl_vars( append_sid( "{$phpbb_admin_path}index.$phpEx" ) ); // Load and execute the relevant module $module->load_active(); ! ob_start(); ! adm_page_header( $module->get_page_title() ); ! $template->set_filenames( array( 'body' => $phpbb_root_path . 'adm/style/acp_' . $acp_panel . '.html', ! ) ); adm_page_footer(); $phpbb_admin_html .= ob_get_contents(); ob_end_clean(); ! return $phpbb_admin_html; } } + ?> \ No newline at end of file |
|
From: OryNider <ory...@us...> - 2008-01-18 10:39:10
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes/acp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20338/acp Modified Files: auth.php Log Message: |
|
From: OryNider <ory...@us...> - 2008-01-18 10:37:53
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19868/phpbb3 Modified Files: session.php Log Message: |
|
From: OryNider <ory...@us...> - 2008-01-18 10:37:53
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19868/internal Modified Files: session.php Log Message: Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** session.php 18 Jan 2008 10:28:37 -0000 1.2 --- session.php 18 Jan 2008 10:37:45 -0000 1.3 *************** *** 205,209 **** if ( !$db->sql_query($sql) || !$db->sql_affectedrows() ) { ! $session_id = md5(phpBB2::dss_rand()); $sql = "INSERT INTO " . SESSIONS_TABLE . " --- 205,209 ---- if ( !$db->sql_query($sql) || !$db->sql_affectedrows() ) { ! $session_id = md5(mx_dss_rand()); $sql = "INSERT INTO " . SESSIONS_TABLE . " |
|
From: OryNider <ory...@us...> - 2008-01-18 10:28:41
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16080/includes Modified Files: mx_functions_core.php mx_functions_phpbb.php Log Message: mx_message_die() upgrade plus an @ in funtions_install Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** mx_functions_core.php 15 Jan 2008 10:53:13 -0000 1.59 --- mx_functions_core.php 18 Jan 2008 10:28:37 -0000 1.60 *************** *** 65,69 **** global $db; ! if (($config = $this->get('phpbb_config')) && $use_cache ) { return $config; --- 65,69 ---- global $db; ! if (($config = $this->get('phpbb_config')) && ($use_cache) ) { return $config; *************** *** 107,115 **** * @return unknown */ ! function obtain_mxbb_config($force_refresh = false) { global $db; ! if ( ($config = $this->get('mxbb_config')) && !($force_refresh) ) { return $config; --- 107,115 ---- * @return unknown */ ! function obtain_mxbb_config($use_cache = true) { global $db; ! if ( ($config = $this->get('mxbb_config')) && ($use_cache) ) { return $config; Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** mx_functions_phpbb.php 16 Jan 2008 04:00:48 -0000 1.39 --- mx_functions_phpbb.php 18 Jan 2008 10:28:37 -0000 1.40 *************** *** 19,24 **** // Note: These functions will later be accessible wrapped as phpBBX::orig_functionname() // ! include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions.' . $phpEx); ! include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); // --- 19,24 ---- // Note: These functions will later be accessible wrapped as phpBBX::orig_functionname() // ! include($mx_root_path . 'includes/shared/phpbb2/includes/functions.' . $phpEx); ! include($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); // *************** *** 315,324 **** global $mx_starttime, $mx_page, $mx_block, $mx_user, $mx_request_vars, $mx_cache, $tplEx; //$default_lang = $mx_user->get_old_lang($board_config['default_lang']); $default_lang = $mx_user->lang['default_lang']; if(defined('HAS_DIED')) { ! print_r("mx_message_die() was called multiple times. This isn't supposed to happen. Was mx_message_die() used in page_tail.php? <br /><br />"); } --- 315,372 ---- global $mx_starttime, $mx_page, $mx_block, $mx_user, $mx_request_vars, $mx_cache, $tplEx; + static $msg_history; + //$default_lang = $mx_user->get_old_lang($board_config['default_lang']); $default_lang = $mx_user->lang['default_lang']; + if( !isset($msg_history) ) + { + $msg_history = array(); + } + $msg_history[] = array( + 'msg_code' => $msg_code, + 'msg_text' => $msg_text, + 'msg_title' => $msg_title, + 'err_line' => $err_line, + 'err_file' => $err_file, + 'sql' => $sql + ); + if(defined('HAS_DIED')) { ! // ! // This message is printed at the end of the report. ! // Of course, you can change it to suit your own needs. ;-) ! // ! $custom_error_message = 'Please, contact the %swebmaster%s. Thank you.'; ! if ( !empty($board_config) && !empty($board_config['board_email']) ) ! { ! $custom_error_message = sprintf($custom_error_message, '<a href="mailto:' . $board_config['board_email'] . '">', '</a>'); ! } ! else ! { ! $custom_error_message = sprintf($custom_error_message, '', ''); ! } ! echo "<html>\n<body>\n<b>Critical Error!</b><br />\nmx_message_die() was called multiple times.<br /> <hr />"; ! for( $i = 0; $i < count($msg_history); $i++ ) ! { ! echo '<b>Error #' . ($i+1) . "</b>\n<br />\n"; ! if( !empty($msg_history[$i]['msg_title']) ) ! { ! echo '<b>' . $msg_history[$i]['msg_title'] . "</b>\n<br />\n"; ! } ! echo $msg_history[$i]['msg_text'] . "\n<br /><br />\n"; ! if( !empty($msg_history[$i]['err_line']) ) ! { ! echo '<b>Line :</b> ' . $msg_history[$i]['err_line'] . '<br /><b>File :</b> ' . $msg_history[$i]['err_file'] . "</b>\n<br />\n"; ! } ! if( !empty($msg_history[$i]['sql']) ) ! { ! echo '<b>SQL :</b> ' . $msg_history[$i]['sql'] . "\n<br />\n"; ! } ! echo " <hr />\n"; ! } ! echo $custom_error_message . '<hr /><br clear="all">'; ! die("</body>\n</html>"); } |
|
From: OryNider <ory...@us...> - 2008-01-18 10:28:41
|
Update of /cvsroot/mxbb/core/includes/sessions/internal In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16080/includes/sessions/internal Modified Files: session.php Log Message: mx_message_die() upgrade plus an @ in funtions_install Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/internal/session.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** session.php 9 Sep 2007 16:51:31 -0000 1.1 --- session.php 18 Jan 2008 10:28:37 -0000 1.2 *************** *** 205,209 **** if ( !$db->sql_query($sql) || !$db->sql_affectedrows() ) { ! $session_id = md5(mx_dss_rand()); $sql = "INSERT INTO " . SESSIONS_TABLE . " --- 205,209 ---- if ( !$db->sql_query($sql) || !$db->sql_affectedrows() ) { ! $session_id = md5(phpBB2::dss_rand()); $sql = "INSERT INTO " . SESSIONS_TABLE . " |
|
From: OryNider <ory...@us...> - 2008-01-18 10:28:41
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16080/install/includes Modified Files: functions_install.php Log Message: mx_message_die() upgrade plus an @ in funtions_install Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** functions_install.php 9 Sep 2007 16:49:07 -0000 1.3 --- functions_install.php 18 Jan 2008 10:28:37 -0000 1.4 *************** *** 769,773 **** if( $tmpary[$i] == '.' || $tmpary[$i] == '..' ) continue; $fullname = $cwd.$tmpary[$i]; ! if( is_dir($fullname) ) { if( $cur_level < $max_levels ) --- 769,773 ---- if( $tmpary[$i] == '.' || $tmpary[$i] == '..' ) continue; $fullname = $cwd.$tmpary[$i]; ! if( @is_dir($fullname) ) { if( $cur_level < $max_levels ) |
|
From: OryNider <ory...@us...> - 2008-01-18 10:28:41
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16080/install Modified Files: mx_install.php Log Message: mx_message_die() upgrade plus an @ in funtions_install Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** mx_install.php 13 Sep 2007 09:12:38 -0000 1.81 --- mx_install.php 18 Jan 2008 10:28:37 -0000 1.82 *************** *** 215,218 **** --- 215,311 ---- } } + + /* + * Remove variables created by register_globals from the global scope + * Thanks to Matt Kavanagh + */ + function deregister_globals() + { + $not_unset = array( + 'GLOBALS' => true, + '_GET' => true, + '_POST' => true, + '_COOKIE' => true, + '_REQUEST' => true, + '_SERVER' => true, + '_SESSION' => true, + '_ENV' => true, + '_FILES' => true, + 'phpEx' => true, + 'phpbb_root_path' => true + ); + + // Not only will array_merge and array_keys give a warning if + // a parameter is not an array, array_merge will actually fail. + // So we check if _SESSION has been initialised. + if (!isset($_SESSION) || !is_array($_SESSION)) + { + $_SESSION = array(); + } + + // Merge all into one extremely huge array; unset this later + $input = array_merge( + array_keys($_GET), + array_keys($_POST), + array_keys($_COOKIE), + array_keys($_SERVER), + array_keys($_SESSION), + array_keys($_ENV), + array_keys($_FILES) + ); + + foreach ($input as $varname) + { + if (isset($not_unset[$varname])) + { + // Hacking attempt. No point in continuing unless it's a COOKIE + if ($varname !== 'GLOBALS' || isset($_GET['GLOBALS']) || isset($_POST['GLOBALS']) || isset($_SERVER['GLOBALS']) || isset($_SESSION['GLOBALS']) || isset($_ENV['GLOBALS']) || isset($_FILES['GLOBALS'])) + { + exit; + } + else + { + $cookie = &$_COOKIE; + while (isset($cookie['GLOBALS'])) + { + foreach ($cookie['GLOBALS'] as $registered_var => $value) + { + if (!isset($not_unset[$registered_var])) + { + unset($GLOBALS[$registered_var]); + } + } + $cookie = &$cookie['GLOBALS']; + } + } + } + + unset($GLOBALS[$varname]); + } + + unset($input); + } + + // If we are on PHP >= 6.0.0 we do not need some code + if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) + { + /** + * @ignore + */ + define('STRIP', false); + } + else + { + set_magic_quotes_runtime(0); + + // Be paranoid with passed vars + if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on' || !function_exists('ini_get')) + { + deregister_globals(); + } + + define('STRIP', (get_magic_quotes_gpc()) ? true : false); + } + // // End Of Global Vars Initialization *************** *** 344,348 **** if( install_language_select($lang_options, $language, 'language') > 1 ) { ! include($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx"); $s_hidden_fields = ''; --- 437,448 ---- if( install_language_select($lang_options, $language, 'language') > 1 ) { ! if( @file_exists($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx") ) ! { ! include($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx"); ! } ! else ! { ! include($mx_root_path . "install/language/lang_english/lang_admin.$phpEx"); ! } $s_hidden_fields = ''; |
|
From: OryNider <ory...@us...> - 2008-01-18 10:28:41
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16080 Modified Files: common.php Log Message: mx_message_die() upgrade plus an @ in funtions_install Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** common.php 18 Jan 2008 08:17:30 -0000 1.73 --- common.php 18 Jan 2008 10:28:37 -0000 1.74 *************** *** 309,312 **** --- 309,319 ---- $portal_config = $mx_cache->obtain_mxbb_config(); + /* + if (empty($portal_config['portal_version'])) + { + $portal_config = $mx_cache->obtain_mxbb_config(); + } + */ + // // Define Users/Group/Sessions backend, and validate *************** *** 356,363 **** // mxBB Includes - doing the rest // ! @include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/constants.' . $phpEx); ! include_once($mx_root_path . 'includes/mx_functions_style.' . $phpEx); // Styling and sessions include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions include_once($mx_root_path . 'includes/mx_functions_phpbb.' . $phpEx); // phpBB associated functions // We do not need this any longer, unset for safety purposes --- 363,370 ---- // mxBB Includes - doing the rest // ! include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/constants.' . $phpEx); include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions include_once($mx_root_path . 'includes/mx_functions_phpbb.' . $phpEx); // phpBB associated functions + include_once($mx_root_path . 'includes/mx_functions_style.' . $phpEx); // Styling and sessions // We do not need this any longer, unset for safety purposes |
2 messages has been excluded from this view by a project administrator.
