ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 153 Activity

Blog 6.5

Browse Source 
Index date and time format okay
Update to 6.5 okay
This commit is contained in:
Fred Tempez 2023-02-10 22:37:51 +01:00
parent aa0b152b67
commit ed46aeb65a
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module/blog/blog.php
View File

@ -125,7 +125,7 @@ class blog extends common
]; ];
public static $timeFormats = [ public static $timeFormats = [
'%H:%M' => 'HH:MM', '%H:%M' => 'HH:MM',
'%I:%M:%S %p' => "HH:MM tt", '%I:%M %p' => "HH:MM tt",
]; ];
public static $timeFormat = ''; public static $timeFormat = '';
@ -161,10 +161,17 @@ class blog extends common
$this->setData(['module', $this->getUrl(0), 'config', 'articlesLenght', 0]); $this->setData(['module', $this->getUrl(0), 'config', 'articlesLenght', 0]);
$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '6.0']); $this->setData(['module', $this->getUrl(0), 'config', 'versionData', '6.0']);
} }
// Version 6.5
if (version_compare($this->getData(['module', $this->getUrl(0), 'config', 'versionData']), '6.5', '<')) {
$this->setData(['module', $this->getUrl(0), 'config', 'dateFormat', '%d %B %Y']);
$this->setData(['module', $this->getUrl(0), 'config', 'timeFormat', '%H:%M']);
$this->setData(['module', $this->getUrl(0), 'config', 'versionData', '6.5']);
}
} }
/** /**
* Flux RSS * Flux RSS
*/ */
@ -538,8 +545,8 @@ class blog extends common
'itemsperPage' => $this->getInput('blogOptionItemsperPage', helper::FILTER_INT, true), 'itemsperPage' => $this->getInput('blogOptionItemsperPage', helper::FILTER_INT, true),
'articlesLenght' => $this->getInput('blogOptionArticlesLenght', helper::FILTER_INT), 'articlesLenght' => $this->getInput('blogOptionArticlesLenght', helper::FILTER_INT),
'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData']), 'versionData' => $this->getData(['module', $this->getUrl(0), 'config', 'versionData']),
'dateFormat' => $this->getInput('blogOptionDateFormat', helper::FILTER_STRING_SHORT), 'dateFormat' => $this->getInput('blogOptionDateFormat'),
'timeFormat' => $this->getInput('blogOptionTimeFormat', helper::FILTER_STRING_SHORT), 'timeFormat' => $this->getInput('blogOptionTimeFormat'),
]]); ]]);
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([

2
module/blog/changes.md
View File

@ -1,4 +1,4 @@
# version 6.4 # version 6.5
- Formats de date - Formats de date
# version 6.4 # version 6.4
- Multilingisme - Multilingisme

4
module/blog/view/option/option.php
View File

@ -35,9 +35,9 @@
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::select('blogOptionDateFormat', $module::$timeFormats, [ <?php echo template::select('blogOptionTimeFormat', $module::$timeFormats, [
'label' => 'Format des heures', 'label' => 'Format des heures',
'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'dateFormat']) 'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'timeFormat'])
]); ?> ]); ?>
</div> </div>
</div> </div>