[Scummvm-cvs-logs] scummvm-web master -> 51c6d597c2e0f00f188eacbc8ea51d34ee3c80a2

sev- sev at scummvm.org
Sat Mar 5 22:43:56 CET 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
97cd678d4a WEB: Remove extra item as default Mac binary
51c6d597c2 WEB: Fix description for the recommended binary download


Commit: 97cd678d4a0460a296c6d1e3f6ab39b8efce4cd5
    https://github.com/scummvm/scummvm-web/commit/97cd678d4a0460a296c6d1e3f6ab39b8efce4cd5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-05T22:43:34+01:00

Commit Message:
WEB: Remove extra item as default Mac binary

Changed paths:
    data/downloads.xml



diff --git a/data/downloads.xml b/data/downloads.xml
index c7b4507..f4900a6 100755
--- a/data/downloads.xml
+++ b/data/downloads.xml
@@ -527,7 +527,6 @@
 					<category_icon>catpl-macos-universal.png</category_icon>
 					<url>1.7.0/scummvm-1.7.0-macosx.dmg</url>
 					<name>1.7.0 Mac OS X Universal Disk Image</name>
-					<user_agent>Macintosh</user_agent>
 				</file>
 				<file>
 					<category_icon>catpl-ps2.png</category_icon>


Commit: 51c6d597c2e0f00f188eacbc8ea51d34ee3c80a2
    https://github.com/scummvm/scummvm-web/commit/51c6d597c2e0f00f188eacbc8ea51d34ee3c80a2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-05T22:43:34+01:00

Commit Message:
WEB: Fix description for the recommended binary download

Changed paths:
    include/Pages/DownloadsPage.php



diff --git a/include/Pages/DownloadsPage.php b/include/Pages/DownloadsPage.php
index e3f69ee..2cd95b3 100644
--- a/include/Pages/DownloadsPage.php
+++ b/include/Pages/DownloadsPage.php
@@ -21,10 +21,21 @@ class DownloadsPage extends Controller {
 
 					if ($userAgent != "") {
 						$url = str_replace('{$release}', RELEASE, $curItem->getURL());
-						sscanf($url, "http://www.scummvm.org/frs/scummvm/scummvm-%s", $versionStr);
-						$version = substr($versionStr, 0, strpos($versionStr, "-"));
+						sscanf($url, "/frs/scummvm/%s", $versionStr);
+						$version = substr($versionStr, 0, strpos($versionStr, "/"));
 						$name = strip_tags($curItem->getName());
-						$js .= "\t\t\t'{$userAgent}':\t{ 'os':\t'{$name}', 'ver':\t'{$version}', 'desc':\t'{$curItem->getExtraInfo()}', 'url':\t'{$url}'},\n";
+						$data = $curItem->getExtraInfo();
+						if (is_array($data)) {
+							$extra_text = $data['size'] . " ";
+							if ($data['ext'] == '.exe')
+								$extra_text = $extra_path + 'Win32 ';
+
+							$extra_text .= $data['ext'] . " " . $data['msg'];
+						} else {
+							$extra_text = $data;
+						}
+
+						$js .= "\t\t\t'{$userAgent}':\t{ 'os':\t'{$name}', 'ver':\t'{$version}', 'desc':\t'{$extra_text}', 'url':\t'{$url}'},\n";
 					}
 				}
 			}






More information about the Scummvm-git-logs mailing list