← All changes | src/class-loader.php +55 -24 3.0.3 → 3.2 View file →

		@@ -38,8 +38,9 @@
38	38	$this->box_ids_to_load = $this->filter_boxes();
39	39
40	40	// Only add other hooks if necessary
41	41	if( count( $this->box_ids_to_load ) > 0 ) {
	42	+ add_action( 'wp_footer', array( $this, 'print_boxes_content' ) );
42	43	add_action( 'wp_enqueue_scripts', array( $this, 'load_assets' ), 90 );
43	44	}
44	45	}
45	46
		@@ -71,8 +72,9 @@
71	72	$string = strtolower( $string );
72	73
73	74	foreach( $patterns as $pattern ) {
74	75
	76	+ $pattern = rtrim( $pattern, '/' );
75	77	$pattern = strtolower( $pattern );
76	78
77	79	if( function_exists( 'fnmatch' ) ) {
78	80	$match = fnmatch( $pattern, $string );
		@@ -87,8 +89,24 @@
87	89
88	90	return false;
89	91	}
90	92
	93	+ /**
	94	+ * @return string
	95	+ */
	96	+ protected function get_request_url() {
	97	+ // strip trailing slashes
	98	+ $request_uri = rtrim( $_SERVER['REQUEST_URI'], '/' );
	99	+
	100	+ // strip ? and query string
	101	+ $qpos = strpos( $request_uri, '?' );
	102	+ if( $qpos ) {
	103	+ $request_uri = substr( $request_uri, 0, $qpos );
	104	+ }
	105	+
	106	+ return $request_uri;
	107	+ }
	108	+
91	109	/**
92	110	* Check if this rule passes (conditional matches expected value)
93	111	*
94	112	* @param string $condition
		@@ -109,9 +127,9 @@
109	127	$matched = true;
110	128	break;
111	129
112	130	case 'is_url':
113		- $matched = $this->match_patterns( $_SERVER['REQUEST_URI'], $value );
	131	+ $matched = $this->match_patterns( $this->get_request_url(), $value );
114	132	break;
115	133
116	134	case 'is_referer':
117	135	if( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
		@@ -143,8 +161,12 @@
143	161
144	162	case 'is_post_with_tag':
145	163	$matched = is_singular( 'post' ) && has_tag( $value );
146	164	break;
	165	+
	166	+ case 'is_user_logged_in':
	167	+ $matched = is_user_logged_in();
	168	+ break;
147	169	}
148	170
149	171	/**
150	172	* Filters whether a given box rule matches the condition and expected value.
		@@ -235,17 +257,37 @@
235	257	* Load plugin styles
236	258	*/
237	259	public function load_assets() {
238	260	$pre_suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
	261	+ wp_enqueue_script('boxzilla', $this->plugin->url('/assets/js/script' . $pre_suffix . '.js' ), array(), $this->plugin->version(), true );
239	262
240		- wp_enqueue_style( 'boxzilla', $this->plugin->url( '/assets/css/styles' . $pre_suffix . '.css' ), array(), $this->plugin->version() );
241		- wp_enqueue_script( 'boxzilla', $this->plugin->url( '/assets/js/script' . $pre_suffix . '.js' ), array( 'jquery' ), $this->plugin->version(), true );
	263	+ // create boxzilla_Global_Options object
	264	+ $plugin_options = $this->options;
	265	+ $boxes = $this->get_matched_boxes();
242	266
243		- $this->pass_box_options();
	267	+ $data = array(
	268	+ 'testMode' => (bool) $plugin_options['test_mode'],
	269	+ 'boxes' => array_map( function(Box $box) { return $box->get_client_options(); }, $boxes ),
	270	+ );
244	271
	272	+ wp_localize_script( 'boxzilla', 'boxzilla_options', $data );
	273	+
245	274	do_action( 'boxzilla_load_assets', $this );
246	275	}
247	276
	277	+ public function print_boxes_content() {
	278	+ $boxes = $this->get_matched_boxes();
	279	+ if( empty( $boxes ) ) {
	280	+ return;
	281	+ }
	282	+
	283	+ echo '<div style="display: none;">';
	284	+ foreach( $boxes as $box ) {
	285	+ echo sprintf( '<div id="boxzilla-box-%d-content">', $box->ID ) . $box->get_content() . '</div>';
	286	+ }
	287	+ echo '</div>';
	288	+ }
	289	+
248	290	/**
249	291	* Get an array of Box objects. These are the boxes that will be loaded for the current request.
250	292	*
251	293	* @return Box[]
		@@ -260,9 +302,9 @@
260	302	return $boxes;
261	303	}
262	304
263	305	// query Box posts
264		- $boxes = get_posts(
	306	+ $posts = get_posts(
265	307	array(
266	308	'post_type' => 'boxzilla-box',
267	309	'post_status' => 'publish',
268	310	'post__in' => $this->box_ids_to_load,
		@@ -270,31 +312,20 @@
270	312	)
271	313	);
272	314
273	315	// create `Box` instances out of \WP_Post instances
274		- foreach ( $boxes as $key => $box ) {
275		- $boxes[ $key ] = new Box( $box );
	316	+ $boxes = array();
	317	+ foreach ( $posts as $key => $post ) {
	318	+ // skip posts with no content
	319	+ if( empty( trim( $post->post_content ) ) ) {
	320	+ continue;
	321	+ }
	322	+
	323	+ $boxes[ $key ] = new Box( $post );
276	324	}
277	325	}
278	326
279	327	return $boxes;
280		- }
281		-
282		- /**
283		- * Create array of Box options and pass it to JavaScript script.
284		- */
285		- public function pass_box_options() {
286		-
287		- // create boxzilla_Global_Options object
288		- $plugin_options = $this->options;
289		- $boxes = $this->get_matched_boxes();
290		-
291		- $data = array(
292		- 'testMode' => (boolean) $plugin_options['test_mode'],
293		- 'boxes' => array_map( function(Box $box) { return $box->get_client_options(); }, $boxes ),
294		- );
295		-
296		- wp_localize_script( 'boxzilla', 'boxzilla_options', $data );
297	328	}
298	329
299	330	}
300	331