Fix potential issue with json_encode() in templates

This commit is contained in:
Frederic Guillot
2015-08-14 17:25:25 -04:00
parent 17a3781bd8
commit 357102dc6e
9 changed files with 10 additions and 10 deletions

View File

@@ -7,7 +7,7 @@
<?php else: ?> <?php else: ?>
<section id="analytic-avg-time-column"> <section id="analytic-avg-time-column">
<div id="chart" data-metrics='<?= json_encode($metrics) ?>' data-label="<?= t('Average time spent') ?>"></div> <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-label="<?= t('Average time spent') ?>"></div>
<table class="table-stripped"> <table class="table-stripped">
<tr> <tr>

View File

@@ -6,7 +6,7 @@
<p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p> <p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p>
<?php else: ?> <?php else: ?>
<section id="analytic-burndown"> <section id="analytic-burndown">
<div id="chart" data-metrics='<?= json_encode($metrics) ?>' data-date-format="<?= e('%%Y-%%m-%%d') ?>" data-label-total="<?= t('Total for all columns') ?>"></div> <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-date-format="<?= e('%%Y-%%m-%%d') ?>" data-label-total="<?= t('Total for all columns') ?>"></div>
</section> </section>
<?php endif ?> <?php endif ?>

View File

@@ -6,7 +6,7 @@
<p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p> <p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p>
<?php else: ?> <?php else: ?>
<section id="analytic-cfd"> <section id="analytic-cfd">
<div id="chart" data-metrics='<?= json_encode($metrics) ?>' data-date-format="<?= e('%%Y-%%m-%%d') ?>"></div> <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-date-format="<?= e('%%Y-%%m-%%d') ?>"></div>
</section> </section>
<?php endif ?> <?php endif ?>

View File

@@ -14,7 +14,7 @@
<?php else: ?> <?php else: ?>
<section id="analytic-lead-cycle-time"> <section id="analytic-lead-cycle-time">
<div id="chart" data-metrics='<?= json_encode($metrics) ?>' data-label-cycle="<?= t('Cycle Time') ?>" data-label-lead="<?= t('Lead Time') ?>"></div> <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>' data-label-cycle="<?= t('Cycle Time') ?>" data-label-lead="<?= t('Lead Time') ?>"></div>
<form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off"> <form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">

View File

@@ -7,7 +7,7 @@
<?php else: ?> <?php else: ?>
<section id="analytic-task-repartition"> <section id="analytic-task-repartition">
<div id="chart" data-metrics='<?= json_encode($metrics) ?>'></div> <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>'></div>
<table> <table>
<tr> <tr>

View File

@@ -7,7 +7,7 @@
<?php else: ?> <?php else: ?>
<section id="analytic-user-repartition"> <section id="analytic-user-repartition">
<div id="chart" data-metrics='<?= json_encode($metrics) ?>'></div> <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>'></div>
<table> <table>
<tr> <tr>

View File

@@ -6,8 +6,8 @@
<div id="budget-chart"> <div id="budget-chart">
<div id="chart" <div id="chart"
data-date-format="<?= e('%%Y-%%m-%%d') ?>" data-date-format="<?= e('%%Y-%%m-%%d') ?>"
data-metrics='<?= json_encode($daily_budget) ?>' data-metrics='<?= json_encode($daily_budget, JSON_HEX_APOS) ?>'
data-labels='<?= json_encode(array('in' => t('Budget line'), 'out' => t('Expenses'), 'left' => t('Remaining'), 'value' => t('Amount'), 'date' => t('Date'), 'type' => t('Type'))) ?>'></div> data-labels='<?= json_encode(array('in' => t('Budget line'), 'out' => t('Expenses'), 'left' => t('Remaining'), 'value' => t('Amount'), 'date' => t('Date'), 'type' => t('Type')), JSON_HEX_APOS) ?>'></div>
</div> </div>
<hr/> <hr/>
<table class="table-fixed table-stripped"> <table class="table-fixed table-stripped">

View File

@@ -35,7 +35,7 @@
<?php if (! empty($tasks)): ?> <?php if (! empty($tasks)): ?>
<div <div
id="gantt-chart" id="gantt-chart"
data-tasks='<?= json_encode($tasks) ?>' data-tasks='<?= json_encode($tasks, JSON_HEX_APOS) ?>'
data-save-url="<?= $this->url->href('gantt', 'saveDate', array('project_id' => $project['id'])) ?>" data-save-url="<?= $this->url->href('gantt', 'saveDate', array('project_id' => $project['id'])) ?>"
data-label-start-date="<?= t('Start date:') ?>" data-label-start-date="<?= t('Start date:') ?>"
data-label-end-date="<?= t('Due date:') ?>" data-label-end-date="<?= t('Due date:') ?>"

View File

@@ -10,7 +10,7 @@
</div> </div>
<h3 id="analytic-task-time-column"><?= t('Time spent into each column') ?></h3> <h3 id="analytic-task-time-column"><?= t('Time spent into each column') ?></h3>
<div id="chart" data-metrics='<?= json_encode($time_spent_columns) ?>' data-label="<?= t('Time spent') ?>"></div> <div id="chart" data-metrics='<?= json_encode($time_spent_columns, JSON_HEX_APOS) ?>' data-label="<?= t('Time spent') ?>"></div>
<table class="table-stripped"> <table class="table-stripped">
<tr> <tr>
<th><?= t('Column') ?></th> <th><?= t('Column') ?></th>