| @@ -75,10 +75,8 @@ | ||
| 75 | 75 | * |
| 76 | 76 | * @since 2.04 |
| 77 | 77 | * |
| 78 | 78 | * @param int|string $entry_id |
| 79 | - * | |
| 80 | - * @return void | |
| 81 | 79 | */ |
| 82 | 80 | protected function init_entry( $entry_id ) { |
| 83 | 81 | $this->entry = FrmEntry::getOne( $entry_id, true ); |
| 84 | 82 | } |
| @@ -96,10 +94,8 @@ | ||
| 96 | 94 | /** |
| 97 | 95 | * Set the form_id property |
| 98 | 96 | * |
| 99 | 97 | * @since 2.04 |
| 100 | - * | |
| 101 | - * @return void | |
| 102 | 98 | */ |
| 103 | 99 | protected function init_form_id() { |
| 104 | 100 | $this->form_id = (int) $this->entry->form_id; |
| 105 | 101 | } |
| @@ -109,10 +105,8 @@ | ||
| 109 | 105 | * |
| 110 | 106 | * @since 2.04 |
| 111 | 107 | * |
| 112 | 108 | * @param array $atts |
| 113 | - * | |
| 114 | - * @return void | |
| 115 | 109 | */ |
| 116 | 110 | protected function init_include_fields( $atts ) { |
| 117 | 111 | |
| 118 | 112 | // For reverse compatibility with the fields parameter |
| @@ -152,10 +146,8 @@ | ||
| 152 | 146 | * |
| 153 | 147 | * @since 2.04 |
| 154 | 148 | * |
| 155 | 149 | * @param array $atts |
| 156 | - * | |
| 157 | - * @return void | |
| 158 | 150 | */ |
| 159 | 151 | protected function init_exclude_fields( $atts ) { |
| 160 | 152 | $this->exclude_fields = $this->prepare_array_property( 'exclude_fields', $atts ); |
| 161 | 153 | |
| @@ -198,10 +190,8 @@ | ||
| 198 | 190 | /** |
| 199 | 191 | * Set the fields property |
| 200 | 192 | * |
| 201 | 193 | * @since 2.04 |
| 202 | - * | |
| 203 | - * @return void | |
| 204 | 194 | */ |
| 205 | 195 | protected function init_fields() { |
| 206 | 196 | $this->fields = FrmField::get_all_for_form( $this->form_id, '', 'exclude', 'exclude' ); |
| 207 | 197 | |
| @@ -226,10 +216,8 @@ | ||
| 226 | 216 | /** |
| 227 | 217 | * Set the field_values property |
| 228 | 218 | * |
| 229 | 219 | * @since 2.04 |
| 230 | - * | |
| 231 | - * @return void | |
| 232 | 220 | */ |
| 233 | 221 | protected function init_field_values() { |
| 234 | 222 | foreach ( $this->fields as $field ) { |
| 235 | 223 | if ( $this->is_field_included( $field ) ) { |
| @@ -252,10 +240,8 @@ | ||
| 252 | 240 | /** |
| 253 | 241 | * Set the user_info property |
| 254 | 242 | * |
| 255 | 243 | * @since 2.04 |
| 256 | - * | |
| 257 | - * @return void | |
| 258 | 244 | */ |
| 259 | 245 | protected function init_user_info() { |
| 260 | 246 | if ( isset( $this->entry->description ) ) { |
| 261 | 247 | $entry_description = (array) $this->entry->description; |
| @@ -265,31 +251,23 @@ | ||
| 265 | 251 | 'referrer' => '', |
| 266 | 252 | ); |
| 267 | 253 | } |
| 268 | 254 | |
| 269 | - $ip = array( | |
| 255 | + $ip = array( | |
| 270 | 256 | 'label' => __( 'IP Address', 'formidable' ), |
| 271 | 257 | 'value' => $this->entry->ip, |
| 272 | 258 | ); |
| 259 | + | |
| 273 | 260 | $browser = array( |
| 274 | 261 | 'label' => __( 'User-Agent (Browser/OS)', 'formidable' ), |
| 275 | - 'value' => isset( $entry_description['browser'] ) ? FrmEntriesHelper::get_browser( $entry_description['browser'] ) : '', | |
| 262 | + 'value' => FrmEntriesHelper::get_browser( $entry_description['browser'] ), | |
| 276 | 263 | ); |
| 264 | + | |
| 277 | 265 | $referrer = array( |
| 278 | 266 | 'label' => __( 'Referrer', 'formidable' ), |
| 279 | - 'value' => isset( $entry_description['referrer'] ) ? $entry_description['referrer'] : '', | |
| 267 | + 'value' => $entry_description['referrer'], | |
| 280 | 268 | ); |
| 281 | 269 | |
| 282 | - /** | |
| 283 | - * Allow the referrer to be modified. | |
| 284 | - * | |
| 285 | - * @since 5.5.1 | |
| 286 | - * | |
| 287 | - * @param array $referrer | |
| 288 | - * @param array @entry_description | |
| 289 | - */ | |
| 290 | - $referrer = apply_filters( 'frm_user_info_referrer', $referrer, $entry_description, $this->entry ); | |
| 291 | - | |
| 292 | 270 | $this->user_info = array( |
| 293 | 271 | 'ip' => $ip, |
| 294 | 272 | 'browser' => $browser, |
| 295 | 273 | 'referrer' => $referrer, |
| @@ -351,10 +329,8 @@ | ||
| 351 | 329 | * |
| 352 | 330 | * @since 2.04 |
| 353 | 331 | * |
| 354 | 332 | * @param stdClass $field |
| 355 | - * | |
| 356 | - * @return void | |
| 357 | 333 | */ |
| 358 | 334 | protected function add_field_values( $field ) { |
| 359 | 335 | $this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry ); |
| 360 | 336 | } |