319,7 → 319,7 |
|
// Generate UUID |
else if ($actionID == 'generate_uuid') { |
$uuid = gen_uuid(); |
$uuid = gen_uuid(OIDplus::config()->getValue('uuid_prefer_timebased', '1') == '1'); |
if (!$uuid) return array("status" => 1); |
return array( |
"status" => 0, |
501,7 → 501,12 |
throw new OIDplusException(_L('Please enter a valid value (0=no, 1=yes).')); |
} |
}); |
OIDplus::config()->prepareConfigKey('uuid_prefer_timebased', 'Preferred UUID Generator version? 1=Timebased (Very secure, but reveals the MAC address of the server); 4=Random (has a very, very tiny change to generate duplicates)', '1', OIDplusConfig::PROTECTION_HIDDEN, function($value) { |
if (($value != '1') && ($value != '4')) { |
throw new OIDplusException(_L('Please enter a valid value (1=Timebased, 4=Random).')); |
} |
}); |
} |
|
/** |
* @param string $id |
1019,7 → 1024,7 |
$enable_weid_presentation = OIDplus::config()->getValue('oid_grid_show_weid'); |
|
$output = '<div class="container box"><div id="suboid_table" class="table-responsive">'; |
$output .= '<table class="table table-bordered table-striped">'; |
$output .= '<table id="crudTable" class="table table-bordered table-striped">'; |
$output .= '<thead>'; |
$output .= ' <tr>'; |
$output .= ' <th>'._L('ID').(($parentNS == 'gs1') ? ' '._L('(without check digit)') : '').'</th>'; |