diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2009-11-23 15:16:06 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-11-23 15:16:06 (GMT) |
| commit | b0be6ba1f0911cea8e91d4ce0ae5c17777f467cc (patch) | |
| tree | edb02ae78a26606821d1880020098863d20c25b4 | |
| parent | 175a0ba0da8cee624b6857515f9c447a5da90331 (diff) | |
Use SITE_SUGAR_STABLE if useragent string doesn't contain sugar version
| -rw-r--r-- | aslo/config.php | 1 | ||||
| -rw-r--r-- | site/app/models/file.php | 6 | ||||
| -rw-r--r-- | site/app/models/version.php | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/aslo/config.php b/aslo/config.php index c628b1f..9f7d565 100644 --- a/aslo/config.php +++ b/aslo/config.php @@ -263,6 +263,7 @@ define('SITE_MIME', 'application/vnd.olpc-sugar'); // application/x-xpinstall define('SITE_ORG', 'Sugar Labs'); // Mozilla define('SSITE_URL', 'https://activities.sugarlabs.org'); define('HELP_IRC', '#Sugar on irc.freenode.nt'); +define('SITE_SUGAR_STABLE', '0.86'); define('SITE_APP', 1); // 1 diff --git a/site/app/models/file.php b/site/app/models/file.php index 62c05ba..1041f5d 100644 --- a/site/app/models/file.php +++ b/site/app/models/file.php @@ -86,16 +86,16 @@ class File extends AppModel // Platform WHERE if necessary $platform = !empty($platform_id) ? " AND (File.platform_id = ".PLATFORM_ALL." OR File.platform_id = {$platform_id})" : ''; - if (preg_match('/OLPC\/0\.([^-]*)-/', $_SERVER['HTTP_USER_AGENT'], $matches)) { + if (preg_match('/OLPC\/0\.([^-]*)-/', env('HTTP_USER_AGENT'), $matches)) { if (floatval($matches[1]) <= 4.6) $sp = '0.82'; else $sp = '0.84'; } else { - if (preg_match('/Sugar Labs\/([0-9]+)\.([0-9]+)/', $_SERVER['HTTP_USER_AGENT'], $matches)) + if (preg_match('/Sugar Labs\/([0-9]+)\.([0-9]+)/', env('HTTP_USER_AGENT'), $matches)) $sp = $matches[1].'.'.$matches[2]; else - $sp = '0.84'; + $sp = SITE_SUGAR_STABLE; } $sql = " diff --git a/site/app/models/version.php b/site/app/models/version.php index 5bb11a0..f19c0b9 100644 --- a/site/app/models/version.php +++ b/site/app/models/version.php @@ -137,16 +137,16 @@ class Version extends AppModel if (!is_array($status)) $status = array($status); $status_sql = implode(',',$status); - if (preg_match('/OLPC\/0\.([^-]*)-/', $_SERVER['HTTP_USER_AGENT'], $matches)) { + if (preg_match('/OLPC\/0\.([^-]*)-/', env('HTTP_USER_AGENT'), $matches)) { if (floatval($matches[1]) <= 4.6) $sp = '0.82'; else $sp = '0.84'; } else { - if (preg_match('/Sugar Labs\/([0-9]+)\.([0-9]+)/', $_SERVER['HTTP_USER_AGENT'], $matches)) + if (preg_match('/Sugar Labs\/([0-9]+)\.([0-9]+)/', env('HTTP_USER_AGENT'), $matches)) $sp = $matches[1].'.'.$matches[2]; else - $sp = '0.84'; + $sp = SITE_SUGAR_STABLE; } $sql = " |