diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2008-12-19 15:58:24 (GMT) |
---|---|---|
committer | YOUR NAME <USER@develer.com> | 2009-02-11 19:06:50 (GMT) |
commit | 3b1eac921dfe4effb27cff3df5461ff25e412952 (patch) | |
tree | bfc0bb0e13d1db68c4c6670d09b8e0a51811fd56 | |
parent | dc7e505d8754e18deca3d0660f004c8ae129072a (diff) |
Adapt file uploads to .xo
-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 098e366..22bbd09 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 7234356..7f9e8bf 100644 --- a/site/app/controllers/developers_controller.php +++ b/site/app/controllers/developers_controller.php @@ -223,7 +223,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('This add-on ID (%1$s) already exists in the database. If this is your add-on, you can <a href="%2$s">upload a new version</a>.', $data['Addon']['guid'], $this->url("/developers/versions/add/{$existing[0]['Addon']['id']}"))); @@ -499,6 +499,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; |