r686 - webspace/include
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Mar 25 15:19:36 EST 2006
Author: floam
Date: 2006-03-25 15:19:36 -0500 (Sat, 25 Mar 2006)
New Revision: 686
Modified:
webspace/include/downloads.php
webspace/include/errors.php
webspace/include/get.php
webspace/include/getdata.php
webspace/include/home.php
webspace/include/news.php
webspace/include/thebrain.php
Log:
New URLs, some other stuff.
Modified: webspace/include/downloads.php
===================================================================
--- webspace/include/downloads.php 2006-03-25 19:19:57 UTC (rev 685)
+++ webspace/include/downloads.php 2006-03-25 20:19:36 UTC (rev 686)
@@ -1,5 +1,6 @@
<?php
-function oscompare($a, $b) {
+function oscompare($a, $b)
+{
$os = determineos();
return ($a == $os) ? -1 : 1;
}
@@ -9,7 +10,7 @@
<p>Provides latest patch <tt>pk3</tt> data from
id. You need to copy your <tt>pak0.pk3</tt> from the CD-ROM
when the installation process is completed.</p>
- <p><a href="http://icculus.org/~zakk/q3run/ioquake3_setup.exe">
+ <p><a href="files/ioquake3_setup.exe">
Download for Windows x86</a>, 26MB.
<em>MD5: <tt>cd1298f0430ec9b040f2c855d78363c5</tt></em><br />
<em>Built from Subversion
@@ -26,17 +27,17 @@
Execute the <tt>.run</tt> file as root with something like
<tt>sh <em>ioquake3-version_etc.run</em></tt></p>
<p>
- <a href="http://icculus.org/~zakk/q3run/ioquake3-1.33_SVN629-0.1.i386.run">
+ <a href="files/ioquake3-1.33_SVN629-0.1.i386.run">
Download for x86</a>, 2.7MB.
- <em>MD5: <a href="http://icculus.org/~zakk/q3run/ioquake3-1.33_SVN629-0.1.i386.run.asc">
+ <em>MD5: <a href="files/ioquake3-1.33_SVN629-0.1.i386.run.asc">
<tt>1f77f6afb2b6428e8e47ddc3d8bc8b98</tt></a></em><br />
- <a href="http://icculus.org/~zakk/q3run/ioquake3-1.33_SVN629-0.1.x86_64.run">
+ <a href="files/ioquake3-1.33_SVN629-0.1.x86_64.run">
Download for x86_64</a>, 3.4MB.
- <em>MD5: <a href="http://icculus.org/~zakk/q3run/ioquake3-1.33_SVN629-0.1.x86_64.run.asc">
+ <em>MD5: <a href="files/ioquake3-1.33_SVN629-0.1.x86_64.run.asc">
<tt>bf338d31d40991e0e8f930a0e5b078c7</tt></a></em><br />
- <a href="http://icculus.org/~zakk/q3run/ioquake3-1.33_SVN629-0.1.ppc.run">
+ <a href="files/ioquake3-1.33_SVN629-0.1.ppc.run">
Download for PowerPC</a>, 2.7MB.
- <em>MD5: <a href="http://icculus.org/~zakk/q3run/ioquake3-1.33_SVN629-0.1.ppc.run.asc">
+ <em>MD5: <a href="files/ioquake3-1.33_SVN629-0.1.ppc.run.asc">
<tt>cefbaca88dd5c5cd8b151f21f38f20df</tt></a></em><br />
<em>Built from Subversion
<a href="http://svn.icculus.org/quake3/trunk/?rev=629">revision 629</a>.</em>
@@ -51,7 +52,7 @@
you need to copy your <tt>pak0.pk3</tt> from your legal CD-ROM.
Further instruction is in the <tt>ReadMe.rtf</tt> included in
the <tt>dmg</tt>. Intel binaries will be coming shortly.</p>
- <p><a href="http://icculus.org/~zakk/q3run/ioquake3.dmg">
+ <p><a href="files/ioquake3.dmg">
Download for OS X (PowerPC)</a>, 5.5MB.
<em>MD5: <tt>cd1298f0430ec9b040f2c855d78363c5</tt></em><br />
<em>Built from Subversion
Modified: webspace/include/errors.php
===================================================================
--- webspace/include/errors.php 2006-03-25 19:19:57 UTC (rev 685)
+++ webspace/include/errors.php 2006-03-25 20:19:36 UTC (rev 686)
@@ -1,6 +1,8 @@
<?php
-if (!$code) { $code = $_GET['code']; }
-if (!$detail) { $error['detail'] = $_GET['detail']; }
+if (!$code)
+ $code = $_GET['code'];
+if (!$detail)
+ $error['detail'] = $_GET['detail'];
switch($code)
{
@@ -14,7 +16,8 @@
break;
case 500:
$error['name'] = "Internal Server Error";
- $error['description'] = "Oh, crap. Something is broke and it's almost definitely our fault!";
+ $error['description'] = "Oh, crap. Something is broke and it's almost
+ definitely our fault!";
break;
}
Modified: webspace/include/get.php
===================================================================
--- webspace/include/get.php 2006-03-25 19:19:57 UTC (rev 685)
+++ webspace/include/get.php 2006-03-25 20:19:36 UTC (rev 686)
@@ -11,9 +11,8 @@
</ul>
<?php
include("downloads.php");
-foreach ($downloads as $os => $desc) {
+foreach ($downloads as $os => $desc)
$installers .= "<li class=\"$os\">$desc</li>\n";
-}
$official ="
<h2>Sanctioned Installers</h2>
@@ -146,7 +145,8 @@
<a href="?page=help">help</a>.</li>
</ol>';
-switch ($_GET['method']){
+switch ($_GET['method'])
+{
case "official":
echo $official;
break;
Modified: webspace/include/getdata.php
===================================================================
--- webspace/include/getdata.php 2006-03-25 19:19:57 UTC (rev 685)
+++ webspace/include/getdata.php 2006-03-25 20:19:36 UTC (rev 686)
@@ -1,6 +1,7 @@
<?php
-switch ($_POST['agree']) {
+switch ($_POST['agree'])
+{
case "I Do Not Agree":
$html = "<h2>KEINE DATEN FÜR SIE!</h2>
<p>You'll need to agree to the EULA if you want the
@@ -15,7 +16,8 @@
break;
default:
$eula = file_get_contents("include/id_patch_pk3s_Q3A_EULA.txt");
- $html = "<p>Newer <tt>pk3</tt> files from id point release patches
+ $html =
+"<p>Newer <tt>pk3</tt> files from id point release patches
are required to play Quake III: Arena on icculus.org/quake3.</p>
<h2>EULA</h2>
<p>In order for us to distribute the updated pk3 files from id
Modified: webspace/include/home.php
===================================================================
--- webspace/include/home.php 2006-03-25 19:19:57 UTC (rev 685)
+++ webspace/include/home.php 2006-03-25 20:19:36 UTC (rev 686)
@@ -16,14 +16,16 @@
<?php
$os = determineos();
include("downloads.php");
- if ($os) {
+ if ($os)
+ {
echo "Keep in mind this is a beta, 1.34 hasn't come out yet. We have detected
the operating system you are most likely using, and we have an installer
for you:<div class=\"indent $os\">$downloads[$os]</div>
<em>Check out the <a href=\"?page=get\">Get It</a> page for other installers
and instructions for different installation methods.</em>";
}
- else {
+ else
+ {
echo "We could not magically determine your platform. Check out the
<a href=\"?page=get\">Get It</a> page for installers and instructions fo
the different installation methods.";
Modified: webspace/include/news.php
===================================================================
--- webspace/include/news.php 2006-03-25 19:19:57 UTC (rev 685)
+++ webspace/include/news.php 2006-03-25 20:19:36 UTC (rev 686)
@@ -14,10 +14,8 @@
else
{
if ($err = news_digest($sock, $digestarray, $news_index, $news_item_max))
- {
$err = "Failed to get news digest: $err";
- }
-
+
$current_post = 0;
$news_item_count = count($digestarray);
@@ -45,7 +43,8 @@
news_logout($sock);
-if ($err) {
+if ($err)
+{
$code = 500;
$detail = $err;
require("errors.php");
Modified: webspace/include/thebrain.php
===================================================================
--- webspace/include/thebrain.php 2006-03-25 19:19:57 UTC (rev 685)
+++ webspace/include/thebrain.php 2006-03-25 20:19:36 UTC (rev 686)
@@ -1,4 +1,13 @@
<?php
+$navlist = array(
+ "home" => "Home",
+ "media" => "Screenshots",
+ "get" => "Get It",
+ "status" => "Status",
+ "discuss" => "Discussion",
+ "help" => "Help",
+);
+
if (!empty($_SERVER['HTTP_USER_AGENT']))
$ua = get_browser(null, true);
else
@@ -6,34 +15,29 @@
$normal = '<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-if ((strpos($_SERVER['HTTP_ACCEPT'], "application/xhtml+xml")) || ($ua['parent'] == "Validation Checkers")) {
+if ((strpos($_SERVER['HTTP_ACCEPT'], "application/xhtml+xml")) || ($ua['parent'] == "Validation Checkers"))
+{
$content_type = "application/xhtml+xml";
echo $normal;
}
-elseif ((strpos($_SERVER['HTTP_ACCEPT'], "application/xml")) || ($ua['browser'] == "IE" && $ua['version'] >= 6)) {
- if ($ua['browser'] == "IE") {
+elseif ((strpos($_SERVER['HTTP_ACCEPT'], "application/xml")) || ($ua['browser'] == "IE" && $ua['version'] >= 6))
+{
+ if ($ua['browser'] == "IE")
+ {
echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">
<?xml-stylesheet type=\"text/xsl\" href=\"include/copy.xsl\"?>\n";
}
$content_type = "application/xml";
}
-else {
+else
+{
$content_type = "text/html";
echo $normal;
}
header("Content-type: $content_type; charset=UTF-8");
-$navlist = array(
- "home" => "Home",
- "media" => "Screenshots",
- "get" => "Get It",
- "help" => "Help",
- "status" => "Status",
- "discuss" => "Discussion",
-);
-
function include_safe($file) {
if (file_exists("include/$file")) {
include($file);
@@ -44,10 +48,13 @@
}
}
-function determineos() {
+function determineos()
+{
global $ua;
- if ($ua == true) {
- switch ($ua['platform']) {
+ if ($ua == true)
+ {
+ switch ($ua['platform'])
+ {
case "Win95":
case "Win98":
case "WinME":
@@ -67,15 +74,14 @@
$os = false;
break;
}
- return $os;
+ return $os;
}
- else { return false; }
+ else
+ return false;
}
-if (!$_GET['page']) {
+if (!$_GET['page'])
$page = "home";
-}
-else {
+else
$page = $_GET['page'];
-}
?>
More information about the quake3-commits
mailing list