Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: FlorinCB <ory...@us...> - 2008-10-07 06:02:50
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20322 Modified Files: session.php Log Message: PHPBB_URL removed Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** session.php 6 Oct 2008 04:43:04 -0000 1.36 --- session.php 7 Oct 2008 06:00:07 -0000 1.37 *************** *** 1895,1900 **** return $img_data; } ! ! $img_data['src'] = PHPBB_URL . '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']; --- 1895,1900 ---- return $img_data; } ! //PHPBB_URL is not supported here for compatibility with phpBB2 backend use img() method ! $img_data['src'] = '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']; |
|
From: FlorinCB <ory...@us...> - 2008-10-07 05:49:08
|
Update of /cvsroot/mxbb/mx_phpbb3/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19986 Added Files: overall_footer_plugin.html overall_header_plugin.html Log Message: --- NEW FILE: overall_header_plugin.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 http-equiv="content-language" content="{S_USER_LANG}" /> <meta http-equiv="imagetoolbar" content="no" /> <meta name="resource-type" content="document" /> <meta name="distribution" content="global" /> <meta name="copyright" content="2000, 2002, 2005, 2007 phpBB Group" /> <meta name="keywords" content="" /> <meta name="description" content="" /> {META} <title>{SITENAME} • <!-- IF S_IN_MCP -->{L_MCP} • <!-- ELSEIF S_IN_UCP -->{L_UCP} • <!-- ENDIF -->{PAGE_TITLE}</title> <!-- phpBB style name: prosilver Based on style: prosilver (this is the default phpBB3 style) Original author: Tom Beddard ( http://www.subBlue.com/ ) Modified by: NOTE: This page was generated by phpBB, the free open-source bulletin board package. The phpBB Group is not responsible for the content of this page and forum. For more information about phpBB please visit http://www.phpbb.com --> <script type="text/javascript"> // <![CDATA[ var jump_page = '{LA_JUMP_PAGE}:'; var on_page = '{ON_PAGE}'; var per_page = '{PER_PAGE}'; var base_url = '{A_BASE_URL}'; var style_cookie = 'phpBBstyle'; var onload_functions = new Array(); var onunload_functions = new Array(); <!-- IF S_USER_PM_POPUP --> if ({S_NEW_PM}) { var url = '{UA_POPUP_PM}'; window.open(url.replace(/&/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400'); } <!-- ENDIF --> /** * Find a member */ function find_username(url) { popup(url, 760, 570, '_usersearch'); return false; } /** * New function for handling multiple calls to window.onload and window.unload by pentapenguin */ window.onload = function() { for (var i = 0; i < onload_functions.length; i++) { eval(onload_functions[i]); } } window.onunload = function() { for (var i = 0; i < onunload_functions.length; i++) { eval(onunload_functions[i]); } } // ]]> </script> <script type="text/javascript" src="{T_TEMPLATE_PATH}/styleswitcher.js"></script> <script type="text/javascript" src="{T_TEMPLATE_PATH}/forum_fn.js"></script> <link href="{T_THEME_PATH}/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" /> <link href="{T_STYLESHEET_LINK}" rel="stylesheet" type="text/css" media="screen, projection" /> <link href="{T_THEME_PATH}/normal.css" rel="stylesheet" type="text/css" title="A" /> <link href="{T_THEME_PATH}/medium.css" rel="alternate stylesheet" type="text/css" title="A+" /> <link href="{T_THEME_PATH}/large.css" rel="alternate stylesheet" type="text/css" title="A++" /> <!-- IF S_CONTENT_DIRECTION eq 'rtl' --> <link href="{T_THEME_PATH}/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" /> <!-- ENDIF --> </head> <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}"> <div id="wrap"> <a id="top" name="top" accesskey="t"></a> <div id="page-header"> <div class="headerbar"> <div class="inner"><span class="corners-top"><span></span></span> <div id="site-description"> <a href="{U_INDEX}" title="{L_INDEX}" id="logo">{SITE_LOGO_IMG}</a> <h1>{SITENAME}</h1> <p>{SITE_DESCRIPTION}</p> <p style="display: none;"><a href="#start_here">{L_SKIP}</a></p> </div> <!-- IF S_DISPLAY_SEARCH and not S_IN_SEARCH --> <div id="search-box"> <form action="{U_SEARCH}" method="post" id="search"> <fieldset> <input name="keywords" id="keywords" type="text" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search" value="<!-- IF SEARCH_WORDS-->{SEARCH_WORDS}<!-- ELSE -->{L_SEARCH_MINI}<!-- ENDIF -->" onclick="if(this.value=='{LA_SEARCH_MINI}')this.value='';" onblur="if(this.value=='')this.value='{LA_SEARCH_MINI}';" /> <input class="button2" value="{L_SEARCH}" type="submit" /><br /> <a href="{U_SEARCH}" title="{L_SEARCH_ADV_EXPLAIN}">{L_SEARCH_ADV}</a> {S_SEARCH_HIDDEN_FIELDS} </fieldset> </form> </div> <!-- ENDIF --> <span class="corners-bottom"><span></span></span></div> </div> <div class="navbar"> <div class="inner"><span class="corners-top"><span></span></span> <ul class="linklist navlinks"> <li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- BEGIN navlinks --> <strong>‹</strong> <a href="{navlinks.U_VIEW_FORUM}">{navlinks.FORUM_NAME}</a><!-- END navlinks --></li> <li class="rightside"><a href="#" onclick="fontsizeup(); return false;" onkeypress="fontsizeup(); return false;" class="fontsize" title="{L_CHANGE_FONT_SIZE}">{L_CHANGE_FONT_SIZE}</a></li> <!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF --> <!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_PRINT_PM --><li class="rightside"><a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p" class="print">{L_PRINT_PM}</a></li><!-- ENDIF --> </ul> <!-- IF not S_IS_BOT and S_USER_LOGGED_IN --> <ul class="linklist leftside"> <li class="icon-ucp"> <a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="u">{L_PROFILE}</a> <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> • <a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a> <!-- IF U_RESTORE_PERMISSIONS --> • <a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a> <!-- ENDIF --> </li> </ul> <!-- ENDIF --> <ul class="linklist rightside"> <li class="icon-faq"><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}">{L_FAQ}</a></li> <!-- IF not S_IS_BOT --> <!-- IF S_DISPLAY_MEMBERLIST --><li class="icon-members"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}">{L_MEMBERLIST}</a></li><!-- ENDIF --> <!-- IF not S_USER_LOGGED_IN and S_REGISTER_ENABLED --><li class="icon-register"><a href="{U_REGISTER}">{L_REGISTER}</a></li><!-- ENDIF --> <li class="icon-logout"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="l">{L_LOGIN_LOGOUT}</a></li> <!-- ENDIF --> </ul> <span class="corners-bottom"><span></span></span></div> </div> </div> <a name="start_here"></a> <div id="page-body"> <!-- IF S_BOARD_DISABLED and S_USER_LOGGED_IN and (U_MCP or U_ACP) --> <div id="message" class="rules"> <div class="inner"><span class="corners-top"><span></span></span> <strong>{L_INFORMATION}:</strong> {L_BOARD_DISABLED} <span class="corners-bottom"><span></span></span></div> </div> <!-- ENDIF --> --- NEW FILE: overall_footer_plugin.html --- </div> <div id="page-footer"> <div class="navbar"> <div class="inner"><span class="corners-top"><span></span></span> <ul class="linklist"> <li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li> <!-- IF not S_IS_BOT --> <!-- IF S_WATCH_FORUM_LINK --><li <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{S_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF --> <!-- IF U_WATCH_TOPIC --><li <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}">{L_WATCH_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_BOOKMARK_TOPIC --><li class="icon-bookmark"><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}">{L_BOOKMARK_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_BUMP_TOPIC --><li class="icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}">{L_BUMP_TOPIC}</a></li><!-- ENDIF --> <!-- ENDIF --> <li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a> • <!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a> • <!-- ENDIF -->{S_TIMEZONE}</li> </ul> <span class="corners-bottom"><span></span></span></div> </div> <!-- We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain the full copyright we ask you at least leave in place the "Powered by phpBB" line, with "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. The phpBB Group : 2006 //--> <div class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> © 2000, 2002, 2005, 2007 phpBB Group <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> <!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF --> </div> </div> </div> <div> <a id="bottom" name="bottom" accesskey="z"></a> <!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF --> </div> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-10-07 04:29:48
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17868 Modified Files: functions.php Log Message: update Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** functions.php 24 Sep 2008 19:12:17 -0000 1.50 --- functions.php 7 Oct 2008 04:24:51 -0000 1.51 *************** *** 1790,1796 **** if ( !$field_id ) { ! $sql = "INSERT INTO " . $this->custom_table . " (custom_name, custom_description, data, regex, field_type) ! VALUES('" . $field_name . "', '" . $field_desc . "', '" . $data . "', '" . $regex . "', '" . $field_type . "')"; ! if ( !( $db->sql_query( $sql ) ) ) { --- 1790,1803 ---- if ( !$field_id ) { ! $sql_array = array( ! 'custom_name' => utf8_normalize_nfc($field_name), ! 'custom_description' => utf8_normalize_nfc($field_desc), ! 'data' => $data, ! 'regex' => $regex, ! 'field_type' => $field_type, ! ); ! ! $sql = "INSERT INTO " . $this->custom_table . $db->sql_build_array('INSERT', $sql_array); ! if ( !( $db->sql_query( $sql ) ) ) { *************** *** 1799,1803 **** $field_id = $db->sql_nextid(); ! $sql = "UPDATE " . $this->custom_table . " SET field_order = '$field_id' --- 1806,1810 ---- $field_id = $db->sql_nextid(); ! $sql = "UPDATE " . $this->custom_table . " SET field_order = '$field_id' *************** *** 1811,1817 **** else { ! $sql = "UPDATE " . $this->custom_table . " ! SET custom_name = '$field_name', custom_description = '$field_desc', data = '$data', regex = '$regex', field_order='$field_order' ! WHERE custom_id = $field_id"; if ( !( $db->sql_query( $sql ) ) ) --- 1818,1832 ---- else { ! ! $sql_array = array( ! 'custom_name' => utf8_normalize_nfc($field_name), ! 'custom_description' => utf8_normalize_nfc($field_desc), ! 'data' => $data, ! 'regex' => $regex, ! 'field_order' => (int) $field_order, ! ); ! ! $sql = "UPDATE " . $this->custom_table . "SET " . $db->sql_build_array('UPDATE', $sql_array) . " ! WHERE custom_id = '" . $db->sql_escape($field_id) . "'"; if ( !( $db->sql_query( $sql ) ) ) |
|
From: FlorinCB <ory...@us...> - 2008-10-07 03:20:39
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15576 Modified Files: bbcode.php Log Message: fixed smilies bbcode Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bbcode.php 7 Oct 2008 02:54:41 -0000 1.3 --- bbcode.php 7 Oct 2008 03:17:57 -0000 1.4 *************** *** 1376,1380 **** global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! //$mytext = stripslashes($mytext); if ($bbcode_uid) --- 1376,1382 ---- global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page; ! //Do some checks ! $phpbb3_text = $bbcode_bitfield ? true : false; ! $bbcode_bitfield = ($bbcode_bitfield && (strlen($bbcode_bitfield) < 2)) ? false : $bbcode_bitfield; if ($bbcode_uid) *************** *** 1382,1389 **** $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield); } ! if ($smilies_on) { ! $mytext = $this->smilies_pass($mytext); } $mytext = str_replace("\n", "\n<br />\n", $mytext); return $this->make_clickable($mytext); --- 1384,1395 ---- $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield); } ! if ($smilies_on && $phpbb3_text) { ! $mytext = $this->smilies3_pass($mytext); } + else if ($smilies_on) + { + $mytext = $this->smilies_pass($mytext); + } $mytext = str_replace("\n", "\n<br />\n", $mytext); return $this->make_clickable($mytext); |
|
From: FlorinCB <ory...@us...> - 2008-10-07 03:18:05
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14471 Modified Files: bbcode.php Log Message: fixed smilies bbcode Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bbcode.php 7 Oct 2008 02:30:31 -0000 1.2 --- bbcode.php 7 Oct 2008 02:54:41 -0000 1.3 *************** *** 1393,1396 **** --- 1393,1397 ---- * Smilies pass. * + * compatible with phpBB3 blocks * * @param string $message *************** *** 1398,1402 **** * */ ! function smilies_pass($message) { static $orig, $repl; --- 1399,1403 ---- * */ ! function smilies3_pass($message) { static $orig, $repl; *************** *** 1425,1429 **** $replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->'; } ! $db->sql_freeresult($result); if (sizeof($match)) --- 1426,1431 ---- $replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->'; } ! ! $db->sql_freeresult($result); if (sizeof($match)) *************** *** 1446,1454 **** } ! $message = str_replace("{SMILIES_PATH}", $this->smiley_path_url . $this->smilies_path . '/' . $smilies[$i][$this->smiley_url], ' ' . $message . ' '); ! $message = substr($message, 1, -1); ! return $message; } /** --- 1448,1503 ---- } ! $message = str_replace("{SMILIES_PATH}", $this->smiley_path_url . $this->smilies_path . $smilies[$i][$this->smiley_url], ' ' . $message . ' '); ! return $message; } + + /** + * Smilies pass. + * + * compatible with phpBB2 blocks + * + * @param string $message + * @return string + * + */ + function smilies_pass($message) + { + static $orig, $repl; + global $board_config, $mx_root_path, $phpbb_root_path, $phpEx; + + if (!isset($orig)) + { + global $db; + $orig = $repl = array(); + + $sql = 'SELECT * FROM ' . SMILIES_TABLE; + if( !$result = $db->sql_query($sql) ) + { + mx_message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql); + } + + $smilies = $db->sql_fetchrowset($result); + + if (count($smilies)) + { + @usort($smilies, 'smiley_sort'); + } + + for ($i = 0; $i < count($smilies); $i++) + { + $orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/"; + $repl[] = '<img src="' . $this->smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$this->smiley_url] . '" alt="' . $smilies[$i][$this->emotion] . '" border="0" />'; + } + } + + if (count($orig)) + { + $message = preg_replace($orig, $repl, ' ' . $message . ' '); + $message = substr($message, 1, -1); + } + + return $message; + } /** |
|
From: FlorinCB <ory...@us...> - 2008-10-07 02:33:13
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13061 Modified Files: bbcode.php Log Message: fixed smilies bbcode Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bbcode.php 4 Oct 2008 07:04:25 -0000 1.1 --- bbcode.php 7 Oct 2008 02:30:31 -0000 1.2 *************** *** 40,43 **** --- 40,44 ---- var $smiley_path_url = ''; var $smiley_root_path = ''; + var $smilies_path = ''; var $smiley_url = 'smiley_url'; *************** *** 72,75 **** --- 73,78 ---- $this->smiley_root_path = $phpbb_root_path; //same here $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); + $this->smilies_path = str_replace("//", "/", $board_config['smilies_path']); + } *************** *** 86,90 **** if ($bbcode_bitfield !== false) { ! $this->bbcode_bitfield = $bbcode_bitfield; // Init those added with a new bbcode_bitfield (already stored codes will not get parsed again) --- 89,93 ---- if ($bbcode_bitfield !== false) { ! //$this->bbcode_bitfield = $bbcode_bitfield; // Init those added with a new bbcode_bitfield (already stored codes will not get parsed again) *************** *** 884,888 **** // Remove the uid from tags that have not been transformed into HTML ! //$text = str_replace(':' . $uid, '', $text); // Remove our padding from the string.. --- 887,891 ---- // Remove the uid from tags that have not been transformed into HTML ! $text = str_replace(':' . $uid, '', $text); // Remove our padding from the string.. *************** *** 1388,1399 **** /** ! * phpBB Smilies pass. * - * Hacking smilies_pass from phpbb/includes/bbcode.php * * @param string $message * @return string * ! */ function smilies_pass($message) { --- 1391,1401 ---- /** ! * Smilies pass. * * * @param string $message * @return string * ! */ function smilies_pass($message) { *************** *** 1411,1435 **** mx_message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql); } ! ! $smilies = $db->sql_fetchrowset($result); ! ! if (count($smilies)) { ! @usort($smilies, 'smiley_sort'); } ! for ($i = 0; $i < count($smilies); $i++) { ! $orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/"; ! $repl[] = '<img src="' . $this->smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$this->smiley_url] . '" alt="' . $smilies[$i][$this->emotion] . '" border="0" />'; ! } ! } ! if (count($orig)) ! { ! $message = preg_replace($orig, $repl, ' ' . $message . ' '); ! $message = substr($message, 1, -1); } return $message; } --- 1413,1452 ---- mx_message_die(GENERAL_ERROR, "Couldn't obtain smilies data", "", __LINE__, __FILE__, $sql); } ! ! while ($row = $db->sql_fetchrow($result)) { ! if (empty($row['code'])) ! { ! continue; ! } ! ! // (assertion) ! $match[] = '(?<=^|[\n .])' . preg_quote($row['code'], '#') . '(?![^<>]*>)'; ! $replace[] = '<!-- s' . $row['code'] . ' --><img src="{SMILIES_PATH}/' . $row['smiley_url'] . '" alt="' . $row['code'] . '" title="' . $row['emotion'] . '" /><!-- s' . $row['code'] . ' -->'; } + $db->sql_freeresult($result); ! if (sizeof($match)) { ! if ($max_smilies) ! { ! $num_matches = preg_match_all('#' . implode('|', $match) . '#', $message, $matches); ! unset($matches); ! if ($num_matches !== false && $num_matches > $max_smilies) ! { ! $this->warn_msg[] = sprintf($mx_user->lang['TOO_MANY_SMILIES'], $max_smilies); ! return; ! } ! } ! ! // Make sure the delimiter # is added in front and at the end of every element within $match ! $message = trim(preg_replace(explode(chr(0), '#' . implode('#' . chr(0) . '#', $match) . '#'), $replace, $message)); ! } } + $message = str_replace("{SMILIES_PATH}", $this->smiley_path_url . $this->smilies_path . '/' . $smilies[$i][$this->smiley_url], ' ' . $message . ' '); + $message = substr($message, 1, -1); + return $message; } *************** *** 1652,1693 **** } - /* - $result = $db->sql_query($sql, 3600); - - $smilies = array(); - while ($row = $db->sql_fetchrow($result)) - { - if (empty($smilies[$row['smiley_url']])) - { - $smilies[$row['smiley_url']] = $row; - } - } - $db->sql_freeresult($result); - - if (sizeof($smilies)) - { - foreach ($smilies as $row) - { - $template->assign_block_vars('smiley', array( - 'SMILEY_CODE' => $row['code'], - 'A_SMILEY_CODE' => addslashes($row['code']), - 'SMILEY_IMG' => $this->smiley_root_path . $board_config['smilies_path'] . '/' . $row['smiley_url'], - 'SMILEY_WIDTH' => $row['smiley_width'], - 'SMILEY_HEIGHT' => $row['smiley_height'], - 'SMILEY_DESC' => $row['emotion']) - ); - } - } - - //What we do here with forum_id versus page_id ? - if ($mode == 'inline' && $display_link) - { - $template->assign_vars(array( - 'S_SHOW_SMILEY_LINK' => true, - 'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", 'mode=smilies&f=' . $forum_id)) - ); - } - */ - if ($mode == 'window') { --- 1669,1672 ---- |
|
From: FlorinCB <ory...@us...> - 2008-10-07 02:16:56
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8749/includes Added Files: mx_functions_emailer.php mx_functions_smtp.php Log Message: mx emailer --- NEW FILE: mx_functions_smtp.php --- <?php /** * * @package Emailer * @version $Id: mx_functions_smtp.php,v 1.1 2008/10/07 00:10:14 orynider Exp $ * @copyright (c) 2002-2008 MX-Publisher Project Team & ( C) 2001 The phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com * /** * Modifications: * * */ /** * Emailer * @package MXP3 */ define('SMTP_INCLUDED', 1); // // This function has been modified as provided // by SirSir to allow multiline responses when // using SMTP Extensions // function server_parse($socket, $response, $line = __LINE__) { $server_response = ''; while (substr($server_response, 3, 1) != ' ') { if (!($server_response = fgets($socket, 256))) { mx_message_die(GENERAL_ERROR, "Couldn't get mail server response codes", "", $line, __FILE__); } } if (!(substr($server_response, 0, 3) == $response)) { mx_message_die(GENERAL_ERROR, "Ran into problems sending Mail. Response: $server_response", "", $line, __FILE__); } } // Replacement or substitute for PHP's mail command function smtpmail($mail_to, $subject, $message, $headers = '') { global $board_config; // Fix any bare linefeeds in the message to make it RFC821 Compliant. $message = preg_replace("#(?<!\r)\n#si", "\r\n", $message); if ($headers != '') { if (is_array($headers)) { if (sizeof($headers) > 1) { $headers = join("\n", $headers); } else { $headers = $headers[0]; } } $headers = chop($headers); // Make sure there are no bare linefeeds in the headers $headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers); // Ok this is rather confusing all things considered, // but we have to grab bcc and cc headers and treat them differently // Something we really didn't take into consideration originally $header_array = explode("\r\n", $headers); @reset($header_array); $headers = ''; while(list(, $header) = each($header_array)) { if (preg_match('#^cc:#si', $header)) { $cc = preg_replace('#^cc:(.*)#si', '\1', $header); } else if (preg_match('#^bcc:#si', $header)) { $bcc = preg_replace('#^bcc:(.*)#si', '\1', $header); $header = ''; } $headers .= ($header != '') ? $header . "\r\n" : ''; } $headers = chop($headers); $cc = explode(', ', $cc); $bcc = explode(', ', $bcc); } if (trim($subject) == '') { mx_message_die(GENERAL_ERROR, "No email Subject specified", "", __LINE__, __FILE__); } if (trim($message) == '') { mx_message_die(GENERAL_ERROR, "Email message was blank", "", __LINE__, __FILE__); } // Ok we have error checked as much as we can to this point let's get on // it already. if( !$socket = @fsockopen($board_config['smtp_host'], 25, $errno, $errstr, 20) ) { mx_message_die(GENERAL_ERROR, "Could not connect to smtp host : $errno : $errstr", "", __LINE__, __FILE__); } // Wait for reply server_parse($socket, "220", __LINE__); // Do we want to use AUTH?, send RFC2554 EHLO, else send RFC821 HELO // This improved as provided by SirSir to accomodate if( !empty($board_config['smtp_username']) && !empty($board_config['smtp_password']) ) { fputs($socket, "EHLO " . $board_config['smtp_host'] . "\r\n"); server_parse($socket, "250", __LINE__); fputs($socket, "AUTH LOGIN\r\n"); server_parse($socket, "334", __LINE__); fputs($socket, base64_encode($board_config['smtp_username']) . "\r\n"); server_parse($socket, "334", __LINE__); fputs($socket, base64_encode($board_config['smtp_password']) . "\r\n"); server_parse($socket, "235", __LINE__); } else { fputs($socket, "HELO " . $board_config['smtp_host'] . "\r\n"); server_parse($socket, "250", __LINE__); } // From this point onward most server response codes should be 250 // Specify who the mail is from.... fputs($socket, "MAIL FROM: <" . $board_config['board_email'] . ">\r\n"); server_parse($socket, "250", __LINE__); // Specify each user to send to and build to header. $to_header = ''; // Add an additional bit of error checking to the To field. $mail_to = (trim($mail_to) == '') ? 'Undisclosed-recipients:;' : trim($mail_to); if (preg_match('#[^ ]+\@[^ ]+#', $mail_to)) { fputs($socket, "RCPT TO: <$mail_to>\r\n"); server_parse($socket, "250", __LINE__); } // Ok now do the CC and BCC fields... @reset($bcc); while(list(, $bcc_address) = each($bcc)) { // Add an additional bit of error checking to bcc header... $bcc_address = trim($bcc_address); if (preg_match('#[^ ]+\@[^ ]+#', $bcc_address)) { fputs($socket, "RCPT TO: <$bcc_address>\r\n"); server_parse($socket, "250", __LINE__); } } @reset($cc); while(list(, $cc_address) = each($cc)) { // Add an additional bit of error checking to cc header $cc_address = trim($cc_address); if (preg_match('#[^ ]+\@[^ ]+#', $cc_address)) { fputs($socket, "RCPT TO: <$cc_address>\r\n"); server_parse($socket, "250", __LINE__); } } // Ok now we tell the server we are ready to start sending data fputs($socket, "DATA\r\n"); // This is the last response code we look for until the end of the message. server_parse($socket, "354", __LINE__); // Send the Subject Line... fputs($socket, "Subject: $subject\r\n"); // Now the To Header. fputs($socket, "To: $mail_to\r\n"); // Now any custom headers.... fputs($socket, "$headers\r\n\r\n"); // Ok now we are ready for the message... fputs($socket, "$message\r\n"); // Ok the all the ingredients are mixed in let's cook this puppy... fputs($socket, ".\r\n"); server_parse($socket, "250", __LINE__); // Now tell the server we are done and close the socket... fputs($socket, "QUIT\r\n"); fclose($socket); return TRUE; } ?> --- NEW FILE: mx_functions_emailer.php --- <?php /** * * @package Emailer * @version $Id: mx_functions_emailer.php,v 1.1 2008/10/07 00:10:14 orynider Exp $ * @copyright (c) 2002-2008 MX-Publisher Project Team & ( C) 2001 The phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mx-publisher.com * /** * Modifications: * Added $emailer->use_html method by OryNider * */ /** * Emailer * @package MXP3 */ class mx_emailer { var $msg, $subject, $extra_headers; var $addresses, $reply_to, $from; var $use_smtp; var $tpl_msg = array(); var $use_html = false; function emailer($use_smtp) { $this->reset(); $this->use_smtp = $use_smtp; $this->use_html = false; $this->reply_to = $this->from = ''; } // Resets all the data (address, template file, etc etc to default function reset() { $this->addresses = array(); $this->vars = $this->msg = $this->extra_headers = ''; } // Sets an email address to send to function email_address($address) { $this->addresses['to'] = trim($address); } function cc($address) { $this->addresses['cc'][] = trim($address); } function bcc($address) { $this->addresses['bcc'][] = trim($address); } function replyto($address) { $this->reply_to = trim($address); } function from($address) { $this->from = trim($address); } // set up subject for mail function set_subject($subject = '') { $this->subject = trim(preg_replace('#[\n\r]+#s', '', $subject)); } // set up extra mail headers function extra_headers($headers) { $this->extra_headers .= trim($headers) . "\n"; } function set_mail_priority($priority = MAIL_NORMAL_PRIORITY) { $this->mail_priority = $priority; } /** * Set the email html */ function set_mail_html($html = false) { $this->use_html = $html; } function use_template($template_file, $template_lang = '') { global $board_config, $phpbb_root_path, $mx_root_path, $mx_root_path; if (trim($template_file) == '') { mx_message_die(GENERAL_ERROR, 'No template file set', '', __LINE__, __FILE__); } if (trim($template_lang) == '') { $template_lang = $board_config['default_lang']; } if (empty($this->tpl_msg[$template_lang . $template_file])) { $tpl_file = $mx_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; if (!file_exists(realpath($tpl_file))) { $tpl_file = $mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; if (!file_exists(realpath($tpl_file))) { mx_message_die(GENERAL_ERROR, 'Could not find email template file :: ' . $template_file . ' @:' . $tpl_file, '', __LINE__, __FILE__); } } if (!($fd = @fopen($tpl_file, 'r'))) { mx_message_die(GENERAL_ERROR, 'Failed opening template file :: ' . $template_file . ' @:' . $tpl_file, '', __LINE__, __FILE__); } $this->tpl_msg[$template_lang . $template_file] = fread($fd, filesize($tpl_file)); fclose($fd); } $this->msg = $this->tpl_msg[$template_lang . $template_file]; return true; } // assign variables function assign_vars($vars) { $this->vars = (empty($this->vars)) ? $vars : $this->vars . $vars; } // Send the mail out to the recipients set previously in var $this->address function send() { global $board_config, $lang, $phpEx, $phpbb_root_path, $db, $mx_root_path; // Escape all quotes, else the eval will fail. $this->msg = str_replace ("'", "\'", $this->msg); $this->msg = preg_replace('#\{([a-z0-9\-_]*?)\}#is', "' . $\\1 . '", $this->msg); // Set vars reset ($this->vars); while (list($key, $val) = each($this->vars)) { $$key = $val; } eval("\$this->msg = '$this->msg';"); // Clear vars reset ($this->vars); while (list($key, $val) = each($this->vars)) { unset($$key); } // We now try and pull a subject from the email body ... if it exists, // do this here because the subject may contain a variable $drop_header = ''; $match = array(); if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) { $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : 'No Subject'); $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); } else { $this->subject = (($this->subject != '') ? $this->subject : 'No Subject'); } if (preg_match('#^(Charset:(.*?))$#m', $this->msg, $match)) { $this->encoding = (trim($match[2]) != '') ? trim($match[2]) : trim($lang['ENCODING']); $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); } else { $this->encoding = trim($lang['ENCODING']); } if ($drop_header != '') { $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); } $to = $this->addresses['to']; $cc = (count($this->addresses['cc'])) ? implode(', ', $this->addresses['cc']) : ''; $bcc = (count($this->addresses['bcc'])) ? implode(', ', $this->addresses['bcc']) : ''; // Build header if ($this->use_html) { $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') . (($this->from != '') ? "From: $this->from\n" : "From: " . $board_config['board_email'] . "\n") . "Return-Path: " . $board_config['board_email'] . "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/html; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . date('r', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By Mx-Publisher\n" . $this->extra_headers . (($cc != '') ? "Cc: $cc\n" : '') . (($bcc != '') ? "Bcc: $bcc\n" : ''); } else { $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') . (($this->from != '') ? "From: $this->from\n" : "From: " . $board_config['board_email'] . "\n") . "Return-Path: " . $board_config['board_email'] . "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . date('r', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By Mx-Publisher\n" . $this->extra_headers . (($cc != '') ? "Cc: $cc\n" : '') . (($bcc != '') ? "Bcc: $bcc\n" : ''); } // Send message ... removed $this->encode() from subject for time being if ( $this->use_smtp ) { if (!defined('SMTP_INCLUDED')) { include($mx_root_path . 'includes/shared/phpbb2/includes/smtp.' . $phpEx); } $result = smtpmail($to, $this->subject, $this->msg, $this->extra_headers); } else { $empty_to_header = ($to == '') ? TRUE : FALSE; $to = ($to == '') ? (($board_config['sendmail_fix']) ? ' ' : 'Undisclosed-recipients:;') : $to; $result = mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers); if (!$result && !$board_config['sendmail_fix'] && $empty_to_header) { $to = ' '; switch (PORTAL_BACKEND) { case 'phpbb2': $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '1' WHERE config_name = 'sendmail_fix'"; if (!$db->sql_query($sql)) { mx_message_die(GENERAL_ERROR, 'Unable to update config table', '', __LINE__, __FILE__, $sql); } break; case 'internal': case 'phpbb3': if (!$board_config['board_email']) { mx_message_die(GENERAL_ERROR, 'The is no default email adress configured were to notify the admin.', '', __LINE__, __FILE__, ''); } break; } $board_config['sendmail_fix'] = 1; $result = mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers); } } // Did it work? if (!$result) { mx_message_die(GENERAL_ERROR, 'Failed sending email :: ' . (($this->use_smtp) ? 'SMTP' : 'PHP') . ' :: ' . $result, '', __LINE__, __FILE__); } return true; } // Encodes the given string for proper display for this encoding ... nabbed // from php.net and modified. There is an alternative encoding method which // may produce lesd output but it's questionable as to its worth in this // scenario IMO function encode($str) { if ($this->encoding == '') { return $str; } // define start delimimter, end delimiter and spacer $end = "?="; $start = "=?$this->encoding?B?"; $spacer = "$end\r\n $start"; // determine length of encoded text within chunks and ensure length is even $length = 75 - strlen($start) - strlen($end); $length = floor($length / 2) * 2; // encode the string and split it into chunks with spacers after each chunk $str = chunk_split(base64_encode($str), $length, $spacer); // remove trailing spacer and add start and end delimiters $str = preg_replace('#' . preg_quote($spacer, '#') . '$#', '', $str); return $start . $str . $end; } // // Attach files via MIME. // function attachFile($filename, $mimetype = "application/octet-stream", $szFromAddress, $szFilenameToDisplay) { global $lang; $mime_boundary = "--==================_846811060==_"; $this->msg = '--' . $mime_boundary . "\nContent-Type: text/plain;\n\tcharset=\"" . $lang['ENCODING'] . "\"\n\n" . $this->msg; if ($mime_filename) { $filename = $mime_filename; $encoded = $this->encode_file($filename); } $fd = fopen($filename, "r"); $contents = fread($fd, filesize($filename)); $this->mimeOut = "--" . $mime_boundary . "\n"; $this->mimeOut .= "Content-Type: " . $mimetype . ";\n\tname=\"$szFilenameToDisplay\"\n"; $this->mimeOut .= "Content-Transfer-Encoding: quoted-printable\n"; $this->mimeOut .= "Content-Disposition: attachment;\n\tfilename=\"$szFilenameToDisplay\"\n\n"; if ( $mimetype == "message/rfc822" ) { $this->mimeOut .= "From: ".$szFromAddress."\n"; $this->mimeOut .= "To: ".$this->emailAddress."\n"; $this->mimeOut .= "Date: ".date("D, d M Y H:i:s") . " UT\n"; $this->mimeOut .= "Reply-To:".$szFromAddress."\n"; $this->mimeOut .= "Subject: ".$this->mailSubject."\n"; $this->mimeOut .= "X-Mailer: PHP/".phpversion()."\n"; $this->mimeOut .= "MIME-Version: 1.0\n"; } $this->mimeOut .= $contents."\n"; $this->mimeOut .= "--" . $mime_boundary . "--" . "\n"; return $out; // added -- to notify email client attachment is done } function getMimeHeaders($filename, $mime_filename="") { $mime_boundary = "--==================_846811060==_"; if ($mime_filename) { $filename = $mime_filename; } $out = "MIME-Version: 1.0\n"; $out .= "Content-Type: multipart/mixed;\n\tboundary=\"$mime_boundary\"\n\n"; $out .= "This message is in MIME format. Since your mail reader does not understand\n"; $out .= "this format, some or all of this message may not be legible."; return $out; } // // Split string by RFC 2045 semantics (76 chars per line, end with \r\n). // function myChunkSplit($str) { $stmp = $str; $len = strlen($stmp); $out = ""; while ($len > 0) { if ($len >= 76) { $out .= substr($stmp, 0, 76) . "\r\n"; $stmp = substr($stmp, 76); $len = $len - 76; } else { $out .= $stmp . "\r\n"; $stmp = ""; $len = 0; } } return $out; } // // Split the specified file up into a string and return it // function encode_file($sourcefile) { if (is_readable(realpath($sourcefile))) { $fd = fopen($sourcefile, "r"); $contents = fread($fd, filesize($sourcefile)); $encoded = $this->myChunkSplit(base64_encode($contents)); fclose($fd); } return $encoded; } } // class emailer ?> |
|
From: FlorinCB <ory...@us...> - 2008-10-07 01:27:31
|
Update of /cvsroot/mxbb/core/admin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8749/admin Added Files: index.htm Log Message: mx emailer --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-10-07 00:16:22
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8810 Modified Files: mx_functions_emailer.php Log Message: mx emailer Index: mx_functions_emailer.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_emailer.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_functions_emailer.php 7 Oct 2008 00:10:14 -0000 1.1 --- mx_functions_emailer.php 7 Oct 2008 00:12:00 -0000 1.2 *************** *** 216,220 **** if (!defined('SMTP_INCLUDED')) { ! include($mx_root_path . 'includes/shared/phpbb2/includes/smtp.' . $phpEx); } --- 216,220 ---- if (!defined('SMTP_INCLUDED')) { ! include($mx_root_path . 'includes/mx_functions_smtp.' . $phpEx); } |
|
From: FlorinCB <ory...@us...> - 2008-10-07 00:15:17
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8749/includes/shared/phpbb2/includes Modified Files: emailer.php Log Message: mx emailer Index: emailer.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/emailer.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** emailer.php 6 Oct 2008 01:03:57 -0000 1.4 --- emailer.php 7 Oct 2008 00:10:14 -0000 1.5 *************** *** 110,114 **** function use_template($template_file, $template_lang = '') { ! global $board_config, $phpbb_root_path, $module_root_path, $mx_root_path; if (trim($template_file) == '') --- 110,114 ---- function use_template($template_file, $template_lang = '') { ! global $board_config, $phpbb_root_path, $mx_root_path, $mx_root_path; if (trim($template_file) == '') *************** *** 124,132 **** if (empty($this->tpl_msg[$template_lang . $template_file])) { ! $tpl_file = $module_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; if (!file_exists(realpath($tpl_file))) { ! $tpl_file = $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; if (!file_exists(realpath($tpl_file))) --- 124,132 ---- if (empty($this->tpl_msg[$template_lang . $template_file])) { ! $tpl_file = $mx_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; if (!file_exists(realpath($tpl_file))) { ! $tpl_file = $mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; if (!file_exists(realpath($tpl_file))) *************** *** 159,163 **** function send() { ! global $board_config, $lang, $phpEx, $phpbb_root_path, $db, $module_root_path; // Escape all quotes, else the eval will fail. --- 159,163 ---- function send() { ! global $board_config, $lang, $phpEx, $phpbb_root_path, $db, $mx_root_path; // Escape all quotes, else the eval will fail. |
|
From: FlorinCB <ory...@us...> - 2008-10-07 00:14:36
|
Update of /cvsroot/mxbb/core/language/lang_english/email In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8749/language/lang_english/email Added Files: admin_send_email.tpl index.htm Log Message: mx emailer --- NEW FILE: admin_send_email.tpl --- Charset: iso-8859-1 The following is an email sent to you by an administrator of "{SITENAME}". If this message is spam, contains abusive or other comments you find offensive please contact the webmaster of the board at the following address: {BOARD_EMAIL} Include this full email (particularly the headers). Message sent to you follows: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {MESSAGE} --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: FlorinCB <ory...@us...> - 2008-10-07 00:14:28
|
Update of /cvsroot/mxbb/core/language/lang_english/email In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8679/email Log Message: Directory /cvsroot/mxbb/core/language/lang_english/email added to the repository |
|
From: FlorinCB <ory...@us...> - 2008-10-06 22:47:26
|
Update of /cvsroot/mxbb/core/install/schemas In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4784 Modified Files: mysql_41_schema_install.sql mysql_schema_install.sql Log Message: schema fix, revoved invalid mx_prosilver style Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** mysql_schema_install.sql 30 Sep 2008 07:04:46 -0000 1.58 --- mysql_schema_install.sql 6 Oct 2008 22:47:16 -0000 1.59 *************** *** 678,688 **** ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mx_prosilver', 'mx_prosilver', 'mx_prosilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (5, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (6, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (7, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); --- 678,687 ---- ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (5, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (6, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); Index: mysql_41_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_41_schema_install.sql,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mysql_41_schema_install.sql 4 Oct 2008 18:01:29 -0000 1.10 --- mysql_41_schema_install.sql 6 Oct 2008 22:47:16 -0000 1.11 *************** *** 678,688 **** ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mx_prosilver', 'mx_prosilver', 'mx_prosilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (5, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (6, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (7, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); --- 678,687 ---- ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mxBase1', 'mxBase1', 'mxBase1.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'mxBase2', 'mxBase2', 'mxBase2.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (5, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); ! INSERT INTO `mx_table_themes` (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (6, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); |
|
From: FlorinCB <ory...@us...> - 2008-10-06 13:24:26
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23165 Modified Files: mx_functions_admincp.php Log Message: query fix for UTF-8 Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** mx_functions_admincp.php 4 Oct 2008 07:04:25 -0000 1.61 --- mx_functions_admincp.php 6 Oct 2008 13:20:03 -0000 1.62 *************** *** 3210,3215 **** $search_raw_words = array(); ! $search_raw_words['text'] = split_words(clean_words('post', $post_text, $stopword_array, $synonym_array)); ! $search_raw_words['title'] = split_words(clean_words('post', $post_title, $stopword_array, $synonym_array)); @set_time_limit(0); --- 3210,3215 ---- $search_raw_words = array(); ! $search_raw_words['text'] = split_words(clean_words('post', utf8_normalize_nfc($post_text), $stopword_array, $synonym_array)); ! $search_raw_words['title'] = split_words(clean_words('post', utf8_normalize_nfc($post_title), $stopword_array, $synonym_array)); @set_time_limit(0); *************** *** 3323,3332 **** case 'mysqli': $sql = "INSERT IGNORE INTO " . $search_word_table . " (word_text, word_common) ! VALUES $value_sql"; break; case 'mssql': case 'mssql-odbc': $sql = "INSERT INTO " . $search_word_table . " (word_text, word_common) ! $value_sql"; break; } --- 3323,3332 ---- case 'mysqli': $sql = "INSERT IGNORE INTO " . $search_word_table . " (word_text, word_common) ! VALUES " . $value_sql; break; case 'mssql': case 'mssql-odbc': $sql = "INSERT INTO " . $search_word_table . " (word_text, word_common) ! " . $value_sql; break; } *************** *** 3346,3358 **** if ( $match_sql != '' ) { $sql = "INSERT INTO " . $search_match_table . " ($db_key, word_id, title_match) SELECT $block_id, word_id, $title_match FROM " . $search_word_table . " WHERE word_text IN ($match_sql)"; ! if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql); ! } ! $db->sql_freeresult($result); } } --- 3346,3385 ---- if ( $match_sql != '' ) { + + $sql = "SELECT $block_id, word_id, $title_match + FROM " . $search_word_table . " + WHERE word_text IN ($match_sql)"; + if ( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, 'Could not select words', '', __LINE__, __FILE__, $sql); + } + + while ( $row = $db->sql_fetchrow($result) ) + { + $word_id = $row['word_id']; + } + $db->sql_freeresult($result); + + + //To do: Need to be upgraded for UTF-8 + //$sql_where = ' IN (' . $match_sql . ')'; $sql = "INSERT INTO " . $search_match_table . " ($db_key, word_id, title_match) SELECT $block_id, word_id, $title_match FROM " . $search_word_table . " WHERE word_text IN ($match_sql)"; ! ! $sql = array( ! $db_key => $block_id, ! 'word_id' => $word_id, ! 'title_match' => $title_match, ! ); ! ! $sql = "INSERT INTO $search_match_table " . $db->sql_build_array('INSERT', $sql); ! ! if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql); ! } ! } } |
|
From: FlorinCB <ory...@us...> - 2008-10-06 10:22:59
|
Update of /cvsroot/mxbb/mx_music In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9241 Modified Files: music_flv.php Log Message: fix Index: music_flv.php =================================================================== RCS file: /cvsroot/mxbb/mx_music/music_flv.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** music_flv.php 26 Sep 2008 12:29:09 -0000 1.8 --- music_flv.php 6 Oct 2008 09:40:25 -0000 1.9 *************** *** 269,273 **** if( empty($row) ) { ! mx_message_die(GENERAL_ERROR, $lang['Song_not_exist']); } --- 269,273 ---- if( empty($row) ) { ! print(GENERAL_ERROR . ' ' . $lang['Song_not_exist'] . 'Sond ID: ' . '$song_id'); } *************** *** 300,304 **** if( empty($thissong['song_url']) && !file_exists(MUSIC_UPLOAD_PATH . $thissong['song_filename']) ) { ! mx_message_die(GENERAL_ERROR, $lang['Song_not_exist']); } --- 300,304 ---- if( empty($thissong['song_url']) && !file_exists(MUSIC_UPLOAD_PATH . $thissong['song_filename']) ) { ! print(GENERAL_ERROR . ' ' . $lang['Song_not_exist'] . ' ' . $thissong['song_url']) && !file_exists(MUSIC_UPLOAD_PATH . $thissong['song_filename']); } |
|
From: FlorinCB <ory...@us...> - 2008-10-06 04:47:26
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28586 Modified Files: session.php Log Message: this is working prefixed Index: session.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** session.php 5 Oct 2008 04:19:02 -0000 1.35 --- session.php 6 Oct 2008 04:43:04 -0000 1.36 *************** *** 1902,1906 **** $alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt; ! switch ($type) { --- 1902,1906 ---- $alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt; ! switch ($type) { |
|
From: FlorinCB <ory...@us...> - 2008-10-06 04:40:23
|
Update of /cvsroot/mxbb/core/admin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28356 Modified Files: admin_mx_portal.php Log Message: query upgraded using latest features compatible with UTF-8 Index: admin_mx_portal.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_portal.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** admin_mx_portal.php 4 Oct 2008 07:04:24 -0000 1.46 --- admin_mx_portal.php 6 Oct 2008 04:37:41 -0000 1.47 *************** *** 93,106 **** $new['smtp_username'] = $mx_request_vars->post('smtp_username', MX_TYPE_NO_TAGS, '0'); $new['smtp_password'] = $mx_request_vars->post('smtp_password', MX_TYPE_NO_TAGS, '0'); ! $sql = "UPDATE " . PORTAL_TABLE . " ! SET "; ! ! $is_first = true; ! foreach ($new as $key => $value) ! { ! $sql .= ($is_first ? "" : ", ") . $key . " = '" . str_replace("\'", "''", $value) . "'"; ! $is_first = false; ! } if( !($db->sql_query($sql)) ) --- 93,99 ---- $new['smtp_username'] = $mx_request_vars->post('smtp_username', MX_TYPE_NO_TAGS, '0'); $new['smtp_password'] = $mx_request_vars->post('smtp_password', MX_TYPE_NO_TAGS, '0'); + ! $sql = "UPDATE " . PORTAL_TABLE . " SET " . $db->sql_build_array('UPDATE', utf8_normalize_nfc($new)); if( !($db->sql_query($sql)) ) |
|
From: FlorinCB <ory...@us...> - 2008-10-06 04:37:19
|
Update of /cvsroot/mxbb/core/install In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28207 Modified Files: db_convert.php Log Message: version 1.0.0 working :) Index: db_convert.php =================================================================== RCS file: /cvsroot/mxbb/core/install/db_convert.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** db_convert.php 5 Oct 2008 09:23:59 -0000 1.2 --- db_convert.php 6 Oct 2008 04:34:36 -0000 1.3 *************** *** 28,32 **** $mx_portal_copy = '<b>MX-Publisher Modular System!</b> <br /><br/> MX-Publisher is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001 (originally named MX-Publisher). <br /><br />Authors: The MX-Publisher Development Team. <br />Please visit <a href="http://www.mx-publisher.com/">www.mx-publisher.com</a> for further information.'; ! define('INSTALLER_VERSION', '0.9.0'); define('INSTALLER_NAME', 'MX-Publisher-DB-Converter'); --- 28,32 ---- $mx_portal_copy = '<b>MX-Publisher Modular System!</b> <br /><br/> MX-Publisher is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001 (originally named MX-Publisher). <br /><br />Authors: The MX-Publisher Development Team. <br />Please visit <a href="http://www.mx-publisher.com/">www.mx-publisher.com</a> for further information.'; ! define('INSTALLER_VERSION', '1.0.0'); define('INSTALLER_NAME', 'MX-Publisher-DB-Converter'); *************** *** 118,121 **** --- 118,179 ---- } + // Determine mapping database type + switch ($db->sql_layer) + { + case 'mysql': + $this_sql_layer = 'mysql_40'; + break; + + case 'mysql4': + if (version_compare($db->mysql_version, '4.1.3', '>=')) + { + $this_sql_layer = 'mysql_41'; + } + else + { + $this_sql_layer = 'mysql_40'; + } + break; + + case 'mysqli': + $this_sql_layer = 'mysql_41'; + break; + + case 'mssql': + case 'mssql_odbc': + $this_sql_layer = 'mssql'; + break; + + default: + $this_sql_layer = $db->sql_layer; + break; + } + + switch ($db->sql_layer) + { + case 'mysql': + $charset = ' CHARACTER SET latin1;'; + break; + + case 'mysql4': + if (version_compare($db->mysql_version, '4.1.3', '>=')) + { + $charset = ' CHARACTER SET utf8 COLLATE utf8_bin;'; + } + else + { + $charset = ' CHARACTER SET latin1;'; + } + break; + + case 'mysqli': + $charset = ' CHARACTER SET utf8 COLLATE utf8_bin;'; + break; + + default: + $charset = ' CHARACTER SET latin1;'; + } + + if (!($result = $db->sql_query($sql))) { *************** *** 134,138 **** $table = $tables[0]; ! $sql2 = "ALTER TABLE $table DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci"; if ( !($result2 = $db->sql_query($sql2)) ) --- 192,196 ---- $table = $tables[0]; ! $sql2 = "ALTER TABLE $table DEFAULT CHARACTER SET utf8 COLLATE utf8_bin"; if ( !($result2 = $db->sql_query($sql2)) ) *************** *** 144,181 **** print "$table changed to UTF-8 successfully.<br>\n"; ! // Now loop through all the fields within this table ! $sql3 = "SHOW COLUMNS FROM $table"; ! if ( !($result3 = $db->sql_query($sql3)) ) ! { ! install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql3); ! ! break; ! } ! while ( $row3 = $db->sql_fetchrow($result3) ) ! { ! $field_name = $row3[0]; ! $field_type = $row3[1]; ! // Change text based fields ! $skipped_field_types = array('char', 'text', 'blob', 'enum', 'set'); ! foreach ( $skipped_field_types as $type ) ! { ! if ( strpos($field_type, $type) !== false ) ! { ! $sql4 = "ALTER TABLE $table CHANGE `$field_name` `$field_name` $field_type CHARACTER SET utf8 COLLATE utf8_bin"; ! if ( !($result4 = $db->sql_query($sql4)) ) ! { ! install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql4); ! break 3; ! } ! print "---- $field_name changed to UTF-8 successfully.<br>\n"; ! } ! } ! } ! print "<hr>\n"; } --- 202,377 ---- print "$table changed to UTF-8 successfully.<br>\n"; + + + switch ($this_sql_layer) + { + case 'mysql_40': + case 'mysql_41': + $sql3 = "SHOW COLUMNS + FROM $table"; + if ( !($result3 = $db->sql_query($sql3)) ) + { + install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql3); + + break; + } + break; ! // PostgreSQL has a way of doing this in a much simpler way but would ! // not allow us to support all versions of PostgreSQL ! case 'postgres': ! $sql3 = "SELECT a.attname ! FROM pg_class c, pg_attribute a ! WHERE c.relname = '{$table}' ! AND a.attnum > 0 ! AND a.attrelid = c.oid"; ! if ( !($result3 = $db->sql_query($sql3)) ) ! { ! install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql3); ! ! break; ! } ! break; ! // same deal with PostgreSQL, we must perform more complex operations than ! // we technically could ! case 'mssql': ! $sql3 = "SELECT c.name ! FROM syscolumns c ! LEFT JOIN sysobjects o ON c.id = o.id ! WHERE o.name = '{$table}'"; ! if ( !($result3 = $db->sql_query($sql3)) ) ! { ! install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql3); ! ! break; ! } ! break; ! ! case 'oracle': ! $sql3 = "SELECT column_name ! FROM user_tab_columns ! WHERE table_name = '{$table}'"; ! if ( !($result3 = $db->sql_query($sql3)) ) ! { ! install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql3); ! ! break; ! } ! break; ! ! case 'firebird': ! $sql3 = "SELECT RDB\$FIELD_NAME as FNAME ! FROM RDB\$RELATION_FIELDS ! WHERE RDB\$RELATION_NAME = '{$table}'"; ! if ( !($result3 = $db->sql_query($sql3)) ) ! { ! install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql3); ! ! break; ! } ! break; ! ! // ugh, SQLite ! case 'sqlite': ! $sql3 = "SELECT sql ! FROM sqlite_master ! WHERE type = 'table' ! AND name = '{$table}'"; ! if ( !($result3 = $db->sql_query($sql3)) ) ! { ! install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql3); ! ! break; ! } ! break; ! } ! ! while ($row3 = $db->sql_fetchrow($result3) ) ! { ! $field_types = array(); ! ! $field_types[] = current($row3); ! ! $db->sql_freeresult($result3); ! ! $field_type = $field_types[1]; ! ! switch ($this_sql_layer) ! { ! case 'mysql_40': ! case 'mysql_41': ! ! // lower case just in case ! $field_name = strtolower($row3['Field']); ! $field_type = strtolower($row3['Type']); ! break; ! ! case 'postgres': ! // lower case just in case ! $field_name = strtolower($row3['attname']); ! $field_type = strtolower($row3['atttype']); ! break; ! ! case 'mssql': ! // lower case just in case ! $field_name = strtolower($row3['name']); ! $field_type = strtolower($row3['type']); ! break; ! ! case 'oracle': ! // lower case just in case ! $field_name = strtolower($row3['column_name']); ! $field_type = strtolower($row3['column_type']); ! break; ! ! case 'firebird': ! // lower case just in case ! $field_name = strtolower($row3['fname']); ! $field_type = strtolower($row3['ftype']); ! break; ! ! case 'sqlite': ! ! preg_match('#\((.*)\)#s', $row['sql'], $matches); ! ! $cols = trim($matches[1]); ! $col_array = preg_split('/,(?![\s\w]+\))/m', $cols); ! ! foreach ($col_array as $declaration) ! { ! $entities = preg_split('#\s+#', trim($declaration)); ! if ($entities[0] == 'PRIMARY') ! { ! continue; ! } ! ! // lower case just in case ! $field_name = strtolower($entities[0]); ! $field_type = strtolower($entities[1]); ! } ! ! break; ! } ! // Change text based fields ! $skipped_field_types = array('char', 'text', 'blob', 'enum', 'set'); ! foreach ( $skipped_field_types as $type ) ! { ! if ( strpos($field_type, $type) !== false ) ! { ! $sql4 = "ALTER TABLE $table CHANGE `$field_name` `$field_name` $field_type " . $charset; ! if ( !($result4 = $db->sql_query($sql4)) ) ! { ! install_die('SQL Error: ' . 'Line: ' . __LINE__ . ' File: ' . __FILE__ . ' Query: ' . $sql4); ! break 3; ! } ! print "---- $field_name changed to UTF-8 successfully.<br>\n"; ! } ! } ! } ! print "<hr>\n"; } |
|
From: FlorinCB <ory...@us...> - 2008-10-06 01:04:08
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb2/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12379 Modified Files: emailer.php Log Message: Added $emailer->use_html Index: emailer.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb2/includes/emailer.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** emailer.php 4 Oct 2008 07:04:25 -0000 1.3 --- emailer.php 6 Oct 2008 01:03:57 -0000 1.4 *************** *** 19,22 **** --- 19,30 ---- * ***************************************************************************/ + + + /** + * Modifications: + * Added $emailer->use_html method by OryNider + * + */ + // *************** *** 32,35 **** --- 40,44 ---- var $tpl_msg = array(); + var $use_html = false; function emailer($use_smtp) *************** *** 37,40 **** --- 46,50 ---- $this->reset(); $this->use_smtp = $use_smtp; + $this->use_html = false; $this->reply_to = $this->from = ''; } *************** *** 84,91 **** $this->extra_headers .= trim($headers) . "\n"; } function use_template($template_file, $template_lang = '') { ! global $board_config, $phpbb_root_path; if (trim($template_file) == '') --- 94,114 ---- $this->extra_headers .= trim($headers) . "\n"; } + + function set_mail_priority($priority = MAIL_NORMAL_PRIORITY) + { + $this->mail_priority = $priority; + } + + /** + * Set the email html + */ + function set_mail_html($html = false) + { + $this->use_html = $html; + } function use_template($template_file, $template_lang = '') { ! global $board_config, $phpbb_root_path, $module_root_path, $mx_root_path; if (trim($template_file) == '') *************** *** 101,113 **** if (empty($this->tpl_msg[$template_lang . $template_file])) { ! $tpl_file = $phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; ! if (!@file_exists(@$phpBB2->phpbb_realpath($tpl_file))) { ! $tpl_file = $phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; ! if (!@file_exists(@$phpBB2->phpbb_realpath($tpl_file))) { ! mx_message_die(GENERAL_ERROR, 'Could not find email template file :: ' . $template_file, '', __LINE__, __FILE__); } } --- 124,136 ---- if (empty($this->tpl_msg[$template_lang . $template_file])) { ! $tpl_file = $module_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'; ! if (!file_exists(realpath($tpl_file))) { ! $tpl_file = $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl'; ! if (!file_exists(realpath($tpl_file))) { ! mx_message_die(GENERAL_ERROR, 'Could not find email template file :: ' . $template_file . ' @:' . $tpl_file, '', __LINE__, __FILE__); } } *************** *** 115,119 **** if (!($fd = @fopen($tpl_file, 'r'))) { ! mx_message_die(GENERAL_ERROR, 'Failed opening template file :: ' . $tpl_file, '', __LINE__, __FILE__); } --- 138,142 ---- if (!($fd = @fopen($tpl_file, 'r'))) { ! mx_message_die(GENERAL_ERROR, 'Failed opening template file :: ' . $template_file . ' @:' . $tpl_file, '', __LINE__, __FILE__); } *************** *** 136,140 **** function send() { ! global $board_config, $lang, $phpEx, $phpbb_root_path, $db; // Escape all quotes, else the eval will fail. --- 159,163 ---- function send() { ! global $board_config, $lang, $phpEx, $phpbb_root_path, $db, $module_root_path; // Escape all quotes, else the eval will fail. *************** *** 144,148 **** // Set vars reset ($this->vars); ! while (list($key, $val) = each($this->vars)) { $$key = $val; --- 167,171 ---- // Set vars reset ($this->vars); ! while (list($key, $val) = each($this->vars)) { $$key = $val; *************** *** 153,157 **** // Clear vars reset ($this->vars); ! while (list($key, $val) = each($this->vars)) { unset($$key); --- 176,180 ---- // Clear vars reset ($this->vars); ! while (list($key, $val) = each($this->vars)) { unset($$key); *************** *** 193,204 **** // Build header ! $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') . (($this->from != '') ? "From: $this->from\n" : "From: " . $board_config['board_email'] . "\n") . "Return-Path: " . $board_config['board_email'] . "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . date('r', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By phpBB2\n" . $this->extra_headers . (($cc != '') ? "Cc: $cc\n" : '') . (($bcc != '') ? "Bcc: $bcc\n" : ''); ! // Send message ... removed $this->encode() from subject for time being if ( $this->use_smtp ) { ! if ( !defined('SMTP_INCLUDED') ) ! { ! include($phpbb_root_path . 'includes/smtp.' . $phpEx); } --- 216,234 ---- // Build header ! if ($this->use_html) ! { ! $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') . (($this->from != '') ? "From: $this->from\n" : "From: " . $board_config['board_email'] . "\n") . "Return-Path: " . $board_config['board_email'] . "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/html; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . date('r', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By Mx-Publisher\n" . $this->extra_headers . (($cc != '') ? "Cc: $cc\n" : '') . (($bcc != '') ? "Bcc: $bcc\n" : ''); ! } ! else ! { ! $this->extra_headers = (($this->reply_to != '') ? "Reply-to: $this->reply_to\n" : '') . (($this->from != '') ? "From: $this->from\n" : "From: " . $board_config['board_email'] . "\n") . "Return-Path: " . $board_config['board_email'] . "\nMessage-ID: <" . md5(uniqid(time())) . "@" . $board_config['server_name'] . ">\nMIME-Version: 1.0\nContent-type: text/plain; charset=" . $this->encoding . "\nContent-transfer-encoding: 8bit\nDate: " . date('r', time()) . "\nX-Priority: 3\nX-MSMail-Priority: Normal\nX-Mailer: PHP\nX-MimeOLE: Produced By Mx-Publisher\n" . $this->extra_headers . (($cc != '') ? "Cc: $cc\n" : '') . (($bcc != '') ? "Bcc: $bcc\n" : ''); ! } ! // Send message ... removed $this->encode() from subject for time being if ( $this->use_smtp ) { ! if (!defined('SMTP_INCLUDED')) ! { ! include($mx_root_path . 'includes/shared/phpbb2/includes/smtp.' . $phpEx); } *************** *** 209,229 **** $empty_to_header = ($to == '') ? TRUE : FALSE; $to = ($to == '') ? (($board_config['sendmail_fix']) ? ' ' : 'Undisclosed-recipients:;') : $to; ! ! $result = @mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers); ! if (!$result && !$board_config['sendmail_fix'] && $empty_to_header) { $to = ' '; ! ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '1' ! WHERE config_name = 'sendmail_fix'"; ! if (!$db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, 'Unable to update config table', '', __LINE__, __FILE__, $sql); ! } $board_config['sendmail_fix'] = 1; ! $result = @mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers); } } --- 239,274 ---- $empty_to_header = ($to == '') ? TRUE : FALSE; $to = ($to == '') ? (($board_config['sendmail_fix']) ? ' ' : 'Undisclosed-recipients:;') : $to; ! ! $result = mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers); ! if (!$result && !$board_config['sendmail_fix'] && $empty_to_header) { $to = ' '; ! ! switch (PORTAL_BACKEND) { ! case 'phpbb2': ! ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '1' ! WHERE config_name = 'sendmail_fix'"; ! if (!$db->sql_query($sql)) ! { ! mx_message_die(GENERAL_ERROR, 'Unable to update config table', '', __LINE__, __FILE__, $sql); ! } ! break; ! ! case 'internal': ! case 'phpbb3': ! ! if (!$board_config['board_email']) ! { ! mx_message_die(GENERAL_ERROR, 'The is no default email adress configured were to notify the admin.', '', __LINE__, __FILE__, ''); ! } ! break; ! } $board_config['sendmail_fix'] = 1; ! $result = mail($to, $this->subject, preg_replace("#(?<!\r)\n#s", "\n", $this->msg), $this->extra_headers); } } *************** *** 238,244 **** } ! // Encodes the given string for proper display for this encoding ... nabbed ! // from php.net and modified. There is an alternative encoding method which ! // may produce lesd output but it's questionable as to its worth in this // scenario IMO function encode($str) --- 283,289 ---- } ! // Encodes the given string for proper display for this encoding ... nabbed ! // from php.net and modified. There is an alternative encoding method which ! // may produce lesd output but it's questionable as to its worth in this // scenario IMO function encode($str) *************** *** 358,362 **** function encode_file($sourcefile) { ! if (is_readable($phpBB2->phpbb_realpath($sourcefile))) { $fd = fopen($sourcefile, "r"); --- 403,407 ---- function encode_file($sourcefile) { ! if (is_readable(realpath($sourcefile))) { $fd = fopen($sourcefile, "r"); |
|
From: FlorinCB <ory...@us...> - 2008-10-06 00:58:38
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9702 Modified Files: album_upload.php Log Message: fix Index: album_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_upload.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** album_upload.php 1 Sep 2008 01:11:49 -0000 1.5 --- album_upload.php 6 Oct 2008 00:58:32 -0000 1.6 *************** *** 1321,1326 **** $db->sql_freeresult($result); ! ! include_once($phpbb_root_path . 'includes/emailer.'.$phpEx); $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; --- 1321,1326 ---- $db->sql_freeresult($result); ! ! include_once($mx_root_path . 'includes/shared/phpbb2/includes/emailer.' . $phpEx); $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; |
|
From: FlorinCB <ory...@us...> - 2008-10-06 00:45:43
|
Update of /cvsroot/mxbb/core/includes/utf In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4169 Modified Files: utf_normalizer.php utf_tools.php Log Message: Added utf tools borowed from phpBB3 Index: utf_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/utf/utf_tools.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** utf_tools.php 6 Oct 2008 00:35:54 -0000 1.2 --- utf_tools.php 6 Oct 2008 00:45:38 -0000 1.3 *************** *** 779,783 **** } ! global $phpbb_root_path, $phpEx; // iso-8859-* character encoding --- 779,783 ---- } ! global $mx_root_path, $phpEx; // iso-8859-* character encoding *************** *** 795,803 **** if (!function_exists('iso_8859_' . $array[1])) { ! if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx)) { trigger_error('Basic reencoder file is missing', E_USER_ERROR); } ! include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx); } return call_user_func('iso_8859_' . $array[1], $string); --- 795,803 ---- if (!function_exists('iso_8859_' . $array[1])) { ! if (!file_exists($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx)) { trigger_error('Basic reencoder file is missing', E_USER_ERROR); } ! include($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx); } return call_user_func('iso_8859_' . $array[1], $string); *************** *** 827,835 **** if (!function_exists('cp' . $array[1])) { ! if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx)) { trigger_error('Basic reencoder file is missing', E_USER_ERROR); } ! include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx); } return call_user_func('cp' . $array[1], $string); --- 827,835 ---- if (!function_exists('cp' . $array[1])) { ! if (!file_exists($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx)) { trigger_error('Basic reencoder file is missing', E_USER_ERROR); } ! include($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx); } return call_user_func('cp' . $array[1], $string); *************** *** 847,855 **** if (!function_exists('tis_620')) { ! if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx)) { trigger_error('Basic reencoder file is missing', E_USER_ERROR); } ! include($phpbb_root_path . 'includes/utf/data/recode_basic.' . $phpEx); } return tis_620($string); --- 847,855 ---- if (!function_exists('tis_620')) { ! if (!file_exists($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx)) { trigger_error('Basic reencoder file is missing', E_USER_ERROR); } ! include($mx_root_path . 'includes/utf/data/recode_basic.' . $phpEx); } return tis_620($string); *************** *** 861,869 **** if (!function_exists('sjis')) { ! if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_cjk.' . $phpEx)) { trigger_error('CJK reencoder file is missing', E_USER_ERROR); } ! include($phpbb_root_path . 'includes/utf/data/recode_cjk.' . $phpEx); } return sjis($string); --- 861,869 ---- if (!function_exists('sjis')) { ! if (!file_exists($mx_root_path . 'includes/utf/data/recode_cjk.' . $phpEx)) { trigger_error('CJK reencoder file is missing', E_USER_ERROR); } ! include($mx_root_path . 'includes/utf/data/recode_cjk.' . $phpEx); } return sjis($string); *************** *** 875,883 **** if (!function_exists('euc_kr')) { ! if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_cjk.' . $phpEx)) { trigger_error('CJK reencoder file is missing', E_USER_ERROR); } ! include($phpbb_root_path . 'includes/utf/data/recode_cjk.' . $phpEx); } return euc_kr($string); --- 875,883 ---- if (!function_exists('euc_kr')) { ! if (!file_exists($mx_root_path . 'includes/utf/data/recode_cjk.' . $phpEx)) { trigger_error('CJK reencoder file is missing', E_USER_ERROR); } ! include($mx_root_path . 'includes/utf/data/recode_cjk.' . $phpEx); } return euc_kr($string); *************** *** 889,897 **** if (!function_exists('big5')) { ! if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_cjk.' . $phpEx)) { trigger_error('CJK reencoder file is missing', E_USER_ERROR); } ! include($phpbb_root_path . 'includes/utf/data/recode_cjk.' . $phpEx); } return big5($string); --- 889,897 ---- if (!function_exists('big5')) { ! if (!file_exists($mx_root_path . 'includes/utf/data/recode_cjk.' . $phpEx)) { trigger_error('CJK reencoder file is missing', E_USER_ERROR); } ! include($mx_root_path . 'includes/utf/data/recode_cjk.' . $phpEx); } return big5($string); *************** *** 903,911 **** if (!function_exists('gb2312')) { ! if (!file_exists($phpbb_root_path . 'includes/utf/data/recode_cjk.' . $phpEx)) { trigger_error('CJK reencoder file is missing', E_USER_ERROR); } ! include($phpbb_root_path . 'includes/utf/data/recode_cjk.' . $phpEx); } return gb2312($string); --- 903,911 ---- if (!function_exists('gb2312')) { ! if (!file_exists($mx_root_path . 'includes/utf/data/recode_cjk.' . $phpEx)) { trigger_error('CJK reencoder file is missing', E_USER_ERROR); } ! include($mx_root_path . 'includes/utf/data/recode_cjk.' . $phpEx); } return gb2312($string); *************** *** 1039,1048 **** { static $uniarray = array(); ! global $phpbb_root_path, $phpEx; // common is always set if (!isset($uniarray['c'])) { ! $uniarray['c'] = include($phpbb_root_path . 'includes/utf/data/case_fold_c.' . $phpEx); } --- 1039,1048 ---- { static $uniarray = array(); ! global $mx_root_path, $phpEx; // common is always set if (!isset($uniarray['c'])) { ! $uniarray['c'] = include($mx_root_path . 'includes/utf/data/case_fold_c.' . $phpEx); } *************** *** 1050,1054 **** if ($option === 'full' && !isset($uniarray['f'])) { ! $uniarray['f'] = include($phpbb_root_path . 'includes/utf/data/case_fold_f.' . $phpEx); } --- 1050,1054 ---- if ($option === 'full' && !isset($uniarray['f'])) { ! $uniarray['f'] = include($mx_root_path . 'includes/utf/data/case_fold_f.' . $phpEx); } *************** *** 1056,1060 **** if ($option !== 'full' && !isset($uniarray['s'])) { ! $uniarray['s'] = include($phpbb_root_path . 'includes/utf/data/case_fold_s.' . $phpEx); } --- 1056,1060 ---- if ($option !== 'full' && !isset($uniarray['s'])) { ! $uniarray['s'] = include($mx_root_path . 'includes/utf/data/case_fold_s.' . $phpEx); } *************** *** 1653,1657 **** "\xF0\x9D\x9F\x8A" => "\xCF\x9D", ); ! global $phpbb_root_path, $phpEx; // do the case fold --- 1653,1657 ---- "\xF0\x9D\x9F\x8A" => "\xCF\x9D", ); ! global $mx_root_path, $phpEx; // do the case fold *************** *** 1660,1665 **** if (!class_exists('utf_normalizer')) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx); } --- 1660,1665 ---- if (!class_exists('utf_normalizer')) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/utf_normalizer.' . $phpEx); } *************** *** 1750,1754 **** "\xE1\xBF\xBC" => "\xCE\xA9\xCD\x85", ); ! global $phpbb_root_path, $phpEx; // perform a small trick, avoid further normalization on composed points that contain U+0345 in their decomposition --- 1750,1754 ---- "\xE1\xBF\xBC" => "\xCE\xA9\xCD\x85", ); ! global $mx_root_path, $phpEx; // perform a small trick, avoid further normalization on composed points that contain U+0345 in their decomposition *************** *** 1777,1782 **** if (!class_exists('utf_normalizer')) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx); } --- 1777,1782 ---- if (!class_exists('utf_normalizer')) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/utf_normalizer.' . $phpEx); } *************** *** 1821,1830 **** function utf8_clean_string($text) { ! global $phpbb_root_path, $phpEx; static $homographs = array(); if (empty($homographs)) { ! $homographs = include($phpbb_root_path . 'includes/utf/data/confusables.' . $phpEx); } --- 1821,1830 ---- function utf8_clean_string($text) { ! global $mx_root_path, $phpEx; static $homographs = array(); if (empty($homographs)) { ! $homographs = include($mx_root_path . 'includes/utf/data/confusables.' . $phpEx); } Index: utf_normalizer.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/utf/utf_normalizer.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** utf_normalizer.php 6 Oct 2008 00:35:54 -0000 1.2 --- utf_normalizer.php 6 Oct 2008 00:45:38 -0000 1.3 *************** *** 97,108 **** if (!isset($GLOBALS['utf_nfc_qc'])) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); } if (!isset($GLOBALS['utf_canonical_decomp'])) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); } --- 97,108 ---- if (!isset($GLOBALS['utf_nfc_qc'])) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); } if (!isset($GLOBALS['utf_canonical_decomp'])) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); } *************** *** 137,148 **** if (!isset($GLOBALS['utf_nfc_qc'])) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); } if (!isset($GLOBALS['utf_canonical_decomp'])) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); } --- 137,148 ---- if (!isset($GLOBALS['utf_nfc_qc'])) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); } if (!isset($GLOBALS['utf_canonical_decomp'])) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); } *************** *** 170,181 **** if (!isset($GLOBALS['utf_nfkc_qc'])) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_nfkc_qc.' . $phpEx); } if (!isset($GLOBALS['utf_compatibility_decomp'])) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx); } --- 170,181 ---- if (!isset($GLOBALS['utf_nfkc_qc'])) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_nfkc_qc.' . $phpEx); } if (!isset($GLOBALS['utf_compatibility_decomp'])) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx); } *************** *** 206,211 **** if (!isset($GLOBALS['utf_canonical_decomp'])) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); } --- 206,211 ---- if (!isset($GLOBALS['utf_canonical_decomp'])) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); } *************** *** 234,239 **** if (!isset($GLOBALS['utf_compatibility_decomp'])) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx); } --- 234,239 ---- if (!isset($GLOBALS['utf_compatibility_decomp'])) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx); } *************** *** 265,270 **** if (!isset($utf_jamo_index, $utf_jamo_type, $utf_combining_class)) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.' . $phpEx); } --- 265,270 ---- if (!isset($utf_jamo_index, $utf_jamo_type, $utf_combining_class)) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_normalizer_common.' . $phpEx); } *************** *** 272,277 **** if (!isset($utf_canonical_comp)) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx); } --- 272,277 ---- if (!isset($utf_canonical_comp)) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx); } *************** *** 967,972 **** if (!isset($utf_combining_class)) { ! global $phpbb_root_path, $phpEx; ! include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.' . $phpEx); } --- 967,972 ---- if (!isset($utf_combining_class)) { ! global $mx_root_path, $phpEx; ! include($mx_root_path . 'includes/utf/data/utf_normalizer_common.' . $phpEx); } |
|
From: FlorinCB <ory...@us...> - 2008-10-06 00:38:52
|
Update of /cvsroot/mxbb/core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1761 Modified Files: common.php Log Message: Added utf tools borowed from phpBB3 Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** common.php 4 Oct 2008 07:04:24 -0000 1.107 --- common.php 6 Oct 2008 00:38:46 -0000 1.108 *************** *** 211,214 **** --- 211,215 ---- include_once($mx_root_path . 'includes/mx_constants.' . $phpEx); // Also includes phpBB constants include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class + include_once($mx_root_path . 'includes/utf/utf_tools.' . $phpEx); //Load UTF-8 Tools include_once($mx_root_path . 'includes/mx_functions_core.' . $phpEx); // CORE class |
|
From: FlorinCB <ory...@us...> - 2008-10-06 00:36:01
|
Update of /cvsroot/mxbb/core/includes/utf In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv836 Modified Files: utf_normalizer.php utf_tools.php Log Message: update Index: utf_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/utf/utf_tools.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** utf_tools.php 6 Oct 2008 00:29:05 -0000 1.1 --- utf_tools.php 6 Oct 2008 00:35:54 -0000 1.2 *************** *** 4,9 **** * @package utf * @version $Id$ ! * @copyright (c) 2006 phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ --- 4,10 ---- * @package utf * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2005 The phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com * */ Index: utf_normalizer.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/utf/utf_normalizer.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** utf_normalizer.php 6 Oct 2008 00:29:05 -0000 1.1 --- utf_normalizer.php 6 Oct 2008 00:35:54 -0000 1.2 *************** *** 4,9 **** * @package utf * @version $Id$ ! * @copyright (c) 2005 phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ --- 4,10 ---- * @package utf * @version $Id$ ! * @copyright (c) 2002-2008 MX-Publisher Project Team & (C) 2005 The phpBB Group ! * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 ! * @link http://www.mx-publisher.com * */ |
|
From: FlorinCB <ory...@us...> - 2008-10-06 00:29:16
|
Update of /cvsroot/mxbb/core/includes/utf In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30594 Added Files: utf_normalizer.php utf_tools.php Log Message: Added utf tools borowed from phpBB3 --- NEW FILE: utf_tools.php --- <?php /** * * @package utf * @version $Id: utf_tools.php,v 1.1 2008/10/06 00:29:05 orynider Exp $ * @copyright (c) 2006 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } /** * Modifications: * */ [...1884 lines suppressed...] if (utf8_strlen($new_lines[$index] . $word) > $width) { $new_lines[$index] = substr($new_lines[$index], 0, -1); $index++; $new_lines[$index] = ''; } $new_lines[$index] .= $word . ' '; } $new_lines[$index] = substr($new_lines[$index], 0, -1); $index++; $new_lines[$index] = ''; } unset($new_lines[$index]); return implode($break, $new_lines); } ?> --- NEW FILE: utf_normalizer.php --- <?php /** * * @package utf * @version $Id: utf_normalizer.php,v 1.1 2008/10/06 00:29:05 orynider Exp $ * @copyright (c) 2005 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ if ( !defined('IN_PORTAL') ) { die("Hacking attempt"); } /** * Modifications: * */ [...1491 lines suppressed...] { // If the $tmp_pos cursor was moved then at least one character was not in normal form. Replace $str with the fixed version if ($tmp_pos == $len) { // The $tmp_pos cursor is at the end of $str, therefore $tmp holds the whole $str return $tmp; } else { // The rightmost chunk of $str has not been appended to $tmp yet return $tmp . substr($str, $tmp_pos); } } // The string was already in normal form return $str; } } ?> |
Update of /cvsroot/mxbb/core/includes/utf/data In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30594/data Added Files: case_fold_c.php case_fold_f.php case_fold_s.php confusables.php recode_basic.php recode_cjk.php search_indexer_0.php search_indexer_1.php search_indexer_19.php search_indexer_2.php search_indexer_20.php search_indexer_21.php search_indexer_26.php search_indexer_3.php search_indexer_31.php search_indexer_32.php search_indexer_33.php search_indexer_36.php search_indexer_4.php search_indexer_448.php search_indexer_5.php search_indexer_58.php search_indexer_6.php search_indexer_64.php search_indexer_84.php search_indexer_9.php search_indexer_95.php utf_canonical_comp.php utf_canonical_decomp.php utf_compatibility_decomp.php utf_nfc_qc.php utf_nfkc_qc.php utf_normalizer_common.php Log Message: Added utf tools borowed from phpBB3 --- NEW FILE: search_indexer_58.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_36.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_84.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_21.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_2.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_0.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_19.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_20.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: recode_basic.php --- <?php function iso_8859_1($string) { return utf8_encode($string); } function iso_8859_2($string) { static $transform = array( "\x80" => "\xC2\x80", "\x81" => "\xC2\x81", "\x82" => "\xC2\x82", "\x83" => "\xC2\x83", "\x84" => "\xC2\x84", "\x85" => "\xC2\x85", "\x86" => "\xC2\x86", "\x87" => "\xC2\x87", "\x88" => "\xC2\x88", "\x89" => "\xC2\x89", [...1504 lines suppressed...] "\xC3\xB1" => "\xF1", "\xC3\xB2" => "\xF2", "\xC3\xB3" => "\xF3", "\xC3\xB4" => "\xF4", "\xC3\xB5" => "\xF5", "\xC3\xB6" => "\xF6", "\xC3\xB7" => "\xF7", "\xC3\xB8" => "\xF8", "\xC3\xB9" => "\xF9", "\xC3\xBA" => "\xFA", "\xC3\xBB" => "\xFB", "\xC3\xBC" => "\xFC", "\xC3\xBD" => "\xFD", "\xC3\xBE" => "\xFE", "\xC3\xBF" => "\xFF" ); return strtr($string, $transform); } ?> --- NEW FILE: utf_compatibility_decomp.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_6.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_32.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: case_fold_c.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: utf_canonical_comp.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: utf_canonical_decomp.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_1.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_3.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_448.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: utf_normalizer_common.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: case_fold_f.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_4.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: confusables.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_5.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_64.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: recode_cjk.php --- <?php // Not inluded within the standard distribution function gb2312($string) { static $transform = array( "\xA1\xA1" => "\xE3\x80\x80", "\xA1\xA2" => "\xE3\x80\x81", "\xA1\xA3" => "\xE3\x80\x82", "\xA1\xA4" => "\xE3\x83\xBB", "\xA1\xA5" => "\xCB\x89", "\xA1\xA6" => "\xCB\x87", "\xA1\xA7" => "\xC2\xA8", "\xA1\xA8" => "\xE3\x80\x83", "\xA1\xA9" => "\xE3\x80\x85", "\xA1\xAA" => "\xE2\x80\x95", "\xA1\xAB" => "\xEF\xBD\x9E", "\xA1\xAC" => "\xE2\x80\x96", "\xA1\xAD" => "\xE2\x80\xA6", [...45140 lines suppressed...] "\xF9\xC7" => "\xE8\x99\x8B", "\xF9\xC8" => "\xE8\xAE\x9F", "\xF9\xC9" => "\xE9\x92\x83", "\xF9\xCA" => "\xE9\xB1\xB9", "\xF9\xCB" => "\xE9\xBA\xB7", "\xF9\xCC" => "\xE7\x99\xB5", "\xF9\xCD" => "\xE9\xA9\xAB", "\xF9\xCE" => "\xE9\xB1\xBA", "\xF9\xCF" => "\xE9\xB8\x9D", "\xF9\xD0" => "\xE7\x81\xA9", "\xF9\xD1" => "\xE7\x81\xAA", "\xF9\xD2" => "\xE9\xBA\xA4", "\xF9\xD3" => "\xE9\xBD\xBE", "\xF9\xD4" => "\xE9\xBD\x89", "\xF9\xD5" => "\xE9\xBE\x98", ); return strtr($string, $transform); } ?> --- NEW FILE: search_indexer_33.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: utf_nfkc_qc.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_31.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_95.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: utf_nfc_qc.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_26.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: case_fold_s.php --- (This appears to be a binary file; contents omitted.) --- NEW FILE: search_indexer_9.php --- (This appears to be a binary file; contents omitted.) |
2 messages has been excluded from this view by a project administrator.
