arenard
/
paniers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ajout datetime GIT repo version

This commit is contained in:
Adrien RENARD 2025-08-22 12:51:51 +02:00
parent 0425d069f9
commit 12e1f4326d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functions/functions.php
View File

@ -3,9 +3,9 @@
// SMARTY DISPLAY // // SMARTY DISPLAY //
function display() { function display() {
$GLOBALS['smarty'] -> assign('gitVS',getGitVersion());
$GLOBALS['smarty'] -> assign('debug',isset($GLOBALS['debug']) ? $GLOBALS['debug'] : false); $GLOBALS['smarty'] -> assign('debug',isset($GLOBALS['debug']) ? $GLOBALS['debug'] : false);
$GLOBALS['smarty'] -> assign('errors',isset($GLOBALS['errors']) ? $GLOBALS['errors'] : false); $GLOBALS['smarty'] -> assign('errors',isset($GLOBALS['errors']) ? $GLOBALS['errors'] : false);
$GLOBALS['smarty'] -> assign('gitVS',getGitVersion());
$GLOBALS['smarty'] -> assign('jsFiles',$GLOBALS['jsFiles']); $GLOBALS['smarty'] -> assign('jsFiles',$GLOBALS['jsFiles']);
$GLOBALS['smarty'] -> assign('cssFiles',$GLOBALS['cssFiles']); $GLOBALS['smarty'] -> assign('cssFiles',$GLOBALS['cssFiles']);
@ -85,8 +85,10 @@ function getGitVersion() {
exec('git describe --always',$version_mini_hash); exec('git describe --always',$version_mini_hash);
exec('git rev-list HEAD | wc -l',$version_number); exec('git rev-list HEAD | wc -l',$version_number);
exec('git log -1',$line); exec('git log -1',$line);
exec('git log -1 --format=%cd --date=iso',$date);
$version['short'] = "v1.".trim($version_number[0]).".".$version_mini_hash[0]; $version['short'] = "v1.".trim($version_number[0]).".".$version_mini_hash[0];
$version['full'] = "v1.".trim($version_number[0]).".$version_mini_hash[0] (".str_replace('commit ','',$line[0]).")"; $version['full'] = "v1.".trim($version_number[0]).".$version_mini_hash[0] (".str_replace('commit ','',$line[0]).")";
$version['date'] = formatDate($date[0], 'iso', 'datetime');
return $version; return $version;
} }
@ -190,6 +192,7 @@ function strtoupperFirstLetter($str) {
'mysql_datetime' => "Y-m-d H:i:s", 'mysql_datetime' => "Y-m-d H:i:s",
'strdate' => "Y-m-d", 'strdate' => "Y-m-d",
'strdatetime' => "Y-m-d_H.i.s", 'strdatetime' => "Y-m-d_H.i.s",
'iso' => "Y-m-d H:i:s P",
'time' => "H:i", 'time' => "H:i",
'print_time' => "H:i", 'print_time' => "H:i",
'mois' => "m-d" 'mois' => "m-d"
@ -204,10 +207,11 @@ function dateFormatHasDate($format) {
|| $format=='mysql_datetime' || $format=='mysql_datetime'
|| $format=='strdate' || $format=='strdate'
|| $format=='strdatetime' || $format=='strdatetime'
|| $format=='iso'
|| $format=='timestamp'; || $format=='timestamp';
} }
function dateFormatHasTime($format) { function dateFormatHasTime($format) {
return $format=='datetime' || $format=='mysql_datetime' || $format=='strdatetime' || $format=='timestamp'; return $format=='datetime' || $format=='mysql_datetime' || $format=='strdatetime' || $format=='iso' || $format=='timestamp';
} }
function parseDate($dateTxt='', $format="mysql_datetime", $moment=false, $dateTimeZoneTxt = "Europe/Paris") { function parseDate($dateTxt='', $format="mysql_datetime", $moment=false, $dateTimeZoneTxt = "Europe/Paris") {

2
public_html_admin/templates/structure/topBar.tpl
View File

@ -37,7 +37,7 @@
<li><a href="https://connexion.pixap.fr/logout/"><i class="glyphicon glyphicon-off"></i> déconnection</a></li> <li><a href="https://connexion.pixap.fr/logout/"><i class="glyphicon glyphicon-off"></i> déconnection</a></li>
<li class="divider"></li> <li class="divider"></li>
<li style="padding-left: 20px;"> <li style="padding-left: 20px;">
<b>GIT vs. : </b> {$gitVS.short} <b>GIT vs. : </b> {$gitVS.short}<br/><i>{$gitVS.date}</i>
</li> </li>
</ul> </ul>
</li> </li>