Update TINYIB_DATEFMT to use strftime format (instead of date)

This commit is contained in:
Trevor Slocum 2020-10-22 08:24:11 -07:00
parent 7c3c801049
commit 0133da8cb2
5 changed files with 11 additions and 15 deletions

View File

@ -68,6 +68,7 @@ if (!defined('TINYIB_LOCALE') || TINYIB_LOCALE == '') {
return $string;
}
} else {
setlocale(LC_ALL, TINYIB_LOCALE);
require 'inc/gettext/src/autoloader.php';
$translations = Translations::fromPoFile('locale/' . TINYIB_LOCALE . '/tinyib.po');
$translator = new Translator();

View File

@ -56,7 +56,7 @@ if (!defined('TINYIB_JSON')) {
define('TINYIB_JSON', true);
}
if (!defined('TINYIB_DATEFMT')) {
define('TINYIB_DATEFMT', 'y/m/d(D)H:i:s');
define('TINYIB_DATEFMT', '%g/%m/%d(%a)%H:%M:%S');
}
if (!defined('TINYIB_DBMIGRATE')) {
define('TINYIB_DBMIGRATE', false);

View File

@ -136,7 +136,7 @@ function nameBlock($name, $tripcode, $email, $timestamp, $rawposttext) {
$output = '<a href="mailto:' . $email . '">' . $output . '</a>';
}
return $output . $rawposttext . ' ' . date(TINYIB_DATEFMT, $timestamp);
return $output . $rawposttext . ' ' . strftime(TINYIB_DATEFMT, $timestamp);
}
function writePage($filename, $contents) {
@ -244,7 +244,7 @@ function checkBanned() {
$ban = banByIP($_SERVER['REMOTE_ADDR']);
if ($ban) {
if ($ban['expire'] == 0 || $ban['expire'] > time()) {
$expire = ($ban['expire'] > 0) ? ('<br>This ban will expire ' . date(TINYIB_DATEFMT, $ban['expire'])) : '<br>This ban is permanent and will not expire.';
$expire = ($ban['expire'] > 0) ? ('<br>This ban will expire ' . strftime(TINYIB_DATEFMT, $ban['expire'])) : '<br>This ban is permanent and will not expire.';
$reason = ($ban['reason'] == '') ? '' : ('<br>Reason: ' . $ban['reason']);
fancyDie('Your IP address ' . $ban['ip'] . ' has been banned from posting on this image board. ' . $expire . $reason);
} else {

View File

@ -53,16 +53,11 @@ function supportedFileTypes() {
}
$types_allowed = array_map('strtoupper', array_unique(array_column($tinyib_uploads, 0)));
$types_last = array_pop($types_allowed);
$types_formatted = $types_allowed
? implode(', ', $types_allowed) . ' and ' . $types_last
: $types_last;
if (count($tinyib_uploads) == 1) {
return sprintf(__('Supported file type is %s'), $types_formatted);
} else {
return sprintf(__('Supported file types are %s.'), $types_formatted);
if (count($types_allowed) == 1) {
return sprintf(__('Supported file type is %s'), $types_allowed[0]);
}
$last_type = array_pop($types_allowed);
return sprintf(__('Supported file types are %1$s and %2$s.'), implode(', ', $types_allowed), $last_type);
}
function makeLinksClickable($text) {
@ -797,9 +792,9 @@ function manageBansTable() {
if (count($allbans) > 0) {
$text .= '<table border="1"><tr><th>' . __('IP Address') . '</th><th>' . __('Set At') . '</th><th>' . __('Expires') . '</th><th>' . __('Reason') . '</th><th>&nbsp;</th></tr>';
foreach ($allbans as $ban) {
$expire = ($ban['expire'] > 0) ? date(TINYIB_DATEFMT, $ban['expire']) : __('Does not expire');
$expire = ($ban['expire'] > 0) ? strftime(TINYIB_DATEFMT, $ban['expire']) : __('Does not expire');
$reason = ($ban['reason'] == '') ? '&nbsp;' : htmlentities($ban['reason']);
$text .= '<tr><td>' . $ban['ip'] . '</td><td>' . date(TINYIB_DATEFMT, $ban['timestamp']) . '</td><td>' . $expire . '</td><td>' . $reason . '</td><td><a href="?manage&bans&lift=' . $ban['id'] . '">' . __('lift') . '</a></td></tr>';
$text .= '<tr><td>' . $ban['ip'] . '</td><td>' . strftime(TINYIB_DATEFMT, $ban['timestamp']) . '</td><td>' . $expire . '</td><td>' . $reason . '</td><td><a href="?manage&bans&lift=' . $ban['id'] . '">' . __('lift') . '</a></td></tr>';
}
$text .= '</table>';
}

View File

@ -35,7 +35,7 @@ define('TINYIB_WORDBREAK', 80); // Words longer than this many characters
define('TINYIB_TIMEZONE', 'UTC'); // See https://secure.php.net/manual/en/timezones.php - e.g. America/Los_Angeles
define('TINYIB_CATALOG', true); // Generate catalog page
define('TINYIB_JSON', true); // Generate JSON files
define('TINYIB_DATEFMT', 'y/m/d(D)H:i:s'); // Date format (see php.net/date)
define('TINYIB_DATEFMT', '%g/%m/%d(%a)%H:%M:%S'); // Date and time format (see php.net/strftime)
$tinyib_hidefieldsop = array(); // Fields to hide when creating a new thread - e.g. array('name', 'email', 'subject', 'message', 'file', 'embed', 'password')
$tinyib_hidefields = array(); // Fields to hide when replying
$tinyib_capcodes = array(array('Admin', 'red'), array('Mod', 'purple')); // Administrator and moderator capcode label and color