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: OryNider <ory...@us...> - 2008-03-06 03:11:50
|
Update of /cvsroot/mxbb/mx_shotcast/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080/templates/subSilver Modified Files: shotcast_front.tpl Log Message: version 2.0 Index: shotcast_front.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/templates/subSilver/shotcast_front.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shotcast_front.tpl 2 Oct 2007 04:44:36 -0000 1.2 --- shotcast_front.tpl 6 Mar 2008 03:09:40 -0000 1.3 *************** *** 27,33 **** <!-- END switch_user_logged_out --> <!-- BEGIN switch_user_logged_in --> ! [ <a href="javascript:void(0);" onClick="window.open('{S_LISTEN_STATION}','','scrollbars=no,resizable=yes,width=350,height=96')">{L_CLICK_TO_LISTEN_STATION}</a> ] ! <a href="javascript:void(0);" onClick="window.open('{S_LISTEN_WMP}','','scrollbars=no,resizable=yes,width=350,height=96')"><img src="{WMP_IMG}" alt="{L_CLICK_TO_LISTEN_WMP}" border="0" /></a> ! <a href="javascript:void(0);" onClick="window.open('{S_LISTEN_REAL}','','scrollbars=no,resizable=yes,width=350,height=96')"><img src="{REAL_IMG}" alt="{L_CLICK_TO_LISTEN_REAL}" border="0" /></a> <!-- END switch_user_logged_in --> <!-- BEGIN switch_user_listening --> --- 27,33 ---- <!-- END switch_user_logged_out --> <!-- BEGIN switch_user_logged_in --> ! [ <a href="javascript:void(0);" onClick="window.open('{S_LISTEN_STATION}', 'poppage', 'toolbars=0, scrollbars=0, location=0, statusbars=0, menubars=0, resizable=1, width=320, height=142 left = 100, top = 100')">{L_CLICK_TO_LISTEN_STATION}</a> ] ! <a href="javascript:void(0);" onClick="window.open('{S_LISTEN_WMP}', 'poppage', 'toolbars=0, scrollbars=0, location=0, statusbars=0, menubars=0, resizable=1, width=320, height=142 left = 100, top = 100')"><img src="{WMP_IMG}" alt="{L_CLICK_TO_LISTEN_WMP}" border="0" /></a> ! <a href="javascript:void(0);" onClick="window.open('{S_LISTEN_REAL}', 'poppage', 'toolbars=0, scrollbars=0, location=0, statusbars=0, menubars=0, resizable=1, width=320, height=142 left = 100, top = 100')"><img src="{REAL_IMG}" alt="{L_CLICK_TO_LISTEN_REAL}" border="0" /></a> <!-- END switch_user_logged_in --> <!-- BEGIN switch_user_listening --> |
|
From: OryNider <ory...@us...> - 2008-03-06 03:11:49
|
Update of /cvsroot/mxbb/mx_shotcast/images/blue In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080/images/blue Removed Files: player.png player2.png player3_real.png player3_wmp.png small_real.png small_wmp.png Log Message: version 2.0 --- player3_real.png DELETED --- --- small_real.png DELETED --- --- small_wmp.png DELETED --- --- player2.png DELETED --- --- player.png DELETED --- --- player3_wmp.png DELETED --- |
|
From: OryNider <ory...@us...> - 2008-03-06 03:11:47
|
Update of /cvsroot/mxbb/mx_shotcast In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080 Modified Files: cur_song.php db_install.php db_upgrade.php getinfo.php mx_install_readme.htm radioplayer.php Added Files: play.php Removed Files: play_real.php play_wmp.php shotcast_config.php Log Message: version 2.0 Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_upgrade.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** db_upgrade.php 28 Feb 2008 06:26:38 -0000 1.6 --- db_upgrade.php 6 Mar 2008 03:09:28 -0000 1.7 *************** *** 31,35 **** } ! $mx_module_version = '1.0.8'; $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 31,35 ---- } ! $mx_module_version = '2.0.0-RC1'; $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; Index: mx_install_readme.htm =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/mx_install_readme.htm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_install_readme.htm 28 Feb 2008 06:26:38 -0000 1.4 --- mx_install_readme.htm 6 Mar 2008 03:09:28 -0000 1.5 *************** *** 235,239 **** <tr> <td height="45"> ! <p><b><font size="2" face="Fixedsys">v. 1.0.0</font></b></p> <p><font face="Fixedsys"><span style= "font-size: 16px; line-height: normal; font-weight:bold">Module</span><br /> --- 235,239 ---- <tr> <td height="45"> ! <p><b><font size="2" face="Fixedsys">v. 2.0.0-Beta</font></b></p> <p><font face="Fixedsys"><span style= "font-size: 16px; line-height: normal; font-weight:bold">Module</span><br /> --- shotcast_config.php DELETED --- Index: cur_song.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/cur_song.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cur_song.php 24 Feb 2008 01:14:04 -0000 1.3 --- cur_song.php 6 Mar 2008 03:09:18 -0000 1.4 *************** *** 88,92 **** </HEAD> <body> ! <span style="font-weight : bold;"><?=$song[0];?></span> </body> </HTML> \ No newline at end of file --- 88,101 ---- </HEAD> <body> ! <?php ! if($radio->song()) ! { ! echo '<span style="font-weight : bold;">'.$radio->song().'</span>'; ! } ! else ! { ! echo '<span style="font-weight : bold;">'.$song[0].'</span>'; ! } ! ?> </body> </HTML> \ No newline at end of file Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_install.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** db_install.php 28 Feb 2008 06:26:37 -0000 1.6 --- db_install.php 6 Mar 2008 03:09:18 -0000 1.7 *************** *** 35,39 **** } ! $mx_module_version = '1.0.8'; $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 35,39 ---- } ! $mx_module_version = '2.0.0-RC1'; $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; Index: radioplayer.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/radioplayer.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** radioplayer.php 28 Feb 2008 06:26:39 -0000 1.6 --- radioplayer.php 6 Mar 2008 03:09:29 -0000 1.7 *************** *** 61,68 **** <meta name="keywords" content="Radio Player" /> <meta name="author" content="Radio Player originaly made by: Niklas Pull - http://pull.zapto.org" /> ! <title>Radio Player :: <?=$station;?></title> ! <? //include($module_root_path . "stylesheet.$phpEx");?> <style type="text/css"> <!-- body { margin: 0; --- 61,76 ---- <meta name="keywords" content="Radio Player" /> <meta name="author" content="Radio Player originaly made by: Niklas Pull - http://pull.zapto.org" /> ! <!-- First load standard template *.css definition, located in the the phpbb template folder --> ! <link rel="stylesheet" href="<?php echo PHPBB_URL . TEMPLATE_ROOT_PATH . $theme['head_stylesheet']; ?>" type="text/css" /> ! <!-- Then load MX-Publisher template *.css definition for mx, located in the the portal template folder --> ! <link rel="stylesheet" href="<?php echo PORTAL_URL . TEMPLATE_ROOT_PATH . $theme['head_stylesheet']; ?>" type="text/css" /> <style type="text/css"> <!-- + * { + margin: 0; + padding: 0; + font-family: Verdana; + font-size: 10px; + } body { margin: 0; *************** *** 70,276 **** font-family: Verdana; font-size: 10px; BACKGROUND-IMAGE: url('<?=$module_root_path;?>images/<?=SKIN;?>/playerbg.png'); } ! a{ text-decoration: none; } ! #main { ! width: 350px; ! height: 100px; ! position: relative; ! left: 0px; ! top: 0px; ! margin:0; ! padding:0; ! background-image: url('<?=$module_root_path;?>images/<?=SKIN;?>/player.png'); ! background-repeat: no-repeat; ! background-attachment: fixed; ! background-color: #eeeeee; } ! #display { ! width: 315px; ! height: 39px; ! position: relative; ! left: 18px; ! top: 18px; } ! #display_low { ! width: 310px; ! height: 21px; ! position: relative; ! left: 3px; ! top: 3px; } ! #bottom { ! width: 350px; ! height: 39px; ! position: relative; ! left: 0px; ! top: 22px; } ! #songtitle { ! width: 310px; ! height: 12px; ! position: relative; ! left: 3px; ! top: 3px; } ! #station { ! width: 150px; ! position: relative; ! left: 23px; ! top: 30px; } ! #bitrate { ! width: 55px; ! position: relative; ! left: 185px; ! top: 18px; } ! #equalizer { ! width: 55px; ! position: relative; ! left: 280px; ! top: 0px; } ! #icon { ! width: 55px; ! position: relative; ! left: 300px; ! top: 10px; } ! #iframe { ! width: 0px; ! position: relative; ! left: 0px; ! top: 0px; } ! table { ! font-family: Verdana; ! font-size: 10px; } ! --> ! </style> ! <!-- script language="javascript" type="text/javascript" src="<?=$module_root_path;?>templates/radioplayer.js"></script --> ! <script language="javascript"> ! function Ajax(){ ! var xmlHttp; ! try{ ! xmlHttp=new XMLHttpRequest(); ! } ! catch (e){ ! try{ ! xmlHttp=new ActiveXObject("Msxml2.XMLHTTP"); ! } ! catch (e){ ! try{ ! xmlHttp=new ActiveXObject("Microsoft.XMLHTTP"); ! } ! catch (e){ ! return false; ! } ! } ! } ! ! xmlHttp.onreadystatechange=function(){ ! if(xmlHttp.readyState==4){ ! document.getElementById('songtitle').innerHTML=xmlHttp.responseText; ! setTimeout('Ajax()',25000); ! } } ! xmlHttp.open("GET","<?=$module_root_path;?>cur_song.<?=$phpEx;?>",true); ! xmlHttp.send(null); } ! ! window.onload=function(){ ! setTimeout('Ajax()',1); } ! ! function radio_player() { ! props=window.open('<?=$module_root_path;?>radioplayer.<?=$phpEx;?>?lang=&z=wmp', 'poppage', 'toolbars=0, scrollbars=0, location=0, statusbars=0, menubars=0, resizable=1, width=350, height=100 left = 100, top = 100'); } </script> </head> <body> ! <div id="iframe"> ! <SCRIPT language="javascript"> ! <!-- ! document.writeln("<iframe width=\"350\" height=\"0\""); ! document.writeln(" id=\"myiframe\" name=\"myiframe\""); ! document.writeln(" src=\"<?=$module_root_path;?>radio_update.<?=$phpEx;?>\""); ! document.writeln(" scrolling=\"no\""); ! document.writeln(" style=\"width:350px;height:0px;border:0px\">"); ! document.writeln("Sorry, your browser doesn't seem to support IFrames!"); ! document.writeln("</iframe>"); ! document.writeln(""); ! //--> ! </SCRIPT> </div> - <div id="main"> ! <div id="display"> ! <div id="songtitle"> ! <? ! if($text[1] == 0) ! { ! echo "<b>Radio station currently Offline.</b>"; ! } ! else ! { ! echo "Checking for song title..."; ! } ! ?> ! </div> ! <div id="display_low"> ! <table border="0" cellpadding="0" cellspacing="0" width="300" height="21"> ! <tr class="table"> ! <td align="left" valign="bottom"> ! <i>Station: <b><?=$station;?></b></i> ! </td> ! <td align="center" valign="bottom"> ! <?=$text[5];?> kbps ! </td> ! <td align="right" valign="bottom"> ! <img src="<?=$module_root_path;?>images/equalizer_<?=$status;?>.gif" height="21"> ! </td> ! </tr> ! </table> ! </div> ! </div> ! <div id="bottom"> ! <table border="0" cellpadding="0" cellspacing="0" width="350" height="39"> ! <tr class="table"> ! <td width="193"> ! <img src="<?=$module_root_path;?>images/<?=SKIN;?>/player2.png" width="193" height="39" usemap="#play" border="0"> ! </td> ! <td width="157" height="39" background="<?=$module_root_path;?>images/<?=SKIN;?>/player3_<?=$player;?>.png"> ! Switch to: ! <a href="<?=$module_root_path;?>radioplayer.<?=$phpEx;?>?player=<?=$changeto;?>"> ! <img src="<?=$module_root_path;?>images/<?=SKIN;?>/small_<?=$changeto;?>.png" border="0"> ! </a> ! </td> ! </tr> ! </table> ! </div> </div> ! <div id="iframe"> ! <? ! if($status == 'play') ! { ! ?> ! <iframe src="<?=$module_root_path;?><?=$status;?>_<?=$player;?>.<?=$phpEx;?>" name="stream" width="0" height="0"></iframe> ! <? ! } ! ?> </div> ! <map name="play"> ! <area shape="rect" alt="Stop" coords="55,0,78,27" href="<?=$module_root_path;?>radioplayer.<?=$phpEx;?>?player=<?=$player;?>" target="_self"> ! <area shape="rect" alt="Play" coords="21,0,47,28" href="<?=$module_root_path;?>radioplayer.<?=$phpEx;?>?player=<?=$player;?>&status=play" target="_self"> ! </map> </body> ! </html> --- 78,254 ---- font-family: Verdana; font-size: 10px; + color: #ffffff; BACKGROUND-IMAGE: url('<?=$module_root_path;?>images/<?=SKIN;?>/playerbg.png'); } ! a, a:visited, a:active{ text-decoration: none; + color: #8a99f4; + border: 0px; } ! select{ ! font-family: Verdana; ! font-size: 10px; ! background-color: #f1f1f1; ! border: 0px; } ! #shell{ ! background-image: url('<?=$module_root_path;?>images/<?=SKIN;?>/shell.jpg'); ! width: 320px; ! height: 142px; ! left: 0px; ! top: 0px; ! position: absolute; } ! #station{ ! left: 5px; ! top: 1px; ! position: absolute; } ! #songtitle{ ! left: 10px; ! top: 30px; ! position: absolute; } ! #songtitle{ ! width: 305px; ! left: 10px; ! top: 28px; ! position: absolute; } ! #bitrate{ ! left: 138px; ! top: 60px; ! position: absolute; } ! #contentType{ ! left: 138px; ! top: 80px; ! position: absolute; } ! #play{ ! left: 10px; ! top: 110px; ! position: absolute; } ! #stop{ ! left: 45px; ! top: 115px; ! position: absolute; } ! #select{ ! left: 220px; ! top: 110px; ! position: absolute; } ! #infoPlayer{ ! left: 8px; ! top: 60px; ! position: absolute; } ! #infoPlugin{ ! left: 8px; ! top: 79px; ! position: absolute; } ! #equalizer{ ! left: 214px; ! bottom: 39px; ! position: absolute; } ! #closeButton{ ! left: 305px; ! top: 2px; ! position: absolute; } ! --> ! </style> ! <script type="text/javascript"> ! <!-- ! loadimg = new Image(27,27); ! loadimg.src = "<?=$module_root_path;?>images/<?=SKIN;?>/play_h.jpg"; ! loadimg2 = new Image(19,19); ! loadimg2.src = "<?=$module_root_path;?>images/<?=SKIN;?>/stop_h.jpg"; ! window.onload = function(){ ! checkSong(); ! embedInfo(detectEmbed()); } + //--> </script> + <title>Radio Player :: <?=$station;?></title> + <?php require($module_root_path . "includes/detectScript.htm"); ?> + </head> <body> ! <div id="shell"> ! <div id="station">Radio Player :: <?=$station;?></div> ! ! <div id="songtitle"> ! <?php ! if($text[1] == 0) ! { ! echo "<b>Radio station currently Offline.</b>"; ! } ! else ! { ! echo "Checking for song title..."; ! } ! ?> </div> ! <div id="bitrate"><?=$text[5];?> kbps</div> ! <div id="contentType"><?=$mimetype;?></div> ! <div id="infoPlayer"></div> ! <div id="infoPlugin"></div> ! ! <div id="equalizer"><img src="<?=$module_root_path;?>images/<?=SKIN;?>/equalizer_stop.gif" id="eq"></div> ! <div id="closeButton"><a href="javascript:window.close()"><img src="<?=$module_root_path;?>images/<?=SKIN;?>/close.jpg" border="0"></a></div> + <div id="play"><img id="playB" src="<?=$module_root_path;?>images/<?=SKIN;?>/play.jpg" onclick="javascript:playR()" + onmouseover="javascript:document.getElementById('playB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/play_h.jpg';" + onmouseout="javascript:document.getElementById('playB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/play.jpg';"> + </div> + <div id="stop"><img id="stopB" src="<?=$module_root_path;?>images/<?=SKIN;?>/stop.jpg" onclick="javascript:stopR()" + onmouseover="document.getElementById('stopB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/stop_h.jpg';" + onmouseout="document.getElementById('stopB').src = '<?=$module_root_path;?>images/<?=SKIN;?>/stop.jpg';"> </div> ! <div id="select"> ! Media Player:<br><select id="embedchoise" onchange="javascript:changeEmbed()"> ! <option value="auto">Auto detect</option> ! <option value="wmp">WMP</option> ! <?php ! if ($mimetype !== 'audio/aacp') ! { ! ?> ! <option value="real">RealPlayer</option> ! <? ! } ! ?> ! <script type="text/javascript"> ! <!-- // ! if(AXcompatible()){ ! document.write('<option value="winampX">WinampX</option>'); ! } else { ! <?php ! if ($mimetype !== 'audio/aacp') ! { ! ?> ! document.write('<option value="quicktime">QuickTime</option>'); ! <?php ! } ! ?> ! } ! // --> ! </script> ! </select> </div> + <br> ! </div> ! <div id="iframe"> ! <IFRAME src="#" name="embedFrame" ID="embedFrame" width="0" height="0" style="border: 0px;"></iframe> ! </div> </body> ! </html> \ No newline at end of file --- NEW FILE: play.php --- <?php if( !defined('IN_PORTAL') || !is_object($mx_block)) { define('IN_PORTAL', true); $mx_root_path = "../../"; $module_root_path = "./"; $phpEx = substr(strrchr(__FILE__, '.'), 1); include_once($mx_root_path . 'common.'.$phpEx); // // Start session management // $mx_user->init($user_ip, PAGE_INDEX); // // End session management // $title = 'Media Player Radio'; $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' ); $is_block = FALSE; } else { // // Read block Configuration // $title = $mx_block->block_info['block_title']; $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); if( is_object($mx_block)) { $is_block = TRUE; } } define('IN_SHOTCAST', true); require($module_root_path .'includes/common.'.$phpEx); require($module_root_path . 'getinfo.'.$phpEx); header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: post-check=0, pre-check=0', false); header('Pragma: no-cache'); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head> <script type="text/javascript"> <!-- window.onunload = function(){ stopWinampx(); } //--> </script> </head> <body> <?php require($module_root_path . "includes/detectScript.htm"); if(!isset($_GET['embed'])){ ?> <script type="text/javascript"> var embed = detectEmbed(); self.location = 'play.php?embed='+embed; </script> <?php } else { if($_GET['embed'] == "real") { ?> <OBJECT id="RVOCX" classid="CLSID:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA"> <PARAM name="SRC" value="http://<?=$radio->host;?>:<?=$radio->port;?>"> <PARAM name="autostart" value="true"> <EMBED autostart="true" src="http://<?=$radio->host;?>:<?=$radio->port;?>" type="audio/x-pn-realaudio-plugin"> </EMBED> </OBJECT> <?php } else if($_GET['embed'] == "quicktime") { ?> <OBJECT id="QuickTime" classid="CLSID:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" codebase="http://www.apple.com/qtactivex/qtplugin.cab"> <PARAM name="SRC" value="http://<?=$radio->host;?>:<?=$radio->port;?><?=$wmplist;?>"> <PARAM name="AUTOPLAY" value="true"> <EMBED id="QuickTime" src="http://<?=$radio->host;?>:<?=$radio->port;?><?=$wmplist;?>" type="audio/mpegurl" autoplay="true" pluginspace="http://www.apple.com/quicktime/download/"> </EMBED> </OBJECT> <?php } else if($_GET['embed'] == "winampX") { ?> <OBJECT id="IWinAmpActiveX" classid="CLSID:FE0BD779-44EE-4A4B-AA2E-743C63F2E5E6" codebase="http://pdl.stream.aol.com/downloads/aol/unagi/ampx_en_dl.cab" version="-1,-1,-1,-1"> </OBJECT> <script type="text/javascript"> winampx = document.getElementById('IWinAmpActiveX'); winampx.AppendFileToPlaylist('http://<?=$radio->host;?>:<?=$radio->port;?>'); winampx.Play(); </script> <?php } else if($_GET['embed'] == "wmp6") { ?> <OBJECT id="MediaPlayer" classid="CLSID:22d6f312-b0f6-11d0-94ab-0080c74c7e95" codebase="http://activex.microsoft.com/activex/controls/mplayer/sv/nsmp2inf.cab#Version=6,4,5,715" type="application/x-oleobject"> <PARAM name="FileName" value="http://<?=$radio->host;?>:<?=$radio->port;?>"> <PARAM name="AutoStart" value="true"> </OBJECT> <?php } else if($_GET['embed'] == "wmp7") { ?> <OBJECT id="MediaPlayer" classid="CLSID:6BF52A52-394A-11D3-B153-00C04F79FAA6"> <PARAM name="url" value="http://<?=$radio->host;?>:<?=$radio->port;?>"> <PARAM name="AutoStart" value="true"> <EMBED type="application/x-mplayer2" pluginspage="http://www.microsoft.com/windows/windowsmedia/" filename="http://<?=$radio->host;?>:<?=$radio->port;?>" src="http://<?=$radio->host;?>:<?=$radio->port;?>" autostart=1> </EMBED> </OBJECT> <?php } else if($_GET['embed'] == "aac_wmp") { ?> <SCRIPT LANGUAGE="JavaScript"> //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>'); </SCRIPT> <?php } } ?> </body> </html> Index: getinfo.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/getinfo.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** getinfo.php 28 Feb 2008 06:26:38 -0000 1.5 --- getinfo.php 6 Mar 2008 03:09:28 -0000 1.6 *************** *** 18,22 **** //$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'; $time = date("U"); --- 18,22 ---- //$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'; $time = date("U"); *************** *** 33,48 **** $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; $radio_skin = isset($_GET['skin']) ? $_GET['skin'] : $shotcast_config['skin']; @define('SKIN', $radio_skin); - $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'; - $errno = 0; $errstr = ''; --- 33,41 ---- $station_name = "Shotcast Radio"; // Radio Station Name (for the no pass version) $force_no_playlist = true; ! $radio_skin = isset($_GET['skin']) ? $_GET['skin'] : $shotcast_config['skin']; @define('SKIN', $radio_skin); $errno = 0; $errstr = ''; *************** *** 146,150 **** $text[3] = !empty($text[3]) ? $text[3] : $maxlisteners; $text[5] = !empty($text[5]) ? $text[5] : $bitrate; - $text[6] = !empty($text[6]) ? $text[6] : $song[0]; } --- 139,142 ---- *************** *** 154,158 **** $currentlisteners = "Unknon"; $bitrate = "Unknon"; ! $song[0] = "Unknon Artist"; $maxlisteners = "Unknon"; $servergenre = $lang['Socket_functions_disabled']; --- 146,150 ---- $currentlisteners = "Unknon"; $bitrate = "Unknon"; ! $text[6] = $song[0] = "Unknon Artist"; $maxlisteners = "Unknon"; $servergenre = $lang['Socket_functions_disabled']; *************** *** 163,170 **** } // The "i" after the pattern delimiter indicates a case-insensitive search if (preg_match("/Unauthorized/", $station)) { ! $station = $shotcast_config['shotcast_name']; } --- 155,427 ---- } + /** + * radio.class is a stand-alone php class for ShoutCast Servers that obtains informations about the server. + * USAGE: + * $variable = new radio(HOST, PORT); - Construct the Object. ie. - new radio($SERVER_NAME, 8000); + * $variable->host - Get server host. (INT) + * $variable->port - Get server port. (INT) + * $variable->stat - Status if server is on/off (INT, 1=on, 0=off) + * $variable->bitrate - Bitrate of streaming audio. (INT) + * $variable->listners - Listners. (INT) + * $variable->station - Radiostation name (STRING) + * $variable->genre - Streamers selected genre. (STRING) + * $variable->song - Current song. (STRING) + * $variable->played - Last played songs (ARRAY[STRING]) + * + * @author Niklas Pull + * @created 2008-02-04, Sweden + * + * Keep the autor tag in order to use or distrubutate this php class, + */ + + + class radio + { + var $host; + var $port; + var $stat = 0; + + var $rawdata; + var $c = 0; + + var $errno; + var $errstr; + + /** + * Constructor for radio class. + * @param $host Server Host. + * @param $port Server Port + */ + function radio($host, $port) + { + $this->host = $host; + $this->port = $port; + $this->rawdata = $this->getServerData("index.html"); + $this->stat = $this->servStat(); + } + + /** + * Collecting raw data from ShoutCast server. + * @param $source From where to collect data. + * @return An array with each row. + */ + function getServerData($source) + { + $fp = @fsockopen($this->host, $this->port, $errno, $errstr, 10); + + if (!$fp) + { + return; + } + else + { + @fputs($fp, "GET /$source HTTP/1.1\r\n"); + @fputs($fp, "Host: $this->host\r\n"); + @fputs($fp, "User-Agent: SHOUTcast Song Status (Mozilla Compatible)\r\n\r\n"); + @fputs($fp, "Connection: close\r\n\r\n"); + while (!feof($fp)) + { + $buf .= fgets($fp,128); + } + @fclose($fp); + return explode("\t", strip_tags(str_replace(array("</td>", "</tr>", "Current Song"), array("\t", "\t", " Current Song"), $buf))); + } + } + + /** + * @return An integer, 1 if the server is streaming otherwise 0. + */ + function servStat() + { + $i = 0; + while ($i < count($this->rawdata)) + { + $this->rawdata[$i] = trim($this->rawdata[$i]); + if (strstr($this->rawdata[$i], "Server Status:")) + { + $tmp = explode(" ", $this->rawdata[$i+1]); + return ($tmp[3] == "up") ? "1" : "0"; + } + $i++; + } + return 0; + } + + /** + * @return An integer representing the bitrate of the streaming. + */ + function bitrate() + { + $i = 0; + if($this->stat != 1) + { + return 0; + } + while ($i < count($this->rawdata)) + { + $this->rawdata[$i] = trim($this->rawdata[$i]); + if (strstr($this->rawdata[$i], "Stream Status:")) + { + $bitr = explode(" ", $this->rawdata[$i+1]); + return $bitr[4]; + } + $i++; + } + } + + /** + * @return An integer of how many listners. + */ + function listners() + { + $i = 0; + if($this->stat != 1) + { + return 0; + } + while ($i < count($this->rawdata)) + { + $this->rawdata[$i] = trim($this->rawdata[$i]); + if (strstr($this->rawdata[$i], "Stream Status:")) + { + $listn = explode(" ", $this->rawdata[$i+1]); + return $listn[7]; + } + $i++; + } + } + + /** + * @return A string representing the Stream title. + */ + function station() + { + $i = 0; + if($this->stat != 1) + { + return; + } + while ($i < count($this->rawdata)) + { + $this->rawdata[$i] = trim($this->rawdata[$i]); + if (strstr($this->rawdata[$i], "Stream Title:")) + { + return $this->rawdata[$i+1]; + } + $i++; + } + } + + /** + * @return The mime-type of the stream + */ + function mimeType() + { + $i = 0; + if($this->stat != 1) + { + return; + } + while ($i < count($this->rawdata)) + { + $this->rawdata[$i] = trim($this->rawdata[$i]); + if (strstr($this->rawdata[$i], "Content Type:")) + { + return $this->rawdata[$i+1]; + } + $i++; + } + } + + /** + * @return The streaming genre. + */ + function genre() + { + $i = 0; + if($this->stat != 1){ + return; + } + while ($i < count($this->rawdata)) + { + $this->rawdata[$i] = trim($this->rawdata[$i]); + if (strstr($this->rawdata[$i], "Stream Genre:")) + { + return $this->rawdata[$i+1]; + } + $i++; + } + } + + /** + * @return A string with the current song playing on the stream. + */ + function song(){ + $i = 0; + if($this->stat != 1){ + return; + } + if($this->c != 0){ + return trim($this->rawdata[$this->c]); + } + while ($i < count($this->rawdata)) { + $this->rawdata[$i] = trim($this->rawdata[$i]); + if (strstr($this->rawdata[$i], "Current Song:")) { + $this->c = $i+1; + return $this->rawdata[$i+1]; + } + $i++; + } + } + + /** + * @return An array with Strings of every previous played song, the lenght is set inte the .ini file for the ShoutCast server. + */ + function played() + { + $played = array(); + $i = 0; + if($this->stat != 1) + { + return; + } + $raw_played = $this->getServerData("played.html"); + while ($i < count($raw_played)) + { + $raw_played[$i] = trim($raw_played[$i]); + if (strstr($raw_played[$i], "Current Song")) + { + $i=$i+3; + break; + } + $i++; + } + $j=0; + while ($raw_played[$i-1] != "") + { + $played[$j] = $raw_played[$i]; + $i=$i+2; + $j++; + } + return $played; + } + + } + + $radio = new radio($scip, $scport); + + if (($radio->stat == 1) && ($radio->mimeType())) + { + $mimetype = $radio->mimeType(); + } + else + { + $mimetype = ($stream_type == 'mp3') ? 'audio/mpeg' : 'audio/aacp'; + } + // The "i" after the pattern delimiter indicates a case-insensitive search if (preg_match("/Unauthorized/", $station)) { ! $station = $radio->station(); } *************** *** 176,180 **** if (preg_match("/Unauthorized/", $servergenre)) { ! $servergenre = $lang['require_password']; } --- 433,437 ---- if (preg_match("/Unauthorized/", $servergenre)) { ! $servergenre = $radio->genre(); } *************** *** 194,197 **** --- 451,479 ---- } + if (preg_match("/^[a-zA-Z\-\'\ ]+$/", $text[6])) + { + $song[0] = $text[6]; + } + else if ($song[0]) + { + $text[6] = $song[0]; + } + else + { + $song[0] = "Unknon Artist"; + } + + $wmpmode = ($mimetype !== 'audio/aacp') ? 'http://' : 'icyx://'; // AAC VS MPEG + $wmplist = ''; //($mimetype == 'audio/mpeg') ? '' : '/' . $playlist; + + $protocol_type = ($mimetype !== 'audio/aacp') ? 'http' : 'icyx'; + $streamdest = $protocol_type . "://" . $scip . ":" . $scport . "/" . $playlist; + + $accplugin = 'http://retro-radio.net/plugin/setup_AAC_aacPlus_plugin_1_0_36.exe'; + $ff2pluginspace = ($mimetype !== 'audio/aacp') ? 'http://port25.technet.com/videos/downloads/wmpfirefoxplugin.exe' : $accplugin; + $wmp7pluginspace = ($mimetype !== 'audio/aacp') ? 'http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&ar=Media&sba=Plugin&' : $accplugin; + $wmp6pluginspace = ($mimetype !== 'audio/aacp') ? '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'; + + $state = ($text[1] == 1) ? 'Up' : 'Down'; $shotcast_state_icon = ($text[1] == 1) ? 'online.gif' : 'offline.gif'; *************** *** 199,203 **** $text[3] = !empty($text[3]) ? $text[3] : $maxlisteners; $text[5] = !empty($text[5]) ? $text[5] : $bitrate; - $song[0] = !empty($song[0]) ? $song[0] : $text[6]; $status = isset($_GET['status']) ? $_GET['status'] : 'stop'; --- 481,484 ---- --- play_real.php DELETED --- --- play_wmp.php DELETED --- |
|
From: OryNider <ory...@us...> - 2008-03-06 03:11:45
|
Update of /cvsroot/mxbb/mx_shotcast/doc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080/doc Modified Files: ReadMe.txt Removed Files: radio.class.php Log Message: version 2.0 --- radio.class.php DELETED --- Index: ReadMe.txt =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/doc/ReadMe.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReadMe.txt 24 Feb 2008 01:14:07 -0000 1.1 --- ReadMe.txt 6 Mar 2008 03:09:34 -0000 1.2 *************** *** 1,23 **** ! - - - - - - - - - - - - - - - - - - - - - - - ! - - - - - - - - RADIO PLAYER - - - - - - - ! - - - - - - - - - - - - - - - - - - - - - - - ! History: ! - Verion 1.00 - by: Niklas Pull ! May 17, 2006 ! - Version 1.01 - Fixed real mode by OryNider for Firefox. ! October 7, 2006 ! - Version 1.02 - Rewriten wmp script by OryNider in JavaScript ! for Firefox. In Firefox and Linux when media mode user normaly ! will be propted to install a plugin, but since this is hidden ! in iframes user will have to install the plugin manualy. ! October 21, 2006 ! - Version 1.03 - Forced media player mode for NetScape using ! MIME type="audio/mpeg" in the Mac script. ! October 22, 2006 - Version 1.04 beta 1 - In contrib/no_pass/ you have a version --- 1,70 ---- ! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ! - - - - - - - - - - - - - RADIO PLAYER v2.0 - - - - - - - - - - - - ! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ! This is a popup radio player for SHOUTcast servers. The embed's are ! hidden in iframes with autostarts, so the pricipal is very simple. ! It also uses an ajax script to update the song title. ! Autodetect the users players and plugins and chooses the most fitting. ! It can switch between Real Player, Windows Media Player, QuickTime or ! Winamp ActiveX player. ! Feel free to use it however you want, all I want is that you keep ! the author meta tag. ! ! ! --------------------------------------------------------------------- ! ! Instructions: ! ! All you need is to edit config.php to your ShoutCast server ! adress/ip and port, no password is needed. ! ! ! --------------------------------------------------------------------- ! ! New for v2.0: ! ! This new Version is almost completly renewed. The player detect the ! best player for the user or he/she can select which one to use. ! Added QuickTime and Winamp ActiveX as selectable embed players. ! Supports AAC streams with a AAC plugin for WMP or usage of AOL's ! Winamp ActiveX embed player. New design on the skin with easier ! skinnable interface (Photoshop files included). ! ! ! --------------------------------------------------------------------- ! ! History: ! ! - Version 2.0 - This new Version is almost completly renewed. The ! player detect the best player for the user or he/she can select ! which one to use. Added QuickTime and Winamp ActiveX as selectable ! embed players. Supports AAC streams with a AAC plugin for WMP or ! usage of AOL's Winamp ActiveX embed player. New design on the skin ! with easier skinnable interface (Photoshop files included). ! February 24, 2008 Niklas Pull aka Little Frog ! ! - Version 1.1 - Mayor update. New more userfriendly version for users ! and developers. A stand-alone php class for obtaining information ! from the ShoutCast server without having to use password. Removed ! some general "dead" code. Added some alternative skins. Also put ! in a new Ajax script and modified the cache controll so the dynamic ! song update also works in IE. (NOTE: This version does not work as a ! module for mx-systems). ! February 4, 2008 Niklas Pull aka Little Frog ! ! - Version 1.07 - Upgrade that allows to play icyx aac ! plus streams in IE and FF. ! January 22, 2008 OryNider ! ! - Version 1.05 - "This is version 1.05 Beta with some changes." ! January 21, 2008 OryNider ! ! - Version 1.04 - Fixed some problems With WMP 9 (Windows 98 SE) ! October 23, 2006 OryNider - Version 1.04 beta 1 - In contrib/no_pass/ you have a version *************** *** 27,64 **** To use it upload contrib/no_pass/getinfo.php replaceing the original file. ! October 23, 2006 ! ! - Version 1.04 - Fixed some problems With WMP 9 (Windows 98 SE) ! October 23, 2006 ! ! - Version 1.05 - 1.07 - Added support for icy strems - by OryNider ! December 20, 2007 ! ! - Version 1.08 - Backported the style engine from Version 1.1 ! February 23, 2008 ! ------------------------------------------------------------------ ! ! This is a popup radio player for SHOUTcast ! servers. The embed's are hidden in iframes ! with autostarts, so the pricipal is very ! simple. It also uses an ajax script to update ! the song title. ! ! It can switch between real player and wmp ! mode, however the real player version did not ! worked with Firefox and Netscape. Fixed for ! Firefox by OryNider - http://pubory.uv.ro/ ! Feel free to use it however you want, all I ! want is that you keep the author meta tag. ! --------------------------------------------- ! Instructions: - All you have to do is to edit config.php to - your ip adress, port and SHOUTcast password. - Everythings done in 1 min, :) --- 74,97 ---- To use it upload contrib/no_pass/getinfo.php replaceing the original file. ! October 23, 2006 OryNider ! - Version 1.03 - Forced media player mode for NetScape using ! MIME type="audio/mpeg" in the Mac script. ! October 22, 2006 OryNider + - Version 1.02 - Rewriten wmp script by OryNider in JavaScript + for Firefox. In Firefox and Linux when media mode user normaly + will be propted to install a plugin, but since this is hidden + in iframes user will have to install the plugin manualy. + October 21, 2006 OryNider ! - Version 1.01 - Fixed real mode by OryNider for Firefox. ! October 7, 2006 OryNider ! - Verion 1.00 - Original version with all base code created by ! Niklas Pull ! May 17, 2006 Niklas Pull aka Little Frog + --------------------------------------------------------------------- |
|
From: OryNider <ory...@us...> - 2008-03-06 03:11:44
|
Update of /cvsroot/mxbb/mx_shotcast/images/red In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080/images/red Removed Files: player.png player2.png player3_real.png player3_wmp.png small_real.png small_wmp.png Log Message: version 2.0 --- player3_real.png DELETED --- --- small_real.png DELETED --- --- small_wmp.png DELETED --- --- player2.png DELETED --- --- player.png DELETED --- --- player3_wmp.png DELETED --- |
Update of /cvsroot/mxbb/mx_shotcast/images/default In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080/images/default Added Files: close.jpg equalizer.psd equalizer_play.gif equalizer_stop.gif play.jpg play_h.jpg player.psd shell.jpg stop.jpg stop_h.jpg Removed Files: player.png player2.png player3.png player3_real.png player3_wmp.png playerbg.png small_real.png small_wmp.png Log Message: version 2.0 --- NEW FILE: play_h.jpg --- (This appears to be a binary file; contents omitted.) --- player3_real.png DELETED --- --- NEW FILE: player.psd --- (This appears to be a binary file; contents omitted.) --- NEW FILE: equalizer.psd --- (This appears to be a binary file; contents omitted.) --- player.png DELETED --- --- NEW FILE: equalizer_play.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: shell.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: play.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: close.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: equalizer_stop.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: stop_h.jpg --- (This appears to be a binary file; contents omitted.) --- small_real.png DELETED --- --- NEW FILE: stop.jpg --- (This appears to be a binary file; contents omitted.) --- playerbg.png DELETED --- --- player3.png DELETED --- --- player2.png DELETED --- --- small_wmp.png DELETED --- --- player3_wmp.png DELETED --- |
|
From: OryNider <ory...@us...> - 2008-03-06 03:11:28
|
Update of /cvsroot/mxbb/mx_shotcast/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080/admin Modified Files: admin_shotcast.php Log Message: version 2.0 Index: admin_shotcast.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/admin/admin_shotcast.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_shotcast.php 28 Feb 2008 06:26:36 -0000 1.5 --- admin_shotcast.php 6 Mar 2008 03:09:17 -0000 1.6 *************** *** 84,87 **** --- 84,90 ---- mx_message_die(GENERAL_ERROR, "Failed to update shotcast configuration for $config_name", "", __LINE__, __FILE__, $sql); } + $default_config[$config_name] = $new[$config_name]; + $mx_cache->put('shotcast_config', $default_config); + // Behave as per HTTP/1.1 spec for others echo '"<meta http-equiv="refresh" content="1;url="$file">"'; |
|
From: OryNider <ory...@us...> - 2008-03-06 03:10:52
|
Update of /cvsroot/mxbb/mx_shotcast/images/cyan In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080/images/cyan Removed Files: player.png player2.png player3_real.png player3_wmp.png small_real.png small_wmp.png Log Message: version 2.0 --- player3_real.png DELETED --- --- small_real.png DELETED --- --- small_wmp.png DELETED --- --- player2.png DELETED --- --- player.png DELETED --- --- player3_wmp.png DELETED --- |
|
From: OryNider <ory...@us...> - 2008-03-06 03:10:31
|
Update of /cvsroot/mxbb/mx_shotcast/images/custom_skining In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5080/images/custom_skining Removed Files: equalizer_play.gif equalizer_stop.gif player3_.png trans_real.gif trans_wmp.gif Log Message: version 2.0 --- trans_wmp.gif DELETED --- --- trans_real.gif DELETED --- --- equalizer_stop.gif DELETED --- --- player3_.png DELETED --- --- equalizer_play.gif DELETED --- |
|
From: OryNider <ory...@us...> - 2008-03-05 20:53:21
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5016 Modified Files: common.php Log Message: obtain_phpbb_config should not query phpbb_config table on every refresh, altrog this is never working for me with tru or false :( Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** common.php 22 Feb 2008 23:02:49 -0000 1.87 --- common.php 5 Mar 2008 20:51:57 -0000 1.88 *************** *** 348,352 **** // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(false); } $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/'; --- 348,352 ---- // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(true); } $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/'; *************** *** 358,362 **** // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(false); $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/'; break; --- 358,362 ---- // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the MX-Publisher cache whenever updating phpBB config settings // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(true); $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/'; break; |
|
From: Culprit <cul...@us...> - 2008-03-03 13:50:24
|
Update of /cvsroot/mxbb/mx_langtools/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13419/mx_langtools/templates/_core Modified Files: lang_translate.tpl Log Message: template color fix by invert colors Index: lang_translate.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_langtools/templates/_core/lang_translate.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_translate.tpl 29 Feb 2008 14:21:16 -0000 1.2 --- lang_translate.tpl 3 Mar 2008 13:50:06 -0000 1.3 *************** *** 6,9 **** --- 6,10 ---- position:absolute; background-color: #fff; + color: #000; border:solid 1px #000; z-index: 1000; |
|
From: Culprit <cul...@us...> - 2008-03-03 13:50:23
|
Update of /cvsroot/mxbb/mx_langtools/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13419/mx_langtools/templates/subSilver Modified Files: lang_translate.tpl Log Message: template color fix by invert colors Index: lang_translate.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_langtools/templates/subSilver/lang_translate.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_translate.tpl 29 Feb 2008 14:21:16 -0000 1.1 --- lang_translate.tpl 3 Mar 2008 13:50:05 -0000 1.2 *************** *** 6,9 **** --- 6,10 ---- position:absolute; background-color: #fff; + color: #000; border:solid 1px #000; z-index: 1000; |
|
From: Culprit <cul...@us...> - 2008-03-03 11:32:55
|
Update of /cvsroot/mxbb/mx_langtools/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28687/mx_langtools/templates/prosilver Added Files: lang_translate.tpl Log Message: prosilver translate template --- NEW FILE: lang_translate.tpl --- <style type="text/css"> .trans_info { margin-top:1px; margin-left:0px; padding:4px; position:absolute; background-color: #fff; border:solid 1px #000; z-index: 1000; } .trans_info_img { background: url('{IMG_INFO}') no-repeat 0px 0px; width:15px; height:15px; } .trans_info_img:hover { background-position: 0px -15px; } </style> <h1>{L_LANGUAGES_TOOLS}</h1> <p class="genmed">{L_TRANSLATE_DESCRIPTION}</p> <!-- INCLUDE selects.tpl --> <div id="translate_file"> <form action="{S_ACTION}" method="POST"> <!-- IF FILE_FULL_ROOT_PATH_ORIGINAL --> <h2 style="margin-bottom:0px;padding-bottom:0px;">{L_TRANSLATE}</h2> <p style="margin-top:0px;margin-bottom:3px;"><strong>{L_FILE}:</strong> {FILE_FULL_ROOT_PATH_TRANSLATE} • <!-- IF FILE_IS_WRITABLE --><span style="color:Green">{L_FILE_IS_WRITABLE}</span> <!-- ELSE --><span style="color:Red">{L_FILE_IS_UNWRITABLE}</span><!-- ENDIF --> • {L_FILE_CHARSET}: {L_ENCODING} </p> <input type="hidden" name="language[into]" value="{I_LANGUAGE}" /> <input type="hidden" name="translate[module]" value="{I_MODULE}" /> <input type="hidden" name="translate[file]" value="{I_FILE}" /> <table border="0" cellspacing="1" cellpadding="4" width="100%" class="forumline"> <thead> <tr> <th class="thCornerL" width="25%">{L_TRANSLATE_KEY}</th> <th class="thCornerR" width="75%">{L_TRANSLATE_VALUE}</th> </tr> </thead> <tbody> <!-- BEGIN language_item --> <tr> <td class="row1" valign="top"> <span style="float:right" onmouseover="getObj('l_row_info_{language_item.COUNTER}').style.display='';" onmouseout="getObj('l_row_info_{language_item.COUNTER}').style.display='none';" class="trans_info_img"> </span> <span>{language_item.U_KEY}</span> </td> <td class="row2" valign="top"> <div id="l_row_info_{language_item.COUNTER}" class="trans_info" style="display:none">{language_item.ORIGINAL_VALUE}</div> <textarea name="l[{language_item.KEY}]" style="width:100%" rows="3">{language_item.TRANSLATE_VALUE}</textarea> </td> </tr> <!-- END language_item --> </tbody> <tfoot> <tr> <td colspan="2" align="right" class="row2"> <input type="hidden" name="set_file" value="{L_SUBMIT}" /> <!-- IF FILE_IS_WRITABLE --> <input type="submit" name="save" value="{L_SAVE}" /> <!-- ENDIF --> <input type="submit" name="download" value="{L_DOWNLOAD}" /> <input type="reset" value="{L_RESET}" /> </td> </tr> </tfoot> </table> <!-- ENDIF --> </form> </div> <p></p> |
|
From: Culprit <cul...@us...> - 2008-03-03 11:32:48
|
Update of /cvsroot/mxbb/mx_langtools/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28637/mx_langtools/templates/prosilver Log Message: Directory /cvsroot/mxbb/mx_langtools/templates/prosilver added to the repository |
|
From: Jon O. <jon...@us...> - 2008-03-01 21:21:15
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30176 Modified Files: mx_functions_admincp.php mx_functions_phpbb.php Log Message: I'm making the Page adminCP more clear. Dynamic and Split blocks are not really blocks, but blocks controlling page layout. This has been emphasized in the adminCP. Additionally, i've added a virtual block, to at last reactivate old bundled blog methods. Index: mx_functions_admincp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** mx_functions_admincp.php 17 Feb 2008 20:14:26 -0000 1.51 --- mx_functions_admincp.php 1 Mar 2008 21:21:10 -0000 1.52 *************** *** 288,292 **** '" . $function_id . "', '" . $mx_request_vars->post('auth_view', MX_TYPE_INT, '0') . "' , ! '" . $mx_request_vars->post('auth_edit', MX_TYPE_INT, '0') . "' , '" . $mx_request_vars->post('show_block', MX_TYPE_INT, '1') . "' , '" . $mx_request_vars->post('show_title', MX_TYPE_INT, '1') . "' , --- 288,292 ---- '" . $function_id . "', '" . $mx_request_vars->post('auth_view', MX_TYPE_INT, '0') . "' , ! '" . $mx_request_vars->post('auth_edit', MX_TYPE_INT, '5') . "' , '" . $mx_request_vars->post('show_block', MX_TYPE_INT, '1') . "' , '" . $mx_request_vars->post('show_title', MX_TYPE_INT, '1') . "' , *************** *** 478,481 **** --- 478,514 ---- if ( !MX_ADMIN_DEBUG ) { + // + // First create split, dynamic or virtual blocks - if needed + // + if ($mx_request_vars->is_request('action_type')) + { + switch ($mx_request_vars->request('action_type')) + { + case 'split': + $temp_row = mx_get_info(FUNCTION_TABLE, 'function_file', 'mx_multiple_blocks.php'); + $_POST['block_title'] = 'Split Column'; + $_POST['block_desc'] = 'Page: ' . $mx_request_vars->post('page_id', MX_TYPE_INT, 0); + $message = $this->do_it(MX_BLOCK_TYPE, MX_DO_INSERT, $temp_row['function_id']); + $_POST['block_id'] = $message['new_id']; + break; + + case 'dynamic': + $temp_row = mx_get_info(FUNCTION_TABLE, 'function_file', 'mx_dynamic.php'); + $_POST['block_title'] = 'Dynamic (Sub)'; + $_POST['block_desc'] = 'Page: ' . $mx_request_vars->post('page_id', MX_TYPE_INT, 0); + $message = $this->do_it(MX_BLOCK_TYPE, MX_DO_INSERT, $temp_row['function_id']); + $_POST['block_id'] = $message['new_id']; + break; + + case 'virtual': + $temp_row = mx_get_info(FUNCTION_TABLE, 'function_file', 'mx_virtual.php'); + $_POST['block_title'] = 'Virtual (Blog)'; + $_POST['block_desc'] = 'Page: ' . $mx_request_vars->post('page_id', MX_TYPE_INT, 0); + $message = $this->do_it(MX_BLOCK_TYPE, MX_DO_INSERT, $temp_row['function_id']); + $_POST['block_id'] = $message['new_id']; + break; + } + } + if ($mx_request_vars->is_empty_post('block_id')) { *************** *** 1105,1108 **** --- 1138,1142 ---- { global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars, $mx_cache, $mx_root_path, $mx_table_prefix, $table_prefix, $userdata; + global $controller_block; switch ( $type ) *************** *** 1311,1315 **** // $message_child .= $this->do_it( MX_BLOCK_PARAMETER_TYPE, MX_DO_DELETE, $block_id, false, false); ! $message_child .= $this->do_it( MX_PAGE_BLOCK_TYPE, MX_DO_DELETE, $block_id, false, false); // --- 1345,1352 ---- // $message_child .= $this->do_it( MX_BLOCK_PARAMETER_TYPE, MX_DO_DELETE, $block_id, false, false); ! if ($controller_block != 'yes') ! { ! $message_child .= $this->do_it( MX_PAGE_BLOCK_TYPE, MX_DO_DELETE, $block_id, false, false); ! } // *************** *** 1511,1514 **** --- 1548,1563 ---- case MX_PAGE_BLOCK_TYPE: + // + // Get function Ids for split, dynamic and virtual blocks + // + $temp_row = mx_get_info(FUNCTION_TABLE, 'function_file', 'mx_multiple_blocks.php'); + $tempFunctionId_split = $temp_row['function_id']; + $temp_row = mx_get_info(FUNCTION_TABLE, 'function_file', 'mx_dynamic.php'); + $tempFunctionId_dynamic = $temp_row['function_id']; + $temp_row = mx_get_info(FUNCTION_TABLE, 'function_file', 'mx_virtual.php'); + $tempFunctionId_virtual = $temp_row['function_id']; + + $blocksToDelete = array(); + if( $parent ) { *************** *** 1516,1519 **** --- 1565,1584 ---- $sql = "DELETE FROM " . COLUMN_BLOCK_TABLE . " WHERE column_id = " . $column_id; + + // + // Look for split, dynamic or virtual blocks + // + $temp_row = mx_get_info(COLUMN_BLOCK_TABLE, 'column_id', $column_id); + foreach ($temp_row as $key => $data) + { + $temp_sql = "SELECT COUNT(*) AS total FROM " . BLOCK_TABLE . " WHERE (function_id = '$tempFunctionId_split' OR function_id = '$tempFunctionId_dynamic' OR function_id = '$tempFunctionId_virtual') AND block_id = '".$data['block_id']."'"; + $result = $db->sql_query($temp_sql); + $temp_count = $db->sql_fetchrow($result); + + if ($temp_count['total']>0) + { + $blocksToDelete[] = $data['block_id']; + } + } } else *************** *** 1529,1536 **** --- 1594,1630 ---- $sql = "DELETE FROM " . COLUMN_BLOCK_TABLE . " WHERE block_id = $block_id" . $sql_xtra_options; + + // + // Look for split, dynamic or virtual blocks + // + $temp_sql = "SELECT COUNT(*) AS total FROM " . BLOCK_TABLE . " WHERE (function_id = '$tempFunctionId_split' OR function_id = '$tempFunctionId_dynamic' OR function_id = '$tempFunctionId_virtual') AND block_id = '".$block_id."'"; + $result = $db->sql_query($temp_sql); + $temp_count = $db->sql_fetchrow($result); + + if ($temp_count['total']>0) + { + $blocksToDelete[] = $block_id; + } } if ( !MX_ADMIN_DEBUG ) { + // + // First delete split, dynamic or virtual blocks - if needed + // + if (count($blocksToDelete) > 0) + { + foreach ($blocksToDelete as $key => $delete_id) + { + //$message_child .= 'delete:' . $delete_id; + $controller_block = 'yes'; + $message_child .= $this->do_it(MX_BLOCK_TYPE, MX_DO_DELETE, $delete_id); + } + } + $controller_block = ''; + + // + // Now remove page blocks + // if( !($result = $db->sql_query($sql)) ) { *************** *** 3476,3479 **** --- 3570,3578 ---- for( $j = 0; $j < $total_functions; $j++ ) { + if ($row[$j]['function_file'] == 'mx_multiple_blocks.php' || $row[$j]['function_file'] == 'mx_dynamic.php' || $row[$j]['function_file'] == 'mx_virtual.php') + { + //continue; + } + if( $row[$j]['module_id'] != $row[$j-1]['module_id'] ) { *************** *** 3533,3537 **** // Generate dynamic block select // ! $sql = "SELECT blk.*, function_admin, fnc.function_name, fnc.function_id, fnc.function_desc, fnc.module_id, mdl.module_name, mdl.module_id, mdl.module_desc FROM " . BLOCK_TABLE . " blk, " . FUNCTION_TABLE . " fnc, --- 3632,3636 ---- // Generate dynamic block select // ! $sql = "SELECT blk.*, function_admin, fnc.function_name, fnc.function_id, fnc.function_desc, fnc.function_file, fnc.module_id, mdl.module_name, mdl.module_id, mdl.module_desc FROM " . BLOCK_TABLE . " blk, " . FUNCTION_TABLE . " fnc, *************** *** 3571,3574 **** --- 3670,3677 ---- if( $row[$j]['function_id'] != $row[$j-1]['function_id'] ) { + if ($row[$j]['function_file'] == 'mx_multiple_blocks.php' || $row[$j]['function_file'] == 'mx_dynamic.php' || $row[$j]['function_file'] == 'mx_virtual.php') + { + continue; + } $function_desc_tmp = str_replace("\n", '', $row[$j]['function_desc']); $function_desc_tmp = str_replace("\r", '', $function_desc_tmp); Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** mx_functions_phpbb.php 29 Feb 2008 00:54:10 -0000 1.51 --- mx_functions_phpbb.php 1 Mar 2008 21:21:10 -0000 1.52 *************** *** 777,780 **** --- 777,785 ---- } + if (!$page_id) + { + $page_id = 1; + } + // // Start user session |
|
From: Jon O. <jon...@us...> - 2008-03-01 21:18:49
|
Update of /cvsroot/mxbb/core/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29124 Modified Files: mx_pagecp_admin_body.tpl Log Message: I'm making the Page adminCP more clear. Dynamic and Split blocks are not really blocks, but blocks controlling page layout. This has been emphasized in the adminCP. Additionally, i've added a virtual block, to at last reactivate old bundled blog methods. Index: mx_pagecp_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/templates/_core/admin/mx_pagecp_admin_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mx_pagecp_admin_body.tpl 9 Sep 2007 16:54:28 -0000 1.1 --- mx_pagecp_admin_body.tpl 1 Mar 2008 21:18:35 -0000 1.2 *************** *** 934,938 **** <!-- BEGIN blockrow --> <tr> ! <td class="row1" > <img src="{IMG_ICON_BLOCK}" border="0" align="absmiddle"> <span class="gen">{pages.columnrow.blockrow.BLOCK_TITLE}</span> <span class="gensmall"><i>{pages.columnrow.blockrow.BLOCK_LAST_EDITED}</i></span> <span class="gensmall">{pages.columnrow.blockrow.BLOCK_DESC}</span></td> <td class="row1" align="center" valign="middle"><span class="gen"><a href="{pages.columnrow.blockrow.U_BLOCK_SETTING}"><span class="gensmall">{pages.columnrow.blockrow.L_SETTING}</span></a> </span></td> <td class="row1" align="center" valign="middle"><span class="gen"><a href="{pages.columnrow.blockrow.U_BLOCK_DELETE}"><span class="gensmall">{pages.columnrow.blockrow.L_REMOVE}</span></a></span></td> --- 934,938 ---- <!-- BEGIN blockrow --> <tr> ! <td class="row1" > <img src="{pages.columnrow.blockrow.IMG_ICON_BLOCK}" border="0" align="absmiddle"> <span class="gen">{pages.columnrow.blockrow.BLOCK_TITLE}</span> <span class="gensmall"><i>{pages.columnrow.blockrow.BLOCK_LAST_EDITED}</i></span> <span class="gensmall">{pages.columnrow.blockrow.BLOCK_DESC}</span></td> <td class="row1" align="center" valign="middle"><span class="gen"><a href="{pages.columnrow.blockrow.U_BLOCK_SETTING}"><span class="gensmall">{pages.columnrow.blockrow.L_SETTING}</span></a> </span></td> <td class="row1" align="center" valign="middle"><span class="gen"><a href="{pages.columnrow.blockrow.U_BLOCK_DELETE}"><span class="gensmall">{pages.columnrow.blockrow.L_REMOVE}</span></a></span></td> *************** *** 942,948 **** --- 942,962 ---- <!-- END blockrow --> <!-- BEGIN add_block --> + <!-- <tr> <td colspan="5" class="row2"><form method="post" action="{S_ACTION}">{pages.columnrow.add_block.LIST_BLOCK} {pages.columnrow.add_block.S_HIDDEN_FIELDS}<input type="submit" class="liteoption" name="submit" value="{pages.columnrow.add_block.S_SUBMIT}" /></form></td> </tr> + --> + <tr> + <td class="row2" width="25%"><form method="post" action="{S_ACTION}"><input type="hidden" name="action_type" value="split" />{pages.columnrow.add_block.S_HIDDEN_FIELDS}<input type="submit" class="liteoption" name="submit" value="{pages.columnrow.add_block.S_SUBMIT_SPLIT}" /></form></td> + <td class="row2" width="25%"><form method="post" action="{S_ACTION}"><input type="hidden" name="action_type" value="dynamic" />{pages.columnrow.add_block.S_HIDDEN_FIELDS}<input type="submit" class="liteoption" name="submit" value="{pages.columnrow.add_block.S_SUBMIT_DYNAMIC}" /></form></td> + <td class="row2" width="25%"><form method="post" action="{S_ACTION}"><input type="hidden" name="action_type" value="virtual" />{pages.columnrow.add_block.S_HIDDEN_FIELDS}<input type="submit" class="liteoption" name="submit" value="{pages.columnrow.add_block.S_SUBMIT_VIRTUAL}" /></form></td> + <td colspan="2" class="row2"> </td> + </tr> + <tr> + <td class="row2" valign="top"><span class="gensmall">{pages.columnrow.add_block.S_SUBMIT_SPLIT_EXPLAIN}</span></td> + <td class="row2" valign="top"><span class="gensmall">{pages.columnrow.add_block.S_SUBMIT_DYNAMIC_EXPLAIN}</span></td> + <td class="row2" valign="top"><span class="gensmall">{pages.columnrow.add_block.S_SUBMIT_VIRTUAL_EXPLAIN}</span></td> + <td colspan="2" class="row2"> </td> + </tr> <!-- END add_block --> <tr> |
|
From: Jon O. <jon...@us...> - 2008-03-01 21:18:17
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28927/lang_english Modified Files: lang_admin.php Log Message: I'm making the Page adminCP more clear. Dynamic and Split blocks are not really blocks, but blocks controlling page layout. This has been emphasized in the adminCP. Additionally, i've added a virtual block, to at last reactivate old bundled blog methods. Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** lang_admin.php 5 Feb 2008 14:29:58 -0000 1.84 --- lang_admin.php 1 Mar 2008 21:18:11 -0000 1.85 *************** *** 370,373 **** --- 370,380 ---- $lang['Click_page_column_delete_yes'] = 'Click %sHere%s to delete the Page Column'; + $lang['Add_Split_Block'] = 'Add Split Column Block'; + $lang['Add_Split_Block_explain'] = 'This block splits the column'; + $lang['Add_Dynamic_Block'] = 'Add Dynamic (Sub) Block'; + $lang['Add_Dynamic_Block_explain'] = 'This dynamic block defines subpages, set from the navigation menu'; + $lang['Add_Virtual_Block'] = 'Add Virtual (Page Blog) Block'; + $lang['Add_Virtual_Block_explain'] = 'This block turns the page into a virtual (blog) page'; + // // Page templates |
|
From: Jon O. <jon...@us...> - 2008-03-01 21:18:17
|
Update of /cvsroot/mxbb/core/language/lang_swedish In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28927/lang_swedish Modified Files: lang_admin.php Log Message: I'm making the Page adminCP more clear. Dynamic and Split blocks are not really blocks, but blocks controlling page layout. This has been emphasized in the adminCP. Additionally, i've added a virtual block, to at last reactivate old bundled blog methods. Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_swedish/lang_admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lang_admin.php 14 Feb 2008 21:31:38 -0000 1.2 --- lang_admin.php 1 Mar 2008 21:18:12 -0000 1.3 *************** *** 358,361 **** --- 358,368 ---- $lang['Click_page_column_delete_yes'] = 'Klicka %shär%s för att ta bort sidkolumnen'; + $lang['Add_Split_Block'] = 'Lägg till kolumndelarblock'; + $lang['Add_Split_Block_explain'] = 'Detta block delar upp kolumnen'; + $lang['Add_Dynamic_Block'] = 'Lägg till dynamiskt (sub) block'; + $lang['Add_Dynamic_Block_explain'] = 'Detta block är ett dynamiskt block, vars innehåll bestäms via navigeringsmenyn'; + $lang['Add_Virtual_Block'] = 'Lägg till virtuellt (sidblogg) block'; + $lang['Add_Virtual_Block_explain'] = 'Detta block gör sidan till en virtuell (blogg-) sida'; + // // Page templates |
|
From: OryNider <ory...@us...> - 2008-03-01 19:07:57
|
Update of /cvsroot/mxbb/mx_pjirc/doc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6087 Modified Files: chat.jpg front.jpg settings.jpg style.jpg Log Message: docs upgrade Index: settings.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/doc/settings.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsSFOgd6 and /tmp/cvsIUM3zR differ Index: style.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/doc/style.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs585tfi and /tmp/cvsGIkRk4 differ Index: chat.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/doc/chat.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvseo7LvB and /tmp/cvsWR8CYn differ Index: front.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/doc/front.jpg,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs53AktN and /tmp/cvsn2xejA differ |
|
From: OryNider <ory...@us...> - 2008-03-01 19:04:47
|
Update of /cvsroot/mxbb/mx_pjirc/doc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4761 Modified Files: Tag: core28x chat.jpg front.jpg settings.jpg style.jpg Log Message: docs upgrade Index: settings.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/doc/settings.jpg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 Binary files /tmp/cvs8H6BDB and /tmp/cvsJxge9G differ Index: style.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/doc/style.jpg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 Binary files /tmp/cvsaXjjf6 and /tmp/cvsUmuuTc differ Index: chat.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/doc/chat.jpg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 Binary files /tmp/cvs51K40A and /tmp/cvsah16EI differ Index: front.jpg =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/doc/front.jpg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 Binary files /tmp/cvsoYXnZf and /tmp/cvsTv9SSo differ |
|
From: OryNider <ory...@us...> - 2008-03-01 18:39:54
|
Update of /cvsroot/mxbb/mx_pjirc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26471 Modified Files: Tag: core28x db_install.php db_upgrade.php Log Message: ah, this should be version 1.0.7 not 1.0.8 Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/db_install.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 *** db_install.php 1 Mar 2008 18:10:06 -0000 1.2.2.2 --- db_install.php 1 Mar 2008 18:39:50 -0000 1.2.2.3 *************** *** 34,38 **** } ! $mx_module_version = '1.0.8'; $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 34,38 ---- } ! $mx_module_version = '1.0.7'; $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/db_upgrade.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 *** db_upgrade.php 1 Mar 2008 18:10:21 -0000 1.2.2.2 --- db_upgrade.php 1 Mar 2008 18:39:50 -0000 1.2.2.3 *************** *** 31,35 **** } ! $mx_module_version = '1.0.8'; $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 31,35 ---- } ! $mx_module_version = '1.0.7'; $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; |
|
From: OryNider <ory...@us...> - 2008-03-01 18:39:54
|
Update of /cvsroot/mxbb/mx_pjirc/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26471/includes Modified Files: Tag: core28x common.php Log Message: ah, this should be version 1.0.7 not 1.0.8 Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/includes/common.php,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** common.php 1 Mar 2008 18:10:31 -0000 1.1.2.3 --- common.php 1 Mar 2008 18:39:50 -0000 1.1.2.4 *************** *** 30,34 **** // mx_pjirc version... // ! define('_PJIRC_VERSION', "mx_PJIRC v.1.0"); // --- 30,34 ---- // mx_pjirc version... // ! define('_PJIRC_VERSION', "Mx_PJIRC v.1.0.7"); // *************** *** 44,48 **** // Load language files. // ! $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x $mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE); --- 44,48 ---- // Load language files. // ! //$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x $mx_user->extend(MX_LANG_MAIN, MX_IMAGES_NONE); |
|
From: OryNider <ory...@us...> - 2008-03-01 18:33:46
|
Update of /cvsroot/mxbb/mx_radio/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24089 Modified Files: common.php Log Message: $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_radio/includes/common.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** common.php 28 Feb 2008 06:26:35 -0000 1.3 --- common.php 1 Mar 2008 18:33:42 -0000 1.4 *************** *** 41,44 **** --- 41,46 ---- } + $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x + // // Load language files. |
|
From: OryNider <ory...@us...> - 2008-03-01 18:32:15
|
Update of /cvsroot/mxbb/mx_shotcast/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23643 Modified Files: common.php Log Message: $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x Index: common.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/includes/common.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** common.php 28 Feb 2008 06:26:42 -0000 1.5 --- common.php 1 Mar 2008 18:32:11 -0000 1.6 *************** *** 29,32 **** --- 29,34 ---- } + $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x + // // mx_shotcast version... |
|
From: OryNider <ory...@us...> - 2008-03-01 18:11:19
|
Update of /cvsroot/mxbb/mx_pjirc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10387 Modified Files: Tag: core28x db_install.php db_uninstall.php db_upgrade.php index.php pjirc_chat.php pjirc_faq.php pjirc_front.php pjirc_update.php Log Message: version 1.0.8 Index: index.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/index.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 *** index.php 9 Feb 2008 11:29:08 -0000 1.1.2.2 --- index.php 1 Mar 2008 18:10:24 -0000 1.1.2.3 *************** *** 62,73 **** //HTML, 1st frame = the chat, 2nd frame = pjirc_update.php (send to the db the user statue "chatting" every Xseconds) ! echo "<html>"; ! echo "<head>"; ! echo "<u><h2><title>".$pjirc_config['chat_name']."</title></h2></u>"; ! echo "</head>"; ! echo "<frameset frameborder=\"no\" cols=\"100%,0%\">"; ! echo "<frame noresize scrolling=\"no\" frameborder=\"no\" src=\"pjirc_chat.php\" name=\"chat\">"; ! echo "<frame noresize scrolling=\"no\" frameborder=\"no\" src=\"pjirc_update.php\" name=\"update\">"; ! echo "</frameset>"; ! echo "</html>"; ?> \ No newline at end of file --- 62,109 ---- //HTML, 1st frame = the chat, 2nd frame = pjirc_update.php (send to the db the user statue "chatting" every Xseconds) ! // ! // Start output of page ! // ! $template->set_filenames(array( ! 'pjirc_index' => 'pjirc_index.tpl') ! ); ! ! $template->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], ! 'SITE_DESCRIPTION' => $board_config['site_desc'], ! 'PAGE_TITLE' => $pjirc_config['chat_name'], ! 'USERNAME' => $nick, ! 'PREFIX_USERNAME' => $pjirc_config['prefix_username'], ! 'CHAT_NAME' => $pjirc_config['chat_name'], ! 'SERVER' => $pjirc_config['irc_server'], ! 'PORT' => $pjirc_config['irc_port'], ! 'CHANNEL' => $pjirc_config['irc_channel'], ! 'QUIT_MESSAGE' => $pjirc_config['irc_quit'], ! ! 'S_MAIN_CHAT' => mx_append_sid($module_root_path.'pjirc_chat.'.$phpEx), ! 'S_UPDATE_CHAT' => mx_append_sid($module_root_path.'pjirc_update.'.$phpEx), ! 'S_QUIT_CHAT' => mx_append_sid($module_root_path.'pjirc_update.'.$phpEx), ! ! 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], ! 'S_CONTENT_ENCODING' => $lang['ENCODING'], ! 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], ! 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], ! 'S_USER_LANG' => ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'], ! 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), ! 'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx), ! 'LANG' => ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'], ! 'HELP' => $help, ! ! //+ MX-Publisher ! 'U_PORTAL_ROOT_PATH' => PORTAL_URL, ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'MODULE_PATH' => $module_root_path, ! ! 'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'], ! 'T_MXBB_STYLESHEET' => $theme['head_stylesheet'], ! 'UI_BACKGROUND' => $pjirc_config['ui_background'] ! )); ! ! $template->pparse('pjirc_index'); ?> \ No newline at end of file Index: pjirc_chat.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_chat.php,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** pjirc_chat.php 9 Feb 2008 11:29:08 -0000 1.3.2.2 --- pjirc_chat.php 1 Mar 2008 18:10:28 -0000 1.3.2.3 *************** *** 119,135 **** $template->assign_vars(array( ! 'USERNAME' => $nick, ! 'PREFIX_USERNAME' => $pjirc_config['prefix_username'], 'CHAT_NAME' => $pjirc_config['chat_name'], 'SERVER' => $pjirc_config['irc_server'], 'PORT' => $pjirc_config['irc_port'], 'CHANNEL' => $pjirc_config['irc_channel'], ! 'QUIT_MESSAGE' => $pjirc_config['irc_quit'], ! // 'S_QUIT_CHAT' => mx_append_sid($module_root_path.'pjirc_drop.'.$phpEx), ! 'S_QUIT_CHAT' => mx_append_sid($module_root_path.'pjirc_update.'.$phpEx), ! 'LANG' => $board_config['default_lang'], 'HELP' => $help, ! 'MODULE_PATH' => $module_root_path, //GUI_SETTING --- 119,155 ---- $template->assign_vars(array( ! 'SITENAME' => $board_config['sitename'], ! 'SITE_DESCRIPTION' => $board_config['site_desc'], ! 'PAGE_TITLE' => $pjirc_config['chat_name'], 'USERNAME' => $nick, ! 'PREFIX_USERNAME' => $pjirc_config['prefix_username'], 'CHAT_NAME' => $pjirc_config['chat_name'], 'SERVER' => $pjirc_config['irc_server'], 'PORT' => $pjirc_config['irc_port'], 'CHANNEL' => $pjirc_config['irc_channel'], ! 'QUIT_MESSAGE' => $pjirc_config['irc_quit'], ! ! 'S_MAIN_CHAT' => mx_append_sid($module_root_path.'pjirc_chat.'.$phpEx), ! 'S_UPDATE_CHAT' => mx_append_sid($module_root_path.'pjirc_update.'.$phpEx), ! 'S_QUIT_CHAT' => mx_append_sid($module_root_path.'pjirc_update.'.$phpEx), ! ! 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], ! 'S_CONTENT_ENCODING' => $lang['ENCODING'], ! 'S_CONTENT_DIR_LEFT' => $lang['LEFT'], ! 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], ! 'S_USER_LANG' => ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'], ! 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), ! 'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx), ! 'LANG' => ($mx_user->lang['default_lang']) ? $mx_user->get_old_lang($mx_user->lang['default_lang']) : $board_config['default_lang'], 'HELP' => $help, ! ! //+ MX-Publisher ! 'U_PORTAL_ROOT_PATH' => PORTAL_URL, ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'MODULE_PATH' => $module_root_path, ! ! 'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'], ! 'T_MXBB_STYLESHEET' => $theme['head_stylesheet'], //GUI_SETTING Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/db_install.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** db_install.php 9 Feb 2008 09:43:38 -0000 1.2.2.1 --- db_install.php 1 Mar 2008 18:10:06 -0000 1.2.2.2 *************** *** 34,38 **** } ! $mx_module_version = '1.0.1'; $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 34,38 ---- } ! $mx_module_version = '1.0.8'; $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; Index: pjirc_faq.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/pjirc_faq.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 *** pjirc_faq.php 9 Feb 2008 11:29:08 -0000 1.1.2.2 --- pjirc_faq.php 1 Mar 2008 18:10:29 -0000 1.1.2.3 *************** *** 9,26 **** */ ! 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); ! // ! // End session management ! // // --- 9,49 ---- */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) ! { ! define('IN_PORTAL', true); ! $mx_root_path = "../../"; ! $module_root_path = "./"; ! ! $phpEx = substr(strrchr(__FILE__, '.'), 1); ! include_once($mx_root_path . 'common.'.$phpEx); ! ! // ! // Start session management ! // ! $mx_user->init($user_ip, PAGE_INDEX); ! // ! // End session management ! // ! ! $title = 'Media Player Radio'; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '315' ); ! $is_block = FALSE; ! } ! else ! { ! // ! // Read block Configuration ! // ! ! $title = $mx_block->block_info['block_title']; ! $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! ! if( is_object($mx_block)) ! { ! $is_block = TRUE; ! } ! } // *************** *** 75,79 **** 'body' => 'pjirc_faq.tpl') ); ! make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx, $forum_id); $template->assign_vars(array( --- 98,102 ---- 'body' => 'pjirc_faq.tpl') ); ! mx_make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx, $forum_id); $template->assign_vars(array( Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_pjirc/db_upgrade.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** db_upgrade.php 9 Feb 2008 09:43:38 -0000 1.2.2.1 --- db_upgrade.php 1 Mar 2008 18:10:21 -0000 1.2.2.2 *************** *** 31,35 **** } ! $mx_module_version = '1.0.1'; $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; --- 31,35 ---- } ! $mx_module_version = '1.0.8'; $mx_module_copy = 'mxBB <i> - mx_pjirc</i> module by Amo & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; |
2 messages has been excluded from this view by a project administrator.