chg: Filter on subjectid should now be instant (instead of waiting for ajax to kick in)

chg: Improved check for customtemplate

Author: Chris Gårdenberg

class/class-eduadminrouter.php

@@ -44,6 +44,13 @@ public function register_post_types() {
 		}
 
 		public function register_routes() {
+			$this->register_programme_routes();
+			/*
+			 * Course template routes
+			 */
+		}
+
+		private function register_programme_routes() {
 			$programme_list_id   = get_option( 'eduadmin-programme-list' );
 			$programme_detail_id = get_option( 'eduadmin-programme-detail' );
 			$programme_book_id   = get_option( 'eduadmin-programme-book' );
@@ -69,9 +76,6 @@ public function register_routes() {
 				'index.php?page_id=' . $programme_book_id . '&edu_programme=$matches[1]',
 				'top'
 			);
-			/*
-			 * Course template routes
-			 */
 		}
 	}
 }

content/template/listTemplate/list-events.php

@@ -55,6 +55,10 @@
 	$filters[] = 'Subjects/any(s:s/SubjectName eq \'' . sanitize_text_field( $attributes['subject'] ) . '\')';
 }
 
+if ( ! empty( $attributes['subjectid'] ) ) {
+	$filters[] = 'Subjects/any(s:s/SubjectId eq ' . intval( $attributes['subjectid'] ) . ')';
+}
+
 if ( ! empty( $_REQUEST['eduadmin-subject'] ) ) {
 	$filters[]               = 'Subjects/any(s:s/SubjectId eq ' . intval( $_REQUEST['eduadmin-subject'] ) . ')';
 	$attributes['subjectid'] = intval( $_REQUEST['eduadmin-subject'] );

eduadmin.php

@@ -9,7 +9,7 @@
  * Plugin URI:	https://www.eduadmin.se
  * Description:	EduAdmin plugin to allow visitors to book courses at your website
  * Tags:	booking, participants, courses, events, eduadmin, lega online
- * Version:	2.1
+ * Version:	2.0.1
  * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
  * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
  * Requires at least: 4.7

includes/edu-shortcodes.php

@@ -102,13 +102,13 @@ function eduadmin_get_detail_view( $attributes ) {
 	}
 
 	EDU()->session->regenerate_id( true );
-
-	if ( ! isset( $attributes['customtemplate'] ) || 1 !== $attributes['customtemplate'] ) {
+	if ( empty( $attributes['customtemplate'] ) || 1 !== intval( $attributes['customtemplate'] ) ) {
 		$str = include_once EDUADMIN_PLUGIN_PATH . '/content/template/detailTemplate/' . $attributes['template'] . '.php';
 		EDU()->stop_timer( $t );
 
 		return $str;
 	}
+
 	EDU()->stop_timer( $t );
 
 	return '';

includes/general-settings.php

@@ -18,14 +18,14 @@ function edu_render_general_settings() {
 	}
 	?>
 	<div class="eduadmin wrap">
-		<h2><?php echo sprintf( __( "EduAdmin settings - %s", 'eduadmin-booking' ), __( "General", 'eduadmin-booking' ) ); ?></h2>
+		<h2><?php echo esc_html( sprintf( __( 'EduAdmin settings - %s', 'eduadmin-booking' ), __( 'General', 'eduadmin-booking' ) ) ); ?></h2>
 
 		<form method="post" action="options.php">
 			<?php settings_fields( 'eduadmin-rewrite' ); ?>
 			<?php do_settings_sections( 'eduadmin-rewrite' ); ?>
 			<div class="block">
-				<h3><?php _e( "General settings", 'eduadmin-booking' ); ?></h3>
-				<?php _e( "Availability text", 'eduadmin-booking' ); ?>
+				<h3><?php esc_html_e( 'General settings', 'eduadmin-booking' ); ?></h3>
+				<?php esc_html_e( 'Availability text', 'eduadmin-booking' ); ?>
 				<br />
 				<?php
 				$spotLeft = get_option( 'eduadmin-spotsLeft', 'exactNumbers' );
@@ -44,30 +44,30 @@ function edu_render_general_settings() {
 				<div class="eduadmin-spotsSettings">
 					<div id="eduadmin-intervalSetting">
 						<br />
-						<b><?php _e( "Interval settings", 'eduadmin-booking' ); ?></b>
+						<b><?php esc_html_e( "Interval settings", 'eduadmin-booking' ); ?></b>
 						<br />
-						<?php _e( "Insert one interval range per row (1-3, 4-10, 10+)", 'eduadmin-booking' ); ?>
+						<?php esc_html_e( "Insert one interval range per row (1-3, 4-10, 10+)", 'eduadmin-booking' ); ?>
 						<br />
 						<textarea name="eduadmin-spotsSettings" class="form-control" rows="5" cols="30"><?php echo get_option( 'eduadmin-spotsSettings', "1-5\n5-10\n10+" ); ?></textarea>
 					</div>
 					<div id="eduadmin-alwaysFewSpots">
 						<br />
-						<b><?php _e( "Number of participants before showing as \"Few spots left\"", 'eduadmin-booking' ); ?></b>
+						<b><?php esc_html_e( "Number of participants before showing as \"Few spots left\"", 'eduadmin-booking' ); ?></b>
 						<br />
 						<input type="number" name="eduadmin-alwaysFewSpots" value="<?php echo esc_attr( get_option( 'eduadmin-alwaysFewSpots', "3" ) ); ?>" />
 					</div>
 				</div>
 				<br />
-				<?php _e( "Number of months to fetch events for", 'eduadmin-booking' ); ?>
+				<?php esc_html_e( "Number of months to fetch events for", 'eduadmin-booking' ); ?>
 				<br />
 				<input type="number" name="eduadmin-monthsToFetch" value="<?php echo esc_attr( get_option( 'eduadmin-monthsToFetch', '6' ) ); ?>" /> <?php _e( "months", 'eduadmin-booking' ); ?>
 				<br />
 				<p class="submit">
 					<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e( "Save settings", 'eduadmin-booking' ); ?>" />
 				</p>
-				<h3><?php _e( "Rewrite settings", 'eduadmin-booking' ); ?></h3>
+				<h3><?php esc_html_e( "Rewrite settings", 'eduadmin-booking' ); ?></h3>
 				<p>
-					<?php echo __( "Enter the URL you want to use with the application (please check that the URL does not exists)", 'eduadmin-booking' ); ?>
+					<?php echo esc_html__( "Enter the URL you want to use with the application (please check that the URL does not exists)", 'eduadmin-booking' ); ?>
 				</p>
 				<?php echo home_url(); ?>/<input style="width: 200px;" type="text" class="form-control folder" name="eduadmin-rewriteBaseUrl" id="eduadmin-rewriteBaseUrl" value="<?php echo esc_attr( get_option( 'eduadmin-rewriteBaseUrl' ) ); ?>" placeholder="<?php echo __( "URL", 'eduadmin-booking' ); ?>" />/
 				<?php
@@ -79,13 +79,13 @@ function edu_render_general_settings() {
 					}
 				}
 				?>
-				<h3><?php _e( 'Course templates', 'eduadmin-booking' ); ?></h3>
+				<h3><?php esc_html_e( 'Course templates', 'eduadmin-booking' ); ?></h3>
 				<table>
 					<tr>
-						<td><?php _e( "List view page", 'eduadmin-booking' ); ?></td>
+						<td><?php esc_html_e( 'List view page', 'eduadmin-booking' ); ?></td>
 						<td>
 							<select class="form-control" style="width: 300px;" name="eduadmin-listViewPage" id="eduadmin-listViewPage">
-								<option value="">-- <?php _e( "No page selected", 'eduadmin-booking' ); ?>--
+								<option value="">-- <?php esc_html_e( "No page selected", 'eduadmin-booking' ); ?>--
 								</option>
 								<?php
 								$listPage = get_option( 'eduadmin-listViewPage' );
@@ -251,7 +251,7 @@ function edu_render_general_settings() {
 					</tr>
 				</table>
 				<?php
-				$pages = get_pages();
+				$pages           = get_pages();
 				$programme_pages = array();
 				foreach ( $pages as $p ) {
 					if ( strstr( $p->post_content, '[eduadmin' ) ) {

readme.md

@@ -47,6 +47,9 @@ and redo your own customization.
 
 == Changelog ==
 
+### 2.0.1 ###
+- chg: Better check against `customtemplate`
+
 ### 2.0 ###
 - add: Adding page for certificates
 - chg: Bumping major version, since we're using a brand new API