← All changes | lib/social/includes/class-log.php +53 -58 6.2.1 → 6.2.5 View file →

		@@ -131,9 +131,9 @@
131	131	return false;
132	132	}
133	133
134	134	// Return.
135		- return absint( $log_settings['enabled'] );
	135	+ return (bool) absint( $log_settings['enabled'] );
136	136
137	137	}
138	138
139	139	/**
		@@ -206,11 +206,8 @@
206	206	)
207	207	);
208	208
209	209	// Bail if no bulk action.
210		- if ( ! is_array( $bulk_action ) ) {
211		- return;
212		- }
213	210	if ( ! count( $bulk_action ) ) {
214	211	return;
215	212	}
216	213
		@@ -336,9 +333,9 @@
336	333	return;
337	334	}
338	335
339	336	// Check if we need to hide the meta box by the logged in User's role.
340		- if ( wp_get_current_user() && is_array( wp_get_current_user()->roles ) && ! empty( wp_get_current_user()->roles ) ) {
	337	+ if ( ! empty( wp_get_current_user()->roles ) ) {
341	338	// Bail if we're hiding the meta boxes for the logged in User's role.
342	339	if ( $this->base->get_class( 'settings' )->get_setting( 'hide_meta_box_by_roles', '[' . wp_get_current_user()->roles[0] . ']' ) ) {
343	340	return;
344	341	}
		@@ -369,9 +366,9 @@
369	366	* Outputs the plugin's log of existing status update calls made to the API
370	367	*
371	368	* @since 3.0.0
372	369	*
373		- * @param WP_Post $post Post.
	370	+ * @param \WP_Post $post Post.
374	371	*/
375	372	public function output_post_log( $post ) {
376	373
377	374	// Get log.
		@@ -704,9 +701,9 @@
704	701	*
705	702	* @since 3.9.6
706	703	*
707	704	* @param array $params Query Parameters (false = all records).
708		- * @return string WHERE SQL clause
	705	+ * @return string|false WHERE SQL clause
709	706	*/
710	707	private function build_where_clause( $params ) {
711	708
712	709	global $wpdb;
		@@ -717,63 +714,61 @@
717	714	}
718	715
719	716	// Build where clauses.
720	717	$where = array();
721		- if ( $params !== false && is_array( $params ) && count( $params ) > 0 ) {
722		- foreach ( $params as $key => $value ) {
723		- // Skip blank params.
724		- if ( empty( $value ) ) {
725		- continue;
726		- }
	718	+ foreach ( $params as $key => $value ) {
	719	+ // Skip blank params.
	720	+ if ( empty( $value ) ) {
	721	+ continue;
	722	+ }
727	723
728		- // Build condition based on the key.
729		- switch ( $key ) {
730		- case 'post_title':
	724	+ // Build condition based on the key.
	725	+ switch ( $key ) {
	726	+ case 'post_title':
	727	+ $where[] = $wpdb->prepare(
	728	+ '(%i LIKE %s OR status_text LIKE %s OR result_message LIKE %s)',
	729	+ $key,
	730	+ '%' . $wpdb->esc_like( $value ) . '%',
	731	+ '%' . $wpdb->esc_like( $value ) . '%',
	732	+ '%' . $wpdb->esc_like( $value ) . '%'
	733	+ );
	734	+ break;
	735	+
	736	+ case 'request_sent_start_date':
	737	+ if ( ! empty( $params['request_sent_end_date'] ) && $params['request_sent_start_date'] > $params['request_sent_end_date'] ) {
731	738	$where[] = $wpdb->prepare(
732		- '(%i LIKE %s OR status_text LIKE %s OR result_message LIKE %s)',
733		- $key,
734		- '%' . $wpdb->esc_like( $value ) . '%',
735		- '%' . $wpdb->esc_like( $value ) . '%',
736		- '%' . $wpdb->esc_like( $value ) . '%'
	739	+ 'request_sent <= %s',
	740	+ $value . ' 23:59:59'
737	741	);
738		- break;
	742	+ } else {
	743	+ $where[] = $wpdb->prepare(
	744	+ 'request_sent >= %s',
	745	+ $value . ' 00:00:00'
	746	+ );
	747	+ }
	748	+ break;
739	749
740		- case 'request_sent_start_date':
741		- if ( ! empty( $params['request_sent_end_date'] ) && $params['request_sent_start_date'] > $params['request_sent_end_date'] ) {
742		- $where[] = $wpdb->prepare(
743		- 'request_sent <= %s',
744		- $value . ' 23:59:59'
745		- );
746		- } else {
747		- $where[] = $wpdb->prepare(
748		- 'request_sent >= %s',
749		- $value . ' 00:00:00'
750		- );
751		- }
752		- break;
753		-
754		- case 'request_sent_end_date':
755		- if ( ! empty( $params['request_sent_start_date'] ) && $params['request_sent_start_date'] > $params['request_sent_end_date'] ) {
756		- $where[] = $wpdb->prepare(
757		- 'request_sent >= %s',
758		- $value . ' 00:00:00'
759		- );
760		- } else {
761		- $where[] = $wpdb->prepare(
762		- 'request_sent <= %s',
763		- $value . ' 23:59:59'
764		- );
765		- }
766		- break;
767		-
768		- default:
	750	+ case 'request_sent_end_date':
	751	+ if ( ! empty( $params['request_sent_start_date'] ) && $params['request_sent_start_date'] > $params['request_sent_end_date'] ) {
769	752	$where[] = $wpdb->prepare(
770		- '%i = %s',
771		- $key,
772		- $value
	753	+ 'request_sent >= %s',
	754	+ $value . ' 00:00:00'
773	755	);
774		- break;
775		- }
	756	+ } else {
	757	+ $where[] = $wpdb->prepare(
	758	+ 'request_sent <= %s',
	759	+ $value . ' 23:59:59'
	760	+ );
	761	+ }
	762	+ break;
	763	+
	764	+ default:
	765	+ $where[] = $wpdb->prepare(
	766	+ '%i = %s',
	767	+ $key,
	768	+ $value
	769	+ );
	770	+ break;
776	771	}
777	772	}
778	773
779	774	if ( ! count( $where ) ) {
		@@ -900,9 +895,9 @@
900	895	* Deletes all Log entries older than the given date
901	896	*
902	897	* @since 3.9.8
903	898	*
904		- * @param datetime $date_time Date and Time.
	899	+ * @param \DateTime $date_time Date and Time.
905	900	* @return bool Success
906	901	*/
907	902	public function delete_by_request_sent_cutoff( $date_time ) {
908	903
		@@ -1052,9 +1047,9 @@
1052	1047	// Define HTML output.
1053	1048	$html = '';
1054	1049
1055	1050	// If no results, return a single row.
1056		- if ( ! $log || ! is_array( $log ) || count( $log ) === 0 ) {
	1051	+ if ( ! $log ) {
1057	1052	$html = '
1058	1053	<tr>
1059	1054	<td colspan="' . $colspan . '">' .
1060	1055	sprintf(