Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

JSON and text response

givanz8d6deedc3a42
diff --git a/admin/controller/content/revisions.php b/admin/controller/content/revisions.php
index 24324b8..06b472c 100644
--- a/admin/controller/content/revisions.php
+++ b/admin/controller/content/revisions.php
@@ -30,7 +30,7 @@ use Vvveb\System\Images;
class Revisions extends Base {
protected $type = 'post';
-
+
protected $object = 'post';
//check for other modules permission like revision and editor to enable links like save/delete etc
@@ -42,11 +42,12 @@ class Revisions extends Base {
function init() {
if (isset($this->request->get['type'])) {
$this->type = $this->request->get['type'];
- }
+ }
+
if (isset($this->request->get['object'])) {
$this->object = $this->request->get['object'];
}
-
+
$this->revisions = model($this->object . '_content_revision');
$this->post = model($this->object);
@@ -64,9 +65,12 @@ class Revisions extends Base {
function delete() {
$results = $this->revisions->delete($this->options + $this->global);
- header('Content-type: application/json; charset=utf-8');
+ if ($results) {
+ $message[] = __('Revision deleted!');
+ }
- die();
+ $this->response->setType('json');
+ $this->response->output($message);
}
function save() {
@@ -90,14 +94,18 @@ class Revisions extends Base {
}
function revision() {
- $view = $this->view;
- $results = $this->revisions->get($this->options);
-
- if ($results && isset($results['content'])) {
- echo $results['content'];
+ $view = $this->view;
+ $results = $this->revisions->get($this->options);
+ $revision = [];
+
+ if ($results && $results['content']) {
+ foreach (['content', 'created_at', 'display_name'] as $key) {
+ $revision[$key] = $results[$key];
+ }
}
- die();
+ $this->response->setType('json');
+ $this->response->output($revision);
}
function index() {
diff --git a/app/controller/feed/robots.php b/app/controller/feed/robots.php
index 4c0b1f4..a77647e 100644
--- a/app/controller/feed/robots.php
+++ b/app/controller/feed/robots.php
@@ -40,8 +40,7 @@ class Robots extends Base {
$text = preg_replace('@(sitemap):\s+/@', "$1: $host/", $text);
}
- $this->view->text = $text;
-
$this->response->setType('text');
+ $this->response->output($text);
}
}
diff --git a/system/core/response.php b/system/core/response.php
index 96b0709..a76251c 100755
--- a/system/core/response.php
+++ b/system/core/response.php
@@ -83,16 +83,24 @@ class Response {
}
}
- if (is_array($data) && $this->type == 'json') {
- echo json_encode($data);
+ if ($this->type == 'text') {
+ echo $data;
} else {
- $view = View :: getInstance();
-
- if ($this->type) {
- $view->setType($this->type);
+ if ($this->type == 'json') {
+ if (is_array($data)) {
+ echo json_encode($data);
+ } else {
+ echo $data;
+ }
+ } else {
+ $view = View :: getInstance();
+
+ if ($this->type) {
+ $view->setType($this->type);
+ }
+
+ $view->render();
}
-
- $view->render();
}
$this->done = true;