diff options
Diffstat (limited to 'site/app/controllers/files_controller.php')
| -rw-r--r-- | site/app/controllers/files_controller.php | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/site/app/controllers/files_controller.php b/site/app/controllers/files_controller.php index 694085d..e662400 100644 --- a/site/app/controllers/files_controller.php +++ b/site/app/controllers/files_controller.php @@ -72,7 +72,7 @@ class FilesController extends AppController $this->File->id = $file_id; if (!$file = $this->File->read()) { - $this->flash(_('error_file_notfound'), '/'); + $this->flash($file_id, '/'); return; } $this->Addon->id = $file['Version']['addon_id']; @@ -85,7 +85,7 @@ class FilesController extends AppController } $addontype = $addon['Addon']['addontype_id']; - $startfile = 'install.rdf'; + $startfile = 'install.rdf2'; $path = REPO_PATH.'/'.$this->Addon->id.'/'.$file['File']['filename']; if (!file_exists($path)) { @@ -116,14 +116,12 @@ class FilesController extends AppController foreach ($contents as $content) { $isJar = false; - if ($addontype == ADDON_EXTENSION) { - $paths = split("/", $content['filename'], 2); - $pathinfo = pathinfo($path); - if ($pathinfo['extension'] == '.xo') - $startfile = $paths[0].'/activity/activity.info'; - else - $startfile = $paths[0].'/library/library.info'; - } + // we are sugar + $paths = split("/", $content['filename'], 2); + if ($addontype == ADDON_CONTENT) + $startfile = $paths[0].'/library/library.info'; + else + $startfile = $paths[0].'/activity/activity.info'; if (substr($content['filename'], strrpos($content['filename'], '.')) == '.jar') { $content['folder'] = 1; @@ -169,7 +167,7 @@ class FilesController extends AppController $contents = $this->_get_contents($path, $file, $addontype); if (is_bool($contents) && $contents == false) { - $this->flash(_('error_file_notfound'), '/'); + $this->flash($file, '/'); return; } $this->publish('filename', $file); |