← All changes | classes/models/FrmPersonalData.php +10 -16 6.26 → trunk View file →

		@@ -71,9 +71,9 @@
71	71	);
72	72
73	73	$entries = $this->get_user_entries( $email );
74	74
75		- if ( empty( $entries ) ) {
	75	+ if ( ! $entries ) {
76	76	return $data_to_export;
77	77	}
78	78
79	79	foreach ( $entries as $entry ) {
		@@ -103,9 +103,9 @@
103	103	'messages' => array(),
104	104	'done' => true,
105	105	);
106	106
107		- if ( empty( $email ) ) {
	107	+ if ( ! $email ) {
108	108	return $data_removed;
109	109	}
110	110
111	111	$this->page = absint( $page );
		@@ -110,9 +110,9 @@
110	110
111	111	$this->page = absint( $page );
112	112	$entries = $this->get_user_entries( $email );
113	113
114		- if ( empty( $entries ) ) {
	114	+ if ( ! $entries ) {
115	115	return $data_removed;
116	116	}
117	117
118	118	// TODO: Add an option to anonymize the entries with wp_privacy_anonymize_data( 'email', '[email protected]' );
		@@ -145,25 +145,21 @@
145	145	'order_by' => 'item_id ASC',
146	146	'limit' => $this->get_current_page(),
147	147	);
148	148
149		- $user = get_user_by( 'email', $email );
150		-
	149	+ $user = get_user_by( 'email', $email );
151	150	$entries_by_email = FrmDb::get_col( 'frm_item_metas', array( 'meta_value' => $email ), 'item_id', $query_args );
152	151
153		- if ( empty( $user ) ) {
154		- // no matching user, so return the entry ids we have
	152	+ if ( ! $user ) {
	153	+ // No matching user, so return the entry ids we have
155	154	return $entries_by_email;
156	155	}
157	156
158	157	$query_args['order_by'] = 'id ASC';
	158	+ $entries_by_user = FrmDb::get_col( 'frm_items', array( 'user_id' => $user->ID ), 'id', $query_args );
	159	+ $entry_ids = array_merge( $entries_by_user, $entries_by_email );
159	160
160		- $entries_by_user = FrmDb::get_col( 'frm_items', array( 'user_id' => $user->ID ), 'id', $query_args );
161		-
162		- $entry_ids = array_merge( $entries_by_user, $entries_by_email );
163		- $entry_ids = array_unique( array_filter( $entry_ids ) );
164		-
165		- return $entry_ids;
	161	+ return array_unique( array_filter( $entry_ids ) );
166	162	}
167	163
168	164	/**
169	165	* @return string
		@@ -169,9 +165,8 @@
169	165	* @return string
170	166	*/
171	167	private function get_current_page() {
172	168	$start = ( $this->page - 1 ) * $this->limit;
173		-
174	169	return FrmDb::esc_limit( $start . ',' . $this->limit );
175	170	}
176	171
177	172	/**
		@@ -179,10 +174,9 @@
179	174	*
180	175	* @return array
181	176	*/
182	177	private function prepare_entry_data( $entry ) {
183		- $entry = FrmEntry::getOne( $entry, true );
184		-
	178	+ $entry = FrmEntry::getOne( $entry, true );
185	179	$entry_data = array();
186	180
187	181	foreach ( $entry->metas as $field_id => $meta ) {
188	182	$field = FrmField::getOne( $field_id );