Skip to content

Commit

Permalink
[Module] fix: encodage issue in database
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolas-eoxia
nicolas-eoxia committed May 7, 2022
1 parent 62599ac commit e9b77b7
Show file tree
Hide file tree
Showing 12 changed files with 250 additions and 124 deletions.
14 changes: 7 additions & 7 deletions admin/ticket/ticket.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@

if ($action == 'generateExtrafields') {
$ret1 = $extra_fields->addExtraField('digiriskdolibarr_ticket_lastname', $langs->trans("LastName"), 'varchar', 2000, 255, 'ticket', 0, 0, '', '', 1, '', 1);
$ret2 = $extra_fields->addExtraField('digiriskdolibarr_ticket_firstname', $langs->trans("FirstName"), 'varchar', 2100, 255, 'ticket', 0, 0, '', '', 1, '', 1);
$ret3 = $extra_fields->addExtraField('digiriskdolibarr_ticket_phone', $langs->trans("Phone"), 'phone', 2200, '', 'ticket', 0, 0, '', '', 1, '', 1);
$ret2 = $extra_fields->addExtraField('digiriskdolibarr_ticket_firstname', $langs->transnoentities("FirstName"), 'varchar', 2100, 255, 'ticket', 0, 0, '', '', 1, '', 1);
$ret3 = $extra_fields->addExtraField('digiriskdolibarr_ticket_phone', $langs->transnoentities("Phone"), 'phone', 2200, '', 'ticket', 0, 0, '', '', 1, '', 1);
$ret4 = $extra_fields->addExtraField('digiriskdolibarr_ticket_service', $langs->trans("Service"), 'varchar', 2300, 255, 'ticket', 0, 0, '', '', 1, '', 1);
$ret5 = $extra_fields->addExtraField('digiriskdolibarr_ticket_location', $langs->trans("Location"), 'varchar', 2400, 255, 'ticket', 0, 0, '', '', 1, '', 1);
$ret6 = $extra_fields->addExtraField('digiriskdolibarr_ticket_date', $langs->trans("Date"), 'datetime', 2500, '', 'ticket', 0, 0, '', '', 1, '', 1);
Expand Down Expand Up @@ -133,7 +133,7 @@
setEventMessages($category->error, null, 'errors');
}

$category->label = $langs->trans('SST');
$category->label = $langs->transnoentities('SST');
$category->description = '';
$category->color = '';
$category->visible = 1;
Expand All @@ -142,7 +142,7 @@
$result3 = $category->create($user);

