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-02-01 16:12:10
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/advancedCSS In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14955/templates/_core/contrib/advancedCSS Added Files: horizontal.js mx_menu_horizontal.tpl mx_menu_vertical.tpl vertical.js Log Message: renaming and moving of files... --- NEW FILE: vertical.js --- <!-- Example of initializing: var menu = new XulMenu("id_of_the_menu"); menu.init(); Example of initializing and setting additional stuff: var menu1 = new XulMenu("menu1"); menu1.type = "horizontal"; menu1.position.level1.top = 0; menu1.position.level1.left = 0; menu1.position.levelX.top = 0; menu1.position.levelX.left = 0; menu1.arrow1 = "images/arrow.gif"; menu1.arrow2 = "images/arrow-active.gif"; Note: arrow1 & arrow2 set only when you want the arrow image to change when element is active. If you don't want the arrow to change keep both variables empty. ---------------- API ---------------- Controlling the menu: show(id) hide(id) hideAll() hideHigherOrEqualLevels(n) id = id of the element n = level examples: 1) menu1.show("menu1-1"); 2) menu1.show("menu1-1"); menu1.show("menu1-1-2"); menu1.show("menu1-1-2-0"); menu1.hideHigherOrEqualLevels(2); Both examples show the same. --> <script type="text/javascript"> var menu1 = new XulMenu('menu' + '{$block_id}'); menu1.type = "vertical"; menu1.position.level1.top = 0; menu1.position.level1.left = 0; menu1.position.levelX.top = 0; menu1.position.levelX.left = 0; menu1.arrow1 = "images/arrow1.gif"; menu1.arrow2 = "images/arrow2.gif"; menu1.init(); </script> --- NEW FILE: mx_menu_horizontal.tpl --- <style type="text/css"> <!-- #bar { background: #{T_TR_COLOR1}; cursor: default; } .XulMenu { font-family: {T_FONTFACE1}; font-size: 11px; -moz-user-select: none; } .XulMenu .button, .XulMenu .button:hover, .XulMenu .button-active, .XulMenu .button-active:hover { text-align: left; line-height: normal; padding: 5px 6px 4px 6px; border: 1px solid #ECE9D8; color: {T_FONTFACE1}; text-decoration: none; cursor: default; white-space: nowrap; display: block; position: relative; } .XulMenu .button:hover { border-color: #ffffff #ACA899 #ACA899 #ffffff; } .XulMenu .button-active, .XulMenu .button-active:hover { border-color: #ACA899 #ffffff #ffffff #ACA899; } .XulMenu .item, .XulMenu .item:hover, .XulMenu .item-active, .XulMenu .item-active:hover { background: {T_TR_COLOR1}; line-height: normal; text-align: left; padding: 3px 30px 3px 20px; color: #000000; border: 1px {T_TR_COLOR1}; border-style: solid solid solid solid; text-decoration: none; cursor: default; white-space: nowrap; display: block; position: relative; } .XulMenu .item:hover, .XulMenu .item-active, .XulMenu .item-active:hover { background: {T_TR_COLOR2}; color: {T_FONTFACE1}; border: 1px {T_TH_COLOR1}; border-style: solid solid solid solid; } .XulMenu .section { background: {T_TR_COLOR1}; border: 1px {T_TH_COLOR1}; border-style: solid solid solid solid; padding: 2px 1px 1px 2px; position: absolute; visibility: hidden; z-index: -1; } .XulMenu .arrow { position: absolute; top: 7px; right: 8px; border: 0; } * html .XulMenu td { position: relative; } /* ie 5.0 fix */ --> </style> <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/ie5.js"></script> <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/1.4/XulMenu.js"></script> <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> <td align="left" class="row1"> <div id="bar"> <table cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="XulMenu"> <tr> <!-- BEGIN catrow --> <td> <a class="button" href="javascript:void(0)">{catrow.CATEGORY_NAME}</a> <div class="section"> <!-- BEGIN menurow --> <a class="item" href="{catrow.menurow.U_MENU_URL}" target="{catrow.menurow.U_MENU_URL_TARGET}">{catrow.menurow.MENU_NAME}</a> <!-- END menurow --> </div> </td> <!-- END catrow --> </tr> </table> </div> </td> </tr> </table> --- NEW FILE: mx_menu_vertical.tpl --- <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/ie5.js"></script> <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/mygosumenu/1.4/XulMenu.js"></script> <style type="text/css"> <!-- #bar { background: #{T_TR_COLOR1}; cursor: default; } .XulMenu { font-family: {T_FONTFACE1}; font-size: 11px; -moz-user-select: none; } .XulMenu .button, .XulMenu .button:hover, .XulMenu .button-active, .XulMenu .button-active:hover { text-align: left; line-height: normal; padding: 5px 6px 4px 6px; border: 1px solid #ECE9D8; color: {T_FONTFACE1}; text-decoration: none; cursor: default; white-space: nowrap; display: block; position: relative; } .XulMenu .button:hover { border-color: #ffffff #ACA899 #ACA899 #ffffff; } .XulMenu .button-active, .XulMenu .button-active:hover { border-color: #ACA899 #ffffff #ffffff #ACA899; } .XulMenu .button img, .XulMenu .button-active img{ position: absolute; top: 4px; right: 2px; border: 0; } .XulMenu .item, .XulMenu .item:hover, .XulMenu .item-active, .XulMenu .item-active:hover { background: {T_TR_COLOR1}; line-height: normal; text-align: left; padding: 3px 20px 3px 20px; color: #000000; border: 1px {T_TR_COLOR1}; border-style: solid solid solid solid; text-decoration: none; cursor: default; white-space: nowrap; display: block; position: relative; } .XulMenu .item:hover, .XulMenu .item-active, .XulMenu .item-active:hover { background: {T_TR_COLOR2}; color: {T_FONTFACE1}; border: 1px {T_TH_COLOR1}; border-style: solid solid solid solid; } .XulMenu .section { background: {T_TR_COLOR1}; border: 1px {T_TH_COLOR1}; border-style: solid solid solid solid; padding: 2px 1px 1px 2px; position: absolute; visibility: hidden; z-index: -1; } .XulMenu .arrow { position: absolute; top: 7px; right: 8px; border: 0; } * html .XulMenu td { position: relative; } /* ie 5.0 fix */ --> </style> <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> <td align="center" class="row1"> <div id="bar"> <table width="100%" cellspacing="0" cellpadding="0" id="menu{MENU_ID}" class="XulMenu"> <!-- BEGIN catrow --> <tr> <td> <a class="button" href="javascript:void(0)">{catrow.CATEGORY_NAME}<img class="arrow" src="{TEMPLATE_IMAGES_PATH}/arrow_right.gif" width="10" height="12" alt="" /></a> <div class="section"> <!-- BEGIN menurow --> <a class="item" href="{catrow.menurow.U_MENU_URL}" target="{catrow.menurow.U_MENU_URL_TARGET}">{catrow.menurow.U_MENU_ICON}{catrow.menurow.MENU_NAME}</a> <!-- END menurow --> </div> </td> </tr> <!-- END catrow --> </table> </div> </td> </tr> </table> --- NEW FILE: horizontal.js --- <!-- Example of initializing: var menu = new XulMenu("id_of_the_menu"); menu.init(); Example of initializing and setting additional stuff: var menu1 = new XulMenu("menu1"); menu1.type = "horizontal"; menu1.position.level1.top = 0; menu1.position.level1.left = 0; menu1.position.levelX.top = 0; menu1.position.levelX.left = 0; menu1.arrow1 = "images/arrow.gif"; menu1.arrow2 = "images/arrow-active.gif"; Note: arrow1 & arrow2 set only when you want the arrow image to change when element is active. If you don't want the arrow to change keep both variables empty. ---------------- API ---------------- Controlling the menu: show(id) hide(id) hideAll() hideHigherOrEqualLevels(n) id = id of the element n = level examples: 1) menu1.show("menu1-1"); 2) menu1.show("menu1-1"); menu1.show("menu1-1-2"); menu1.show("menu1-1-2-0"); menu1.hideHigherOrEqualLevels(2); Both examples show the same. --> <script type="text/javascript"> var menu1 = new XulMenu('menu' + '{$block_id}'); menu1.type = "horizontal"; menu1.arrow1 = "images/arrow1.gif"; menu1.arrow2 = "images/arrow2.gif"; menu1.position.level1.top = 0; menu1.position.level1.left = 0; menu1.position.levelX.top = 0; menu1.position.levelX.left = 0; menu1.init(); </script> |
|
From: Jon O. <jon...@us...> - 2008-02-01 16:12:09
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14955/templates/_core Added Files: _core.cfg mx_menu_horizontal.tpl mx_menu_overall_navigation.tpl mx_menu_vertical.tpl Log Message: renaming and moving of files... --- NEW FILE: mx_menu_horizontal.tpl --- <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> <!-- BEGIN catrow --> <td class="row1" align="left" width="{CAT_WIDTH}" valign="top"> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> <td class="row2"> <table width="100%" cellpadding="2" cellspacing="0" border="0"> <tr> <td class="cat" width="10" align="center" valign="middle" style="border:none;"> <span class="mx_rollup_button" onClick="mx_toggle(this, 'mxNavCat_{catrow.BLOCK_ID}{catrow.CAT_ID}', '{catrow.U_CAT_NAV_EXPAND}', '{catrow.U_CAT_NAV_CONTRACT}');"><img src="{catrow.U_CAT_NAV_DYNAMIC}" border="0" /></span> </td> <td class="cat" align="left" width="100%" style="border:none;"> <span class="nav"><b> {catrow.CATEGORY}</b></span> </td> </tr> <tr> <td class="row1" align="left" colspan="2"><span class="genmed">{catrow.DESCRIPTION}</span></td> </tr> </table> </td> </tr> <tbody id="mxNavCat_{catrow.BLOCK_ID}{catrow.CAT_ID}" style="display: {catrow.CAT_SHOW};"> <tr> <td class="row1" style="border:none;"> <table width="100%" cellpadding="2" cellspacing="0" border="0"> <!-- BEGIN menurow --> <tr> <td style="border:none;" class="row1" valign="middle" colspan="2" onmouseout="this.className='row1';" onmouseover="this.className='row2';">{catrow.menurow.U_MENU_ICON}<span class="{catrow.menurow.MENU_STYLE}"><a href="{catrow.menurow.U_MENU_URL}" target="{catrow.menurow.U_MENU_URL_TARGET}" class="genmed" title="{catrow.menurow.MENU_DESC}">{catrow.menurow.MENU_NAME}</a></span></td> </tr> <!-- END menurow --> </table> </td> </tr> </tbody> </table> </td> <!-- END catrow --> </tr> </table> --- NEW FILE: _core.cfg --- <?php // // ** Configuration file for subSilver template ** // // ** copyright (C) 2001 The phpBB Group ** // ** Created by subBlue design ** // ** www.subBlue.com ** // // ** subSilver dev. forum: www.subSky.com/phpBB2/ ** // // $Id: _core.cfg,v 1.1 2008/02/01 16:12:02 jonohlsson Exp $ // // Please note that to enable support of different languages // the {LANG} place holder is available. This will be replaced // with xxx where xxx is the users selected language. If // that language isn't available it will default to english. // Therefore you MUST ensure you have at least a english // directory if you choose to localise your template // // // Do not alter this line! // define(MX_TEMPLATE_CONFIG, TRUE); $mx_template_config = true; // ------------------------------------------------------------------------- // Do some checks // ------------------------------------------------------------------------- $current_template_path = file_exists( $mx_root_path . $current_template_path . "/images" ) ? $current_template_path : ( file_exists( $mx_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path : $default_template_path ); // ------------------------------------------------------------------------- // Prefix with PORTAL_URL // ------------------------------------------------------------------------- $current_template_images = PORTAL_URL . $current_template_path . "/images"; // ------------------------------------------------------------------------- // Define images path // ------------------------------------------------------------------------- $mx_images['mx_menu_images'] = $current_template_images; ?> --- NEW FILE: mx_menu_overall_navigation.tpl --- <table cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <!-- BEGIN catrow --> <td align="center" valign="middle"> <div class="cat-button{catrow.CURRENT}" onmouseout="this.className='cat-button{catrow.CURRENT}';" onmouseover="this.className='cat-button-current';">{catrow.U_MENU_ICON}<a href="{catrow.U_CATEGORY_URL}">{catrow.CATEGORY_NAME}</a></div> </td> <!-- END catrow --> </tr> </table> <table cellpadding="0" cellspacing="0" border="0" align="center"> <tr> <!-- BEGIN menurow --> <td align="center" valign="middle"> <div class="nav-button{menurow.CURRENT}" onmouseout="this.className='nav-button{menurow.CURRENT}';" onmouseover="this.className='nav-button-current';">{menurow.U_MENU_ICON}<a href="{menurow.U_MENU_URL}" target="{menurow.U_MENU_URL_TARGET}">{menurow.MENU_NAME}</a></div> </td> <!-- END menurow --> </tr> </table> --- NEW FILE: mx_menu_vertical.tpl --- <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <!-- BEGIN catrow --> <tr> <td> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> <td class="row2" align="left"> <table width="100%" cellpadding="2" cellspacing="0" border="0" > <tr> <td class="cat" align="center" width="10" style="border:none;"> <span class="mx_rollup_button" onClick="mx_toggle(this, 'mxNavCat_{catrow.BLOCK_ID}{catrow.CAT_ID}', '{catrow.U_CAT_NAV_EXPAND}', '{catrow.U_CAT_NAV_CONTRACT}');"><img src="{catrow.U_CAT_NAV_DYNAMIC}" border="0" alt=""/></span> </td> <td class="cat" align="left" width="100%" style="border:none;"> <span class="nav"> {catrow.CATEGORY}</span> <!-- BEGIN switch_cat_desc --> <br> <span class="gensmall"> {catrow.switch_cat_desc.CAT_DESC}</span> <!-- END switch_cat_desc --> </td> </tr> </table> </td> </tr> </table> </td> </tr> <tbody id="mxNavCat_{catrow.BLOCK_ID}{catrow.CAT_ID}" style="display: {catrow.CAT_SHOW};"> <tr> <td class="row1"> <table width="100%" cellpadding="2" cellspacing="0" border="0"> <!-- BEGIN menurow --> <tr> <td style="border:none;" class="row1" valign="middle" height="10" align="left" colspan="2" onmouseout="this.className='row1';" onmouseover="this.className='row2';">{catrow.menurow.U_MENU_ICON}<span class="{catrow.menurow.MENU_STYLE}"> <a href="{catrow.menurow.U_MENU_URL}" target="{catrow.menurow.U_MENU_URL_TARGET}" class="genmed" title="{catrow.menurow.MENU_DESC}">{catrow.menurow.MENU_NAME}</a></span></td> </tr> <!-- END menurow --> </table> </td> </tr> </tbody> <!-- END catrow --> </table> |
|
From: Jon O. <jon...@us...> - 2008-02-01 16:10:31
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14446 Modified Files: mx_menu_simple.html Log Message: updated for "new" nav_menu Index: mx_menu_simple.html =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/templates/prosilver/mx_menu_simple.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_menu_simple.html 14 Dec 2007 02:23:31 -0000 1.1 --- mx_menu_simple.html 1 Feb 2008 16:10:22 -0000 1.2 *************** *** 16,20 **** <dd class="posts_portal"> <!-- BEGIN modulerow --> ! <a class="nav" href="{modulerow.U_MENU_MODULE}">{modulerow.MENU_NAME}</a><br /> <!-- END modulerow --> </dd> --- 16,20 ---- <dd class="posts_portal"> <!-- BEGIN modulerow --> ! <a class="nav" href="{modulerow.U_MENU_URL}">{modulerow.MENU_NAME}</a><br /> <!-- END modulerow --> </dd> |
|
From: Jon O. <jon...@us...> - 2008-02-01 15:49:48
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/advanced In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5496/advanced Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/advanced added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-01 15:49:47
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/simpleX In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5496/simpleX Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/simpleX added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-01 15:49:47
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/simpleCSS In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5496/simpleCSS Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/simpleCSS added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-01 15:49:47
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/overallCSS In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5496/overallCSS Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/overallCSS added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-01 15:49:47
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/classic In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5496/classic Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/classic added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-01 15:49:47
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/advancedCSS In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5496/advancedCSS Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/advancedCSS added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-01 15:49:47
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/overall In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5496/overall Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib/overall added to the repository |
|
From: Jon O. <jon...@us...> - 2008-02-01 15:48:56
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5095/contrib Log Message: Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/_core/contrib added to the repository |
|
From: OryNider <ory...@us...> - 2008-02-01 14:13:00
|
Update of /cvsroot/mxbb/mx_smartor/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32131 Modified Files: Tag: core28x lang_admin.php Log Message: some admin files fixed |
|
From: OryNider <ory...@us...> - 2008-02-01 14:12:42
|
Update of /cvsroot/mxbb/mx_smartor/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32052/admin Modified Files: Tag: core28x admin_album_auth.php admin_album_cat.php admin_album_cfg.php admin_album_clearcache.php admin_album_clown_SP.php admin_album_config_personal.php admin_album_ext.php admin_album_otf.php admin_album_personal.php Log Message: some admin files fixed Index: admin_album_config_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_config_personal.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** admin_album_config_personal.php 9 Aug 2007 13:16:50 -0000 1.2 --- admin_album_config_personal.php 1 Feb 2008 14:12:26 -0000 1.2.2.1 *************** *** 94,98 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . append_sid("admin_album_config_personal.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 94,98 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . mx_append_sid("admin_album_config_personal.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 108,112 **** 'L_ALBUM_PERSONAL_CONFIG' => $lang['Album_Personal_Settings'], 'L_ALBUM_PERSONAL_CONFIG_EXPLAIN' => $lang['Album_Personal_Settings_Explain'], ! 'S_ALBUM_PERSONAL_CONFIG_ACTION' => append_sid('admin_album_config_personal.'.$phpEx), 'PERSONAL_GALLERY_LIMIT' => $new['personal_gallery_limit'], --- 108,112 ---- 'L_ALBUM_PERSONAL_CONFIG' => $lang['Album_Personal_Settings'], 'L_ALBUM_PERSONAL_CONFIG_EXPLAIN' => $lang['Album_Personal_Settings_Explain'], ! 'S_ALBUM_PERSONAL_CONFIG_ACTION' => mx_append_sid('admin_album_config_personal.'.$phpEx), 'PERSONAL_GALLERY_LIMIT' => $new['personal_gallery_limit'], Index: admin_album_cfg.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cfg.php,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** admin_album_cfg.php 9 Aug 2007 13:16:49 -0000 1.4 --- admin_album_cfg.php 1 Feb 2008 14:12:26 -0000 1.4.2.1 *************** *** 79,83 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . append_sid("admin_album_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 79,83 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . mx_append_sid("admin_album_cfg.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 92,96 **** 'L_ALBUM_CONFIG' => $lang['Album_config'], 'L_ALBUM_CONFIG_EXPLAIN' => $lang['Album_config_explain'], ! 'S_ALBUM_CONFIG_ACTION' => append_sid('admin_album_cfg.'.$phpEx), // Index --- 92,96 ---- 'L_ALBUM_CONFIG' => $lang['Album_config'], 'L_ALBUM_CONFIG_EXPLAIN' => $lang['Album_config_explain'], ! 'S_ALBUM_CONFIG_ACTION' => mx_append_sid('admin_album_cfg.'.$phpEx), // Index Index: admin_album_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -C2 -d -r1.11.2.1 -r1.11.2.2 *** admin_album_auth.php 5 Oct 2007 02:18:25 -0000 1.11.2.1 --- admin_album_auth.php 1 Feb 2008 14:12:26 -0000 1.11.2.2 *************** *** 76,80 **** 'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_ALBUM_ACTION' => append_sid( "admin_album_auth.$phpEx" ), 'L_LOOK_UP_CAT' => $lang['Look_up_Category'], // --- Album Category Hierarchy : begin --- 76,80 ---- 'L_ALBUM_AUTH_EXPLAIN' => $lang['Album_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_ALBUM_ACTION' => mx_append_sid( "admin_album_auth.$phpEx" ), 'L_LOOK_UP_CAT' => $lang['Look_up_Category'], // --- Album Category Hierarchy : begin *************** *** 112,116 **** 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_ALBUM_ACTION' => append_sid( "admin_album_auth.$phpEx?cat_id=$cat_id" ), )); --- 112,116 ---- 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_ALBUM_ACTION' => mx_append_sid( "admin_album_auth.$phpEx?cat_id=$cat_id" ), )); *************** *** 194,198 **** } // okay, return a message... ! $message = $lang['Album_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_album_auth'], '<a href="' . append_sid( "admin_album_auth.$phpEx" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); --- 194,198 ---- } // okay, return a message... ! $message = $lang['Album_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_album_auth'], '<a href="' . mx_append_sid( "admin_album_auth.$phpEx" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); Index: admin_album_clearcache.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clearcache.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** admin_album_clearcache.php 9 Aug 2007 13:16:50 -0000 1.11 --- admin_album_clearcache.php 1 Feb 2008 14:12:26 -0000 1.11.2.1 *************** *** 57,61 **** 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => append_sid("admin_album_clearcache.$phpEx"), ) ); --- 57,61 ---- 'L_YES' => $lang['Yes'], ! 'S_CONFIRM_ACTION' => mx_append_sid("admin_album_clearcache.$phpEx"), ) ); Index: admin_album_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_ext.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_album_ext.php 7 Jun 2007 20:13:08 -0000 1.1 --- admin_album_ext.php 1 Feb 2008 14:12:26 -0000 1.1.2.1 *************** *** 87,91 **** if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['album_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . append_sid( "admin_album_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 87,91 ---- if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $message = $lang['album_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid( "admin_album_ext.$phpEx" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 116,120 **** $template->assign_vars( array( ! 'S_ALBUM_ACTION' => append_sid( "admin_album_ext.$phpEx" ), 'L_ALBUM_TITLE' => $lang['mx_album_admin'], --- 116,120 ---- $template->assign_vars( array( ! 'S_ALBUM_ACTION' => mx_append_sid( "admin_album_ext.$phpEx" ), 'L_ALBUM_TITLE' => $lang['mx_album_admin'], Index: admin_album_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_cat.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** admin_album_cat.php 9 Aug 2007 13:16:49 -0000 1.11 --- admin_album_cat.php 1 Feb 2008 14:12:26 -0000 1.11.2.1 *************** *** 82,86 **** global $lang, $album_user_id, $phpEx; ! $message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . append_sid("admin_album_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 82,86 ---- global $lang, $album_user_id, $phpEx; ! $message = $in_message . "<br /><br />" . sprintf($lang['Click_return_album_category'], "<a href=\"" . mx_append_sid("admin_album_cat.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 101,105 **** $template->assign_vars(array( ! 'S_ALBUM_ACTION' => append_sid("admin_album_cat.$phpEx"), 'L_CREATE_CATEGORY' => $lang['Create_category'], 'L_ALBUM_INDEX' => $lang['Album_Categories_Title'] --- 101,105 ---- $template->assign_vars(array( ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_cat.$phpEx"), 'L_CREATE_CATEGORY' => $lang['Create_category'], 'L_ALBUM_INDEX' => $lang['Album_Categories_Title'] *************** *** 157,161 **** $template->assign_vars(array( ! 'S_ALBUM_ACTION' => append_sid("admin_album_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], --- 157,161 ---- $template->assign_vars(array( ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_TITLE' => $lang['Category_Title'], 'L_CAT_DESC' => $lang['Category_Desc'], *************** *** 274,278 **** $template->assign_vars(array( ! 'S_ALBUM_ACTION' => append_sid("admin_album_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], --- 274,278 ---- $template->assign_vars(array( ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_cat.$phpEx?cat_id=$cat_id"), 'L_CAT_DELETE' => $lang['Delete_Category'], 'L_CAT_DELETE_EXPLAIN' => $lang['Delete_Category_Explain'], *************** *** 323,327 **** 'L_ALBUM_CAT_TITLE' => $lang['Album_Categories_Title'], 'L_ALBUM_CAT_EXPLAIN' => $lang['Album_Categories_Explain'], ! 'S_ALBUM_ACTION' => append_sid("admin_album_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], --- 323,327 ---- 'L_ALBUM_CAT_TITLE' => $lang['Album_Categories_Title'], 'L_ALBUM_CAT_EXPLAIN' => $lang['Album_Categories_Explain'], ! 'S_ALBUM_ACTION' => mx_append_sid("admin_album_cat.$phpEx"), 'L_CAT_TITLE' => $lang['Category_Title'], Index: admin_album_otf.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_otf.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** admin_album_otf.php 7 Jun 2007 20:13:10 -0000 1.1 --- admin_album_otf.php 1 Feb 2008 14:12:26 -0000 1.1.2.1 *************** *** 271,275 **** { $otf_pic_time = $otf_pic_time + 1; ! $pic_img_url = append_sid(ALBUM_OTF_PATH . $pic_images[$pic_cat][$i][$j]); $pic_thumbnail = $pic_images[$pic_cat][$i][$j]; --- 271,275 ---- { $otf_pic_time = $otf_pic_time + 1; ! $pic_img_url = mx_append_sid(ALBUM_OTF_PATH . $pic_images[$pic_cat][$i][$j]); $pic_thumbnail = $pic_images[$pic_cat][$i][$j]; *************** *** 284,292 **** else { ! $pic_img_thumb = append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); } */ ! $pic_img_thumb = append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); if ( ($upload_pics == true) && ($cat_to_upload > 0) ) --- 284,292 ---- else { ! $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); } */ ! $pic_img_thumb = mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf_thumbnail" . '&pic_cat=' . $pic_cat_names[$pic_cat][$i][$j] . '&pic_id=' . $pic_file_names[$pic_cat][$i][$j])); if ( ($upload_pics == true) && ($cat_to_upload > 0) ) *************** *** 328,341 **** if ($upload_counter > 0) { ! $message = $lang['Album_upload_successful'] . "(" . $upload_counter . ")" . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } elseif ($upload_counter < count($pic_images[$pic_cat])) { ! $message = $lang['Album_upload_partially_successful'] . "(" . $upload_counter . ")" . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } else { ! $message = $lang['Album_upload_not_successful'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } mx_message_die(GENERAL_MESSAGE, $message); --- 328,341 ---- if ($upload_counter > 0) { ! $message = $lang['Album_upload_successful'] . "(" . $upload_counter . ")" . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } elseif ($upload_counter < count($pic_images[$pic_cat])) { ! $message = $lang['Album_upload_partially_successful'] . "(" . $upload_counter . ")" . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/admin_album_otf.$phpEx") . "\">", "</a>" ); } else { ! $message = $lang['Album_upload_not_successful'] . "<br /><br />" . sprintf( $lang['Click_return_album_config'], "<a href=\"" . mx_append_sid( "admin_album_otf.$phpEx" ) . "\">", "</a>" ); } mx_message_die(GENERAL_MESSAGE, $message); *************** *** 363,368 **** 'S_COLWIDTH' => $s_colwidth, 'PORTAL_URL' => PORTAL_URL, ! 'S_ACTION' => append_sid( "admin_album_otf." . $phpEx ), ! // 'S_ACTION' => append_sid($module_root_path . 'includes/album_otf.' . $phpEx), ) ); --- 363,368 ---- 'S_COLWIDTH' => $s_colwidth, 'PORTAL_URL' => PORTAL_URL, ! 'S_ACTION' => mx_append_sid( "admin_album_otf." . $phpEx ), ! // 'S_ACTION' => mx_append_sid($module_root_path . 'includes/album_otf.' . $phpEx), ) ); Index: admin_album_personal.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** admin_album_personal.php 9 Aug 2007 13:16:51 -0000 1.11 --- admin_album_personal.php 1 Feb 2008 14:12:26 -0000 1.11.2.1 *************** *** 157,161 **** 'L_IS_MODERATOR' => $lang['Is_Moderator'], 'L_PRIVATE_ACCESS' => $lang['Private_access'], ! 'S_ALBUM_ACTION' => append_sid('admin_album_personal.'.$phpEx) ) ); --- 157,161 ---- 'L_IS_MODERATOR' => $lang['Is_Moderator'], 'L_PRIVATE_ACCESS' => $lang['Private_access'], ! 'S_ALBUM_ACTION' => mx_append_sid('admin_album_personal.'.$phpEx) ) ); *************** *** 196,200 **** // okay, return a message... ! $message = $lang['Album_personal_successfully'] . '<br /><br />' . sprintf($lang['Click_return_album_personal'], '<a href="' . append_sid("admin_album_personal.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 196,200 ---- // okay, return a message... ! $message = $lang['Album_personal_successfully'] . '<br /><br />' . sprintf($lang['Click_return_album_personal'], '<a href="' . mx_append_sid("admin_album_personal.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); Index: admin_album_clown_SP.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_clown_SP.php,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** admin_album_clown_SP.php 9 Aug 2007 13:16:50 -0000 1.13 --- admin_album_clown_SP.php 1 Feb 2008 14:12:26 -0000 1.13.2.1 *************** *** 77,81 **** if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . append_sid("admin_album_clown_SP.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 77,81 ---- if( isset($HTTP_POST_VARS['submit']) ) { ! $message = $lang['Album_config_updated'] . "<br /><br />" . sprintf($lang['Click_return_album_config'], "<a href=\"" . mx_append_sid("admin_album_clown_SP.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid($mx_root_path . "admin/index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 91,95 **** 'L_ALBUM_CONFIG' => $lang['SP_Album_config'], 'L_ALBUM_CONFIG_EXPLAIN' => $lang['SP_Album_config_explain'], ! 'S_ALBUM_CONFIG_ACTION' => append_sid('admin_album_clown_SP.'.$phpEx),//to submit form //cat names --- 91,95 ---- 'L_ALBUM_CONFIG' => $lang['SP_Album_config'], 'L_ALBUM_CONFIG_EXPLAIN' => $lang['SP_Album_config_explain'], ! 'S_ALBUM_CONFIG_ACTION' => mx_append_sid('admin_album_clown_SP.'.$phpEx),//to submit form //cat names |
|
From: OryNider <ory...@us...> - 2008-02-01 14:12:42
|
Update of /cvsroot/mxbb/mx_smartor In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32052 Modified Files: Tag: core28x album.php Log Message: some admin files fixed Index: album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album.php,v retrieving revision 1.17.2.4 retrieving revision 1.17.2.5 diff -C2 -d -r1.17.2.4 -r1.17.2.5 *** album.php 15 Jan 2008 10:56:07 -0000 1.17.2.4 --- album.php 1 Feb 2008 14:12:27 -0000 1.17.2.5 *************** *** 567,574 **** */ ! // if (empty($album_view_mode)) ! // { ! album_display_index($album_user_id, ALBUM_ROOT_CATEGORY, true, true, true); ! // } // Generate the page --- 567,571 ---- */ ! album_display_index($album_user_id, ALBUM_ROOT_CATEGORY, true, true, true); // Generate the page |
|
From: OryNider <ory...@us...> - 2008-02-01 14:12:42
|
Update of /cvsroot/mxbb/mx_smartor/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32052/includes Modified Files: Tag: core28x album_pic.php album_showpage.php album_thumbnail.php Log Message: some admin files fixed Index: album_showpage.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_showpage.php,v retrieving revision 1.12.2.2 retrieving revision 1.12.2.3 diff -C2 -d -r1.12.2.2 -r1.12.2.3 *** album_showpage.php 15 Jan 2008 10:56:13 -0000 1.12.2.2 --- album_showpage.php 1 Feb 2008 14:12:27 -0000 1.12.2.3 *************** *** 44,47 **** --- 44,48 ---- include_once($phpbb_root_path . 'includes/functions_color_groups.' . $phpEx); include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); + if ( isset($_POST['message']) ) { *************** *** 171,175 **** $template->assign_block_vars('disable_pic_nuffed', array( 'L_PIC_UNNUFFED_CLICK' => $lang['Nuff_UnClick'], ! 'U_PIC_UNNUFFED_CLICK' => append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $pic_id . $full_size_param)), ) ); --- 172,176 ---- $template->assign_block_vars('disable_pic_nuffed', array( 'L_PIC_UNNUFFED_CLICK' => $lang['Nuff_UnClick'], ! 'U_PIC_UNNUFFED_CLICK' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $pic_id . $full_size_param)), ) ); *************** *** 244,250 **** $pic_array_id = $i; } ! $pic_list .= 'Pic[' . $i . '] = \'' . append_sid(this_smartor_mxurl("smartor_mode=" . $pic_link . '&pic_id=' . $total_pic_rows[$i]['pic_id']), true) . '\'; ' . "\n"; /* ! $pic_list .= 'Pic[' . $i . '] = \'' . append_sid(album_append_uid($pic_link . $phpEx . '?pic_id=' . $total_pic_rows[$i]['pic_id']), true) . '\'; ' . "\n"; */ $tit_list .= 'Tit[' . $i . '] = \'' . $total_pic_rows[$i]['pic_title'] . '\'; ' . "\n"; --- 245,251 ---- $pic_array_id = $i; } ! $pic_list .= 'Pic[' . $i . '] = \'' . mx_append_sid(this_smartor_mxurl("smartor_mode=" . $pic_link . '&pic_id=' . $total_pic_rows[$i]['pic_id']), true) . '\'; ' . "\n"; /* ! $pic_list .= 'Pic[' . $i . '] = \'' . mx_append_sid(album_append_uid($pic_link . $phpEx . '?pic_id=' . $total_pic_rows[$i]['pic_id']), true) . '\'; ' . "\n"; */ $tit_list .= 'Tit[' . $i . '] = \'' . $total_pic_rows[$i]['pic_title'] . '\'; ' . "\n"; *************** *** 361,365 **** for($i = $min_pic_counter; $i <= $max_pic_counter; $i++) { ! $thumbnail_file = append_sid(this_smartor_mxurl('smartor_mode=album_thumbnail&pic_id=' . $total_pic_rows[$i]['pic_id'], TRUE)); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 362,366 ---- for($i = $min_pic_counter; $i <= $max_pic_counter; $i++) { ! $thumbnail_file = mx_append_sid(this_smartor_mxurl('smartor_mode=album_thumbnail&pic_id=' . $total_pic_rows[$i]['pic_id'], TRUE)); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 384,388 **** else { ! $pic_preview = 'onmouseover="showtrail(\'' . append_sid(this_fap_addonurl('smartor_mode=album_picm&pic_id=' . $total_pic_rows[$i]['pic_id'])) . '\',\'' . addslashes($total_pic_rows[$i]['pic_title']) . '\', ' . $album_config['midthumb_width'] . ', ' . $album_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } if ($album_config['show_pics_nav'] == 1) --- 385,389 ---- else { ! $pic_preview = 'onmouseover="showtrail(\'' . mx_append_sid(this_fap_addonurl('smartor_mode=album_picm&pic_id=' . $total_pic_rows[$i]['pic_id'])) . '\',\'' . addslashes($total_pic_rows[$i]['pic_title']) . '\', ' . $album_config['midthumb_width'] . ', ' . $album_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } if ($album_config['show_pics_nav'] == 1) *************** *** 390,394 **** $template->assign_block_vars('pics_nav.pics', array( 'U_PIC_THUMB' => $thumbnail_file, ! 'U_PIC_LINK' => ($i == $new_pic_array_id) ? '#' : append_sid(this_smartor_mxurl('smartor_mode=album_showpage&pic_id=' . $total_pic_rows[$i]['pic_id'] . $full_size_param . $nuffimage_vars . $sort_append)), 'PIC_TITLE' => $total_pic_rows[$i]['pic_title'], 'PIC_PREVIEW' => ($i == $new_pic_array_id) ? '' : $pic_preview, --- 391,395 ---- $template->assign_block_vars('pics_nav.pics', array( 'U_PIC_THUMB' => $thumbnail_file, ! 'U_PIC_LINK' => ($i == $new_pic_array_id) ? '#' : mx_append_sid(this_smartor_mxurl('smartor_mode=album_showpage&pic_id=' . $total_pic_rows[$i]['pic_id'] . $full_size_param . $nuffimage_vars . $sort_append)), 'PIC_TITLE' => $total_pic_rows[$i]['pic_title'], 'PIC_PREVIEW' => ($i == $new_pic_array_id) ? '' : $pic_preview, *************** *** 405,409 **** for($i = $min_pic_counter; $i >= $max_pic_counter; $i--) { ! $thumbnail_file = append_sid(this_smartor_mxurl('smartor_mode=album_thumbnail&pic_id=' . $total_pic_rows[$i]['pic_id'], TRUE)); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 406,410 ---- for($i = $min_pic_counter; $i >= $max_pic_counter; $i--) { ! $thumbnail_file = mx_append_sid(this_smartor_mxurl('smartor_mode=album_thumbnail&pic_id=' . $total_pic_rows[$i]['pic_id'], TRUE)); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 428,432 **** else { ! $pic_preview = 'onmouseover="showtrail(\'' . append_sid(this_fap_addonurl('smartor_mode=album_picm&pic_id=' . $total_pic_rows[$i]['pic_id'], TRUE)) . '\',\'' . addslashes($total_pic_rows[$i]['pic_title']) . '\', ' . $album_config['midthumb_width'] . ', ' . $album_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } if ($album_config['show_pics_nav'] == 1) --- 429,433 ---- else { ! $pic_preview = 'onmouseover="showtrail(\'' . mx_append_sid(this_fap_addonurl('smartor_mode=album_picm&pic_id=' . $total_pic_rows[$i]['pic_id'], TRUE)) . '\',\'' . addslashes($total_pic_rows[$i]['pic_title']) . '\', ' . $album_config['midthumb_width'] . ', ' . $album_config['midthumb_height'] . ')" onmouseout="hidetrail()"'; } if ($album_config['show_pics_nav'] == 1) *************** *** 434,438 **** $template->assign_block_vars('pics_nav.pics', array( 'U_PIC_THUMB' => $thumbnail_file, ! 'U_PIC_LINK' => ($i == $new_pic_array_id) ? '#' : append_sid(this_smartor_mxurl('smartor_mode=album_showpage&pic_id=' . $total_pic_rows[$i]['pic_id'] . $full_size_param . $nuffimage_vars . $sort_append)), 'PIC_TITLE' => $total_pic_rows[$i]['pic_title'], 'PIC_PREVIEW' => ($i == $new_pic_array_id) ? '' : $pic_preview, --- 435,439 ---- $template->assign_block_vars('pics_nav.pics', array( 'U_PIC_THUMB' => $thumbnail_file, ! 'U_PIC_LINK' => ($i == $new_pic_array_id) ? '#' : mx_append_sid(this_smartor_mxurl('smartor_mode=album_showpage&pic_id=' . $total_pic_rows[$i]['pic_id'] . $full_size_param . $nuffimage_vars . $sort_append)), 'PIC_TITLE' => $total_pic_rows[$i]['pic_title'], 'PIC_PREVIEW' => ($i == $new_pic_array_id) ? '' : $pic_preview, *************** *** 452,456 **** $template->assign_block_vars('pic_nuffed_enabled', array( 'L_PIC_NUFFED_CLICK' => $lang['Nuff_Click'], ! 'U_PIC_NUFFED_CLICK' => append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $pic_id . $full_size_param . '&nuffimage=true')), ) ); --- 453,457 ---- $template->assign_block_vars('pic_nuffed_enabled', array( 'L_PIC_NUFFED_CLICK' => $lang['Nuff_Click'], ! 'U_PIC_NUFFED_CLICK' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage" . '&pic_id=' . $pic_id . $full_size_param . '&nuffimage=true')), ) ); *************** *** 548,552 **** // Check the permissions // ------------------------------------ - $auth_data = album_user_access($cat_id, $thiscat, 1, 0, 1, 1, 1, 1); --- 549,552 ---- *************** *** 556,560 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_showpage&pic_id=$pic_id")); exit; } --- 556,560 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! mx_redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?mx_redirect=album.php?smartor_mode=album_showpage&pic_id=$pic_id")); exit; } *************** *** 717,721 **** else { ! $poster = '<a href="'. append_sid($phpbb_root_path ."profile.php?mode=viewprofile&". POST_USERS_URL .'='. $commentrow[$i]['user_id']) .'">'. $commentrow[$i]['username'] .'</a>'; } --- 717,721 ---- else { ! $poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.php?mode=viewprofile&". POST_USERS_URL .'='. $commentrow[$i]['user_id']) .'">'. $commentrow[$i]['username'] .'</a>'; } *************** *** 750,756 **** //email, profile, pm links ! $email_uri = ( $board_config['board_email_form'] ) ? append_sid($phpbb_root_path ."profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $commentrow[$i]['user_id']) : 'mailto:' . $commentrow[$i]['user_email']; ! $profile_url = append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $commentrow[$i]['user_id'] ); ! $pm_url = append_sid($phpbb_root_path ."privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $commentrow[$i]['user_id']); //avatar --- 750,756 ---- //email, profile, pm links ! $email_uri = ( $board_config['board_email_form'] ) ? mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=email&" . POST_USERS_URL .'=' . $commentrow[$i]['user_id']) : 'mailto:' . $commentrow[$i]['user_email']; ! $profile_url = mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $commentrow[$i]['user_id'] ); ! $pm_url = mx_append_sid($phpbb_root_path ."privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $commentrow[$i]['user_id']); //avatar *************** *** 853,859 **** 'EDIT_INFO' => $edit_info, ! 'EDIT' => ( ( $auth_data['edit'] and ($commentrow[$i]['comment_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != ALBUM_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_comment_edit&comment_id=". $commentrow[$i]['comment_id'])) .'">'. $lang['Edit_pic'] .'</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($commentrow[$i]['comment_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != ALBUM_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. append_sid(this_smartor_mxurl("smartor_mode=album_comment_delete&comment_id=". $commentrow[$i]['comment_id'])) .'">'. $lang['Delete_pic'] .'</a>' : '' ) ); --- 853,859 ---- 'EDIT_INFO' => $edit_info, ! 'EDIT' => ( ( $auth_data['edit'] and ($commentrow[$i]['comment_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_edit_level'] != ALBUM_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_comment_edit&comment_id=". $commentrow[$i]['comment_id'])) .'">'. $lang['Edit_pic'] .'</a>' : '', ! 'DELETE' => ( ( $auth_data['delete'] and ($commentrow[$i]['comment_user_id'] == $userdata['user_id']) ) or ($auth_data['moderator'] and ($thiscat['cat_delete_level'] != ALBUM_ADMIN) ) or ($userdata['user_level'] == ADMIN) ) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_comment_delete&comment_id=". $commentrow[$i]['comment_id'])) .'">'. $lang['Delete_pic'] .'</a>' : '' ) ); *************** *** 863,867 **** $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&sort_order=$sort_order")), $total_comments, $comments_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $comments_per_page ) + 1 ), ceil( $total_comments / $comments_per_page )) ) --- 863,867 ---- $template->assign_vars(array( ! 'PAGINATION' => generate_pagination(mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&sort_order=$sort_order")), $total_comments, $comments_per_page, $start), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $comments_per_page ) + 1 ), ceil( $total_comments / $comments_per_page )) ) *************** *** 890,894 **** else { ! $poster = '<a href="'. append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>'; } --- 890,894 ---- else { ! $poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>'; } *************** *** 896,900 **** // Comment Posting Form //--------------------------------- - if ($auth_data['comment'] == 1) { --- 896,899 ---- *************** *** 906,947 **** } } ! $image_rating = ImageRating($thispic['rating']); - - //begin shows smilies - $max_smilies = 20; ! $sql = 'SELECT emoticon, code, smile_url ! FROM ' . SMILIES_TABLE . ' ! GROUP BY smile_url ! ORDER BY smilies_id LIMIT ' . $max_smilies; ! if (!$result = $db->sql_query($sql)) ! { ! mx_message_die(GENERAL_ERROR, "Couldn't retrieve smilies list", '', __LINE__, __FILE__, $sql); ! } ! $smilies_count = $db->sql_numrows($result); ! $smilies_data = $db->sql_fetchrowset($result); ! ! if ($auth_data['comment'] == 1) { ! for ($i = 1; $i < $smilies_count+1; $i++) ! { ! $template->assign_block_vars('switch_comment_post.smilies', array( ! 'CODE' => $smilies_data[$i - 1]['code'], ! 'URL' => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies_data[$i - 1]['smile_url'], ! 'DESC' => $smilies_data[$i - 1]['emoticon'] ! )); ! ! if ( is_integer($i / 5) ) ! $template->assign_block_vars('switch_comment_post.smilies.new_col', array()); ! ! } ! } ! ! // -------------------------------- // Rate Scale // -------------------------------- - if (!$already_rated) { --- 905,946 ---- } } ! $image_rating = ImageRating($thispic['rating']); ! //begin shows smilies ! $max_smilies = 20; ! $sql = 'SELECT emoticon, code, smile_url ! FROM ' . SMILIES_TABLE . ' ! GROUP BY smile_url ! ORDER BY smilies_id LIMIT ' . $max_smilies; ! ! if (!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Couldn't retrieve smilies list", '', __LINE__, __FILE__, $sql); ! } ! $smilies_count = $db->sql_numrows($result); ! $smilies_data = $db->sql_fetchrowset($result); ! ! if ($auth_data['comment'] == 1) ! { ! for ($i = 1; $i < $smilies_count+1; $i++) ! { ! $template->assign_block_vars('switch_comment_post.smilies', array( ! 'CODE' => $smilies_data[$i - 1]['code'], ! 'URL' => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies_data[$i - 1]['smile_url'], ! 'DESC' => $smilies_data[$i - 1]['emoticon'] ! )); ! ! if ( is_integer($i / 5) ) ! { ! $template->assign_block_vars('switch_comment_post.smilies.new_col', array()); ! } ! } ! } ! ! // -------------------------------- // Rate Scale // -------------------------------- if (!$already_rated) { *************** *** 969,979 **** $slideshow_select = ''; $slideshow_onoff = $lang['Slideshow_Off']; ! $slideshow_link = append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id)); $slideshow_link_full = '<a href="' . $slideshow_link . '">' . $lang['Slideshow_Off'] . '</a>'; ! $pic_link = append_sid(this_smartor_mxurl("smartor_mode=" . $nuffimage_pic . "&pic_id=" . $pic_id, TRUE)); ! $next_pic = ($no_next_pic == false) ? '<a href="' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=next&slideshow=' . $slideshow_delay)) . '#TopPic"><img src="' . $images['icon_right_arrow3'] . '" title="' . $lang['Next_Pic'] . '" border="0" alt="' . $lang['Next_Pic'] . '" align="middle" /></a>' : ''; ! $prev_pic = ($no_prev_pic == false) ? '<a href="' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=prev&slideshow=' . $slideshow_delay)) . '#TopPic"><img src="' . $images['icon_left_arrow3'] . '" title="' . $lang['Prev_Pic'] . '" border="0" alt="' . $lang['Prev_Pic'] . '" align="middle" /></a>' : ''; ! $next_pic_url = ($no_next_pic == false) ? append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=next&slideshow=' . $slideshow_delay)) . '#TopPic' : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $first_pic_id . $full_size_param)) . '#TopPic'; ! $prev_pic_url = ($no_prev_pic == false) ? append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=prev&slideshow=' . $slideshow_delay)) . '#TopPic' : append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $last_pic_id . $full_size_param)) . '#TopPic'; } else --- 968,978 ---- $slideshow_select = ''; $slideshow_onoff = $lang['Slideshow_Off']; ! $slideshow_link = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id)); $slideshow_link_full = '<a href="' . $slideshow_link . '">' . $lang['Slideshow_Off'] . '</a>'; ! $pic_link = mx_append_sid(this_smartor_mxurl("smartor_mode=" . $nuffimage_pic . "&pic_id=" . $pic_id, TRUE)); ! $next_pic = ($no_next_pic == false) ? '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=next&slideshow=' . $slideshow_delay)) . '#TopPic"><img src="' . $images['icon_right_arrow3'] . '" title="' . $lang['Next_Pic'] . '" border="0" alt="' . $lang['Next_Pic'] . '" align="middle" /></a>' : ''; ! $prev_pic = ($no_prev_pic == false) ? '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=prev&slideshow=' . $slideshow_delay)) . '#TopPic"><img src="' . $images['icon_left_arrow3'] . '" title="' . $lang['Prev_Pic'] . '" border="0" alt="' . $lang['Prev_Pic'] . '" align="middle" /></a>' : ''; ! $next_pic_url = ($no_next_pic == false) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=next&slideshow=' . $slideshow_delay)) . '#TopPic' : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $first_pic_id . $full_size_param)) . '#TopPic'; ! $prev_pic_url = ($no_prev_pic == false) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=prev&slideshow=' . $slideshow_delay)) . '#TopPic' : mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $last_pic_id . $full_size_param)) . '#TopPic'; } else *************** *** 994,1003 **** $slideshow_select .= '</select> '; $slideshow_onoff = $lang['Slideshow_On']; ! //$slideshow_link = append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . '&full=true&slideshow=' . $slideshow_delay)); ! $slideshow_link = append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . '&full=true')); $slideshow_link_full = '<a href="' . $slideshow_link . '">' . $lang['Slideshow_On'] . '</a>'; ! $pic_link = append_sid(this_smartor_mxurl("smartor_mode=" . $nuffimage_pic . "&pic_id=" . $pic_id . $sort_append . $full_size_param . $nuff_http_full_string, TRUE)); ! $next_pic = ($no_next_pic == false) ? '<a href="' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=next' . $nuffimage_vars)) . '#TopPic"><img src="' . $images['icon_left_arrow3'] . '" title="' . $lang['Next_Pic'] . '" border="0" alt="' . $lang['Next_Pic'] . '" align="middle" /></a>' : ''; ! $prev_pic = ($no_prev_pic == false) ? '<a href="' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=prev' . $nuffimage_vars)) . '#TopPic"><img src="' . $images['icon_right_arrow3'] . '" title="' . $lang['Prev_Pic'] . '" border="0" alt="' . $lang['Prev_Pic'] . '" align="middle" /></a>' : ''; $next_pic_url = '#TopPic'; $prev_pic_url = '#TopPic'; --- 993,1002 ---- $slideshow_select .= '</select> '; $slideshow_onoff = $lang['Slideshow_On']; ! //$slideshow_link = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . '&full=true&slideshow=' . $slideshow_delay)); ! $slideshow_link = mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . '&full=true')); $slideshow_link_full = '<a href="' . $slideshow_link . '">' . $lang['Slideshow_On'] . '</a>'; ! $pic_link = mx_append_sid(this_smartor_mxurl("smartor_mode=" . $nuffimage_pic . "&pic_id=" . $pic_id . $sort_append . $full_size_param . $nuff_http_full_string, TRUE)); ! $next_pic = ($no_next_pic == false) ? '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=next' . $nuffimage_vars)) . '#TopPic"><img src="' . $images['icon_left_arrow3'] . '" title="' . $lang['Next_Pic'] . '" border="0" alt="' . $lang['Next_Pic'] . '" align="middle" /></a>' : ''; ! $prev_pic = ($no_prev_pic == false) ? '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $pic_id . $full_size_param . '&mode=prev' . $nuffimage_vars)) . '#TopPic"><img src="' . $images['icon_right_arrow3'] . '" title="' . $lang['Prev_Pic'] . '" border="0" alt="' . $lang['Prev_Pic'] . '" align="middle" /></a>' : ''; $next_pic_url = '#TopPic'; $prev_pic_url = '#TopPic'; *************** *** 1045,1049 **** $server_path = $server_protocol . $server_name . $server_port . $script_name; ! $thumbnail_file = append_sid(this_smartor_mxurl("album_thumbnail" . '&pic_id=' . $pic_id)); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { --- 1044,1048 ---- $server_path = $server_protocol . $server_name . $server_port . $script_name; ! $thumbnail_file = mx_append_sid(this_smartor_mxurl("album_thumbnail" . '&pic_id=' . $pic_id)); if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) ) { *************** *** 1061,1067 **** $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), ! //'U_PIC' => ( $picm ) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=$pic_id", TRUE)) : append_sid(this_smartor_mxurl("smartor_mode=album_picm&pic_id=$pic_id", TRUE)), 'U_PIC' => $pic_link, 'U_PIC_L1' => ( $picm ) ? '<a href='.this_smartor_mxurl("smartor_mode=album_showpage&full=true&pic_id=" . $pic_id) . '>' : '', --- 1060,1066 ---- $template->assign_vars(array( 'CAT_TITLE' => $thiscat['cat_title'], ! 'U_VIEW_CAT' => ($cat_id != PERSONAL_GALLERY) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_cat&cat_id=$cat_id")) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_personal&user_id=$user_id")), ! //'U_PIC' => ( $picm ) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=$pic_id", TRUE)) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_picm&pic_id=$pic_id", TRUE)), 'U_PIC' => $pic_link, 'U_PIC_L1' => ( $picm ) ? '<a href='.this_smartor_mxurl("smartor_mode=album_showpage&full=true&pic_id=" . $pic_id) . '>' : '', *************** *** 1069,1074 **** 'U_PIC_CLICK' => ( $picm ) ? '' : 'Click on image to view larger image', ! 'U_NEXT' => append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&mode=next")), ! 'U_PREVIOUS' => append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&mode=previous")), 'PIC_RATING' => $image_rating, --- 1068,1073 ---- 'U_PIC_CLICK' => ( $picm ) ? '' : 'Click on image to view larger image', ! 'U_NEXT' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&mode=next")), ! 'U_PREVIOUS' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id&mode=previous")), 'PIC_RATING' => $image_rating, *************** *** 1115,1119 **** 'L_SUBMIT' => $lang['Submit'], ! 'S_ALBUM_ACTION' => append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id")), // Mighty Gorgon - Slideshow - BEGIN --- 1114,1118 ---- 'L_SUBMIT' => $lang['Submit'], ! 'S_ALBUM_ACTION' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id")), // Mighty Gorgon - Slideshow - BEGIN *************** *** 1148,1156 **** $template->pparse('body'); ! if ( !is_object($mx_block) ) ! { ! include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } ! } else --- 1147,1154 ---- $template->pparse('body'); ! if ( !is_object($mx_block) ) ! { ! include($mx_root_path . 'includes/page_tail.'.$phpEx); ! } } else *************** *** 1169,1173 **** { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! redirect(append_sid($phpbb_root_path ."login.$phpEx?redirect=album.php?smartor_mode=album_showpage&pic_id=$pic_id")); } else --- 1167,1171 ---- { mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']); ! mx_redirect(mx_append_sid($phpbb_root_path ."login.$phpEx?mx_redirect=album.php?smartor_mode=album_showpage&pic_id=$pic_id")); } else *************** *** 1181,1185 **** $comment_username = (!$userdata['session_logged_in']) ? str_replace("\'", "''", substr(htmlspecialchars(trim($HTTP_POST_VARS['comment_username'])), 0, 32)) : str_replace("'", "''", htmlspecialchars(trim($userdata['username']))); - --- 1179,1182 ---- *************** *** 1289,1296 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id")) . '">') ); ! $message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id ")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); --- 1286,1293 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id")) . '">') ); ! $message = $lang['Stored'] . "<br /><br />" . sprintf($lang['Click_view_message'], "<a href=\"" . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=$pic_id ")) . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_album_index'], "<a href=\"" . mx_append_sid(this_smartor_mxurl()) . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); Index: album_pic.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_pic.php,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** album_pic.php 7 Jun 2007 20:13:30 -0000 1.6 --- album_pic.php 1 Feb 2008 14:12:27 -0000 1.6.2.1 *************** *** 15,31 **** } - $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 - // - ! define('ALBUM_MOD_PATH', 'album_mod/'); // Get general album information --- 15,20 ---- } ! @define('ALBUM_MOD_PATH', 'album_mod/'); // Get general album information *************** *** 107,114 **** // ------------------------------------ // Check the permissions // ------------------------------------ $album_user_access = album_permissions($album_user_id, $cat_id, ALBUM_AUTH_VIEW, $thispic); ! if ( $album_user_access['view'] == false ) { mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); --- 96,127 ---- // ------------------------------------ + // Get the current Category Info + // ------------------------------------ + + if ($cat_id != PERSONAL_GALLERY) + { + $sql = "SELECT * + FROM ". ALBUM_CAT_TABLE ." + WHERE cat_id = '$cat_id'"; + if( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql); + } + + $thiscat = $db->sql_fetchrow($result); + } + else + { + $thiscat = init_personal_gallery_cat($user_id); + } + + // ------------------------------------ // Check the permissions // ------------------------------------ $album_user_access = album_permissions($album_user_id, $cat_id, ALBUM_AUTH_VIEW, $thispic); ! ! $auth_data = album_user_access($cat_id, $thiscat, 1, 0, 1, 1, 1, 1); ! ! if (($auth_data['view'] == 0) && ($album_user_access['view'] == false)) { mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); *************** *** 122,126 **** if ( ($thispic['cat_approval'] == ADMIN) || (($thispic['cat_approval'] == MOD) && !$album_user_access['moderator']) ) { ! if ( $thispic['pic_approval'] != 1 ) { mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); --- 135,139 ---- if ( ($thispic['cat_approval'] == ADMIN) || (($thispic['cat_approval'] == MOD) && !$album_user_access['moderator']) ) { ! if ($thispic['pic_approval'] !== 1) { mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); Index: album_thumbnail.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/includes/album_thumbnail.php,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** album_thumbnail.php 9 Aug 2007 13:17:01 -0000 1.7 --- album_thumbnail.php 1 Feb 2008 14:12:27 -0000 1.7.2.1 *************** *** 120,133 **** } ! /* // ------------------------------------ // Check the permissions // ------------------------------------ $album_user_access = album_permissions($album_user_id, $cat_id, ALBUM_AUTH_VIEW, $thispic); ! if ( $album_user_access['view'] == false ) { mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } // ------------------------------------ // Check Pic Approval --- 120,157 ---- } ! // ------------------------------------ ! // Get the current Category Info ! // ------------------------------------ ! ! if ($cat_id != PERSONAL_GALLERY) ! { ! $sql = "SELECT * ! FROM ". ALBUM_CAT_TABLE ." ! WHERE cat_id = '$cat_id'"; ! if( !($result = $db->sql_query($sql)) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql); ! } ! ! $thiscat = $db->sql_fetchrow($result); ! } ! else ! { ! $thiscat = init_personal_gallery_cat($user_id); ! } ! ! // ------------------------------------ // Check the permissions // ------------------------------------ $album_user_access = album_permissions($album_user_id, $cat_id, ALBUM_AUTH_VIEW, $thispic); ! $auth_data = album_user_access($cat_id, $thiscat, 1, 0, 1, 1, 1, 1); ! ! if (($auth_data['view'] == 0) && ($album_user_access['view'] == false)) { mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']); } + /* // ------------------------------------ // Check Pic Approval |
|
From: OryNider <ory...@us...> - 2008-02-01 14:12:42
|
Update of /cvsroot/mxbb/mx_smartor/album_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32052/album_mod Modified Files: Tag: core28x album_bbconstants.php album_common.php album_constants.php Log Message: some admin files fixed |
|
From: OryNider <ory...@us...> - 2008-02-01 08:04:53
|
Update of /cvsroot/mxbb/mx_shotcast/templates/subSilver/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18130/admin Modified Files: Tag: core28x shotcast_config_body.tpl Log Message: upgrade for 2.8.1 Index: shotcast_config_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/templates/subSilver/admin/shotcast_config_body.tpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** shotcast_config_body.tpl 2 Oct 2007 05:04:39 -0000 1.1.2.1 --- shotcast_config_body.tpl 1 Feb 2008 08:04:48 -0000 1.1.2.2 *************** *** 44,47 **** --- 44,55 ---- </tr> <tr> + <td class="row1"><p><b>{L_STREAM_TYPE}:</b><br></p></td> + <td class="row2">{STREAM_TYPE}</td></td> + </tr> + <tr> + <td class="row1"><p><b>{L_SHOW_STATUS}:</b><br></p></td> + <td class="row2">{SHOW_STATUS}</td></td> + </tr> + <tr> <td class="catBottom" colspan="2" align="center">{S_HIDDEN_FIELDS} <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> *************** *** 51,57 **** </tr> </table> - - - <br> </form> --- 59,62 ---- |
|
From: OryNider <ory...@us...> - 2008-02-01 08:04:28
|
Update of /cvsroot/mxbb/mx_shotcast/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17364/lang_english Modified Files: Tag: core28x lang_admin.php Log Message: upgrade for 2.8.1 Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/language/lang_english/lang_admin.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 *** lang_admin.php 2 Oct 2007 05:02:54 -0000 1.1.2.1 --- lang_admin.php 1 Feb 2008 08:03:52 -0000 1.1.2.2 *************** *** 30,33 **** --- 30,35 ---- $lang['Show_status'] = "Show status"; + $lang['Stream_type'] = "Stream Type"; + // |
|
From: OryNider <ory...@us...> - 2008-02-01 08:04:05
|
Update of /cvsroot/mxbb/mx_shotcast/language/lang_romanian In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17364/lang_romanian Modified Files: Tag: core28x lang_admin.php Log Message: upgrade for 2.8.1 Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/language/lang_romanian/lang_admin.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** lang_admin.php 6 Jun 2007 23:20:12 -0000 1.1 --- lang_admin.php 1 Feb 2008 08:03:53 -0000 1.1.2.1 *************** *** 22,25 **** --- 22,26 ---- $lang['Show_status'] = "Show status"; + $lang['Stream_type'] = "Stream Type"; // |
|
From: OryNider <ory...@us...> - 2008-02-01 08:02:57
|
Update of /cvsroot/mxbb/mx_shotcast/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17217/admin Modified Files: Tag: core28x admin_shotcast.php Log Message: upgrade for 2.8.1 Index: admin_shotcast.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/admin/admin_shotcast.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 *** admin_shotcast.php 2 Oct 2007 05:00:13 -0000 1.1.2.1 --- admin_shotcast.php 1 Feb 2008 08:02:22 -0000 1.1.2.2 *************** *** 34,38 **** // Setup basic portal stuff... // ! define('IN_PORTAL', true); $mx_root_path = '../../../'; $module_root_path = "../"; --- 34,38 ---- // Setup basic portal stuff... // ! @define('IN_PORTAL', true); $mx_root_path = '../../../'; $module_root_path = "../"; *************** *** 66,70 **** if(!$result = $db->sql_query($sql)) { ! message_die(GENERAL_ERROR, "Couldn't query shotcast config table", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) --- 66,70 ---- if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Couldn't query shotcast config table", "", __LINE__, __FILE__, $sql); } while( $row = $db->sql_fetchrow($result) ) *************** *** 84,93 **** mx_message_die(GENERAL_ERROR, "Failed to update shotcast configuration for $config_name", "", __LINE__, __FILE__, $sql); } } } //Show status? ! if ($new['show_status']=="true") { $show_status = "<select name=\"show_status\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; --- 84,104 ---- mx_message_die(GENERAL_ERROR, "Failed to update shotcast configuration for $config_name", "", __LINE__, __FILE__, $sql); } + // Behave as per HTTP/1.1 spec for others + echo '"<meta http-equiv="refresh" content="1;url="$file">"'; } } + //stream_type + if ($new['stream_type'] == 'mp3') + { + $stream_type = "<select name=\"stream_type\" size=1><option value=\"mp3\" selected>mp3<option value=\"icy\">icy</select>"; + } + else + { + $stream_type = "<select name=\"stream_type\" size=1><option value=\"mp3\">mp3<option value=\"icy\" selected>icy</select>"; + } //Show status? ! if ($new['show_status'] == true) { $show_status = "<select name=\"show_status\" size=1><option value=\"true\" selected>on<option value=\"false\">off</select>"; *************** *** 115,123 **** 'L_PLAY_LIST' => $lang['play_list'], 'L_SHOW_STATUS' => $lang['Show_status'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_RESET' => $lang['Reset'], ! 'L_CHECK_PERIOD' => $lang['Check_period'], 'L_CHECK_PERIOD_EXPLAIN' => $lang['Check_period_explain'], ! 'L_SHOW_LISTEN' => $lang['show_listen'], 'L_SHOW_LISTEN_INFO' => $lang['show_listen_info'], 'L_FORCE_ONLINE' => !empty($lang['Force_Online']) ? $lang['Force_Online'] : 'Force Online', --- 126,135 ---- 'L_PLAY_LIST' => $lang['play_list'], 'L_SHOW_STATUS' => $lang['Show_status'], ! 'L_STREAM_TYPE' => $lang['Stream_type'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_RESET' => $lang['Reset'], ! 'L_CHECK_PERIOD' => $lang['Check_period'], 'L_CHECK_PERIOD_EXPLAIN' => $lang['Check_period_explain'], ! 'L_SHOW_LISTEN' => $lang['show_listen'], 'L_SHOW_LISTEN_INFO' => $lang['show_listen_info'], 'L_FORCE_ONLINE' => !empty($lang['Force_Online']) ? $lang['Force_Online'] : 'Force Online', *************** *** 129,133 **** 'STATION_PORT' => $new['shotcast_port'], 'STATION_PASS' => $new['shotcast_pass'], ! 'PLAY_LIST' => $new['play_list'], 'CHECK_PERIOD' => $new['check_period'], --- 141,145 ---- 'STATION_PORT' => $new['shotcast_port'], 'STATION_PASS' => $new['shotcast_pass'], ! 'PLAY_LIST' => $new['play_list'], 'CHECK_PERIOD' => $new['check_period'], *************** *** 135,142 **** //GUI_SETTING 'USER_STATE_BUTTON' => $user_state_button, ! 'S_LISTEN_YES' => $show_listen_select_yes, 'S_LISTEN_NO' => $show_listen_select_no, 'FORCE_ON_ENABLED' => ($new['force_online'] == 1) ? 'checked="checked"' : '', ! 'FORCE_ON_DISABLED' => ($new['force_online'] == 0) ? 'checked="checked"' : '', 'SHOW_STATUS' => $show_status) ); --- 147,155 ---- //GUI_SETTING 'USER_STATE_BUTTON' => $user_state_button, ! 'S_LISTEN_YES' => $show_listen_select_yes, 'S_LISTEN_NO' => $show_listen_select_no, 'FORCE_ON_ENABLED' => ($new['force_online'] == 1) ? 'checked="checked"' : '', ! 'FORCE_ON_DISABLED' => ($new['force_online'] == 0) ? 'checked="checked"' : '', ! 'STREAM_TYPE' => $stream_type, 'SHOW_STATUS' => $show_status) ); |
|
From: OryNider <ory...@us...> - 2008-02-01 08:02:33
|
Update of /cvsroot/mxbb/mx_shotcast In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17217 Modified Files: Tag: core28x db_install.php db_upgrade.php getinfo.php play_real.php play_wmp.php shotcast_config.php shotcast_last10.php stop_real.php stop_wmp.php Log Message: upgrade for 2.8.1 Index: stop_wmp.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/stop_wmp.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** stop_wmp.php 2 Oct 2007 05:06:24 -0000 1.1.2.2 --- stop_wmp.php 1 Feb 2008 08:02:26 -0000 1.1.2.3 *************** *** 1,5 **** ! <?php ! ! define( 'IN_PORTAL', 1 ); $module_root_path = './'; --- 1,5 ---- ! <?php ! define('IN_PORTAL', 1); ! define('IN_SHOTCAST', 1); $module_root_path = './'; *************** *** 7,10 **** --- 7,11 ---- include($module_root_path . 'shotcast_config.'.$phpEx); + include($module_root_path . 'getinfo.'.$phpEx); if (empty($song[0])) Index: stop_real.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/stop_real.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** stop_real.php 2 Oct 2007 05:06:23 -0000 1.1.2.2 --- stop_real.php 1 Feb 2008 08:02:25 -0000 1.1.2.3 *************** *** 1,5 **** ! <?php ! ! define( 'IN_PORTAL', 1 ); $module_root_path = './'; --- 1,5 ---- ! <?php ! define('IN_PORTAL', 1); ! define('IN_SHOTCAST', 1); $module_root_path = './'; *************** *** 7,10 **** --- 7,11 ---- include($module_root_path . 'shotcast_config.'.$phpEx); + include($module_root_path . 'getinfo.'.$phpEx); if (empty($song[0])) Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_upgrade.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 *** db_upgrade.php 2 Oct 2007 05:00:20 -0000 1.1.2.1 --- db_upgrade.php 1 Feb 2008 08:02:23 -0000 1.1.2.2 *************** *** 64,67 **** --- 64,68 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('force_online', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('stream_type', 'mp3')"; } else Index: shotcast_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/shotcast_config.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 *** shotcast_config.php 2 Oct 2007 05:00:28 -0000 1.1.2.1 --- shotcast_config.php 1 Feb 2008 08:02:25 -0000 1.1.2.2 *************** *** 38,41 **** --- 38,46 ---- $scpass = $shotcast_config['shotcast_pass']; // SHOUTcast Password $playlist = ( !empty($shotcast_config['play_list']) ? $shotcast_config['play_list'] : 'listen.pls' ); // Real Player Play List File + $stream_type = $shotcast_config['stream_type']; //Stream type: aac or mp3 + $station_name = "Shotcast Radio"; // Radio Station Name (for the no pass version) + $force_no_playlist = true; + $protocol_type = ($stream_type == 'mp3') ? 'http' : 'icyx'; + $streamdest = $protocol_type . "://" . $scip . ":" . $scport . "/" . $playlist; ?> \ No newline at end of file Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_install.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 *** db_install.php 2 Oct 2007 05:00:18 -0000 1.1.2.1 --- db_install.php 1 Feb 2008 08:02:23 -0000 1.1.2.2 *************** *** 58,69 **** $sql[] = "CREATE TABLE " . $mx_table_prefix . "shotcast_config ( ! config_name VARCHAR(255) NOT NULL default '', config_value varchar(255) NOT NULL default '', PRIMARY KEY (config_name) ) TYPE=MyISAM"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('shotcast_name', 'The Joy Fm')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('shotcast_host', '209.85.88.199')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('shotcast_port', '10040')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('shotcast_pass', 'thejoyfm')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('play_list', 'listen.pls')"; --- 58,69 ---- $sql[] = "CREATE TABLE " . $mx_table_prefix . "shotcast_config ( ! config_name VARCHAR(255) NOT NULL default '', config_value varchar(255) NOT NULL default '', PRIMARY KEY (config_name) ) TYPE=MyISAM"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('shotcast_name', 'Happy Radio')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('shotcast_host', 'Happy.Radio.Su')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('shotcast_port', '8000')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('shotcast_pass', 'thejoyfm')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('play_list', 'listen.pls')"; *************** *** 72,75 **** --- 72,76 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('show_listen_select', '1')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('force_online', '1')"; + $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('stream_type', 'icy')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config ( config_name , config_value ) VALUES ('show_status', 'true')"; Index: shotcast_last10.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/shotcast_last10.php,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** shotcast_last10.php 2 Oct 2007 05:06:23 -0000 1.2.2.2 --- shotcast_last10.php 1 Feb 2008 08:02:25 -0000 1.2.2.3 *************** *** 124,130 **** else { ! $request="GET /played.html HTTP/1.1\r\nHost: " . $host . ":" . $port . "\r\nUser-Agent: SHOUTcast DNAS Status [played] * (Mozilla/PHP)\r\n"."Connection: close\r\n\r\n"; @fputs($fp,$request,strlen($request)); ! $page=''; while (!feof($fp)) { --- 124,130 ---- else { ! $request = "GET /played.html HTTP/1.1\r\nHost: " . $host . ":" . $port . "\r\nUser-Agent: SHOUTcast DNAS Status [played] * (Mozilla/PHP)\r\n"."Connection: close\r\n\r\n"; @fputs($fp,$request,strlen($request)); ! $page = ''; while (!feof($fp)) { *************** *** 132,136 **** } @fclose($fp); //close connection ! $played_html=$page; if ($played_html) --- 132,136 ---- } @fclose($fp); //close connection ! $played_html = $page; if ($played_html) Index: getinfo.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/getinfo.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 *** getinfo.php 2 Oct 2007 05:00:22 -0000 1.1.2.1 --- getinfo.php 1 Feb 2008 08:02:23 -0000 1.1.2.2 *************** *** 14,17 **** --- 14,21 ---- } + //$accplugin = 'http://' . $_SERVER['SERVER_NAME'] . substr($_SERVER['PHP_SELF'], 0, -strlen(basename(__FILE__))) . 'install/setup_AAC_aacPlus_plugin.exe'; + + $accplugin = 'http://retro-radio.net/plugin/setup_AAC_aacPlus_plugin_1_0_36.exe'; + $nick = str_replace(" ", "_", $userdata['username']); $period = !empty($period) ? $period : $shotcast_config['check_period'] * 1000; *************** *** 20,23 **** --- 24,35 ---- $scport = !empty($scport) ? $scport : $shotcast_config['shotcast_port']; // Port $scpass = !empty($scpass) ? $scpass : $shotcast_config['shotcast_pass']; // SHOUTcast Password + + $wmpmode = ($protocol_type !== 'icyx') ? 'http://' : 'icyx://'; // AAC VS MPEG + $wmplist = ( ($stream_type == 'mp3') || ($force_no_playlist) ) ? '' : '/' .$playlist; + $ff2pluginspace = ($stream_type == 'mp3') ? 'http://port25.technet.com/videos/downloads/wmpfirefoxplugin.exe' : $accplugin; + $wmp7pluginspace = ($stream_type == 'mp3') ? 'http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&' : $accplugin; + $wmp6pluginspace = ($stream_type == 'mp3') ? 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,4,5,715' : 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,4,5,715'; + + $time = date("U"); $errno = 0; Index: play_real.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/play_real.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 *** play_real.php 2 Oct 2007 05:00:24 -0000 1.1.2.1 --- play_real.php 1 Feb 2008 08:02:24 -0000 1.1.2.2 *************** *** 1,5 **** ! <?php ! ! define( 'IN_PORTAL', 1 ); $module_root_path = './'; --- 1,5 ---- ! <?php ! define('IN_PORTAL', 1); ! define('IN_SHOTCAST', 1); $module_root_path = './'; *************** *** 7,10 **** --- 7,11 ---- include($module_root_path . 'shotcast_config.'.$phpEx); + include($module_root_path . 'getinfo.'.$phpEx); if (empty($song[0])) *************** *** 14,17 **** --- 15,20 ---- ?> + + ?> <html> <head> Index: play_wmp.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/play_wmp.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 *** play_wmp.php 2 Oct 2007 05:00:24 -0000 1.1.2.1 --- play_wmp.php 1 Feb 2008 08:02:24 -0000 1.1.2.2 *************** *** 1,5 **** ! <?php ! ! define( 'IN_PORTAL', 1 ); $module_root_path = './'; --- 1,6 ---- ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <?php ! define('IN_PORTAL', 1); ! define('IN_SHOTCAST', 1); $module_root_path = './'; *************** *** 7,10 **** --- 8,12 ---- include($module_root_path . 'shotcast_config.'.$phpEx); + include($module_root_path . 'getinfo.'.$phpEx); if (empty($song[0])) *************** *** 14,18 **** ?> ! <html><head> <STYLE type=text/css>BODY { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BACKGROUND-REPEAT: repeat-x; FONT-FAMILY: Arial, Helvetica, sans-serif; BACKGROUND-COLOR: #CEDEDF; --- 16,21 ---- ?> ! <html> ! <head> <STYLE type=text/css>BODY { PADDING-RIGHT: 0px; PADDING-LEFT: 0px; PADDING-BOTTOM: 0px; MARGIN: 0px; PADDING-TOP: 0px; BACKGROUND-REPEAT: repeat-x; FONT-FAMILY: Arial, Helvetica, sans-serif; BACKGROUND-COLOR: #CEDEDF; *************** *** 43,64 **** if (Mac) { ! ! if ( navigator.appName == "Netscape" ){ ! //Netscape code ! document.write (' <Embed id="wmp" name="wmp" type="audio/mpeg"'); ! document.write (' pluginspage="http://www.microsoft.com/windows/windowsmedia/"'); ! document.write (' filename="http://<?=$scip;?>:<?=$scport;?>"'); ! document.write (' src="http://<?=$scip;?>:<?=$scport;?>"'); ! document.write (' Name=MediaPlayer'); ! document.write (' ShowControls=1'); ! document.write (' ShowDisplay=1'); ! document.write (' ShowStatusBar=1'); ! document.write (' AUTOSTART=1'); ! document.write (' width=332'); ! document.write (' height=354>'); ! document.write (' </Embed>'); } ! ! if ( navigator.appName != "Netscape" ){ ! document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="332" height="354" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="1" src="http://<?=$scip;?>:<?=$scport;?>" ></embed>'); } } --- 46,69 ---- if (Mac) { ! if ( navigator.appName == "Netscape" ) ! { ! //Netscape code ! document.write (' <Embed id="wmp" name="wmp" type="audio/mpeg"'); ! document.write (' pluginspage="<?=$ff2pluginspace;?>"'); ! document.write (' filename="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"'); ! document.write (' src="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"'); ! document.write (' Name=MediaPlayer'); ! document.write (' ShowControls=1'); ! document.write (' ShowDisplay=1'); ! document.write (' ShowStatusBar=1'); ! document.write (' AUTOSTART=1'); ! document.write (' width=332'); ! document.write (' height=354>'); ! document.write (' </Embed>'); ! } ! else ! { ! document.write(' <embed id="wmp" name="wmp" type="audio/mpeg" width="332" height="354" ShowTracker="0" ShowDisplay="0" ShowGotoBar="0" ShowStatusBar="1" ShowCaptioning="0" AUTOSTART="1" src="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>" ></embed>'); ! } } *************** *** 66,144 **** if (Win) { ! if ( navigator.appName != "Netscape" ){ ! WMP7 = new ActiveXObject('WMPlayer.OCX'); ! } ! ! // Windows Media Player 7 Code ! if ( WMP7 ) ! { ! ! document.write ('<OBJECT ID=MediaPlayer '); ! document.write (' CLASSID=CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6'); ! document.write (' standby="Loading Microsoft Windows Media Player components..."'); ! document.write (' TYPE="application/x-oleobject" width="332" height="354">'); ! document.write ('<PARAM NAME="url" VALUE="http://<?=$scip;?>:<?=$scport;?>">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="true">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! document.write ('<PARAM NAME="uiMode" VALUE="mini">'); ! document.write (' <Embed type="application/x-mplayer2"'); ! document.write (' pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"'); ! document.write (' filename="http://<?=$scip;?>:<?=$scport;?>"'); ! document.write (' src="http://<?=$scip;?>:<?=$scport;?>"'); ! document.write (' Name="MediaPlayer"'); ! document.write (' ShowControls="1"'); ! document.write (' ShowDisplay="1"'); ! document.write (' ShowStatusBar="1"'); ! document.write (' AUTOSTART="true"'); ! document.write (' width="332"'); ! document.write (' height="354">'); ! document.write (' </embed>'); ! document.write ('</OBJECT>'); ! } - // Windows Media Player 6.4 Code - else ! { ! //IE Code ! document.write ('<OBJECT ID=MediaPlayer '); ! document.write (' CLASSID=CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95'); ! document.write (' CODEBASE=http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,4,5,715 '); ! document.write (' standby="Loading Microsoft Windows Media Player components..."'); ! document.write (' TYPE="application/x-oleobject" width="332" height="354">'); ! document.write (' <PARAM NAME="FileName" VALUE="http://<?=$scip;?>:<?=$scport;?>">'); ! document.write ('<PARAM NAME="url" VALUE="http://<?=$scip;?>:<?=$scport;?>"> '); ! document.write ('<PARAM NAME="AutoStart" VALUE="1">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! //Firefox code ! document.write (' <Embed type="application/x-mplayer2"'); ! document.write (' pluginspage="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&"'); ! document.write (' filename="http://<?=$scip;?>:<?=$scport;?>"'); ! document.write (' src="http://<?=$scip;?>:<?=$scport;?>"'); ! document.write (' Name="MediaPlayer"'); ! document.write (' ShowControls="1"'); ! document.write (' ShowDisplay="1"'); ! document.write (' ShowStatusBar="1"'); ! document.write (' AUTOSTART="true"'); ! document.write (' width="332"'); ! document.write (' height="354">'); ! document.write (' </embed>'); ! document.write ('</OBJECT>'); ! ! } } - else { ! ! document.write(' <embed type="audio/mpeg" width="332" height="354" AUTOSTART="1" filename="http://<?=$scip;?>:<?=$scport;?>" src="http://<?=$scip;?>:<?=$scport;?>" ></embed>'); ! } --- 71,200 ---- if (Win) { ! if ( navigator.appName != "Netscape" ) ! { ! WMP7 = new ActiveXObject('WMPlayer.OCX'); ! } ! // Windows Media Player 7 Code ! if ( WMP7 ) ! { ! document.write ('<OBJECT ID=MediaPlayer '); ! document.write (' CLASSID=CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95'); ! document.write (' standby="Loading Microsoft Windows Media Player components..."'); ! document.write (' TYPE="application/x-oleobject" width="332" height="354">'); ! document.write ('<PARAM NAME="FileName" VALUE="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>" valuetype="ref">'); ! document.write ('<PARAM NAME="url" VALUE="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>">'); ! document.write ('<PARAM NAME="AutoStart" VALUE="true">'); ! document.write ('<PARAM NAME="uiMode" VALUE="mini">'); ! document.write ('<param name="AudioStream" value="1">'); ! document.write ('<param name="AutoSize" value="0">'); ! document.write ('<param name="AnimationAtStart" value="-1">'); ! document.write ('<param name="AllowScan" value="-1">'); ! document.write ('<param name="AllowChangeDisplaySize" value="-1">'); ! document.write ('<param name="AutoRewind" value="0">'); ! document.write ('<param name="Balance" value="0">'); ! document.write ('<param name="BaseURL" value>'); ! document.write ('<param name="BufferingTime" value="5">'); ! document.write ('<param name="CaptioningID" value>'); ! document.write ('<param name="ClickToPlay" value="-1">'); ! document.write ('<param name="CursorType" value="0">'); ! document.write ('<param name="CurrentPosition" value="-1">'); ! document.write ('<param name="CurrentMarker" value="0">'); ! document.write ('<param name="DefaultFrame" value>'); ! document.write ('<param name="DisplayBackColor" value="0">'); ! document.write ('<param name="DisplayForeColor" value="16777215">'); ! document.write ('<param name="DisplayMode" value="1">'); ! document.write ('<param name="DisplaySize" value="1">'); ! document.write ('<param name="Enabled" value="-1">'); ! document.write ('<param name="EnableContextMenu" value="-1">'); ! document.write ('<param name="EnablePositionControls" value="-1">'); ! document.write ('<param name="EnableFullScreenControls" value="-1">'); ! document.write ('<param name="EnableTracker" value="-1">'); ! document.write ('<param name="InvokeURLs" value="-1">'); ! document.write ('<param name="Language" value="-1">'); ! document.write ('<param name="Mute" value="0">'); ! document.write ('<param name="PlayCount" value="0">'); ! document.write ('<param name="PreviewMode" value="0">'); ! document.write ('<param name="Rate" value="1">'); ! document.write ('<param name="SAMILang" value>'); ! document.write ('<param name="SAMIStyle" value>'); ! document.write ('<param name="SAMIFileName" value>'); ! document.write ('<param name="SelectionStart" value="-1">'); ! document.write ('<param name="SelectionEnd" value="-1">'); ! document.write ('<param name="SendOpenStateChangeEvents" value="-1">'); ! document.write ('<param name="SendWarningEvents" value="-1">'); ! document.write ('<param name="SendErrorEvents" value="-1">'); ! document.write ('<param name="SendKeyboardEvents" value="0">'); ! document.write ('<param name="SendMouseClickEvents" value="0">'); ! document.write ('<param name="SendMouseMoveEvents" value="0">'); ! document.write ('<param name="SendPlayStateChangeEvents" value="-1">'); ! document.write ('<param name="ShowCaptioning" value="0">'); ! document.write ('<param name="ShowControls" value="-1">'); ! document.write ('<param name="ShowAudioControls" value="-1">'); ! document.write ('<param name="ShowDisplay" value="0">'); ! document.write ('<param name="ShowGotoBar" value="0">'); ! document.write ('<param name="ShowPositionControls" value="0">'); ! document.write ('<param name="ShowStatusBar" value="-1">'); ! document.write ('<param name="ShowTracker" value="-1">'); ! document.write ('<param name="TransparentAtStart" value="0">'); ! document.write ('<param name="VideoBorderWidth" value="0">'); ! document.write ('<param name="VideoBorderColor" value="333333">'); ! document.write ('<param name="VideoBorder3D" value="-1">'); ! document.write ('<param name="Volume" value="-1">'); ! document.write ('<param name="WindowlessVideo" value="-1">'); + document.write (' <Embed type="application/x-mplayer2"'); + document.write (' pluginspage="<?=$wmp7pluginspace;?>"'); + document.write (' filename="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"'); + document.write (' src="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"'); + document.write (' Name="MediaPlayer"'); + document.write (' ShowControls="1"'); + document.write (' ShowDisplay="1"'); + document.write (' ShowStatusBar="1"'); + document.write (' AUTOSTART="true"'); + document.write (' width="332"'); + document.write (' height="354">'); + document.write (' </embed>'); ! document.write ('</OBJECT>'); ! } ! // Windows Media Player 6.4 Code ! else ! { ! //IE Code ! document.write ('<OBJECT ID="MediaPlayer"'); ! document.write (' CLASSID="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95"'); ! document.write (' CODEBASE="<?=$wmp6pluginspace;?>"'); ! document.write (' standby="Loading Microsoft Windows Media Player components..."'); ! document.write (' TYPE="application/x-oleobject" width="250" height="62">'); ! document.write (' <PARAM NAME="FileName" VALUE="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>" valuetype="ref">'); ! document.write ('<PARAM NAME="url" VALUE="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"> '); ! document.write ('<PARAM NAME="AutoStart" VALUE="true">'); ! document.write ('<PARAM NAME="ShowControls" VALUE="1">'); ! //Firefox code ! document.write (' <Embed type="application/x-ms-wmp"'); ! document.write (' pluginspage="<?=$ff2pluginspace;?>"'); ! document.write (' filename="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"'); ! document.write (' src="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"'); ! document.write (' Name=MediaPlayer'); ! document.write (' ShowControls=1'); ! document.write (' ShowDisplay=1'); ! document.write (' ShowStatusBar=1'); ! document.write (' AUTOSTART=1'); ! document.write (' width=290'); ! document.write (' height=320>'); ! document.write (' </embed>'); ! document.write ('</OBJECT>'); ! } } else { ! document.write(' <embed type="audio/mpeg" width="332" height="354" AUTOSTART="1" filename="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>" src="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>" ></embed>'); } |
|
From: OryNider <ory...@us...> - 2008-02-01 07:59:45
|
Update of /cvsroot/mxbb/mx_radio/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16969 Modified Files: Tag: core28x mx_player.tpl mx_playerg.tpl Log Message: upgrade for 2.8.1 Index: mx_playerg.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_radio/templates/subSilver/mx_playerg.tpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** mx_playerg.tpl 6 Jun 2007 23:34:02 -0000 1.1 --- mx_playerg.tpl 1 Feb 2008 07:59:40 -0000 1.1.2.1 *************** *** 75,79 **** </HEAD> <BODY> ! <TABLE cellSpacing=0 cellPadding=0 width=315 border=0> <TBODY> <TR> --- 75,79 ---- </HEAD> <BODY> ! <TABLE cellSpacing="0" cellPadding="0" width="{BLOCK_SIZE}" border="0" class="forumline" style="border-top:none;"> <TBODY> <TR> *************** *** 85,89 **** <TD vAlign=center align=middle> ! <TABLE cellSpacing=0 cellPadding=0 width=300 border=0> <TBODY> <TR> --- 85,89 ---- <TD vAlign=center align=middle> ! <TABLE cellSpacing=0 cellPadding=0 width="{PLAYER_SIZE}" border=0> <TBODY> <TR> Index: mx_player.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_radio/templates/subSilver/mx_player.tpl,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** mx_player.tpl 6 Jun 2007 23:34:02 -0000 1.1 --- mx_player.tpl 1 Feb 2008 07:59:40 -0000 1.1.2.1 *************** *** 74,78 **** <META content="MSHTML 6.00.2800.1106" name=GENERATOR></HEAD> <BODY> ! <TABLE cellSpacing=0 cellPadding=0 width=315 border=0> <TBODY> <TR> --- 74,78 ---- <META content="MSHTML 6.00.2800.1106" name=GENERATOR></HEAD> <BODY> ! <TABLE cellSpacing="0" cellPadding="0" width="{BLOCK_SIZE}" border="0" class="forumline" style="border-top:none;"> <TBODY> <TR> *************** *** 84,88 **** <TD vAlign=center align=middle> ! <TABLE cellSpacing=0 cellPadding=0 width=300 border=0> <TBODY> <TR> --- 84,88 ---- <TD vAlign=center align=middle> ! <TABLE cellSpacing=0 cellPadding=0 width="{PLAYER_SIZE}" border=0> <TBODY> <TR> |
|
From: OryNider <ory...@us...> - 2008-02-01 07:58:20
|
Update of /cvsroot/mxbb/mx_radio/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16495/admin Modified Files: Tag: core28x admin_radio.php Log Message: upgrade for 2.8.1 |
|
From: OryNider <ory...@us...> - 2008-02-01 07:58:20
|
Update of /cvsroot/mxbb/mx_radio In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16495 Modified Files: Tag: core28x db_install.php db_uninstall.php db_upgrade.php mx_install_readme.htm radio_front.php radio_index.php radio_update.php Added Files: Tag: core28x Media_Radio.pak Removed Files: Tag: core28x mx_radio.pak Log Message: upgrade for 2.8.1 --- NEW FILE: Media_Radio.pak --- module=+:72=+:Media Radio=+:modules/mx_radio/=+:mx_radio=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:72=+:89=+:Radio Front=+:mx_radio front block=+:radio_front.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Radio Front=+:Demo block=+:89=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:72=+:126=+:Radio Player=+:Radio Player or Index=+:radio_index.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:Radio Player=+:Demo block=+:126=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- mx_radio.pak DELETED --- Index: mx_install_readme.htm =================================================================== RCS file: /cvsroot/mxbb/mx_radio/mx_install_readme.htm,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_install_readme.htm 2 Nov 2007 00:26:10 -0000 1.1.2.1 --- mx_install_readme.htm 1 Feb 2008 07:58:16 -0000 1.1.2.2 *************** *** 6,10 **** <meta name="generator" content= "HTML Tidy for Windows (vers 19 September 2007), see www.w3.org" /> ! <title>Mx Portal installation - readme</title> <meta http-equiv="Content-Type" content= "text/html; charset=us-ascii" /> --- 6,10 ---- <meta name="generator" content= "HTML Tidy for Windows (vers 19 September 2007), see www.w3.org" /> ! <title>mxBB Portal installation - readme</title> <meta http-equiv="Content-Type" content= "text/html; charset=us-ascii" /> Index: radio_index.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/radio_index.php,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** radio_index.php 6 Jun 2007 23:31:14 -0000 1.1 --- radio_index.php 1 Feb 2008 07:58:16 -0000 1.1.2.1 *************** *** 8,51 **** * */ - define('IN_PORTAL', 1); ! $mx_root_path = "../../"; ! $mx_module_path = "./"; ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! // ! // Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! define('_RADIO_CONFIG', true); ! include_once($mx_module_path .'includes/common.'.$phpEx); ! // ! // End session management ! // ! // include_once($mx_module_path .'includes/player.'.$phpEx); ! // ! // Begin output of page ! // if ( $radio_config['gf_select'] ) ! { $template->set_filenames(array( 'body_radio' => 'mx_player.tpl' )); ! } else ! { $template->set_filenames(array( 'body_radio' => 'mx_playerg.tpl' )); ! } $template->assign_vars(array( 'BLOCK_SIZE' => $block_size, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'U_PORTAL_ROOT_PATH' => PORTAL_URL, --- 8,74 ---- * */ ! 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' ); ! $player_size = ( isset($block_size) && !empty($block_size) ? $block_size - 15 : '300' ); + $is_block = FALSE; + } + else + { + // + // Read block Configuration + // + + $title = $mx_block->block_info['block_title']; + $block_size = $player_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); + + if( is_object($mx_block)) + { + $is_block = TRUE; + } + } + + define('_RADIO_CONFIG', true); + include_once($module_root_path .'includes/common.'.$phpEx); + + // + // Begin output of page + // if ( $radio_config['gf_select'] ) ! { $template->set_filenames(array( 'body_radio' => 'mx_player.tpl' )); ! } else ! { $template->set_filenames(array( 'body_radio' => 'mx_playerg.tpl' )); ! } $template->assign_vars(array( 'BLOCK_SIZE' => $block_size, + 'PLAYER_SIZE' => $player_size, 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'U_PORTAL_ROOT_PATH' => PORTAL_URL, *************** *** 55,61 **** 'FLASH_FILE' => $mx_root_path . $radio_config['flash_FileName'], 'GATEWAY_FILE' => $mx_root_path . $radio_config['gateway_FileName'], ! 'IMG_IFRAME_BG' => $mx_module_path .'images/iframe_bg.png', ! 'IMG_ADVIEW' => $mx_module_path .'gateway/gateway_files/adview.gif', ! 'JS_ADX' => $mx_module_path .'gateway/gateway_files/adx.js', 'STATION_STREAM' => $radio_config['radio_FileName'] )); --- 78,84 ---- 'FLASH_FILE' => $mx_root_path . $radio_config['flash_FileName'], 'GATEWAY_FILE' => $mx_root_path . $radio_config['gateway_FileName'], ! 'IMG_IFRAME_BG' => $module_root_path .'images/iframe_bg.png', ! 'IMG_ADVIEW' => $module_root_path .'gateway/gateway_files/adview.gif', ! 'JS_ADX' => $module_root_path .'gateway/gateway_files/adx.js', 'STATION_STREAM' => $radio_config['radio_FileName'] )); *************** *** 65,74 **** $template->pparse('body_radio'); ! $time=date("U"); $nick = str_replace(" ", "_", $userdata['username']); ! if ($_POST['update']==true) { ! update_radio_user($nick,$time); } --- 88,97 ---- $template->pparse('body_radio'); ! $time = date("U"); $nick = str_replace(" ", "_", $userdata['username']); ! if ($_POST['update'] == true) { ! update_radio_user($nick,$time); } |
|
From: OryNider <ory...@us...> - 2008-02-01 07:58:19
|
Update of /cvsroot/mxbb/mx_radio/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16495/includes Modified Files: Tag: core28x common.php Log Message: upgrade for 2.8.1 |
2 messages has been excluded from this view by a project administrator.
