Commit bde44376 authored by Franco Fichtner's avatar Franco Fichtner

make: apparently this just happened

parent 0e5e6e8f
...@@ -50,6 +50,9 @@ style: force ...@@ -50,6 +50,9 @@ style: force
@cat ${.CURDIR}/.style.out @cat ${.CURDIR}/.style.out
@rm ${.CURDIR}/.style.out @rm ${.CURDIR}/.style.out
stylefix: force
phpcbf --standard=PSR2 ${.CURDIR}/src/opnsense/mvc || true
setup: force setup: force
${.CURDIR}/src/etc/rc.php_ini_setup ${.CURDIR}/src/etc/rc.php_ini_setup
......
...@@ -94,7 +94,7 @@ abstract class BaseModel ...@@ -94,7 +94,7 @@ abstract class BaseModel
{ {
// copy xml tag attributes to Field // copy xml tag attributes to Field
if ($config_data != null) { if ($config_data != null) {
foreach($config_data->attributes() as $AttrKey => $AttrValue) { foreach ($config_data->attributes() as $AttrKey => $AttrValue) {
$internal_data->setAttributeValue($AttrKey, $AttrValue); $internal_data->setAttributeValue($AttrKey, $AttrValue);
} }
} }
......
...@@ -143,5 +143,4 @@ class ArrayField extends BaseField ...@@ -143,5 +143,4 @@ class ArrayField extends BaseField
return null; return null;
} }
} }
...@@ -88,13 +88,18 @@ abstract class BaseField ...@@ -88,13 +88,18 @@ abstract class BaseField
/** /**
* @return string uuid v4 number * @return string uuid v4 number
*/ */
protected function generateUUID() { protected function generateUUID()
return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x', {
mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), return sprintf(
mt_rand( 0, 0xffff ), '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
mt_rand( 0, 0x0fff ) | 0x4000, mt_rand(0, 0xffff),
mt_rand( 0, 0x3fff ) | 0x8000, mt_rand(0, 0xffff),
mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ) mt_rand(0, 0xffff),
mt_rand(0, 0x0fff) | 0x4000,
mt_rand(0, 0x3fff) | 0x8000,
mt_rand(0, 0xffff),
mt_rand(0, 0xffff),
mt_rand(0, 0xffff)
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment