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-06-18 17:53:10
|
Update of /cvsroot/mxbb/core/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10929/lang_romanian Modified Files: lang_admin.php Log Message: $lang['Width'] $lang['Height'] Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_romanian/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin.php 17 Jun 2008 05:07:05 -0000 1.2 --- lang_admin.php 18 Jun 2008 17:53:07 -0000 1.3 *************** *** 323,326 **** --- 323,328 ---- $lang['Order'] = 'Ordine'; $lang['Sort'] = 'Sortare'; + $lang['Width'] = 'Lãþime'; + $lang['Height'] = 'Înãlþime'; $lang['Page_sort_title'] = 'Titlu paginã'; $lang['Page_sort_desc'] = 'Descripþie paginã'; |
|
From: FlorinCB <ory...@us...> - 2008-06-18 17:53:08
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10929/lang_english Modified Files: lang_admin.php Log Message: $lang['Width'] $lang['Height'] Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** lang_admin.php 16 Jun 2008 20:41:35 -0000 1.87 --- lang_admin.php 18 Jun 2008 17:53:05 -0000 1.88 *************** *** 330,333 **** --- 330,335 ---- $lang['Order'] = 'Order'; $lang['Sort'] = 'Sort'; + $lang['Width'] = 'Width'; + $lang['Height'] = 'Height'; $lang['Page_sort_title'] = 'Page title'; $lang['Page_sort_desc'] = 'Page description'; |
|
From: FlorinCB <ory...@us...> - 2008-06-18 17:44:04
|
Update of /cvsroot/mxbb/core/templates/prosilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2373 Added Files: smile_list_body.html Log Message: new file --- NEW FILE: smile_list_body.html --- <h1>{L_SMILEY_TITLE}</h1> <p>{L_SMILEY_TEXT}</p> <form method="post" action="{S_SMILEY_ACTION}"> <fieldset class="tabulated"> <table cellspacing="1"> <thead> <tr> <th>{L_SMILE}</th> <th>{L_CODE}</th> <th>{L_EMOT}</th> <th>{L_WIDTH}</th> <th>{L_HEIGHT}</th> <th>{L_ORDER}</th> <th>{L_ACTION}</th> </tr> </thead> <tbody> <!-- BEGIN smiles --> <tr class="row1"> <td style="text-align: center;"><img src="{smiles.SMILEY_IMG}" alt="{smiles.CODE}" title="{smiles.CODE}" /></td> <td style="text-align: center;">{smiles.CODE}</td> <td style="text-align: center;">{smiles.EMOT}</td> <td style="text-align: center;">{smiles.WIDTH}</td> <td style="text-align: center;">{smiles.HEIGHT}</td> <td style="text-align: center;">{smiles.ORDER}</td> <td style="text-align: center; white-space: nowrap;"> <a href="{smiles.U_SMILEY_EDIT}" title="{L_EDIT}"><img src="../templates/prosilver/admin/images/icon_edit.gif" alt="" /></a> <a href="{smiles.U_SMILEY_DELETE}" title="{L_DELETE}"><img src="../templates/prosilver/admin/images/icon_delete.gif" alt="" /></a> </td> </tr> <!-- END smiles --> </tbody> </table> <p class="quick"> {S_HIDDEN_FIELDS}<input type="submit" name="add" value="{L_SMILEY_ADD}" class="button2" /> <input class="button2" type="submit" name="import_pack" value="{L_IMPORT_PACK}"> <input class="button2" type="submit" name="export_pack" value="{L_EXPORT_PACK}"> </p> </fieldset> </form> |
|
From: FlorinCB <ory...@us...> - 2008-06-18 17:42:56
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1042 Modified Files: admin_mx_smilies.php Log Message: fix Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** admin_mx_smilies.php 18 Jun 2008 16:56:55 -0000 1.15 --- admin_mx_smilies.php 18 Jun 2008 17:42:51 -0000 1.16 *************** *** 782,785 **** --- 782,788 ---- "L_CODE" => $lang['Code'], "L_EMOT" => $lang['Emotion'], + 'L_WIDTH' => $lang['Width'], + 'L_HEIGHT' => $lang['Height'], + 'L_ORDER' => $lang['Order'], "L_SMILE" => $lang['Smile'], "L_IMPORT_PACK" => $lang['import_smile_pack'], |
|
From: Culprit <cul...@us...> - 2008-06-18 17:01:09
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15417/core/includes/shared/phpbb3/includes Modified Files: functions_hook.php Log Message: convert link SID fix Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** functions_hook.php 18 Jun 2008 12:14:14 -0000 1.16 --- functions_hook.php 18 Jun 2008 17:00:55 -0000 1.17 *************** *** 228,239 **** $match_link_cnt = preg_match_all( '#(action|href)=[\'"](([^?\'"]*)\??([^\'"]*)?)[\'"]#si', $html, $match_link); ! if( 0) ! { ! print '<pre>'; ! print htmlentities( trim($html)); ! print_r( $match_link); ! die(); ! } ! $preg_array = array( '##si' => ''); $do_not_convert_ary = array( "{$phpbb_root_path}memberlist"); $do_not_convert = "(" . implode( "|", $do_not_convert_ary) . ")"; --- 228,232 ---- $match_link_cnt = preg_match_all( '#(action|href)=[\'"](([^?\'"]*)\??([^\'"]*)?)[\'"]#si', $html, $match_link); ! $preg_array = array( '##si' => ''); $do_not_convert_ary = array( "{$phpbb_root_path}memberlist"); $do_not_convert = "(" . implode( "|", $do_not_convert_ary) . ")"; *************** *** 262,265 **** --- 255,259 ---- $link_orig = preg_replace( '#([./\[\]\(\)?\\\\])#si', "\\\\\\1", $match_link[2][$i]); $link_orig = str_replace( '#', '\#', $link_orig); + $link = str_replace( 'sid=sid=', 'sid=', $link); if ( !empty($link_orig) && !( eregi($do_not_convert, $link_orig)) ) { *************** *** 267,271 **** } } ! //return $html; if( 0) { --- 261,265 ---- } } ! if( 0) { |
|
From: FlorinCB <ory...@us...> - 2008-06-18 16:56:58
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10870 Modified Files: admin_mx_smilies.php Log Message: this needs to be studied on a new template (for phpBB3 backend) Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_mx_smilies.php 18 Jun 2008 16:52:22 -0000 1.14 --- admin_mx_smilies.php 18 Jun 2008 16:56:55 -0000 1.15 *************** *** 814,818 **** 'WIDTH' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_width'] : '', 'HEIGHT' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_height'] : '', ! 'ORDER' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_order'] + 1 : '', "U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&id=" . $smilies[$i][$smiley_id]), --- 814,818 ---- 'WIDTH' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_width'] : '', 'HEIGHT' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_height'] : '', ! 'ORDER' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_order'] : '', "U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&id=" . $smilies[$i][$smiley_id]), |
|
From: FlorinCB <ory...@us...> - 2008-06-18 16:52:26
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8628 Modified Files: admin_mx_smilies.php Log Message: mmm Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_mx_smilies.php 18 Jun 2008 16:23:59 -0000 1.13 --- admin_mx_smilies.php 18 Jun 2008 16:52:22 -0000 1.14 *************** *** 164,172 **** if( !empty($clear_current) ) { ! $sql = "DELETE ! FROM " . $table; ! if( !$result = $db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't delete current smilies", "", __LINE__, __FILE__, $sql); } } --- 164,177 ---- if( !empty($clear_current) ) { ! switch ($db->sql_layer) { ! case 'sqlite': ! case 'firebird': ! $db->sql_query('DELETE FROM ' . $table); ! break; ! ! default: ! $db->sql_query('TRUNCATE TABLE ' . $table); ! break; } } *************** *** 208,211 **** --- 213,228 ---- $smile_data[$j] = str_replace(">", ">", $smile_data[$j]); $k = $smile_data[$j]; + + // Stripslash here because it got addslashed before... (on export) + $smile_url = stripslashes($smile_data[0]); + $smiley_width = stripslashes($smile_data[1]); + $smiley_height = stripslashes($smile_data[2]); + $display_on_posting = stripslashes($smile_data[3]); + + if (isset($smile_data[4]) && isset($smile_data[5])) + { + $smile_emotion = stripslashes($smile_data[4]); + $smile_code = stripslashes($smile_data[5]); + } if( $smiles[$k] == 1 ) *************** *** 223,229 **** case 'phpbb3': ! $sql = "UPDATE " . $table . " ! SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emotion = '" . str_replace("\'", "''", $smile_data[1]) . "' ! WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; break; } --- 240,255 ---- case 'phpbb3': ! $sql = array( ! 'emotion' => $smile_emotion, ! $fields . '_url' => $smile_url, ! $fields . '_height' => (int) $smiley_height, ! $fields . '_width' => (int) $smiley_width, ! $fields . '_order' => (int) $smiley_order, ! 'display_on_posting'=> (int) $display_on_posting, ! ); ! ! $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " ! WHERE code = '" . $db->sql_escape($smile_code) . "'"; ! $db->sql_query($sql); break; } *************** *** 245,250 **** case 'phpbb3': ! $sql = "INSERT INTO " . $table . " (code, smiley_url, emotion) ! VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; } --- 271,284 ---- case 'phpbb3': ! $sql = array( ! 'code' => $smile_code, ! 'emotion' => $smile_emotion, ! $fields . '_url' => $smile_url, ! $fields . '_height' => (int) $smiley_height, ! $fields . '_width' => (int) $smiley_width, ! $fields . '_order' => (int) $smiley_order, ! 'display_on_posting'=> (int) $display_on_posting, ! ); ! $db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql)); break; } *************** *** 777,780 **** --- 811,818 ---- "CODE" => $smilies[$i]['code'], "EMOT" => $smilies[$i][$emotion], + + 'WIDTH' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_width'] : '', + 'HEIGHT' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_height'] : '', + 'ORDER' => (PORTAL_BACKEND === 'phpbb3') ? $smilies[$i]['smiley_order'] + 1 : '', "U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&id=" . $smilies[$i][$smiley_id]), |
|
From: FlorinCB <ory...@us...> - 2008-06-18 16:24:04
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21727 Modified Files: admin_mx_smilies.php Log Message: not ready yet (for phpBB3 backend) Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin_mx_smilies.php 18 Jun 2008 16:13:59 -0000 1.12 --- admin_mx_smilies.php 18 Jun 2008 16:23:59 -0000 1.13 *************** *** 616,620 **** $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " ! WHERE $field_sql = '" . $db->sql_escape($smile_code) . "'"; $db->sql_query($sql); break; --- 616,620 ---- $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " ! WHERE code = '" . $db->sql_escape($smile_code) . "'"; $db->sql_query($sql); break; |
|
From: FlorinCB <ory...@us...> - 2008-06-18 16:14:07
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12510 Modified Files: admin_mx_smilies.php Log Message: smilies.pak fixed for all backends Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin_mx_smilies.php 18 Jun 2008 06:20:56 -0000 1.11 --- admin_mx_smilies.php 18 Jun 2008 16:13:59 -0000 1.12 *************** *** 37,50 **** } - /* - $mx_root_path = "./../"; - require($mx_root_path . 'extension.inc'); - - $cancel = $mx_request_vars->is_post('cancel'); - $no_page_header = $cancel; - - require('./pagestart.' . $phpEx); - */ - // // Security and Page header --- 37,40 ---- *************** *** 67,71 **** $cancel = $mx_request_vars->is_post('cancel'); ! $no_page_header = $cancel; require('./pagestart.' . $phpEx); --- 57,61 ---- $cancel = $mx_request_vars->is_post('cancel'); ! require('./pagestart.' . $phpEx); *************** *** 73,77 **** // Load default header // ! include_once('./page_header_admin.' . $phpEx); if ($cancel) --- 63,70 ---- // Load default header // ! if ($no_page_header === false) ! { ! include_once('./page_header_admin.' . $phpEx); ! } if ($cancel) *************** *** 93,120 **** } - $delimeter = '=+:'; - switch (PORTAL_BACKEND) { case 'internal': $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed ! $smiley_root_path = $phpbb_root_path; //same here $smiley_url = 'smile_url'; $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; break; case 'phpbb2': $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; $smiley_url = 'smile_url'; $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; break; case 'phpbb3': $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; $smiley_url = 'smiley_url'; $smiley_id = 'smiley_id'; ! $emotion = 'emotion'; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); break; --- 86,120 ---- } switch (PORTAL_BACKEND) { case 'internal': $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed ! $smiley_root_path = $phpbb_root_path; //same here ! $fields = 'smilies'; $smiley_url = 'smile_url'; $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; ! $table = SMILIES_TABLE; ! $delimeter = '=+:'; break; case 'phpbb2': $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; ! $fields = 'smilies'; $smiley_url = 'smile_url'; $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; ! $table = SMILIES_TABLE; ! $delimeter = '=+:'; break; case 'phpbb3': $smiley_path_url = PHPBB_URL; ! $smiley_root_path = $phpbb_root_path; ! $fields = 'smiley'; $smiley_url = 'smiley_url'; $smiley_id = 'smiley_id'; ! $emotion = 'emotion'; ! $table = SMILIES_TABLE; ! $delimeter = ', '; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); break; *************** *** 165,169 **** { $sql = "DELETE ! FROM " . SMILIES_TABLE; if( !$result = $db->sql_query($sql) ) { --- 165,169 ---- { $sql = "DELETE ! FROM " . $table; if( !$result = $db->sql_query($sql) ) { *************** *** 174,178 **** { $sql = "SELECT code ! FROM ". SMILIES_TABLE; if( !$result = $db->sql_query($sql) ) { --- 174,178 ---- { $sql = "SELECT code ! FROM ". $table; if( !$result = $db->sql_query($sql) ) { *************** *** 217,221 **** case 'internal': case 'phpbb2': ! $sql = "UPDATE " . SMILIES_TABLE . " SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; --- 217,221 ---- case 'internal': case 'phpbb2': ! $sql = "UPDATE " . $table . " SET smile_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; *************** *** 223,227 **** case 'phpbb3': ! $sql = "UPDATE " . SMILIES_TABLE . " SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emotion = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; --- 223,227 ---- case 'phpbb3': ! $sql = "UPDATE " . $table . " SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emotion = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; *************** *** 240,249 **** case 'internal': case 'phpbb2': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emotion) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; --- 240,249 ---- case 'internal': case 'phpbb2': ! $sql = "INSERT INTO " . $table . " (code, smile_url, emoticon) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; case 'phpbb3': ! $sql = "INSERT INTO " . $table . " (code, smiley_url, emotion) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; *************** *** 314,319 **** if ($mx_request_vars->get('export_pack', MX_TYPE_NO_TAGS) == "send" ) { ! $sql = "SELECT * ! FROM " . SMILIES_TABLE; if( !$result = $db->sql_query($sql) ) { --- 314,334 ---- if ($mx_request_vars->get('export_pack', MX_TYPE_NO_TAGS) == "send" ) { ! //$gen_simple_header = true; ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT * ! FROM " . SMILIES_TABLE; ! break; ! ! case 'phpbb3': ! $sql = 'SELECT * ! FROM ' . SMILIES_TABLE . ' ! ORDER BY smiley_order'; ! break; ! } ! if( !$result = $db->sql_query($sql) ) { *************** *** 322,342 **** $resultset = $db->sql_fetchrowset($result); ! $smile_pak = ""; ! for($i = 0; $i < count($resultset); $i++ ) { ! $smile_pak .= $resultset[$i][$smiley_url] . $delimeter; ! $smile_pak .= $resultset[$i][$emotion] . $delimeter; ! $smile_pak .= $resultset[$i]['code'] . "\n"; } ! header("Content-Type: text/x-delimtext; name=\"smiles.pak\""); ! header("Content-disposition: attachment; filename=smiles.pak"); ! echo $smile_pak; ! exit; } - $message = sprintf($lang['export_smiles'], "<a href=\"" . mx_append_sid("admin_mx_smilies.$phpEx?export_pack=send", true) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . mx_append_sid("admin_mx_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); --- 337,387 ---- $resultset = $db->sql_fetchrowset($result); ! $smile_pak = ""; ! switch (PORTAL_BACKEND) { ! case 'internal': ! case 'phpbb2': ! for($i = 0; $i < count($resultset); $i++ ) ! { ! $smile_pak .= $resultset[$i][$smiley_url] . $delimeter; ! $smile_pak .= $resultset[$i]['emoticon'] . $delimeter; ! $smile_pak .= $resultset[$i]['code'] . "\n"; ! } ! break; ! ! case 'phpbb3': ! for($i = 0; $i < count($resultset); $i++ ) ! { ! $smile_pak .= "'" . addslashes($resultset[$i][$smiley_url]) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i][$fields . '_width']) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i][$fields . '_height']) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i]['display_on_posting']) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i][$emotion]) . "'" . $delimeter; ! $smile_pak .= "'" . addslashes($resultset[$i]['code']) . "'" . $delimeter . "\n"; ! } ! break; } + $db->sql_freeresult($result); ! if ($smile_pak != '') ! { ! //garbage_collection(); ! header('Pragma: public'); ! header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); ! // Send out the Headers ! header('Content-Type: text/x-delimtext; name="smilies.pak"'); ! header('Content-Disposition: inline; filename="smilies.pak"'); ! echo $smile_pak; ! flush(); ! exit; ! } ! else ! { ! mx_message_die(GENERAL_MESSAGE, 'Error'); ! } } $message = sprintf($lang['export_smiles'], "<a href=\"" . mx_append_sid("admin_mx_smilies.$phpEx?export_pack=send", true) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_smileadmin'], "<a href=\"" . mx_append_sid("admin_mx_smilies.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); *************** *** 395,399 **** if ($mx_request_vars->is_post('confirm')) { ! $sql = "DELETE FROM " . SMILIES_TABLE . " WHERE smilies_id = " . $smiley_id; $result = $db->sql_query($sql); --- 440,444 ---- if ($mx_request_vars->is_post('confirm')) { ! $sql = "DELETE FROM " . $table . " WHERE smilies_id = " . $smiley_id; $result = $db->sql_query($sql); *************** *** 442,446 **** case 'phpbb2': $sql = "SELECT * ! FROM " . SMILIES_TABLE . " WHERE smilies_id = " . $smiley_id; break; --- 487,491 ---- case 'phpbb2': $sql = "SELECT * ! FROM " . $table . " WHERE smilies_id = " . $smiley_id; break; *************** *** 448,452 **** case 'phpbb3': $sql = "SELECT * ! FROM " . SMILIES_TABLE . " WHERE smiley_id = " . $smiley_id; break; --- 493,497 ---- case 'phpbb3': $sql = "SELECT * ! FROM " . $table . " WHERE smiley_id = " . $smiley_id; break; *************** *** 481,489 **** ); ! $s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="smile_id" value="' . $smile_data['smilies_id'] . '" />'; $template->assign_vars(array( ! "SMILEY_CODE" => $smile_data['code'], ! "SMILEY_EMOTICON" => $smile_data[$emotion], "L_SMILEY_TITLE" => $lang['smiley_title'], --- 526,538 ---- ); ! $s_hidden_fields = '<input type="hidden" name="mode" value="save" /><input type="hidden" name="smile_id" value="' . $smile_data[$smiley_id] . '" />'; $template->assign_vars(array( ! 'SMILEY_URL' => addslashes($smile_data[$smiley_url]), ! 'SMILEY_CODE' => addslashes($smile_data['code']), ! 'SMILEY_EMOTICON' => addslashes($smile_data[$emotion]), ! 'SMILEY_WIDTH' => (PORTAL_BACKEND === 'phpbb3') ? $smile_data['smiley_width'] : '', ! 'SMILEY_HEIGHT' => (PORTAL_BACKEND === 'phpbb3') ? $smile_data['smiley_height'] : '', ! 'SMILEY_ORDER' => (PORTAL_BACKEND === 'phpbb3') ? $smile_data['smiley_order'] + 1 : '', "L_SMILEY_TITLE" => $lang['smiley_title'], *************** *** 523,526 **** --- 572,583 ---- $smile_code = trim($smile_code); $smile_url = trim($smile_url); + + if (PORTAL_BACKEND === 'phpbb3') + { + $smiley_width = $mx_request_vars->post('smile_width', MX_TYPE_NO_HTML); + $smiley_height = $mx_request_vars->post('smile_height', MX_TYPE_NO_HTML); + $smiley_order = $mx_request_vars->post('smile_order', MX_TYPE_NO_HTML); + } + // If no code was entered complain ... *************** *** 543,547 **** case 'internal': case 'phpbb2': ! $sql = "UPDATE " . SMILIES_TABLE . " SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' WHERE smilies_id = $smile_id"; --- 600,604 ---- case 'internal': case 'phpbb2': ! $sql = "UPDATE " . $table . " SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' WHERE smilies_id = $smile_id"; *************** *** 549,555 **** case 'phpbb3': ! $sql = "UPDATE " . SMILIES_TABLE . " ! SET code = '" . str_replace("\'", "''", $smile_code) . "', smiley_url = '" . str_replace("\'", "''", $smile_url) . "', emotion = '" . str_replace("\'", "''", $smile_emotion) . "' ! WHERE smiley_id = $smile_id"; break; } --- 606,621 ---- case 'phpbb3': ! $sql = array( ! 'emotion' => $smile_emotion, ! $fields . '_url' => $smile_url, ! $fields . '_height' => (int) $smiley_height, ! $fields . '_width' => (int) $smiley_width, ! $fields . '_order' => (int) $smiley_order, ! 'display_on_posting'=> (int) $display_on_posting, ! ); ! ! $sql = "UPDATE $table SET " . $db->sql_build_array('UPDATE', $sql) . " ! WHERE $field_sql = '" . $db->sql_escape($smile_code) . "'"; ! $db->sql_query($sql); break; } *************** *** 580,583 **** --- 646,657 ---- $smile_code = trim($smile_code); $smile_url = trim($smile_url); + + if (PORTAL_BACKEND === 'phpbb3') + { + $smiley_width = $mx_request_vars->post('smile_width', MX_TYPE_NO_HTML); + $smiley_height = $mx_request_vars->post('smile_height', MX_TYPE_NO_HTML); + $smiley_order = $mx_request_vars->post('smile_order', MX_TYPE_NO_HTML); + $display_on_posting = $mx_request_vars->request('display', MX_TYPE_INT, 1); + } // If no code was entered complain ... *************** *** 600,604 **** case 'internal': case 'phpbb2': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smile_url, emoticon) VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; $result = $db->sql_query($sql); --- 674,678 ---- case 'internal': case 'phpbb2': ! $sql = "INSERT INTO " . $table . " (code, smile_url, emoticon) VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; $result = $db->sql_query($sql); *************** *** 606,612 **** case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emotion) ! VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; ! $result = $db->sql_query($sql); break; } --- 680,693 ---- case 'phpbb3': ! $sql = array( ! 'code' => $smile_code, ! 'emotion' => $smile_emotion, ! $fields . '_url' => $smile_url, ! $fields . '_height' => (int) $smiley_height, ! $fields . '_width' => (int) $smiley_width, ! $fields . '_order' => (int) $smiley_order, ! 'display_on_posting'=> (int) $display_on_posting, ! ); ! $db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql)); break; } *************** *** 631,637 **** // any options. // ! $sql = "SELECT * ! FROM " . SMILIES_TABLE; ! $result = $db->sql_query($sql); if( !$result ) { --- 712,731 ---- // any options. // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT * ! FROM " . $table; ! $result = $db->sql_query($sql); ! break; ! ! case 'phpbb3': ! $sql = 'SELECT * ! FROM ' . $table . ' ! ORDER BY smiley_order'; ! $result = $db->sql_query($sql); ! break; ! } if( !$result ) { |
|
From: Culprit <cul...@us...> - 2008-06-18 12:14:27
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13247/core/includes/shared/phpbb3/includes Modified Files: functions_hook.php functions_module.php functions.php Log Message: new acp update Index: functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** functions.php 15 Jun 2008 21:01:41 -0000 1.17 --- functions.php 18 Jun 2008 12:14:15 -0000 1.18 *************** *** 2172,2180 **** function redirect($url, $return = false) { ! global $db, $mx_cache, $board_config, $user, $phpbb_root_path; if (empty($user->lang)) { ! $user->add_lang('common'); } --- 2172,2180 ---- function redirect($url, $return = false) { ! global $db, $mx_cache, $board_config, $mx_user, $phpbb_root_path; if (empty($user->lang)) { ! $mx_user->add_lang('common'); } *************** *** 2193,2197 **** { // Malformed url, redirect to current page... ! $url = self::generate_board_url() . '/' . $user->page['page']; } else if (!empty($url_parts['scheme']) && !empty($url_parts['host'])) --- 2193,2197 ---- { // Malformed url, redirect to current page... ! $url = self::generate_board_url() . '/' . $mx_user->page['page']; } else if (!empty($url_parts['scheme']) && !empty($url_parts['host'])) *************** *** 2332,2336 **** } ! return append_sid($url); } --- 2332,2336 ---- } ! return mx_append_sid($url); } *************** *** 2474,2478 **** // generate activation key ! $confirm_key = gen_rand_string(10); if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']) --- 2474,2478 ---- // generate activation key ! $confirm_key = phpBB3::gen_rand_string(10); if (defined('IN_ADMIN') && isset($user->data['session_admin']) && $user->data['session_admin']) *************** *** 2482,2486 **** else { ! page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]); } --- 2482,2486 ---- else { ! //page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]); } *************** *** 2498,2502 **** // re-add sid / transform & to & for user->page (user->page is always using &) $use_page = ($u_action) ? $phpbb_root_path . $u_action : $phpbb_root_path . str_replace('&', '&', $user->page['page']); ! $u_action = reapply_sid($use_page); $u_action .= ((strpos($u_action, '?') === false) ? '?' : '&') . 'confirm_key=' . $confirm_key; --- 2498,2502 ---- // re-add sid / transform & to & for user->page (user->page is always using &) $use_page = ($u_action) ? $phpbb_root_path . $u_action : $phpbb_root_path . str_replace('&', '&', $user->page['page']); ! $u_action = self::reapply_sid($use_page); $u_action .= ((strpos($u_action, '?') === false) ? '?' : '&') . 'confirm_key=' . $confirm_key; *************** *** 2520,2524 **** else { ! page_footer(); } } --- 2520,2524 ---- else { ! //page_footer(); } } *************** *** 3282,3288 **** function smiley_text($text, $force_option = false) { ! global $board_config, $user, $phpbb_root_path; ! if ($force_option || !$board_config['allow_smilies'] || !$user->optionget('viewsmilies')) { return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text); --- 3282,3288 ---- function smiley_text($text, $force_option = false) { ! global $board_config, $mx_user, $phpbb_root_path; ! if ($force_option || !$board_config['allow_smilies'] || !$mx_user->optionget('viewsmilies')) { return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $text); *************** *** 4307,4310 **** --- 4307,4311 ---- /** * Generate page header + function page_header($page_title = '', $display_online_list = true) { *************** *** 4648,4656 **** // application/xhtml+xml not used because of IE ! header('Content-type: text/html; charset=UTF-8'); ! header('Cache-Control: private, no-cache="set-cookie"'); ! header('Expires: 0'); ! header('Pragma: no-cache'); return; --- 4649,4657 ---- // application/xhtml+xml not used because of IE ! //header('Content-type: text/html; charset=UTF-8'); ! //header('Cache-Control: private, no-cache="set-cookie"'); ! //header('Expires: 0'); ! //header('Pragma: no-cache'); return; *************** *** 4660,4666 **** /** * Generate page footer function page_footer($run_cron = true) { ! global $db, $board_config, $template, $user, $auth, $mx_cache, $starttime, $phpbb_root_path, $phpEx; // Output page creation time --- 4661,4668 ---- /** * Generate page footer + function page_footer($run_cron = true) { ! global $db, $board_config, $template, $mx_user, $auth, $mx_cache, $starttime, $phpbb_root_path, $phpEx; // Output page creation time *************** *** 4699,4703 **** 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', ! 'U_ACP' => ($auth->acl_get('a_') && $user->data['is_registered']) ? append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $user->session_id) : '') ); --- 4701,4706 ---- 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', ! 'U_ACP' => ( $mx_user->data['is_registered']) ? mx_append_sid("{$phpbb_root_path}adm/index.$phpEx", false, true, $mx_user->session_id) : '' ! ) ); *************** *** 4738,4742 **** if ($cron_type) { ! $template->assign_var('RUN_CRON_TASK', '<img src="' . append_sid($phpbb_root_path . 'cron.' . $phpEx, 'cron_type=' . $cron_type) . '" width="1" height="1" alt="cron" />'); } } --- 4741,4745 ---- if ($cron_type) { ! $template->assign_var('RUN_CRON_TASK', '<img src="' . mx_append_sid($phpbb_root_path . 'cron.' . $phpEx, 'cron_type=' . $cron_type) . '" width="1" height="1" alt="cron" />'); } } *************** *** 4744,4748 **** $template->display('body'); ! garbage_collection(); exit; --- 4747,4751 ---- $template->display('body'); ! self::garbage_collection(); exit; Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** functions_hook.php 18 Jun 2008 08:11:20 -0000 1.15 --- functions_hook.php 18 Jun 2008 12:14:14 -0000 1.16 *************** *** 17,20 **** --- 17,21 ---- } + class mx_phpbb3_admin { *************** *** 235,238 **** --- 236,241 ---- } $preg_array = array( '##si' => ''); + $do_not_convert_ary = array( "{$phpbb_root_path}memberlist"); + $do_not_convert = "(" . implode( "|", $do_not_convert_ary) . ")"; for( $i=0; $i<$match_link_cnt; $i++) { *************** *** 259,263 **** $link_orig = preg_replace( '#([./\[\]\(\)?\\\\])#si', "\\\\\\1", $match_link[2][$i]); $link_orig = str_replace( '#', '\#', $link_orig); ! if ( !empty($link_orig) ) { $preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => @$mx_admin_path . $link)); --- 262,266 ---- $link_orig = preg_replace( '#([./\[\]\(\)?\\\\])#si', "\\\\\\1", $match_link[2][$i]); $link_orig = str_replace( '#', '\#', $link_orig); ! if ( !empty($link_orig) && !( eregi($do_not_convert, $link_orig)) ) { $preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => @$mx_admin_path . $link)); *************** *** 278,281 **** --- 281,286 ---- return preg_replace( array_keys( $preg_array), $preg_array, $html); } + + } Index: functions_module.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_module.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** functions_module.php 15 Jun 2008 21:01:42 -0000 1.12 --- functions_module.php 18 Jun 2008 12:14:14 -0000 1.13 *************** *** 51,55 **** 'request_var', 'add_form_key', 'generate_text_for_display', 'check_form_key', 'gen_sort_selects', 'on_page', 'generate_pagination', 'generate_text_for_edit', 'generate_text_for_storage', 'group_create', ! 'unique_id', 'set_config', 'style_select', 'language_select' ); /** --- 51,55 ---- 'request_var', 'add_form_key', 'generate_text_for_display', 'check_form_key', 'gen_sort_selects', 'on_page', 'generate_pagination', 'generate_text_for_edit', 'generate_text_for_storage', 'group_create', ! 'unique_id', 'set_config', 'style_select', 'language_select', 'meta_refresh', 'get_formatted_filesize' ); /** |
|
From: Culprit <cul...@us...> - 2008-06-18 12:14:04
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12291/core/admin Modified Files: index_new.php Log Message: new acp update Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** index_new.php 18 Jun 2008 08:11:25 -0000 1.12 --- index_new.php 18 Jun 2008 12:13:39 -0000 1.13 *************** *** 108,120 **** include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); mx_page::load_file( 'acp/auth', 'phpbb3' ); ! // mx_page::load_file( 'auth'); ! mx_page::load_file( 'functions', 'phpbb2' ); ! // mx_page::load_file( 'functions', 'phpbb2' ); CULPRIT, You have to add this to the shared phpbb3 folder. ! mx_page::load_file( 'functions_module', 'phpbb3' ); mx_page::load_file( 'functions_module', 'phpbb3' ); $phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/'; } - // mx_page::load_file( 'functions_'); class mx_acp { --- 108,119 ---- include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); mx_page::load_file( 'acp/auth', 'phpbb3' ); ! ! mx_page::load_file( 'functions', 'phpbb3' ); mx_page::load_file( 'functions_module', 'phpbb3' ); + mx_page::load_file( 'functions_admin', 'phpbb3' ); + mx_page::load_file( 'functions_hook', 'phpbb3' ); $phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/'; } class mx_acp { *************** *** 154,158 **** if ( OLYMPUS_CATEGORY == PORTAL_BACKEND ) { - include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx ); $this->phpbb3_hook = new mx_phpbb3_admin( $this ); //$this->phpbb3_hook->hook( 'admin' ); --- 153,156 ---- *************** *** 795,798 **** --- 793,797 ---- } + $mx_acp = new mx_acp(); $mx_acp->decode_url( $_GET ); *************** *** 801,804 **** --- 800,804 ---- $mx_acp->assign_menu(); + //$cache_acp_file = "{$mx_root_path}cache" $script = $mx_acp->prepare_action_script(); error_reporting( E_ALL ^ E_NOTICE ); |
|
From: FlorinCB <ory...@us...> - 2008-06-18 11:44:18
|
Update of /cvsroot/mxbb/core/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12601 Modified Files: bbcode.tpl Log Message: clean up Index: bbcode.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/bbcode.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bbcode.tpl 18 Jun 2008 11:04:29 -0000 1.2 --- bbcode.tpl 18 Jun 2008 11:44:08 -0000 1.3 *************** *** 60,91 **** <!-- BEGIN email --><a href="mailto:{EMAIL}">{EMAIL}</a><!-- END email --> - <!-- BEGIN s_open --><strike><!-- END s_open --> - <!-- BEGIN s_close --></strike><!-- END s_close --> - - <!-- BEGIN sup_open --><sup><!-- END sup_open --> - <!-- BEGIN sup_close --></sup><!-- END sup_close --> - - <!-- BEGIN sub_open --><sub><!-- END sub_open --> - <!-- BEGIN sub_close --></sub><!-- END sub_close --> - - <!-- BEGIN spoil_open --> - <div align="center"> - <div class="spoiltitle"><b>{L_BBCODEBOX_HIDDEN}:</b> - <input class="spoilbtn" type="button" value="{L_BBCODEBOX_VIEW}" onClick="javascript:if (this.parentNode.parentNode.getElementsByTagName('div')[1].getElementsByTagName('div')[0].style.display != '') { this.parentNode.parentNode.getElementsByTagName('div')[1].getElementsByTagName('div')[0].style.display = ''; this.innerText = ''; this.value = '{L_BBCODEBOX_HIDE}'; } else { this.parentNode.parentNode.getElementsByTagName('div')[1].getElementsByTagName('div')[0].style.display = 'none'; this.innerText = ''; this.value = '{L_BBCODEBOX_VIEW}'; }" onfocus="this.blur();"> - </div> - <div class="spoildiv"> - <div style="display: none;"> - <!-- END spoil_open --> - <!-- BEGIN spoil_close --></div></div></div><span class="postbody"><!-- END spoil_close --> - - <!-- BEGIN align_open --><div style="text-align:{ALIGN}"><!-- END align_open --> - <!-- BEGIN align_close --></div><!-- END align_close --> - - <!-- BEGIN marq_open --><marquee direction="{MARQ}" scrolldelay="120"><!-- END marq_open --> - <!-- BEGIN marq_close --></marquee><!-- END marq_close --> - - <!-- BEGIN font_open --><span style="font-family:{FONT}"><!-- END font_open --> - <!-- BEGIN font_close --></span><!-- END font_close --> - <!-- BEGIN flash --><!-- URL's used in the movie--> <!-- text used in the movie--> --- 60,63 ---- *************** *** 120,125 **** <embed src="http://www.youtube.com/v/{YOUTUBEID}" type="application/x-shockwave-flash" width="425" height="350"></embed> </object><br /> ! <a href="http://youtube.com/watch?v={YOUTUBEID}" target="_blank">{YOUTUBELINK}</a><br /> ! </div> <!-- END youtube --> --- 92,96 ---- <embed src="http://www.youtube.com/v/{YOUTUBEID}" type="application/x-shockwave-flash" width="425" height="350"></embed> </object><br /> ! <a href="http://youtube.com/watch?v={YOUTUBEID}" target="_blank">{YOUTUBELINK}</a></div><br /> <!-- END youtube --> |
|
From: FlorinCB <ory...@us...> - 2008-06-18 11:39:47
|
Update of /cvsroot/mxbb/core/language/lang_romanian_no_diacritics In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6947 Modified Files: lang_main.php Log Message: $lang['Link'] = 'Legatura'; Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_romanian_no_diacritics/lang_main.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_main.php 16 Jun 2008 14:40:08 -0000 1.1 --- lang_main.php 18 Jun 2008 11:39:41 -0000 1.2 *************** *** 35,38 **** --- 35,40 ---- $lang['No'] = 'Nu'; + $lang['Link'] = 'Legatura'; + $lang['Hidden_block'] = 'Block ascuns...'; $lang['Hidden_block_explain'] = 'Acest bloc este \'ascuns\', dar visibil deoarece esti un admin/moderator.'; |
|
From: FlorinCB <ory...@us...> - 2008-06-18 11:39:00
|
Update of /cvsroot/mxbb/core/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5853 Modified Files: lang_main.php Log Message: $lang['Link'] = 'Legãturã'; Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_romanian/lang_main.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_main.php 16 Jun 2008 14:40:00 -0000 1.1 --- lang_main.php 18 Jun 2008 11:38:55 -0000 1.2 *************** *** 35,38 **** --- 35,40 ---- $lang['No'] = 'Nu'; + $lang['Link'] = 'Legãturã'; + $lang['Hidden_block'] = 'Block ascuns...'; $lang['Hidden_block_explain'] = 'Acest bloc este \'ascuns\', dar visibil deoarece eºti un admin/moderator.'; |
|
From: FlorinCB <ory...@us...> - 2008-06-18 11:37:53
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4188 Modified Files: lang_main.php Log Message: $lang['Link'] = 'Link'; Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_main.php,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** lang_main.php 9 Mar 2008 23:38:50 -0000 1.40 --- lang_main.php 18 Jun 2008 11:37:47 -0000 1.41 *************** *** 36,39 **** --- 36,41 ---- $lang['No'] = 'No'; + $lang['Link'] = 'Link'; + $lang['Hidden_block'] = 'Hidden block'; $lang['Hidden_block_explain'] = 'This block is \'hidden\', but visible to you since you have the proper permissions set.'; |
|
From: FlorinCB <ory...@us...> - 2008-06-18 11:36:19
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1669 Modified Files: mx_functions_bbcode.php Log Message: $lang['Link'] Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_functions_bbcode.php 18 Jun 2008 11:05:27 -0000 1.7 --- mx_functions_bbcode.php 18 Jun 2008 11:36:06 -0000 1.8 *************** *** 116,122 **** $bbcode_tpl['video'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['video']); $bbcode_tpl['GVideo'] = str_replace('{GVIDEOID}', '\\1', $bbcode_tpl['GVideo']); ! $bbcode_tpl['GVideo'] = str_replace('{GVIDEOLINK}', $lang['GVideo_link'], $bbcode_tpl['GVideo']); $bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']); ! $bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['youtube_link'], $bbcode_tpl['youtube']); //Stop more bbcode --- 116,122 ---- $bbcode_tpl['video'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['video']); $bbcode_tpl['GVideo'] = str_replace('{GVIDEOID}', '\\1', $bbcode_tpl['GVideo']); ! $bbcode_tpl['GVideo'] = str_replace('{GVIDEOLINK}', $lang['Link'], $bbcode_tpl['GVideo']); $bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']); ! $bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['Link'], $bbcode_tpl['youtube']); //Stop more bbcode |
|
From: FlorinCB <ory...@us...> - 2008-06-18 11:05:39
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27703 Modified Files: mx_functions_bbcode.php mx_functions_tools.php Log Message: fixes to bbcode/smilies and upgrade Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** mx_functions_tools.php 17 Jun 2008 15:54:53 -0000 1.32 --- mx_functions_tools.php 18 Jun 2008 11:05:28 -0000 1.33 *************** *** 18,25 **** --- 18,27 ---- // This 'include' is needed for the mx_text class // + /* if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass')) { mx_page::load_file('bbcode'); } + */ /** *************** *** 144,148 **** if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass')) { ! mx_page::load_file('bbcode'); } --- 146,150 ---- if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass')) { ! //mx_page::load_file('bbcode'); } *************** *** 407,411 **** if( $this->bbcode_on ) { ! $text = bbencode_second_pass($text, $bbcode_uid); } --- 409,413 ---- if( $this->bbcode_on ) { ! $text = mx_bbencode_second_pass($text, $bbcode_uid); } Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_functions_bbcode.php 16 Jun 2008 08:30:25 -0000 1.6 --- mx_functions_bbcode.php 18 Jun 2008 11:05:27 -0000 1.7 *************** *** 105,108 **** --- 105,123 ---- $bbcode_tpl['email'] = str_replace('{EMAIL}', '\\1', $bbcode_tpl['email']); + + //Start more bbcode + $bbcode_tpl['stream'] = str_replace('{URL}', '\\1', $bbcode_tpl['stream']); + $bbcode_tpl['web'] = str_replace('{URL}', '\\1', $bbcode_tpl['web']); + $bbcode_tpl['flash'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['flash']); + $bbcode_tpl['flash'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['flash']); + $bbcode_tpl['flash'] = str_replace('{URL}', '\\3', $bbcode_tpl['flash']); + $bbcode_tpl['video'] = str_replace('{URL}', '\\3', $bbcode_tpl['video']); + $bbcode_tpl['video'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['video']); + $bbcode_tpl['video'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['video']); + $bbcode_tpl['GVideo'] = str_replace('{GVIDEOID}', '\\1', $bbcode_tpl['GVideo']); + $bbcode_tpl['GVideo'] = str_replace('{GVIDEOLINK}', $lang['GVideo_link'], $bbcode_tpl['GVideo']); + $bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']); + $bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['youtube_link'], $bbcode_tpl['youtube']); + //Stop more bbcode define("BBCODE_TPL_READY", true); *************** *** 216,219 **** --- 231,259 ---- $replacements[] = $bbcode_tpl['email']; + //Strat more bbcode + + // [stream]Sound URL[/stream] code.. + $patterns[] = "#\[stream:$uid\](.*?)\[/stream:$uid\]#si"; + $replacements[] = $bbcode_tpl['stream']; + + // [flash width=X height=X]Flash URL[/flash] code.. + $patterns[] = "#\[flash width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9]):$uid\](.*?)\[/flash:$uid\]#si"; + $replacements[] = $bbcode_tpl['flash']; + + // [video width=X height=X]Video URL[/video] code.. + $patterns[] = "#\[video width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9]):$uid\](.*?)\[/video:$uid\]#si"; + $replacements[] = $bbcode_tpl['video']; + $text = preg_replace($patterns, $replacements, $text); + + // [GVideo]GVideo URL[/GVideo] code.. + $patterns[] = "#\[GVideo\]http://video.google.[A-Za-z0-9.]{2,5}/videoplay\?docid=([0-9A-Za-z-_]*)[^[]*\[/GVideo\]#is"; + $replacements[] = $bbcode_tpl['GVideo']; + + // [youtube]YouTube URL[/youtube] code.. + $patterns[] = "#\[youtube\]http://(?:www\.)?youtube.com/watch\?v=([0-9A-Za-z-_]{11})[^[]*\[/youtube\]#is"; + $replacements[] = $bbcode_tpl['youtube']; + + //Stop more bbcode + $text = preg_replace($patterns, $replacements, $text); *************** *** 282,285 **** --- 322,338 ---- $text = preg_replace("#\[img\]((http|ftp|https|ftps)://)([^ \?&=\#\"\n\r\t<]*?(\.(jpg|jpeg|gif|png)))\[/img\]#sie", "'[img:$uid]\\1' . str_replace(' ', '%20', '\\3') . '[/img:$uid]'", $text); + //Start more bbcode + + // [stream]Sound URL[/stream] code.. + $text = preg_replace("#\[stream\](.*?)\[/stream\]#si", "[stream:$uid]\\1[/stream:$uid]", $text); + + // [flash width=X height=X]Flash URL[/flash] code.. + $text = preg_replace("#\[flash width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9])\](([a-z]+?)://([^, \n\r]+))\[\/flash\]#si","[flash width=\\1 height=\\2:$uid\]\\3[/flash:$uid]", $text); + + // [video width=X height=X]Video URL[/video] code.. + $text = preg_replace("#\[video width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9])\](([a-z]+?)://([^, \n\r]+))\[\/video\]#si","[video width=\\1 height=\\2:$uid\]\\3[/video:$uid]", $text); + + //Stop more bbcode + // Remove our padding from the string.. return substr($text, 1);; *************** *** 729,743 **** case 'internal': $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed $smiley_url = 'smile_url'; ! break; case 'phpbb2': $smiley_path_url = PHPBB_URL; $smiley_url = 'smile_url'; ! break; case 'phpbb3': $smiley_path_url = PHPBB_URL; $smiley_url = 'smiley_url'; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); ! break; } --- 782,805 ---- case 'internal': $smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed + $smiley_root_path = $phpbb_root_path; //same here $smiley_url = 'smile_url'; ! $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; ! break; case 'phpbb2': $smiley_path_url = PHPBB_URL; + $smiley_root_path = $phpbb_root_path; $smiley_url = 'smile_url'; ! $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; ! break; case 'phpbb3': $smiley_path_url = PHPBB_URL; + $smiley_root_path = $phpbb_root_path; $smiley_url = 'smiley_url'; + $smiley_id = 'smiley_id'; + $emotion = 'emotion'; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); ! break; } *************** *** 766,770 **** { $orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/"; ! $repl[] = '<img src="' . $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url] . '" alt="' . $smilies[$i]['emoticon'] . '" border="0" />'; } } --- 828,832 ---- { $orig[] = "/(?<=.\W|\W.|^\W)" . preg_quote($smilies[$i]['code'], "/") . "(?=.\W|\W.|\W$)/"; ! $repl[] = '<img src="' . $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url] . '" alt="' . $smilies[$i][$emotion] . '" border="0" />'; } } |
|
From: FlorinCB <ory...@us...> - 2008-06-18 11:04:51
|
Update of /cvsroot/mxbb/core/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26513 Modified Files: bbcode.tpl Log Message: bbcode Index: bbcode.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/bbcode.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bbcode.tpl 9 Sep 2007 16:50:45 -0000 1.1 --- bbcode.tpl 18 Jun 2008 11:04:29 -0000 1.2 *************** *** 59,60 **** --- 59,158 ---- <!-- BEGIN email --><a href="mailto:{EMAIL}">{EMAIL}</a><!-- END email --> + + <!-- BEGIN s_open --><strike><!-- END s_open --> + <!-- BEGIN s_close --></strike><!-- END s_close --> + + <!-- BEGIN sup_open --><sup><!-- END sup_open --> + <!-- BEGIN sup_close --></sup><!-- END sup_close --> + + <!-- BEGIN sub_open --><sub><!-- END sub_open --> + <!-- BEGIN sub_close --></sub><!-- END sub_close --> + + <!-- BEGIN spoil_open --> + <div align="center"> + <div class="spoiltitle"><b>{L_BBCODEBOX_HIDDEN}:</b> + <input class="spoilbtn" type="button" value="{L_BBCODEBOX_VIEW}" onClick="javascript:if (this.parentNode.parentNode.getElementsByTagName('div')[1].getElementsByTagName('div')[0].style.display != '') { this.parentNode.parentNode.getElementsByTagName('div')[1].getElementsByTagName('div')[0].style.display = ''; this.innerText = ''; this.value = '{L_BBCODEBOX_HIDE}'; } else { this.parentNode.parentNode.getElementsByTagName('div')[1].getElementsByTagName('div')[0].style.display = 'none'; this.innerText = ''; this.value = '{L_BBCODEBOX_VIEW}'; }" onfocus="this.blur();"> + </div> + <div class="spoildiv"> + <div style="display: none;"> + <!-- END spoil_open --> + <!-- BEGIN spoil_close --></div></div></div><span class="postbody"><!-- END spoil_close --> + + <!-- BEGIN align_open --><div style="text-align:{ALIGN}"><!-- END align_open --> + <!-- BEGIN align_close --></div><!-- END align_close --> + + <!-- BEGIN marq_open --><marquee direction="{MARQ}" scrolldelay="120"><!-- END marq_open --> + <!-- BEGIN marq_close --></marquee><!-- END marq_close --> + + <!-- BEGIN font_open --><span style="font-family:{FONT}"><!-- END font_open --> + <!-- BEGIN font_close --></span><!-- END font_close --> + + <!-- BEGIN flash --><!-- URL's used in the movie--> + <!-- text used in the movie--> + <!-- --> + <div style="text-align:center;"> + <OBJECT classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=5,0,0,0" WIDTH={WIDTH} HEIGHT={HEIGHT}> + <PARAM NAME=movie VALUE="{URL}"><PARAM NAME=quality VALUE=high> <PARAM NAME=scale VALUE=noborder> <PARAM NAME=wmode VALUE=transparent> <PARAM NAME=bgcolor VALUE=#000000> + <EMBED src="{URL}" quality=high scale=noborder wmode=transparent bgcolor=#000000 WIDTH={WIDTH} HEIGHT={HEIGHT} TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"> + </EMBED></OBJECT> + </div> + <!-- END flash --> + + <!-- BEGIN GVideo --> + <div style="text-align:center;"> + <object width="425" height="350"> + <param name="movie" value="http://video.google.com/googleplayer.swf?docId={GVIDEOID}"></param> + <embed style="width:400px; height:326px;" id="VideoPlayback" + align="middle" type="application/x-shockwave-flash" + src="http://video.google.com/googleplayer.swf?docId={GVIDEOID}" + allowScriptAccess="sameDomain" quality="best" bgcolor="#ffffff" + scale="noScale" salign="TL" FlashVars="playerMode=embedded"> + </embed> + </object><br /> + <a href="http://video.google.com/googleplayer.swf?docId={GVIDEOID}" target="_blank">{GVIDEOLINK}</a><br /> + </div> + <!-- END GVideo --> + + <!-- BEGIN youtube --> + <div style="text-align:center;"> + <object width="425" height="350"> + <param name="movie" value="http://www.youtube.com/v/{YOUTUBEID}"></param> + <embed src="http://www.youtube.com/v/{YOUTUBEID}" type="application/x-shockwave-flash" width="425" height="350"></embed> + </object><br /> + <a href="http://youtube.com/watch?v={YOUTUBEID}" target="_blank">{YOUTUBELINK}</a><br /> + </div> + <!-- END youtube --> + + <!-- BEGIN stream --> + <div style="text-align:center;"> + <object id="wmp" width=300 height=70 classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95" + codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0" + standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject"> + <param name="FileName" value="{URL}"> + <param name="ShowControls" value="1"> + <param name="ShowDisplay" value="0"> + <param name="ShowStatusBar" value="1"> + <param name="AutoSize" value="1"> + <param name="autoplay" value="0"> + <embed type="application/x-mplayer2" + pluginspage="http://www.microsoft.com/windows95/downloads/contents/wurecommended/s_wufeatured/mediaplayer/default.asp" + src="{URL}" name=MediaPlayer2 showcontrols=1 showdisplay=0 showstatusbar=1 autosize=1 autoplay=0 visible=1 animationatstart=0 transparentatstart=1 loop=0 height=70 width=300> + </embed> + </object> + </div> + <!-- END stream --> + + <!-- BEGIN video --> + <div style="text-align:center;"> + <div align="left"><embed src="{URL}" autoplay="false" width={WIDTH} height={HEIGHT}></embed></div> + </div> + <!-- END video --> + + <!-- BEGIN hr --><hr noshade color='#000000' size='1'><!-- END hr --> + + <!-- BEGIN fade_open --> + <span style="height: 1; Filter: Alpha(Opacity=100, FinishOpacity=0, Style=1, StartX=0, FinishX=100%)"> + <!-- END fade_open --> + <!-- BEGIN fade_close --> + </span> + <!-- END fade_close --> \ No newline at end of file |
|
From: Culprit <cul...@us...> - 2008-06-18 08:12:02
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16552/core/includes/shared/phpbb3/includes Modified Files: functions_hook.php Log Message: new acp phpbb3 fixes Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** functions_hook.php 18 Jun 2008 05:12:59 -0000 1.14 --- functions_hook.php 18 Jun 2008 08:11:20 -0000 1.15 *************** *** 168,171 **** --- 168,173 ---- '#adm_page_footer\(\);#si' => '$mx_acp->_template_assign_vars();$template->pparse(\'panel\');', '#global #si' => 'global $mx_acp, ', + '#\s(header\()#si' => '// \1', + '#ob_start\(\'ob_gzhandler\'\);#si' => '// \0', ); *************** *** 238,244 **** $p_cnt = preg_match_all( '#([^=&]*)=([^&]*)#si', '&' . $params , $link_parts); $link_compare_ary = @array_combine( $link_parts[1], $link_parts[2]); ! $eregi = 'adm/index.' . $phpEx . '?i=' . $panel_i . '&panel=' . $link_compare_ary['i'] . '&mode=' . $link_compare_ary['mode']; $panel = $menu_action[$eregi]; ! $link = 'index.' . $phpEx . '?cat=' . OLYMPUS_CATEGORY . '&i=' . $panel_i . '&panel=' . $menu_action[$eregi] . '&mode=' . $link_compare_ary['mode']; unset( $link_compare_ary['i']); unset( $link_compare_ary['mode']); --- 240,247 ---- $p_cnt = preg_match_all( '#([^=&]*)=([^&]*)#si', '&' . $params , $link_parts); $link_compare_ary = @array_combine( $link_parts[1], $link_parts[2]); ! $eregi = "adm/index.{$phpEx}?i={$panel_i}&panel={$link_compare_ary[i]}&mode={$link_compare_ary[mode]}"; $panel = $menu_action[$eregi]; ! $filename = basename( $_SERVER['PHP_SELF']); ! $link = "{$filename}?cat=" . OLYMPUS_CATEGORY . "&i={$panel_i}&panel=" .$menu_action[$eregi] . "&mode={$link_compare_ary[mode]}"; unset( $link_compare_ary['i']); unset( $link_compare_ary['mode']); *************** *** 258,262 **** if ( !empty($link_orig) ) { ! $preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => $admin_path . $link)); } } --- 261,265 ---- if ( !empty($link_orig) ) { ! $preg_array = array_merge( $preg_array, array( '#' . $link_orig .'#si' => @$mx_admin_path . $link)); } } |
|
From: Culprit <cul...@us...> - 2008-06-18 08:11:30
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16552/core/admin Modified Files: index_new.php Log Message: new acp phpbb3 fixes Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** index_new.php 18 Jun 2008 05:11:39 -0000 1.11 --- index_new.php 18 Jun 2008 08:11:25 -0000 1.12 *************** *** 111,115 **** mx_page::load_file( 'functions', 'phpbb2' ); // mx_page::load_file( 'functions', 'phpbb2' ); CULPRIT, You have to add this to the shared phpbb3 folder. ! mx_page::load_file( 'functions_module' ); $phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/'; --- 111,116 ---- mx_page::load_file( 'functions', 'phpbb2' ); // mx_page::load_file( 'functions', 'phpbb2' ); CULPRIT, You have to add this to the shared phpbb3 folder. ! mx_page::load_file( 'functions_module', 'phpbb3' ); ! mx_page::load_file( 'functions_module', 'phpbb3' ); $phpbb_admin_path = ( defined( 'PHPBB_ADMIN_PATH' ) ) ? PHPBB_ADMIN_PATH : 'adm/'; *************** *** 795,799 **** $mx_acp = new mx_acp(); ! $mx_acp->decode_url( $HTTP_GET_VARS ); $mx_acp->assign_tabs(); --- 796,800 ---- $mx_acp = new mx_acp(); ! $mx_acp->decode_url( $_GET ); $mx_acp->assign_tabs(); *************** *** 824,828 **** $panel_html = ob_get_contents(); ob_end_clean(); ! print_r( $HTTP_POST_VARS ); $panel_html .= preg_replace( array( "#\n#esi", "#\t#si" ), array( "sprintf('%4d', \$i++) . '\n'", ' ' ), str_replace( "\n", "<br/>\n", htmlentities( $script ) ) ); break; --- 825,829 ---- $panel_html = ob_get_contents(); ob_end_clean(); ! print_r( $_POST ); $panel_html .= preg_replace( array( "#\n#esi", "#\t#si" ), array( "sprintf('%4d', \$i++) . '\n'", ' ' ), str_replace( "\n", "<br/>\n", htmlentities( $script ) ) ); break; |
|
From: FlorinCB <ory...@us...> - 2008-06-18 06:21:05
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28023 Modified Files: admin_mx_smilies.php Log Message: partial support for phpBB3 enabled for smilies, more will come... Index: admin_mx_smilies.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_mx_smilies.php 15 Jun 2008 22:26:25 -0000 1.10 --- admin_mx_smilies.php 18 Jun 2008 06:20:56 -0000 1.11 *************** *** 101,105 **** $smiley_root_path = $phpbb_root_path; //same here $smiley_url = 'smile_url'; ! $smiley_id = 'smilies_id'; break; case 'phpbb2': --- 101,106 ---- $smiley_root_path = $phpbb_root_path; //same here $smiley_url = 'smile_url'; ! $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; break; case 'phpbb2': *************** *** 107,111 **** $smiley_root_path = $phpbb_root_path; $smiley_url = 'smile_url'; ! $smiley_id = 'smilies_id'; break; case 'phpbb3': --- 108,113 ---- $smiley_root_path = $phpbb_root_path; $smiley_url = 'smile_url'; ! $smiley_id = 'smilies_id'; ! $emotion = 'emoticon'; break; case 'phpbb3': *************** *** 113,117 **** $smiley_root_path = $phpbb_root_path; $smiley_url = 'smiley_url'; ! $smiley_id = 'smiley_id'; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); break; --- 115,120 ---- $smiley_root_path = $phpbb_root_path; $smiley_url = 'smiley_url'; ! $smiley_id = 'smiley_id'; ! $emotion = 'emotion'; $board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']); break; *************** *** 221,225 **** case 'phpbb3': $sql = "UPDATE " . SMILIES_TABLE . " ! SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emoticon = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; break; --- 224,228 ---- case 'phpbb3': $sql = "UPDATE " . SMILIES_TABLE . " ! SET smiley_url = '" . str_replace("\'", "''", $smile_data[0]) . "', emotion = '" . str_replace("\'", "''", $smile_data[1]) . "' WHERE code = '" . str_replace("\'", "''", $smile_data[$j]) . "'"; break; *************** *** 242,246 **** case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emoticon) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; --- 245,249 ---- case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emotion) VALUES('" . str_replace("\'", "''", $smile_data[$j]) . "', '" . str_replace("\'", "''", $smile_data[0]) . "', '" . str_replace("\'", "''", $smile_data[1]) . "')"; break; *************** *** 324,328 **** { $smile_pak .= $resultset[$i][$smiley_url] . $delimeter; ! $smile_pak .= $resultset[$i]['emoticon'] . $delimeter; $smile_pak .= $resultset[$i]['code'] . "\n"; } --- 327,331 ---- { $smile_pak .= $resultset[$i][$smiley_url] . $delimeter; ! $smile_pak .= $resultset[$i][$emotion] . $delimeter; $smile_pak .= $resultset[$i]['code'] . "\n"; } *************** *** 454,458 **** if( !$result ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql); } $smile_data = $db->sql_fetchrow($result); --- 457,461 ---- if( !$result ) { ! mx_message_die(GENERAL_ERROR, 'Could not obtain ' . $emotion . ' information', "", __LINE__, __FILE__, $sql); } $smile_data = $db->sql_fetchrow($result); *************** *** 482,486 **** $template->assign_vars(array( "SMILEY_CODE" => $smile_data['code'], ! "SMILEY_EMOTICON" => $smile_data['emoticon'], "L_SMILEY_TITLE" => $lang['smiley_title'], --- 485,489 ---- $template->assign_vars(array( "SMILEY_CODE" => $smile_data['code'], ! "SMILEY_EMOTICON" => $smile_data[$emotion], "L_SMILEY_TITLE" => $lang['smiley_title'], *************** *** 547,551 **** case 'phpbb3': $sql = "UPDATE " . SMILIES_TABLE . " ! SET code = '" . str_replace("\'", "''", $smile_code) . "', smiley_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' WHERE smiley_id = $smile_id"; break; --- 550,554 ---- case 'phpbb3': $sql = "UPDATE " . SMILIES_TABLE . " ! SET code = '" . str_replace("\'", "''", $smile_code) . "', smiley_url = '" . str_replace("\'", "''", $smile_url) . "', emotion = '" . str_replace("\'", "''", $smile_emotion) . "' WHERE smiley_id = $smile_id"; break; *************** *** 603,607 **** case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emoticon) VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; $result = $db->sql_query($sql); --- 606,610 ---- case 'phpbb3': ! $sql = "INSERT INTO " . SMILIES_TABLE . " (code, smiley_url, emotion) VALUES ('" . str_replace("\'", "''", $smile_code) . "', '" . str_replace("\'", "''", $smile_url) . "', '" . str_replace("\'", "''", $smile_emotion) . "')"; $result = $db->sql_query($sql); *************** *** 679,683 **** "SMILEY_IMG" => $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url], "CODE" => $smilies[$i]['code'], ! "EMOT" => $smilies[$i]['emoticon'], "U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&id=" . $smilies[$i][$smiley_id]), --- 682,686 ---- "SMILEY_IMG" => $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies[$i][$smiley_url], "CODE" => $smilies[$i]['code'], ! "EMOT" => $smilies[$i][$emotion], "U_SMILEY_EDIT" => mx_append_sid("admin_mx_smilies.$phpEx?mode=edit&id=" . $smilies[$i][$smiley_id]), |
|
From: Culprit <cul...@us...> - 2008-06-18 05:13:04
|
Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3578/core/includes/shared/phpbb3/includes Modified Files: functions_hook.php Log Message: fixes Index: functions_hook.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions_hook.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** functions_hook.php 15 Jun 2008 21:01:41 -0000 1.13 --- functions_hook.php 18 Jun 2008 05:12:59 -0000 1.14 *************** *** 101,105 **** global $db, $phpbb_root_path, $phpEx; $sql = "SELECT m1.parent_id AS m1_parent, m1.module_langname AS m1_langname, m2.module_langname AS m2_langname, m2.module_basename AS m2_basename, m2.module_mode AS m2_mode ! FROM " . MODULES_TABLE . " AS m1 RIGHT OUTER JOIN phpbb3_modules AS m2 ON m1.module_id = m2.parent_id AND m2.module_enabled = 1 AND m2.module_display = 1 WHERE m1.parent_id IN (" . $this->id_tabs . ") AND m1.module_class = 'acp' ORDER BY m1.left_id"; --- 101,105 ---- global $db, $phpbb_root_path, $phpEx; $sql = "SELECT m1.parent_id AS m1_parent, m1.module_langname AS m1_langname, m2.module_langname AS m2_langname, m2.module_basename AS m2_basename, m2.module_mode AS m2_mode ! FROM " . MODULES_TABLE . " AS m1 RIGHT OUTER JOIN " . MODULES_TABLE . " AS m2 ON m1.module_id = m2.parent_id AND m2.module_enabled = 1 AND m2.module_display = 1 WHERE m1.parent_id IN (" . $this->id_tabs . ") AND m1.module_class = 'acp' ORDER BY m1.left_id"; |
|
From: Culprit <cul...@us...> - 2008-06-18 05:11:45
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2712/core/admin Modified Files: index_new.php Log Message: fixes Index: index_new.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index_new.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** index_new.php 22 Feb 2008 23:02:49 -0000 1.10 --- index_new.php 18 Jun 2008 05:11:39 -0000 1.11 *************** *** 107,113 **** { include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); ! mx_page::load_file( 'acp/auth' ); // mx_page::load_file( 'auth'); ! mx_page::load_file( 'functions' ); // mx_page::load_file( 'functions', 'phpbb2' ); CULPRIT, You have to add this to the shared phpbb3 folder. mx_page::load_file( 'functions_module' ); --- 107,113 ---- { include_once( $mx_root_path . 'includes/sessions/phpbb3/auth.' . $phpEx ); ! mx_page::load_file( 'acp/auth', 'phpbb3' ); // mx_page::load_file( 'auth'); ! mx_page::load_file( 'functions', 'phpbb2' ); // mx_page::load_file( 'functions', 'phpbb2' ); CULPRIT, You have to add this to the shared phpbb3 folder. mx_page::load_file( 'functions_module' ); *************** *** 155,159 **** include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx ); $this->phpbb3_hook = new mx_phpbb3_admin( $this ); ! $this->phpbb3_hook->hook( 'admin' ); } } --- 155,159 ---- include_once( $mx_root_path . 'includes/shared/phpbb3/includes/functions_hook.' . $phpEx ); $this->phpbb3_hook = new mx_phpbb3_admin( $this ); ! //$this->phpbb3_hook->hook( 'admin' ); } } |
|
From: FlorinCB <ory...@us...> - 2008-06-17 18:23:00
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14085 Added Files: index.htm Log Message: index.html --- 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-06-17 18:21:41
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13584 Added Files: mx_search_results.html Log Message: mx_search_results.html 1st attempt prosilver --- NEW FILE: mx_search_results.html --- <div class="forabg block" style="width:{BLOCK_SIZE}"> <div class="inner bg2 panel"> <div class="topic-actions"> <div class="rightside"> {SEARCH_MATCHES} </div> </div> <p><a class="{S_CONTENT_FLOW_BEGIN}" href="{U_NEW_SEARCH}">{L_NEW_SEARCH}</a></p> <div class="topic-actions"> <ul class="topiclist"> <li class="search"> <dl class="icon"> <dt> {L_PAGE} </dt> <dd> {L_BLOCK} </dd> </dl> <!-- BEGIN searchresults --> <dl class="icon"> <dt class="bg1"> <span class="name">{searchresults.PAGE_TITLE_URL}</span> <span class="gensmall">{searchresults.PAGE_DESC}</span> </dt> <dt class="bg2" style="text-align:left;"> <span class="forumlink">{searchresults.BLOCK_TITLE_URL}</span> <span class="gensmall">{searchresults.BLOCK_DESC}</span> <span class="gensmall">{searchresults.L_BLOCK_UPDATED}{searchresults.BLOCK_EDITOR} {searchresults.EDIT_TIME}</span> </dt> </dl> <!-- END searchresults --> <dl> <dt> </dt> </dl> </li> </ul> </div> <div class="topic-actions"> <div class="pagination"> <dl class="text"> <dt><!-- IF PAGINATION --> • <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> • <span>{PAGINATION}</span><!-- ELSE --> • {PAGE_NUMBER}<!-- ENDIF --></dt> <dt>{S_TIMEZONE}</dt> </dl> </div> </div> </div> <span class="corners-bottom"> </span> </div> |
2 messages has been excluded from this view by a project administrator.
