Changeset 3181493
- Timestamp:
- 11/04/2024 02:08:33 PM (17 months ago)
- Location:
- eduadmin-booking/trunk
- Files:
-
- 9 edited
-
CHANGELOG.md (modified) (1 diff)
-
PLUGIN-CHECKSUM (modified) (1 diff)
-
content/template/data/ld-json.php (modified) (3 diffs)
-
content/template/data/ogp.php (modified) (1 diff)
-
eduadmin.php (modified) (1 diff)
-
includes/edu-options.php (modified) (1 diff)
-
includes/edu-text-functions.php (modified) (1 diff)
-
includes/general-settings.php (modified) (28 diffs)
-
readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
eduadmin-booking/trunk/CHANGELOG.md
r3166325 r3181493 2 2 3 3 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. 4 5 ## [5.2.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.1.3...v5.2.0) (2024-11-04) 6 7 8 ### Features 9 10 * Setting to turn off/on OG/metadata and LD+JSON. ([594c422](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/594c422407be2aa6f8a4d2192f5636faac85975b)), closes [#520](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/520) 11 12 13 ### Bug Fixes 14 15 * Added repeatFrequency, repeatCount and courseMode for LD+JSON ([e5e5c42](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/e5e5c42bfe37d39c088e6901c2de3e7f31841e75)), closes [#511](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/511) 4 16 5 17 ### [5.1.3](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.1.2...v5.1.3) (2024-10-10) -
eduadmin-booking/trunk/PLUGIN-CHECKSUM
r3166325 r3181493 1 dfe92ac2cbf028316a32bfd76b493a0f 1 f43f26b58da1439fef621c2813477a7d -
eduadmin-booking/trunk/content/template/data/ld-json.php
r3012782 r3181493 11 11 12 12 if ( $course_id == null ) { 13 return; 14 } 15 16 $show_extra_metadata = EDU()->is_checked( 'eduadmin-showExtraMetadata', "on" ); 17 18 if ( ! $show_extra_metadata ) { 13 19 return; 14 20 } … … 81 87 82 88 if ( $is_ondemand ) { 83 $_event['courseMode'] = "online"; 84 $_event['location'] = "Online"; 89 $_event['courseMode'] = "Online"; 85 90 $_event['description'] = 'On-demand'; 86 91 … … 104 109 } 105 110 } else { 106 $_event['location'] = $event['City']; 107 $_event['startDate'] = $event['StartDate']; 108 $_event['endDate'] = $event['EndDate']; 111 $_event['courseMode'] = "Onsite"; 112 $_event['location'] = $event['City']; 113 $_event['startDate'] = $event['StartDate']; 114 $_event['endDate'] = $event['EndDate']; 109 115 110 116 $_event['courseSchedule'] = [ 111 '@type' => 'Schedule', 112 'startDate' => $event['StartDate'], 113 'endDate' => $event['EndDate'], 117 '@type' => 'Schedule', 118 'startDate' => $event['StartDate'], 119 'endDate' => $event['EndDate'], 120 'repeatFrequency' => 'Daily', 121 'repeatCount' => count( $event['EventDates'] ), 114 122 ]; 115 123 } -
eduadmin-booking/trunk/content/template/data/ogp.php
r3039710 r3181493 11 11 12 12 if ( $course_id == null ) { 13 return; 14 } 15 16 $show_extra_metadata = EDU()->is_checked( 'eduadmin-showExtraMetadata', "on" ); 17 18 if ( ! $show_extra_metadata ) { 13 19 return; 14 20 } -
eduadmin-booking/trunk/eduadmin.php
r3166325 r3181493 10 10 * Description: EduAdmin plugin to allow visitors to book courses at your website 11 11 * Tags: booking, participants, courses, events, eduadmin, lega online 12 * Version: 5. 1.312 * Version: 5.2.0 13 13 * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress 14 14 * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress -
eduadmin-booking/trunk/includes/edu-options.php
r2967419 r3181493 310 310 register_setting( 'eduadmin-rewrite', 'eduadmin-showVatTexts' ); 311 311 register_setting( 'eduadmin-rewrite', 'eduadmin-showPricesAsSelected' ); 312 register_setting( 'eduadmin-rewrite', 'eduadmin-showExtraMetadata' ); 312 313 313 314 if ( is_admin() ) { -
eduadmin-booking/trunk/includes/edu-text-functions.php
r3137602 r3181493 1009 1009 '<span class="edu-manyDays" title="' . esc_attr_x( 'Show schedule', 'frontend', 'eduadmin-booking' ) . '" onclick="edu_openDatePopup(this);">' . 1010 1010 /* translators: 1: Number of days 2: Date range */ 1011 wp_kses_post( sprintf( _nx( '%1$d day on%2$s', '%1$d days between %2$s', count( $days ), 'frontend', 'eduadmin-booking' ), count( $days ), get_start_end_display_date( $days[0], end( $days ), $short, null, false, $force_show_times ) ) ) .1011 wp_kses_post( sprintf( _nx( '%1$d day, %2$s', '%1$d days between %2$s', count( $days ), 'frontend', 'eduadmin-booking' ), count( $days ), get_start_end_display_date( $days[0], end( $days ), $short, null, false, $force_show_times ) ) ) . 1012 1012 '</span><div class="edu-DayPopup"> 1013 1013 <b>' . esc_html_x( 'Schedule', 'frontend', 'eduadmin-booking' ) . '</b><br /> -
eduadmin-booking/trunk/includes/general-settings.php
r2962827 r3181493 52 52 <br /> 53 53 <textarea name="eduadmin-spotsSettings" class="form-control" rows="5" 54 54 cols="30"><?php echo EDU()->get_option( 'eduadmin-spotsSettings', "1-5\n5-10\n10+" ); ?></textarea> 55 55 </div> 56 56 <div id="eduadmin-alwaysFewSpots"> … … 59 59 <br /> 60 60 <input type="number" name="eduadmin-alwaysFewSpots" 61 61 value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-alwaysFewSpots', "3" ) ); ?>" /> 62 62 </div> 63 63 </div> … … 66 66 <br /> 67 67 <input type="number" name="eduadmin-monthsToFetch" 68 68 value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-monthsToFetch', '6' ) ); ?>" /> <?php _ex( 'months', 'backend', 'eduadmin-booking' ); ?> 69 69 <br /> 70 70 <br /> … … 73 73 <label> 74 74 <input type="checkbox" 75 75 name="eduadmin-showVatTexts"<?php checked( EDU()->get_option( 'eduadmin-showVatTexts', "on" ), "on" ); ?> /> 76 76 <?php echo esc_html_x( 'Show VAT texts on prices', 'backend', 'eduadmin-booking' ); ?> 77 77 </label> … … 98 98 </select> 99 99 <br /> 100 <br /> 101 <strong><?php echo esc_html_x( 'Include meta data for search engines on course pages (Open Graph + LD+JSON)', 'backend', 'eduadmin-booking' ); ?></strong> 102 <br /> 103 <em><?php echo esc_html_x( 'This option enables some extra data that is invisible for users, but search engines may show some extra information about the results about the courses.', 'backend', 'eduadmin-booking' ); ?></em> 104 <br /> 105 <label> 106 <input type="checkbox" 107 name="eduadmin-showExtraMetadata"<?php checked( EDU()->get_option( 'eduadmin-showExtraMetadata', "on" ), "on" ); ?> /> 108 <?php echo esc_html_x( 'Yes, include extra meta data', 'backend', 'eduadmin-booking' ); ?> 109 </label> 110 <br /> 100 111 <p class="submit"> 101 112 <input type="submit" name="submit" id="submit" class="button button-primary" 102 113 value="<?php echo esc_attr_x( 'Save settings', 'backend', 'eduadmin-booking' ); ?>" /> 103 114 </p> 104 115 <h3><?php echo esc_html_x( 'Rewrite settings', 'backend', 'eduadmin-booking' ); ?></h3> … … 107 118 </p> 108 119 <?php echo home_url(); ?>/<input style="width: 200px;" type="text" class="form-control folder" 109 110 111 120 name="eduadmin-rewriteBaseUrl" id="eduadmin-rewriteBaseUrl" 121 value="<?php echo esc_attr( EDU()->get_option( 'eduadmin-rewriteBaseUrl' ) ); ?>" 122 placeholder="<?php echo _x( 'URL', 'backend', 'eduadmin-booking' ); ?>" />/ 112 123 <?php 113 124 $pages = get_pages(); … … 129 140 <td> 130 141 <select class="form-control" style="width: 300px;" name="eduadmin-listViewPage" 131 142 id="eduadmin-listViewPage"> 132 143 <option 133 144 value="">-- <?php echo esc_html_x( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- … … 141 152 } 142 153 echo "\t\t\t\t\t\t\t<option " . ( $listPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 143 144 145 154 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 155 ( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 156 "</option>\n"; 146 157 } 147 158 ?> … … 156 167 <td> 157 168 <select class="form-control" style="width: 300px;" name="eduadmin-detailViewPage" 158 169 id="eduadmin-detailViewPage"> 159 170 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 160 171 </option> … … 167 178 } 168 179 echo "\t\t\t\t\t\t\t<option" . ( $detailPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 169 170 171 180 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 181 ( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 182 "</option>\n"; 172 183 } 173 184 ?> … … 182 193 <td> 183 194 <select class="form-control" style="width: 300px;" name="eduadmin-bookingViewPage" 184 195 id="eduadmin-bookingViewPage"> 185 196 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 186 197 </option> … … 193 204 } 194 205 echo "\t\t\t\t\t\t\t<option" . ( $bookingPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 195 196 197 206 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 207 ( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 208 "</option>\n"; 198 209 } 199 210 ?> … … 208 219 <td> 209 220 <select class="form-control" style="width: 300px;" name="eduadmin-thankYouPage" 210 221 id="eduadmin-thankYouPage"> 211 222 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 212 223 </option> … … 215 226 foreach ( $pages as $p ) { 216 227 echo "\t\t\t\t\t\t\t<option" . ( $thankPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 217 218 228 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 229 "</option>\n"; 219 230 } 220 231 ?> … … 227 238 <td> 228 239 <select class="form-control" style="width: 300px;" name="eduadmin-loginViewPage" 229 240 id="eduadmin-loginViewPage"> 230 241 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 231 242 </option> … … 238 249 } 239 250 echo "\t\t\t\t\t\t\t<option" . ( $loginPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 240 241 242 251 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 252 ( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 253 "</option>\n"; 243 254 } 244 255 ?> … … 253 264 <td> 254 265 <select class="form-control" style="width: 300px;" name="eduadmin-interestObjectPage" 255 266 id="eduadmin-interestObjectPage"> 256 267 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 257 268 </option> … … 264 275 } 265 276 echo "\t\t\t\t\t\t\t<option" . ( $objectInterestPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 266 267 268 277 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 278 ( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 279 "</option>\n"; 269 280 } 270 281 ?> … … 279 290 <td> 280 291 <select class="form-control" style="width: 300px;" name="eduadmin-interestEventPage" 281 292 id="eduadmin-interestEventPage"> 282 293 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 283 294 </option> … … 290 301 } 291 302 echo "\t\t\t\t\t\t\t<option" . ( $eventInterestPage == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 292 293 294 303 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 304 ( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 305 "</option>\n"; 295 306 } 296 307 ?> … … 321 332 <td> 322 333 <select class="form-control" style="width: 300px;" name="eduadmin-programme-list" 323 334 id="eduadmin-programme-list"> 324 335 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 325 336 </option> … … 332 343 } 333 344 echo "\t\t\t\t\t\t\t<option" . ( $list_page == $p->ID ? ' selected="selected"' : '' ) . ' value="' . $p->ID . '">' . 334 335 336 345 htmlentities( $p->post_title . ' (ID: ' . $p->ID . ')' ) . 346 ( $suggested ? ' (' . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 347 "</option>\n"; 337 348 } 338 349 ?> … … 347 358 <td> 348 359 <select class="form-control" style="width: 300px;" name="eduadmin-programme-detail" 349 360 id="eduadmin-programme-detail"> 350 361 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 351 362 </option> … … 358 369 } 359 370 echo "\t\t\t\t\t\t\t<option" . ( $detail_page == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 360 361 362 371 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 372 ( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 373 "</option>\n"; 363 374 } 364 375 ?> … … 373 384 <td> 374 385 <select class="form-control" style="width: 300px;" name="eduadmin-programme-book" 375 386 id="eduadmin-programme-book"> 376 387 <option value="">-- <?php _ex( 'No page selected', 'backend', 'eduadmin-booking' ); ?>-- 377 388 </option> … … 384 395 } 385 396 echo "\t\t\t\t\t\t\t<option" . ( $book_page == $p->ID ? " selected=\"selected\"" : "" ) . " value=\"" . $p->ID . "\">" . 386 387 388 397 htmlentities( $p->post_title . " (ID: " . $p->ID . ")" ) . 398 ( $suggested ? " (" . _x( 'suggested', 'backend', 'eduadmin-booking' ) . ")" : "" ) . 399 "</option>\n"; 389 400 } 390 401 ?> … … 400 411 <p class="submit"> 401 412 <input type="submit" name="submit" id="submit" class="button button-primary" 402 413 value="<?php echo esc_attr_x( 'Save settings', 'backend', 'eduadmin-booking' ); ?>" /> 403 414 </p> 404 415 </div> … … 407 418 <input type="hidden" name="act" value="clearTransients" /> 408 419 <input type="submit" class="button button-primary" 409 420 value="<?php echo esc_attr_x( 'Clear transients/cache', 'backend', 'eduadmin-booking' ); ?>" /> 410 421 </form> 411 422 </div> -
eduadmin-booking/trunk/readme.txt
r3166325 r3181493 4 4 Requires at least: 6.0 5 5 Tested up to: 6.6 6 Stable tag: 5. 1.36 Stable tag: 5.2.0 7 7 Requires PHP: 8.1 8 8 License: GPL3 … … 46 46 The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md) 47 47 48 ### [5.2.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.1.3...v5.2.0) (2024-11-04) 49 50 51 #### Features 52 53 * Setting to turn off/on OG/metadata and LD+JSON. ([594c422](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/594c422407be2aa6f8a4d2192f5636faac85975b)), closes [#520](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/520) 54 55 56 #### Bug Fixes 57 58 * Added repeatFrequency, repeatCount and courseMode for LD+JSON ([e5e5c42](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/e5e5c42bfe37d39c088e6901c2de3e7f31841e75)), closes [#511](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/511) 59 48 60 ### [5.1.3](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.1.2...v5.1.3) (2024-10-10) 49 61 … … 62 74 * Fetch AnswerId for checkbox questions the correct way ([d123497](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/d123497be9795741796aad8f13469623bc072701)) 63 75 64 ### [5.1.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v5.0.1...v5.1.0) (2024-08-19)65 76 66 77 67 #### Features68 69 * Adding new endpoints and classes ([0df472e](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/0df472e7b80f3e1ca8584a3f7b7cbf0c81432dcc))70 71 72 #### Bug Fixes73 74 * Fixes incorrect encoding after PHP 8.1 changing how things work. ([ff8055d](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/ff8055dfda0cb4e805977895136a2a0df6135f33)), closes [#526](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/526)75 76 77
Note: See TracChangeset
for help on using the changeset viewer.