www/adium.im 519:cce18b978222: Readded the download/version chec...
commits at adium.im
commits at adium.im
Fri Feb 10 01:05:32 UTC 2012
details: http://hg.adium.im/www/adium.im/rev/cce18b978222
revision: 519:cce18b978222
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Fri Feb 10 00:06:48 2012 +0000
Readded the download/version checking code. Also made some minor cleanup and updates to the PHP as the patch in #11627 suggests. Fixes #11627
Subject: www/adium.im 520:202f8674d8b7: Provide a cleaner approach to handling the donation link, so that a direct url can be provided to anyone wanting to know how to donate.
details: http://hg.adium.im/www/adium.im/rev/202f8674d8b7
revision: 520:202f8674d8b7
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Fri Feb 10 00:30:50 2012 +0000
Provide a cleaner approach to handling the donation link, so that a direct url can be provided to anyone wanting to know how to donate.
Subject: www/adium.im 521:a30f330a9f45: Add a favicon for iOS devices.
details: http://hg.adium.im/www/adium.im/rev/a30f330a9f45
revision: 521:a30f330a9f45
branch: rewrite
author: Paul Wilde <me at paulwilde.co.uk>
date: Fri Feb 10 01:03:24 2012 +0000
Add a favicon for iOS devices.
diffs (199 lines):
diff -r 1e9143bde12a -r a30f330a9f45 apple-touch-icon.png
Binary file apple-touch-icon.png has changed
diff -r 1e9143bde12a -r a30f330a9f45 donate/index.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/donate/index.php Fri Feb 10 01:03:24 2012 +0000
@@ -0,0 +1,31 @@
+<?php
+$paypal_url = 'https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&submit.x=57&submit.y=8&encrypted=-----BEGIN+PKCS7-----%0D%0AMIIHFgYJKoZIhvcNAQcEoIIHBzCCBwMCAQExggEwMIIBLAIBADCBlDCBjjELMAkG%0D%0AA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQw%0D%0AEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UE%0D%0AAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJ%0D%0AKoZIhvcNAQEBBQAEgYAFR5tF%2BRKUV3BS49vJraDG%2BIoWDoZMieUT%2FJJ1Fzjsr511%0D%0Au7hS1F2piJuHuqmm%2F0r8Kf8oaycOo74K3zLmUQ6T6hUS6%2Bh6lZAoIlhI3A1YmqIP%0D%0AdrdY%2FtfKRbWfolDumJ9Mdv%2FzJxPnpdQiTN5K1PMrPYE6GgPWE9WC4V9lqstSmTEL%0D%0AMAkGBSsOAwIaBQAwgZMGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIjtd%2BN9o4ZB6A%0D%0AcIbH8ZjOLmE35xBQ%2F93chtzIcRXHhIQJVpBRCkyJkdTD3libP3F7TgkrLij1DBxg%0D%0AfFlE0V%2FGTk29Ys%2FwsPO7hNs3YSNuSz0HT5F6sa8aXwFtMCE%2FgB1Ha4qdtYY%2BNETJ%0D%0AEETwNMLefjhaBfI%2BnRxl2K2gggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0B%0D%0AAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAY!
DVQQHEw1Nb3Vu%0D%0AdGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9j%0D%0AZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBh%0D%0AbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UE%0D%0ABhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYD%0D%0AVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQI%0D%0AbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZI%0D%0AhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS%2BNdl72T7oKJ4u4uw%2B6aw%0D%0AntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe%2FhJl66%2FRGqrj%0D%0A5rFb08sAABNTzDTiqqNpJeBsYs%2Fc2aiGozptX2RlnBktH%2BSUNpAajW724Nv2Wvhi%0D%0Af6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7%0D%0ABgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYD%0D%0AVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDAS%0D%0ABgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQD%0D%0AFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGF!
sLmNvbYIBADAMBgNV%0D%0AHRMEBTADAQH%2FMA0GCSqGSIb3DQEBBQUAA4GBA!
IFfOlaag
Frl71%2Bjq6OKidbWFSE%2B%0D%0AQ4FqROvdgIONth%2B8kSK%2F%2FY%2F4ihuE4Ymvzn5ceE3S%2FiBSQQMjyvb%2Bs2TWbQYDwcp1%0D%0A29OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa%2Bu4qect%0D%0AsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYD%0D%0AVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFs%0D%0AIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRww%0D%0AGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkq%0D%0AhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNDAzMjUwNDQ0%0D%0AMzRaMCMGCSqGSIb3DQEJBDEWBBRzTAS6zk5cmMeC49IorY8CM%2BkX0TANBgkqhkiG%0D%0A9w0BAQEFAASBgBsyRfMv9mSyoYq00wIB7BmUHFGq5x%2Ffnr8M24XbKjhkyeULk2NC%0D%0As4jbCgaWNg6grvccJtjbvmDskMKt%2BdS%2BEAkeWwm1Zf%2F%2B5u1fMyb5vo1NNcRIs5oq%0D%0A7SvXiLTPRzVqzQdhVs7PoZG0i0RRIb0tMeo1IssZeB2GE5Nsg0D8PwpB%0D%0A-----END+PKCS7-----';
+?>
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta http-equiv="refresh" content="0; url=<?php echo $paypal_url; ?>">
+ <style>
+ p, a {
+ margin: 50px 0;
+ text-align: center;
+ color: #666;
+ font-family: Helvetica Neue, sans-serif;
+ font-weight: 500;
+ color: #666;
+ text-align: center;
+ text-decoration: none;
+ }
+
+ a { color: #222; }
+ a:hover { text-decoration: underline; }
+ </style>
+</head>
+
+<body>
+
+ <p>Redirecting you to PayPal. <a href="<?php echo $paypal_url; ?>">Click here</a> if it takes more than 10 seconds.</p>
+
+</body>
+</html>
\ No newline at end of file
diff -r 1e9143bde12a -r a30f330a9f45 index.php
--- a/index.php Thu Feb 09 22:00:41 2012 +0000
+++ b/index.php Fri Feb 10 01:03:24 2012 +0000
@@ -1,14 +1,111 @@
+<?php
+ $releases = array(
+ '10.6' => array(
+ 'ver' => '1.4.4',
+ 'link' => 'http://download.adium.im/Adium_1.4.4.dmg',
+ 'md5' => '7ef5dd8e764560856f99634f55a23887'
+ ),
+ '10.5.8' => array(
+ 'ver' => '1.4.4',
+ 'link' => 'http://download.adium.im/Adium_1.4.4.dmg',
+ 'md5' => '7ef5dd8e764560856f99634f55a23887'
+ ),
+ '10.4' => array(
+ 'ver' => '1.3.10',
+ 'link' => 'http://download.adium.im/Adium_1.3.10.dmg',
+ 'md5' => '16309a78add9dc7695ccc14079baae10'
+ ),
+ '10.3.9' => array(
+ 'ver' => '1.0.6',
+ 'link' => 'http://download.adium.im/Adium_1.0.6.dmg',
+ 'md5' => '9e19c217f945b7fd82e46d0fa25a5a9b'
+ ),
+ '10.2' => array(
+ 'ver' => '0.89.1',
+ 'link' => 'http://download.adium.im/AdiumX_0.89.1.dmg',
+ 'md5' => '97814d0e0bad4912570201bb332c5595'
+ )
+ );
+
+ if ($_GET['download'] && !$releases[$_GET['download']])
+ $_GET['download'] = '10.6';
+
+ // OS X check
+ $userAgent = $_SERVER['HTTP_USER_AGENT'];
+
+ // Assuming we're working on 10.6 or above unless otherwise proven
+ $os = '10.6';
+
+ if (strstr($userAgent, 'iPhone') || strstr($userAgent, 'iPad') || strstr($userAgent, 'iPod')) {
+ $os = 'iPhone';
+ } else if (strstr($userAgent, 'Mac OS X ')) {
+ // e.g. "Mac OS X 10_6_4;" or "Mac OS X 10.4;"
+
+ // 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)
+ $versionComponents = explode('_', $ver);
+
+ // 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]);
+
+ if ($major == 10) {
+ if ($minor >= 6) {
+ $os = '10.6';
+ } else if ($minor == 5) {
+ if ($micro >= 8) {
+ $os = '10.5.8';
+ } else {
+ $os = '10.4';
+ }
+ } else if ($minor == 4) {
+ $os = '10.4';
+ } else if ($minor == 3) {
+ if ($micro >= 9) {
+ $os = '10.3.9';
+ } else {
+ $os = '10.2';
+ }
+ } else {
+ $os = '10.2'; // 10.3.9 minimum for 1.0
+ }
+ }
+ }
+
+ if ($_GET['forceOS'])
+ $os = $_GET['forceOS'];
+
+ if ($_GET['download'] && $_GET['redirect'] == '301') {
+ header(sprintf('Location: %s', $releases[$_GET['download']['link']]));
+ exit();
+ }
+?>
<!DOCTYPE html>
<html>
<head>
- <title>Adium</title>
+ <title>Adium - Download</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<link rel="stylesheet" href="assets/styles/style.css">
<link rel="stylesheet" href="assets/styles/home.css">
<link rel="stylesheet" href="assets/scripts/fancybox/fancybox.css">
+ <link rel="shortcut icon" href="favicon.ico">
+ <link rel="apple-touch-icon" href="apple-touch-icon.png">
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
<script src="assets/scripts/fancybox/fancybox.min.js"></script>
<script src="assets/scripts/home.js"></script>
@@ -41,12 +138,12 @@
<div id="banner-content">
<h1><span></span>Adium</h1>
- <div class="version">1.4.4</div>
+ <div class="version"><?php echo $releases[$os]['ver']; ?></div>
<h2>Adium is a free instant messaging application for Mac OS X that can connect to MSN,
Google Talk, AIM, Yahoo, ICQ, XMPP, Facebook, Twitter, MobileMe and more.</h2>
<div class="button-container">
- <a class="button download" href="download">Download</a>
+ <a class="button download" href="<?php echo $releases[$os]['link']; ?>">Download</a>
<a class="release-notes" href="release-notes">Release Notes</a>
<a class="source" href="source">Source</a>
</div>
@@ -151,7 +248,7 @@
<section class="support">
<h3>Support</h3>
<ul>
- <li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&submit.x=57&submit.y=8&encrypted=-----BEGIN+PKCS7-----%0D%0AMIIHFgYJKoZIhvcNAQcEoIIHBzCCBwMCAQExggEwMIIBLAIBADCBlDCBjjELMAkG%0D%0AA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQw%0D%0AEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UE%0D%0AAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJ%0D%0AKoZIhvcNAQEBBQAEgYAFR5tF%2BRKUV3BS49vJraDG%2BIoWDoZMieUT%2FJJ1Fzjsr511%0D%0Au7hS1F2piJuHuqmm%2F0r8Kf8oaycOo74K3zLmUQ6T6hUS6%2Bh6lZAoIlhI3A1YmqIP%0D%0AdrdY%2FtfKRbWfolDumJ9Mdv%2FzJxPnpdQiTN5K1PMrPYE6GgPWE9WC4V9lqstSmTEL%0D%0AMAkGBSsOAwIaBQAwgZMGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIjtd%2BN9o4ZB6A%0D%0AcIbH8ZjOLmE35xBQ%2F93chtzIcRXHhIQJVpBRCkyJkdTD3libP3F7TgkrLij1DBxg%0D%0AfFlE0V%2FGTk29Ys%2FwsPO7hNs3YSNuSz0HT5F6sa8aXwFtMCE%2FgB1Ha4qdtYY%2BNETJ%0D%0AEETwNMLefjhaBfI%2BnRxl2K2gggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0B%0D%0AAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYw!
FAYDVQQHEw1Nb3Vu%0D%0AdGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9j%0D%0AZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBh%0D%0AbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UE%0D%0ABhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYD%0D%0AVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQI%0D%0AbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZI%0D%0AhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS%2BNdl72T7oKJ4u4uw%2B6aw%0D%0AntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe%2FhJl66%2FRGqrj%0D%0A5rFb08sAABNTzDTiqqNpJeBsYs%2Fc2aiGozptX2RlnBktH%2BSUNpAajW724Nv2Wvhi%0D%0Af6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7%0D%0ABgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYD%0D%0AVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDAS%0D%0ABgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQD%0D%0AFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5!
cGFsLmNvbYIBADAMBgNV%0D%0AHRMEBTADAQH%2FMA0GCSqGSIb3DQEBBQUAA4!
GBAIFfOl
aagFrl71%2Bjq6OKidbWFSE%2B%0D%0AQ4FqROvdgIONth%2B8kSK%2F%2FY%2F4ihuE4Ymvzn5ceE3S%2FiBSQQMjyvb%2Bs2TWbQYDwcp1%0D%0A29OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa%2Bu4qect%0D%0AsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYD%0D%0AVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFs%0D%0AIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRww%0D%0AGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkq%0D%0AhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNDAzMjUwNDQ0%0D%0AMzRaMCMGCSqGSIb3DQEJBDEWBBRzTAS6zk5cmMeC49IorY8CM%2BkX0TANBgkqhkiG%0D%0A9w0BAQEFAASBgBsyRfMv9mSyoYq00wIB7BmUHFGq5x%2Ffnr8M24XbKjhkyeULk2NC%0D%0As4jbCgaWNg6grvccJtjbvmDskMKt%2BdS%2BEAkeWwm1Zf%2F%2B5u1fMyb5vo1NNcRIs5oq%0D%0A7SvXiLTPRzVqzQdhVs7PoZG0i0RRIb0tMeo1IssZeB2GE5Nsg0D8PwpB%0D%0A-----END+PKCS7-----">Donate</a></li>
+ <li><a href="donate">Donate</a></li>
<li><a href="http://trac.adium.im/wiki/Development">Contribute</a></li>
<li><a href="http://forums.cocoaforge.com/viewforum.php?f=13">Forum</a></li>
<li><a href="http://trac.adium.im/wiki/AdiumIRCChat">IRC Chat</a></li>
diff -r 1e9143bde12a -r a30f330a9f45 scripts/slogan.php
--- a/scripts/slogan.php Thu Feb 09 22:00:41 2012 +0000
+++ b/scripts/slogan.php Fri Feb 10 01:03:24 2012 +0000
@@ -4,7 +4,7 @@
//
function RandomSlogan()
{
- $sloganArray = file("http://www.adium.im/scripts/slogans.txt");
+ $sloganArray = file("slogans.txt", true);
$slogan = "#";
$tries = 0;
@@ -14,7 +14,7 @@
$slogan = $sloganArray[$index];
//Just incase something goes very wrong (5 tries max)
- $tries = $tries + 1;
+ $tries++;
if($tries > 5) return("");
}
More information about the commits
mailing list