mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-10 00:37:02 +02:00
Code Issues Releases Wiki Activity

Additional updates for processwire/processwire-issues#1467

Browse Source
This commit is contained in:
Ryan Cramer
2022-03-18 13:49:01 -04:00
parent 11a15840d3
commit a5e397d005
21 changed files with 194 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wire/core/Database.php
View File

@@ -95,6 +95,7 @@ class Database extends \mysqli implements WireDatabase {
* @throws WireDatabaseException
*
*/
#[\ReturnTypeWillChange]
public function query($sql, $resultmode = MYSQLI_STORE_RESULT) {
static $timerTotalQueryTime = 0;

5
wire/core/PagefilesManager.php
View File

@@ -31,7 +31,7 @@
*
* #pw-body
*
* ProcessWire 3.x, Copyright 2016 by Ryan Cramer
* ProcessWire 3.x, Copyright 2022 by Ryan Cramer
* https://processwire.com
*
* @method save() #pw-hooker
@@ -301,7 +301,8 @@ class PagefilesManager extends Wire {
*
*/
protected function _createPath($path) {
if(is_dir($path)) return true;
if(empty($path)) return false;
if(is_dir("$path")) return true;
return $this->wire('files')->mkdir($path, true);
}

4
wire/core/PagesTrash.php
View File

@@ -79,7 +79,7 @@ class PagesTrash extends Wire {
if($languages && $languages->hasPageNames()) {
foreach($languages as $language) {
if($language->isDefault()) continue;
$langName = $page->get("name$language->id");
$langName = (string) $page->get("name$language->id");
if(!strlen($langName)) continue;
$page->set("name$language->id", $name . "_" . $langName);
}
@@ -227,7 +227,7 @@ class PagesTrash extends Wire {
foreach($languages as $language) {
/** @var Language $language */
if($language->isDefault()) continue;
$langName = $page->get("name$language->id");
$langName = (string) $page->get("name$language->id");
if(!strlen($langName)) continue;
if(strpos($langName, $trashPrefix) === 0) {
list(,$langName) = explode('_', $langName);

4
wire/core/Process.php
View File

@@ -483,14 +483,14 @@ abstract class Process extends WireData implements Module {
$id = $item->id;
$name = $item->name;
$label = (string) $item->{$options['itemLabel']};
$icon = str_replace(array('icon-', 'fa-'),'', $item->{$options['iconKey']});
$icon = str_replace(array('icon-', 'fa-'),'', (string) $item->{$options['iconKey']});
$class = $item->{$options['classKey']};
} else if(is_array($item)) {
$id = isset($item['id']) ? $item['id'] : '';
$name = isset($item['name']) ? $item['name'] : '';
$label = isset($item[$options['itemLabel']]) ? $item[$options['itemLabel']] : '';
$class = isset($item[$options['classKey']]) ? $item[$options['classKey']] : '';
if(isset($item[$options['iconKey']])) $icon = str_replace(array('icon-', 'fa-'),'', $item[$options['iconKey']]);
if(isset($item[$options['iconKey']])) $icon = str_replace(array('icon-', 'fa-'),'', (string) $item[$options['iconKey']]);
} else {
$this->error("Item must be object or array: $item");
continue;

82
wire/core/WireDateTime.php
View File

@@ -286,7 +286,7 @@ class WireDateTime extends Wire {
} else {
$TRIM0 = false;
}
$value = strftime($format, $value);
$value = $this->strftime($format, $value);
if($TRIM0) $value = str_replace(array('TRIM00', 'TRIM0'), '', $value);
} else {
@@ -412,7 +412,7 @@ class WireDateTime extends Wire {
else if($format == 'r') $value = $this->relativeTimeStr($ts, 1);
else if($format == 'r-') $value = $this->relativeTimeStr($ts, 1, false);
else if($format == 'ts') $value = $ts;
else if(strpos($format, '%') !== false) $value = strftime($format, $ts);
else if(strpos($format, '%') !== false && version_compare(PHP_VERSION, '8.1.0', '<')) $value = $this->strftime($format, $ts);
else $value = date($format, $ts);
return $value;
}
@@ -450,6 +450,84 @@ class WireDateTime extends Wire {
return strtotime($str, $options['baseTimestamp']) ;
}
/**
* strftime() replacement function that works in PHP 8.1+ (though not locale aware)
*
* @param string $format
* @param null|int|string $timestamp
* @return string|false
* @since 3.0.197
*
*/
public function strftime($format, $timestamp = null) {
$format = (string) $format;
if(is_string($timestamp)) {
if(empty($timestamp)) {
$timestamp = null;
} else if(ctype_digit($timestamp)) {
$timestamp = (int) $timestamp;
} else {
$timestamp = $this->strtotime($timestamp);
}
}
if($timestamp === null) $timestamp = time();
if(version_compare(PHP_VERSION, '8.1.0', '<')) {
return strftime($format, $timestamp);
}
$format = $this->strftimeToDateFormat($format);
return date($format, $timestamp);
}
/**
* Convert strftime() format to date() format
*
* @param string $format
* @return string
* @since 3.0.197
*
*/
protected function strftimeToDateFormat($format) {
// replacements, in addition to those specified in self::$dateConversion
// strftime format => date format
$replacements = array(
'%e' => 'j', // Day of the month without leading zeros
'%j' => 'z', // Day of the year, 3 digits with leading zeros
'%U' => '_', // Week number of the given year, starting with the first Sunday as the first week (not implemented)
'%h' => 'M', // Abbreviated month name
'%C' => '_', // Two digit representation of the century (year divided by 100, truncated to an integer) (not implemented)
'%g' => 'y', // Two digit representation of the year going by ISO-8601:1988 standards (see %V)
'%G' => 'Y', // 4 digit year
'%k' => 'G', // Hour in 24-hour format
'%l' => 'g', // Hour in 12-hour format
'%r' => 'h:i:s A', // Example: 09:34:17 PM
'%R' => 'G:i', // Example: 00:35 for 12:35 AM
'%T' => 'G:i:s', // Example: 21:34:17 for 09:34:17 PM
'%X' => 'G:i:s', // Preferred time representation based on locale, without the date, Example: 03:59:16 or 15:59:16
'%Z' => 'T', // The time zone abbreviation. Example: EST for Eastern Time
'%c' => 'Y-m-d H:i:s', // Preferred date and time stamp based on locale
'%D' => 'm/d/y', // Example: 02/05/09 for February 5, 2009
'%F' => 'Y-m-d', // Example: 2009-02-05 for February 5, 2009
'%n' => '\\n', // newline
'%t' => '\\t', // tab
'%%' => '%', // literal percent
);
foreach(self::$dateConversion as $dateFormat => $formats) {
$strftimeFormat = $formats[0];
if(empty($strftimeFormat)) continue;
if(strpos($format, $strftimeFormat) !== false) $replacements[$strftimeFormat] = $dateFormat;
}
return strtr($format, $replacements);
}
/**
* Given a unix timestamp (or date string), returns a formatted string indicating the time relative to now

2
wire/core/WireFileTools.php
View File

@@ -38,7 +38,7 @@ class WireFileTools extends Wire {
*
*/
public function mkdir($path, $recursive = false, $chmod = null) {
if(!strlen($path)) return false;
if(!strlen("$path")) return false;
if(is_string($recursive) && strlen($recursive) > 2) {
// chmod argument specified as $recursive argument or arguments swapped