Menu
▾
▴
[mxbb-commits] mx_shotcast ShotCast.pak, 1.3, 1.4 db_install.php, 1.11, 1.12 db_upgrade.php, 1.10, 1.11
|
From: Florin C B. <ory...@us...> - 2013-07-02 05:50:09
|
Update of /cvsroot/mxbb/mx_shotcast In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13223 Modified Files: ShotCast.pak db_install.php db_upgrade.php Log Message: Index: ShotCast.pak =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/ShotCast.pak,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ShotCast.pak 29 May 2013 04:34:03 -0000 1.3 --- ShotCast.pak 2 Jul 2013 05:50:07 -0000 1.4 *************** *** 1,18 **** ! module=+:71=+:StreamCast=+:modules/mx_shotcast/=+:SHOUTcast and ICEcast MXP Module=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:71=+:85=+:Station Front=+:=+:shotcast_front.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:StreamCast Front=+:Demo block=+:85=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:71=+:87=+:StreamCast Last 10=+:StreamCast Last 10 Block =+:shotcast_last10.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:StreamCast Last 10=+:Demo block=+:87=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:71=+:88=+:Stream Stats=+:Stream Stats =+:shotcast_stats.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:StreamCast Stats=+:Demo block=+:88=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:71=+:89=+:Radio Player=+:Radio Player=+:radioplayer.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Radio Player=+:Demo block=+:89=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 --- 1,18 ---- ! module=+:71=+:SteamCaster=+:modules/mx_shotcast/=+:SHOUTcast and ICEcast MXP-CMS Module=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:71=+:85=+:Station Front=+:=+:shotcast_front.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:SteamCaster Front=+:Demo block=+:85=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 ! function=+:71=+:87=+:SteamCaster Last 10=+:SteamCaster Last 10 Block =+:shotcast_last10.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:SteamCaster Last 10=+:Demo block=+:87=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:71=+:88=+:Stream Stats=+:Stream Stats =+:shotcast_stats.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:SteamCaster Stats=+:Demo block=+:88=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:71=+:89=+:Radio Player=+:Radio Player=+:radioplayer.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 ! block=+:=+:Radio Player=+:Web Based Radio Player=+:89=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_install.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** db_install.php 2 Jul 2013 02:46:54 -0000 1.11 --- db_install.php 2 Jul 2013 05:50:07 -0000 1.12 *************** *** 36,40 **** $mx_module_version = '3.5.2'; ! $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; // If fresh install --- 36,40 ---- $mx_module_version = '3.5.2'; ! $mx_module_copy = 'MXP-CMS <i> - SteamCaster</i> module by OryNider & <a href="http://www.mxpcms.sf.net" target="_blank">Mx Team</a>'; // If fresh install Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_shotcast/db_upgrade.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** db_upgrade.php 28 May 2013 07:14:33 -0000 1.10 --- db_upgrade.php 2 Jul 2013 05:50:07 -0000 1.11 *************** *** 32,36 **** $mx_module_version = '3.5.2'; ! $mx_module_copy = 'mxBB <i> - Shotcast</i> module by OryNider & <a href="http://www.mxbb.net" target="_blank">Mx Team</a>'; $message = "<b>Upgrading!</b><br/><br/>"; --- 32,36 ---- $mx_module_version = '3.5.2'; ! $mx_module_copy = 'MXP-CMS <i> - SteamCaster</i> module by OryNider & <a href="http://www.mxpcms.sf.net" target="_blank">Mx Team</a>'; $message = "<b>Upgrading!</b><br/><br/>"; *************** *** 43,65 **** if ($result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "shotcast_config" )) { - // // Upgrade checks - // $upgrade_100 = 0; $upgrade_108 = 0; $upgrade_300 = 0; $upgrade_350 = 0; - // // validate before 1.0 Gold - // if (!$result = $db->sql_query("SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'force_online'")) { $upgrade_100 = 1; } ! ! // // validate before 1.08 - user sessions from mx_radio - // if (!$result = $db->sql_query("SELECT bot_id from " . $mx_table_prefix . "shotcast_session")) { --- 43,60 ---- if ($result = $db->sql_query( "SELECT config_name from " . $mx_table_prefix . "shotcast_config" )) { // Upgrade checks $upgrade_100 = 0; $upgrade_108 = 0; $upgrade_300 = 0; $upgrade_350 = 0; + $upgrade_352 = 0; // validate before 1.0 Gold if (!$result = $db->sql_query("SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'force_online'")) { $upgrade_100 = 1; } ! // validate before 1.08 - user sessions from mx_radio if (!$result = $db->sql_query("SELECT bot_id from " . $mx_table_prefix . "shotcast_session")) { *************** *** 67,81 **** } - // // validate before 3.0 Gold - backported support for - Custom Skins - // if (!$result = $db->sql_query("SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'skin'")) { $upgrade_300 = 1; } ! ! // ! // validate before 3.5.x - backported support for - Caster type: shout or ice ! // if (!$result = $db->sql_query("SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'caster'")) { --- 62,72 ---- } // validate before 3.0 Gold - backported support for - Custom Skins if (!$result = $db->sql_query("SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'skin'")) { $upgrade_300 = 1; } ! ! // validate before 3.5.0 - backported support for - Caster type: shout or ice if (!$result = $db->sql_query("SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'caster'")) { *************** *** 83,86 **** --- 74,83 ---- } + // validate before 3.5.2 + if (!$result = $db->sql_query("SELECT config_value from " . $mx_table_prefix . "shotcast_config WHERE config_name = 'stream_type'")) + { + $upgrade_352 = 1; + } + $message = "<b>Upgrading!</b><br/><br/>"; *************** *** 99,103 **** $sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "shotcast_session"; ! $sql[] = "CREATE TABLE ".$mx_table_prefix."shotcast_session ( id int(11) unsigned NOT NULL auto_increment, user_id mediumint(8) DEFAULT '0' NOT NULL, --- 96,100 ---- $sql[] = "DROP TABLE IF EXISTS " . $mx_table_prefix . "shotcast_session"; ! $sql[] = "CREATE TABLE " . $mx_table_prefix . "shotcast_session ( id int(11) unsigned NOT NULL auto_increment, user_id mediumint(8) DEFAULT '0' NOT NULL, *************** *** 130,137 **** $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('play_port', '')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('play_mount', '/livemp3')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('picture_type', 'cover')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('fallback', 'eq')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('logo', 'logo.gif')"; } else --- 127,141 ---- $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('play_port', '')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('play_mount', '/livemp3')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('picture_type', 'cover')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('fallback', 'eq')"; $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('logo', 'logo.gif')"; + } + + if ($upgrade_352 == 1) + { + $message .= "<b>Upgrading to v. 3.5.2..</b><br/><br/>"; + + $sql[] = "INSERT INTO " . $mx_table_prefix . "shotcast_config VALUES ('stream_type', 'icy')"; } else *************** *** 145,155 **** WHERE module_id = '" . $mx_module_id . "'"; ! $message .= mx_do_install_upgrade( $sql ); } else { - // // If not installed - // $message = "<b>Module is not installed...and thus cannot be upgraded ;)</b><br/><br/>"; } --- 149,157 ---- WHERE module_id = '" . $mx_module_id . "'"; ! $message .= mx_do_install_upgrade($sql); } else { // If not installed $message = "<b>Module is not installed...and thus cannot be upgraded ;)</b><br/><br/>"; } *************** *** 161,163 **** echo "</table><br />"; ! ?> --- 163,165 ---- echo "</table><br />"; ! ?> \ No newline at end of file |
