summaryrefslogtreecommitdiffstats
path: root/application/controllers/file
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2017-03-24 16:08:19 +0100
committerFlorian Pritz <bluewind@xinu.at>2017-03-24 16:08:19 +0100
commit5d87e913a17ebfae71705004c695c2b572e12f40 (patch)
tree06bfda767c38138548c1272935271a9126c4fb1e /application/controllers/file
parent30183ac6133925e87e89aa115f011c72bf94b434 (diff)
Improve error handling in json reformater
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers/file')
-rw-r--r--application/controllers/file/file_default.php21
1 files changed, 17 insertions, 4 deletions
diff --git a/application/controllers/file/file_default.php b/application/controllers/file/file_default.php
index 15fb54832..265bff0d8 100644
--- a/application/controllers/file/file_default.php
+++ b/application/controllers/file/file_default.php
@@ -242,7 +242,7 @@ class File_default extends MY_Controller {
echo $this->load->view('file/html_footer', $this->data, true);
}
- private function _colorify($file, $lexer, $anchor_id = false)
+ private function _colorify($output_cache, $file, $lexer, $anchor_id = false)
{
$output = "";
$lines_to_remove = 0;
@@ -254,7 +254,20 @@ class File_default extends MY_Controller {
$linecount = count(explode("\n", $content));
if ($lexer === "json" && $linecount === 1) {
- $content = json_encode(json_decode($content), JSON_PRETTY_PRINT);
+ $decoded_json = json_decode($content);
+ if ($decoded_json !== null && $decoded_json !== false) {
+ $pretty_json = json_encode($decoded_json, JSON_PRETTY_PRINT);
+ if ($pretty_json !== false) {
+ $content = $pretty_json;
+ $output_cache->render_now(
+ array(
+ "error_type" => "alert-info",
+ "error_message" => "<p>The file below has been reformated for readability. It may differ from the original.</p>"
+ ),
+ "file/fragments/alert-wide"
+ );
+ }
+ }
}
if ($lexer == "ascii") {
@@ -320,7 +333,7 @@ class File_default extends MY_Controller {
// highlight the file and cache the result, fall back to plain text if $lexer fails
foreach (array($lexer, "text") as $lexer) {
$highlit = cache_function($filedata['data_id'].'_'.$lexer, 100,
- function() use ($filedata, $lexer, $is_multipaste) {
+ function() use ($output_cache, $filedata, $lexer, $is_multipaste) {
$file = $this->mfile->file($filedata['data_id']);
if ($lexer == "rmd") {
ob_start();
@@ -340,7 +353,7 @@ class File_default extends MY_Controller {
"return_value" => 0,
);
} else {
- return get_instance()->_colorify($file, $lexer, $is_multipaste ? $filedata["id"] : false);
+ return get_instance()->_colorify($output_cache, $file, $lexer, $is_multipaste ? $filedata["id"] : false);
}
});