Skip to content

FREEI-2458 duplication on extension import is fixed #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release/16.0
Choose a base branch
from
Open

FREEI-2458 duplication on extension import is fixed #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 54 additions & 46 deletions views/validate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?php
// Enforce UTF-8 on imports
foreach($imports as $id => &$import) {
foreach($import as $key => &$value) {
foreach ($imports as $id => &$import) {
foreach ($import as $key => &$value) {
if (!mb_detect_encoding($value, 'UTF-8', true)) {
$value = mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1');
}
}
unset($value); //Break inner reference
}
unset($import); //Break outer reference

header('Content-Type: text/html; charset=utf-8');
?>
<div class="header-section">
Expand All @@ -17,6 +20,7 @@
</div>
</div>
</div>

<div id="toolbar-all">
<label><?php echo _("Replace/Update existing data")?></label>
<div class="radioset" style="display: inline-block;">
Expand All @@ -26,66 +30,70 @@
<label for="replaceexisting_no"><?php echo _("No")?></label>
</div>
</div>

<div>
<p id="error" style="color:red;"></p>
<p id="error" style="color:red;"></p>
</div>
<table data-toggle="table"
data-toolbar="#toolbar-all"
data-show-columns="true"
data-show-toggle="true"
data-toggle="table"
data-pagination="false"
data-search="true"
id="validation-list">

<table
data-toggle="table"
data-toolbar="#toolbar-all"
data-show-columns="true"
data-show-toggle="true"
data-pagination="false"
data-search="true"
id="validation-list">
<thead>
<tr>
<th data-field="id" class="id"><?php echo _('ID')?></th>
<?php foreach ($headers as $key => $header) { ?>
<?php if (isset($header['identifier']) && $header['identifier']) { ?>
<?php $identifiers[] = $key;?>
<th data-field="<?php echo $key?>" data-sortable="true"><?php echo $header['identifier']?></th>
<?php } ?>
<?php } ?>
<?php
$identifiers = []; //Ensure initialized
foreach ($headers as $key => $header) {
if (isset($header['identifier']) && $header['identifier']) {
$identifiers[] = $key;
echo '<th data-field="' . htmlspecialchars($key, ENT_QUOTES, 'UTF-8') . '" data-sortable="true">' . htmlspecialchars($header['identifier'], ENT_QUOTES, 'UTF-8') . '</th>';
}
}
?>
<th data-field="actions" class="actions"><?php echo _('Actions')?></th>
</tr>
</thead>
<tbody>
<?php foreach($imports as $id => $import) {?>
<tr class="scheme" data-unique-id="row-<?php echo $id?>" data-jsonid='<?php echo $id?>'>
<td class="id"><?php echo $id?></td>
<?php foreach ($identifiers as $identifier) {?>

<td data-value="<?php echo $identifier?>"></td>
<?php foreach ($imports as $id => $import) { ?>
<tr class="scheme" data-unique-id="row-<?php echo htmlspecialchars($id, ENT_QUOTES, 'UTF-8')?>" data-jsonid='<?php echo htmlspecialchars($id, ENT_QUOTES, 'UTF-8')?>'>
<td class="id"><?php echo htmlspecialchars($id, ENT_QUOTES, 'UTF-8')?></td>
<?php foreach ($identifiers as $identifier) { ?>
<td data-value="<?php echo htmlspecialchars($identifier, ENT_QUOTES, 'UTF-8')?>"></td>
<?php } ?>
<td class="actions" class="actions">
<i class="fa fa-pencil-square-o actions clickable" data-type="edit" data-id="<?php echo $id?>"></i>
<i class="fa fa-trash-o actions clickable" data-type="delete" data-id="<?php echo $id?>"></i>
<td class="actions">
<i class="fa fa-pencil-square-o actions clickable" data-type="edit" data-id="<?php echo htmlspecialchars($id, ENT_QUOTES, 'UTF-8')?>"></i>
<i class="fa fa-trash-o actions clickable" data-type="delete" data-id="<?php echo htmlspecialchars($id, ENT_QUOTES, 'UTF-8')?>"></i>
</td>
</tr>
<?php } ?>
</tbody>
</table>
<br/>
<br/>
<br/>

<br/><br/><br/>

<div id="edit" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><?php echo _('Edit')?></h4>
</div>
<div class="modal-body">
<div class="edit-fields">
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo _('Close')?></button>
<button type="button" class="btn btn-primary save"><?php echo _('Save changes')?></button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><?php echo _('Edit')?></h4>
</div>
<div class="modal-body">
<div class="edit-fields"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo _('Close')?></button>
<button type="button" class="btn btn-primary save"><?php echo _('Save changes')?></button>
</div>
</div>
</div>
</div>

<script>
var type = "<?php echo $type ?>";
var imports = <?php echo json_encode($imports, JSON_UNESCAPED_UNICODE | JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT) ?>;
Expand Down