aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xweb/stream.gathering.org/index-bak.pl67
-rw-r--r--web/stream.gathering.org/index-bak.tmpl31
2 files changed, 0 insertions, 98 deletions
diff --git a/web/stream.gathering.org/index-bak.pl b/web/stream.gathering.org/index-bak.pl
deleted file mode 100755
index 3e31107..0000000
--- a/web/stream.gathering.org/index-bak.pl
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/perl -I /srv/streamlib
-use warnings;
-use strict;
-use CGI;
-use Geo::IP;
-use NetAddr::IP;
-use Net::IP;
-# apt-get install libnet-ip-perl libnetaddr-ip-perl
-use HTML::Template;
-use stream;
-use stream::config;
-
-my $client = CGI->new;
-
-my $v4net = $stream::config::v4net;
-my $v6net = $stream::config::v6net;
-my $tg = $stream::config::tg;
-my $tg_full = $stream::config::tg_full;
-my %streams = %stream::config::streams;
-
-my $force_unicast = $client->param('forceunicast');
-
-my $location = undef;
-
-print $client->header();
-
-my $clip = $client->remote_addr();
-my $template = HTML::Template->new(filename => 'index.tmpl');
-my $is_local = &is_ip_local($clip, $v4net, $v6net);
-
-my @streams = &html_local_test();
-$template->param(TG => $tg);
-$template->param(TG_FULL => $tg_full);
-$template->param(STREAMS => \@streams);
-print $template->output();
-
-
-sub html_local_test() {
- my @s = ();
- foreach my $name (sort { $streams{$a}->{priority} <=> $streams{$b}->{priority} } keys %streams) {
- my $title_link = "http://stream.tg$tg.gathering.org/stream.pl?delivery=%s&stream=${name}&interlaced=%s";
- my $multicast_link = $streams{$name}->{has_multicast} ? "multicast" : "unicast";
- $multicast_link = "unicast" if ($force_unicast == 1 || not $is_local);
-
- if ($streams{$name}->{external}) {
- $title_link = $streams{$name}->{url};
- } else {
- $title_link = sprintf($title_link, $multicast_link, $streams{$name}->{interlaced});
- }
- my %hash = (
- 'title_link' => $title_link,
- 'title' => $streams{$name}->{title},
- 'source' => $streams{$name}->{source},
- 'delivery' => $multicast_link
- );
- if ($multicast_link eq "multicast") {
- $hash{'is_multicast'} .= 1;
- my $unicast_link = $title_link;
- $unicast_link=~s/multicast/unicast/g;
- $hash{'unicast_link'} .= $unicast_link;
- }
- $hash{'description'} .= $streams{$name}->{description} if exists($streams{$name}->{description});
- push(@s, \%hash);
-
- }
- return @s;
-}
diff --git a/web/stream.gathering.org/index-bak.tmpl b/web/stream.gathering.org/index-bak.tmpl
deleted file mode 100644
index c0aa95d..0000000
--- a/web/stream.gathering.org/index-bak.tmpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<head>
- <title>The Gathering <TMPL_VAR NAME=TG_FULL></title>
- <link rel="stylesheet" type="text/css" media="screen" href="superawesomeness.css">
- <link href='http://fonts.googleapis.com/css?family=Open+Sans&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
-</head>
-<body>
- <div id="spaceship"></div>
- <div id="innhold">
- <h1>The Gathering <TMPL_VAR NAME=TG_FULL></h1>
- <ul>
- <TMPL_LOOP NAME="STREAMS">
- <li><a href="<TMPL_VAR NAME=TITLE_LINK>"><TMPL_VAR NAME=TITLE ></a>
- <p>
- Source: <TMPL_VAR NAME=SOURCE >
- <br/>Delivery: <TMPL_VAR NAME=delivery> <TMPL_IF NAME=IS_MULTICAST>(<a href='<TMPL_VAR NAME=UNICAST_LINK>'>problems? try unicast vlc link here</a>)</TMPL_IF>
- <TMPL_IF NAME="DESCRIPTION"><br /><TMPL_VAR NAME=DESCRIPTION></TMPL_IF></li>
- </TMPL_LOOP>
- </ul>
- </div>
- <footer>
- <p>Problems with the non game streams? The easiest way to get hold of us is on IRC (EFNet);
- one of ViD, Rockj and Sesse should be available if there's too much traffic
- on #tg to be heard.</p>
- <p><a href="http://stream.tg<TMPL_VAR NAME="TG">.gathering.org">http://stream.tg<TMPL_VAR NAME="TG">.gathering.org</a></p>
-
- </footer>
-</body>
-</html>
-
-