if ($result3 > 0) {
$category->label = $langs->trans('AnticipatedLeave');
$category->label = $langs->transnoentities('AnticipatedLeave');
$category->description = '';
$category->color = '';
$category->visible = 1;
Expand All @@ -158,23 +158,23 @@
$category->fk_parent = $result3;
$category->create($user);

$category->label = $langs->trans('HumanProblem');
$category->label = $langs->transnoentities('HumanProblem');
$category->description = '';
$category->color = '';
$category->visible = 1;
$category->type = 'ticket';
$category->fk_parent = $result3;
$category->create($user);

$category->label = $langs->trans('MaterialProblem');
$category->label = $langs->transnoentities('MaterialProblem');
$category->description = '';
$category->color = '';
$category->visible = 1;
$category->type = 'ticket';
$category->fk_parent = $result3;
$category->create($user);

$category->label = $langs->trans('EnhancementSuggestion');
$category->label = $langs->transnoentities('EnhancementSuggestion');
$category->description = '';
$category->color = '';
$category->visible = 1;
Expand Down
85 changes: 44 additions & 41 deletions core/modules/modDigiriskDolibarr.class.php
View file

Large diffs are not rendered by default.

125 changes: 124 additions & 1 deletion core/tpl/digiriskdolibarr_projectcreation_action.tpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
if ( $conf->global->DIGIRISKDOLIBARR_PREVENTIONPLAN_PROJECT == 0 || $project->statut == 2 ) {
$project->ref = $projectRef->getNextValue($third_party, $project);
$project->title = $langs->trans('PreventionPlanInitial') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM;
$project->description = $langs->trans('PreventionPlanDescription');
$project->description = $langs->transnoentities('PreventionPlanDescription');
$project->date_c = dol_now();
$currentYear = dol_print_date(dol_now(), '%Y');
$fiscalMonthStart = $conf->global->SOCIETE_FISCAL_MONTH_START;
Expand Down Expand Up @@ -712,6 +712,7 @@
//dolibarr_set_const($db, 'DIGIRISKDOLIBARR_ACTIVE_STANDARD', dolibarr_get_const($db,'DIGIRISKDOLIBARR_ACTIVE_STANDARD'), 'integer', 0, '', $conf->entity);
//dolibarr_set_const($db, 'DIGIRISKDOLIBARR_NEW_SIGNATURE_TABLE', 1, 'integer', 0, '', $conf->entity);
//dolibarr_set_const($db, 'DIGIRISKDOLIBARR_TRIGGERS_UPDATED', 1, 'integer', 0, '', $conf->entity);
//dolibarr_set_const($db, 'DIGIRISKDOLIBARR_ENCODE_BACKWARD_COMPATIBILITY', 1, 'integer', 0, '', $conf->entity);
//dolibarr_set_const($db, 'DIGIRISKDOLIBARR_MEDIA_MAX_WIDTH_MEDIUM', 854, 'integer', 0, '', $conf->entity);
//dolibarr_set_const($db, 'DIGIRISKDOLIBARR_MEDIA_MAX_HEIGHT_MEDIUM', 480, 'integer', 0, '', $conf->entity);
//dolibarr_set_const($db, 'DIGIRISKDOLIBARR_MEDIA_MAX_WIDTH_LARGE', 1280, 'integer', 0, '', $conf->entity);
Expand Down Expand Up @@ -747,3 +748,125 @@

dolibarr_set_const($db, 'DIGIRISKDOLIBARR_CONF_BACKWARD_COMPATIBILITY', 1, 'integer', 0, '', $conf->entity);
}

if ($conf->global->DIGIRISKDOLIBARR_ENCODE_BACKWARD_COMPATIBILITY == 0) {
$project->fetch($conf->global->DIGIRISKDOLIBARR_PREVENTIONPLAN_PROJECT);
$project->description = $langs->transnoentities('PreventionPlanDescription');
$project->update($user);

require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';

$extrafields = new ExtraFields($db);

$extrafields->fetch_name_optionals_label('ticket');

if ($extrafields->attributes['ticket']['label']['digiriskdolibarr_ticket_firstname'] && $extrafields->attributes['ticket']['label']['digiriskdolibarr_ticket_phone']) {
$extrafields->update('digiriskdolibarr_ticket_firstname', $langs->transnoentities("FirstName"), 'varchar', 255, 'ticket', 0, 0, 2100, '', 1, '', 1);
$extrafields->update('digiriskdolibarr_ticket_phone', $langs->transnoentities("Phone"), 'phone', '', 'ticket', 0, 0, 2200, '', 1, '', 1);
}

require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$tags = new Categorie($db);

$tags->fetch('', $langs->trans('SST'));
if ($tags->id > 0) {
$tags->label = $langs->transnoentities('SST');
$tags->update($user);
}

$tags->fetch('', $langs->trans('AnticipatedLeave'));
if ($tags->id > 0) {
$tags->label = $langs->transnoentities('AnticipatedLeave');
$tags->update($user);
}

$tags->fetch('', $langs->trans('HumanProblem'));
if ($tags->id > 0) {
$tags->label = $langs->transnoentities('HumanProblem');
$tags->update($user);
}

$tags->fetch('', $langs->trans('MaterialProblem'));
if ($tags->id > 0) {
$tags->label = $langs->transnoentities('MaterialProblem');
$tags->update($user);
}

$tags->fetch('', $langs->trans('EnhancementSuggestion'));
if ($tags->id > 0) {
$tags->label = $langs->transnoentities('EnhancementSuggestion');
$tags->update($user);
}

require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
require_once __DIR__ . '/../../class/digiriskresources.class.php';

$societe = new Societe($db);
$resources = new DigiriskResources($db);
$rights_defenderID = $resources->digirisk_dolibarr_fetch_resource('RightsDefender');
$societe->fetch($rights_defenderID);
$societe->name = $langs->transnoentities('RightsDefender') . ' - ' . $conf->global->MAIN_INFO_SOCIETE_NOM;
$societe->update(0, $user);

require_once DOL_DOCUMENT_ROOT . '/user/class/usergroup.class.php';

$usergroup = new UserGroup($db);

$usergroup_id = $conf->global->DIGIRISKDOLIBARR_ADMINUSERGROUP_SET;
if ($usergroup_id > 0) {
$usergroup->fetch($usergroup_id);
$usergroup->note = $langs->transnoentities('DigiriskAdminUserGroupDescription');
$usergroup->update($user);
}

$usergroup_id = $conf->global->DIGIRISKDOLIBARR_USERGROUP_SET;
if ($usergroup_id > 0) {
$usergroup->fetch($usergroup_id);
$usergroup->note = $langs->transnoentities('DigiriskUserGroupDescription');
$usergroup->update($user);
}

$usergroup_id = $conf->global->DIGIRISKDOLIBARR_READERGROUP_SET;
if ($usergroup_id > 0) {
$usergroup->fetch($usergroup_id);
$usergroup->note = $langs->transnoentities('DigiriskReaderGroupDescription');
$usergroup->update($user);
}

require_once __DIR__ . '/../../class/accident.class.php';

$accident = new Accident($db);

$accidents = $accident->fetchAll();
foreach ($accidents as $accident) {
$accident->description = dol_html_entity_decode($accident->description, ENT_QUOTES|ENT_HTML5);
$accident->update($user);
}

require_once __DIR__ . '/../../class/digirisksignature.class.php';

$signatory = new DigiriskSignature($db);

$signatories = $signatory->fetchAll();
foreach ($signatories as $signatory) {
if ($signatory->signature == $langs->trans('FileGenerated')) {
$signatory->signature = $langs->transnoentities('FileGenerated');
$signatory->update($user);
}
}

require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';

$actioncomm = new Actioncomm($db);

$actioncomms = $actioncomm->getActions();
if ( ! empty($actioncomms)) {
foreach ($actioncomms as $actioncomm) {
$actioncomm->label = dol_html_entity_decode($actioncomm->label, ENT_QUOTES|ENT_HTML5);
$actioncomm->note_private = dol_html_entity_decode($actioncomm->note_private, ENT_QUOTES|ENT_HTML5);
$actioncomm->update($user);
}
}

dolibarr_set_const($db, 'DIGIRISKDOLIBARR_ENCODE_BACKWARD_COMPATIBILITY', 1, 'integer', 0, '', $conf->entity);
}
2 changes: 1 addition & 1 deletion core/tpl/digiriskdolibarr_signature_view.tpl.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php if (empty($element->signature) && ($object->status == 2 || $element->signature == $langs->trans("FileGenerated"))) : ?>
<?php if (empty($element->signature) && ($object->status == 2 || $element->signature == $langs->transnoentities("FileGenerated"))) : ?>
<div class="wpeo-button button-blue wpeo-modal-event modal-signature-open modal-open" value="<?php echo $element->id ?>">
<span><i class="fas fa-signature"></i> <?php echo $langs->trans('Sign'); ?></span>
</div>
Expand Down
Loading

0 comments on commit e9b77b7

Please sign in to comment.