-
-
-
+
+
+
@@ -250,10 +253,56 @@
print $this->Field->startControlSet($vv_obj, $this->name, $action, ($action == 'add' || $action == 'edit'));
-include(TEMPLATES . $modelsName . DS . "fields.inc");
+if(!empty($fields)) {
+ // Output the visible fields from the fields.inc configuration
+ foreach($fields as $fieldName => $val) {
+ // Set the defaults. Note that $fieldName will be an integer if the field
+ // is a simple standalone string (not an associative array). In that case,
+ // the $val itself will be the field name.
+ $name = is_int($fieldName) ? $val : $fieldName;
+ $options = [];
+ $required = true;
+ $labelText = null;
+ $childControls = [];
+
+ if(isset($val)) {
+ // We have optional values. Assign them.
+
+ // Set the simple values
+ $required = $val['required'] ?? true;
+ $labelText = $val['labelText'] ?? null;
+ $childControls = $val['childControls'] ?? [];
+
+ // Set the field's options array used by CakePHP.
+ // Currently accepted parameters are 'empty','default','readonly', 'value', 'type', and 'options' where
+ // 'type' and 'options' are for directly setting a select box (currently only in MatchgridRecords/fields.inc).
+ if(isset($val['empty'])) {
+ $options['empty'] = $val['empty'];
+ }
+ if(isset($val['default'])) {
+ $options['default'] = $val['default'];
+ }
+ if(isset($val['readonly'])) {
+ $options['readonly'] = $val['readonly'];
+ }
+ if(isset($val['value'])) {
+ $options['value'] = $val['value'];
+ }
+ if(isset($val['type'])) {
+ $options['type'] = $val['type'];
+ }
+ if(isset($val['options'])) {
+ // select options set explicitly
+ $options['options'] = $val['options'];
+ }
+ }
+
+ print $this->Field->control($name, $options, $required, $labelText, $childControls);
+ }
+}
if(!empty($hidden)) {
- // Inject any hidden variables set by the include file
+ // Inject any hidden fields set by the fields.inc configuration
foreach($hidden as $attr => $v) {
print $this->Form->hidden($attr, ['value' => $v]);
}
diff --git a/app/templates/SystemsOfRecord/fields.inc b/app/templates/SystemsOfRecord/fields.inc
index 202e41c38..e4098cda8 100644
--- a/app/templates/SystemsOfRecord/fields.inc
+++ b/app/templates/SystemsOfRecord/fields.inc
@@ -27,8 +27,24 @@
use \App\Lib\Enum\ResolutionModeEnum;
use \App\Lib\Enum\TrustModeEnum;
+
+$fields = [
+ 'label',
+ 'trust_mode' => [
+ 'empty' => true,
+ 'default' => TrustModeEnum::Standard
+ ],
+ 'resolution_mode' => [
+ 'empty' => true
+ ],
+ 'notification_email' => [
+ 'required' => false
+ ]
+];
+
?>
-
-Field->control('label');
-
- print $this->Field->control('trust_mode',
- ['empty' => true,
- 'default' => TrustModeEnum::Standard ]);
- print $this->Field->control('resolution_mode',
- ['empty' => true,
- 'onChange' => 'fields_update_gadgets();']);
-
- print $this->Field->control('notification_email', [], false);
-}
+ $('#resolution-mode').change(function() {
+ fields_update_gadgets();
+ });
+ });
+
diff --git a/app/templates/element/dialog.php b/app/templates/element/dialog.php
index 2cfdfc076..779a0f451 100644
--- a/app/templates/element/dialog.php
+++ b/app/templates/element/dialog.php
@@ -35,7 +35,7 @@
diff --git a/app/templates/element/httpHeaders.php b/app/templates/element/httpHeaders.php
index bcf393a49..9a2ab9899 100644
--- a/app/templates/element/httpHeaders.php
+++ b/app/templates/element/httpHeaders.php
@@ -25,18 +25,21 @@
* @license Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
*/
-// As a general rule, all Match pages are post-login and so shouldn't be cached
+ // As a general rule, all Match pages are post-login and so shouldn't be cached
header("Expires: Thursday, 10-Jan-69 00:00:00 GMT");
header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
header("Pragma: no-cache");
+
+ // CakePHP adds inline event handlers ("oninput" and "oninvalid") to fields as part of FormHelper.
+ // So as not to throw CSP errors, we must include "script-src-attr 'unsafe-inline'".
+ header("Content-Security-Policy: object-src 'none'; base-uri 'none'; frame-ancestors 'self'; script-src 'self' 'nonce-$vv_js_nonce'; script-src-attr 'unsafe-inline';");
- header("Content-Security-Policy: object-src 'none'; base-uri 'none'; frame-ancestors 'self'");
header("X-Content-Type-Options: nosniff");
header("Permissions-Policy: accelerometer=(),autoplay=(),camera=(),cross-origin-isolated=(),display-capture=(),encrypted-media=(),fullscreen=(),geolocation=(),gyroscope=(),keyboard-map=(),magnetometer=(),microphone=(),midi=(),payment=(),picture-in-picture=(),publickey-credentials-get=(),screen-wake-lock=(),sync-xhr=(self),usb=(),web-share=(),xr-spatial-tracking=(),gamepad=(),hid=(),idle-detection=(),interest-cohort=(),serial=()");
header("Cross-Origin-Opener-Policy: same-origin");
header("X-Permitted-Cross-Domain-Policies: none");
-// Add X-UA-Compatible header for IE
+ // Add X-UA-Compatible header for IE
if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {
header('X-UA-Compatible: IE=edge,chrome=1');
}
diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php
deleted file mode 100644
index 352f7b476..000000000
--- a/app/templates/element/javascript.php
+++ /dev/null
@@ -1,204 +0,0 @@
-
-
-
-
-Flash->render() ?>
diff --git a/app/templates/element/menuAction.php b/app/templates/element/menuAction.php
index c49b7fb93..69abc3021 100644
--- a/app/templates/element/menuAction.php
+++ b/app/templates/element/menuAction.php
@@ -72,7 +72,8 @@ class="">
// Build a link to a confirm dialog box. The confirm button of the dialog
// will trigger the postButton built below the menu link.
$actionUid = 'action-' . md5($action['onclick']['dg_url']);
- $dg_onclick = 'javascript:js_confirm_generic(\''
+ $linkUid = 'linkto-' . $actionUid;
+ $dg_onclick = 'js_confirm_generic(\''
. $action['onclick']['dg_bd_txt'] . '\',\'' // dialog body text
. $actionUid . '\',\'' // ID of postButton element to click on confirm
. $action['onclick']['dg_conf_btn'] . '\',\'' // dialog confirm button
@@ -81,13 +82,21 @@ class="">
. $action['onclick']['dg_bd_txt_repl_str'] // dialog body text replacement strings
. '\']);';
?>
-
+
+
Form->postButton($action['onclick']['dg_conf_btn'],
$action['onclick']['dg_post_btn_array'],['id' => $actionUid, 'class' => 'hidden']); ?>
diff --git a/app/templates/element/pagination.php b/app/templates/element/pagination.php
index c83fab84c..577622fb9 100644
--- a/app/templates/element/pagination.php
+++ b/app/templates/element/pagination.php
@@ -43,39 +43,40 @@
Paginator->hasPage(2)): ?>
-
-
-
+
+
- Paginator->counter('{{pages}}') > 25) {
+ Paginator->counter('{{count}}') > 25): ?>
+ Form->hidden($p, ['default' => $this->request->getQuery($p)]);
}
}
-
+
print $this->Form->control('limit', [
+ 'id' => 'pagination-limit',
'type' => 'select',
'label' => __($product.'.op.page.display'),
'value' => $this->request->getQuery('limit'),
- 'options' => [25 => 25, 50 => 50, 100 => 100],
- 'onChange' => 'this.form.submit()'
+ 'options' => [25 => 25, 50 => 50, 100 => 100]
]);
print $this->Form->end();
- }
- ?>
+ ?>
+
+
+
+
+
diff --git a/app/templates/element/search.php b/app/templates/element/search.php
index eae33b0ad..02b43160f 100644
--- a/app/templates/element/search.php
+++ b/app/templates/element/search.php
@@ -56,7 +56,7 @@
?>
-
diff --git a/app/templates/layout/default.php b/app/templates/layout/default.php
index 72eee77af..537fe2e2b 100644
--- a/app/templates/layout/default.php
+++ b/app/templates/layout/default.php
@@ -29,12 +29,12 @@
print $this->element('httpHeaders');
?>
-
+
- Html->meta('viewport', 'width=device-width, initial-scale=1.0') . "\n"; ?>
+ Html->meta('viewport', 'width=device-width, initial-scale=1.0') . "\n" ?>
Html->charset(); ?>
-
<?= (!empty($vv_title) ? $vv_title : __('match.meta.match')); ?>
+
<?= (!empty($vv_title) ? $vv_title : __('match.meta.match')) ?>
- Html->meta('favicon.ico', '/favicon.ico', array('type' => 'icon')) . "\n"; ?>
+ Html->meta('favicon.ico', '/favicon.ico', array('type' => 'icon')) . "\n" ?>
Html->css([
@@ -51,7 +51,12 @@
'co-color',
'co-base',
'co-responsive'
- ]) . "\n"; ?>
+ ]) . "\n" ?>
+
+
+ Html->script([
+ 'jquery/jquery.min.js'
+ ]) . "\n" ?>
fetch('meta') ?>
@@ -72,7 +77,7 @@
$bodyClasses .= ' logged-out';
}
?>
-
+
@@ -84,7 +89,7 @@
menu
@@ -96,11 +101,11 @@
['controller' => 'Matchgrids',
'action' => 'manage',
$vv_cur_mg->id],
- ['escape' => false]);
+ ['escape' => false])
// XXX Insert quick matchgrid selector here.
?>
- Html->link(__('match.meta.match'), '/'); ?>
+ Html->link(__('match.meta.match'), '/') ?>