diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2008-12-19 15:58:24 (GMT) |
---|---|---|
committer | David Farning <dfarning@gmail.com> | 2009-03-21 00:19:24 (GMT) |
commit | 7a7e32d0a74ec93afb4f6a1ee4fdca535d897e9c (patch) | |
tree | ef92288a088fc757a84a4cc8a3739582684600b8 /site | |
parent | ec21afa0e10ae7c0013a6b9fb064b5685ecbc047 (diff) |
Adapt file uploads to .xo
Diffstat (limited to 'site')
-rw-r--r-- | site/app/controllers/components/developers.php | 2 | ||||
-rw-r--r-- | site/app/controllers/developers_controller.php | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/site/app/controllers/components/developers.php b/site/app/controllers/components/developers.php index 7347ed9..7ccd263 100644 --- a/site/app/controllers/components/developers.php +++ b/site/app/controllers/components/developers.php @@ -624,7 +624,7 @@ class DevelopersComponent extends Object { $filename .= '-'.$data['Version']['version']; - if ($data['Addon']['addontype_id'] != ADDON_SEARCH) { + if (!in_array($data['Addon']['addontype_id'], array(ADDON_SEARCH, ADDON_ACTIVITY))) { $filename .= '-'; $appString = ''; foreach ($data['appversions'] as $appversion) { diff --git a/site/app/controllers/developers_controller.php b/site/app/controllers/developers_controller.php index d389b9d..25968e3 100644 --- a/site/app/controllers/developers_controller.php +++ b/site/app/controllers/developers_controller.php @@ -226,7 +226,7 @@ class DevelopersController extends AppController } // For non-search-engines - if ($data['Addon']['addontype_id'] != ADDON_SEARCH) { + if (!in_array($data['Addon']['addontype_id'], array(ADDON_SEARCH, ADDON_ACTIVITY))) { // Make sure GUID doesn't exist already if ($existing = $this->Addon->findAll("Addon.guid='{$data['Addon']['guid']}'")) { return $this->Error->getJSONforError(sprintf(___('devcp_new_addon_error'), $data['Addon']['guid'], $this->url("/developers/versions/add/{$existing[0]['Addon']['id']}"))); @@ -506,6 +506,13 @@ class DevelopersController extends AppController // Clean search engine data $this->Amo->clean($addon); } + elseif ($addon['Addon']['addontype_id'] == ADDON_ACTIVITY) { + // TODO: Get better information from the activity.info file + $addon['Addon']['name'] = $addon['File']['details']['path']; + $addon['Addon']['summary'] = $addon['File']['details']['path']; + $addon['Version']['version'] = date('Ymd'); + } + $addon['error'] = 0; return $addon; |