[xiph-commits] r11064 - in icecast/branches/kh/icecast: . admin src
web
karl at svn.xiph.org
karl at svn.xiph.org
Sun Mar 26 19:24:10 PST 2006
Author: karl
Date: 2006-03-26 19:23:58 -0800 (Sun, 26 Mar 2006)
New Revision: 11064
Added:
icecast/branches/kh/icecast/admin/logs.xsl
icecast/branches/kh/icecast/admin/showlog.xsl
icecast/branches/kh/icecast/web/adminbar.html
icecast/branches/kh/icecast/web/navbar.html
Modified:
icecast/branches/kh/icecast/NEWS
icecast/branches/kh/icecast/admin/listclients.xsl
icecast/branches/kh/icecast/admin/listmounts.xsl
icecast/branches/kh/icecast/admin/manageauth.xsl
icecast/branches/kh/icecast/admin/managerelays.xsl
icecast/branches/kh/icecast/admin/moveclients.xsl
icecast/branches/kh/icecast/admin/response.xsl
icecast/branches/kh/icecast/admin/stats.xsl
icecast/branches/kh/icecast/admin/updatemetadata.xsl
icecast/branches/kh/icecast/configure.in
icecast/branches/kh/icecast/src/logging.c
icecast/branches/kh/icecast/web/auth.xsl
icecast/branches/kh/icecast/web/server_uptime.xsl
icecast/branches/kh/icecast/web/server_version.xsl
icecast/branches/kh/icecast/web/status.xsl
icecast/branches/kh/icecast/web/style.css
Log:
add some small updates to web pages, bump version to kh4
Modified: icecast/branches/kh/icecast/NEWS
===================================================================
--- icecast/branches/kh/icecast/NEWS 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/NEWS 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,10 +6,20 @@
. authenticated relays, those that match the relay user/pass, bypass the
max-listener check
-TODO
-. update slave host handling to add entry via url, as on-demand relays don't
- connect until there are listeners.
+2.3-kh4
+. fserve thread now looks for a chain of refbufs as well.
+. plug leaks from coverity code analysis. mainly minor but a possible fd leak.
+. log handles caching of N lines.
+. show last N lines of log contents via admin pages
+. change webpages (for the better!), add logs display and reload config.
+. use 64bit handling when using stats _add calls
+. send 403 not 404 for max listeners reached.
+. add server-wide total sent in streams count.
+. fix possible corruption case with new cients.
+. on listener move, search from burst point if most recent refbuf is not a sync
+ point, currently only theora streams.
+
2.3-kh3
. add source auth via authenticator, affects certain admin access as well.
Only url auth using it currently
Modified: icecast/branches/kh/icecast/admin/listclients.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/listclients.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/listclients.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,34 +6,12 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="stats.xsl">Admin Home</a> |
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="/status.xsl">Index</a>
- </td></tr>
- </table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-
-
+<div class="main">
<h1>Listener Stats</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
+
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -92,6 +70,7 @@
</div>
</div>
<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/admin/listmounts.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/listmounts.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/listmounts.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,33 +6,12 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="stats.xsl">Admin Home</a> |
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="/status.xsl">Index</a>
- </td></tr>
- </table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-
+<div class="main">
<h1>Active Mountpoints</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
+
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -75,6 +54,7 @@
</div>
</div>
<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
</xsl:template>
Added: icecast/branches/kh/icecast/admin/logs.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/logs.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/logs.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -0,0 +1,72 @@
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<title>Icecast Streaming Media Server</title>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+
+<div class="main">
+<h1>Icecast2 logs</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Access log</h3>
+<iframe width="100%" height="400" src="showlog.xsl?log=accesslog">
+no frame support however contents can be found <a href="showlog.xsl?log=accesslog">here</a>
+</iframe>
+</div>
+<div class="roundbottom">
+<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Error log</h3>
+<iframe width="100%" height="400" padding="5" src="showlog.xsl?log=errorlog">
+no frame support however contents can be found <a href="showlog.xsl?log=errorlog">here</a>
+</iframe>
+</div>
+<div class="roundbottom">
+<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<div class="roundcont">
+<div class="roundtop">
+<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
+</div>
+<div class="newscontent">
+<h3>Playlist log</h3>
+<iframe width="100%" height="300" src="showlog.xsl?log=playlistlog">
+no frame support however contents can be found <a href="showlog.xsl?log=playlistlog">here</a>
+</iframe>
+</div>
+<div class="roundbottom">
+<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
+</div>
+</div>
+<br />
+<br />
+
+<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
+</body>
+</html>
+
+</xsl:template>
+</xsl:stylesheet>
Modified: icecast/branches/kh/icecast/admin/manageauth.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/manageauth.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/manageauth.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,31 +6,12 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="stats.xsl">Admin Home</a> |
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="/status.xsl">Index</a>
- </td></tr>
- </table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
+<div class="main">
+<h1>Manage Listeners</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
-<h2>Show defined users</h2>
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -94,6 +75,7 @@
</div>
</div>
<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/admin/managerelays.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/managerelays.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/managerelays.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,33 +6,12 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="stats.xsl">Admin Home</a> |
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="/status.xsl">Index</a>
- </td></tr>
- </table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
-
+<div class="main">
<h1>Relay Management</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
+
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -66,6 +45,7 @@
</div>
</div>
<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/admin/moveclients.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/moveclients.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/moveclients.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,33 +6,13 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="stats.xsl">Admin Home</a> |
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="/status.xsl">Index</a>
- </td></tr>
- </table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
+<div class="main">
+<h1>Moving Listeners From (<xsl:value-of select="current_source" />)</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
<xsl:variable name = "currentmount" ><xsl:value-of select="current_source" /></xsl:variable>
-<h1>Moving Listeners From (<xsl:value-of select="current_source" />)</h1>
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -40,7 +20,7 @@
<div class="newscontent">
<h3>Move to which mountpoint ?</h3>
<xsl:for-each select="source">
- <table border="0" cellpadding="1" cellspacing="5" >
+ <table border="0" cellpadding="6" cellspacing="5" >
<tr>
<td>Move from (<xsl:copy-of select="$currentmount" />) to (<xsl:value-of select="@mount" />)</td>
<td><xsl:value-of select="listeners" /> Listeners</td>
@@ -57,6 +37,7 @@
</div>
</div>
<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
Modified: icecast/branches/kh/icecast/admin/response.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/response.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/response.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,32 +6,12 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="stats.xsl">Admin Home</a> |
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="/status.xsl">Index</a>
- </td></tr>
- </table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
+<div class="main">
<h1>Icecast Server Response</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
+
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -50,6 +30,7 @@
</div>
</div>
<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
Added: icecast/branches/kh/icecast/admin/showlog.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/showlog.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/showlog.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -0,0 +1,20 @@
+<xsl:stylesheet xmlns:xsl = "http://www.w3.org/1999/XSL/Transform" version = "1.0" >
+<xsl:output omit-xml-declaration="no" method="xml" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes" encoding="UTF-8" />
+<xsl:template match = "/icestats" >
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="/style.css" />
+</head>
+<div class="logs">
+<body>
+<table>
+<tr><td><pre>
+<xsl:for-each select="/icestats"> <xsl:for-each select="log"> <xsl:value-of select="." /> </xsl:for-each></xsl:for-each>
+</pre></td></tr>
+</table>
+</body>
+</div>
+</html>
+
+</xsl:template>
+</xsl:stylesheet>
Modified: icecast/branches/kh/icecast/admin/stats.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/stats.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/stats.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,31 +6,13 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+
+<div class="main">
+<h1>Icecast2 Admin</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
+
<br />
-<!--header menu -->
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="stats.xsl">Admin Home</a> |
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="/status.xsl">Index</a>
- </td></tr>
- </table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-<!--end header menu -->
<!--global server stats-->
<div class="roundcont">
@@ -112,9 +94,9 @@
</xsl:for-each>
<xsl:text disable-output-escaping="yes">&</xsl:text>nbsp;
-
<!--end mount point stats-->
<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/admin/updatemetadata.xsl
===================================================================
--- icecast/branches/kh/icecast/admin/updatemetadata.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/admin/updatemetadata.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,32 +6,12 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="/style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Admin</center></h2>
-<br />
+<body bhcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
- <table border="0" cellpadding="1" cellspacing="3">
- <tr>
- <td align="center">
- <a class="nav" href="stats.xsl">Admin Home</a> |
- <a class="nav" href="listmounts.xsl">List Mountpoints</a> |
- <a class="nav" href="moveclients.xsl">Move Listeners</a> |
- <a class="nav" href="managerelays.xsl">Manage Relays</a> |
- <a class="nav" href="/status.xsl">Index</a>
- </td></tr>
- </table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-
+<div class="main">
<h1>Update Metadata</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/adminbar.html" />
+
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -61,6 +41,7 @@
</div>
</div>
<div class="poster">Support icecast development at <a class="nav" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/configure.in
===================================================================
--- icecast/branches/kh/icecast/configure.in 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/configure.in 2006-03-27 03:23:58 UTC (rev 11064)
@@ -1,4 +1,4 @@
-AC_INIT([Icecast], [2.3-kh3], [karl at xiph.org])
+AC_INIT([Icecast], [2.3-kh4], [karl at xiph.org])
AC_PREREQ(2.54)
AC_CONFIG_SRCDIR(src/main.c)
Modified: icecast/branches/kh/icecast/src/logging.c
===================================================================
--- icecast/branches/kh/icecast/src/logging.c 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/src/logging.c 2006-03-27 03:23:58 UTC (rev 11064)
@@ -222,6 +222,7 @@
log_set_filename (errorlog, fn_error);
log_set_level (errorlog, config->loglevel);
log_set_trigger (errorlog, config->logsize);
+ log_set_lines_kept (errorlog, config->error_log_lines);
log_set_archive_timestamp(errorlog, config->logarchive);
log_reopen (errorlog);
}
@@ -232,6 +233,7 @@
snprintf (fn_error, FILENAME_MAX, "%s%s%s", config->log_dir, PATH_SEPARATOR, config->access_log);
log_set_filename (accesslog, fn_error);
log_set_trigger (accesslog, config->logsize);
+ log_set_lines_kept (accesslog, config->access_log_lines);
log_set_archive_timestamp(errorlog, config->logarchive);
log_reopen (accesslog);
}
@@ -242,6 +244,7 @@
snprintf (fn_error, FILENAME_MAX, "%s%s%s", config->log_dir, PATH_SEPARATOR, config->playlist_log);
log_set_filename (playlistlog, fn_error);
log_set_trigger (playlistlog, config->logsize);
+ log_set_lines_kept (playlistlog, config->playlist_log_lines);
log_set_archive_timestamp(errorlog, config->logarchive);
log_reopen (playlistlog);
}
Added: icecast/branches/kh/icecast/web/adminbar.html
===================================================================
--- icecast/branches/kh/icecast/web/adminbar.html 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/web/adminbar.html 2006-03-27 03:23:58 UTC (rev 11064)
@@ -0,0 +1,36 @@
+<html>
+ <head>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ </head>
+
+ <body>
+ <!--index header menu -->
+ <center>
+ <table class="roundcont">
+ <tr>
+ <td class="topleft"></td>
+ <td rowspan="2" class="nav">
+ <table>
+ <tr>
+ <td>
+ <a target="_parent" href="/admin/stats.xsl">Admin Home</a>
+ <a target="_parent" href="/admin/listmounts.xsl">List Mountpoints</a>
+ <a target="_parent" href="/admin/moveclients.xsl">Move Listeners</a>
+ <a target="_parent" href="/admin/managerelays.xsl">Manage Relays</a>
+ <a target="_parent" href="/admin/function.xsl?perform=updatecfg">Reload Config</a>
+ <a target="_parent" href="/admin/logs.xsl">Logs</a>
+ <a target="_parent" href="/status.xsl">Index</a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="topright"></td>
+ </tr>
+ <tr>
+ <td class="bottomleft"></td>
+ <td class="bottomright"></td>
+ </tr>
+ </table>
+ </center>
+ </body>
+</html>
Modified: icecast/branches/kh/icecast/web/auth.xsl
===================================================================
--- icecast/branches/kh/icecast/web/auth.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/web/auth.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,37 +6,36 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<table border="0" width="100%%">
+
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+
+<div class="main">
+<h1>Authorization Page</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/navbar.html" />
+
+<table border="0" width="100%">
<tr>
-<td width="50"></td>
<td>
-<img align="left" src="/images/icecast.png" /><h2><center>Authorization Page</center></h2>
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
</div>
+
<div class="newscontent">
<xsl:for-each select="source">
-<xsl:choose>
-<xsl:when test="listeners">
<xsl:if test="authenticator">
-<xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
-<h3>(<xsl:value-of select="@mount" />)</h3>
+<h3><xsl:if test="server_name"><xsl:value-of select="server_name" /> </xsl:if>
+(<xsl:value-of select="@mount" />)</h3>
<form method="GET" action="/admin/buildm3u">
<table border="0" cellpadding="4">
-<tr><td>Username : <input type="text" name="username"/></td></tr>
-<tr><td>Password : <input type="password" name="password"/></td></tr>
+<tr><td>Username :</td> <td> <input type="text" name="username"/></td></tr>
+<tr><td>Password :</td> <td> <input type="password" name="password"/></td></tr>
+<tr><td></td></tr>
<tr><td><input type="Submit" value="Login"/></td></tr>
</table>
<input type="hidden" name="mount" value="{@mount}"/>
</form>
</xsl:if>
-</xsl:when>
-<xsl:otherwise>
-<h3><xsl:value-of select="@mount" /> - Not Connected</h3>
-</xsl:otherwise>
-</xsl:choose>
<br></br>
<br></br>
</xsl:for-each>
@@ -48,9 +47,12 @@
</div>
<br></br><br></br>
</td>
-<td width="25"></td></tr>
+</tr>
</table>
-<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+<div class="poster">
+Support Icecast development at <a target="_blank" href="http://www.icecast.org">www.icecast.org</a>
+</div>
+</div>
</body>
</html>
</xsl:template>
Added: icecast/branches/kh/icecast/web/navbar.html
===================================================================
--- icecast/branches/kh/icecast/web/navbar.html 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/web/navbar.html 2006-03-27 03:23:58 UTC (rev 11064)
@@ -0,0 +1,33 @@
+<html>
+ <head>
+ <link rel="stylesheet" type="text/css" href="/style.css" />
+ </head>
+
+ <body>
+ <!--index header menu -->
+ <center>
+ <table class="roundcont">
+ <tr>
+ <td class="topleft"></td>
+ <td rowspan="2" class="nav">
+ <table>
+ <tr>
+ <td>
+ <a href="/admin/stats.xsl" target="_parent">Admin</a>
+ <a href="/status.xsl" target="_parent">Server Status</a>
+ <a href="/server_uptime.xsl" target="_parent">Server Uptime</a>
+ <a href="/server_version.xsl" target="_parent">Version Info</a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="topright"></td>
+ </tr>
+ <tr>
+ <td class="bottomleft"></td>
+ <td class="bottomright"></td>
+ </tr>
+ </table>
+ </center>
+ </body>
+</html>
Modified: icecast/branches/kh/icecast/web/server_uptime.xsl
===================================================================
--- icecast/branches/kh/icecast/web/server_uptime.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/web/server_uptime.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,31 +6,12 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Status (Server Uptime)</center></h2>
-<br />
-<!--index header menu -->
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
- <tr>
- <td bgcolor="#656565">
- <a class="nav" href="admin/stats.xsl">Administration</a> |
- <a class="nav" href="status.xsl">Server Status</a> |
- <a class="nav" href="server_uptime.xsl">Server Uptime</a> |
- <a class="nav" href="server_version.xsl">Version Info</a> |</td>
- </tr>
-</table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-<!--end index header menu -->
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<div class="main">
+<h1>Icecast2 Status (Server Uptime)</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/navbar.html" />
+
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -58,6 +39,7 @@
<br />
<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+</div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/web/server_version.xsl
===================================================================
--- icecast/branches/kh/icecast/web/server_version.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/web/server_version.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,31 +6,12 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Status (Version Info)</center></h2>
-<br />
-<!--index header menu -->
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
- <tr>
- <td bgcolor="#656565">
- <a class="nav" href="admin/stats.xsl">Administration</a> |
- <a class="nav" href="status.xsl">Server Status</a> |
- <a class="nav" href="server_uptime.xsl">Server Uptime</a> |
- <a class="nav" href="server_version.xsl">Version Info</a> |</td>
- </tr>
-</table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-<!--end index header menu -->
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+<div class="main">
+<h1>Icecast2 Status (Version Info)</h1>
+<iframe scrolling="no" frameborder="0" width="100%" height="100" src="/navbar.html" />
+
<div class="roundcont">
<div class="roundtop">
<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
@@ -62,7 +43,7 @@
</tr>
<tr>
<td width="130">Stream Directory </td>
- <td class="streamdata"><a class="nav" target="_blank" href="http://dir.xiph.org/index.php/">dir.xiph.org</a></td>
+ <td class="streamdata"><a class="nav" target="_blank" href="http://dir.xiph.org/index.php">dir.xiph.org</a></td>
</tr>
<tr>
<td width="130">Community</td>
@@ -77,7 +58,11 @@
<br />
<br />
-<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+<div class="poster">
+Support Icecast development at <a target="_blank" href="http://www.icecast.org">www.icecast.org</a>
+</div>
+
+</div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/web/status.xsl
===================================================================
--- icecast/branches/kh/icecast/web/status.xsl 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/web/status.xsl 2006-03-27 03:23:58 UTC (rev 11064)
@@ -6,30 +6,13 @@
<title>Icecast Streaming Media Server</title>
<link rel="stylesheet" type="text/css" href="style.css" />
</head>
-<body topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
-<img align="left" src="/images/icecast.png" /><h2><center>Icecast2 Status</center></h2>
-<br />
-<!--index header menu -->
-<div class="roundcont">
-<div class="roundtop">
-<img src="/images/corner_topleft.jpg" class="corner" style="display: none" />
-</div>
-<table border="0" width="100%" id="table1" cellspacing="0" cellpadding="4">
- <tr>
- <td bgcolor="#656565">
- <a class="nav" href="admin/stats.xsl">Administration</a> |
- <a class="nav" href="status.xsl">Server Status</a> |
- <a class="nav" href="server_uptime.xsl">Server Uptime</a> |
- <a class="nav" href="server_version.xsl">Version Info</a> |</td>
- </tr>
-</table>
-<div class="roundbottom">
-<img src="/images/corner_bottomleft.jpg" class="corner" style="display: none" />
-</div>
-</div>
-<br />
-<br />
-<!--end index header menu -->
+
+<body bgcolor="#000" topmargin="0" leftmargin="0" rightmargin="0" bottommargin="0">
+
+<div class="main">
+<h1>Icecast2 Status</h1>
+<iframe scrolling="no" frameborder="0" width="100%" src="/navbar.html" />
+
<!--mount point stats-->
<xsl:for-each select="source">
<div class="roundcont">
@@ -107,8 +90,10 @@
</xsl:for-each>
<xsl:text disable-output-escaping="yes">&</xsl:text>nbsp;
-
-<div class="poster">Support icecast development at <a class="nav" target="_blank" href="http://www.icecast.org">www.icecast.org</a></div>
+<div class="poster">
+Support Icecast development at <a target="_blank" href="http://www.icecast.org">www.icecast.org</a>
+</div>
+</div>
</body>
</html>
</xsl:template>
Modified: icecast/branches/kh/icecast/web/style.css
===================================================================
--- icecast/branches/kh/icecast/web/style.css 2006-03-27 02:26:06 UTC (rev 11063)
+++ icecast/branches/kh/icecast/web/style.css 2006-03-27 03:23:58 UTC (rev 11064)
@@ -15,12 +15,6 @@
padding: 0;
}
-body {
- margin-left: 50px;
- margin-right: 25px;
- background-color: #000;
-}
-
.xiphnav {
font-family: Verdana, sans-serif;
font-weight: normal;
@@ -30,14 +24,6 @@
color: #000;
background: #aaa;
}
-h2 {
- font-family: Verdana, sans-serif;
- text-decoration: none;
- font-weight: bold;
- font-size: 250%;
- color: #fff;
- margin-top:3px;
-}
h1 {
font-family: Verdana, sans-serif;
text-decoration: none;
@@ -51,12 +37,13 @@
text-decoration: none;
font-weight: bold;
font-size: 110%;
- color: #fff;
}
-.nav:hover {
- font-family: Verdana, sans-serif;
+.nav a {
+ color: white;
text-decoration: none;
- font-weight: bold;
+ background red;
+}
+.nav a:hover {
color: #f8ef64;
}
.xiphnav_a {
@@ -64,6 +51,24 @@
font-weight: normal;
color: #000;
}
+.main {
+ font-family: Verdana, sans-serif;
+ background-color: #000;
+ margin-left: 50px;
+ width: 90%;
+}
+.main h1 {
+ text-decoration: none;
+ font-weight: bold;
+ font-size: 300%;
+ color: #fff;
+ padding-top: 30px;
+ padding-bottom: 30px;
+ padding-left: 90px;
+ margin-top: 0px;
+ margin-bottom: 10px;
+ background: url(/images/icecast.png) no-repeat left center;
+}
.news {
font-family: Verdana, sans-serif;
text-decoration: none;
@@ -109,10 +114,16 @@
color: #fff;
}
.roundcont {
- width: 90%;
background-color: #656565;
color: #fff;
+ padding: 0px;
+ margin: 0px;
+ border-collapse: collapse;
}
+.roundcont table{
+ border: none;
+ border-collapse: collapse;
+}
.newscontent {
margin: 0 20px;
@@ -158,14 +169,12 @@
}
.newscontent a {
font-family: Verdana, sans-serif;
- text-decoration: underline;
+ text-decoration: none;
font-weight: bold;
color: #f8ef64;
}
.newscontent a:hover {
font-family: Verdana, sans-serif;
- text-decoration: underline;
- font-weight: bold;
color: #fff;
}
.newscontent a.nav2 {
@@ -186,16 +195,33 @@
font-family: Verdana, sans-serif;
margin: 0px;
margin-top: 50px;
+ padding-top: 10px;
+ padding-bottom: 10px;
display: block;
text-decoration: none;
font-size: 100%;
+ font-weight: bold;
color: #f8ef64;
- border-top: 3px dashed #000;
+ border-top: 4px solid #656565;
}
-.roundcont p {
- margin: 10px 50px;
+.poster a {
+ color: white;
+ text-decoration: none;
}
+.nav body {
+ color: white
+ background-color: #656565;
+}
+.nav a {
+ margin: 15px;
+ padding: 0px;
+}
+.nav table {
+ font-size: 110%;
+ text-align: center;
+ border: none;
+}
.roundtop {
background: url(images/corner_topright.jpg) no-repeat top right;
}
@@ -204,6 +230,37 @@
background: url(images/corner_bottomright.jpg) no-repeat top right;
}
+.logs table {
+ background-color: #656565;
+ color: #fff;
+ font-size: 60%;
+}
+
+.banner td {
+ font-size: 150%;
+ vertical-align: top;
+}
+td.topleft {
+ background: url("images/corner_topleft.jpg") no-repeat top left;
+ height: 15px;
+ width: 15px;
+}
+td.topright {
+ background: url("images/corner_topright.jpg") no-repeat top right;
+ height: 15px;
+ width: 15px;
+}
+td.bottomleft {
+ background: url("images/corner_bottomleft.jpg") no-repeat bottom left;
+ height: 15px;
+ width: 15px;
+}
+td.bottomright {
+ background: url("images/corner_bottomright.jpg") no-repeat bottom right;
+ height: 15px;
+ width: 15px;
+}
+
img.corner {
width: 15px;
height: 15px;
More information about the commits
mailing list