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: Jon O. <jon...@us...> - 2008-04-27 18:49:24
|
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/modules In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15622/pafiledb/modules Modified Files: pa_file.php pa_user_upload.php Log Message: A new feature is tested, dynamic buttons. I have coded this update so custom styles will not be affected... Index: pa_file.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_file.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** pa_file.php 15 Feb 2008 22:15:15 -0000 1.24 --- pa_file.php 27 Apr 2008 18:48:48 -0000 1.25 *************** *** 28,32 **** { global $template, $lang, $board_config, $phpEx, $pafiledb_config, $images; ! global $phpbb_root_path, $userdata, $db, $pafiledb_functions; global $mx_root_path, $module_root_path, $is_block, $mx_request_vars; --- 28,32 ---- { global $template, $lang, $board_config, $phpEx, $pafiledb_config, $images; ! global $phpbb_root_path, $userdata, $db, $pafiledb_functions, $mx_user; global $mx_root_path, $module_root_path, $is_block, $mx_request_vars; *************** *** 139,142 **** --- 139,150 ---- } + // + // Disabled file + // + if ($file_data['file_disable']) + { + $file_download_link = 'javascript:disable_popup()'; + } + $template->assign_vars( array( 'L_CLICK_HERE' => $lang['Click_here'], *************** *** 170,173 **** --- 178,182 ---- 'FILE_SCREENSHOT' => $file_screenshot_url, 'FILE_WEBSITE' => $file_website_url, + 'FILE_DISABLE_MSG' => nl2br( $file_data['disable_msg'] ), 'AUTH_EDIT' => ( ( $this->auth_user[$file_data['file_catid']]['auth_edit_file'] && $file_data['user_id'] == $userdata['user_id'] ) || $this->auth_user[$file_data['file_catid']]['auth_mod'] ) ? true : false, *************** *** 180,183 **** --- 189,193 ---- 'DOWNLOAD_IMG' => $images['pa_download'], 'EMAIL_IMG' => $images['pa_email'], + 'TIME' => $file_time, 'UPDATE_TIME' => ( $file_data['file_update_time'] != $file_data['file_time'] ) ? $file_update_time : $lang['never'], *************** *** 189,194 **** 'U_DELETE' => mx_append_sid( $this->this_mxurl( 'action=user_upload&do=delete&file_id=' . $file_id ) ), 'U_EDIT' => mx_append_sid( $this->this_mxurl( 'action=user_upload&file_id=' . $file_id ) ), ! 'U_EMAIL' => mx_append_sid( $this->this_mxurl( 'action=email&file_id=' . $file_id ) ) )); --- 199,209 ---- 'U_DELETE' => mx_append_sid( $this->this_mxurl( 'action=user_upload&do=delete&file_id=' . $file_id ) ), 'U_EDIT' => mx_append_sid( $this->this_mxurl( 'action=user_upload&file_id=' . $file_id ) ), + 'U_EMAIL' => mx_append_sid( $this->this_mxurl( 'action=email&file_id=' . $file_id ) ), ! // Buttons ! 'B_DOWNLOAD_IMG' => $mx_user->create_button('pa_download', $lang['Downloadfile'], $file_download_link), ! 'B_DELETE_IMG' => $mx_user->create_button('pa_icon_delpost', $lang['Deletefile'], "javascript:delete_item('". mx_append_sid( $this->this_mxurl( 'action=user_upload&do=delete&file_id=' . $file_id )) . "')"), ! 'B_EDIT_IMG' => $mx_user->create_button('pa_icon_edit', $lang['Editfile'], mx_append_sid( $this->this_mxurl( 'action=user_upload&file_id=' . $file_id ) )), ! 'B_EMAIL_IMG' => $mx_user->create_button('pa_email', $lang['Emailfile'], mx_append_sid( $this->this_mxurl( 'action=email&file_id=' . $file_id ))), )); Index: pa_user_upload.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_user_upload.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** pa_user_upload.php 18 Feb 2008 20:21:45 -0000 1.28 --- pa_user_upload.php 27 Apr 2008 18:48:49 -0000 1.29 *************** *** 264,267 **** --- 264,270 ---- $pin_checked_yes = ''; $pin_checked_no = ' checked'; + $disable_checked_yes = ''; + $disable_checked_no = ' checked'; + $disable_msg = 'The file is unavailable at the moment!'; $file_download = 0; $approved_checked_yes = ''; *************** *** 293,296 **** --- 296,302 ---- $pin_checked_yes = ( $file_data['file_pin'] ) ? ' checked' : ''; $pin_checked_no = ( !$file_data['file_pin'] ) ? ' checked' : ''; + $disable_checked_yes = ( $file_data['file_disable'] ) ? ' checked' : ''; + $disable_checked_no = ( !$file_data['file_disable'] ) ? ' checked' : ''; + $disable_msg = $file_data['disable_msg']; $file_download = intval( $file_data['file_dls'] ); $approved_checked_yes = ( $file_data['file_approved'] ) ? ' checked' : ''; *************** *** 340,343 **** --- 346,352 ---- 'PIN_CHECKED_YES' => $pin_checked_yes, 'PIN_CHECKED_NO' => $pin_checked_no, + 'DISABLE_CHECKED_YES' => $disable_checked_yes, + 'DISABLE_CHECKED_NO' => $disable_checked_no, + 'DISABLE_MSG' => $disable_msg, 'L_UPLOAD' => $lang['User_upload'], *************** *** 380,383 **** --- 389,396 ---- 'L_FILE_PINNED' => $lang['Filepin'], 'L_FILE_PINNED_INFO' => $lang['Filepininfo'], + 'L_FILE_DISABLE' => $lang['Filedisable'], + 'L_FILE_DISABLE_INFO' => $lang['Filedisableinfo'], + 'L_FILE_DISABLE_MSG' => $lang['Filedisablemsg'], + 'L_FILE_DISABLE_MSG_INFO' => $lang['Filedisablemsginfo'], 'L_FILE_DOWNLOAD' => $lang['Filedls'], 'L_NO' => $lang['No'], |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:49:23
|
Update of /cvsroot/mxbb/mx_pafiledb In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15622 Modified Files: db_install.php db_upgrade.php Log Message: A new feature is tested, dynamic buttons. I have coded this update so custom styles will not be affected... Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_install.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** db_install.php 13 Mar 2008 19:15:19 -0000 1.35 --- db_install.php 27 Apr 2008 18:48:44 -0000 1.36 *************** *** 30,34 **** } ! $mx_module_version = '2.2.4'; $mx_module_copy = 'Original phpBB <i>pafileDB</i> MOD by Mohd/Jon Ohlsson/Orynider</a> based on <a href="http://www.phparena.net/" target="_blank">PHP Arena, pafileDB</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>'; --- 30,34 ---- } ! $mx_module_version = '2.2.5'; $mx_module_copy = 'Original phpBB <i>pafileDB</i> MOD by Mohd/Jon Ohlsson/Orynider</a> based on <a href="http://www.phparena.net/" target="_blank">PHP Arena, pafileDB</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>'; *************** *** 140,144 **** file_update_time int(50) NOT NULL default '0', file_last int(50) default NULL, ! file_pin int(2) default NULL, file_broken TINYINT(1) DEFAULT '0' NOT NULL, topic_id mediumint(8) unsigned NOT NULL default '0', --- 140,146 ---- file_update_time int(50) NOT NULL default '0', file_last int(50) default NULL, ! file_pin int(2) default '0', ! file_disable int(2) default '0', ! disable_msg text, file_broken TINYINT(1) DEFAULT '0' NOT NULL, topic_id mediumint(8) unsigned NOT NULL default '0', Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/db_upgrade.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** db_upgrade.php 16 Feb 2008 21:47:31 -0000 1.27 --- db_upgrade.php 27 Apr 2008 18:48:44 -0000 1.28 *************** *** 30,34 **** } ! $mx_module_version = '2.2.4'; $mx_module_copy = 'Original phpBB <i>pafileDB</i> MOD by Mohd/Jon Ohlsson/Orynider</a> based on <a href="http://www.phparena.net/" target="_blank">PHP Arena, pafileDB</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>'; --- 30,34 ---- } ! $mx_module_version = '2.2.5'; $mx_module_copy = 'Original phpBB <i>pafileDB</i> MOD by Mohd/Jon Ohlsson/Orynider</a> based on <a href="http://www.phparena.net/" target="_blank">PHP Arena, pafileDB</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>'; *************** *** 50,53 **** --- 50,54 ---- $upgrade_201 = 0; $upgrade_280 = 0; // mxBB 2.8 branch -> + $upgrade_225 = 0; $message = "<b>Upgrading!</b><br/><br/>"; *************** *** 67,71 **** { $upgrade_201 = 1; ! $message .= "<b>Validating v. 2.0.1...ok</b><br/><br/>"; } else --- 68,72 ---- { $upgrade_201 = 1; ! $message .= "<b>Upgrading v. 2.0.1...ok</b><br/><br/>"; } else *************** *** 98,101 **** --- 99,113 ---- } + // validate before 2.2.5 + if ( !$result = $db->sql_query( "SELECT file_disable from " . $mx_table_prefix . "pa_files" ) ) + { + $upgrade_225 = 1; + $message .= "<b>Upgrading v. 2.2.5...ok</b><br/><br/>"; + } + else + { + $message .= "<b>Validating v. 2.2.5...ok</b><br/><br/>"; + } + // ------------------------------------------------------------------------------------------------------ if ( $upgrade_103 == 1 ) *************** *** 223,226 **** --- 235,244 ---- $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_auth CHANGE auth_approval_groups auth_approval_edit tinyint(2) NOT NULL default '0' "; } + + if ( $upgrade_225 == 1 ) + { + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_files ADD file_disable int(2) default '0' AFTER file_pin "; + $sql[] = "ALTER TABLE " . $mx_table_prefix . "pa_files ADD disable_msg text AFTER file_disable "; + } else { |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:49:21
|
Update of /cvsroot/mxbb/mx_pafiledb/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15622/language/lang_swedish Modified Files: lang_main.php Log Message: A new feature is tested, dynamic buttons. I have coded this update so custom styles will not be affected... Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/language/lang_swedish/lang_main.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_main.php 13 Feb 2008 21:32:17 -0000 1.1 --- lang_main.php 27 Apr 2008 18:48:45 -0000 1.2 *************** *** 140,143 **** --- 140,147 ---- $lang['Filepin'] = 'Nåla filer'; $lang['Filepininfo'] = 'Välja om du vill \'nåla fast\' filer överst i fillistan.'; + $lang['Filedisable'] = 'Inaktivera filen'; + $lang['Filedisableinfo'] = 'Filen syns men kan inte laddas ner. Ett popupmeddelande informerar användaren att filen inte är tillgänglig för tillfället.'; + $lang['Filedisablemsg'] = 'Inaktiveringsmeddelande'; + $lang['Filedisablemsginfo'] = 'Det som visas i popupmeddelandet'; $lang['Fileadded'] = 'Filen laddades upp...'; $lang['Filedeleted'] = 'Filen togs bort...'; |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:49:20
|
Update of /cvsroot/mxbb/mx_pafiledb/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15622/language/lang_english Modified Files: lang_main.php Log Message: A new feature is tested, dynamic buttons. I have coded this update so custom styles will not be affected... Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/language/lang_english/lang_main.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** lang_main.php 28 Jan 2008 21:57:10 -0000 1.13 --- lang_main.php 27 Apr 2008 18:48:44 -0000 1.14 *************** *** 140,143 **** --- 140,147 ---- $lang['Filepin'] = 'Pin File'; $lang['Filepininfo'] = 'Choose if you want the file pinned or not. Pinned files will always be shown at the top of the file list.'; + $lang['Filedisable'] = 'Disable file download'; + $lang['Filedisableinfo'] = 'This setting makes the file disabled, but still visible. A pop-up message informs the user this file is not available at the moment.'; + $lang['Filedisablemsg'] = 'Disable message'; + $lang['Filedisablemsginfo'] = 'The pop-up message...'; $lang['Fileadded'] = 'The new file has been successfully added'; $lang['Filedeleted'] = 'The file has been successfully deleted'; |
Update of /cvsroot/mxbb/mx_pafiledb/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15622/templates/_core Modified Files: pa_file_add.tpl pa_file_body.tpl pa_header.tpl pa_mini.tpl pa_quickdl_cat_body.tpl pa_toplist_body.tpl pa_viewall_body.tpl Log Message: A new feature is tested, dynamic buttons. I have coded this update so custom styles will not be affected... Index: pa_header.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/pa_header.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pa_header.tpl 9 Sep 2007 20:17:11 -0000 1.1 --- pa_header.tpl 27 Apr 2008 18:48:50 -0000 1.2 *************** *** 60,80 **** <td align="center" class="row1"> <!-- IF IS_AUTH_SEARCH --> ! <b> <a href="{U_PASEARCH}" class="gensmall"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH}" align="middle" /></a> </b> <!-- ENDIF --> <!-- IF IS_AUTH_STATS --> ! <b> <a href="{U_PASTATS}" class="gensmall"><img src="{STATS_IMG}" border="0" alt="{L_STATS}" align="middle" /></a> </b> <!-- ENDIF --> <!-- IF IS_AUTH_TOPLIST --> ! <b> <a href="{U_TOPLIST}" class="gensmall"><img src="{TOPLIST_IMG}" border="0" alt="{L_TOPLIST}" align="middle" /></a> </b> <!-- ENDIF --> <!-- IF IS_AUTH_UPLOAD --> ! <b> <a href="{U_UPLOAD}" class="gensmall"><img src="{UPLOAD_IMG}" border="0" alt="{L_UPLOAD}" align="middle" /></a> </b> <!-- ENDIF --> <!-- IF IS_AUTH_VIEWALL --> ! <b> <a href="{U_VIEW_ALL}" class="gensmall"><img src="{VIEW_ALL_IMG}" border="0" alt="{L_VIEW_ALL}" align="middle" /></a> </b> <!-- ENDIF --> <br /> <!-- IF IS_AUTH_MCP --> ! <b> <a href="{U_MCP}" class="gensmall">[{MCP_LINK}]</a> </b> <!-- ENDIF --> </td> --- 60,81 ---- <td align="center" class="row1"> <!-- IF IS_AUTH_SEARCH --> ! {B_SEARCH_IMG} <!-- ENDIF --> <!-- IF IS_AUTH_STATS --> ! {B_STATS_IMG} <!-- ENDIF --> <!-- IF IS_AUTH_TOPLIST --> ! {B_TOPLIST_IMG} <!-- ENDIF --> <!-- IF IS_AUTH_UPLOAD --> ! {B_UPLOAD_IMG} <!-- ENDIF --> <!-- IF IS_AUTH_VIEWALL --> ! {B_VIEW_ALL_IMG} ! <!-- <b> <a href="{U_VIEW_ALL}" class="gensmall"><img src="{VIEW_ALL_IMG}" border="0" alt="{L_VIEW_ALL}" align="middle" /></a> </b> --> <!-- ENDIF --> <br /> <!-- IF IS_AUTH_MCP --> ! {B_MCP_LINK} <!-- ENDIF --> </td> Index: pa_file_add.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/pa_file_add.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pa_file_add.tpl 9 Sep 2007 20:17:10 -0000 1.1 --- pa_file_add.tpl 27 Apr 2008 18:48:49 -0000 1.2 *************** *** 3,7 **** <!-- var error_msg = ""; ! function checkAddForm() { error_msg = ""; --- 3,7 ---- <!-- var error_msg = ""; ! function checkAddForm() { error_msg = ""; *************** *** 19,23 **** error_msg += "Please fill the file name field"; } ! if(document.form.long_desc.value == "") { --- 19,23 ---- error_msg += "Please fill the file name field"; } ! if(document.form.long_desc.value == "") { *************** *** 39,43 **** } <!-- ENDIF --> ! if(error_msg != "") { --- 39,43 ---- } <!-- ENDIF --> ! if(error_msg != "") { *************** *** 113,117 **** </td> </tr> ! <!-- IF IS_ADMIN or IS_MOD --> <tr> <td class="row1"><span class="genmed">{L_FILE_PINNED}</span><br><span class="gensmall">{L_FILE_PINNED_INFO}</span></td> --- 113,117 ---- </td> </tr> ! <!-- IF IS_ADMIN or IS_MOD --> <tr> <td class="row1"><span class="genmed">{L_FILE_PINNED}</span><br><span class="gensmall">{L_FILE_PINNED_INFO}</span></td> *************** *** 122,132 **** </tr> <tr> <td class="row1"><span class="genmed">{L_FILE_DOWNLOAD}</span></td> <td class="row2"><input type="text" class="post" size="10" name="file_download" value="{FILE_DOWNLOAD}" /></td> ! </tr> <!-- ENDIF --> <tr> <td class="cat" colspan="2" align="center"><span class="cattitle">{L_SCREENSHOT}</span></td> ! </tr> <tr> <td class="row1"><span class="genmed">{L_FILESS_UPLOAD}</span><br><span class="gensmall">{L_FILESSINFO_UPLOAD}</span></td> --- 122,143 ---- </tr> <tr> + <td class="row1"><span class="genmed">{L_FILE_DISABLE}</span><br><span class="gensmall">{L_FILE_DISABLE_INFO}</span></td> + <td class="row2"> + <input type="radio" name="file_disable" value="1"{DISABLE_CHECKED_YES} /><span class="genmed">{L_YES}</span> + <input type="radio" name="file_disable" value="0"{DISABLE_CHECKED_NO} /><span class="genmed">{L_NO}</span> + </td> + </tr> + <tr> + <td class="row1"><span class="genmed">{L_FILE_DISABLE_MSG}</span><br><span class="gensmall">{L_FILE_DISABLE_MSG_INFO}</span></td> + <td class="row2"><textarea rows="6" name="disable_msg" cols="32">{DISABLE_MSG}</textarea></td> + </tr> + <tr> <td class="row1"><span class="genmed">{L_FILE_DOWNLOAD}</span></td> <td class="row2"><input type="text" class="post" size="10" name="file_download" value="{FILE_DOWNLOAD}" /></td> ! </tr> <!-- ENDIF --> <tr> <td class="cat" colspan="2" align="center"><span class="cattitle">{L_SCREENSHOT}</span></td> ! </tr> <tr> <td class="row1"><span class="genmed">{L_FILESS_UPLOAD}</span><br><span class="gensmall">{L_FILESSINFO_UPLOAD}</span></td> *************** *** 134,138 **** <input type="file" size="50" name="screen_shot" maxlength="{FILESIZE}" class="post" /> </td> ! </tr> <tr> <td class="row1"><span class="genmed">{L_FILESS}</span><br><span class="gensmall">{L_FILESSINFO}</span></td> --- 145,149 ---- <input type="file" size="50" name="screen_shot" maxlength="{FILESIZE}" class="post" /> </td> ! </tr> <tr> <td class="row1"><span class="genmed">{L_FILESS}</span><br><span class="gensmall">{L_FILESSINFO}</span></td> *************** *** 147,154 **** <input type="radio" name="sshot_link" value="0" {SS_CHECKED_NO}><span class="genmed">{L_NO}</span> </td> ! </tr> <tr> <td class="cat" colspan="2" align="center"><span class="cattitle">{L_FILES}</span></td> ! </tr> <tr> <td class="row1"><span class="genmed">{L_FILE_UPLOAD}</span><br><span class="gensmall">{L_FILEINFO_UPLOAD}</span></td> --- 158,165 ---- <input type="radio" name="sshot_link" value="0" {SS_CHECKED_NO}><span class="genmed">{L_NO}</span> </td> ! </tr> <tr> <td class="cat" colspan="2" align="center"><span class="cattitle">{L_FILES}</span></td> ! </tr> <tr> <td class="row1"><span class="genmed">{L_FILE_UPLOAD}</span><br><span class="gensmall">{L_FILEINFO_UPLOAD}</span></td> *************** *** 156,160 **** <input type="file" size="50" name="userfile" maxlength="{FILESIZE}" class="post" /> </td> ! </tr> <tr> <td class="row1"><span class="genmed">{L_FILE_URL}</span><br><span class="gensmall">{L_FILE_URL_INFO}</span></td> --- 167,171 ---- <input type="file" size="50" name="userfile" maxlength="{FILESIZE}" class="post" /> </td> ! </tr> <tr> <td class="row1"><span class="genmed">{L_FILE_URL}</span><br><span class="gensmall">{L_FILE_URL_INFO}</span></td> *************** *** 173,177 **** <td align="center" class="cat" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_FILE_TITLE}" name="submit"></td> </tr> ! </table> </form> <!-- INCLUDE pa_footer.tpl --> --- 184,188 ---- <td align="center" class="cat" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_FILE_TITLE}" name="submit"></td> </tr> ! </table> </form> <!-- INCLUDE pa_footer.tpl --> Index: pa_quickdl_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/pa_quickdl_cat_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pa_quickdl_cat_body.tpl 28 Jan 2008 21:57:11 -0000 1.2 --- pa_quickdl_cat_body.tpl 27 Apr 2008 18:48:50 -0000 1.3 *************** *** 1,2 **** --- 1,23 ---- + <script language='javascript'> + <!-- + + var disableMsg = new Array(); + <!-- BEGIN file_rows --> + disableMsg['msg_{file_rows.FILE_ID}'] = '{file_rows.FILE_DISABLE_MSG}'; + <!-- END file_rows --> + + function disable_popup(id) + { + if (id) + { + alert(disableMsg['msg_'+id]); + } + else + { + alert('{FILE_DISABLE_MSG}'); + } + } + --> + </script> <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> Index: pa_viewall_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/pa_viewall_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pa_viewall_body.tpl 9 Sep 2007 20:17:14 -0000 1.1 --- pa_viewall_body.tpl 27 Apr 2008 18:48:50 -0000 1.2 *************** *** 1,2 **** --- 1,11 ---- + <script language='javascript'> + <!-- + function disable_popup() + { + alert('{FILE_DISABLE_MSG}'); + } + --> + </script> + <!-- INCLUDE pa_header.tpl --> <table width="100%" cellpadding="2" cellspacing="2"> *************** *** 11,15 **** <!-- IF FILELIST --> <table width="100%" cellpadding="4" cellspacing="1" class="forumline"> ! <tr> <th class="thCornerL" width="5%"> </th> <th class="thTop" width="35%">{L_FILE}</th> --- 20,24 ---- <!-- IF FILELIST --> <table width="100%" cellpadding="4" cellspacing="1" class="forumline"> ! <tr> <th class="thCornerL" width="5%"> </th> <th class="thTop" width="35%">{L_FILE}</th> *************** *** 24,28 **** <!-- BEGIN file_rows --> ! <tr> <td class="row1" align="center" valign="middle"><a href="{file_rows.U_FILE}" class="topictitle"><img src="{file_rows.PIN_IMAGE}" border="0"></a></td> <td class="row1" valign="middle"><a href="{file_rows.U_FILE}" class="topictitle">{file_rows.FILE_NAME}</a> <!-- IF file_rows.IS_NEW_FILE --><img src="{file_rows.FILE_NEW_IMAGE}" border="0" alt="{L_NEW_FILE}"><!-- ENDIF --><br><span class="genmed">{file_rows.FILE_DESC}</span></td> --- 33,37 ---- <!-- BEGIN file_rows --> ! <tr> <td class="row1" align="center" valign="middle"><a href="{file_rows.U_FILE}" class="topictitle"><img src="{file_rows.PIN_IMAGE}" border="0"></a></td> <td class="row1" valign="middle"><a href="{file_rows.U_FILE}" class="topictitle">{file_rows.FILE_NAME}</a> <!-- IF file_rows.IS_NEW_FILE --><img src="{file_rows.FILE_NEW_IMAGE}" border="0" alt="{L_NEW_FILE}"><!-- ENDIF --><br><span class="genmed">{file_rows.FILE_DESC}</span></td> *************** *** 50,54 **** <input type="hidden" name="action" value="viewall"> <input type="hidden" name="start" value="{START}"> ! <tr> <td class="cat" align="center" colspan="7"><span class="genmed">{L_SELECT_SORT_METHOD}: <select name="sort_method"> --- 59,63 ---- <input type="hidden" name="action" value="viewall"> <input type="hidden" name="start" value="{START}"> ! <tr> <td class="cat" align="center" colspan="7"><span class="genmed">{L_SELECT_SORT_METHOD}: <select name="sort_method"> *************** *** 85,92 **** <th class="thHead">{L_NO_FILES}</th> </tr> ! <tr> <td class="row1" align="center" height="30"><span class="genmed">{L_NO_FILES_CAT}</span></td> </tr> ! </table> <!-- ENDIF --> <!-- INCLUDE pa_footer.tpl --> --- 94,101 ---- <th class="thHead">{L_NO_FILES}</th> </tr> ! <tr> <td class="row1" align="center" height="30"><span class="genmed">{L_NO_FILES_CAT}</span></td> </tr> ! </table> <!-- ENDIF --> <!-- INCLUDE pa_footer.tpl --> Index: pa_toplist_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/pa_toplist_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pa_toplist_body.tpl 9 Sep 2007 20:17:14 -0000 1.1 --- pa_toplist_body.tpl 27 Apr 2008 18:48:50 -0000 1.2 *************** *** 1,2 **** --- 1,11 ---- + <script language='javascript'> + <!-- + function disable_popup() + { + alert('{FILE_DISABLE_MSG}'); + } + --> + </script> + <!-- INCLUDE pa_header.tpl --> <table width="100%" cellpadding="2" cellspacing="2"> *************** *** 9,16 **** <table width="100%" cellpadding="4" cellspacing="1" class="forumline"> ! <tr> <th class="thHead" colspan="7"> {L_TOPLIST}</th> </tr> ! <tr> <td colspan="7" class="row1" align="center"><span class="gen"><b>{L_CURRENT_TOPLIST} - {L_NEW_FILES}</b></span></td> </tr> --- 18,25 ---- <table width="100%" cellpadding="4" cellspacing="1" class="forumline"> ! <tr> <th class="thHead" colspan="7"> {L_TOPLIST}</th> </tr> ! <tr> <td colspan="7" class="row1" align="center"><span class="gen"><b>{L_CURRENT_TOPLIST} - {L_NEW_FILES}</b></span></td> </tr> *************** *** 18,23 **** <td colspan="7" class="row2" align="center"><span class="genmed"><a href="{U_NEWEST_FILE}" class="genmed">{L_NEWEST_FILE}</a> | <a href="{U_MOST_POPULAR}" class="genmed">{L_MOST_POPULAR}</a> | <a href="{U_TOP_RATED}" class="genmed">{L_TOP_RATED}</a></span></td> </tr> ! <!-- IF IS_NEWEST --> ! <tr> <td colspan="7" class="row1" align="center"> <span class="gen"> --- 27,32 ---- <td colspan="7" class="row2" align="center"><span class="genmed"><a href="{U_NEWEST_FILE}" class="genmed">{L_NEWEST_FILE}</a> | <a href="{U_MOST_POPULAR}" class="genmed">{L_MOST_POPULAR}</a> | <a href="{U_TOP_RATED}" class="genmed">{L_TOP_RATED}</a></span></td> </tr> ! <!-- IF IS_NEWEST --> ! <tr> <td colspan="7" class="row1" align="center"> <span class="gen"> *************** *** 27,32 **** </td> </tr> ! <!-- IF FILE_DATE --> ! <tr> <td colspan="7" class="row1" align="center"> <span class="gen"> --- 36,41 ---- </td> </tr> ! <!-- IF FILE_DATE --> ! <tr> <td colspan="7" class="row1" align="center"> <span class="gen"> *************** *** 38,45 **** </tr> <!-- ENDIF --> ! <!-- ENDIF --> <!-- IF IS_POPULAR --> ! <tr> <td colspan="7" class="row1" align="center"> <span class="genmed"> --- 47,54 ---- </tr> <!-- ENDIF --> ! <!-- ENDIF --> <!-- IF IS_POPULAR --> ! <tr> <td colspan="7" class="row1" align="center"> <span class="genmed"> *************** *** 53,57 **** <!-- IF FILE_LIST --> ! <tr> <td width="4%" align="center" class="cat" nowrap="nowrap"> </td> <td class="cat" align="center" nowrap="nowrap"><span class="cattitle"> {L_CATEGORY} </span></td> --- 62,66 ---- <!-- IF FILE_LIST --> ! <tr> <td width="4%" align="center" class="cat" nowrap="nowrap"> </td> <td class="cat" align="center" nowrap="nowrap"><span class="cattitle"> {L_CATEGORY} </span></td> *************** *** 65,69 **** </tr> <!-- BEGIN files_row --> ! <tr> <td class="row1" align="center" valign="middle"><a href="{files_row.U_FILE}" class="topictitle">{files_row.PIN_IMAGE}</a></td> <td class="row1"><span class="forumlink"><a href="{files_row.U_CAT}" class="forumlink">{files_row.CAT_NAME}</a></span></td> --- 74,78 ---- </tr> <!-- BEGIN files_row --> ! <tr> <td class="row1" align="center" valign="middle"><a href="{files_row.U_FILE}" class="topictitle">{files_row.PIN_IMAGE}</a></td> <td class="row1"><span class="forumlink"><a href="{files_row.U_CAT}" class="forumlink">{files_row.CAT_NAME}</a></span></td> *************** *** 75,84 **** <td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{files_row.RATING}</span></td> <!-- ENDIF --> ! </tr> <!-- END files_row --> ! <tr> <td colspan="7" class="cat" align="center">  </td> </tr> ! <!-- ENDIF --> </table> <!-- IF NO_FILE --> --- 84,93 ---- <td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{files_row.RATING}</span></td> <!-- ENDIF --> ! </tr> <!-- END files_row --> ! <tr> <td colspan="7" class="cat" align="center">  </td> </tr> ! <!-- ENDIF --> </table> <!-- IF NO_FILE --> *************** *** 87,94 **** <th class="thHead">{L_NO_FILES}</th> </tr> ! <tr> <td class="row1" align="center" height="30"><span class="genmed">{L_NO_FILES_CAT}</span></td> </tr> ! </table> <!-- ENDIF --> <!-- INCLUDE pa_footer.tpl --> \ No newline at end of file --- 96,103 ---- <th class="thHead">{L_NO_FILES}</th> </tr> ! <tr> <td class="row1" align="center" height="30"><span class="genmed">{L_NO_FILES_CAT}</span></td> </tr> ! </table> <!-- ENDIF --> <!-- INCLUDE pa_footer.tpl --> \ No newline at end of file Index: pa_file_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/pa_file_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pa_file_body.tpl 9 Sep 2007 20:17:10 -0000 1.1 --- pa_file_body.tpl 27 Apr 2008 18:48:49 -0000 1.2 *************** *** 12,15 **** --- 12,27 ---- } } + + function disable_popup(id) + { + if (id) + { + alert(disableMsg['msg_'+id]); + } + else + { + alert('{FILE_DISABLE_MSG}'); + } + } --> </script> *************** *** 29,36 **** <th class="thCornerR" align="right" nowrap> <!-- IF AUTH_EDIT --> ! <a href="{U_EDIT}"><img src="{EDIT_IMG}" border="0" alt="{L_EDIT}" /></a> <!-- ENDIF --> <!-- IF AUTH_DELETE --> ! <a href="javascript:delete_item('{U_DELETE}')"><img src="{DELETE_IMG}" border="0" alt="{L_DELETE}" /></a> <!-- ENDIF --> </th> --- 41,48 ---- <th class="thCornerR" align="right" nowrap> <!-- IF AUTH_EDIT --> ! {B_EDIT_IMG} <!-- ENDIF --> <!-- IF AUTH_DELETE --> ! {B_DELETE_IMG} <!-- ENDIF --> </th> *************** *** 112,124 **** <tr> <!-- IF AUTH_DOWNLOAD --> ! <td width="33%" align="center"><a href="{U_DOWNLOAD}"><img src="{DOWNLOAD_IMG}" border="0" alt="{L_DOWNLOAD}" /></a></td> <!-- ENDIF --> <!-- BEGIN use_ratings --> ! <td width="34%" align="center"><a href="{use_ratings.U_RATE}"><img src="{use_ratings.RATE_IMG}" border="0" alt="{use_ratings.L_RATE}" /></a></td> <!-- END use_ratings --> <!-- IF AUTH_EMAIL --> ! <td width="33%" align="center"><a href="{U_EMAIL}"><img src="{EMAIL_IMG}" border="0" alt="{L_EMAIL}" /></a></td> <!-- ENDIF --> </tr> --- 124,136 ---- <tr> <!-- IF AUTH_DOWNLOAD --> ! <td width="33%" align="center">{B_DOWNLOAD_IMG}</td> <!-- ENDIF --> <!-- BEGIN use_ratings --> ! <td width="34%" align="center">{use_ratings.B_RATE_IMG}</td> <!-- END use_ratings --> <!-- IF AUTH_EMAIL --> ! <td width="33%" align="center">{B_EMAIL_IMG}</td> <!-- ENDIF --> </tr> *************** *** 150,157 **** <td align="right"> <!-- BEGIN auth_edit --> ! <a href="{use_comments.text.auth_edit.U_COMMENT_EDIT}"><img src="{use_comments.text.auth_edit.EDIT_IMG}" alt="{use_comments.text.auth_edit.L_COMMENT_EDIT}" title="{use_comments.text.auth_edit.L_COMMENT_EDIT}" border="0"></a> <!-- END auth_edit --> <!-- BEGIN auth_delete --> ! <a href="{use_comments.text.auth_delete.U_COMMENT_DELETE}"><img src="{use_comments.text.auth_delete.DELETE_IMG}" alt="{use_comments.text.auth_delete.L_COMMENT_DELETE}" title="{use_comments.text.auth_delete.L_COMMENT_DELETE}" border="0"></a> <!-- END auth_delete --> </td> --- 162,169 ---- <td align="right"> <!-- BEGIN auth_edit --> ! {use_comments.text.auth_edit.B_EDIT_IMG} <!-- END auth_edit --> <!-- BEGIN auth_delete --> ! {use_comments.text.auth_delete.B_DELETE_IMG} <!-- END auth_delete --> </td> *************** *** 184,188 **** <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> ! <td><a href="{use_comments.auth_post.U_COMMENT_POST}"><img src="{use_comments.auth_post.REPLY_IMG}" border="0" alt="{use_comments.auth_post.L_COMMENT_ADD}" align="middle" /></a></td> </tr> </table> --- 196,200 ---- <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> ! <td>{use_comments.auth_post.B_REPLY_IMG}</td> </tr> </table> Index: pa_mini.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/templates/_core/pa_mini.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pa_mini.tpl 9 Sep 2007 20:17:12 -0000 1.1 --- pa_mini.tpl 27 Apr 2008 18:48:50 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + <script language='javascript'> + <!-- + + var disableMsg = new Array(); + <!-- BEGIN file_rows --> + disableMsg['msg_{file_rows.FILE_ID}'] = '{file_rows.FILE_DISABLE_MSG}'; + <!-- END file_rows --> + + function disable_popup(id) + { + if (id) + { + alert(disableMsg['msg_'+id]); + } + else + { + alert('{FILE_DISABLE_MSG}'); + } + } + --> + </script> + <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-top:none;"><tr><td> <tr> |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:46:49
|
Update of /cvsroot/mxbb/mx_faq In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14596 Modified Files: db_install.php db_upgrade.php Log Message: probably wise... Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_faq/db_install.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db_install.php 9 Feb 2008 00:00:45 -0000 1.4 --- db_install.php 27 Apr 2008 18:46:43 -0000 1.5 *************** *** 32,36 **** $mx_module_version = '2.0.1'; ! $mx_module_copy = 'Original mxBB <i>Faq & Rules</i> module by <a href="http://phpms.sourceforge.net" target="_blank">Selven</a>'; $message = "<b>This is a fresh install!</b><br/><br/>"; --- 32,36 ---- $mx_module_version = '2.0.1'; ! $mx_module_copy = 'Original Mx-Publisher <i>Faq & Rules</i> module by <a href="http://phpms.sourceforge.net" target="_blank">Selven</a>'; $message = "<b>This is a fresh install!</b><br/><br/>"; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_faq/db_upgrade.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db_upgrade.php 9 Feb 2008 00:00:45 -0000 1.4 --- db_upgrade.php 27 Apr 2008 18:46:43 -0000 1.5 *************** *** 32,36 **** $mx_module_version = '2.0.1'; ! $mx_module_copy = 'Original mxBB <i>Faq & Rules</i> module by <a href="http://phpms.sourceforge.net" target="_blank">Selven</a>'; $message = "<b>This is a fresh install!</b><br/><br/>"; --- 32,36 ---- $mx_module_version = '2.0.1'; ! $mx_module_copy = 'Original Mx-Publisher <i>Faq & Rules</i> module by <a href="http://phpms.sourceforge.net" target="_blank">Selven</a>'; $message = "<b>This is a fresh install!</b><br/><br/>"; |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:45:33
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13832 Modified Files: Tag: core28x mx_menu_nav.php mx_site_nav.php Log Message: Output duplicated template parameters, for compatibility with 2.9.x. Index: mx_menu_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v retrieving revision 1.22.2.1 retrieving revision 1.22.2.2 diff -C2 -d -r1.22.2.1 -r1.22.2.2 *** mx_menu_nav.php 3 Feb 2008 19:25:02 -0000 1.22.2.1 --- mx_menu_nav.php 27 Apr 2008 18:45:28 -0000 1.22.2.2 *************** *** 204,207 **** --- 204,208 ---- // $cat_on = $current_cat || $hasCurrentMenu ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $cat_id] == 1 : $catData[0]['cat_show'] == 1 ); + $style = $catData[0]['cat_url'] == $page_id && !$hasCurrentMenu ? 'cattitle' : 'genmed'; $template->assign_block_vars('catrow', array( *************** *** 209,215 **** 'BLOCK_ID' => intval($block_id), 'CATEGORY' => $catt, - 'CATEGORY_URL' => $cat_url, 'CATEGORY_NAME' => $cat, ! //'U_CAT_ICON' => $cat_icon, 'U_CAT_NAV_CONTRACT' => $images['mx_contract'], 'U_CAT_NAV_EXPAND' => $images['mx_expand'], --- 210,217 ---- 'BLOCK_ID' => intval($block_id), 'CATEGORY' => $catt, 'CATEGORY_NAME' => $cat, ! 'CATEGORY_STYLE' => $style, ! 'CATEGORY_URL' => $cat_url, ! 'U_CATEGORY_URL' => $cat_url, // For compatibility with 2.9.x+ 'U_CAT_NAV_CONTRACT' => $images['mx_contract'], 'U_CAT_NAV_EXPAND' => $images['mx_expand'], *************** *** 219,222 **** --- 221,233 ---- )); + if ( $catData[0]['cat_url'] != 0 ) + { + $template->assign_block_vars('catrow.menurow_cat', array( + 'CATEGORY_NAME' => $cat, + 'U_CATEGORY_URL' => $cat_url, + 'CATEGORY_STYLE' => $style, + )); + } + if (!empty($cat_desc)) { *************** *** 229,232 **** --- 240,244 ---- // Loop through each menu in this category // + $first_menu = true; foreach($catData as $key => $menuData) { *************** *** 241,244 **** --- 253,259 ---- } + $menu_sep = $first_menu ? '' : '|'; + $first_menu = false; + $action = $menuData['menu_name']; $action = ( !empty($lang[$action]) ? $lang[$action] : $action ); *************** *** 316,329 **** 'MENU_STYLE' => $style, 'MENU_DESC' => $desc, 'U_MENU_MODULE' => $menu_link, 'U_LINK_TARGET' => $link_target, ! 'U_MENU_ICON' => $menu_icon ); $template->assign_block_vars('catrow.modulerow', $menu_array); if ($current_cat) { $template->assign_block_vars('modulerow', $menu_array); } } --- 331,354 ---- 'MENU_STYLE' => $style, 'MENU_DESC' => $desc, + 'MENU_SEP' => $menu_sep, + 'U_MENU_MODULE' => $menu_link, 'U_LINK_TARGET' => $link_target, ! 'U_MENU_ICON' => $menu_icon, ! ! // For compatibility with 2.9.x+ ! 'U_MENU_URL' => $menu_link, ! 'U_MENU_URL_TARGET' => $link_target, ! 'MENU_ICON' => $icon_url, ! 'CURRENT' => $menuData['is_current'] ? '-current' : '', ); $template->assign_block_vars('catrow.modulerow', $menu_array); + $template->assign_block_vars('catrow.menurow', $menu_array); // For compatibility with 2.9.x+ if ($current_cat) { $template->assign_block_vars('modulerow', $menu_array); + $template->assign_block_vars('menurow', $menu_array); // For compatibility with 2.9.x+ } } *************** *** 340,343 **** --- 365,374 ---- 'CAT_WIDTH' => $cat_width, + //+ mxBB + 'U_PORTAL_ROOT_PATH' => PORTAL_URL, + 'U_PHPBB_ROOT_PATH' => PHPBB_URL, + 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, + 'TEMPLATE_IMAGES_PATH' => $images['mx_menu_images'], // Full path + // // mygosmenu Index: mx_site_nav.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** mx_site_nav.php 3 Feb 2008 19:25:03 -0000 1.1.2.1 --- mx_site_nav.php 27 Apr 2008 18:45:29 -0000 1.1.2.2 *************** *** 112,115 **** --- 112,120 ---- 'CAT_WIDTH' => $cat_width, + //+ mxBB + 'U_PORTAL_ROOT_PATH' => PORTAL_URL, + 'U_PHPBB_ROOT_PATH' => PHPBB_URL, + 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, + // // mygosmenu |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:45:33
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13832/includes Modified Files: Tag: core28x navmenu_functions.php Log Message: Output duplicated template parameters, for compatibility with 2.9.x. Index: navmenu_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** navmenu_functions.php 3 Feb 2008 19:26:05 -0000 1.7.2.1 --- navmenu_functions.php 27 Apr 2008 18:45:27 -0000 1.7.2.2 *************** *** 283,286 **** --- 283,287 ---- if ( isset( $mx_page->subpage_rowset[$page_parent] ) ) { + $first_menu = true; foreach( $mx_page->subpage_rowset[$page_parent] as $subpage_id => $page_data ) { *************** *** 292,295 **** --- 293,297 ---- { $cat = $page_data['page_name']; + $desc = $page_data['page_desc']; // *************** *** 331,335 **** // For overall_header navigation // - is this current page category? ! $current_parent_page = ($mx_page->page_id == $page_data['page_id'] || has_active_subpage($subpage_id) || ( isset($_GET['cat_link']) ? intval($_GET['cat_link']) == $page_data['page_id'] : false) ) ? true : false; // --- 333,338 ---- // For overall_header navigation // - is this current page category? ! //$current_parent_page = ($mx_page->page_id == $page_data['page_id'] || has_active_subpage($subpage_id) || ( isset($_GET['cat_link']) ? intval($_GET['cat_link']) == $page_data['page_id'] : false) ) ? true : false; ! $current_parent_page = ($mx_page->page_id == $page_data['page_id'] || has_active_subpage($subpage_id) ) ? true : false; // *************** *** 346,349 **** --- 349,354 ---- // $cat_on = $current_parent_page ? true : ( isset($HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $page_data['page_id']]) ? $HTTP_COOKIE_VARS['mxNavCat_' . $block_id . $page_data['page_id']] == 1 : $catData[0]['cat_show'] == 1 ); + $menu_sep = $first_menu ? '' : '|'; + $first_menu = false; $template->assign_block_vars('catrow', array( *************** *** 351,356 **** 'BLOCK_ID' => intval($block_id), 'CATEGORY' => $catt, ! 'CATEGORY_URL' => $cat_url, 'CATEGORY_NAME' => $cat, 'U_CAT_NAV_CONTRACT' => $images['mx_contract'], 'U_CAT_NAV_EXPAND' => $images['mx_expand'], --- 356,364 ---- 'BLOCK_ID' => intval($block_id), 'CATEGORY' => $catt, ! 'CATEGORY_NAME' => $cat, + 'CATEGORY_URL' => $cat_url, + 'U_CATEGORY_URL' => $cat_url, // For compatibility with 2.9.x+ + 'U_CAT_NAV_CONTRACT' => $images['mx_contract'], 'U_CAT_NAV_EXPAND' => $images['mx_expand'], *************** *** 358,373 **** 'CAT_SHOW' => $cat_on ? '' : 'none', 'U_MENU_ICON' => $menu_icon, ! 'CURRENT' => $current_parent_page ? '-current' : '' )); generate_site_menu( $subpage_id, $depth + 1, $current_parent_page ); } else { $is_current = $mx_page->page_id == $page_data['page_id']; $action = $page_data['page_name']; $action = ( !empty($lang[$action]) ? $lang[$action] : $action ); $style = $is_current ? 'cattitle' : 'genmed'; // // Get menu icon --- 366,422 ---- 'CAT_SHOW' => $cat_on ? '' : 'none', 'U_MENU_ICON' => $menu_icon, ! 'CURRENT' => $current_parent_page ? '-current' : '', ! 'MENU_SEP' => $menu_sep, ! ! // ! // Overall Nav ! // ! 'U_CATEGORY_URL' => $cat_url, ! 'U_CATEGORY_URL_TARGET' => $link_target, ! 'CATEGORY_NAME' => $cat, ! 'CATEGORY_DESC' => $desc, ! 'CATEGORY_STYLE' => $style, ! 'MENU_SEP' => $menu_sep, )); + if ($current_parent_page) + { + // + // Overall Nav + // + $is_current = $mx_page->page_id == $page_data['page_id']; + $style = $is_current ? 'cattitle' : 'genmed'; + $link_target = ( true ) ? '' : '_blank'; + + $template->assign_block_vars('menurow_cat', array( + // + // Overall Nav + // + 'U_CATEGORY_URL' => $cat_url, + 'U_CATEGORY_URL_TARGET' => $link_target, + 'CATEGORY_NAME' => $cat, + 'CATEGORY_DESC' => $desc, + 'CATEGORY_STYLE' => $style, + 'CURRENT' => $is_current ? '-current' : '', + + )); + } + + // Recursive call generate_site_menu( $subpage_id, $depth + 1, $current_parent_page ); } else { + $row_color_over = $theme['tr_color2']; + $is_current = $mx_page->page_id == $page_data['page_id']; $action = $page_data['page_name']; $action = ( !empty($lang[$action]) ? $lang[$action] : $action ); + $desc = $page_data['page_desc']; $style = $is_current ? 'cattitle' : 'genmed'; + $menu_sep = $first_menu ? '' : '|'; + $first_menu = false; + // // Get menu icon *************** *** 404,408 **** $link_target = ( true ) ? '' : '_blank'; - $row_color_over = $theme['tr_color2']; $menu_array = array( --- 453,456 ---- *************** *** 411,424 **** 'MENU_STYLE' => $style, 'MENU_DESC' => $desc, 'U_MENU_MODULE' => $menu_link, 'U_LINK_TARGET' => $link_target, ! 'U_MENU_ICON' => $menu_icon ); $template->assign_block_vars('catrow.modulerow', $menu_array); if ($current_parent_page) { $template->assign_block_vars('modulerow', $menu_array); } } --- 459,481 ---- 'MENU_STYLE' => $style, 'MENU_DESC' => $desc, + 'MENU_SEP' => $menu_sep, 'U_MENU_MODULE' => $menu_link, 'U_LINK_TARGET' => $link_target, ! 'U_MENU_ICON' => $menu_icon, ! ! // For compatibility with 2.9.x+ ! 'U_MENU_URL' => $menu_link, ! 'U_MENU_URL_TARGET' => $link_target, ! 'U_MENU_ICON' => $menu_icon, ! 'CURRENT' => $is_current ? '-current' : '', ); $template->assign_block_vars('catrow.modulerow', $menu_array); + $template->assign_block_vars('catrow.menurow', $menu_array); // For compatibility with 2.9.x+ if ($current_parent_page) { $template->assign_block_vars('modulerow', $menu_array); + $template->assign_block_vars('menurow', $menu_array); // For compatibility with 2.9.x+ } } |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:44:49
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13157 Modified Files: index.php Log Message: This and that, forgot the details...sorry... Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** index.php 9 Mar 2008 23:38:00 -0000 1.75 --- index.php 27 Apr 2008 18:44:42 -0000 1.76 *************** *** 11,14 **** --- 11,15 ---- define( 'IN_PORTAL', 1 ); + $phpEx = substr(strrchr(__FILE__, '.'), 1); $mx_root_path = "./"; |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:44:48
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13157/modules/mx_navmenu/includes Modified Files: navmenu_functions.php Log Message: This and that, forgot the details...sorry... Index: navmenu_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/includes/navmenu_functions.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** navmenu_functions.php 9 Mar 2008 23:39:30 -0000 1.13 --- navmenu_functions.php 27 Apr 2008 18:44:43 -0000 1.14 *************** *** 349,352 **** --- 349,354 ---- // $cat_on = $current_parent_page ? true : ( isset($_COOKIE['mxNavCat_' . $block_id . $page_data['page_id']]) ? $_COOKIE['mxNavCat_' . $block_id . $page_data['page_id']] == 1 : $catData[0]['cat_show'] == 1 ); + $menu_sep = $first_menu ? '' : '|'; + $first_menu = false; $template->assign_block_vars('catrow', array( *************** *** 362,365 **** --- 364,368 ---- 'U_MENU_ICON' => $menu_icon, 'CURRENT' => $current_parent_page ? '-current' : '', + 'MENU_SEP' => $menu_sep, // *************** *** 393,397 **** 'CATEGORY_STYLE' => $style, 'CURRENT' => $is_current ? '-current' : '', ! )); } --- 396,400 ---- 'CATEGORY_STYLE' => $style, 'CURRENT' => $is_current ? '-current' : '', ! 'MENU_SEP' => $menu_sep, )); } |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:43:43
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12530 Modified Files: Tag: core28x mx_functions_style.php Log Message: New style buttons... Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.17.2.24 retrieving revision 1.17.2.25 diff -C2 -d -r1.17.2.24 -r1.17.2.25 *** mx_functions_style.php 11 Mar 2008 19:58:29 -0000 1.17.2.24 --- mx_functions_style.php 27 Apr 2008 18:43:36 -0000 1.17.2.25 *************** *** 1040,1043 **** --- 1040,1120 ---- } + /** + * Create buttons. + * + * You can create code for buttons: + * 1) Simple textlinks (MX_BUTTON_TEXT) + * 2) Standard image links (MX_BUTTON_IMAGE) + * 3) Generic buttons, with spanning text on top background image (MX_BUTTON_GENERIC) + * + * Note: The rollover feature is done using a css shift technique, so you do not need separate images + * + * @param unknown_type $type + * @param unknown_type $label + * @param unknown_type $url + * @param unknown_type $img + */ + function create_button($key, $label, $url) + { + global $images; + + switch($images['buttontype'][$key]) + { + case MX_BUTTON_TEXT: + return '<a class="textbutton" href="'. $url .'"><span>' . $label . '</span></a>'; + break; + + case MX_BUTTON_IMAGE: + return '<a class="imagebutton" href="'. $url .'"><img src = "' . $images[$key] . '" alt="' . $label . '" title="' . $label . '" border="0"></a>'; + break; + + case MX_BUTTON_GENERIC: + return '<a class="genericbutton" href="'. $url .'"><span>' . $label . '</span></a>'; + break; + + default: + return '<a class="imagebutton" href="'. $url .'"><img src = "' . $images[$key] . '" alt="' . $label . '" title="' . $label . '" border="0"></a>'; + break; + } + } + + /** + * Create icons. + * + * You can create code for icons: + * 1) Simple textlinks (MX_BUTTON_TEXT) + * 2) Standard image links (MX_BUTTON_IMAGE) + * 3) Generic buttons, with spanning text on top background image (MX_BUTTON_GENERIC) + * + * Note: The rollover feature is done using a css shift technique, so you do not need separate images + * + * @param unknown_type $type + * @param unknown_type $label + * @param unknown_type $url + * @param unknown_type $img + */ + function create_icon($key, $label, $url) + { + global $images; + + switch($images['buttontype'][$key]) + { + case MX_BUTTON_TEXT: + return '<a class="textbutton" href="'. $url .'"><span>' . $label . '</span></a>'; + break; + + case MX_BUTTON_IMAGE: + return '<a class="imagebutton" href="'. $url .'"><img src = "' . $images[$key] . '" alt="' . $label . '" title="' . $label . '" border="0"></a>'; + break; + + case MX_BUTTON_GENERIC: + return '<a class="genericbutton" href="'. $url .'"><span>' . $label . '</span></a>'; + break; + + default: + return '<a class="imagebutton" href="'. $url .'"><img src = "' . $images[$key] . '" alt="' . $label . '" title="' . $label . '" border="0"></a>'; + break; + } + } } // class mx_user ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:43:03
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11813 Modified Files: mx_functions_core.php mx_functions_style.php mx_functions_tools.php Log Message: Includes/ updates. - general fixes (will be discussed in the forums later) - styling buttons Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** mx_functions_core.php 14 Mar 2008 20:39:24 -0000 1.87 --- mx_functions_core.php 27 Apr 2008 18:42:56 -0000 1.88 *************** *** 3524,3528 **** global $mx_root_path, $phpbb_root_path, $phpEx; ! $path = PORTAL_BACKEND == 'internal' || $force_shared ? $mx_root_path . 'includes/shared/' . PORTAL_BACKEND . '/includes/' : $phpbb_root_path . 'includes/'; if (file_exists($path . $file.'.'.$phpEx)) --- 3524,3544 ---- global $mx_root_path, $phpbb_root_path, $phpEx; ! if (PORTAL_BACKEND == 'internal' || $force_shared) ! { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $path = $mx_root_path . 'includes/shared/phpbb2/includes/'; ! break; ! case 'phpbb3': ! $path = $mx_root_path . 'includes/shared/phpbb3/includes/'; ! break; ! } ! } ! else ! { ! $path = $phpbb_root_path . 'includes/'; ! } if (file_exists($path . $file.'.'.$phpEx)) Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** mx_functions_style.php 27 Mar 2008 16:32:42 -0000 1.68 --- mx_functions_style.php 27 Apr 2008 18:42:57 -0000 1.69 *************** *** 402,405 **** --- 402,409 ---- define('MX_IMAGES_NONE' , 60); define('MX_LANG_CUSTOM' , 70); + + define('MX_BUTTON_IMAGE' , 10); + define('MX_BUTTON_TEXT' , 20); + define('MX_BUTTON_GENERIC' , 30); /**#@-*/ *************** *** 874,882 **** break; } ! if (empty($this->template_name)) { ! $row['head_stylesheet'] = $this->template_name = 'subSilver'; } $this->current_template_path = $this->template_path . $this->template_name; --- 878,888 ---- break; } ! ! /* Until discussed... if (empty($this->template_name)) { ! $row['head_stylesheet'] = $this->template_name = 'subSilver'; } + */ $this->current_template_path = $this->template_path . $this->template_name; *************** *** 1159,1163 **** { global $images, $board_config, $template, $phpbb_root_path, $mx_root_path, $theme, $current_module_images; ! global $mx_block; //unset($GLOBALS['MX_TEMPLATE_CONFIG']); --- 1165,1169 ---- { global $images, $board_config, $template, $phpbb_root_path, $mx_root_path, $theme, $current_module_images; ! global $mx_block, $mx_user; //unset($GLOBALS['MX_TEMPLATE_CONFIG']); *************** *** 1643,1646 **** --- 1649,1730 ---- } + /** + * Create buttons. + * + * You can create code for buttons: + * 1) Simple textlinks (MX_BUTTON_TEXT) + * 2) Standard image links (MX_BUTTON_IMAGE) + * 3) Generic buttons, with spanning text on top background image (MX_BUTTON_GENERIC) + * + * Note: The rollover feature is done using a css shift technique, so you do not need separate images + * + * @param unknown_type $type + * @param unknown_type $label + * @param unknown_type $url + * @param unknown_type $img + */ + function create_button($key, $label, $url) + { + global $images; + + switch($images['buttontype'][$key]) + { + case MX_BUTTON_TEXT: + return '<a class="textbutton" href="'. $url .'"><span>' . $label . '</span></a>'; + break; + + case MX_BUTTON_IMAGE: + return '<a class="imagebutton" href="'. $url .'"><img src = "' . $images[$key] . '" alt="' . $label . '" title="' . $label . '" border="0"></a>'; + break; + + case MX_BUTTON_GENERIC: + return '<a class="genericbutton" href="'. $url .'"><span>' . $label . '</span></a>'; + break; + + default: + return '<a class="imagebutton" href="'. $url .'"><img src = "' . $images[$key] . '" alt="' . $label . '" title="' . $label . '" border="0"></a>'; + break; + } + } + + /** + * Create icons. + * + * You can create code for icons: + * 1) Simple textlinks (MX_BUTTON_TEXT) + * 2) Standard image links (MX_BUTTON_IMAGE) + * 3) Generic buttons, with spanning text on top background image (MX_BUTTON_GENERIC) + * + * Note: The rollover feature is done using a css shift technique, so you do not need separate images + * + * @param unknown_type $type + * @param unknown_type $label + * @param unknown_type $url + * @param unknown_type $img + */ + function create_icon($key, $label, $url) + { + global $images; + + switch($images['buttontype'][$key]) + { + case MX_BUTTON_TEXT: + return '<a class="textbutton" href="'. $url .'"><span>' . $label . '</span></a>'; + break; + + case MX_BUTTON_IMAGE: + return '<a class="imagebutton" href="'. $url .'"><img src = "' . $images[$key] . '" alt="' . $label . '" title="' . $label . '" border="0"></a>'; + break; + + case MX_BUTTON_GENERIC: + return '<a class="genericbutton" href="'. $url .'"><span>' . $label . '</span></a>'; + break; + + default: + return '<a class="imagebutton" href="'. $url .'"><img src = "' . $images[$key] . '" alt="' . $label . '" title="' . $label . '" border="0"></a>'; + break; + } + } + } // class mx_user ?> \ No newline at end of file Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** mx_functions_tools.php 21 Mar 2008 20:12:45 -0000 1.26 --- mx_functions_tools.php 27 Apr 2008 18:42:57 -0000 1.27 *************** *** 3634,3637 **** --- 3634,3638 ---- var $images = array('icon_minipost'=>'', 'comment_post'=>'', 'icon_edit'=>'', 'icon_delpost'=>''); + var $u_post = ''; var $u_delete = ''; *************** *** 3753,3757 **** function display_internal_comments() { ! global $template, $lang, $board_config, $phpEx, $db, $userdata, $images; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars, $portal_config; --- 3754,3758 ---- function display_internal_comments() { ! global $template, $lang, $board_config, $phpEx, $db, $userdata, $images, $mx_user; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars, $portal_config; *************** *** 3913,3917 **** 'L_COMMENT_EDIT' => $lang['Comment_edit'], 'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['comments_id']), ! 'EDIT_IMG' => $this->images['icon_edit'], )); } --- 3914,3919 ---- 'L_COMMENT_EDIT' => $lang['Comment_edit'], 'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['comments_id']), ! 'EDIT_IMG' => $images[$this->images['icon_edit']], ! 'B_EDIT_IMG' => $mx_user->create_button($this->images['icon_edit'], $lang['Comment_edit'], $this->u_edit($this->comments_row['comments_id'])), )); } *************** *** 3922,3926 **** 'L_COMMENT_DELETE' => $lang['Comment_delete'], 'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['comments_id']), ! 'DELETE_IMG' => $this->images['icon_delpost'], )); } --- 3924,3929 ---- 'L_COMMENT_DELETE' => $lang['Comment_delete'], 'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['comments_id']), ! 'DELETE_IMG' => $images[$this->images['icon_delpost']], ! 'B_DELETE_IMG' => $mx_user->create_button($this->images['icon_delpost'], $lang['Comment_delete'], $this->u_delete($this->comments_row['comments_id'])), )); } *************** *** 3933,3937 **** 'L_COMMENT_ADD' => $lang['Comment_add'], 'U_COMMENT_POST' => $this->u_post(), ! 'REPLY_IMG' => $this->images['comment_post'], )); } --- 3936,3941 ---- 'L_COMMENT_ADD' => $lang['Comment_add'], 'U_COMMENT_POST' => $this->u_post(), ! 'REPLY_IMG' => $images[$this->images['comment_post']], ! 'B_REPLY_IMG' => $mx_user->create_button($this->images['comment_post'], $lang['Comment_add'], $this->u_post()), )); } *************** *** 3957,3961 **** function display_phpbb_comments( ) { ! global $template, $lang, $board_config, $phpEx, $db, $userdata, $images; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars, $portal_config; --- 3961,3965 ---- function display_phpbb_comments( ) { ! global $template, $lang, $board_config, $phpEx, $db, $userdata, $images, $mx_user; global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars, $portal_config; *************** *** 4150,4154 **** 'L_COMMENT_EDIT' => $lang['Comment_edit'], 'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['post_id']), ! 'EDIT_IMG' => $this->images['icon_edit'], )); } --- 4154,4159 ---- 'L_COMMENT_EDIT' => $lang['Comment_edit'], 'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['post_id']), ! 'EDIT_IMG' => $images[$this->images['icon_edit']], ! 'B_EDIT_IMG' => $mx_user->create_button($this->images['icon_edit'], $lang['Comment_edit'], $this->u_edit($this->comments_row['post_id'])), )); } *************** *** 4159,4163 **** 'L_COMMENT_DELETE' => $lang['Comment_delete'], 'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['post_id']), ! 'DELETE_IMG' => $this->images['icon_delpost'], )); } --- 4164,4169 ---- 'L_COMMENT_DELETE' => $lang['Comment_delete'], 'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['post_id']), ! 'DELETE_IMG' => $images[$this->images['icon_delpost']], ! 'B_DELETE_IMG' => $mx_user->create_button($this->images['icon_delpost'], $lang['Comment_delete'], $this->u_delete($this->comments_row['post_id'])), )); } *************** *** 4170,4174 **** 'L_COMMENT_ADD' => $lang['Comment_add'], 'U_COMMENT_POST' => $this->u_post(), ! 'REPLY_IMG' => $this->images['comment_post'], )); } --- 4176,4181 ---- 'L_COMMENT_ADD' => $lang['Comment_add'], 'U_COMMENT_POST' => $this->u_post(), ! 'REPLY_IMG' => $images[$this->images['comment_post']], ! 'B_REPLY_IMG' => $mx_user->create_button($this->images['comment_post'], $lang['Comment_add'], $this->u_post()), )); } |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:41:19
|
Update of /cvsroot/mxbb/core/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10879 Modified Files: Tag: core28x subSilver.cfg Log Message: Style update Index: subSilver.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/subSilver.cfg,v retrieving revision 1.7.2.7 retrieving revision 1.7.2.8 diff -C2 -d -r1.7.2.7 -r1.7.2.8 *** subSilver.cfg 17 Feb 2008 12:55:33 -0000 1.7.2.7 --- subSilver.cfg 27 Apr 2008 18:41:08 -0000 1.7.2.8 *************** *** 68,72 **** // Standalone mxBB installation? Where are the phpbb images? // ! $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // --- 68,72 ---- // Standalone mxBB installation? Where are the phpbb images? // ! $mx_images['mx_graphics']['phpbb_icons'] = !empty($current_template_path) && file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:41:00
|
Update of /cvsroot/mxbb/core/templates/subsilver2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10176/subsilver2 Modified Files: subsilver2.cfg Log Message: Style improvements... Index: subsilver2.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/subsilver2/subsilver2.cfg,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** subsilver2.cfg 4 Feb 2008 16:02:07 -0000 1.4 --- subsilver2.cfg 27 Apr 2008 18:40:25 -0000 1.5 *************** *** 65,69 **** $mx_images['mx_graphics']['menu_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/menu_icons" ) ? $current_template_path . "/images/menu_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/menu_icons" ) ? $cloned_template_path . "/images/menu_icons" : $default_template_path . "/images/menu_icons" ); $mx_images['mx_graphics']['admin_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/admin_icons" ) ? $current_template_path . "/images/admin_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/admin_icons" ) ? $cloned_template_path . "/images/admin_icons" : $default_template_path . "/images/admin_icons" ); ! $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // --- 65,69 ---- $mx_images['mx_graphics']['menu_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/menu_icons" ) ? $current_template_path . "/images/menu_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/menu_icons" ) ? $cloned_template_path . "/images/menu_icons" : $default_template_path . "/images/menu_icons" ); $mx_images['mx_graphics']['admin_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/admin_icons" ) ? $current_template_path . "/images/admin_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/admin_icons" ) ? $cloned_template_path . "/images/admin_icons" : $default_template_path . "/images/admin_icons" ); ! $mx_images['mx_graphics']['phpbb_icons'] = !empty($current_template_path) && file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:41:00
|
Update of /cvsroot/mxbb/core/templates/mxBase2 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10176/mxBase2 Modified Files: mxBase2.cfg mxBase2.css mx_main_layout.tpl mx_main_layout_1_col.tpl overall_header.tpl Log Message: Style improvements... Index: mxBase2.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase2/mxBase2.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mxBase2.cfg 16 Feb 2008 21:43:26 -0000 1.2 --- mxBase2.cfg 27 Apr 2008 18:40:18 -0000 1.3 *************** *** 61,65 **** // Standalone mxBB installation? Where are the phpbb images? // ! //$mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/phpbb2" ) ? $current_template_path . "/images/phpbb2" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/phpbb2" ) ? $cloned_template_path . "/images/phpbb2" : $default_template_path . "/images/phpbb2" ); --- 61,65 ---- // Standalone mxBB installation? Where are the phpbb images? // ! //$mx_images['mx_graphics']['phpbb_icons'] = !empty($current_template_path) && file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/phpbb2" ) ? $current_template_path . "/images/phpbb2" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/phpbb2" ) ? $cloned_template_path . "/images/phpbb2" : $default_template_path . "/images/phpbb2" ); Index: mx_main_layout.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase2/mx_main_layout.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_main_layout.tpl 11 Feb 2008 22:57:06 -0000 1.1 --- mx_main_layout.tpl 27 Apr 2008 18:40:20 -0000 1.2 *************** *** 12,18 **** <!-- END block_header --> - <!-- BEGIN show_title --> - <span class="blocktitle">{layout_column.blocks.show_title.L_TITLE}</span> - <!-- END show_title --> <!-- BEGIN edit --> <div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};"> --- 12,15 ---- *************** *** 29,32 **** --- 26,33 ---- <!-- END edit --> + <!-- BEGIN show_title --> + <span class="blocktitle">{layout_column.blocks.show_title.L_TITLE}</span> + <!-- END show_title --> + <!-- BEGIN block_header --> </div> Index: overall_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase2/overall_header.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** overall_header.tpl 21 Feb 2008 20:03:58 -0000 1.2 --- overall_header.tpl 27 Apr 2008 18:40:24 -0000 1.3 *************** *** 160,168 **** </form> </div> ! </div> ! ! ! ! ! ! --- 160,162 ---- </form> </div> ! </div> \ No newline at end of file Index: mxBase2.css =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase2/mxBase2.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mxBase2.css 18 Feb 2008 18:35:56 -0000 1.2 --- mxBase2.css 27 Apr 2008 18:40:19 -0000 1.3 *************** *** 5,9 **** /* Fix for centering the container in IE */ body{ ! text-align: center; margin: 0px; padding: 0px; --- 5,9 ---- /* Fix for centering the container in IE */ body{ ! /* text-align: center; */ margin: 0px; padding: 0px; *************** *** 141,144 **** --- 141,146 ---- /*background-repeat: repeat-y;*/ /*background-position: right;*/ + + overflow:hidden; } *************** *** 165,168 **** --- 167,171 ---- /* Top header */ #header .globalNav .cat-button, #header .globalNav .cat-button-current{ + white-space: nowrap; padding: 3px 6px; } *************** *** 277,300 **** } ! div.editCP_switch{ ! position: relative; ! margin-top: -20px; ! margin-right: 0px; ! padding: 0px; float: right; } ! div.blockhidden{ ! position: relative; ! margin-top: -20px; ! margin-left: 0px; padding: 0px; - float: left; } ! /* Form elements */ ! .trimform { ! margin-bottom: 0px; ! margin-top: 0px; } --- 280,298 ---- } ! div.blockheader .blockhidden{ float: right; + margin: 0px; + padding: 0px; } ! div.blockheader .editCP_switch{ ! float: right; ! margin: 0px; padding: 0px; } ! div.blockheader .editCP_switch .trimform { ! margin: 0px; ! padding: 0px; } *************** *** 406,415 **** /* This is the outline round the main forum tables */ ! .forumline { } /* Main table cell colours and backgrounds */ ! td.row1 { } ! td.row2 { background-color: #DEE3E7; } ! td.row3 { background-color: #D1D7DC; } td.oddcell { background-color: #97AC7C; } --- 404,416 ---- /* This is the outline round the main forum tables */ ! #leftcol .forumline { ! border: 1px solid #00355C; ! border-width: 1px 0px 1px 1px; ! } /* Main table cell colours and backgrounds */ ! td.row1 { background-color: #ffffff; } ! td.row2 { background-color: #eeeeee; } ! td.row3 { background-color: #dddddd; } td.oddcell { background-color: #97AC7C; } *************** *** 431,434 **** --- 432,438 ---- #middlecol div.block img { margin: 4px 10px 4px 4px; } + .ImageFrame_image { margin: 0px; padding: 0px; } /* Gallery Fix */ + #middlecol div.block img.ImageFrame_image { margin: 0px; padding: 0px; } /* Gallery Fix */ + div.block p { margin: 0.7em 0px 0.7em 0px; } Index: mx_main_layout_1_col.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase2/mx_main_layout_1_col.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_main_layout_1_col.tpl 11 Feb 2008 22:57:06 -0000 1.1 --- mx_main_layout_1_col.tpl 27 Apr 2008 18:40:23 -0000 1.2 *************** *** 12,18 **** <!-- END block_header --> - <!-- BEGIN show_title --> - <span class="blocktitle">{layout_column.blocks.show_title.L_TITLE}</span> - <!-- END show_title --> <!-- BEGIN edit --> <div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};"> --- 12,15 ---- *************** *** 29,32 **** --- 26,33 ---- <!-- END edit --> + <!-- BEGIN show_title --> + <span class="blocktitle">{layout_column.blocks.show_title.L_TITLE}</span> + <!-- END show_title --> + <!-- BEGIN block_header --> </div> |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:40:59
|
Update of /cvsroot/mxbb/core/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10176/prosilver Modified Files: prosilver.cfg Log Message: Style improvements... Index: prosilver.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/prosilver/prosilver.cfg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** prosilver.cfg 6 Feb 2008 23:44:18 -0000 1.6 --- prosilver.cfg 27 Apr 2008 18:40:25 -0000 1.7 *************** *** 65,69 **** $mx_images['mx_graphics']['menu_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/menu_icons" ) ? $current_template_path . "/images/menu_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/menu_icons" ) ? $cloned_template_path . "/images/menu_icons" : $default_template_path . "/images/menu_icons" ); $mx_images['mx_graphics']['admin_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/admin_icons" ) ? $current_template_path . "/images/admin_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/admin_icons" ) ? $cloned_template_path . "/images/admin_icons" : $default_template_path . "/images/admin_icons" ); ! $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // --- 65,69 ---- $mx_images['mx_graphics']['menu_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/menu_icons" ) ? $current_template_path . "/images/menu_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/menu_icons" ) ? $cloned_template_path . "/images/menu_icons" : $default_template_path . "/images/menu_icons" ); $mx_images['mx_graphics']['admin_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/admin_icons" ) ? $current_template_path . "/images/admin_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/admin_icons" ) ? $cloned_template_path . "/images/admin_icons" : $default_template_path . "/images/admin_icons" ); ! $mx_images['mx_graphics']['phpbb_icons'] = !empty($current_template_path) && file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:40:59
|
Update of /cvsroot/mxbb/core/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10176/subSilver Modified Files: subSilver.cfg Log Message: Style improvements... Index: subSilver.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/subSilver/subSilver.cfg,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** subSilver.cfg 16 Feb 2008 21:43:26 -0000 1.11 --- subSilver.cfg 27 Apr 2008 18:40:25 -0000 1.12 *************** *** 65,69 **** $mx_images['mx_graphics']['menu_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/menu_icons" ) ? $current_template_path . "/images/menu_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/menu_icons" ) ? $cloned_template_path . "/images/menu_icons" : $default_template_path . "/images/menu_icons" ); $mx_images['mx_graphics']['admin_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/admin_icons" ) ? $current_template_path . "/images/admin_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/admin_icons" ) ? $cloned_template_path . "/images/admin_icons" : $default_template_path . "/images/admin_icons" ); ! $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // --- 65,69 ---- $mx_images['mx_graphics']['menu_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/menu_icons" ) ? $current_template_path . "/images/menu_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/menu_icons" ) ? $cloned_template_path . "/images/menu_icons" : $default_template_path . "/images/menu_icons" ); $mx_images['mx_graphics']['admin_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/admin_icons" ) ? $current_template_path . "/images/admin_icons" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/admin_icons" ) ? $cloned_template_path . "/images/admin_icons" : $default_template_path . "/images/admin_icons" ); ! $mx_images['mx_graphics']['phpbb_icons'] = !empty($current_template_path) && file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); // |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:40:58
|
Update of /cvsroot/mxbb/core/templates/mxSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10176/mxSilver Modified Files: mxSilver.cfg Log Message: Style improvements... Index: mxSilver.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxSilver/mxSilver.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mxSilver.cfg 16 Feb 2008 21:43:26 -0000 1.3 --- mxSilver.cfg 27 Apr 2008 18:40:24 -0000 1.4 *************** *** 69,73 **** // Standalone MX-Publisher installation? Where are the phpbb images? // ! //$mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/phpbb2" ) ? $current_template_path . "/images/phpbb2" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/phpbb2" ) ? $cloned_template_path . "/images/phpbb2" : $default_template_path . "/images/phpbb2" ); --- 69,73 ---- // Standalone MX-Publisher installation? Where are the phpbb images? // ! //$mx_images['mx_graphics']['phpbb_icons'] = !empty($current_template_path) && file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/phpbb2" ) ? $current_template_path . "/images/phpbb2" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/phpbb2" ) ? $cloned_template_path . "/images/phpbb2" : $default_template_path . "/images/phpbb2" ); |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:40:55
|
Update of /cvsroot/mxbb/core/templates/mxBase1 In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10176/mxBase1 Modified Files: mxBase1.cfg mxBase1.css mx_main_layout.tpl Log Message: Style improvements... Index: mx_main_layout.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase1/mx_main_layout.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_main_layout.tpl 11 Feb 2008 22:56:39 -0000 1.1 --- mx_main_layout.tpl 27 Apr 2008 18:40:17 -0000 1.2 *************** *** 11,17 **** <!-- END block_header --> - <!-- BEGIN show_title --> - <span class="blocktitle">{layout_column.blocks.show_title.L_TITLE}</span> - <!-- END show_title --> <!-- BEGIN edit --> <div class="editCP_switch" style="display: {layout_column.blocks.edit.EDITCP_SHOW};"> --- 11,14 ---- *************** *** 28,31 **** --- 25,32 ---- <!-- END edit --> + <!-- BEGIN show_title --> + <span class="blocktitle">{layout_column.blocks.show_title.L_TITLE}</span> + <!-- END show_title --> + <!-- BEGIN block_header --> </div> Index: mxBase1.cfg =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase1/mxBase1.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mxBase1.cfg 16 Feb 2008 21:43:26 -0000 1.2 --- mxBase1.cfg 27 Apr 2008 18:40:17 -0000 1.3 *************** *** 61,65 **** // Standalone mxBB installation? Where are the phpbb images? // ! //$mx_images['mx_graphics']['phpbb_icons'] = file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/phpbb2" ) ? $current_template_path . "/images/phpbb2" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/phpbb2" ) ? $cloned_template_path . "/images/phpbb2" : $default_template_path . "/images/phpbb2" ); --- 61,65 ---- // Standalone mxBB installation? Where are the phpbb images? // ! //$mx_images['mx_graphics']['phpbb_icons'] = !empty($current_template_path) && file_exists( $phpbb_root_path . $current_template_path . "/images" ) ? $current_template_path . "/images" : ( !empty($cloned_template_path) && file_exists( $phpbb_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path . "/images" : $default_template_path . "/images"); $mx_images['mx_graphics']['phpbb_icons'] = file_exists( $mx_root_path . $current_template_path . "/images/phpbb2" ) ? $current_template_path . "/images/phpbb2" : ( file_exists( $mx_root_path . $cloned_template_path . "/images/phpbb2" ) ? $cloned_template_path . "/images/phpbb2" : $default_template_path . "/images/phpbb2" ); Index: mxBase1.css =================================================================== RCS file: /cvsroot/mxbb/core/templates/mxBase1/mxBase1.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mxBase1.css 18 Feb 2008 18:35:56 -0000 1.2 --- mxBase1.css 27 Apr 2008 18:40:17 -0000 1.3 *************** *** 5,9 **** /* Fix for centering the container in IE */ body{ ! text-align: center; margin: 0px; padding: 0px; --- 5,9 ---- /* Fix for centering the container in IE */ body{ ! /* text-align: center; */ margin: 0px; padding: 0px; *************** *** 121,124 **** --- 121,126 ---- /*background-repeat: repeat-y;*/ /*background-position: right;*/ + + overflow:hidden; } *************** *** 145,148 **** --- 147,151 ---- /* Top header */ #header .globalNav .cat-button, #header .globalNav .cat-button-current{ + white-space: nowrap; padding: 3px 6px; } *************** *** 235,239 **** div.blockheader{ margin: 0px; ! padding: 2px 5px; /* background: url(/templates/mxBase1/images/cornerr.gif) top right no-repeat; */ --- 238,242 ---- div.blockheader{ margin: 0px; ! padding: 4px 4px; /* background: url(/templates/mxBase1/images/cornerr.gif) top right no-repeat; */ *************** *** 257,280 **** } ! div.editCP_switch{ ! position: relative; ! margin-top: -20px; ! margin-right: 0px; ! padding: 0px; float: right; } ! div.blockhidden{ ! position: relative; ! margin-top: -20px; ! margin-left: 0px; padding: 0px; - float: left; } ! /* Form elements */ ! .trimform { ! margin-bottom: 0px; ! margin-top: 0px; } --- 260,278 ---- } ! div.blockheader .blockhidden{ float: right; + margin: 0px; + padding: 0px; } ! div.blockheader .editCP_switch{ ! float: right; ! margin: 0px; padding: 0px; } ! div.blockheader .editCP_switch .trimform { ! margin: 0px; ! padding: 0px; } *************** *** 384,393 **** /* This is the outline round the main forum tables */ ! .forumline { } /* Main table cell colours and backgrounds */ ! td.row1 { } ! td.row2 { background-color: #DEE3E7; } ! td.row3 { background-color: #D1D7DC; } td.oddcell { background-color: #97AC7C; } --- 382,395 ---- /* This is the outline round the main forum tables */ ! #leftcol .forumline { ! border: 1px solid #00355C; ! border-width: 1px 0px 1px 1px; ! } ! /* Main table cell colours and backgrounds */ ! td.row1 { background-color: #ffffff; } ! td.row2 { background-color: #eeeeee; } ! td.row3 { background-color: #dddddd; } td.oddcell { background-color: #97AC7C; } *************** *** 409,412 **** --- 411,417 ---- #middlecol div.block img { margin: 4px 10px 4px 4px; } + .ImageFrame_image { margin: 0px; padding: 0px; } /* Gallery Fix */ + #middlecol div.block img.ImageFrame_image { margin: 0px; padding: 0px; } /* Gallery Fix */ + div.block p { margin: 0.7em 0px 0.7em 0px; } |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:39:12
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9544 Modified Files: Tag: core28x index.php Log Message: Modfied SIDs fix, to ensure SIDs are added. Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.32.2.3 retrieving revision 1.32.2.4 diff -C2 -d -r1.32.2.3 -r1.32.2.4 *** index.php 19 Feb 2008 22:04:35 -0000 1.32.2.3 --- index.php 27 Apr 2008 18:39:05 -0000 1.32.2.4 *************** *** 164,168 **** //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid(PORTAL_URL . $file) )); $row_count++; --- 164,168 ---- //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid(PORTAL_URL . $file . ( ( strpos($file, '?') !== false ) ? '&sid=' : '?sid=' ) . $userdata['session_id']) )); $row_count++; *************** *** 216,220 **** //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid(PHPBB_URL . 'admin/' . $file)) ); $row_count++; --- 216,220 ---- //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid(PHPBB_URL . 'admin/' . $file . ( ( strpos($file, '?') !== false ) ? '&sid=' : '?sid=' ) . $userdata['session_id'])) ); $row_count++; |
|
From: Jon O. <jon...@us...> - 2008-04-27 18:38:46
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9115 Modified Files: index.php Log Message: Modfied SIDs fix, to ensure SIDs are added. Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** index.php 25 Mar 2008 05:21:58 -0000 1.45 --- index.php 27 Apr 2008 18:38:41 -0000 1.46 *************** *** 164,168 **** //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => mx_append_sid(PORTAL_URL . $file) )); $row_count++; --- 164,168 ---- //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => mx_append_sid(PORTAL_URL . $file . ( ( strpos($file, '?') !== false ) ? '&sid=' : '?sid=' ) . $userdata['session_id']) )); $row_count++; *************** *** 223,228 **** //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => mx_append_sid(PHPBB_URL . 'admin/' . $file) ! )); $row_count++; } --- 223,228 ---- //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => mx_append_sid(PHPBB_URL . 'admin/' . $file . ( ( strpos($file, '?') !== false ) ? '&sid=' : '?sid=' ) . $userdata['session_id'])) ! ); $row_count++; } |
|
From: OryNider <ory...@us...> - 2008-04-20 08:01:32
|
Update of /cvsroot/mxbb/mx_shotcast/images/aero In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8379/aero Modified Files: stop.jpg Log Message: 3.0.0-RC Index: stop.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/images/aero/stop.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs4FbtEF and /tmp/cvs4ioBRM differ |
|
From: OryNider <ory...@us...> - 2008-04-20 07:22:17
|
Update of /cvsroot/mxbb/mx_shotcast In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19604 Modified Files: db_install.php db_upgrade.php getinfo.php radioplayer.php shotcast_front.php Log Message: 3.0.0-RC Index: shotcast_front.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/shotcast_front.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shotcast_front.php 28 Feb 2008 06:26:39 -0000 1.7 --- shotcast_front.php 20 Apr 2008 07:21:40 -0000 1.8 *************** *** 224,227 **** --- 224,231 ---- $template->pparse('body'); + + // REMOVE OLD SESSIONS + drop_shotcast_users($period); + unset($liteners, $sql, $howmanylisten, $listeners_list, $block_size, $module_root_path, $isimler, $can_listen); ?> Index: radioplayer.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/radioplayer.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** radioplayer.php 6 Mar 2008 03:20:54 -0000 1.9 --- radioplayer.php 20 Apr 2008 07:21:40 -0000 1.10 *************** *** 53,58 **** user_listensc($nick); ?> ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ! "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> --- 53,57 ---- user_listensc($nick); ?> ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> *************** *** 70,74 **** margin: 0; padding: 0; ! font-family: Verdana; font-size: 10px; } --- 69,73 ---- margin: 0; padding: 0; ! font-family: Trebuchet MS, Lucida Grande, Verdana, Helvetica, Arial, sans-serif; font-size: 10px; } *************** *** 76,84 **** margin: 0; padding: 0; ! font-family: Verdana; font-size: 10px; color: #ffffff; BACKGROUND-IMAGE: url('<?=$module_root_path;?>images/<?=SKIN;?>/playerbg.png'); } a, a:visited, a:active{ text-decoration: none; --- 75,106 ---- margin: 0; padding: 0; ! font-family: Trebuchet MS, Lucida Grande, Verdana, Helvetica, Arial, sans-serif; font-size: 10px; color: #ffffff; BACKGROUND-IMAGE: url('<?=$module_root_path;?>images/<?=SKIN;?>/playerbg.png'); } + /* General markup styles + ---------------------------------------- */ + * { + font-size: 100%; + } + + body, div, p, th, td, li, dd { + voice-family: "\"}\""; + voice-family: inherit; + } + + html { + /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-ie browsers */ + height: 100%; + margin-bottom: 1px; + } + + /* General font families for common tags */ + font,th,td,p { font-family: Trebuchet MS, Lucida Grande, Verdana, Helvetica, Arial, sans-serif; } + + img { + border: 0; + } a, a:visited, a:active{ text-decoration: none; *************** *** 87,95 **** } select{ ! font-family: Verdana; font-size: 10px; background-color: #f1f1f1; border: 0px; } #shell{ background-image: url('<?=$module_root_path;?>images/<?=SKIN;?>/shell.jpg'); --- 109,128 ---- } select{ ! font-family: Helvetica, Lucida Grande, Verdana, Helvetica, Arial, sans-serif; font-size: 10px; background-color: #f1f1f1; border: 0px; } + station{ + font-weight: bold; + font-size: 12px; + font-family: Calibri, Helvetica, sans-serif; + + } + #station{ + font-weight: bold; + font-size: 12px; + font-family: Calibri, Helvetica, sans-serif; + } #shell{ background-image: url('<?=$module_root_path;?>images/<?=SKIN;?>/shell.jpg'); *************** *** 106,117 **** } #songtitle{ - left: 10px; - top: 30px; - position: absolute; - } - #songtitle{ width: 305px; left: 10px; ! top: 28px; position: absolute; } --- 139,148 ---- } #songtitle{ width: 305px; left: 10px; ! top: 30px; ! font-weight: bold; ! font-size: 12px; ! font-family: Calibri, Trebuchet MS, Lucida Grande, Helvetica, Verdana, sans-serif; position: absolute; } *************** *** 157,161 **** } #closeButton{ ! left: 305px; top: 2px; position: absolute; --- 188,192 ---- } #closeButton{ ! left: 300px; top: 2px; position: absolute; *************** *** 169,175 **** --- 200,216 ---- loadimg2 = new Image(19,19); loadimg2.src = "<?=$module_root_path;?>images/<?=SKIN;?>/stop_h.jpg"; + loadimg3 = new Image(18,18); + loadimg3.src = "<?=$module_root_path;?>images/<?=SKIN;?>/close_h.png"; window.onload = function(){ checkSong(); embedInfo(detectEmbed()); + <?php + if($autoplay) + { + ?> + playR(); + <?php + } + ?> } //--> *************** *** 181,186 **** <body> <div id="shell"> ! <div id="station">Radio Player :: <?=$station;?></div> ! <div id="songtitle"> <?php --- 222,226 ---- <body> <div id="shell"> ! <div style="font-weight: bold; font-size: 12px; font-family: Calibri, Helvetica, sans-serif;" id="station">Radio Player :: <?=$station;?></div> <div id="songtitle"> <?php *************** *** 202,215 **** <div id="infoPlugin"></div> ! <div id="equalizer"><img src="<?=$module_root_path;?>images/<?=SKIN;?>/equalizer_stop.gif" id="eq"></div> ! <div id="closeButton"><a href="javascript:window.close()"><img src="<?=$module_root_path;?>images/<?=SKIN;?>/close.jpg" border="0"></a></div> <div id="play"><img id="playB" src="<?=$module_root_path;?>images/<?=SKIN;?>/play.jpg" onclick="javascript:playR()" onmouseover="javascript:document.getElementById('playB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/play_h.jpg';" ! onmouseout="javascript:document.getElementById('playB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/play.jpg';"> </div> <div id="stop"><img id="stopB" src="<?=$module_root_path;?>images/<?=SKIN;?>/stop.jpg" onclick="javascript:stopR()" ! onmouseover="document.getElementById('stopB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/stop_h.jpg';" ! onmouseout="document.getElementById('stopB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/stop.jpg';"> </div> --- 242,258 ---- <div id="infoPlugin"></div> ! <div id="equalizer"><img id="eq" src="<?=$module_root_path;?>images/<?=SKIN;?>/equalizer_stop.gif" /></div> ! <div id="closeButton"><img id="closeB" src="<?=$module_root_path;?>images/<?=SKIN;?>/close.png" onclick="javascript:window.close()" ! onmouseover="javascript:document.getElementById('closeB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/close_h.png';" ! onmouseout="javascript:document.getElementById('closeB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/close.png';" /> ! </div> <div id="play"><img id="playB" src="<?=$module_root_path;?>images/<?=SKIN;?>/play.jpg" onclick="javascript:playR()" onmouseover="javascript:document.getElementById('playB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/play_h.jpg';" ! onmouseout="javascript:document.getElementById('playB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/play.jpg';" /> </div> <div id="stop"><img id="stopB" src="<?=$module_root_path;?>images/<?=SKIN;?>/stop.jpg" onclick="javascript:stopR()" ! onmouseover="document.getElementById('stopB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/stop_h.jpg';" ! onmouseout="document.getElementById('stopB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/stop.jpg';" /> </div> Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_install.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** db_install.php 6 Mar 2008 03:09:18 -0000 1.7 --- db_install.php 20 Apr 2008 07:21:39 -0000 1.8 *************** *** 35,39 **** } ! $mx_module_version = '2.0.0-RC1'; $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 35,39 ---- } ! $mx_module_version = '3.0.0-RC'; $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_upgrade.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** db_upgrade.php 6 Mar 2008 03:09:28 -0000 1.7 --- db_upgrade.php 20 Apr 2008 07:21:39 -0000 1.8 *************** *** 31,35 **** } ! $mx_module_version = '2.0.0-RC1'; $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 31,35 ---- } ! $mx_module_version = '3.0.0-RC'; $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; Index: getinfo.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/getinfo.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** getinfo.php 7 Mar 2008 03:28:33 -0000 1.9 --- getinfo.php 20 Apr 2008 07:21:39 -0000 1.10 *************** *** 15,19 **** //require($module_root_path . "includes/common.$phpEx"); ! $shotcast_config['skin'] = 'default'; //$accplugin = 'http://' . $_SERVER['SERVER_NAME'] . substr($_SERVER['PHP_SELF'], 0, -strlen(basename(__FILE__))) . 'install/setup_AAC_aacPlus_plugin.exe'; --- 15,20 ---- //require($module_root_path . "includes/common.$phpEx"); ! $shotcast_config['skin'] = 'aero'; ! $autoplay = true; //$accplugin = 'http://' . $_SERVER['SERVER_NAME'] . substr($_SERVER['PHP_SELF'], 0, -strlen(basename(__FILE__))) . 'install/setup_AAC_aacPlus_plugin.exe'; *************** *** 428,431 **** --- 429,434 ---- } + $station = empty($station) ? $station_name : $station; + if (preg_match("/Unauthorized/", $servertitle)) { |
|
From: OryNider <ory...@us...> - 2008-04-20 07:22:16
|
Update of /cvsroot/mxbb/mx_shotcast/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19604/includes Modified Files: common.php detectScript.htm Added Files: cur_song.php Log Message: 3.0.0-RC Index: detectScript.htm =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/includes/detectScript.htm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** detectScript.htm 6 Mar 2008 06:03:40 -0000 1.2 --- detectScript.htm 20 Apr 2008 07:21:40 -0000 1.3 *************** *** 21,25 **** function checkSong(){ ! var xmlHttp; try{ xmlHttp = new XMLHttpRequest(); --- 21,25 ---- function checkSong(){ ! var xmlHttp; try{ xmlHttp = new XMLHttpRequest(); *************** *** 42,52 **** if(xmlHttp.readyState == 4){ document.getElementById('songtitle').innerHTML = xmlHttp.responseText; ! setTimeout('Ajax()',25000); } } ! xmlHttp.open("GET","<?=$module_root_path;?>cur_song.<?=$phpEx;?>",true); xmlHttp.send(null); } function embedInfo(embed){ --- 42,54 ---- if(xmlHttp.readyState == 4){ document.getElementById('songtitle').innerHTML = xmlHttp.responseText; ! setTimeout('checkSong()',15900); } } ! xmlHttp.open("GET","<?=$module_root_path;?>includes/cur_song.<?=$phpEx;?>",true); xmlHttp.send(null); } + + function embedInfo(embed){ *************** *** 137,140 **** --- 139,143 ---- function playR(){ + document.getElementById('eq').src = '<?=$module_root_path;?>images/<?=SKIN;?>/equalizer_play.gif'; var embed = document.getElementById('embedchoise'); var frame = document.getElementById('embedFrame'); *************** *** 150,159 **** embedInfo(detectEmbed()); } - document.getElementById('eq').src = '<?=$module_root_path;?>images/<?=SKIN;?>/equalizer_play.gif'; } function stopR(){ - document.getElementById('embedFrame').src = ""; document.getElementById('eq').src = '<?=$module_root_path;?>images/<?=SKIN;?>/equalizer_stop.gif'; } --- 153,161 ---- embedInfo(detectEmbed()); } } function stopR(){ document.getElementById('eq').src = '<?=$module_root_path;?>images/<?=SKIN;?>/equalizer_stop.gif'; + document.getElementById('embedFrame').src = ""; } --- NEW FILE: cur_song.php --- <?php if( !defined('IN_PORTAL') || !is_object($mx_block)) { define('IN_PORTAL', true); $mx_root_path = "../../../"; $module_root_path = "./../"; $phpEx = substr(strrchr(__FILE__, '.'), 1); include_once($mx_root_path . 'common.'.$phpEx); // // Start session management // $mx_user->init($user_ip, PAGE_INDEX); // // End session management // $title = 'Media Player Radio'; $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' ); $is_block = FALSE; } else { // // Read block Configuration // $title = $mx_block->block_info['block_title']; $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); if( is_object($mx_block)) { $is_block = TRUE; } } define('IN_SHOTCAST', true); require($module_root_path .'includes/common.'.$phpEx); require($module_root_path . 'getinfo.'.$phpEx); header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: post-check=0, pre-check=0', false); header('Pragma: no-cache'); ?> <HTML> <HEAD> <META http-equiv="pragma" content="no-cache"> <META HTTP-EQUIV="refresh" CONTENT="159"> <META name="robots" content="noindex"> <script> <!-- /* Auto Refresh Page with Time script By JavaScript Kit (javascriptkit.com) Over 200+ free scripts here! */ //enter refresh time in "minutes:seconds" Minutes should range from 0 to inifinity. Seconds should range from 0 to 59 var limit="1:59" if (document.images){ var parselimit=limit.split(":") parselimit=parselimit[0]*60+parselimit[1]*1 } function beginrefresh(){ if (!document.images) return if (parselimit==1) window.location.reload() else{ parselimit-=1 curmin=Math.floor(parselimit/60) cursec=parselimit%60 if (curmin!=0) curtime=curmin+" minutes and "+cursec+" seconds left until page refresh!" else curtime=cursec+" seconds left until page refresh!" window.status=curtime setTimeout("beginrefresh()",15900) } } window.onload=beginrefresh //--> </script> </HEAD> <body> <?php if($radio->song()) { echo '<span style="font-weight : bold;">'.$radio->song().'</span>'; } else { echo '<span style="font-weight : bold;">'.$song[0].'</span>'; } ?> </body> </HTML> Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/includes/common.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** common.php 6 Mar 2008 03:09:36 -0000 1.7 --- common.php 20 Apr 2008 07:21:40 -0000 1.8 *************** *** 39,64 **** $module_name = 'shotcast'; ! $sql = "SELECT * FROM " . MODULE_TABLE . " WHERE module_name = '$module_name'"; ! ! if(!($result = $db->sql_query($sql))) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain shotcast module informations from database", '', __LINE__, __FILE__, $sql); ! } ! ! while($module = $db->sql_fetchrow($result)) { $music_module_copy = $module['module_copy']; $music_module_name = $module['module_name']; ! $music_module_version = $module['module_version']; } if( !empty($music_module_copy) ) { ! define('_SHOTCAST_VERSION', 'mxBB <i> - ' . $music_module_name . '</i> ' . $music_module_version . ' © 2007 by OryNider'); } else { ! define('_SHOTCAST_VERSION', 'mxBB <i> - ShotCast Module ver. 1.x</i> © 2007 by OryNider'); } --- 39,82 ---- $module_name = 'shotcast'; ! if (($mx_cache->get('shotcast_module')) && ($use_cache)) { + $module = $mx_cache->get('shotcast_module'); + $music_module_copy = $module['module_copy']; $music_module_name = $module['module_name']; ! $music_module_version = $module['module_version']; ! } + else + { + $module = array(); + + $sql = "SELECT * FROM " . MODULE_TABLE . " WHERE module_name = '$module_name'"; + + if(!($result = $db->sql_query($sql))) + { + mx_message_die(GENERAL_ERROR, "Couldn't obtain shotcast module informations from database", '', __LINE__, __FILE__, $sql); + } + + while($module = $db->sql_fetchrow($result)) + { + $music_module_copy = $module['module_copy']; + $music_module_name = $module['module_name']; + $music_module_version = $module['module_version']; + } + if ($use_cache) + { + $mx_cache->put('shotcast_module', $module); + } + } if( !empty($music_module_copy) ) { ! define('_SHOTCAST_VERSION', 'mxBB <i> - ' . $music_module_name . '</i> ' . $music_module_version . ' © 2007-2008 by OryNider'); } else { ! define('_SHOTCAST_VERSION', 'mxBB <i> - ShotCast Module ver. 3.x</i> © 2007-2008 by OryNider'); } |
|
From: OryNider <ory...@us...> - 2008-04-20 07:21:55
|
Update of /cvsroot/mxbb/mx_shotcast/images/aero In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19604/images/aero Added Files: close.png close_h.png equalizer_play.gif equalizer_stop.gif play.jpg play.png play_h.jpg play_h.png playerbg.png shell.jpg stop.jpg stop_h.jpg Log Message: 3.0.0-RC --- NEW FILE: play_h.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: close_h.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: play_h.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: play.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: equalizer_play.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shell.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: play.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: close.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: stop_h.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: equalizer_stop.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: stop.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: playerbg.png --- (This appears to be a binary file; contents omitted.) |
2 messages has been excluded from this view by a project administrator.