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...> - 2009-07-16 05:16:13
|
Update of /cvsroot/mxbb/core/templates/subsilver2/theme In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30036/templates/subsilver2/theme Modified Files: stylesheet.css Log Message: ?????????? Index: stylesheet.css =================================================================== RCS file: /cvsroot/mxbb/core/templates/subsilver2/theme/stylesheet.css,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** stylesheet.css 27 Dec 2007 03:22:28 -0000 1.1 --- stylesheet.css 16 Jul 2009 05:16:01 -0000 1.2 *************** *** 25,35 **** } ! body { /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ ! font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; ! color: #323D4F; background-color: #FFFFFF; font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */ ! margin: 0; } --- 25,49 ---- } ! /* General page style. The scroll bar colours only visible in IE5.5+ */ ! html, body { /* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */ ! FONT: 10pt "Helvetica", "Lucida Grande", Verdana, Geneva, Arial, sans-serif; ! color: #323D4F; background-color: #FFFFFF; + scrollbar-face-color: #DEE3E7; + scrollbar-highlight-color: #FFFFFF; + scrollbar-shadow-color: #DEE3E7; + scrollbar-3dlight-color: #D1D7DC; + scrollbar-arrow-color: #006699; + scrollbar-track-color: #EFEFEF; + scrollbar-darkshadow-color: #98AAB1; + MARGIN: 5px 10px 10px; + PADDING-RIGHT: 0px; + PADDING-LEFT: 0px; + PADDING-BOTTOM: 0px; + COLOR: #000000; + PADDING-TOP: 0px; font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */ ! margin: 0; } |
|
From: FlorinCB <ory...@us...> - 2009-07-16 05:16:06
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30036/includes Modified Files: mx_constants.php Log Message: ?????????? Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_constants.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** mx_constants.php 31 Oct 2008 19:02:20 -0000 1.31 --- mx_constants.php 16 Jul 2009 05:16:01 -0000 1.32 *************** *** 70,74 **** * @access private */ ! define('MX_PORTAL_PAGES_OFFSET', 1000); /**#@+ --- 70,74 ---- * @access private */ ! define('TX_PORTAL_PAGES_OFFSET', 1000); /**#@+ *************** *** 76,105 **** * @access public */ ! define('PORTAL_TABLE', $mx_table_prefix . 'portal'); ! define('MENU_NAV_TABLE', $mx_table_prefix . 'menu_nav'); ! define('MENU_CAT_TABLE', $mx_table_prefix . 'menu_categories'); ! define('MODULE_TABLE', $mx_table_prefix . 'module'); ! define('FUNCTION_TABLE', $mx_table_prefix . 'function'); ! define('PARAMETER_TABLE', $mx_table_prefix . 'parameter'); ! define('PARAMETER_OPTION_TABLE', $mx_table_prefix . 'parameter_option'); ! define('PAGE_TABLE' , $mx_table_prefix . 'page'); ! define('COLUMN_TABLE' , $mx_table_prefix . 'column'); ! define('COLUMN_BLOCK_TABLE', $mx_table_prefix . 'column_block'); ! define('BLOCK_TABLE', $mx_table_prefix . 'block'); ! define('BLOCK_SYSTEM_PARAMETER_TABLE', $mx_table_prefix . 'block_system_parameter'); ! define('BLOCK_USER_PARAMETER_TABLE', $mx_table_prefix . 'block_user_parameter'); ! define('COLUMN_TEMPLATES' , $mx_table_prefix . 'column_templates'); ! define('PAGE_TEMPLATES' , $mx_table_prefix . 'page_templates'); ! define('MX_THEMES_TABLE', $mx_table_prefix.'themes'); ! define('MX_MATCH_TABLE' , $mx_table_prefix . 'wordmatch'); ! define('MX_WORD_TABLE' , $mx_table_prefix . 'wordlist'); ! define('MX_SEARCH_TABLE' , $mx_table_prefix . 'search_results'); /**#@-*/ --- 76,105 ---- * @access public */ ! define('PORTAL_TABLE', $tx_table_prefix . 'portal'); ! define('MENU_NAV_TABLE', $tx_table_prefix . 'menu_nav'); ! define('MENU_CAT_TABLE', $tx_table_prefix . 'menu_categories'); ! define('MODULE_TABLE', $tx_table_prefix . 'module'); ! define('FUNCTION_TABLE', $tx_table_prefix . 'function'); ! define('PARAMETER_TABLE', $tx_table_prefix . 'parameter'); ! define('PARAMETER_OPTION_TABLE', $tx_table_prefix . 'parameter_option'); ! define('PAGE_TABLE' , $tx_table_prefix . 'page'); ! define('COLUMN_TABLE' , $tx_table_prefix . 'column'); ! define('COLUMN_BLOCK_TABLE', $tx_table_prefix . 'column_block'); ! define('BLOCK_TABLE', $tx_table_prefix . 'block'); ! define('BLOCK_SYSTEM_PARAMETER_TABLE', $tx_table_prefix . 'block_system_parameter'); ! define('BLOCK_USER_PARAMETER_TABLE', $tx_table_prefix . 'block_user_parameter'); ! define('COLUMN_TEMPLATES' , $tx_table_prefix . 'column_templates'); ! define('PAGE_TEMPLATES' , $tx_table_prefix . 'page_templates'); ! define('TX_THEMES_TABLE', $tx_table_prefix.'themes'); ! define('TX_MATCH_TABLE' , $tx_table_prefix . 'wordmatch'); ! define('TX_WORD_TABLE' , $tx_table_prefix . 'wordlist'); ! define('TX_SEARCH_TABLE' , $tx_table_prefix . 'search_results'); /**#@-*/ |
|
From: FlorinCB <ory...@us...> - 2009-07-16 05:16:06
|
Update of /cvsroot/mxbb/core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30036 Modified Files: .htaccess Log Message: ?????????? Index: .htaccess =================================================================== RCS file: /cvsroot/mxbb/core/.htaccess,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** .htaccess 4 Feb 2008 16:56:15 -0000 1.10 --- .htaccess 16 Jul 2009 05:15:59 -0000 1.11 *************** *** 4,7 **** --- 4,8 ---- # Just in case, let's disable viewing of directory indexes. Options -Indexes + Options +FollowSymLinks # Just in case, let's disable register globals (only valid for php4). *************** *** 71,75 **** #RewriteRule ^support/catlink([0-9]*)(.*)$ index.php?page=53&cat_link=$1 [L] ! #RewriteRule ^support(.*)$ index.php?page=53 [L] # --- 72,77 ---- #RewriteRule ^support/catlink([0-9]*)(.*)$ index.php?page=53&cat_link=$1 [L] ! #RewriteRule ^support(.*)$ index.php?page=53 [L] ! #RewriteRule ^index.html$ index.php [L,NE] # |
|
From: FlorinCB <ory...@us...> - 2009-07-12 05:13:08
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15840 Modified Files: mx_functions_tools.php Log Message: fix Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** mx_functions_tools.php 11 Jul 2009 03:22:06 -0000 1.53 --- mx_functions_tools.php 12 Jul 2009 05:13:00 -0000 1.54 *************** *** 165,174 **** if ($text != '' && $bbcode_uid != '') { ! //$text = ($this->bbcode_on) ? $mx_bbcode->bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text); ! $text = ($this->bbcode_on) ? $mx_bbcode->decode($text, $bbcode_uid): preg_replace("/\:$bbcode_uid/si", '', $text); } ! /* ! if ( $text != '' ) { $text = $mx_bbcode->make_clickable($text); --- 165,174 ---- if ($text != '' && $bbcode_uid != '') { ! $text = ($this->bbcode_on) ? $mx_bbcode->bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text); ! //$text = ($this->bbcode_on) ? $mx_bbcode->decode($text, $bbcode_uid): preg_replace("/\:$bbcode_uid/si", '', $text); } ! ! if ($text != '') { $text = $mx_bbcode->make_clickable($text); *************** *** 178,189 **** // Parse smilies // ! if ( $this->smilies_on ) { ! if ( $text != '' ) { $text = $mx_bbcode->smilies_pass($text); } } - */ // --- 178,188 ---- // Parse smilies // ! if ($this->smilies_on) { ! if ($text != '') { $text = $mx_bbcode->smilies_pass($text); } } // |
|
From: FlorinCB <ory...@us...> - 2009-07-12 05:13:03
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15840/sessions/phpbb3 Modified Files: bbcode.php Log Message: fix Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** bbcode.php 11 Jul 2009 04:25:41 -0000 1.10 --- bbcode.php 12 Jul 2009 05:13:00 -0000 1.11 *************** *** 453,457 **** 'u_open' => '<span style="text-decoration: underline">', 'u_close' => '</span>', ! 'img' => '<img src="$1" alt="' . $mx_user->lang['IMAGE'] . '" />', 'size' => '<span style="font-size: $1%; line-height: normal">$2</span>', 'color' => '<span style="color: $1">$2</span>', --- 453,457 ---- 'u_open' => '<span style="text-decoration: underline">', 'u_close' => '</span>', ! 'img' => '<center><img src="$1" alt="' . $mx_user->lang['IMAGE'] . '" /></center>', 'size' => '<span style="font-size: $1%; line-height: normal">$2</span>', 'color' => '<span style="color: $1">$2</span>', |
|
From: FlorinCB <ory...@us...> - 2009-07-12 03:59:36
|
Update of /cvsroot/mxbb/mx_smartor/album_mod/modules In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26215 Modified Files: album_otf.php Log Message: fix Index: album_otf.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_otf.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** album_otf.php 29 Aug 2008 05:58:24 -0000 1.4 --- album_otf.php 12 Jul 2009 03:59:31 -0000 1.5 *************** *** 224,231 **** $page_title = $lang['Album']; ! if ( !$is_block ) ! { include($mx_root_path . 'includes/page_header.'.$phpEx); ! } $template->set_filenames(array('body' => 'album_otf_body.tpl')); --- 224,232 ---- $page_title = $lang['Album']; ! ! if ( !$is_block ) ! { include($mx_root_path . 'includes/page_header.'.$phpEx); ! } $template->set_filenames(array('body' => 'album_otf_body.tpl')); *************** *** 248,288 **** $otf_pic_time = $otf_pic_time + 1; $pic_img_url = mx_append_sid(ALBUM_OTF_PATH . $pic_images[$pic_cat][$i][$j]); - - // $pic_thumbnail = $pic_cat_names[$pic_cat][$i][$j] . '_' . $pic_file_names[$pic_cat][$i][$j]; $pic_thumbnail = $pic_images[$pic_cat][$i][$j]; $pic_thumbnail_fullpath = ALBUM_CACHE_PATH . $pic_thumbnail; ! /* ! if ( file_exists($pic_thumbnail_fullpath) ) { ! $pic_img_thumb = $pic_thumbnail_fullpath; } else { $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); } ! */ $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); ! if ( ($upload_pics == true) && ($cat_to_upload > 0) ) { if ($upload_counter < 9) { ! $otf_pic_title = $pic_cat . ' - ' . $pic_names[$pic_cat][$i][$j] . ' - 00' . ($upload_counter + 1); } ! elseif ( ($upload_counter > 8) && ($upload_counter < 99) ) { ! $otf_pic_title = $pic_cat . ' - ' . $pic_names[$pic_cat][$i][$j] . ' - 0' . ($upload_counter + 1); } else { ! $otf_pic_title = $pic_cat . ' - ' . $pic_names[$pic_cat][$i][$j] . ' - ' . ($upload_counter + 1); ! } $otf_pic_path = ALBUM_OTF_PATH . $pic_images[$pic_cat][$i][$j]; ! if (pic_upload_to_cat($otf_pic_path, $pic_file_names[$pic_cat][$i][$j], ucfirst($otf_pic_title), $pic_names[$pic_cat][$i][$j], $cat_to_upload, $otf_pic_time)) { $upload_counter++; } } $template->assign_block_vars('pic_row.pic_column', array( --- 249,310 ---- $otf_pic_time = $otf_pic_time + 1; $pic_img_url = mx_append_sid(ALBUM_OTF_PATH . $pic_images[$pic_cat][$i][$j]); $pic_thumbnail = $pic_images[$pic_cat][$i][$j]; $pic_thumbnail_fullpath = ALBUM_CACHE_PATH . $pic_thumbnail; ! ! $pic_thumbnail_ext = $pic_cat_names[$pic_cat][$i][$j] . '_' . $pic_file_names[$pic_cat][$i][$j]; ! $pic_thumbnail_ext_fullpath = ALBUM_CACHE_PATH . $pic_thumbnail_ext; ! /* ! elseif (@file_exists($pic_thumbnail_ext_fullpath) ) { ! $pic_img_thumb = $pic_thumbnail_ext_fullpath; } + */ + + /* + if (@file_exists($pic_thumbnail_fullpath) ) + { + $pic_img_thumb = $pic_thumbnail_fullpath; + } else { $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); } ! */ $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); ! if ($cat_to_upload > 0) { if ($upload_counter < 9) { ! $otf_pic_title = '000' . ($upload_counter + 1) . $pic_cat . '_' . $pic_names[$pic_cat][$i][$j]; } ! elseif ( ($upload_counter > 9) && ($upload_counter < 99) ) { ! $otf_pic_title = '00' . ($upload_counter + 1) . $pic_cat . '_' . $pic_names[$pic_cat][$i][$j]; } + elseif ( ($upload_counter > 99) && ($upload_counter < 999) ) + { + $otf_pic_title = '0' . ($upload_counter + 1) . $pic_cat . '_' . $pic_names[$pic_cat][$i][$j]; + } else { ! $otf_pic_title = $pic_cat . '_' . ($upload_counter + 1) . $pic_names[$pic_cat][$i][$j]; ! } ! ! $otf_pic_path = ALBUM_OTF_PATH . $pic_images[$pic_cat][$i][$j]; ! ! $pic_upload_result = pic_upload_to_cat($otf_pic_path, $pic_file_names[$pic_cat][$i][$j], ucfirst($otf_pic_title), $pic_names[$pic_cat][$i][$j], $cat_to_upload, $otf_pic_time); ! ! if ($pic_upload_result) { $upload_counter++; } + else + { + pic_upload_to_cat($otf_pic_path, $pic_file_names[$pic_cat][$i][$j], ucfirst($otf_pic_title), $pic_names[$pic_cat][$i][$j], $cat_to_upload, $otf_pic_time); + } } $template->assign_block_vars('pic_row.pic_column', array( *************** *** 301,305 **** if ( ($upload_pics == true) && ($cat_to_upload > 0) ) { ! //$template->assign_block_vars('upload_confirm', array()); if ($upload_counter > 0) { --- 323,327 ---- if ( ($upload_pics == true) && ($cat_to_upload > 0) ) { ! $template->assign_block_vars('upload_confirm', array()); if ($upload_counter > 0) { *************** *** 352,359 **** $template->pparse('body'); ! if ( !$is_block ) ! { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } --- 374,381 ---- $template->pparse('body'); ! if (!$is_block ) ! { include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } *************** *** 361,368 **** function pic_upload_to_cat($otf_pic_path, $otf_pic_filename, $otf_pic_title, $otf_pic_des, $otf_pic_cat, $otf_pic_time) { ! global $db, $userdata, $pic_thumbnail; if (file_exists(ALBUM_UPLOAD_PATH . $otf_pic_filename)) { ! $otf_pic_filename = $otf_pic_filename . '_' . time() . '_' . mt_rand(100000, 999999); } if (file_exists(ALBUM_UPLOAD_PATH . $otf_pic_filename)) --- 383,391 ---- function pic_upload_to_cat($otf_pic_path, $otf_pic_filename, $otf_pic_title, $otf_pic_des, $otf_pic_cat, $otf_pic_time) { ! global $db, $mx_user, $userdata, $pic_thumbnail; ! if (file_exists(ALBUM_UPLOAD_PATH . $otf_pic_filename)) { ! $otf_pic_filename = time() . '_' . mt_rand(100000, 999999) . '_' . $otf_pic_filename; } if (file_exists(ALBUM_UPLOAD_PATH . $otf_pic_filename)) *************** *** 371,388 **** } ! if ($pic_thumbnail == '') { $pic_thumbnail = $otf_pic_filename; } ! if ($otf_pic_time == '') { $otf_pic_time = time(); } $otf_pic_username = $userdata['username']; ! $otf_pic_user_id = $userdata['user_id']; ! $otf_pic_user_ip = $userdata['session_ip']; $move_file = 'rename'; - //$move_file = 'copy'; //$move_file = 'move_uploaded_file'; $upload_success = $move_file($otf_pic_path, ALBUM_UPLOAD_PATH . $otf_pic_filename); --- 394,426 ---- } ! if (!$pic_thumbnail) { $pic_thumbnail = $otf_pic_filename; } ! if (!$otf_pic_time) { $otf_pic_time = time(); } + $otf_pic_username = $userdata['username']; ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! ! case 'phpbb2': ! ! $otf_pic_user_id = $userdata['user_id']; ! $otf_pic_user_ip = $userdata['session_ip']; ! break; ! ! case 'phpbb3': ! ! $otf_pic_user_id = $mx_user->data['user_id']; ! $otf_pic_user_ip = album_encode_ip($mx_user->data['session_ip']); ! break; ! } $move_file = 'rename'; //$move_file = 'move_uploaded_file'; $upload_success = $move_file($otf_pic_path, ALBUM_UPLOAD_PATH . $otf_pic_filename); *************** *** 393,402 **** $sql = "INSERT INTO " . ALBUM_TABLE . " (pic_filename, pic_thumbnail, pic_title, pic_desc, pic_user_id, pic_user_ip, pic_username, pic_time, pic_cat_id, pic_approval) VALUES ('$otf_pic_filename', '$pic_thumbnail', '$otf_pic_title', '$otf_pic_des', '$otf_pic_user_id', '$otf_pic_user_ip', '$otf_pic_username', '$otf_pic_time', '$otf_pic_cat', '1')"; ! if( !$result = $db->sql_query($sql) ) { return false; } } ! return true; } --- 431,452 ---- $sql = "INSERT INTO " . ALBUM_TABLE . " (pic_filename, pic_thumbnail, pic_title, pic_desc, pic_user_id, pic_user_ip, pic_username, pic_time, pic_cat_id, pic_approval) VALUES ('$otf_pic_filename', '$pic_thumbnail', '$otf_pic_title', '$otf_pic_des', '$otf_pic_user_id', '$otf_pic_user_ip', '$otf_pic_username', '$otf_pic_time', '$otf_pic_cat', '1')"; ! if(!$result = @$db->sql_query($sql)) { return false; } } ! else ! { ! @chmod(ALBUM_UPLOAD_PATH . $otf_pic_filename, 0777); ! $sql = "INSERT INTO " . ALBUM_TABLE . " (pic_filename, pic_thumbnail, pic_title, pic_desc, pic_user_id, pic_user_ip, pic_username, pic_time, pic_cat_id, pic_approval) ! VALUES ('$otf_pic_filename', '$pic_thumbnail', '$otf_pic_title', '$otf_pic_des', '$otf_pic_user_id', '$otf_pic_user_ip', '$otf_pic_username', '$otf_pic_time', '$otf_pic_cat', '1')"; ! if(!$result = @$db->sql_query($sql)) ! { ! mx_message_die(GENERAL_ERROR, 'Upload Failed, plus could not insert new entryes in album table', '', __LINE__, __FILE__, $sql); ! } ! ! print_r('Upload Failed, please upload missing files manualy via ftp. and change upload method.'); ! } ! return true; } |
|
From: FlorinCB <ory...@us...> - 2009-07-11 21:58:57
|
Update of /cvsroot/mxbb/core/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22251 Modified Files: bbcode.tpl Log Message: bbbcode upd Index: bbcode.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/bbcode.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bbcode.tpl 11 Jul 2009 18:17:07 -0000 1.6 --- bbcode.tpl 11 Jul 2009 21:58:44 -0000 1.7 *************** *** 73,79 **** <!-- 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}" --- 73,79 ---- <!-- BEGIN GVideo --> <div style="text-align:center;"> ! <object codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" id="flv_video" name="flv_video" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" align="center" height="500" width="640"> <param name="movie" value="http://video.google.com/googleplayer.swf?docId={GVIDEOID}"></param> ! <embed style="width:640px; height:500px;" id="VideoPlayback" align="middle" type="application/x-shockwave-flash" src="http://video.google.com/googleplayer.swf?docId={GVIDEOID}" *************** *** 82,86 **** </embed> </object><br /> ! <a href="http://video.google.com/googleplayer.swf?docId={GVIDEOID}" target="_blank">{GVIDEOLINK}</a><br /> </div> <!-- END GVideo --> --- 82,86 ---- </embed> </object><br /> ! <a href="http://video.google.com/googleplayer.swf?docId={GVIDEOID}" target="_blank">http://video.google.com/videoplay?docid={GVIDEOID}</a><br /> </div> <!-- END GVideo --> *************** *** 89,94 **** <div style="text-align:center;"> <center> ! <object width="640" height="500"> ! <param name="movie" value="http://www.youtube.com/v/{YOUTUBEID}"></param> <param name="quality" value="high"> <param name="play" value="true"> --- 89,94 ---- <div style="text-align:center;"> <center> ! <object codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" id="flv_video" name="flv_video" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" align="center" height="500" width="640"> ! <param name="movie" value="http://www.youtube.com/v/{YOUTUBEID}"></param> <param name="quality" value="high"> <param name="play" value="true"> *************** *** 110,114 **** <!-- BEGIN scribd --> <div style="text-align:center;"> ! <object codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" id="doc_326877108105255" name="doc_326877108105255" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" align="middle" height="500" width="100%"> <param name="movie" value="{SCRIBDURL}"> <param name="quality" value="high"> --- 110,114 ---- <!-- BEGIN scribd --> <div style="text-align:center;"> ! <object codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" id="{SCRIBDID}" name="{SCRIBDID}" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" height="500" width="640" align="center"> <param name="movie" value="{SCRIBDURL}"> <param name="quality" value="high"> |
|
From: FlorinCB <ory...@us...> - 2009-07-11 18:17:11
|
Update of /cvsroot/mxbb/core/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4908 Modified Files: bbcode.tpl Log Message: fix Index: bbcode.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/bbcode.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** bbcode.tpl 11 Jul 2009 04:25:41 -0000 1.5 --- bbcode.tpl 11 Jul 2009 18:17:07 -0000 1.6 *************** *** 110,114 **** <!-- BEGIN scribd --> <div style="text-align:center;"> ! <object codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" id="doc_326877108105255" name="doc_326877108105255" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" align="middle" height="500" width="100%"> <param name="movie" value="{SCRIBDURL}"> <param name="quality" value="high"> --- 110,114 ---- <!-- BEGIN scribd --> <div style="text-align:center;"> ! <object codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" id="doc_326877108105255" name="doc_326877108105255" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" align="middle" height="500" width="100%"> <param name="movie" value="{SCRIBDURL}"> <param name="quality" value="high"> |
|
From: FlorinCB <ory...@us...> - 2009-07-11 04:45:30
|
Update of /cvsroot/mxbb/mx_music/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2410 Modified Files: music_flv_body.tpl music_midi_body.tpl Log Message: templating Index: music_flv_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_flv_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** music_flv_body.tpl 8 Jul 2009 04:05:24 -0000 1.4 --- music_flv_body.tpl 11 Jul 2009 04:45:24 -0000 1.5 *************** *** 160,165 **** <!-- BEGIN flv --> ! <div id="flvplayer"> ! <object width="425" height="350" id="flvplayer" align="center"> <param name="allowScriptAccess" value="always" /> <param name="movie" value="{VIDEO_URL}" /> --- 160,165 ---- <!-- BEGIN flv --> ! <div id="flvplayer" style="text-align:center;"> ! <object codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" id="flvplayer" name="flvplayer" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" align="center" width="640" height="500" id="flvplayer"> <param name="allowScriptAccess" value="always" /> <param name="movie" value="{VIDEO_URL}" /> *************** *** 170,176 **** <param name="scale" value="noscale" /> <param name="salign" value="lt" /> ! <param name="bgcolor" value="000000" /> <param name="flashvars" value="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" /> ! <embed src="{VIDEO_URL}" flashvars="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="360" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> </object> </div> --- 170,176 ---- <param name="scale" value="noscale" /> <param name="salign" value="lt" /> ! <param name="bgcolor" value="#E3F0FB" /> <param name="flashvars" value="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" /> ! <embed src="{VIDEO_URL}" flashvars="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="360" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="#E3F0FB" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> </object> </div> Index: music_midi_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_music/templates/_core/music_midi_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** music_midi_body.tpl 2 Feb 2009 01:51:19 -0000 1.1 --- music_midi_body.tpl 11 Jul 2009 04:45:24 -0000 1.2 *************** *** 8,12 **** </tr> <tr> ! <td width="90%" class="row1" align="center"> <!-- BEGIN media --> <SCRIPT LANGUAGE="JavaScript"> --- 8,12 ---- </tr> <tr> ! <td width="100%" class="row1" align="center"> <!-- BEGIN media --> <SCRIPT LANGUAGE="JavaScript"> *************** *** 59,63 **** document.write (' <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"'); document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); document.write ('<PARAM NAME="url" VALUE="{U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{U_SONG}">'); --- 59,63 ---- document.write (' <object id="MediaPlayer" width={WIDTH} height={HEIGHT} classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"'); document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject" align="center">'); document.write ('<PARAM NAME="url" VALUE="{U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{U_SONG}">'); *************** *** 95,99 **** document.write (' <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject">'); document.write ('<PARAM NAME="url" VALUE="{U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{U_SONG}">'); --- 95,99 ---- document.write (' <object id="wmp" width={WIDTH} height={HEIGHT} classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); document.write ('codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,0,0"'); ! document.write ('standby="Loading Microsoft Windows Media Player components..." type="application/x-oleobject" align="center">'); document.write ('<PARAM NAME="url" VALUE="{U_SONG}">'); document.write ('<PARAM NAME="FileName" value="{U_SONG}">'); *************** *** 139,159 **** <!-- BEGIN flashvideo --> ! <embed src="{SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" flashvars=""> </embed> <!-- END flashvideo --> <!-- BEGIN youtube --> ! <object width="425" height="350"> <param name="movie" value="{VIDEO_URL}" /> <param name="wmode" value="transparent" /> <param name="allowfullscreen" value="true" /> <param name="flashvars" value="&rs=1&sn=1&iurl={U_IMG}" /> ! <embed src="{VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={U_IMG}" /> </object> <!-- END youtube --> <!-- BEGIN flv --> ! <div id="flvplayer"> ! <object width="425" height="350" id="flvplayer" align="center"> <param name="allowScriptAccess" value="always" /> <param name="movie" value="{VIDEO_URL}" /> --- 139,159 ---- <!-- BEGIN flashvideo --> ! <embed src="{SONG_URL}" id="VideoPlayback" type="application/x-shockwave-flash" wmode="transparent" width="640" height="350" flashvars=""> </embed> <!-- END flashvideo --> <!-- BEGIN youtube --> ! <object width="640" height="350"> <param name="movie" value="{VIDEO_URL}" /> <param name="wmode" value="transparent" /> <param name="allowfullscreen" value="true" /> <param name="flashvars" value="&rs=1&sn=1&iurl={U_IMG}" /> ! <embed src="{VIDEO_URL}" type="application/x-shockwave-flash" wmode="transparent" width="640" height="350" allowfullscreen="true" flashvars="&rs=1&sn=1&iurl={U_IMG}" /> </object> <!-- END youtube --> <!-- BEGIN flv --> ! <div style="text-align:center;" id="flvplayer"> ! <object width="640" height="350" id="flvplayer" align="center"> <param name="allowScriptAccess" value="always" /> <param name="movie" value="{VIDEO_URL}" /> *************** *** 166,170 **** <param name="bgcolor" value="000000" /> <param name="flashvars" value="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" /> ! <embed src="{VIDEO_URL}" flashvars="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="425" height="360" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> </object> </div> --- 166,170 ---- <param name="bgcolor" value="000000" /> <param name="flashvars" value="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" /> ! <embed src="{VIDEO_URL}" flashvars="file={SONG_URL}&image={U_IMG}&shuffleOnLoad=no" loop="false" allowfullscreen="true" menu="false" quality="high" width="640" height="360" scale="noscale" salign="lt" name="flvplayer" align="center" bgcolor="000000" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" /> </object> </div> *************** *** 172,182 **** <!-- BEGIN ram --> ! <embed src="{U_SONG}" align="center" ! width="275" height="40" type="audio/x-pn-realaudio-plugin" console="cons" ! controls="ControlPanel" autostart="false"></embed> <!-- END ram --> <!-- BEGIN qt --> ! <object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="377" height="212"> <param name="qtsrc" value="{U_SONG}"> <param name="autoplay" value="true"> --- 172,180 ---- <!-- BEGIN ram --> ! <embed src="{U_SONG}" align="center" width="640" height="40" type="audio/x-pn-realaudio-plugin" console="cons" controls="ControlPanel" autostart="false"></embed> <!-- END ram --> <!-- BEGIN qt --> ! <object id="qt" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab" width="640" height="212"> <param name="qtsrc" value="{U_SONG}"> <param name="autoplay" value="true"> *************** *** 185,189 **** <param name="kioskmode" value="true"> <param name="cache" value="false"> ! <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{U_SONG}" width="377" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="true" kioskmode="true" cache="false"> </embed> </object> --- 183,187 ---- <param name="kioskmode" value="true"> <param name="cache" value="false"> ! <embed src="templates/subSilver/images/uneedqt41.jpg" qtsrc="{U_SONG}" width="640" height="212" type="video/quicktime" pluginspage="http://www.apple.com/quicktime/download/" controller="true" loop="false" autoplay="true" kioskmode="true" cache="false"> </embed> </object> *************** *** 191,195 **** <!-- BEGIN img --> ! <a href="javascript:void(0);" onClick="window.open('{SONG_FULL_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{SONG_THUMB_URL}" id="image" type="image" width="425" height="350" border="1"></a> <!-- END img --> </td> --- 189,193 ---- <!-- BEGIN img --> ! <a href="javascript:void(0);" onClick="window.open('{SONG_FULL_URL}','','scrollbars=yes,resizable=no,width=804,height=610')"><img src="{SONG_THUMB_URL}" id="image" type="image" width="640" height="350" border="1"></a> <!-- END img --> </td> |
|
From: FlorinCB <ory...@us...> - 2009-07-11 04:25:48
|
Update of /cvsroot/mxbb/core/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32741/templates/_core Modified Files: bbcode.tpl Log Message: ?????????? Index: bbcode.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/bbcode.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** bbcode.tpl 11 Jul 2009 03:22:06 -0000 1.4 --- bbcode.tpl 11 Jul 2009 04:25:41 -0000 1.5 *************** *** 88,95 **** <!-- 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></div><br /> <!-- END youtube --> --- 88,108 ---- <!-- BEGIN youtube --> <div style="text-align:center;"> ! <center> ! <object width="640" height="500"> ! <param name="movie" value="http://www.youtube.com/v/{YOUTUBEID}"></param> ! <param name="quality" value="high"> ! <param name="play" value="true"> ! <param name="loop" value="true"> ! <param name="scale" value="showall"> ! <param name="wmode" value="opaque"> ! <param name="devicefont" value="false"> ! <param name="bgcolor" value="#ffffff"> ! <param name="menu" value="true"> ! <param name="allowFullScreen" value="true"> ! <param name="allowScriptAccess" value="always"> ! <param name="salign" value=""> ! <center><embed src="http://www.youtube.com/v/{YOUTUBEID}" type="application/x-shockwave-flash" width="640" height="500"></embed></center> ! </object> ! </center><br /> <a href="http://youtube.com/watch?v={YOUTUBEID}" target="_blank">{YOUTUBELINK}</a></div><br /> <!-- END youtube --> |
|
From: FlorinCB <ory...@us...> - 2009-07-11 04:25:47
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32741/includes/sessions/phpbb3 Modified Files: bbcode.php Log Message: ?????????? Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** bbcode.php 11 Jul 2009 03:50:32 -0000 1.9 --- bbcode.php 11 Jul 2009 04:25:41 -0000 1.10 *************** *** 513,516 **** --- 513,517 ---- 'flash' => array('{WIDTH}' => '$1', '{HEIGHT}' => '$2', '{URL}' => '$3'), 'scribd' => array('{WIDTH}' => '$1', '{HEIGHT}' => '$2', '{SCRIBDURL}' => '$3'), + 'youtube' => array('{YOUTUBEID}' => '$1', '{YOUTUBELINK}' => '$2', '{WIDTH}' => '$3', '{HEIGHT}' => '$4'), 'ipaper' => array('{IPAPERID}' => '$1', '{IPAPERKEY}' => '$2', '{WIDTH}' => '$3', '{HEIGHT}' => '$4', '{IPAPERLINK}' => '$5'), 'url' => array('{URL}' => '$1', '{DESCRIPTION}' => '$2'), *************** *** 731,734 **** --- 732,737 ---- $bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']); $bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['Link'], $bbcode_tpl['youtube']); + $bbcode_tpl['youtube'] = str_replace('{WIDTH}', '\\3', $bbcode_tpl['youtube']); + $bbcode_tpl['youtube'] = str_replace('{HEIGHT}', '\\4', $bbcode_tpl['youtube']); $bbcode_tpl['ipaper'] = str_replace('{IPAPERID}', '\\1', $bbcode_tpl['ipaper']); $bbcode_tpl['ipaper'] = str_replace('{IPAPERKEY}', '\\2', $bbcode_tpl['ipaper']); *************** *** 984,987 **** --- 987,993 ---- $text = $this->bbencode_first_pass_pda($text, $uid, '[ipaper]', '[/ipaper]', '', true, ''); + // [youtube] and [/youtube] for posting scribd embed bbcode in your posts. + $text = $this->bbencode_first_pass_pda($text, $uid, '[youtube]', '[/youtube]', '', true, ''); + // [scribd] and [/scribd] for posting scribd embed bbcode in your posts. $text = $this->bbencode_first_pass_pda($text, $uid, '[scribd]', '[/scribd]', '', false, ''); |
|
From: FlorinCB <ory...@us...> - 2009-07-11 03:50:40
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28888 Modified Files: bbcode.php Log Message: fix for last update Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** bbcode.php 11 Jul 2009 03:22:06 -0000 1.8 --- bbcode.php 11 Jul 2009 03:50:32 -0000 1.9 *************** *** 1482,1498 **** global $mx_page; ! $addional_header_text = ""; ! $header_text = '<script type="text/javascript" src="http://www.scribd.com/javascripts/view.js"></script>'."\n"; ! $header_text = '<script type="text/javascript">'."\n"; ! $header_text = '<!--'."\n"; ! $header_text = 'function iPaper(docId, access_key, height, width) {'."\n"; ! $header_text = 'var scribd_doc = scribd.Document.getDoc(docId, access_key);'."\n"; ! $header_text = 'scribd_doc.addParam(\'height\', height);'."\n"; ! $header_text = 'scribd_doc.addParam(\'width\', width);'."\n"; ! $header_text = 'scribd_doc.write(\'embedded_flash\');'."\n"; ! $header_text = '}'."\n"; ! $header_text = '//-->'."\n"; ! $header_text = '</script>'; $addional_header_text .= "\n"."\n".$header_text; --- 1482,1498 ---- global $mx_page; ! $addional_header_text = $header_text = ""; ! $header_text .= '<script type="text/javascript" src="http://www.scribd.com/javascripts/view.js"></script>'."\n"; ! $header_text .= '<script type="text/javascript">'."\n"; ! $header_text .= '<!--'."\n"; ! $header_text .= 'function iPaper(docId, access_key, height, width) {'."\n"; ! $header_text .= 'var scribd_doc = scribd.Document.getDoc(docId, access_key);'."\n"; ! $header_text .= 'scribd_doc.addParam(\'height\', height);'."\n"; ! $header_text .= 'scribd_doc.addParam(\'width\', width);'."\n"; ! $header_text .= 'scribd_doc.write(\'embedded_flash\');'."\n"; ! $header_text .= '}'."\n"; ! $header_text .= '//-->'."\n"; ! $header_text .= '</script>'; $addional_header_text .= "\n"."\n".$header_text; *************** *** 1501,1521 **** if (is_object($mx_page)) { ! $mx_page->add_header_text($header_text); ! ! die("test"); ! } ! else ! { ! echo '<script type="text/javascript" src="http://www.scribd.com/javascripts/view.js"></script>'."\n"; ! echo '<script type="text/javascript">'."\n"; ! echo '<!--'."\n"; ! echo 'function iPaper(docId, access_key, height, width) {'."\n"; ! echo 'var scribd_doc = scribd.Document.getDoc(docId, access_key);'."\n"; ! echo 'scribd_doc.addParam(\'height\', height);'."\n"; ! echo 'scribd_doc.addParam(\'width\', width);'."\n"; ! echo 'scribd_doc.write(\'embedded_flash\');'."\n"; ! echo '}'."\n"; ! echo '//-->'."\n"; ! echo '</script>'; } } --- 1501,1505 ---- if (is_object($mx_page)) { ! $mx_page->add_header_text($addional_header_text); } } |
|
From: FlorinCB <ory...@us...> - 2009-07-11 03:22:24
|
Update of /cvsroot/mxbb/core/includes/sessions/phpbb3 In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23243/core/includes/sessions/phpbb3 Modified Files: bbcode.php Log Message: some fixes not commited Index: bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** bbcode.php 25 Feb 2009 10:45:48 -0000 1.7 --- bbcode.php 11 Jul 2009 03:22:06 -0000 1.8 *************** *** 60,63 **** --- 60,69 ---- var $template_bitfield; var $template_filename = ''; + + var $site_url = ''; + var $document_id = ''; + var $access_key = ''; + var $height = 0; + var $width = 0; /** *************** *** 371,375 **** ); break; ! default: if (isset($rowset[$bbcode_id])) --- 377,382 ---- ); break; ! ! default: if (isset($rowset[$bbcode_id])) *************** *** 400,404 **** { // Default template ! $bbcode_tpl = (!empty($rowset[$bbcode_id]['second_pass_replace'])) ? $rowset[$bbcode_id]['second_pass_replace'] : $rowset[$bbcode_id]['bbcode_tpl']; } --- 407,411 ---- { // Default template ! $bbcode_tpl = ($rowset[$bbcode_id]['second_pass_replace']) ? $rowset[$bbcode_id]['second_pass_replace'] : $rowset[$bbcode_id]['bbcode_tpl']; } *************** *** 487,491 **** } } ! return (isset($this->bbcode_template[$tpl_name])) ? $this->bbcode_template[$tpl_name] : ((isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false); } --- 494,499 ---- } } ! ! return (isset($this->bbcode_template[$tpl_name])) ? $this->bbcode_template[$tpl_name] : ((isset($bbcode_hardtpl[$tpl_name])) ? $bbcode_hardtpl[$tpl_name] : false); } *************** *** 503,508 **** 'size' => array('{SIZE}' => '$1', '{TEXT}' => '$2'), 'img' => array('{URL}' => '$1'), ! 'flash' => array('{WIDTH}' => '$1', '{HEIGHT}' => '$2', '{URL}' => '$3'), 'url' => array('{URL}' => '$1', '{DESCRIPTION}' => '$2'), 'email' => array('{EMAIL}' => '$1', '{DESCRIPTION}' => '$2') ); --- 511,519 ---- 'size' => array('{SIZE}' => '$1', '{TEXT}' => '$2'), 'img' => array('{URL}' => '$1'), ! 'flash' => array('{WIDTH}' => '$1', '{HEIGHT}' => '$2', '{URL}' => '$3'), ! 'scribd' => array('{WIDTH}' => '$1', '{HEIGHT}' => '$2', '{SCRIBDURL}' => '$3'), ! 'ipaper' => array('{IPAPERID}' => '$1', '{IPAPERKEY}' => '$2', '{WIDTH}' => '$3', '{HEIGHT}' => '$4', '{IPAPERLINK}' => '$5'), 'url' => array('{URL}' => '$1', '{DESCRIPTION}' => '$2'), + 'size' => array('{ID}' => '$1', '{TEXT}' => '$2'), 'email' => array('{EMAIL}' => '$1', '{DESCRIPTION}' => '$2') ); *************** *** 625,628 **** --- 636,640 ---- return $code; } + /** *************** *** 672,675 **** --- 684,688 ---- function prepare_bbcode_template($bbcode_tpl) { + global $document_id, $access_key, $height, $width; global $lang; *************** *** 718,721 **** --- 731,743 ---- $bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']); $bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['Link'], $bbcode_tpl['youtube']); + $bbcode_tpl['ipaper'] = str_replace('{IPAPERID}', '\\1', $bbcode_tpl['ipaper']); + $bbcode_tpl['ipaper'] = str_replace('{IPAPERKEY}', '\\2', $bbcode_tpl['ipaper']); + $bbcode_tpl['ipaper'] = str_replace('{WIDTH}', '\\3', $bbcode_tpl['ipaper']); + $bbcode_tpl['ipaper'] = str_replace('{HEIGHT}', '\\4', $bbcode_tpl['ipaper']); + $bbcode_tpl['ipaper'] = str_replace('{IPAPERLINK}', '\\5', $bbcode_tpl['ipaper']); + //$bbcode_tpl['scribd'] = str_replace('{WIDTH}', '\\1', $bbcode_tpl['scribd']); + //$bbcode_tpl['scribd'] = str_replace('{HEIGHT}', '\\2', $bbcode_tpl['scribd']); + $bbcode_tpl['scribd'] = str_replace('{SCRIBDID}', '\\1', $bbcode_tpl['scribd']); + $bbcode_tpl['scribd'] = str_replace('{SCRIBDURL}', $lang['Link'], $bbcode_tpl['scribd']); //Stop more bbcode *************** *** 766,770 **** //$text = str_replace(array("\n", "\r"), array('<br />', "\n"), $text); ! $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); --- 788,792 ---- //$text = str_replace(array("\n", "\r"), array('<br />', "\n"), $text); ! $text = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $text); *************** *** 790,797 **** $bbcode_tpl = $this->prepare_bbcode_template($bbcode_tpl); } ! // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. $text = $this->bbencode_second_pass_code($text, $uid, $bbcode_tpl); ! // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. $text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text); --- 812,822 ---- $bbcode_tpl = $this->prepare_bbcode_template($bbcode_tpl); } ! // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. $text = $this->bbencode_second_pass_code($text, $uid, $bbcode_tpl); ! ! // [IPAPER] and [/IPAPER] for posting iPaper in your posts. ! $text = $this->bbencode_ipaper_pass_render($text, $uid, $bbcode_tpl); ! // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. $text = str_replace("[quote:$uid]", $bbcode_tpl['quote_open'], $text); *************** *** 877,881 **** $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.. --- 902,905 ---- *************** *** 883,892 **** $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); --- 907,931 ---- $replacements[] = $bbcode_tpl['GVideo']; ! // [youtube]www.youtube.com[/youtube] ! $patterns[] = "#\[youtube\]http://(?:www\.)?youtube.com/watch\?v=([0-9A-Za-z-_]{11})[^[]*\[/youtube\]#is"; $replacements[] = $bbcode_tpl['youtube']; ! // [youtube=xxxx://www.youtube.com]Youtube[/youtube] code.. ! //$patterns[] = "#\[youtube=http://(?:www\.)?youtube.com/watch\?v=([0-9A-Za-z-_]{11})]([^?\n\r\t].*?)\[/youtube\]#is"; ! //$replacements[] = $bbcode_tpl['youtube']; ! ! // [scribd]Scribd URL[/scribd] code.. ! $patterns[] = "#\[scribd\]http://(?:d\.)?scribd.com/ScribdViewer.swf\?document_id=([0-9A-Za-z-_]*)[^[]*\[/scribd\]#is"; ! $replacements[] = $bbcode_tpl['scribd']; ! ! // [scribd]Scribd URL[/scribd] code.. ! $patterns[] = "#\[scribd id=([0-9A-Za-z-_]{8}) key=([0-9A-Za-z-_]{24})\](.*?)\[/scribd\]#is"; ! $replacements[] = $bbcode_tpl['scribd']; ! ! // [ipaper]Scribd URL[/ipaper] code.. ! $patterns[] = "#\[ipaper\]http://(?:d\.)?scribd.com/ScribdViewer.swf\?document_id=([0-9A-Za-z-_]*)\&access_key=([0-9A-Za-z-_]*)[^[]*\[/ipaper\]#is"; ! $replacements[] = $bbcode_tpl['ipaper']; + //Stop more bbcode $text = preg_replace($patterns, $replacements, $text); *************** *** 937,945 **** // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. $text = $this->bbencode_first_pass_pda($text, $uid, '[code]', '[/code]', '', true, ''); ! // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. $text = $this->bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, ''); $text = $this->bbencode_first_pass_pda($text, $uid, '/\[quote=\\\\"(.*?)\\\\"\]/is', '[/quote]', '', false, '', "[quote:$uid=\\\"\\1\\\"]"); // [list] and [list=x] for (un)ordered lists. $open_tag = array(); --- 976,991 ---- // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. $text = $this->bbencode_first_pass_pda($text, $uid, '[code]', '[/code]', '', true, ''); ! // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. $text = $this->bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, ''); $text = $this->bbencode_first_pass_pda($text, $uid, '/\[quote=\\\\"(.*?)\\\\"\]/is', '[/quote]', '', false, '', "[quote:$uid=\\\"\\1\\\"]"); + // [ipaper] and [/ipaper] for posting scribd embed bbcode in your posts. + $text = $this->bbencode_first_pass_pda($text, $uid, '[ipaper]', '[/ipaper]', '', true, ''); + + // [scribd] and [/scribd] for posting scribd embed bbcode in your posts. + $text = $this->bbencode_first_pass_pda($text, $uid, '[scribd]', '[/scribd]', '', false, ''); + $text = $this->bbencode_first_pass_pda($text, $uid, '/\[scribd\\\\id=([0-9A-Za-z-_]{8})\\\\key=([0-9A-Za-z-_]{24})\](.*?)\]/is', '[/scribd]', '', false, '', "[scribd:$uid=\\\id=\\1\\\key=\\2\\\]"); + // [list] and [list=x] for (un)ordered lists. $open_tag = array(); *************** *** 978,982 **** // [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); --- 1024,1031 ---- // [stream]Sound URL[/stream] code.. $text = preg_replace("#\[stream\](.*?)\[/stream\]#si", "[stream:$uid]\\1[/stream:$uid]", $text); ! ! // [scribd width=X height=X]Scribd URL[/scribd] code.. ! $text = preg_replace("#\[scribd width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9])\](([a-z]+?)://([^, \n\r]+))\[\/scribd\]#si","[scribd width=\\1 height=\\2:$uid\]\\3[/scribd:$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); *************** *** 990,994 **** return substr($text, 1);; ! } // bbencode_first_pass() /** --- 1039,1044 ---- return substr($text, 1);; ! } // bbencode_first_pass() ! /** *************** *** 1303,1308 **** } // bbencode_second_pass_code() - //phpBB Temporary code ends /** --- 1353,1524 ---- } // bbencode_second_pass_code() + + /** + * Rewritten by Florin C Bodin - July 10, 2009. + * Description: Pass Embed Scibd iPaper in a post Pass + * Version: 0.2 + * Original Author: Stuart Marsh + * Author URI: http://www.beardygeek.com + * This should be used before displaying the message. + */ + function bbencode_ipaper_pass_render($text, $uid, $bbcode_tpl) + { + global $document_id, $access_key, $height, $width; + global $lang; + + $params = array('document_id','access_key','height','width'); + + $ipaper_start_html = $bbcode_tpl['ipaper_open']; + $ipaper_end_html = $bbcode_tpl['ipaper_close']; + + // First, do all the 1st-level matches. + $match_count = preg_match_all("#\[ipaper:1:$uid\](.*?)\[/ipaper:1:$uid\]#si", $text, $matches); + + for ($i = 0; $i < $match_count; $i++) + { + + $before_replace = $matches[1][$i]; + $after_replace = $matches[1][$i]; + + //Remove ipaper open and close bbcode tags. + $before_replace = str_replace(array($ipaper_start_html, $ipaper_end_html), "", $before_replace); + $after_replace = str_replace(array($ipaper_start_html, $ipaper_end_html), "", $after_replace); + $after_replace = str_replace(array('”','″'), '', $after_replace); + + // Then, do the 2nd-level matches. + $total = preg_match_all("|([^?&#=]+)=([^?&#=]+)(#{0,}[^?&#=]*)|", $after_replace, $attributes, PREG_SET_ORDER); + + if ($total) + { + $this->ipaper_head(); + } + + $arguments[] = array(); + + foreach ((array) $attributes as $elem) + { + if(!in_array($elem[$i], $params)) + { + $arguments[$elem[1]] = $elem[2]; + } + } + + if ((!array_key_exists('document_id', $arguments)) && (!array_key_exists('access_key', $arguments))) + { + return '<div style="background-color:#f99; padding:10px;">Error: Required parameter "docId" or "access_key" is missing!</div>'; + } + + // First, do all the 1st-level matches. + if (array_key_exists('document_id', $arguments)) + { + $document_id = $arguments['document_id']; + } + else + { + $document_id = ''; + } + + if (array_key_exists('access_key', $arguments)) + { + $access_key = $arguments['access_key']; + } + else + { + $access_key = 'key-'; + } + + if (array_key_exists('height', $arguments)) + { + $height = $arguments['height']; + } + else + { + $height = 600; + } + + if (array_key_exists('width', $arguments)) + { + $width = $arguments['width']; + } + else + { + $width = 400; + } + + $after_replace = ''; + $after_replace .= "\n".'<p id="embedded_flash" style="text-align: center;"><a href="http://www.scribd.com">Scribd</a></p>'."\n"; + $after_replace .= '<script type="text/javascript">iPaper('.$document_id.', \''.$access_key.'\', '.$height.', '.$width.');</script>'."\n"; + + $str_to_match = "[ipaper:1:$uid]" . $before_replace . "[/ipaper:1:$uid]"; + + $replacement = $ipaper_start_html . $after_replace . $ipaper_end_html; + + $text = str_replace($str_to_match, $replacement, $text); + + } + + // Now, do all the non-first-level matches. These are simple. + $text = str_replace("[ipaper:$uid]", $ipaper_start_html, $text); + $text = str_replace("[/ipaper:$uid]", $ipaper_end_html, $text); + + return $text; + + } //bbencode_ipaper_pass_render() + + + function ipaper_head() + { + // ------------------------------------------------------------------------- + // Extend page with additional header or footer data + // Examples: + // $mx_page->add_css_file(); // Include style dependent *.css file, eg module_path/template_path/template/theme.css + // $mx_page->add_js_file( 'includes/js.js' ); // Relative to module_root + // $mx_page->add_header_text( 'header text' ); + // $mx_page->add_footer_text( 'includes/test.txt', true ); // Relative to module_root + // Note: Included text from file (last example), will evaluate $theme and $mx_block->info variables. + // ------------------------------------------------------------------------- + + global $document_id, $access_key, $height, $width; + global $mx_page; + + $addional_header_text = ""; + + $header_text = '<script type="text/javascript" src="http://www.scribd.com/javascripts/view.js"></script>'."\n"; + $header_text = '<script type="text/javascript">'."\n"; + $header_text = '<!--'."\n"; + $header_text = 'function iPaper(docId, access_key, height, width) {'."\n"; + $header_text = 'var scribd_doc = scribd.Document.getDoc(docId, access_key);'."\n"; + $header_text = 'scribd_doc.addParam(\'height\', height);'."\n"; + $header_text = 'scribd_doc.addParam(\'width\', width);'."\n"; + $header_text = 'scribd_doc.write(\'embedded_flash\');'."\n"; + $header_text = '}'."\n"; + $header_text = '//-->'."\n"; + $header_text = '</script>'; + + $addional_header_text .= "\n"."\n".$header_text; + + + if (is_object($mx_page)) + { + $mx_page->add_header_text($header_text); + + die("test"); + } + else + { + echo '<script type="text/javascript" src="http://www.scribd.com/javascripts/view.js"></script>'."\n"; + echo '<script type="text/javascript">'."\n"; + echo '<!--'."\n"; + echo 'function iPaper(docId, access_key, height, width) {'."\n"; + echo 'var scribd_doc = scribd.Document.getDoc(docId, access_key);'."\n"; + echo 'scribd_doc.addParam(\'height\', height);'."\n"; + echo 'scribd_doc.addParam(\'width\', width);'."\n"; + echo 'scribd_doc.write(\'embedded_flash\');'."\n"; + echo '}'."\n"; + echo '//-->'."\n"; + echo '</script>'; + } + } /** *************** *** 1389,1392 **** --- 1605,1609 ---- $mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield); } + if ($smilies_on && $phpbb3_text) { *************** *** 1396,1402 **** { $mytext = $this->smilies_pass($mytext); } ! $mytext = str_replace("\n", "\n<br />\n", $mytext); ! return $this->make_clickable($mytext); } --- 1613,1626 ---- { $mytext = $this->smilies_pass($mytext); + } + + //$mytext = str_replace("\n", "\n<br />\n", $mytext); + + if ($mytext != '') + { + $mytext = $this->make_clickable($mytext); } ! ! return $mytext; } |
|
From: FlorinCB <ory...@us...> - 2009-07-11 03:22:15
|
Update of /cvsroot/mxbb/core/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23243/core/templates/_core Modified Files: bbcode.tpl Added Files: confirm_body.tpl Log Message: some fixes not commited --- NEW FILE: confirm_body.tpl --- <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> <td class="nav" align="left"><a class="nav" href="{U_INDEX}">{L_INDEX}</a></td> </tr> </table> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0"> <tr> <th class="thHead" height="25" valign="middle">{MESSAGE_TITLE}</th> </tr> <tr> <td class="row1" align="center"><form action="{S_CONFIRM_ACTION}" method="post"><span class="gen"><br />{MESSAGE_TEXT}<br /><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{L_YES}" class="mainoption" /> <input type="submit" name="cancel" value="{L_NO}" class="liteoption" /></span></form></td> </tr> </table> <br clear="all" /> Index: bbcode.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/bbcode.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bbcode.tpl 18 Jun 2008 11:44:08 -0000 1.3 --- bbcode.tpl 11 Jul 2009 03:22:06 -0000 1.4 *************** *** 95,98 **** --- 95,141 ---- <!-- END youtube --> + <!-- BEGIN scribd --> + <div style="text-align:center;"> + <object codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" id="doc_326877108105255" name="doc_326877108105255" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" align="middle" height="500" width="100%"> + <param name="movie" value="{SCRIBDURL}"> + <param name="quality" value="high"> + <param name="play" value="true"> + <param name="loop" value="true"> + <param name="scale" value="showall"> + <param name="wmode" value="opaque"> + <param name="devicefont" value="false"> + <param name="bgcolor" value="#ffffff"> + <param name="menu" value="true"> + <param name="allowFullScreen" value="true"> + <param name="allowScriptAccess" value="always"> + <param name="salign" value=""> + <embed src="{SCRIBDURL}" quality="high" pluginspage="http://www.macromedia.com/go/getflashplayer" play="true" loop="true" scale="showall" wmode="opaque" devicefont="false" bgcolor="#ffffff" name="doc_326877108105255_object" menu="true" allowfullscreen="true" allowscriptaccess="always" salign="" type="application/x-shockwave-flash" align="middle" height="500" width="100%"></embed> + </object> + <a title="View Article / Book" href="{SCRIBDURL}" style="margin: 12px auto 6px auto; font-family: Helvetica,Arial,Sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 14px; line-height: normal; font-size-adjust: none; font-stretch: normal; -x-system-font: none; display: block; text-decoration: underline;">View Article / Book</a> + </div><br /> + <!-- END scribd --> + + <!-- BEGIN ipaper --> + <div style="text-align:center;"> + <script type="text/javascript" src="http://www.scribd.com/javascripts/view.js"></script> + <script type="text/javascript"> + <!-- // + var docId = '{IPAPERID}'; + var access_key = '{IPAPERKEY}'; + var height = '{HEIGHT}'; + var width = '{WIDTH}'; + + function iPaper(docId, access_key, height, width) { + var scribd_doc = scribd.Document.getDoc(docId, access_key); + scribd_doc.addParam('height', height); + scribd_doc.addParam('width', width); + scribd_doc.write('embedded_flash'); + } + //--> + </script> + <a title="View Article / Book" href="{URL}" style="margin: 12px auto 6px auto; font-family: Helvetica,Arial,Sans-serif; font-style: normal; font-variant: normal; font-weight: normal; font-size: 14px; line-height: normal; font-size-adjust: none; font-stretch: normal; -x-system-font: none; display: block; text-decoration: underline;">View Article / Book</a> + </div><br /> + <!-- END ipaper --> + <!-- BEGIN stream --> <div style="text-align:center;"> *************** *** 125,128 **** --- 168,172 ---- <span style="height: 1; Filter: Alpha(Opacity=100, FinishOpacity=0, Style=1, StartX=0, FinishX=100%)"> <!-- END fade_open --> + <!-- BEGIN fade_close --> </span> |
|
From: FlorinCB <ory...@us...> - 2009-07-11 03:22:14
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23243/core/modules/mx_phpbb3blocks Modified Files: mx_last_msg.php Log Message: some fixes not commited Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/mx_last_msg.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_last_msg.php 31 Oct 2008 18:55:36 -0000 1.6 --- mx_last_msg.php 11 Jul 2009 03:22:06 -0000 1.7 *************** *** 19,22 **** --- 19,24 ---- // =================================================== require_once($module_root_path .'includes/phpbb3blocks_constants.'. $phpEx); + require_once($mx_root_path . 'includes/mx_functions_tools.' . $phpEx); + $mx_text_formatting = new mx_text_formatting(); // *************** *** 218,222 **** $message = $postrow[$row_count]['topic_title']; ! $url = mx_append_sid(PHPBB_URL . 'viewtopic.' . $phpEx . '?' . 'f=' . $postrow[$row_count]['forum_id'] . '&lmsg_start='. $msg_start .'&t='. $postrow[$row_count]['topic_id'] .'#'. $postrow[$row_count]['topic_last_post_id']); --- 220,228 ---- $message = $postrow[$row_count]['topic_title']; ! $bbcode_uid = $postrow[$row_count]['bbcode_uid']; ! $bbcode_bitfield = $postrow[$row_count]['bbcode_bitfield'] ? $postrow[$row_count]['bbcode_bitfield'] : true; ! ! $message = $mx_bbcode->decode($message, $bbcode_uid, true, $bbcode_bitfield); ! $url = mx_append_sid(PHPBB_URL . 'viewtopic.' . $phpEx . '?' . 'f=' . $postrow[$row_count]['forum_id'] . '&lmsg_start='. $msg_start .'&t='. $postrow[$row_count]['topic_id'] .'#'. $postrow[$row_count]['topic_last_post_id']); *************** *** 377,385 **** if (strlen($message) > $nb_characteres) { ! $message = substr($message, 0, $nb_characteres); ! $position_espace = strrpos($message,''); ! ! $position_espace = empty($position_espace) ? $nb_characteres : $position_espace; ! $message = substr($message, 0, $position_espace); $message .='...'; } --- 383,387 ---- if (strlen($message) > $nb_characteres) { ! $message = $mx_text_formatting->truncate_text($message, $nb_characteres, true); $message .='...'; } *************** *** 406,414 **** if ( strlen($forum_name) > $nb_characteres ) { ! $forum_name = substr($forum_name, 0, $nb_characteres); ! $position_espace = strrpos($forum_name,''); ! ! $position_espace = empty($position_espace) ? $nb_characteres : $position_espace; ! $forum_name = substr($forum_name, 0, $position_espace); $forum_name .='...'; } --- 408,412 ---- if ( strlen($forum_name) > $nb_characteres ) { ! $forum_name = $mx_text_formatting->truncate_text($forum_name, $nb_characteres, true); $forum_name .='...'; } |
|
From: FlorinCB <ory...@us...> - 2009-07-11 03:22:14
|
Update of /cvsroot/mxbb/core/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23243/core/includes Modified Files: mx_functions_bbcode.php mx_functions_tools.php Log Message: some fixes not commited Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** mx_functions_tools.php 8 Dec 2008 23:57:18 -0000 1.52 --- mx_functions_tools.php 11 Jul 2009 03:22:06 -0000 1.53 *************** *** 165,171 **** if ($text != '' && $bbcode_uid != '') { ! $text = ($this->bbcode_on) ? $mx_bbcode->bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text); } ! if ( $text != '' ) { --- 165,173 ---- if ($text != '' && $bbcode_uid != '') { ! //$text = ($this->bbcode_on) ? $mx_bbcode->bbencode_second_pass($text, $bbcode_uid) : preg_replace("/\:$bbcode_uid/si", '', $text); ! $text = ($this->bbcode_on) ? $mx_bbcode->decode($text, $bbcode_uid): preg_replace("/\:$bbcode_uid/si", '', $text); } ! ! /* if ( $text != '' ) { *************** *** 183,187 **** } } ! // // Highlight active words (primarily for search) --- 185,190 ---- } } ! */ ! // // Highlight active words (primarily for search) Index: mx_functions_bbcode.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mx_functions_bbcode.php 6 Nov 2008 00:45:27 -0000 1.17 --- mx_functions_bbcode.php 11 Jul 2009 03:22:06 -0000 1.18 *************** *** 121,125 **** //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']); --- 121,125 ---- //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']); *************** *** 132,135 **** --- 132,141 ---- $bbcode_tpl['youtube'] = str_replace('{YOUTUBEID}', '\\1', $bbcode_tpl['youtube']); $bbcode_tpl['youtube'] = str_replace('{YOUTUBELINK}', $lang['Link'], $bbcode_tpl['youtube']); + $bbcode_tpl['ipaper'] = str_replace('{IPAPERID}', '\\1', $bbcode_tpl['ipaper']); + $bbcode_tpl['ipaper'] = str_replace('{IPAPERKEY}', '\\2', $bbcode_tpl['ipaper']); + $bbcode_tpl['ipaper'] = str_replace('{HEIGHT}', '\\3', $bbcode_tpl['ipaper']); + $bbcode_tpl['ipaper'] = str_replace('{WIDTH}', '\\4', $bbcode_tpl['ipaper']); + $bbcode_tpl['ipaper'] = str_replace('{IPAPERLINK}', $lang['Link'], $bbcode_tpl['ipaper']); + $bbcode_tpl['scribd'] = str_replace('{SCRIBDURL}', $lang['Link'], $bbcode_tpl['scribd']); //Stop more bbcode *************** *** 269,278 **** $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); --- 275,299 ---- $replacements[] = $bbcode_tpl['GVideo']; ! // [youtube]www.youtube.com[/youtube] ! $patterns[] = "#\[youtube\]http://(?:www\.)?youtube.com/watch\?v=([0-9A-Za-z-_]{11})[^[]*\[/youtube\]#is"; $replacements[] = $bbcode_tpl['youtube']; ! // [youtube=xxxx://www.youtube.com]Youtube[/youtube] code.. ! //$patterns[] = "#\[youtube=http://(?:www\.)?youtube.com/watch\?v=([0-9A-Za-z-_]{11})]([^?\n\r\t].*?)\[/youtube\]#is"; ! //$replacements[] = $bbcode_tpl['youtube']; ! ! // [scribd]Scribd URL[/scribd] code.. ! $patterns[] = "#\[scribd\](.*?)\[/scribd\]#si"; ! $replacements[] = $bbcode_tpl['scribd']; + // [scribd]Scribd URL[/scribd] code.. + $patterns[] = "#\[scribd id=([0-9A-Za-z-_]{8}) key=([0-9A-Za-z-_]{24})\](.*?)\[/scribd\]#is"; + $replacements[] = $bbcode_tpl['scribd']; + + // [ipaper]Scribd URL[/ipaper] code.. + $patterns[] = "#\[ipaper\]http://(?:d\.)?scribd.com/ScribdViewer.swf\?document_id=([0-9A-Za-z-_]*)\&access_key=([0-9A-Za-z-_]*)[^[]*\[/ipaper\]#is"; + $replacements[] = $bbcode_tpl['ipaper']; + + //Stop more bbcode $text = preg_replace($patterns, $replacements, $text); *************** *** 323,331 **** // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. $text = $this->bbencode_first_pass_pda($text, $uid, '[code]', '[/code]', '', true, ''); ! // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. $text = $this->bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, ''); $text = $this->bbencode_first_pass_pda($text, $uid, '/\[quote=\\\\"(.*?)\\\\"\]/is', '[/quote]', '', false, '', "[quote:$uid=\\\"\\1\\\"]"); // [list] and [list=x] for (un)ordered lists. $open_tag = array(); --- 344,359 ---- // [CODE] and [/CODE] for posting code (HTML, PHP, C etc etc) in your posts. $text = $this->bbencode_first_pass_pda($text, $uid, '[code]', '[/code]', '', true, ''); ! // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. $text = $this->bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, ''); $text = $this->bbencode_first_pass_pda($text, $uid, '/\[quote=\\\\"(.*?)\\\\"\]/is', '[/quote]', '', false, '', "[quote:$uid=\\\"\\1\\\"]"); + // [ipaper] and [/ipaper] for posting scribd embed bbcode in your posts. + $text = $this->bbencode_first_pass_pda($text, $uid, '[ipaper]', '[/ipaper]', '', true, ''); + + // [scribd] and [/scribd] for posting scribd embed bbcode in your posts. + $text = $this->bbencode_first_pass_pda($text, $uid, '[scribd]', '[/scribd]', '', false, ''); + $text = $this->bbencode_first_pass_pda($text, $uid, '/\[scribd\\\\id=([0-9A-Za-z-_]{8})\\\\key=([0-9A-Za-z-_]{24})\](.*?)\]/is', '[/scribd]', '', false, '', "[scribd:$uid=\\\id=\\1\\\key=\\2\\\]"); + // [list] and [list=x] for (un)ordered lists. $open_tag = array(); *************** *** 361,369 **** //Start more bbcode $text = str_replace('url:' . $uid, 'url', $text); - $text = str_replace('web:' . $uid, 'web', $text); // [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); --- 389,399 ---- //Start more bbcode $text = str_replace('url:' . $uid, 'url', $text); // [stream]Sound URL[/stream] code.. $text = preg_replace("#\[stream\](.*?)\[/stream\]#si", "[stream:$uid]\\1[/stream:$uid]", $text); ! ! // [scribd width=X height=X]Scribd URL[/scribd] code.. ! $text = preg_replace("#\[scribd width=([0-6]?[0-9]?[0-9]) height=([0-4]?[0-9]?[0-9])\](([a-z]+?)://([^, \n\r]+))\[\/scribd\]#si","[scribd width=\\1 height=\\2:$uid\]\\3[/scribd:$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); *************** *** 377,381 **** return substr($text, 1);; ! } // bbencode_first_pass() /** --- 407,411 ---- return substr($text, 1);; ! } // bbencode_first_pass() /** *************** *** 692,695 **** --- 722,837 ---- //phpBB Temporary code ends + + /** + * Rewritten by Florin C Bodin - July 10, 2009. + * Description: Pass Embed Scibd iPaper in a post Pass + * Version: 0.2 + * Original Author: Stuart Marsh + * Author URI: http://www.beardygeek.com + * This should be used before displaying the message. + */ + function bbencode_ipaper_pass_render($text, $uid, $bbcode_tpl) + { + global $document_id, $access_key, $height, $width; + global $lang; + + $params = array('document_id','access_key','height','width'); + + $ipaper_start_html = $bbcode_tpl['ipaper_open']; + $ipaper_end_html = $bbcode_tpl['ipaper_close']; + + // First, do all the 1st-level matches. + $match_count = preg_match_all("#\[ipaper:1:$uid\](.*?)\[/ipaper:1:$uid\]#si", $text, $matches); + + for ($i = 0; $i < $match_count; $i++) + { + + $before_replace = $matches[1][$i]; + $after_replace = $matches[1][$i]; + + //Remove ipaper open and close bbcode tags. + $before_replace = str_replace(array($ipaper_start_html, $ipaper_end_html), "", $before_replace); + $after_replace = str_replace(array($ipaper_start_html, $ipaper_end_html), "", $after_replace); + $after_replace = str_replace(array('”','″'), '', $after_replace); + + // Then, do the 2nd-level matches. + $total = preg_match_all("|([^?&#=]+)=([^?&#=]+)(#{0,}[^?&#=]*)|", $after_replace, $attributes, PREG_SET_ORDER); + + if ($total) + { + $this->ipaper_head(); + } + + $arguments[] = array(); + + foreach ((array) $attributes as $elem) + { + if(!in_array($elem[$i], $params)) + { + $arguments[$elem[1]] = $elem[2]; + } + } + + if ((!array_key_exists('document_id', $arguments)) && (!array_key_exists('access_key', $arguments))) + { + return '<div style="background-color:#f99; padding:10px;">Error: Required parameter "docId" or "access_key" is missing!</div>'; + } + + // First, do all the 1st-level matches. + if (array_key_exists('document_id', $arguments)) + { + $document_id = $arguments['document_id']; + } + else + { + $document_id = ''; + } + + if (array_key_exists('access_key', $arguments)) + { + $access_key = $arguments['access_key']; + } + else + { + $access_key = 'key-'; + } + + if (array_key_exists('height', $arguments)) + { + $height = $arguments['height']; + } + else + { + $height = 600; + } + + if (array_key_exists('width', $arguments)) + { + $width = $arguments['width']; + } + else + { + $width = 400; + } + + $after_replace = ''; + $after_replace .= "\n".'<p id="embedded_flash" style="text-align: center;"><a href="http://www.scribd.com">Scribd</a></p>'."\n"; + $after_replace .= '<script type="text/javascript">iPaper('.$document_id.', \''.$access_key.'\', '.$height.', '.$width.');</script>'."\n"; + + $str_to_match = "[ipaper:1:$uid]" . $before_replace . "[/ipaper:1:$uid]"; + + $replacement = $ipaper_start_html . $after_replace . $ipaper_end_html; + + $text = str_replace($str_to_match, $replacement, $text); + + } + + // Now, do all the non-first-level matches. These are simple. + $text = str_replace("[ipaper:$uid]", $ipaper_start_html, $text); + $text = str_replace("[/ipaper:$uid]", $ipaper_end_html, $text); + + return $text; + + } //bbencode_ipaper_pass_render() /** |
|
From: FlorinCB <ory...@us...> - 2009-07-11 03:22:14
|
Update of /cvsroot/mxbb/mx_radiocast/admin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23243/mx_radiocast/admin Modified Files: admin_radio_cat.php Log Message: some fixes not commited Index: admin_radio_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/admin/admin_radio_cat.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_radio_cat.php 10 Jul 2009 21:31:41 -0000 1.4 --- admin_radio_cat.php 11 Jul 2009 03:22:07 -0000 1.5 *************** *** 127,131 **** $colspan = 1; $add_sc = "<td class=\"" . (($i % 2) ? 'row1' : 'row2') . "\" align=\"center\">" . ! "<form action=\"" . append_sid("admin_radio_cat.$phpEx") . "\" method=\"post\"><input type=\"hidden\" value=\"new\" name=\"mode\" /><input type=\"hidden\" value=\"" . $catrow[$i]['cat_id'] . "\" name=\"cat_parent\"><input name=\"submit\" type=\"submit\" value=\"" . $lang['Create_sub_radio'] . "\" class=\"liteoption\">" . "</form></td>"; } --- 127,131 ---- $colspan = 1; $add_sc = "<td class=\"" . (($i % 2) ? 'row1' : 'row2') . "\" align=\"center\">" . ! "<form action=\"" . mx_append_sid("admin_radio_cat.$phpEx") . "\" method=\"post\"><input type=\"hidden\" value=\"new\" name=\"mode\" /><input type=\"hidden\" value=\"" . $catrow[$i]['cat_id'] . "\" name=\"cat_parent\"><input name=\"submit\" type=\"submit\" value=\"" . $lang['Create_sub_radio'] . "\" class=\"liteoption\">" . "</form></td>"; } *************** *** 142,149 **** 'COLSPAN' => $colspan, 'ADD_SC' => $add_sc, ! 'S_MOVE_UP' => append_sid("admin_radio_cat.$phpEx?action=move&move=-15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_MOVE_DOWN' => append_sid("admin_radio_cat.$phpEx?action=move&move=15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_EDIT_ACTION' => append_sid("admin_radio_cat.$phpEx?action=edit&cat_id=" . $catrow[$i]['cat_id']), ! 'S_DELETE_ACTION' => append_sid("admin_radio_cat.$phpEx?action=delete&cat_id=" . $catrow[$i]['cat_id']) ) ); --- 142,149 ---- 'COLSPAN' => $colspan, 'ADD_SC' => $add_sc, ! 'S_MOVE_UP' => mx_append_sid("admin_radio_cat.$phpEx?action=move&move=-15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_MOVE_DOWN' => mx_append_sid("admin_radio_cat.$phpEx?action=move&move=15&cat_id=" . $catrow[$i]['cat_id']), ! 'S_EDIT_ACTION' => mx_append_sid("admin_radio_cat.$phpEx?action=edit&cat_id=" . $catrow[$i]['cat_id']), ! 'S_DELETE_ACTION' => mx_append_sid("admin_radio_cat.$phpEx?action=delete&cat_id=" . $catrow[$i]['cat_id']) ) ); *************** *** 171,178 **** 'TITLE' => " " . $subcatrow['cat_title'], 'DESC' => " " . preg_replace("#\n#", "<br> ", $subcatrow['cat_desc']), ! 'S_MOVE_UP' => append_sid("admin_radio_cat.$phpEx?action=move&move=-15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_MOVE_UP' => append_sid("admin_radio_cat.$phpEx?action=move&move=15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_EDIT_ACTION' => append_sid("admin_radio_cat.$phpEx?action=edit&cat_id=" . $subcatrow['cat_id']), ! 'S_DELETE_ACTION' => append_sid("admin_radio_cat.$phpEx?action=delete&cat_id=" . $subcatrow['cat_id']) ) ); --- 171,178 ---- 'TITLE' => " " . $subcatrow['cat_title'], 'DESC' => " " . preg_replace("#\n#", "<br> ", $subcatrow['cat_desc']), ! 'S_MOVE_UP' => mx_append_sid("admin_radio_cat.$phpEx?action=move&move=-15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_MOVE_UP' => mx_append_sid("admin_radio_cat.$phpEx?action=move&move=15&cat_parent=" . $catrow[$i]['cat_id'] . "&cat_id=" . $subcatrow['cat_id']), ! 'S_EDIT_ACTION' => mx_append_sid("admin_radio_cat.$phpEx?action=edit&cat_id=" . $subcatrow['cat_id']), ! 'S_DELETE_ACTION' => mx_append_sid("admin_radio_cat.$phpEx?action=delete&cat_id=" . $subcatrow['cat_id']) ) ); *************** *** 211,215 **** 'L_RADIOCAST_CAT_TITLE' => $lang['RadioCast_Categories_Title'], 'L_RADIOCAST_CAT_EXPLAIN' => $lang['RadioCast_Categories_Explain'], ! 'S_RADIOCAST_ACTION' => append_sid("admin_radio_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], --- 211,215 ---- 'L_RADIOCAST_CAT_TITLE' => $lang['RadioCast_Categories_Title'], 'L_RADIOCAST_CAT_EXPLAIN' => $lang['RadioCast_Categories_Explain'], ! 'S_RADIOCAST_ACTION' => mx_append_sid("admin_radio_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], *************** *** 328,332 **** $template->assign_vars(array( ! 'S_RADIOCAST_ACTION' => append_sid("admin_radio_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], --- 328,332 ---- $template->assign_vars(array( ! 'S_RADIOCAST_ACTION' => mx_append_sid("admin_radio_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], *************** *** 358,362 **** // Return a message... ! $message = $lang['Category_changed_order'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 358,362 ---- // Return a message... ! $message = $lang['Category_changed_order'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . mx_append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 391,395 **** 'L_RADIOCAST_CAT_TITLE' => $lang['RadioCast_Categories_Title'], 'L_RADIOCAST_CAT_EXPLAIN' => $lang['RadioCast_Categories_Explain'], ! 'S_RADIOCAST_ACTION' => append_sid("admin_radio_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], --- 391,395 ---- 'L_RADIOCAST_CAT_TITLE' => $lang['RadioCast_Categories_Title'], 'L_RADIOCAST_CAT_EXPLAIN' => $lang['RadioCast_Categories_Explain'], ! 'S_RADIOCAST_ACTION' => mx_append_sid("admin_radio_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], *************** *** 488,492 **** // Return a message... ! $message = $lang['New_category_created'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 488,492 ---- // Return a message... ! $message = $lang['New_category_created'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . mx_append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 517,521 **** // Return a message... ! $message = $lang['Category_updated'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 517,521 ---- // Return a message... ! $message = $lang['Category_updated'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . mx_append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 590,594 **** // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 590,594 ---- // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . mx_append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 616,620 **** // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 616,620 ---- // Return a message... ! $message = $lang['Category_deleted'] . "<br /><br />" . sprintf($lang['Click_return_radiocast_category'], "<a href=\"" . mx_append_sid("admin_radio_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); |
|
From: FlorinCB <ory...@us...> - 2009-07-11 03:22:13
|
Update of /cvsroot/mxbb/mx_glance In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23243/mx_glance Modified Files: mx_glance.pak Log Message: some fixes not commited Index: mx_glance.pak =================================================================== RCS file: /cvsroot/mxbb/mx_glance/mx_glance.pak,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_glance.pak 20 Jul 2008 04:12:14 -0000 1.6 --- mx_glance.pak 11 Jul 2009 03:22:06 -0000 1.7 *************** *** 1,11 **** ! module=+:62=+:Last News and Topics=+:modules/mx_glance/=+:Glance Module=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:62=+:73=+:Last News and Topics=+:Last News and Topics=+:mx_glance.php=+: parameter=+:73=+:137=+:Glance_news_forum_id=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0 ! parameter=+:73=+:138=+:Glance_num_news=+:Number=+:1=+:=+:0 ! parameter=+:73=+:139=+:Glance_recent_ignore=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0 ! parameter=+:73=+:140=+:Glance_num_recent=+:Number=+:5=+:=+:0 ! parameter=+:73=+:141=+:Glance_table_width=+:Number=+:200=+:=+:0 ! parameter=+:73=+:142=+:Glance_title_length=+:Number=+:0=+:=+:0 parameter=+:73=+:143=+:Glance_show_new_bullets=+:Boolean=+:TRUE=+:=+:0=+:0 parameter=+:73=+:143=+:Glance_show_user_color=+:Boolean=+:TRUE=+:=+:0=+:0 --- 1,11 ---- ! module=+:62=+:Last News and Topics=+:modules/mx_glance/=+:Glance Module=+:0 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:62=+:73=+:Last News and Topics=+:Last News and Topics=+:mx_glance.php=+: parameter=+:73=+:137=+:Glance_news_forum_id=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0 ! parameter=+:73=+:138=+:Glance_num_news=+:Number=+:1=+:0=+:0 ! parameter=+:73=+:139=+:Glance_recent_ignore=+:Function=+:0=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0 ! parameter=+:73=+:140=+:Glance_num_recent=+:Number=+:5=+:0=+:0 ! parameter=+:73=+:141=+:Glance_table_width=+:Number=+:200=+:0=+:0 ! parameter=+:73=+:142=+:Glance_title_length=+:Number=+:0=+:0=+:0 parameter=+:73=+:143=+:Glance_show_new_bullets=+:Boolean=+:TRUE=+:=+:0=+:0 parameter=+:73=+:143=+:Glance_show_user_color=+:Boolean=+:TRUE=+:=+:0=+:0 *************** *** 15,18 **** parameter=+:73=+:146=+:Glance_use_large=+:Radio_single_select=+:vertical=+:a:2:{i:0;s:8:"vertical";i:1;s:10:"horizontal";}=+:0=+:20 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Last News and Topics=+:Demo - Vertical block=+:30=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 15,18 ---- parameter=+:73=+:146=+:Glance_use_large=+:Radio_single_select=+:vertical=+:a:2:{i:0;s:8:"vertical";i:1;s:10:"horizontal";}=+:0=+:20 parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Last News and Topics=+:Demo - Vertical block=+:30=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:0 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: FlorinCB <ory...@us...> - 2009-07-11 03:22:13
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23243/mx_pafiledb/pafiledb/includes Modified Files: pafiledb_constants.php Log Message: some fixes not commited Index: pafiledb_constants.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/pafiledb_constants.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** pafiledb_constants.php 3 Jun 2008 20:17:07 -0000 1.25 --- pafiledb_constants.php 11 Jul 2009 03:22:06 -0000 1.26 *************** *** 88,91 **** --- 88,92 ---- { $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x + if (is_object($mx_page)) { |
|
From: FlorinCB <ory...@us...> - 2009-07-11 02:55:55
|
Update of /cvsroot/mxbb/mx_radiocast In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17921 Modified Files: db_install.php db_upgrade.php Log Message: upd Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/db_install.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** db_install.php 11 Jun 2009 08:15:55 -0000 1.6 --- db_install.php 11 Jul 2009 02:55:44 -0000 1.7 *************** *** 33,37 **** } ! $mx_module_version = '2.9.1'; $mx_module_copy = 'mX-Publisher <i> - Radio Cast</i> module by <a href="http://caleacrestina.com/" target="_blank">OryNider (FlorinCB)</a>'; --- 33,37 ---- } ! $mx_module_version = '2.9.2'; $mx_module_copy = 'mX-Publisher <i> - Radio Cast</i> module by <a href="http://caleacrestina.com/" target="_blank">OryNider (FlorinCB)</a>'; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/db_upgrade.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** db_upgrade.php 11 Jun 2009 08:15:55 -0000 1.5 --- db_upgrade.php 11 Jul 2009 02:55:44 -0000 1.6 *************** *** 30,34 **** } ! $mx_module_version = '2.9.1'; $mx_module_copy = 'mX-Publisher <i> - Radio Cast</i> module by <a href="http://caleacrestina.com/" target="_blank">OryNider (FlorinCB)</a>'; --- 30,34 ---- } ! $mx_module_version = '2.9.2'; $mx_module_copy = 'mX-Publisher <i> - Radio Cast</i> module by <a href="http://caleacrestina.com/" target="_blank">OryNider (FlorinCB)</a>'; |
|
From: FlorinCB <ory...@us...> - 2009-07-11 02:55:51
|
Update of /cvsroot/mxbb/mx_radiocast/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17921/includes Modified Files: radiocast_add.php radiocast_edit.php Log Message: upd Index: radiocast_add.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_add.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** radiocast_add.php 11 Jul 2009 01:37:52 -0000 1.3 --- radiocast_add.php 11 Jul 2009 02:55:44 -0000 1.4 *************** *** 326,330 **** --- 326,333 ---- $station_url = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['station_url']))); + //Image Edit Added by OryNider $image_system = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['image_system']))); + + $station_imgurl = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['station_imgurl']))); $station_desc = str_replace("\'", "''", htmlspecialchars(substr(trim($HTTP_POST_VARS['station_desc']), 0, $radiocast_config['desc_length']))); *************** *** 452,691 **** if( empty($station_url) ) { ! switch ($filetype) ! { ! case 'audio/mpeg': ! case 'audio/x-mpeg': ! case 'audio/mp3': ! case 'audio/mpg': ! if ($radiocast_config['mp3_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mp3'; ! break; ! case 'audio/wav': ! if ($radiocast_config['wav_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wav'; ! break; ! case 'audio/x-ms-wma': ! if ($radiocast_config['wma_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wma'; ! break; ! // ! // Extra extensions ! // ! case 'video/x-ms-wmv': ! if ($radiocast_config['wmv_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wmv'; ! break; ! case 'video/mpeg': ! if ($radiocast_config['mpeg_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mpeg'; ! break; ! case 'video/avi': ! case 'video/x-msvideo': ! if ($radiocast_config['avi_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.avi'; ! break; ! case 'application/x-shockwave-flash': ! if ($radiocast_config['swf_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.swf'; ! break; ! case 'video/quicktime': ! if ($radiocast_config['qt_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.qt'; ! break; ! case 'audio/x-midi': ! case 'audio/mid': ! case 'audio/midi': ! if ($radiocast_config['mid_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mid'; ! break; ! case 'audio/x-pn-realaudio': ! if ($radiocast_config['ram_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.ram'; ! break; ! case 'audio/basic': ! if ($radiocast_config['au_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.au'; ! break; ! case 'audio/vnd.rn-realmedia': ! case 'application/vnd.rn-realmedia': ! case 'video/vnd.rn-realvideo': ! case 'application/vnd': ! if ($radiocast_config['rm_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.rm'; ! break; ! // End extra ! default: ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } } else { ! switch ($filetype) ! { ! case 'audio/mpeg': ! case 'audio/x-mpeg': ! case 'audio/mp3': ! case 'audio/mpg': ! if ($radiocast_config['mp3_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mp3'; ! break; ! case 'audio/wav': ! if ($radiocast_config['wav_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wav'; ! break; ! case 'audio/x-ms-wma': ! if ($radiocast_config['wma_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wma'; ! break; ! // ! // Extra extensions ! // ! case 'video/x-ms-wmv': ! if ($radiocast_config['wmv_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wmv'; ! break; ! case 'video/mpeg': ! if ($radiocast_config['mpeg_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mpeg'; ! break; ! case 'video/avi': ! case 'video/x-msvideo': ! if ($radiocast_config['avi_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.avi'; ! break; ! case 'application/x-shockwave-flash': ! if ($radiocast_config['swf_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.swf'; ! break; ! case 'video/quicktime': ! if ($radiocast_config['qt_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.qt'; ! break; ! case 'audio/x-midi': ! case 'audio/mid': ! case 'audio/midi': ! if ($radiocast_config['mid_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mid'; ! break; ! case 'audio/x-pn-realaudio': ! if ($radiocast_config['ram_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.ram'; ! break; ! case 'audio/basic': ! if ($radiocast_config['au_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.au'; ! break; ! case 'audio/vnd.rn-realmedia': ! case 'application/vnd.rn-realmedia': ! case 'video/vnd.rn-realvideo': ! case 'application/vnd': ! if ($radiocast_config['rm_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.rm'; ! break; ! default: ! $station_filetype = '.pls'; ! break; ! // End extra ! } } --- 455,694 ---- if( empty($station_url) ) { ! switch ($filetype) ! { ! case 'audio/mpeg': ! case 'audio/x-mpeg': ! case 'audio/mp3': ! case 'audio/mpg': ! if ($radiocast_config['mp3_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mp3'; ! break; ! case 'audio/wav': ! if ($radiocast_config['wav_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wav'; ! break; ! case 'audio/x-ms-wma': ! if ($radiocast_config['wma_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wma'; ! break; ! // ! // Extra extensions ! // ! case 'video/x-ms-wmv': ! if ($radiocast_config['wmv_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wmv'; ! break; ! case 'video/mpeg': ! if ($radiocast_config['mpeg_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mpeg'; ! break; ! case 'video/avi': ! case 'video/x-msvideo': ! if ($radiocast_config['avi_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.avi'; ! break; ! case 'application/x-shockwave-flash': ! if ($radiocast_config['swf_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.swf'; ! break; ! case 'video/quicktime': ! if ($radiocast_config['qt_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.qt'; ! break; ! case 'audio/x-midi': ! case 'audio/mid': ! case 'audio/midi': ! if ($radiocast_config['mid_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mid'; ! break; ! case 'audio/x-pn-realaudio': ! if ($radiocast_config['ram_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.ram'; ! break; ! case 'audio/basic': ! if ($radiocast_config['au_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.au'; ! break; ! case 'audio/vnd.rn-realmedia': ! case 'application/vnd.rn-realmedia': ! case 'video/vnd.rn-realvideo': ! case 'application/vnd': ! if ($radiocast_config['rm_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.rm'; ! break; ! // End extra ! default: ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } } else { ! switch ($filetype) ! { ! case 'audio/mpeg': ! case 'audio/x-mpeg': ! case 'audio/mp3': ! case 'audio/mpg': ! if ($radiocast_config['mp3_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mp3'; ! break; ! case 'audio/wav': ! if ($radiocast_config['wav_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wav'; ! break; ! case 'audio/x-ms-wma': ! if ($radiocast_config['wma_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wma'; ! break; ! // ! // Extra extensions ! // ! case 'video/x-ms-wmv': ! if ($radiocast_config['wmv_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.wmv'; ! break; ! case 'video/mpeg': ! if ($radiocast_config['mpeg_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mpeg'; ! break; ! case 'video/avi': ! case 'video/x-msvideo': ! if ($radiocast_config['avi_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.avi'; ! break; ! case 'application/x-shockwave-flash': ! if ($radiocast_config['swf_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.swf'; ! break; ! case 'video/quicktime': ! if ($radiocast_config['qt_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.qt'; ! break; ! case 'audio/x-midi': ! case 'audio/mid': ! case 'audio/midi': ! if ($radiocast_config['mid_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.mid'; ! break; ! case 'audio/x-pn-realaudio': ! if ($radiocast_config['ram_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.ram'; ! break; ! case 'audio/basic': ! if ($radiocast_config['au_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.au'; ! break; ! case 'audio/vnd.rn-realmedia': ! case 'application/vnd.rn-realmedia': ! case 'video/vnd.rn-realvideo': ! case 'application/vnd': ! if ($radiocast_config['rm_allowed'] == 0) ! { ! mx_message_die(GENERAL_ERROR, $lang['Not_allowed_file_type']); ! } ! $station_filetype = '.rm'; ! break; ! default: ! $station_filetype = '.pls'; ! break; ! // End extra ! } } *************** *** 694,698 **** // Generate filename // -------------------------------- - srand((double)microtime()*1000000); // for older than version 4.2.0 of PHP --- 697,700 ---- *************** *** 716,720 **** else { ! $station_imagename = ''; } --- 718,722 ---- else { ! $station_imagename = $station_imgurl ? $station_imgurl : ($old_pic_filename ? $old_pic_filename : ''); } Index: radiocast_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_edit.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** radiocast_edit.php 11 Jul 2009 01:46:56 -0000 1.4 --- radiocast_edit.php 11 Jul 2009 02:55:44 -0000 1.5 *************** *** 284,288 **** // Check image type // -------------------------------- ! if($station_image) { switch ($imagetype) --- 284,288 ---- // Check image type // -------------------------------- ! if($image_system == '1') { switch ($imagetype) *************** *** 371,377 **** if ( ($image_width > $radiocast_config['max_image_width']) or ($image_height > $radiocast_config['max_image_height']) ) { ! @unlink($station_image_path . $station_imagename); ! mx_message_die(GENERAL_ERROR, 'Your uploaded image size is too big'); } } --- 371,377 ---- if ( ($image_width > $radiocast_config['max_image_width']) or ($image_height > $radiocast_config['max_image_height']) ) { ! @unlink($station_image_path . $station_imagename); ! mx_message_die(GENERAL_ERROR, 'Your uploaded image size is too big'); } } |
|
From: FlorinCB <ory...@us...> - 2009-07-11 02:09:45
|
Update of /cvsroot/mxbb/mx_radiocast/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12653 Modified Files: radiocast_add_body.tpl Log Message: template downgrade for now Index: radiocast_add_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/templates/_core/radiocast_add_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** radiocast_add_body.tpl 11 Jul 2009 01:37:52 -0000 1.2 --- radiocast_add_body.tpl 11 Jul 2009 02:09:36 -0000 1.3 *************** *** 66,78 **** <tr> <td class="row1" rowspan="2"><span class="gen">{L_STATION_IMAGE}:</span><br /><span class="gensmall">{L_STATION_IMAGE_DESC}</span></td> ! <td class="row2"><span class="gen"><input type="radio" name="image_system" value="0" checked="checked" />{L_STATION_IMGURL} / {L_NO_IMAGE} <input type="radio" name="image_system" value="1" /> {L_ADD_IMAGE}</span></td> </tr> <tr> <td class="row2"><input class="post" type="file" name="station_image" size="49" /></td> </tr> ! <tr> ! <td class="row1" width="30%"><span class="gen">{L_STATION_IMGURL}:</span><br /><span class="gensmall">{L_STATION_IMGURL_DESC}</span></td> ! <td class="row2"><input class="post" type="text" name="station_imgurl" size="60" value="{STATION_IMGURL}" /></td> ! </tr> <tr> <td class="row1" height="28"><span class="gen">{L_STATION_TITLE}:</span></td> --- 66,80 ---- <tr> <td class="row1" rowspan="2"><span class="gen">{L_STATION_IMAGE}:</span><br /><span class="gensmall">{L_STATION_IMAGE_DESC}</span></td> ! <td class="row2"><span class="gen"><input type="radio" name="image_system" value="0" checked="checked" /> <!--{L_STATION_IMGURL} / --> {L_NO_IMAGE} <input type="radio" name="image_system" value="1" /> {L_ADD_IMAGE}</span></td> </tr> <tr> <td class="row2"><input class="post" type="file" name="station_image" size="49" /></td> </tr> ! <!-- ! <tr> ! <td class="row1" width="30%"><span class="gen">{L_STATION_IMGURL}:</span><br /><span class="gensmall">{L_STATION_IMGURL_DESC}</span></td> ! <td class="row2"><input class="post" type="text" name="station_imgurl" size="60" value="{STATION_IMGURL}" /></td> ! </tr> ! --> <tr> <td class="row1" height="28"><span class="gen">{L_STATION_TITLE}:</span></td> |
|
From: FlorinCB <ory...@us...> - 2009-07-11 01:47:07
|
Update of /cvsroot/mxbb/mx_radiocast/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10732 Modified Files: radiocast_edit.php Log Message: 'L_ADD_IMAGE' => $lang['Upload_image'], Index: radiocast_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_edit.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** radiocast_edit.php 11 Jul 2009 01:37:52 -0000 1.3 --- radiocast_edit.php 11 Jul 2009 01:46:56 -0000 1.4 *************** *** 213,216 **** --- 213,217 ---- 'L_STATION_IMAGE_DESC' => $lang['Station_image_desc'], 'L_NO_IMAGE' => $no_image, + 'L_ADD_IMAGE' => $lang['Upload_image'], 'L_UPLOAD_IMAGE' => $lang['Upload_image'], |
|
From: FlorinCB <ory...@us...> - 2009-07-11 01:38:05
|
Update of /cvsroot/mxbb/mx_radiocast/templates/_core In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9688/templates/_core Modified Files: radiocast_add_body.tpl radiocast_edit_body.tpl Log Message: update Index: radiocast_edit_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/templates/_core/radiocast_edit_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** radiocast_edit_body.tpl 22 Jan 2009 08:29:51 -0000 1.1 --- radiocast_edit_body.tpl 11 Jul 2009 01:37:52 -0000 1.2 *************** *** 35,39 **** <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th class="thTop" height="25" colspan="2">{L_EDIT_STATION_INFO}</th> </tr> <tr> --- 35,39 ---- <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> ! <th class="thTop" height="25" colspan="3">{L_EDIT_STATION_INFO}</th> </tr> <tr> *************** *** 50,55 **** </tr> <tr> ! <td class="row1" width="30%" rowspan="2"><span class="gen">{L_STATION_IMAGE}:</span><br /><span class="gensmall">{L_STATION_IMAGE_DESC}</span></td> ! <td class="row2"><span class="gen"><input type="radio" name="image_system" value="0" checked="checked" />{L_NO_IMAGE} <input type="radio" name="image_system" value="1" /> {L_UPLOAD_IMAGE}</span></td> </tr> <tr> --- 50,55 ---- </tr> <tr> ! <td class="row1" rowspan="2"><span class="gen">{L_STATION_IMAGE}:</span><br /><span class="gensmall">{L_STATION_IMAGE_DESC}</span></td> ! <td class="row2"><span class="gen"><input type="radio" name="image_system" value="0" checked="checked" />{L_STATION_IMGURL} / {L_NO_IMAGE} <input type="radio" name="image_system" value="1" /> {L_ADD_IMAGE}</span></td> </tr> <tr> *************** *** 57,60 **** --- 57,64 ---- </tr> <tr> + <td class="row1" width="30%"><span class="gen">{L_STATION_IMGURL}:</span><br /><span class="gensmall">{L_STATION_IMGURL_DESC}</span></td> + <td class="row2"><input class="post" type="text" name="station_imgurl" size="60" value="{STATION_IMGURL}" /></td> + </tr> + <tr> <td class="row1" valign="top" width="30%" height="28"><span class="gen">{L_STATION_DESC}<br /></span><span class="genmed">{L_PLAIN_TEXT_ONLY}<br />{L_MAX_LENGTH}: <b>{S_STATION_DESC_MAX_LENGTH}</b></span></td> <td class="row2"><textarea class="post" cols="60" rows="4" name="station_desc" size="60">{STATION_DESC}</textarea></td> Index: radiocast_add_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/templates/_core/radiocast_add_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** radiocast_add_body.tpl 22 Jan 2009 08:29:51 -0000 1.1 --- radiocast_add_body.tpl 11 Jul 2009 01:37:52 -0000 1.2 *************** *** 66,70 **** <tr> <td class="row1" rowspan="2"><span class="gen">{L_STATION_IMAGE}:</span><br /><span class="gensmall">{L_STATION_IMAGE_DESC}</span></td> ! <td class="row2"><span class="gen"><input type="radio" name="image_system" value="0" checked="checked" />{L_NO_IMAGE} <input type="radio" name="image_system" value="1" /> {L_ADD_IMAGE}</span></td> </tr> <tr> --- 66,70 ---- <tr> <td class="row1" rowspan="2"><span class="gen">{L_STATION_IMAGE}:</span><br /><span class="gensmall">{L_STATION_IMAGE_DESC}</span></td> ! <td class="row2"><span class="gen"><input type="radio" name="image_system" value="0" checked="checked" />{L_STATION_IMGURL} / {L_NO_IMAGE} <input type="radio" name="image_system" value="1" /> {L_ADD_IMAGE}</span></td> </tr> <tr> *************** *** 72,78 **** </tr> <tr> <td class="row1" height="28"><span class="gen">{L_STATION_TITLE}:</span></td> <td class="row2"><input class="post" type="text" name="station_title" size="60" /></td> ! </tr> <tr> <td class="row1" height="28"><span class="gen">{L_SINGER}:</span></td> --- 72,82 ---- </tr> <tr> + <td class="row1" width="30%"><span class="gen">{L_STATION_IMGURL}:</span><br /><span class="gensmall">{L_STATION_IMGURL_DESC}</span></td> + <td class="row2"><input class="post" type="text" name="station_imgurl" size="60" value="{STATION_IMGURL}" /></td> + </tr> + <tr> <td class="row1" height="28"><span class="gen">{L_STATION_TITLE}:</span></td> <td class="row2"><input class="post" type="text" name="station_title" size="60" /></td> ! </tr> <tr> <td class="row1" height="28"><span class="gen">{L_SINGER}:</span></td> |
|
From: FlorinCB <ory...@us...> - 2009-07-11 01:37:59
|
Update of /cvsroot/mxbb/mx_radiocast/includes In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9688/includes Modified Files: radiocast_add.php radiocast_edit.php Log Message: update Index: radiocast_add.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_add.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** radiocast_add.php 22 Jan 2009 08:29:51 -0000 1.2 --- radiocast_add.php 11 Jul 2009 01:37:52 -0000 1.3 *************** *** 244,247 **** --- 244,251 ---- 'L_STATION_TITLE' => $lang['Station_Title'], 'L_STATION_URL' => $lang['Station_url'], + + 'L_STATION_IMGURL' => $lang['Station_imgurl'], + 'L_STATION_IMGURL_DESC' => $lang['Station_imgurl_desc'], + 'STATION_IMGURL' => $thissong['station_imgurl'], 'L_STATION_DESC' => $lang['Station_Desc'], Index: radiocast_edit.php =================================================================== RCS file: /cvsroot/mxbb/mx_radiocast/includes/radiocast_edit.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** radiocast_edit.php 22 Jan 2009 08:29:51 -0000 1.2 --- radiocast_edit.php 11 Jul 2009 01:37:52 -0000 1.3 *************** *** 175,181 **** 'L_STATION_TITLE' => $lang['Station_Title'], - 'STATION_TITLE' => $thissong['station_title'], 'L_STATION_URL' => $lang['Station_url'], ! 'STATION_URL' => $thissong['station_url'], 'STATION_SINGER' => $thissong['station_singer'], 'STATION_DESC' => $thissong['station_desc'], --- 175,186 ---- 'L_STATION_TITLE' => $lang['Station_Title'], 'L_STATION_URL' => $lang['Station_url'], ! ! 'L_STATION_IMGURL' => $lang['Station_imgurl'], ! 'L_STATION_IMGURL_DESC' => $lang['Station_imgurl_desc'], ! 'STATION_IMGURL' => $thissong['station_imgurl'], ! ! 'STATION_TITLE' => $thissong['station_title'], ! 'STATION_URL' => $thissong['station_url'], 'STATION_SINGER' => $thissong['station_singer'], 'STATION_DESC' => $thissong['station_desc'], *************** *** 205,209 **** //Image Edit Added by OryNider 'L_STATION_IMAGE' => $lang['Station_image'], ! 'L_STATION_IMAGE_DESC' => $lang['Station_image_desc'], 'L_NO_IMAGE' => $no_image, 'L_UPLOAD_IMAGE' => $lang['Upload_image'], --- 210,215 ---- //Image Edit Added by OryNider 'L_STATION_IMAGE' => $lang['Station_image'], ! 'L_STATION_IMGURL' => $lang['Station_imgurl'], ! 'L_STATION_IMAGE_DESC' => $lang['Station_image_desc'], 'L_NO_IMAGE' => $no_image, 'L_UPLOAD_IMAGE' => $lang['Upload_image'], *************** *** 236,239 **** --- 242,249 ---- //Image Edit Added by OryNider $image_system = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['image_system']))); + + $station_imgurl = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['station_imgurl']))); + + $station_image = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['station_image']))); $station_singer = str_replace("\'", "''", htmlspecialchars(trim($HTTP_POST_VARS['station_singer']))); *************** *** 270,284 **** $imagetmp = ( !empty($HTTP_POST_FILES['station_image']['tmp_name']) ) ? $HTTP_POST_FILES['station_image']['tmp_name'] : ''; - - //Image Edit Added by OryNider - // -------------------------------- - // Check image size // -------------------------------- ! ! if( $image_system == '1' ) ! { ! // -------------------------------- ! // Check image type ! // -------------------------------- switch ($imagetype) { --- 280,288 ---- $imagetmp = ( !empty($HTTP_POST_FILES['station_image']['tmp_name']) ) ? $HTTP_POST_FILES['station_image']['tmp_name'] : ''; // -------------------------------- ! // Check image type ! // -------------------------------- ! if($station_image) ! { switch ($imagetype) { *************** *** 287,305 **** case 'image/pjpeg': $station_imagetype = '.jpg'; ! break; case 'image/gif': $station_imagetype = '.gif'; ! break; case 'image/png': case 'image/x-png': $station_imagetype = '.png'; ! break; default: mx_message_die(GENERAL_ERROR, $lang['Not_allowed_image_type'] . ': ' . $imagetype); } ! if( $imagesize > $radiocast_config['max_image_size'] ) { --- 291,309 ---- case 'image/pjpeg': $station_imagetype = '.jpg'; ! break; case 'image/gif': $station_imagetype = '.gif'; ! break; case 'image/png': case 'image/x-png': $station_imagetype = '.png'; ! break; default: mx_message_die(GENERAL_ERROR, $lang['Not_allowed_image_type'] . ': ' . $imagetype); } ! if( $imagesize > $radiocast_config['max_image_size'] ) { *************** *** 307,313 **** } ! // -------------------------------- ! // If exits old image deleate it ! // -------------------------------- if( !empty($old_pic_filename) && file_exists($station_image_path . $old_pic_filename) ) --- 311,317 ---- } ! // -------------------------------- ! // If exits old image deleate it ! // -------------------------------- if( !empty($old_pic_filename) && file_exists($station_image_path . $old_pic_filename) ) *************** *** 316,322 **** } ! // -------------------------------- ! // Generate imagename ! // -------------------------------- do --- 320,326 ---- } ! // -------------------------------- ! // Generate imagename ! // -------------------------------- do *************** *** 327,333 **** ! // -------------------------------- ! // Move song image to directory ! // -------------------------------- if( !empty($HTTP_POST_FILES['station_image']['tmp_name']) ) --- 331,337 ---- ! // -------------------------------- ! // Move song image to directory ! // -------------------------------- if( !empty($HTTP_POST_FILES['station_image']['tmp_name']) ) *************** *** 353,359 **** } ! // -------------------------------- ! // Check its image size ! // -------------------------------- if( !empty($HTTP_POST_FILES['station_image']['size']) ) --- 357,363 ---- } ! // -------------------------------- ! // Check its image size ! // -------------------------------- if( !empty($HTTP_POST_FILES['station_image']['size']) ) *************** *** 372,382 **** } } - else if( !empty($old_pic_filename) ) - { - $station_imagename = $old_pic_filename; - } else { ! $station_imagename = ''; } --- 376,382 ---- } } else { ! $station_imagename = $station_imgurl ? $station_imgurl : ($old_pic_filename ? $old_pic_filename : ''); } |
2 messages has been excluded from this view by a project administrator.
