fixes #132 - thx laborix & @Fraenkiman!
This commit is contained in:
azett
parent
e58efa9da0
commit
225e3b1b8d
39
CHANGELOG.md
39
CHANGELOG.md
@ -4,33 +4,36 @@
|
||||
- [README](https://github.com/flatpressblog/flatpress/blob/master/README.md): added "help and support" section
|
||||
|
||||
## Plugins
|
||||
- Gallery captions plugin added (see [#108](https://github.com/flatpressblog/flatpress/issues/108))
|
||||
- PhotoSwipe plugin added (see [#109](https://github.com/flatpressblog/flatpress/issues/109))
|
||||
- Gallery captions plugin added ([#108](https://github.com/flatpressblog/flatpress/issues/108))
|
||||
- PhotoSwipe plugin added ([#109](https://github.com/flatpressblog/flatpress/issues/109))
|
||||
- jQuery plugin: Updated jQuery (3.5.1 => 3.6) and jQueryUI (1.12.1 => 1.13.1)
|
||||
- Media Manager plugin shows 50 items per page, not 10
|
||||
- LastComments plugin will not even attempt to delete or rebuild LastComments caches if LastComments plugin is not available ([#43](https://github.com/flatpressblog/flatpress/issues/43))
|
||||
|
||||
## Themes
|
||||
- Leggero
|
||||
- Fixed searchbox glitch in FlatMaas revisited style (see [#97](https://github.com/flatpressblog/flatpress/issues/97))
|
||||
- Fixed missing bullets in preview (see [#98](https://github.com/flatpressblog/flatpress/issues/98))
|
||||
- Fixed searchbox glitch in FlatMaas revisited style ([#97](https://github.com/flatpressblog/flatpress/issues/97))
|
||||
- Fixed missing bullets in preview ([#98](https://github.com/flatpressblog/flatpress/issues/98))
|
||||
- CSS of the Leggero style had some glitches on mobile devices
|
||||
- Invalid HTML output fixed (see [#106](https://github.com/flatpressblog/flatpress/issues/106))
|
||||
- Removed unneccessary external font resource (see [#112](https://github.com/flatpressblog/flatpress/issues/112))
|
||||
- "Add comment" link has its own line (see [#135](https://github.com/flatpressblog/flatpress/issues/135))
|
||||
- Removed legacy/invalid CSS (see [#133](https://github.com/flatpressblog/flatpress/issues/133), [#134](https://github.com/flatpressblog/flatpress/issues/134))
|
||||
- Fixed description of Leggero and Leggero v2 styles (see [#137](https://github.com/flatpressblog/flatpress/issues/137))
|
||||
- Obsolete bullet points removed (see [#136](https://github.com/flatpressblog/flatpress/issues/136))
|
||||
- Updated preview image (see [#139](https://github.com/flatpressblog/flatpress/issues/139))
|
||||
- Invalid HTML output fixed ([#106](https://github.com/flatpressblog/flatpress/issues/106))
|
||||
- Removed unneccessary external font resource ([#112](https://github.com/flatpressblog/flatpress/issues/112))
|
||||
- "Add comment" link has its own line ([#135](https://github.com/flatpressblog/flatpress/issues/135))
|
||||
- Removed legacy/invalid CSS ([#133](https://github.com/flatpressblog/flatpress/issues/133), [#134](https://github.com/flatpressblog/flatpress/issues/134))
|
||||
- Fixed description of Leggero and Leggero v2 styles ([#137](https://github.com/flatpressblog/flatpress/issues/137))
|
||||
- Obsolete bullet points removed ([#136](https://github.com/flatpressblog/flatpress/issues/136))
|
||||
- Updated preview image ([#139](https://github.com/flatpressblog/flatpress/issues/139))
|
||||
|
||||
## Bugfixes
|
||||
- Comment Center config page threw errors (see [#90](https://github.com/flatpressblog/flatpress/issues/90))
|
||||
## Internationalization
|
||||
- Fixed glitches in Spanish an Portuguese language files
|
||||
- Fixed wrong pt-br country code ([#100](https://github.com/flatpressblog/flatpress/issues/100))
|
||||
- Search page: Month names displayed in configured frontend language ([#132](https://github.com/flatpressblog/flatpress/issues/132))
|
||||
|
||||
## Other bugfixes
|
||||
- Comment Center config page threw errors ([#90](https://github.com/flatpressblog/flatpress/issues/90))
|
||||
- Plugin management page: Removed empty warning messages box
|
||||
- Fixed wrong pt-br country code (see [#100](https://github.com/flatpressblog/flatpress/issues/100))
|
||||
- Fixed error at prev link on first / next link on last entry (see [#95](https://github.com/flatpressblog/flatpress/issues/95))
|
||||
- LastComments plugin will not even attempt to delete or rebuild LastComments caches if LastComments plugin is not available (see [#43](https://github.com/flatpressblog/flatpress/issues/43))
|
||||
- Logout redirects to home page again (see [#119](https://github.com/flatpressblog/flatpress/issues/119))
|
||||
- Fixed disappearing non-Latin characters in page title (see [#49](https://github.com/flatpressblog/flatpress/issues/49) and [#91](https://github.com/flatpressblog/flatpress/issues/91))
|
||||
- Fixed error at prev link on first / next link on last entry ([#95](https://github.com/flatpressblog/flatpress/issues/95))
|
||||
- Logout redirects to home page again ([#119](https://github.com/flatpressblog/flatpress/issues/119))
|
||||
- Fixed disappearing non-Latin characters in page title ([#49](https://github.com/flatpressblog/flatpress/issues/49) and [#91](https://github.com/flatpressblog/flatpress/issues/91))
|
||||
|
||||
## Security
|
||||
- Fixed security issue reported by huntr.dev: Session cookie missed the "secure" flag
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Smarty plugin
|
||||
*
|
||||
* @package Smarty
|
||||
* @subpackage plugins
|
||||
*/
|
||||
@ -26,20 +28,22 @@
|
||||
* dropdown to include given date unless explicitly set (Monte)
|
||||
* - 1.3.4 fix behaviour of 0000-00-00 00:00:00 dates to match that
|
||||
* of 0000-00-00 dates (cybot, boots)
|
||||
*
|
||||
* @link http://smarty.php.net/manual/en/language.function.html.select.date.php {html_select_date}
|
||||
* (Smarty online manual)
|
||||
* @version 1.3.4
|
||||
* @author Andrei Zmievski
|
||||
* @author Monte Ohrt <monte at ohrt dot com>
|
||||
* @param array
|
||||
* @param Smarty
|
||||
* @param
|
||||
* array
|
||||
* @param
|
||||
* Smarty
|
||||
* @return string
|
||||
*/
|
||||
function smarty_function_html_select_date($params, &$smarty)
|
||||
{
|
||||
require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
|
||||
require_once $smarty->_get_plugin_filepath('shared','make_timestamp');
|
||||
require_once $smarty->_get_plugin_filepath('function','html_options');
|
||||
function smarty_function_html_select_date($params, &$smarty) {
|
||||
require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
|
||||
require_once $smarty->_get_plugin_filepath('shared', 'make_timestamp');
|
||||
require_once $smarty->_get_plugin_filepath('function', 'html_options');
|
||||
/* Default values. */
|
||||
$prefix = "Date_";
|
||||
$start_year = strftime("%Y");
|
||||
@ -56,24 +60,32 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
$year_as_text = false;
|
||||
/* Display years in reverse order? Ie. 2000,1999,.... */
|
||||
$reverse_years = false;
|
||||
/* Should the select boxes be part of an array when returned from PHP?
|
||||
e.g. setting it to "birthday", would create "birthday[Day]",
|
||||
"birthday[Month]" & "birthday[Year]". Can be combined with prefix */
|
||||
/*
|
||||
* Should the select boxes be part of an array when returned from PHP?
|
||||
* e.g. setting it to "birthday", would create "birthday[Day]",
|
||||
* "birthday[Month]" & "birthday[Year]". Can be combined with prefix
|
||||
*/
|
||||
$field_array = null;
|
||||
/* <select size>'s of the different <select> tags.
|
||||
If not set, uses default dropdown. */
|
||||
/*
|
||||
* <select size>'s of the different <select> tags.
|
||||
* If not set, uses default dropdown.
|
||||
*/
|
||||
$day_size = null;
|
||||
$month_size = null;
|
||||
$year_size = null;
|
||||
/* Unparsed attributes common to *ALL* the <select>/<input> tags.
|
||||
An example might be in the template: all_extra ='class ="foo"'. */
|
||||
/*
|
||||
* Unparsed attributes common to *ALL* the <select>/<input> tags.
|
||||
* An example might be in the template: all_extra ='class ="foo"'.
|
||||
*/
|
||||
$all_extra = null;
|
||||
/* Separate attributes for the tags. */
|
||||
$day_extra = null;
|
||||
$month_extra = null;
|
||||
$year_extra = null;
|
||||
/* Order in which to display the fields.
|
||||
"D" -> day, "M" -> month, "Y" -> year. */
|
||||
/*
|
||||
* Order in which to display the fields.
|
||||
* "D" -> day, "M" -> month, "Y" -> year.
|
||||
*/
|
||||
$field_order = 'MDY';
|
||||
/* String printed between the different fields. */
|
||||
$field_separator = "\n";
|
||||
@ -84,7 +96,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
$year_empty = null;
|
||||
$extra_attrs = '';
|
||||
|
||||
foreach ($params as $_key=>$_value) {
|
||||
foreach ($params as $_key => $_value) {
|
||||
switch ($_key) {
|
||||
case 'prefix':
|
||||
case 'time':
|
||||
@ -107,11 +119,11 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
case 'month_empty':
|
||||
case 'day_empty':
|
||||
case 'year_empty':
|
||||
$$_key = (string)$_value;
|
||||
$$_key = (string) $_value;
|
||||
break;
|
||||
|
||||
case 'all_empty':
|
||||
$$_key = (string)$_value;
|
||||
$$_key = (string) $_value;
|
||||
$day_empty = $month_empty = $year_empty = $all_empty;
|
||||
break;
|
||||
|
||||
@ -120,12 +132,12 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
case 'display_years':
|
||||
case 'year_as_text':
|
||||
case 'reverse_years':
|
||||
$$_key = (bool)$_value;
|
||||
$$_key = (bool) $_value;
|
||||
break;
|
||||
|
||||
default:
|
||||
if(!is_array($_value)) {
|
||||
$extra_attrs .= ' '.$_key.'="'.smarty_function_escape_special_chars($_value).'"';
|
||||
if (!is_array($_value)) {
|
||||
$extra_attrs .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_value) . '"';
|
||||
} else {
|
||||
$smarty->trigger_error("html_select_date: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
|
||||
}
|
||||
@ -139,7 +151,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
}
|
||||
// If $time is not in format yyyy-mm-dd
|
||||
if (preg_match('/^(\d{0,4}-\d{0,2}-\d{0,2})/', $time, $found)) {
|
||||
$time = $found[1];
|
||||
$time = $found [1];
|
||||
} else {
|
||||
// use smarty_make_timestamp to get an unix timestamp and
|
||||
// strftime to make yyyy-mm-dd
|
||||
@ -150,27 +162,27 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
|
||||
// make syntax "+N" or "-N" work with start_year and end_year
|
||||
if (preg_match('!^(\+|\-)\s*(\d+)$!', $end_year, $match)) {
|
||||
if ($match[1] == '+') {
|
||||
$end_year = strftime('%Y') + $match[2];
|
||||
if ($match [1] == '+') {
|
||||
$end_year = strftime('%Y') + $match [2];
|
||||
} else {
|
||||
$end_year = strftime('%Y') - $match[2];
|
||||
$end_year = strftime('%Y') - $match [2];
|
||||
}
|
||||
}
|
||||
if (preg_match('!^(\+|\-)\s*(\d+)$!', $start_year, $match)) {
|
||||
if ($match[1] == '+') {
|
||||
$start_year = strftime('%Y') + $match[2];
|
||||
if ($match [1] == '+') {
|
||||
$start_year = strftime('%Y') + $match [2];
|
||||
} else {
|
||||
$start_year = strftime('%Y') - $match[2];
|
||||
$start_year = strftime('%Y') - $match [2];
|
||||
}
|
||||
}
|
||||
if (strlen($time[0]) > 0) {
|
||||
if ($start_year > $time[0] && !isset($params['start_year'])) {
|
||||
if (strlen($time [0]) > 0) {
|
||||
if ($start_year > $time [0] && !isset($params ['start_year'])) {
|
||||
// force start year to include given date if not explicitly set
|
||||
$start_year = $time[0];
|
||||
$start_year = $time [0];
|
||||
}
|
||||
if($end_year < $time[0] && !isset($params['end_year'])) {
|
||||
if ($end_year < $time [0] && !isset($params ['end_year'])) {
|
||||
// force end year to include given date if not explicitly set
|
||||
$end_year = $time[0];
|
||||
$end_year = $time [0];
|
||||
}
|
||||
}
|
||||
|
||||
@ -183,37 +195,65 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
$field_separator_count++;
|
||||
$month_names = array();
|
||||
$month_values = array();
|
||||
if(isset($month_empty)) {
|
||||
$month_names[''] = $month_empty;
|
||||
$month_values[''] = '';
|
||||
if (isset($month_empty)) {
|
||||
$month_names [''] = $month_empty;
|
||||
$month_values [''] = '';
|
||||
}
|
||||
for ($i = 1; $i <= 12; $i++) {
|
||||
$month_names[$i] = strftime($month_format, mktime(0, 0, 0, $i, 1, 2000));
|
||||
$month_values[$i] = strftime($month_value_format, mktime(0, 0, 0, $i, 1, 2000));
|
||||
// Using the month_names from the FlatPress language files
|
||||
global $lang;
|
||||
$replace_month_names = array();
|
||||
$replace_month_names [0] = '-';
|
||||
$replace_month_value_format = array(
|
||||
"00",
|
||||
"01",
|
||||
"02",
|
||||
"03",
|
||||
"04",
|
||||
"05",
|
||||
"06",
|
||||
"07",
|
||||
"08",
|
||||
"09",
|
||||
"10",
|
||||
"11",
|
||||
"12"
|
||||
);
|
||||
$fp_lang_months = array();
|
||||
$fp_lang_months = $lang ['date'] ['month'];
|
||||
$fplm = 0;
|
||||
for($lm = 1; $lm <= 12; $lm++) {
|
||||
$replace_month_names [$lm] = $fp_lang_months [$fplm];
|
||||
$fplm++;
|
||||
}
|
||||
for($i = 1; $i <= 12; $i++) {
|
||||
$month_names [$i] = $replace_month_names [$i];
|
||||
$month_values [$i] = $replace_month_value_format [$i];
|
||||
}
|
||||
// /FlatPress change
|
||||
|
||||
$month_result .= '<select name=';
|
||||
if (null !== $field_array){
|
||||
if (null !== $field_array) {
|
||||
$month_result .= '"' . $field_array . '[' . $prefix . 'Month]"';
|
||||
} else {
|
||||
$month_result .= '"' . $prefix . 'Month"';
|
||||
}
|
||||
if (null !== $month_size){
|
||||
if (null !== $month_size) {
|
||||
$month_result .= ' size="' . $month_size . '"';
|
||||
}
|
||||
if (null !== $month_extra){
|
||||
if (null !== $month_extra) {
|
||||
$month_result .= ' ' . $month_extra;
|
||||
}
|
||||
if (null !== $all_extra){
|
||||
if (null !== $all_extra) {
|
||||
$month_result .= ' ' . $all_extra;
|
||||
}
|
||||
$month_result .= $extra_attrs . '>'."\n";
|
||||
$month_result .= $extra_attrs . '>' . "\n";
|
||||
|
||||
$month_result .= smarty_function_html_options(array('output' => $month_names,
|
||||
$month_result .= smarty_function_html_options(array(
|
||||
'output' => $month_names,
|
||||
'values' => $month_values,
|
||||
'selected' => (int)$time[1] ? strftime($month_value_format, mktime(0, 0, 0, (int)$time[1], 1, 2000)) : '',
|
||||
'print_result' => false),
|
||||
$smarty);
|
||||
'selected' => (int) $time [1] ? strftime($month_value_format, mktime(0, 0, 0, (int) $time [1], 1, 2000)) : '',
|
||||
'print_result' => false
|
||||
), $smarty);
|
||||
$month_result .= '</select>';
|
||||
}
|
||||
|
||||
@ -221,90 +261,92 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
$field_separator_count++;
|
||||
$days = array();
|
||||
if (isset($day_empty)) {
|
||||
$days[''] = $day_empty;
|
||||
$day_values[''] = '';
|
||||
$days [''] = $day_empty;
|
||||
$day_values [''] = '';
|
||||
}
|
||||
for ($i = 1; $i <= 31; $i++) {
|
||||
$days[] = sprintf($day_format, $i);
|
||||
$day_values[] = sprintf($day_value_format, $i);
|
||||
for($i = 1; $i <= 31; $i++) {
|
||||
$days [] = sprintf($day_format, $i);
|
||||
$day_values [] = sprintf($day_value_format, $i);
|
||||
}
|
||||
|
||||
$day_result .= '<select name=';
|
||||
if (null !== $field_array){
|
||||
if (null !== $field_array) {
|
||||
$day_result .= '"' . $field_array . '[' . $prefix . 'Day]"';
|
||||
} else {
|
||||
$day_result .= '"' . $prefix . 'Day"';
|
||||
}
|
||||
if (null !== $day_size){
|
||||
if (null !== $day_size) {
|
||||
$day_result .= ' size="' . $day_size . '"';
|
||||
}
|
||||
if (null !== $all_extra){
|
||||
if (null !== $all_extra) {
|
||||
$day_result .= ' ' . $all_extra;
|
||||
}
|
||||
if (null !== $day_extra){
|
||||
if (null !== $day_extra) {
|
||||
$day_result .= ' ' . $day_extra;
|
||||
}
|
||||
$day_result .= $extra_attrs . '>'."\n";
|
||||
$day_result .= smarty_function_html_options(array('output' => $days,
|
||||
$day_result .= $extra_attrs . '>' . "\n";
|
||||
$day_result .= smarty_function_html_options(array(
|
||||
'output' => $days,
|
||||
'values' => $day_values,
|
||||
'selected' => $time[2],
|
||||
'print_result' => false),
|
||||
$smarty);
|
||||
'selected' => $time [2],
|
||||
'print_result' => false
|
||||
), $smarty);
|
||||
$day_result .= '</select>';
|
||||
}
|
||||
|
||||
if ($display_years) {
|
||||
$field_separator_count++;
|
||||
if (null !== $field_array){
|
||||
if (null !== $field_array) {
|
||||
$year_name = $field_array . '[' . $prefix . 'Year]';
|
||||
} else {
|
||||
$year_name = $prefix . 'Year';
|
||||
}
|
||||
if ($year_as_text) {
|
||||
$year_result .= '<input type="text" name="' . $year_name . '" value="' . $time[0] . '" size="4" maxlength="4"';
|
||||
if (null !== $all_extra){
|
||||
$year_result .= '<input type="text" name="' . $year_name . '" value="' . $time [0] . '" size="4" maxlength="4"';
|
||||
if (null !== $all_extra) {
|
||||
$year_result .= ' ' . $all_extra;
|
||||
}
|
||||
if (null !== $year_extra){
|
||||
if (null !== $year_extra) {
|
||||
$year_result .= ' ' . $year_extra;
|
||||
}
|
||||
$year_result .= ' />';
|
||||
} else {
|
||||
$years = range((int)$start_year, (int)$end_year);
|
||||
$years = range((int) $start_year, (int) $end_year);
|
||||
if ($reverse_years) {
|
||||
rsort($years, SORT_NUMERIC);
|
||||
} else {
|
||||
sort($years, SORT_NUMERIC);
|
||||
}
|
||||
$yearvals = $years;
|
||||
if(isset($year_empty)) {
|
||||
if (isset($year_empty)) {
|
||||
array_unshift($years, $year_empty);
|
||||
array_unshift($yearvals, '');
|
||||
}
|
||||
$year_result .= '<select name="' . $year_name . '"';
|
||||
if (null !== $year_size){
|
||||
if (null !== $year_size) {
|
||||
$year_result .= ' size="' . $year_size . '"';
|
||||
}
|
||||
if (null !== $all_extra){
|
||||
if (null !== $all_extra) {
|
||||
$year_result .= ' ' . $all_extra;
|
||||
}
|
||||
if (null !== $year_extra){
|
||||
if (null !== $year_extra) {
|
||||
$year_result .= ' ' . $year_extra;
|
||||
}
|
||||
$year_result .= $extra_attrs . '>'."\n";
|
||||
$year_result .= smarty_function_html_options(array('output' => $years,
|
||||
$year_result .= $extra_attrs . '>' . "\n";
|
||||
$year_result .= smarty_function_html_options(array(
|
||||
'output' => $years,
|
||||
'values' => $yearvals,
|
||||
'selected' => $time[0],
|
||||
'print_result' => false),
|
||||
$smarty);
|
||||
'selected' => $time [0],
|
||||
'print_result' => false
|
||||
), $smarty);
|
||||
$year_result .= '</select>';
|
||||
}
|
||||
}
|
||||
|
||||
// Loop thru the field_order field
|
||||
for ($i = 0; $i <= 2; $i++){
|
||||
for($i = 0; $i <= 2; $i++) {
|
||||
$c = substr($field_order, $i, 1);
|
||||
switch ($c){
|
||||
switch ($c) {
|
||||
case 'D':
|
||||
$html_result .= $day_result;
|
||||
break;
|
||||
@ -318,7 +360,7 @@ function smarty_function_html_select_date($params, &$smarty)
|
||||
break;
|
||||
}
|
||||
// Add the field seperator
|
||||
if($i < $field_separator_count) {
|
||||
if ($i < $field_separator_count) {
|
||||
$html_result .= $field_separator;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user