From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sat, 8 Sep 2007 20:40:06 +0000 (+0000)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=6d049bd100a65f8aab957442243991f632381279;hp=c3e52388b36c2e560079419c8f31b9cba66b645f;p=deb%2Fpackages.git

Merge commit 'origin/master' into debian-master
---

diff --git a/cgi-bin/index.php b/cgi-bin/index.php
deleted file mode 100644
index 006db80..0000000
--- a/cgi-bin/index.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?
-
-function go($script)
-{
-	$pipes = null;
-	$proc = proc_open("./$script php", array(
-		0 => array('pipe', 'r'),
-		1 => array('pipe', 'w'),
-		2 => array('pipe', 'w')
-		), $pipes);
-	foreach ($_GET as $k => $v) {
-		fwrite($pipes[0], urlencode($k)."=".urlencode($v)."\n");
-	}
-	fclose($pipes[0]);
-	fpassthru($pipes[1]);
-	$stderr = fread($pipes[2], 4096);
-	$exit = proc_close($proc);
-	if ($exit) {
-		echo "<h1>Error happened, code $exit</h1>\n";
-	}
-	echo "<pre>".htmlspecialchars($stderr);
-	echo "</pre>";
-}
-
-$SUITES = array('oldstable', 'stable', 'testing', 'unstable', 'experimental');
-$pi = substr($_SERVER["PATH_INFO"], 1);
-$elems = explode('/', $pi);
-if ($pi == "") {
-	readfile("index.html");
-	exit;
-} elseif ($pi == 'search') {
-	go("search_packages.pl");
-} elseif ($elems[0] == 'package' && count($elems) == 2) {
-	$_GET['searchon'] = 'names';
-	$_GET['keywords'] = $elems[1];
-	$_GET['suite'] = 'all';
-	$_GET['exact'] = 1;
-	go("search_packages.pl");
-} elseif ($elems[0] == 'source' && count($elems) == 2) {
-	$_GET['searchon'] = 'sourcenames';
-	$_GET['keywords'] = $elems[1];
-	$_GET['suite'] = 'all';
-	$_GET['exact'] = 1;
-	go("search_packages.pl");
-} elseif (in_array($elems[0], $SUITES) && count($elems) == 2) {
-	$_GET['package'] = $elems[1];
-	$_GET['suite'] = $elems[0];
-	go("show_package.pl");
-} elseif (in_array($elems[0], $SUITES) && count($elems) == 3) {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/$elems[0]/".urlencode($elems[2]));
-	exit;
-} elseif (substr($pi, 0, 4) == 'src:') {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/source/".urlencode(substr($pi,4)));
-	exit;
-} elseif (!eregi('[^a-z0-9+.-]', $pi)) {
-	header("Location: http://merkel.debian.org/~jeroen/pdo/package/".urlencode($pi));
-	exit;
-} else {
-	echo "404 not found";
-}
diff --git a/config.sh.sed.in b/config.sh.sed.in
index aecefa9..1c8658e 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -20,7 +20,7 @@ cachedir=${topdir}/cache
 # unset this if %SITE% moves somewhere where the packages files
 # cannot be obtained locally
 #
-localdir=/org/ftp.debian.org/debian
+localdir=/org/ftp.root/debian
 
 # path to private ftp directory
 #ftproot=/org/ftp.root
diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index aad1d57..440b159 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -138,7 +138,7 @@ sub do_dispatch {
 
     my $what_to_do = 'show';
     my $source = 0;
-    if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
+    if (my $path = $ENV{'PATH_INFO'} || $input->param('PATH_INFO')) {
 	my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
 
 	debug( "PATH_INFO=$path components=@components", 3) if DEBUG;
diff --git a/templates/config.tmpl b/templates/config.tmpl
index 6fb12e0..74a5612 100644
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -4,7 +4,7 @@
 
    organisation = 'Debian'
    homepage = 'http://www.debian.org/'
-   packages_homepage = 'http://packages.debian.net/'
+   packages_homepage = 'http://packages.debian.org/'
    searchformurl = packages_homepage
    search_url = '/'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -42,6 +42,6 @@
 -%]
 [%-
    # possible values for importance: high, normal, low
-   sitewidemsg = { importance => "high",
-		   txt => "Please note that this is an experimental version of <a href=\"http://packages.debian.org/\">packages.debian.org</a>. Errors and obsolete information should be expected" }
+#   sitewidemsg = { importance => "high",
+#		   txt => "Please note that this is an experimental version of <a href=\"http://packages.debian.org/\">packages.debian.org</a>. Errors and obsolete information should be expected" }
 -%]
diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index 7107d53..b524d47 100644
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -321,6 +321,6 @@ Do not install it on a normal Debian system.</p>
   [%- END %]
 [% END %]
 
-<script type="text/javascript">init_tab_list("ptablist")</script>
+[%# <script type="text/javascript">init_tab_list("ptablist")</script> %]
 
 [%- PROCESS 'html/foot.tmpl' -%]