mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-30 21:55:31 +00:00
Updated addons MCV stuff
This commit is contained in:
parent
d6a597a1f1
commit
b91ca34894
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
require_once('Archive/Zip.php');
|
||||
|
||||
class AddonsController extends AppController
|
||||
{
|
||||
@ -54,7 +55,7 @@ class AddonsController extends AppController
|
||||
$this->render('add_step1');
|
||||
die();
|
||||
}
|
||||
echo('test');
|
||||
|
||||
//Move temporary file to repository
|
||||
$uploadedFile = $this->data['Addon']['file']['tmp_name'];
|
||||
$tempLocation = REPO_PATH.'/temp/'.$fileName;
|
||||
@ -72,24 +73,15 @@ echo('test');
|
||||
//Search plugins do not have install.rdf to parse
|
||||
if ($this->Amo->addonTypes[$this->data['Addon']['addontype_id']] != 'Search Plugin') {
|
||||
|
||||
//Find install.rdf in the package and get contents
|
||||
$manifestExists = false;
|
||||
//Extract install.rdf from the package
|
||||
$zip = new Archive_Zip($uploadedFile);
|
||||
$extraction = $zip->extract(array('extract_as_string' => true, 'by_name' => array('install.rdf')));
|
||||
|
||||
if ($zip = @zip_open($uploadedFile)) {
|
||||
while ($zipEntry = zip_read($zip)) {
|
||||
if (zip_entry_name($zipEntry) == 'install.rdf') {
|
||||
$manifestExists = true;
|
||||
if (zip_entry_open($zip, $zipEntry, 'r')) {
|
||||
$fileContents = zip_entry_read($zipEntry, zip_entry_filesize($zipEntry));
|
||||
zip_entry_close($zipEntry);
|
||||
}
|
||||
}
|
||||
}
|
||||
zip_close($zip);
|
||||
//Make sure install.rdf is present
|
||||
if ($extraction !== 0) {
|
||||
$fileContents = $extraction[0]['content'];
|
||||
}
|
||||
|
||||
//Make sure install.rdf is there
|
||||
if ($manifestExists !== true) {
|
||||
else {
|
||||
$this->Addon->invalidate('file');
|
||||
$this->set('fileError', 'No install.rdf present');
|
||||
$this->render('add_step1');
|
||||
@ -98,7 +90,7 @@ echo('test');
|
||||
|
||||
//Use Rdf Component to parse install.rdf
|
||||
$manifestData = $this->Rdf->parseInstallManifest($fileContents);
|
||||
|
||||
pr($manifestData);
|
||||
//If the result is a string, it is an error message
|
||||
if (!is_array($manifestData)) {
|
||||
$this->Addon->invalidate('file');
|
||||
@ -144,6 +136,7 @@ echo('test');
|
||||
|
||||
}
|
||||
|
||||
$this->set('manifestData', $manifestData);
|
||||
$this->render('add_step2');
|
||||
}
|
||||
elseif (isset($this->data['Addon']['add_step2'])) {
|
||||
|
19
webtools/remora/app/tests/app/cases/models/addon.test.php
Normal file
19
webtools/remora/app/tests/app/cases/models/addon.test.php
Normal file
@ -0,0 +1,19 @@
|
||||
<?php
|
||||
class AddonsControllerTest extends UnitTestCase {
|
||||
|
||||
//Setup the Addons Controller
|
||||
function setUp() {
|
||||
$this->model =& new Addon();
|
||||
}
|
||||
|
||||
//Make sure there are no PHP errors
|
||||
function testNoErrors() {
|
||||
$this->assertNoErrors();
|
||||
}
|
||||
|
||||
function testAddStepOne() {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
@ -1,5 +1,10 @@
|
||||
<?=$html->formTag('/addons/add/')?>
|
||||
<?=$html->hidden('Addon/add_step2')?>
|
||||
<?=$html->input('Addon/Name')?>
|
||||
<?=$html->tagErrorMsg('Addon/Name', 'Please upload your add-on file.')?>
|
||||
Name: <?=$html->input('Addon/Name', array('value'=>$manifestData['name']['en-US']))?>
|
||||
<?=$html->tagErrorMsg('Addon/Name', 'Please enter the name of your add-on.')?>
|
||||
Homepage: <?=$html->input('Addon/Homepage', array('value'=>$manifestData['homepageURL']))?>
|
||||
<?=$html->tagErrorMsg('Addon/Homepage', 'Please enter the homepage of your add-on.')?><BR />
|
||||
Description: <?=$html->input('Addon/Description', array('value'=>$manifestData['description']['en-US']))?>
|
||||
<?=$html->tagErrorMsg('Addon/Description', 'Please enter a description of your add-on.')?><BR />
|
||||
|
||||
<?=$html->submit()?>
|
||||
|
Loading…
Reference in New Issue
Block a user