|
@@ -22,7 +22,7 @@ discard block |
|
|
block discarded – undo |
|
22
|
22
|
* @see admin/jsonadm/url/action |
|
23
|
23
|
* @see admin/jsonadm/url/config |
|
24
|
24
|
*/ |
|
25
|
|
-$target = $this->config( 'admin/jsonadm/url/target' ); |
|
|
25
|
+$target = $this->config('admin/jsonadm/url/target'); |
|
26
|
26
|
|
|
27
|
27
|
/** admin/jsonadm/url/controller |
|
28
|
28
|
* Name of the client whose action should be called |
|
@@ -38,7 +38,7 @@ discard block |
|
|
block discarded – undo |
|
38
|
38
|
* @see admin/jsonadm/url/action |
|
39
|
39
|
* @see admin/jsonadm/url/config |
|
40
|
40
|
*/ |
|
41
|
|
-$cntl = $this->config( 'admin/jsonadm/url/controller', 'jsonadm' ); |
|
|
41
|
+$cntl = $this->config('admin/jsonadm/url/controller', 'jsonadm'); |
|
42
|
42
|
|
|
43
|
43
|
/** admin/jsonadm/url/action |
|
44
|
44
|
* Name of the action that should create the output |
|
@@ -54,7 +54,7 @@ discard block |
|
|
block discarded – undo |
|
54
|
54
|
* @see admin/jsonadm/url/controller |
|
55
|
55
|
* @see admin/jsonadm/url/config |
|
56
|
56
|
*/ |
|
57
|
|
-$action = $this->config( 'admin/jsonadm/url/action', 'get' ); |
|
|
57
|
+$action = $this->config('admin/jsonadm/url/action', 'get'); |
|
58
|
58
|
|
|
59
|
59
|
/** admin/jsonadm/url/config |
|
60
|
60
|
* Associative list of configuration options used for generating the URL |
|
@@ -76,7 +76,7 @@ discard block |
|
|
block discarded – undo |
|
76
|
76
|
* @see admin/jsonadm/url/controller |
|
77
|
77
|
* @see admin/jsonadm/url/action |
|
78
|
78
|
*/ |
|
79
|
|
-$config = $this->config( 'admin/jsonadm/url/config', [] ); |
|
|
79
|
+$config = $this->config('admin/jsonadm/url/config', []); |
|
80
|
80
|
|
|
81
|
81
|
|
|
82
|
82
|
/** admin/jsonadm/partials/template-errors |
|
@@ -128,22 +128,22 @@ discard block |
|
|
block discarded – undo |
|
128
|
128
|
*/ |
|
129
|
129
|
|
|
130
|
130
|
|
|
131
|
|
-$total = $this->get( 'total', 0 ); |
|
132
|
|
-$offset = max( $this->param( 'page/offset', 0 ), 0 ); |
|
133
|
|
-$limit = max( $this->param( 'page/limit', 25 ), 1 ); |
|
|
131
|
+$total = $this->get('total', 0); |
|
|
132
|
+$offset = max($this->param('page/offset', 0), 0); |
|
|
133
|
+$limit = max($this->param('page/limit', 25), 1); |
|
134
|
134
|
|
|
135
|
|
-$first = ( $offset > 0 ? 0 : null ); |
|
136
|
|
-$prev = ( $offset - $limit >= 0 ? $offset - $limit : null ); |
|
137
|
|
-$next = ( $offset + $limit < $total ? $offset + $limit : null ); |
|
138
|
|
-$last = ( ((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null ); |
|
|
135
|
+$first = ($offset > 0 ? 0 : null); |
|
|
136
|
+$prev = ($offset - $limit >= 0 ? $offset - $limit : null); |
|
|
137
|
+$next = ($offset + $limit < $total ? $offset + $limit : null); |
|
|
138
|
+$last = (((int) ($total / $limit)) * $limit > $offset ? ((int) ($total / $limit)) * $limit : null); |
|
139
|
139
|
|
|
140
|
140
|
|
|
141
|
|
-$ref = array( 'id', 'resource', 'filter', 'page', 'sort', 'include', 'fields' ); |
|
142
|
|
-$params = array_intersect_key( $this->param(), array_flip( $ref ) ) + ['id' => '']; |
|
143
|
|
-$fields = $this->param( 'fields', [] ); |
|
|
141
|
+$ref = array('id', 'resource', 'filter', 'page', 'sort', 'include', 'fields'); |
|
|
142
|
+$params = array_intersect_key($this->param(), array_flip($ref)) + ['id' => '']; |
|
|
143
|
+$fields = $this->param('fields', []); |
|
144
|
144
|
|
|
145
|
|
-foreach( (array) $fields as $resource => $list ) { |
|
146
|
|
- $fields[$resource] = array_flip( explode( ',', $list ) ); |
|
|
145
|
+foreach ((array) $fields as $resource => $list) { |
|
|
146
|
+ $fields[$resource] = array_flip(explode(',', $list)); |
|
147
|
147
|
} |
|
148
|
148
|
|
|
149
|
149
|
|
|
@@ -156,42 +156,42 @@ discard block |
|
|
block discarded – undo |
|
156
|
156
|
|
|
157
|
157
|
"links": { |
|
158
|
158
|
|
|
159
|
|
- <?php if( is_array( $this->get( 'data' ) ) ) : ?> |
|
|
159
|
+ <?php if (is_array($this->get('data'))) : ?> |
|
160
|
160
|
|
|
161
|
|
- <?php if( $first !== null ) : ?> |
|
|
161
|
+ <?php if ($first !== null) : ?> |
|
162
|
162
|
|
|
163
|
|
- "first": "<?php $params['page']['offset'] = $first; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
|
163
|
+ "first": "<?php $params['page']['offset'] = $first; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
164
|
164
|
|
|
165
|
165
|
<?php endif; ?> |
|
166
|
|
- <?php if( $prev !== null ) : ?> |
|
|
166
|
+ <?php if ($prev !== null) : ?> |
|
167
|
167
|
|
|
168
|
|
- "prev": "<?php $params['page']['offset'] = $prev; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
|
168
|
+ "prev": "<?php $params['page']['offset'] = $prev; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
169
|
169
|
|
|
170
|
170
|
<?php endif; ?> |
|
171
|
|
- <?php if( $next !== null ) : ?> |
|
|
171
|
+ <?php if ($next !== null) : ?> |
|
172
|
172
|
|
|
173
|
|
- "next": "<?php $params['page']['offset'] = $next; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
|
173
|
+ "next": "<?php $params['page']['offset'] = $next; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
174
|
174
|
|
|
175
|
175
|
<?php endif; ?> |
|
176
|
|
- <?php if( $last !== null ) : ?> |
|
|
176
|
+ <?php if ($last !== null) : ?> |
|
177
|
177
|
|
|
178
|
|
- "last": "<?php $params['page']['offset'] = $last; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>", |
|
|
178
|
+ "last": "<?php $params['page']['offset'] = $last; echo $this->url($target, $cntl, $action, $params, [], $config); ?>", |
|
179
|
179
|
|
|
180
|
180
|
<?php endif; ?> |
|
181
|
181
|
<?php endif; ?> |
|
182
|
182
|
|
|
183
|
|
- "self": "<?php $params['page']['offset'] = $offset; echo $this->url( $target, $cntl, $action, $params, [], $config ); ?>" |
|
|
183
|
+ "self": "<?php $params['page']['offset'] = $offset; echo $this->url($target, $cntl, $action, $params, [], $config); ?>" |
|
184
|
184
|
}, |
|
185
|
185
|
|
|
186
|
|
- <?php if( isset( $this->errors ) ) : ?> |
|
|
186
|
+ <?php if (isset($this->errors)) : ?> |
|
187
|
187
|
|
|
188
|
|
- "errors": <?php echo $this->partial( $this->config( $this->get( 'partial-errors', 'admin/jsonadm/partials/template-errors' ), 'partials/errors-standard.php' ), array( 'errors' => $this->errors ) ); ?> |
|
|
188
|
+ "errors": <?php echo $this->partial($this->config($this->get('partial-errors', 'admin/jsonadm/partials/template-errors'), 'partials/errors-standard.php'), array('errors' => $this->errors)); ?> |
|
189
|
189
|
|
|
190
|
|
- <?php elseif( isset( $this->data ) ) : ?> |
|
|
190
|
+ <?php elseif (isset($this->data)) : ?> |
|
191
|
191
|
|
|
192
|
|
- "data": <?php echo $this->partial( $this->config( $this->get( 'partial-data', 'admin/jsonadm/partials/template-data' ), 'partials/data-standard.php' ), array( 'data' => $this->get( 'data' ), 'childItems' => $this->get( 'childItems', [] ), 'listItems' => $this->get( 'listItems', [] ) ) ); ?>, |
|
|
192
|
+ "data": <?php echo $this->partial($this->config($this->get('partial-data', 'admin/jsonadm/partials/template-data'), 'partials/data-standard.php'), array('data' => $this->get('data'), 'childItems' => $this->get('childItems', []), 'listItems' => $this->get('listItems', []))); ?>, |
|
193
|
193
|
|
|
194
|
|
- "included": <?php echo $this->partial( $this->config( $this->get( 'partial-included', 'admin/jsonadm/partials/template-included' ), 'partials/included-standard.php' ), array( 'childItems' => $this->get( 'childItems', [] ), 'refItems' => $this->get( 'refItems', [] ) ) ); ?> |
|
|
194
|
+ "included": <?php echo $this->partial($this->config($this->get('partial-included', 'admin/jsonadm/partials/template-included'), 'partials/included-standard.php'), array('childItems' => $this->get('childItems', []), 'refItems' => $this->get('refItems', []))); ?> |
|
195
|
195
|
|
|
196
|
196
|
<?php endif; ?> |
|
197
|
197
|
|