Changeset 3100715
- Timestamp:
- 06/10/2024 05:00:42 PM (8 weeks ago)
- Location:
- ics-calendar
- Files:
-
- 144 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
ics-calendar/trunk/class-r34ics.php
r3100688 r3100715 1893 1893 } 1894 1894 // Add special status messages 1895 // Suggest "Use legacy feed request method" option1896 1895 if (in_array($results['status'], array('failed', 'unknown'))) { 1897 $results['special'][] = sprintf(__('If your feed URL works with our online %1$sPreview%2$s tool, try turning on the %3$s option under the %4$s tab above.', 'r34ics'), '<a href="https://icscalendar.com/preview/" target="_blank">', '</a>', '<strong style="white-space: nowrap;">' . __('Use legacy feed request method', 'r34ics') . '</strong>', '<a href="#settings">' . __('Settings', 'r34ics') . '</a>'); 1896 // URL contains '@' (could be basic auth credentials) and site uses legacy feed request method 1897 if (strpos($url_to_test, '@') !== false && get_option('r34ics_url_get_contents_legacy_method')) { 1898 $results['special'][] = sprintf(__('Your feed URL appears to contain HTTP Basic Authentication credentials. Try turning off the %1$s option under the %2$s tab above.', 'r34ics'), '<strong style="white-space: nowrap;">' . __('Use legacy feed request method', 'r34ics') . '</strong>', '<a href="#settings">' . __('Settings', 'r34ics') . '</a>'); 1899 } 1900 // Suggest "Use legacy feed request method" option 1901 else { 1902 $results['special'][] = sprintf(__('If your feed URL works with our online %1$sPreview%2$s tool, try turning on the %3$s option under the %4$s tab above.', 'r34ics'), '<a href="https://icscalendar.com/preview/" target="_blank">', '</a>', '<strong style="white-space: nowrap;">' . __('Use legacy feed request method', 'r34ics') . '</strong>', '<a href="#settings">' . __('Settings', 'r34ics') . '</a>'); 1903 } 1898 1904 } 1899 1905 // The feed URL appears to be a media library file … … 2117 2123 */ 2118 2124 protected function _url_get_contents($url, $recursion=0, $use_transients=false, $basicauth=false, $skip_domain_errors=false) { 2119 // Use legacy method? (We *must* use legacy method for HTTP Basic Authentication)2120 if (get_option('r34ics_url_get_contents_legacy_method') || !empty($basicauth)) {2125 // Use legacy method? 2126 if (get_option('r34ics_url_get_contents_legacy_method')) { 2121 2127 return $this->_url_get_contents_legacy($url, '', $recursion, null, $use_transients, $basicauth, $skip_domain_errors); 2122 2128 } … … 2168 2174 } 2169 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2170 2192 /** 2171 2193 * Bail out now if URL fails wp_http_validate_url() check … … 2229 2251 'Sec-Fetch-Site' => 'same-origin', 2230 2252 ); 2253 2254 2255 2256 2257 2231 2258 2232 2259 // Set user agent string … … 2313 2340 2314 2341 // Report that we are using the legacy method 2342 2315 2343 if ($this->debug) { $this->debug_messages[$url]['Method'][] = __METHOD__; } 2316 2344 -
ics-calendar/trunk/ics-calendar.php
r3100688 r3100715 4 4 Plugin URI: https://icscalendar.com 5 5 Description: Turn your Google Calendar, Microsoft Office 365 or Apple iCloud Calendar into a seamlessly integrated, auto-updating, zero-maintenance WordPress experience. 6 Version: 11.2.3-beta- 26 Version: 11.2.3-beta- 7 7 Requires at least: 4.9 8 8 Requires PHP: 7.0 -
ics-calendar/trunk/readme.txt
r3100688 r3100715 100 100 == Changelog == 101 101 102 = 11.2.3-beta- 2- 2024.06.10 =102 = 11.2.3-beta- - 2024.06.10 = 103 103 104 104 * Fixed minor issue with ICS Feed URL Tester changes in version 11.2.2 that prevented display of the tested URL after submitting. 105 105 * Modified CSS for new `feedlabelindesc` so feed color dot only appears in event details hover box, and not in inline descriptions; added styling for feed labels in lightbox. 106 106 * Modified `R34ICS::_url_get_contents()` to force reversion to `R34ICS::_url_get_contents_legacy()` if `$basicauth` parameter is true, because the new method does not currently handle HTTP Basic Authentication. 107 107 108 * Updated embedded ics-parser library to latest version (3.4.0+, up through commit [7286ce0](https://github.com/u01jmg3/ics-parser/commit/7286ce0ff37d5123094ffc8b8426d9dfcccca7f9).) 108 109
Note: See TracChangeset
for help on using the changeset viewer.