| @@ -1,14 +1,18 @@ | ||
| 1 | +<?php | |
| 2 | +// phpcs:disable WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound -- View file, its variables are local to the include scope, not true globals. | |
| 3 | +defined('ABSPATH') || die('Restricted Access'); | |
| 4 | +?> | |
| 1 | 5 | <h2 class="cell acym__title acym__title__secondary margin-top-2 acym__fields__edit__section__title" id="acym__fields__edit__section__title--values"> |
| 2 | - <?php echo acym_translation('ACYM_FIELD_VALUES'); ?> | |
| 6 | + <?php echo esc_html(acym_translation('ACYM_FIELD_VALUES')); ?> | |
| 3 | 7 | </h2> |
| 4 | 8 | |
| 5 | 9 | <label class="cell large-11 acym__fields__change" id="acym__fields__custom-text"> |
| 6 | - <?php echo acym_translation('ACYM_CUSTOM_TEXT'); ?> | |
| 10 | + <?php echo esc_html(acym_translation('ACYM_CUSTOM_TEXT')); ?> | |
| 7 | 11 | <textarea |
| 8 | 12 | name="field[option][custom_text]" |
| 9 | 13 | cols="30" |
| 10 | - rows="10"><?php echo empty($data['field']->option->custom_text) ? '' : $data['field']->option->custom_text; ?></textarea> | |
| 14 | + rows="10"><?php echo empty($data['field']->option->custom_text) ? '' : esc_html($data['field']->option->custom_text); ?></textarea> | |
| 11 | 15 | </label> |
| 12 | 16 | |
| 13 | 17 | <div class="cell grid-x acym__fields__change margin-bottom-2" id="acym__fields__value"> |
| 14 | 18 | <div class="cell grid-x acym__listing"> |
| @@ -14,15 +18,15 @@ | ||
| 14 | 18 | <div class="cell grid-x acym__listing"> |
| 15 | 19 | <div class="grid-x cell acym__listing__fields__header"> |
| 16 | 20 | <div class="medium-1 cell acym__listing__header__title"></div> |
| 17 | 21 | <div class="medium-4 cell acym__listing__header__title text-center"> |
| 18 | - <?php echo acym_translation('ACYM_VALUE'); ?> | |
| 22 | + <?php echo esc_html(acym_translation('ACYM_VALUE')); ?> | |
| 19 | 23 | </div> |
| 20 | 24 | <div class="medium-4 cell acym__listing__header__title text-center"> |
| 21 | - <?php echo acym_translation('ACYM_TITLE'); ?> | |
| 25 | + <?php echo esc_html(acym_translation('ACYM_TITLE')); ?> | |
| 22 | 26 | </div> |
| 23 | 27 | <div class="medium-2 cell acym__listing__header__title text-center"> |
| 24 | - <?php echo acym_translation('ACYM_DISABLED'); ?> | |
| 28 | + <?php echo esc_html(acym_translation('ACYM_DISABLED')); ?> | |
| 25 | 29 | </div> |
| 26 | 30 | <div class="small-1 cell acym__listing__header__title"></div> |
| 27 | 31 | </div> |
| 28 | 32 | <div class="acym__fields__values__listing__sortable cell grid-x"> |
| @@ -37,9 +41,9 @@ | ||
| 37 | 41 | <input type="text" name="field[value][value][]" class="cell medium-4 acym__fields__value__value" value=""> |
| 38 | 42 | <input type="text" name="field[value][title][]" class="cell medium-4 acym__fields__value__title" value=""> |
| 39 | 43 | <div class="cell medium-2"> |
| 40 | 44 | <?php |
| 41 | - echo acym_select( | |
| 45 | + acym_select( | |
| 42 | 46 | [ |
| 43 | 47 | 'n' => acym_translation('ACYM_NO'), |
| 44 | 48 | 'y' => acym_translation('ACYM_YES'), |
| 45 | 49 | ], |
| @@ -49,9 +53,12 @@ | ||
| 49 | 53 | 'class' => 'acym__fields__edit__select acym__select', |
| 50 | 54 | 'acym-data-infinite' => true, |
| 51 | 55 | ], |
| 52 | 56 | 'value', |
| 53 | - 'name' | |
| 57 | + 'name', | |
| 58 | + null, | |
| 59 | + false, | |
| 60 | + true | |
| 54 | 61 | ); ?> |
| 55 | 62 | </div> |
| 56 | 63 | </div> |
| 57 | 64 | <?php } else { |
| @@ -63,13 +70,13 @@ | ||
| 63 | 70 | <i class="acymicon-ellipsis-h cell acym__color__dark-gray"></i> |
| 64 | 71 | <i class="acymicon-ellipsis-h cell acym__color__dark-gray"></i> |
| 65 | 72 | </div> |
| 66 | 73 | </div> |
| 67 | - <input type="text" name="field[value][value][]" class="cell medium-4 acym__fields__value__value" value="<?php echo acym_escape($value->value); ?>"> | |
| 68 | - <input type="text" name="field[value][title][]" class="cell medium-4 acym__fields__value__title" value="<?php echo acym_escape($value->title); ?>"> | |
| 74 | + <input type="text" name="field[value][value][]" class="cell medium-4 acym__fields__value__value" value="<?php echo esc_attr($value->value); ?>"> | |
| 75 | + <input type="text" name="field[value][title][]" class="cell medium-4 acym__fields__value__title" value="<?php echo esc_attr($value->title); ?>"> | |
| 69 | 76 | <div class="cell medium-2"> |
| 70 | 77 | <?php |
| 71 | - echo acym_select( | |
| 78 | + acym_select( | |
| 72 | 79 | [ |
| 73 | 80 | 'n' => acym_translation('ACYM_NO'), |
| 74 | 81 | 'y' => acym_translation('ACYM_YES'), |
| 75 | 82 | ], |
| @@ -79,9 +86,12 @@ | ||
| 79 | 86 | 'class' => 'acym__fields__edit__select acym__select', |
| 80 | 87 | 'acym-data-infinite' => true, |
| 81 | 88 | ], |
| 82 | 89 | 'value', |
| 83 | - 'name' | |
| 90 | + 'name', | |
| 91 | + null, | |
| 92 | + false, | |
| 93 | + true | |
| 84 | 94 | ); |
| 85 | 95 | ?> |
| 86 | 96 | </div> |
| 87 | 97 | <i class="cell acymicon-close small-1 acym__color__red cursor-pointer acym__field__delete__value"></i> |
| @@ -89,19 +99,21 @@ | ||
| 89 | 99 | <?php $i++; |
| 90 | 100 | } ?> |
| 91 | 101 | <?php } ?> |
| 92 | 102 | </div> |
| 93 | - <button type="button" class="button button-secondary margin-top-1" id="acym__fields__value__add-value"><?php echo acym_translation( | |
| 94 | - 'ACYM_ADD_VALUE' | |
| 103 | + <button type="button" class="button button-secondary margin-top-1" id="acym__fields__value__add-value"><?php echo esc_html( | |
| 104 | + acym_translation( | |
| 105 | + 'ACYM_ADD_VALUE' | |
| 106 | + ) | |
| 95 | 107 | ); ?></button> |
| 96 | 108 | </div> |
| 97 | 109 | </div> |
| 98 | 110 | |
| 99 | 111 | <div class="cell grid-x acym__fields__change" id="acym__fields__from-db"> |
| 100 | - <p class="cell"><?php echo acym_translation('ACYM_VALUES_FROM_DB'); ?></p> | |
| 101 | - <label class="cell margin-top-1 medium-5"><?php echo acym_translation('ACYM_DATABASE'); ?> | |
| 112 | + <p class="cell"><?php echo esc_html(acym_translation('ACYM_VALUES_FROM_DB')); ?></p> | |
| 113 | + <label class="cell margin-top-1 medium-5"><?php echo esc_html(acym_translation('ACYM_DATABASE')); ?> | |
| 102 | 114 | <?php |
| 103 | - echo acym_select( | |
| 115 | + acym_select( | |
| 104 | 116 | $data['database'], |
| 105 | 117 | 'fieldDB[database]', |
| 106 | 118 | empty($data['field']->fieldDB->database) ? '' : $data['field']->fieldDB->database, |
| 107 | 119 | [ |
| @@ -108,16 +120,19 @@ | ||
| 108 | 120 | 'class' => 'acym__fields__edit__select acym__select', |
| 109 | 121 | 'acym-data-infinite' => true, |
| 110 | 122 | ], |
| 111 | 123 | 'value', |
| 112 | - 'name' | |
| 124 | + 'name', | |
| 125 | + null, | |
| 126 | + false, | |
| 127 | + true | |
| 113 | 128 | ); |
| 114 | 129 | ?> |
| 115 | 130 | </label> |
| 116 | 131 | <div class="medium-1"></div> |
| 117 | - <label class="cell margin-top-1 medium-5"><?php echo acym_translation('ACYM_TABLES'); ?> | |
| 132 | + <label class="cell margin-top-1 medium-5"><?php echo esc_html(acym_translation('ACYM_TABLES')); ?> | |
| 118 | 133 | <?php |
| 119 | - echo acym_select( | |
| 134 | + acym_select( | |
| 120 | 135 | empty($data['field']->fieldDB->tables) ? [] : $data['field']->fieldDB->tables, |
| 121 | 136 | 'fieldDB[table]', |
| 122 | 137 | empty($data['field']->fieldDB->table) ? '' : $data['field']->fieldDB->table, |
| 123 | 138 | [ |
| @@ -124,15 +139,18 @@ | ||
| 124 | 139 | 'class' => 'acym__fields__edit__select acym__select', |
| 125 | 140 | 'acym-data-infinite' => true, |
| 126 | 141 | ], |
| 127 | 142 | 'value', |
| 128 | - 'name' | |
| 143 | + 'name', | |
| 144 | + null, | |
| 145 | + false, | |
| 146 | + true | |
| 129 | 147 | ); |
| 130 | 148 | ?> |
| 131 | 149 | </label> |
| 132 | - <label class="cell margin-top-1 medium-5"><?php echo acym_translation('ACYM_VALUE'); ?> | |
| 150 | + <label class="cell margin-top-1 medium-5"><?php echo esc_html(acym_translation('ACYM_VALUE')); ?> | |
| 133 | 151 | <?php |
| 134 | - echo acym_select( | |
| 152 | + acym_select( | |
| 135 | 153 | empty($data['field']->fieldDB->columns) ? [] : $data['field']->fieldDB->columns, |
| 136 | 154 | 'fieldDB[value]', |
| 137 | 155 | empty($data['field']->fieldDB->value) ? '' : $data['field']->fieldDB->value, |
| 138 | 156 | [ |
| @@ -139,16 +157,19 @@ | ||
| 139 | 157 | 'class' => 'acym__fields__edit__select acym__fields__database__columns acym__select', |
| 140 | 158 | 'acym-data-infinite' => true, |
| 141 | 159 | ], |
| 142 | 160 | 'value', |
| 143 | - 'name' | |
| 161 | + 'name', | |
| 162 | + null, | |
| 163 | + false, | |
| 164 | + true | |
| 144 | 165 | ); |
| 145 | 166 | ?> |
| 146 | 167 | </label> |
| 147 | 168 | <div class="medium-1"></div> |
| 148 | - <label class="cell margin-top-1 medium-5"><?php echo acym_translation('ACYM_TITLE'); ?> | |
| 169 | + <label class="cell margin-top-1 medium-5"><?php echo esc_html(acym_translation('ACYM_TITLE')); ?> | |
| 149 | 170 | <?php |
| 150 | - echo acym_select( | |
| 171 | + acym_select( | |
| 151 | 172 | empty($data['field']->fieldDB->columns) ? [] : $data['field']->fieldDB->columns, |
| 152 | 173 | 'fieldDB[title]', |
| 153 | 174 | empty($data['field']->fieldDB->title) ? '' : $data['field']->fieldDB->title, |
| 154 | 175 | [ |
| @@ -155,15 +176,18 @@ | ||
| 155 | 176 | 'class' => 'acym__fields__edit__select acym__fields__database__columns acym__select', |
| 156 | 177 | 'acym-data-infinite' => true, |
| 157 | 178 | ], |
| 158 | 179 | 'value', |
| 159 | - 'name' | |
| 180 | + 'name', | |
| 181 | + null, | |
| 182 | + false, | |
| 183 | + true | |
| 160 | 184 | ); |
| 161 | 185 | ?> |
| 162 | 186 | </label> |
| 163 | - <label class="cell margin-top-1 medium-4 margin-right-1"><?php echo acym_translation('ACYM_WHERE'); ?> | |
| 187 | + <label class="cell margin-top-1 medium-4"><?php echo esc_html(acym_translation('ACYM_WHERE')); ?> | |
| 164 | 188 | <?php |
| 165 | - echo acym_select( | |
| 189 | + acym_select( | |
| 166 | 190 | empty($data['field']->fieldDB->columns) ? [] : $data['field']->fieldDB->columns, |
| 167 | 191 | 'fieldDB[where]', |
| 168 | 192 | empty($data['field']->fieldDB->where) ? '' : $data['field']->fieldDB->where, |
| 169 | 193 | [ |
| @@ -170,33 +194,37 @@ | ||
| 170 | 194 | 'class' => 'acym__fields__edit__select acym__fields__database__columns acym__select', |
| 171 | 195 | 'acym-data-infinite' => true, |
| 172 | 196 | ], |
| 173 | 197 | 'value', |
| 174 | - 'name' | |
| 198 | + 'name', | |
| 199 | + null, | |
| 200 | + false, | |
| 201 | + true | |
| 175 | 202 | ); |
| 176 | 203 | ?> |
| 177 | 204 | </label> |
| 178 | - <label class="cell margin-top-1 medium-3 margin-right-1"><?php echo acym_translation('ACYM_WHERE_OPERATION'); ?> | |
| 205 | + <label class="cell margin-top-1 medium-3 margin-left-1 margin-right-1"> | |
| 206 | + <?php echo esc_html(acym_translation('ACYM_WHERE_OPERATION')); ?> | |
| 179 | 207 | <?php |
| 180 | - $operator = $data['operatorType']; | |
| 181 | - echo $operator->display( | |
| 208 | + $data['operatorType']->display( | |
| 182 | 209 | 'fieldDB[where_sign]', |
| 183 | 210 | empty($data['field']->fieldDB->where_sign) ? '' : $data['field']->fieldDB->where_sign, |
| 184 | - 'acym__fields__edit__select acym__select' | |
| 211 | + 'acym__fields__edit__select acym__select', | |
| 212 | + true | |
| 185 | 213 | ); |
| 186 | 214 | ?> |
| 187 | 215 | </label> |
| 188 | - <label class="cell margin-top-1 medium-4"><?php echo acym_translation('ACYM_WHERE_VALUE'); ?> | |
| 216 | + <label class="cell margin-top-1 medium-4"><?php echo esc_html(acym_translation('ACYM_WHERE_VALUE')); ?> | |
| 189 | 217 | <input type="text" |
| 190 | - name="fieldDB[where_value]" | |
| 191 | - class="margin-bottom-0" | |
| 192 | - value="<?php echo isset($data['field']->fieldDB->where_value) && strlen($data['field']->fieldDB->where_value) > 0 ? acym_escape( | |
| 218 | + name="fieldDB[where_value]" | |
| 219 | + class="margin-bottom-0" | |
| 220 | + value="<?php echo isset($data['field']->fieldDB->where_value) && strlen($data['field']->fieldDB->where_value) > 0 ? esc_attr( | |
| 193 | 221 | $data['field']->fieldDB->where_value |
| 194 | 222 | ) : ''; ?>"> |
| 195 | 223 | </label> |
| 196 | - <label class="cell margin-top-1 medium-5"><?php echo acym_translation('ACYM_ORDER_BY'); ?> | |
| 224 | + <label class="cell margin-top-1 medium-5"><?php echo esc_html(acym_translation('ACYM_ORDER_BY')); ?> | |
| 197 | 225 | <?php |
| 198 | - echo acym_select( | |
| 226 | + acym_select( | |
| 199 | 227 | empty($data['field']->fieldDB->columns) ? [] : $data['field']->fieldDB->columns, |
| 200 | 228 | 'fieldDB[order_by]', |
| 201 | 229 | empty($data['field']->fieldDB->order_by) ? '' : $data['field']->fieldDB->order_by, |
| 202 | 230 | [ |
| @@ -203,16 +231,19 @@ | ||
| 203 | 231 | 'class' => 'acym__fields__edit__select acym__fields__database__columns acym__select', |
| 204 | 232 | 'acym-data-infinite' => true, |
| 205 | 233 | ], |
| 206 | 234 | 'value', |
| 207 | - 'name' | |
| 235 | + 'name', | |
| 236 | + null, | |
| 237 | + false, | |
| 238 | + true | |
| 208 | 239 | ); |
| 209 | 240 | ?> |
| 210 | 241 | </label> |
| 211 | 242 | <div class="medium-1"></div> |
| 212 | - <label class="cell margin-top-1 medium-5"><?php echo acym_translation('ACYM_SORT_ORDERING'); ?> | |
| 243 | + <label class="cell margin-top-1 medium-5"><?php echo esc_html(acym_translation('ACYM_SORT_ORDERING')); ?> | |
| 213 | 244 | <?php |
| 214 | - echo acym_select( | |
| 245 | + acym_select( | |
| 215 | 246 | ['asc' => 'ASC', 'desc' => 'DESC'], |
| 216 | 247 | 'fieldDB[sort_order]', |
| 217 | 248 | empty($data['field']->fieldDB->sort_order) ? '' : $data['field']->fieldDB->sort_order, |
| 218 | 249 | [ |
| @@ -219,9 +250,12 @@ | ||
| 219 | 250 | 'class' => 'acym__fields__edit__select acym__select', |
| 220 | 251 | 'acym-data-infinite' => true, |
| 221 | 252 | ], |
| 222 | 253 | 'value', |
| 223 | - 'name' | |
| 254 | + 'name', | |
| 255 | + null, | |
| 256 | + false, | |
| 257 | + true | |
| 224 | 258 | ); |
| 225 | 259 | ?> |
| 226 | 260 | </label> |
| 227 | 261 | </div> |