www/adium.im 902:5f43161de563: This hopefully makes indentation ...
commits at adium.im
commits at adium.im
Sat Sep 3 11:37:04 UTC 2016
details: http://hg.adium.im/www/adium.im/rev/5f43161de563
revision: 902:5f43161de563
branch: adiumx.com
author: Robert Vehse <robertvehse at fastmail.fm>
date: Sat Sep 03 13:36:20 2016 +0200
This hopefully makes indentation consistent.
diffs (202 lines):
diff -r 928d4349ed76 -r 5f43161de563 index.php
--- a/index.php Sat Sep 03 11:27:35 2016 +0200
+++ b/index.php Sat Sep 03 13:36:20 2016 +0200
@@ -4,7 +4,7 @@
$downloadText["10.6.8"] = "1.5.10";
$downloadLink["10.6.8"] = "https://adiumx.cachefly.net/Adium_1.5.10.dmg";
-
+
$downloadText["10.5.8"] = "1.4.5";
$downloadLink["10.5.8"] = "https://adiumx.cachefly.net/Adium_1.4.5.dmg";
@@ -25,7 +25,7 @@
// Assuming we're working on 10.6 unless otherwise proven.
$operatingSystem = "10.7.5";
-
+
if (strstr($userAgent, "iPhone") || strstr($userAgent, "iPad") || strstr($userAgent, "iPod")) {
$operatingSystem = "iPhone";
} else if (strstr($userAgent, "Mac OS X ")) {
@@ -33,12 +33,12 @@
// Figure out where the Mac OS X version starts
$verStart_pos = strpos($userAgent, "Mac OS X ") + strlen("Mac OS X ");
-
+
// Figure out where the Mac OS X version ends, which is the first semicolon after 'Mac OS X '
$verToEnd = substr($userAgent, $verStart_pos);
$verEnd_pos = strpos($verToEnd, ";");
-
+
$ver = substr($verToEnd, 0, $verEnd_pos);
//First, look for the form 10_6_4, which is what Safari sends (at least on Mac OS X 10.6)
@@ -47,7 +47,7 @@
//If that didn't explode into multiple components, try the form 10.4.3, which is what Firefox sends
if (count($versionComponents) == 1)
$versionComponents = explode(".", $ver);
-
+
$major = intval($versionComponents[0]);
$minor = intval($versionComponents[1]);
$micro = intval($versionComponents[2]);
@@ -58,28 +58,28 @@
} else if ($minor >= 6) {
$operatingSystem = "10.6.8";
} else if ($minor == 5) {
- if ($micro >= 8) {
+ if ($micro >= 8) {
$operatingSystem = "10.5.8";
} else {
- $operatingSystem = "10.4";
+ $operatingSystem = "10.4";
}
} else if ($minor == 4) {
$operatingSystem = "10.4";
} else if ($minor == 3) {
- if ($micro >= 9) {
+ if ($micro >= 9) {
$operatingSystem = "10.3.9";
} else {
- $operatingSystem = "10.2";
+ $operatingSystem = "10.2";
}
} else {
$operatingSystem = "10.2"; // 10.3.9 minimum for 1.0
}
- }
+ }
}
-
+
if ($_GET['forceOS'] && array_key_exists($_GET['forceOS'], $downloadLink))
$operatingSystem = $_GET['forceOS'];
-
+
if ($_GET['download'] && $_GET['redirect'] == "301") {
header(sprintf("Location: %s", $downloadLink[$_GET['download']]));
exit();
@@ -105,11 +105,11 @@
<a href="/">Adium</a>
</div>
<div id="navcontainer">
- <a class="navtabcurrent" href="https://adium.im/">Download</a>
- <a class="navtab" href="https://adium.im/about/">About</a>
- <a class="navtab" href="https://adium.im/blog/">Blog</a>
+ <a class="navtabcurrent" href="https://adium.im/">Download</a>
+ <a class="navtab" href="https://adium.im/about/">About</a>
+ <a class="navtab" href="https://adium.im/blog/">Blog</a>
<a class="navtab" href="https://adium.im/help/">Help</a>
- <a class="navtab" href="https://trac.adium.im">Development</a>
+ <a class="navtab" href="https://trac.adium.im">Development</a>
<a class="navtab" href="https://adium.spreadshirt.com">Merchandise</a>
<a class="navtab" href="http://www.adiumxtras.com/">Xtras</a>
</div>
@@ -146,51 +146,50 @@
<a href="https://trac.adium.im/wiki/Development">Contributing to Adium</a> | <a href="http://forum.adium.im">Adium Forum</a> | <a href="https://trac.adium.im/wiki/AdiumIRCChat">Adium IRC Chat</a>
</div>
<?php } else if (!$_GET['download']) { ?>
- <div class="download">
- <div class="downloadInfo">
- <a href="<?=$downloadLink[$operatingSystem]?>"><img class="downloadicon" src="images/logo.png" alt="Download"></a><br>
- </div>
- <a href="<?=$downloadLink[$operatingSystem]?>"><span class="downloadlink">Download Adium <?=$downloadText[$operatingSystem]?></span></a>
+ <div class="download">
+ <div class="downloadInfo">
+ <a href="<?=$downloadLink[$operatingSystem]?>"><img class="downloadicon" src="images/logo.png" alt="Download"></a><br>
</div>
- <?php if ($operatingSystem != "10.7.5") { ?>
- <div class="downloadSub" style="color:red;">If you're using OS X 10.7.5 or above, you should get <a href="/?download=10.7.5">Adium <?=$downloadText["10.7.5"]?></a>.</div>
- <?php } ?>
+ <a href="<?=$downloadLink[$operatingSystem]?>"><span class="downloadlink">Download Adium <?=$downloadText[$operatingSystem]?></span></a>
+ </div>
+ <?php if ($operatingSystem != "10.7.5") { ?>
+ <div class="downloadSub" style="color:red;">If you're using OS X 10.7.5 or above, you should get <a href="/?download=10.7.5">Adium <?=$downloadText["10.7.5"]?></a>.</div>
+ <?php } ?>
- <div class="downloadSub">
- <a href="https://trac.adium.im/wiki/AdiumVersionHistory" class="downloadInfo">Version History</a> - <a href="https://trac.adium.im/wiki/GettingAdiumSource" class="downloadInfo">Source</a><br>
- </div>
- <div class="overview">
- Adium is a free instant messaging application for Mac OS X that can connect to AIM, MSN, XMPP (Jabber), Yahoo, and more. <a href="https://www.adium.im/about">Learn more about Adium...</a>
- </div>
- <div id="services">
- <a title="AOL Instant Messenger" href="http://www.aim.com/"><img src="images/services/icon-aim.png" alt="AIM Icon"></a>
- <a title="Windows Live Messenger (MSN)" href="http://www.msn.com/"><img src="images/services/icon-msn.png" alt="MSN Icon"></a>
- <a title="Yahoo Messenger" href="http://messenger.yahoo.com/"><img src="images/services/icon-yahoo.png" alt="Yahoo Icon"></a>
- <a title="Google Talk (XMPP Compatible)" href="http://www.google.com/talk/"><img src="images/services/icon-googletalk.png" alt="Google Talk Icon"></a>
- <a title="Twitter" href="http://twitter.com/"><img src="images/services/icon-twitter.png" alt="Twitter Icon"></a>
- <a title="Facebook Chat" href="http://www.facebook.com"><img src="images/services/icon-facebook.png" alt="Facebook Chat Icon"></a>
- <a title="XMPP (Jabber)" href="http://xmpp.org/"><img src="images/services/icon-xmpp.png" alt="XMPP Icon"></a>
- <a title="Bonjour" href="http://www.apple.com/bonjour"><img src="images/services/icon-bonjour.png" alt="Bonjour Icon"></a>
- <a title="IRC" href="http://en.wikipedia.org/wiki/Internet_Relay_Chat"><img src="images/services/icon-irc.png" alt="IRC Icon"></a>
- <a title="ICQ (AIM Compatible)" href="http://www.icq.com/"><img src="images/services/icon-icq.png" alt="ICQ Icon"></a>
- <a title="Apple MobileMe (AIM Compatible)" href="http://www.me.com/"><img src="images/services/icon-mobileme.png" alt="MobileMe Icon"></a>
- <a title="Live Journal Talk (XMPP Compatible)" href="http://www.livejournal.com/chat/"><img src="images/services/icon-livejournal.png" alt="LJ Talk Icon"></a>
- <a title="Lotus Sametime" href="https://trac.adium.im/wiki/Sametime"><img src="images/services/icon-sametime.png" alt="Lotus Sametime Icon"></a>
- <a title="Novell Groupwise" href="http://www.novell.com/products/groupwise/"><img src="images/services/icon-groupwise.png" alt="Novell Groupwise Icon"></a>
- <a title="Gadu-Gadu" href="http://www.gadu-gadu.pl/"><img src="images/services/icon-gadu-gadu.png" alt="Gadu-Gadu Icon"></a>
- </div>
- <div class="overview">
- <a href="https://trac.adium.im/wiki/Development">Contributing to Adium</a> | <a href="http://forum.adium.im">Adium Forum</a> | <a href="https://trac.adium.im/wiki/AdiumIRCChat">Adium IRC Chat</a>
- </div>
- <div class="oldversionwarning">
- Adium <?=$downloadText["10.7.5"]?> requires OS X 10.7.5 or newer.<br />
- For older versions of OS X, see <a href="https://trac.adium.im/wiki/PreviousReleases">the older releases page</a>.
- </div>
+ <div class="downloadSub">
+ <a href="https://trac.adium.im/wiki/AdiumVersionHistory" class="downloadInfo">Version History</a> - <a href="https://trac.adium.im/wiki/GettingAdiumSource" class="downloadInfo">Source</a><br>
+ </div>
+ <div class="overview">
+ Adium is a free instant messaging application for Mac OS X that can connect to AIM, MSN, XMPP (Jabber), Yahoo, and more. <a href="https://www.adium.im/about">Learn more about Adium...</a>
+ </div>
+ <div id="services">
+ <a title="AOL Instant Messenger" href="http://www.aim.com/"><img src="images/services/icon-aim.png" alt="AIM Icon"></a>
+ <a title="Windows Live Messenger (MSN)" href="http://www.msn.com/"><img src="images/services/icon-msn.png" alt="MSN Icon"></a>
+ <a title="Yahoo Messenger" href="http://messenger.yahoo.com/"><img src="images/services/icon-yahoo.png" alt="Yahoo Icon"></a>
+ <a title="Google Talk (XMPP Compatible)" href="http://www.google.com/talk/"><img src="images/services/icon-googletalk.png" alt="Google Talk Icon"></a>
+ <a title="Twitter" href="http://twitter.com/"><img src="images/services/icon-twitter.png" alt="Twitter Icon"></a>
+ <a title="Facebook Chat" href="http://www.facebook.com"><img src="images/services/icon-facebook.png" alt="Facebook Chat Icon"></a>
+ <a title="XMPP (Jabber)" href="http://xmpp.org/"><img src="images/services/icon-xmpp.png" alt="XMPP Icon"></a>
+ <a title="Bonjour" href="http://www.apple.com/bonjour"><img src="images/services/icon-bonjour.png" alt="Bonjour Icon"></a>
+ <a title="IRC" href="http://en.wikipedia.org/wiki/Internet_Relay_Chat"><img src="images/services/icon-irc.png" alt="IRC Icon"></a>
+ <a title="ICQ (AIM Compatible)" href="http://www.icq.com/"><img src="images/services/icon-icq.png" alt="ICQ Icon"></a>
+ <a title="Apple MobileMe (AIM Compatible)" href="http://www.me.com/"><img src="images/services/icon-mobileme.png" alt="MobileMe Icon"></a>
+ <a title="Live Journal Talk (XMPP Compatible)" href="http://www.livejournal.com/chat/"><img src="images/services/icon-livejournal.png" alt="LJ Talk Icon"></a>
+ <a title="Lotus Sametime" href="https://trac.adium.im/wiki/Sametime"><img src="images/services/icon-sametime.png" alt="Lotus Sametime Icon"></a>
+ <a title="Novell Groupwise" href="http://www.novell.com/products/groupwise/"><img src="images/services/icon-groupwise.png" alt="Novell Groupwise Icon"></a>
+ <a title="Gadu-Gadu" href="http://www.gadu-gadu.pl/"><img src="images/services/icon-gadu-gadu.png" alt="Gadu-Gadu Icon"></a>
+ </div>
+ <div class="overview">
+ <a href="https://trac.adium.im/wiki/Development">Contributing to Adium</a> | <a href="http://forum.adium.im">Adium Forum</a> | <a href="https://trac.adium.im/wiki/AdiumIRCChat">Adium IRC Chat</a>
+ </div>
+ <div class="oldversionwarning">
+ Adium <?=$downloadText["10.7.5"]?> requires OS X 10.7.5 or newer.<br />
+ For older versions of OS X, see <a href="https://trac.adium.im/wiki/PreviousReleases">the older releases page</a>.
</div>
<?php } else if ($_GET['download']) { ?>
<div class="download">
<img class="downloadicon" src="images/logo.png" border="0" alt="Download"/><br />
- Thanks for downloading Adium!
+ Thanks for downloading Adium!
</div>
<div class="downloadSub">
<a href="<?=$downloadLink[$_GET['download']]?>" class="downloadInfo">Your download should start within seconds. If it doesn't, click here.</a>
@@ -200,10 +199,10 @@
</div>
<?php } ?>
<?if ($operatingSystem == "iPhone") { ?><div id="footer"><?php } else { ?><div id="footerfixed"><?php } ?>
- <div class="donate">
- <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7LLXHMM3BEA8C">
- Donate to Adium</a>
- </div>
+ <div class="donate">
+ <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7LLXHMM3BEA8C">
+ Donate to Adium</a>
+ </div>
<div id="powered" style="opacity: 100%">
<!-- <SCRIPT type='text/javascript' language='JavaScript' src='http://www.ohloh.net/projects/3245;badge_js'></SCRIPT> -->
<a href="https://developer.apple.com/wwdc/events/awards/"><img class="libgaim" src="/images/ada.png" alt="Apple design awards 05 special mention"></a>
More information about the commits
mailing list