diff --git a/recess/recess/Recess.class.php b/recess/recess/Recess.class.php
index c91fce7..a359d20 100644
--- a/recess/recess/Recess.class.php
+++ b/recess/recess/Recess.class.php
@@ -44,7 +44,7 @@ public static function main(Request $request, IPolicy $policy, array $apps, RtNo
if(isset($response->context)) {
$forwardRequest->get = $response->context;
}
-
+ $forwardRequest->accepts = $response->request->accepts;
$forwardRequest->cookies = $response->request->cookies;
$forwardRequest->username = $response->request->username;
$forwardRequest->password = $response->request->password;
diff --git a/recess/recess/apps/tools/controllers/RecessToolsAppsController.class.php b/recess/recess/apps/tools/controllers/RecessToolsAppsController.class.php
index cc7d5f8..1fb6d4e 100644
--- a/recess/recess/apps/tools/controllers/RecessToolsAppsController.class.php
+++ b/recess/recess/apps/tools/controllers/RecessToolsAppsController.class.php
@@ -96,7 +96,7 @@ private function generateApp() {
$this->messages[] = $this->tryGeneratingFile('Style Part', $this->application->codeTemplatesDir . 'scaffolding/views/parts/style.part.template.php', $appDir . '/views/parts/style.part.php', $appReplacements);
$this->messages[] = $this->tryCreatingDirectory($appDir . '/views/home', 'home views');
$this->messages[] = $this->tryCreatingDirectory($appDir . '/views/layouts', 'layouts');
- $this->messages[] = $this->tryGeneratingFile('Home Template', $this->application->codeTemplatesDir . 'scaffolding/views/home/index.template.php', $appDir . '/views/home/index.php', $appReplacements);
+ $this->messages[] = $this->tryGeneratingFile('Home Template', $this->application->codeTemplatesDir . 'scaffolding/views/home/index.template.php', $appDir . '/views/home/index.html.php', $appReplacements);
$this->messages[] = $this->tryGeneratingFile('Master Layout', $this->application->codeTemplatesDir . 'scaffolding/views/master.layout.template.php', $appDir . '/views/layouts/master.layout.php', $appReplacements);
$this->messages[] = $this->tryCreatingDirectory($appDir . '/public', 'public');
@@ -345,10 +345,10 @@ public function generateScaffolding($app, $model) {
$viewsDir = $app->viewsDir . $replacements['viewsPrefix'] . '/';
$this->messages[] = $this->tryCreatingDirectory($viewsDir, $model . ' views dir');
$this->messages[] = $this->tryGeneratingFile('resource layout', $this->application->codeTemplatesDir . 'scaffolding/views/resource/resource.layout.template.php', $viewsDir . '../layouts/' . $replacements['viewsPrefix'] . '.layout.php', $replacements);
- $this->messages[] = $this->tryGeneratingFile('index view', $this->application->codeTemplatesDir . 'scaffolding/views/resource/index.template.php', $viewsDir . 'index.php', $replacements);
- $this->messages[] = $this->tryGeneratingFile('editForm view', $this->application->codeTemplatesDir . 'scaffolding/views/resource/editForm.template.php', $viewsDir . 'editForm.php', $replacements, true);
+ $this->messages[] = $this->tryGeneratingFile('index view', $this->application->codeTemplatesDir . 'scaffolding/views/resource/index.template.php', $viewsDir . 'index.html.php', $replacements);
+ $this->messages[] = $this->tryGeneratingFile('editForm view', $this->application->codeTemplatesDir . 'scaffolding/views/resource/editForm.template.php', $viewsDir . 'editForm.html.php', $replacements, true);
$this->messages[] = $this->tryGeneratingFile('form part', $this->application->codeTemplatesDir . 'scaffolding/views/resource/form.part.template.php', $viewsDir . 'form.part.php', $replacements, true);
- $this->messages[] = $this->tryGeneratingFile('static details', $this->application->codeTemplatesDir . 'scaffolding/views/resource/details.template.php', $viewsDir . 'details.php', $replacements);
+ $this->messages[] = $this->tryGeneratingFile('static details', $this->application->codeTemplatesDir . 'scaffolding/views/resource/details.template.php', $viewsDir . 'details.html.php', $replacements);
$this->messages[] = $this->tryGeneratingFile('details part', $this->application->codeTemplatesDir . 'scaffolding/views/resource/details.part.template.php', $viewsDir . 'details.part.php', $replacements);
$this->appName = get_class($app);
$this->modelName = $model;
diff --git a/recess/recess/apps/tools/views/apps/app.php b/recess/recess/apps/tools/views/apps/app.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/app.php
rename to recess/recess/apps/tools/views/apps/app.html.php
diff --git a/recess/recess/apps/tools/views/apps/createModel.php b/recess/recess/apps/tools/views/apps/createModel.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/createModel.php
rename to recess/recess/apps/tools/views/apps/createModel.html.php
diff --git a/recess/recess/apps/tools/views/apps/createModelComplete.php b/recess/recess/apps/tools/views/apps/createModelComplete.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/createModelComplete.php
rename to recess/recess/apps/tools/views/apps/createModelComplete.html.php
diff --git a/recess/recess/apps/tools/views/apps/genController.php b/recess/recess/apps/tools/views/apps/genController.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/genController.php
rename to recess/recess/apps/tools/views/apps/genController.html.php
diff --git a/recess/recess/apps/tools/views/apps/generateScaffolding.php b/recess/recess/apps/tools/views/apps/generateScaffolding.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/generateScaffolding.php
rename to recess/recess/apps/tools/views/apps/generateScaffolding.html.php
diff --git a/recess/recess/apps/tools/views/apps/home.php b/recess/recess/apps/tools/views/apps/home.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/home.php
rename to recess/recess/apps/tools/views/apps/home.html.php
diff --git a/recess/recess/apps/tools/views/apps/newAppInstructions.php b/recess/recess/apps/tools/views/apps/newAppInstructions.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/newAppInstructions.php
rename to recess/recess/apps/tools/views/apps/newAppInstructions.html.php
diff --git a/recess/recess/apps/tools/views/apps/newAppWizard.php b/recess/recess/apps/tools/views/apps/newAppWizard.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/newAppWizard.php
rename to recess/recess/apps/tools/views/apps/newAppWizard.html.php
diff --git a/recess/recess/apps/tools/views/apps/newAppWizardComplete.php b/recess/recess/apps/tools/views/apps/newAppWizardComplete.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/newAppWizardComplete.php
rename to recess/recess/apps/tools/views/apps/newAppWizardComplete.html.php
diff --git a/recess/recess/apps/tools/views/apps/newAppWizardStep2.php b/recess/recess/apps/tools/views/apps/newAppWizardStep2.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/newAppWizardStep2.php
rename to recess/recess/apps/tools/views/apps/newAppWizardStep2.html.php
diff --git a/recess/recess/apps/tools/views/apps/newModelComplete.php b/recess/recess/apps/tools/views/apps/newModelComplete.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/newModelComplete.php
rename to recess/recess/apps/tools/views/apps/newModelComplete.html.php
diff --git a/recess/recess/apps/tools/views/apps/uninstall.php b/recess/recess/apps/tools/views/apps/uninstall.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/apps/uninstall.php
rename to recess/recess/apps/tools/views/apps/uninstall.html.php
diff --git a/recess/recess/apps/tools/views/code/byClass.php b/recess/recess/apps/tools/views/code/byClass.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/code/byClass.php
rename to recess/recess/apps/tools/views/code/byClass.html.php
diff --git a/recess/recess/apps/tools/views/code/byPackage.php b/recess/recess/apps/tools/views/code/byPackage.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/code/byPackage.php
rename to recess/recess/apps/tools/views/code/byPackage.html.php
diff --git a/recess/recess/apps/tools/views/code/classInfo.php b/recess/recess/apps/tools/views/code/classInfo.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/code/classInfo.php
rename to recess/recess/apps/tools/views/code/classInfo.html.php
diff --git a/recess/recess/apps/tools/views/code/home.php b/recess/recess/apps/tools/views/code/home.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/code/home.php
rename to recess/recess/apps/tools/views/code/home.html.php
diff --git a/recess/recess/apps/tools/views/code/packageInfo.php b/recess/recess/apps/tools/views/code/packageInfo.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/code/packageInfo.php
rename to recess/recess/apps/tools/views/code/packageInfo.html.php
diff --git a/recess/recess/apps/tools/views/database/dropTable.php b/recess/recess/apps/tools/views/database/dropTable.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/database/dropTable.php
rename to recess/recess/apps/tools/views/database/dropTable.html.php
diff --git a/recess/recess/apps/tools/views/database/emptyTable.php b/recess/recess/apps/tools/views/database/emptyTable.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/database/emptyTable.php
rename to recess/recess/apps/tools/views/database/emptyTable.html.php
diff --git a/recess/recess/apps/tools/views/database/home.php b/recess/recess/apps/tools/views/database/home.html.php
similarity index 88%
rename from recess/recess/apps/tools/views/database/home.php
rename to recess/recess/apps/tools/views/database/home.html.php
index dbe1fdf..c7382fb 100644
--- a/recess/recess/apps/tools/views/database/home.php
+++ b/recess/recess/apps/tools/views/database/home.html.php
@@ -7,14 +7,13 @@
$source): ?>
()
diff --git a/recess/recess/apps/tools/views/database/newSource.php b/recess/recess/apps/tools/views/database/newSource.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/database/newSource.php
rename to recess/recess/apps/tools/views/database/newSource.html.php
diff --git a/recess/recess/apps/tools/views/database/showTable.php b/recess/recess/apps/tools/views/database/showTable.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/database/showTable.php
rename to recess/recess/apps/tools/views/database/showTable.html.php
diff --git a/recess/recess/apps/tools/views/home/home.php b/recess/recess/apps/tools/views/home/home.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/home/home.php
rename to recess/recess/apps/tools/views/home/home.html.php
diff --git a/recess/recess/apps/tools/views/routes/home.php b/recess/recess/apps/tools/views/routes/home.html.php
similarity index 100%
rename from recess/recess/apps/tools/views/routes/home.php
rename to recess/recess/apps/tools/views/routes/home.html.php
diff --git a/recess/recess/framework/views/NativeView.class.php b/recess/recess/framework/views/NativeView.class.php
index b433626..ee853c2 100644
--- a/recess/recess/framework/views/NativeView.class.php
+++ b/recess/recess/framework/views/NativeView.class.php
@@ -4,24 +4,27 @@
class NativeView extends AbstractView {
protected function getTemplateFor($response) {
$format = $response->request->accepts->format();
- if($format == 'html' || $format == '') {
- $extension = '.php';
- } else {
+
+ if(is_string($format)) {
$extension = ".$format.php";
+ } else {
+ $extension = '.php';
}
+
$template =
$response->meta->app->getViewsDir()
. $response->meta->viewsPrefix
. $response->meta->viewName
. $extension;
+
return $template;
}
-
+
public function canRespondWith(Response $response) {
// TODO: Cache in production mode
return file_exists($this->getTemplateFor($response));
}
-
+
protected function render(Response $response) {
$context = $response->data;
$context['viewsDir'] = $response->meta->app->getViewsDir();
diff --git a/recess/recess/http/MimeTypes.class.php b/recess/recess/http/MimeTypes.class.php
index 97320f4..6e342ba 100644
--- a/recess/recess/http/MimeTypes.class.php
+++ b/recess/recess/http/MimeTypes.class.php
@@ -8,7 +8,8 @@ static function init() {
// TODO: Cache the MIME Type Data Structure
MimeTypes::registerMany(
array(
- array('html', array('text/html', 'application/xhtml+xml')),
+ array('html', 'text/html'),
+ array('xhtml', 'application/xhtml+xml'),
array('xml', array('application/xml', 'text/xml', 'application/x-xml')),
array('json', array('application/json', 'text/x-json','application/jsonrequest')),
array('js', array('text/javascript', 'application/javascript', 'application/x-javascript')),
diff --git a/recess/recess/http/Request.class.php b/recess/recess/http/Request.class.php
index c9abe7f..da4f9a3 100644
--- a/recess/recess/http/Request.class.php
+++ b/recess/recess/http/Request.class.php
@@ -65,6 +65,8 @@ public function data($name) {
return $this->put[$name];
} else if (isset($this->get[$name])) {
return $this->get[$name];
+ } else {
+ return '';
}
}
}