franzz/objects
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change mandatory folder locations & remove obsolete masks

Browse Source
This commit is contained in:
Franzz
2026-05-30 01:29:34 +02:00
parent d13fdacdde
commit af7d0f4c86
5 changed files with 43 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
inc/ToolBox.php
View File

@@ -33,11 +33,16 @@ class ToolBox
}
}
public static function fixGlobalVars($argv)
public static function getRequest($argv)
{
//Add CLI arguments
if(defined('STDIN')) mb_parse_str(implode('&', array_slice($argv, 1)), $_GET);
$_REQUEST = array_merge($_GET, $_REQUEST);
$asRequest = array_replace($_GET, $_POST);
if(PHP_SAPI == 'cli' && count($argv) > 1) {
mb_parse_str(implode('&', array_slice($argv, 1)), $asCliRequest);
$asRequest = array_replace($asRequest, $asCliRequest);
}
return $asRequest;
}
public static function array_map_encapsulate($oData, $sChar)
@@ -471,7 +476,7 @@ class ToolBox
* Return relative time description
* FIXME shitty implementation of i18n
* @param int $oTime Time (strtotime)
* @param string $sLang Language (en/fr)
* @param string $sLang Language (en/fr/es)
* @return string Relative Time
*/
public static function getDateTimeDesc($oTime, $sLang='en')
@@ -488,6 +493,10 @@ class ToolBox
$asWeekDays = array('lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi', 'dimanche');
$asMonths = array('janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre');
break;
case 'es':
$asWeekDays = array('lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado', 'domingo');
$asMonths = array('enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre');
break;
}
$sSep = '|';
@@ -541,6 +550,28 @@ class ToolBox
elseif($sYear==($sCurYear-1)) $sDesc = 'l\'année dernière';
else $sDesc = 'en '.$sYear;
break;
case 'es':
if($iTimeStamp>$sCurTimeStamp) $sDesc = 'en el futuro';
elseif($sCurTimeStamp-$iTimeStamp<60) $sDesc = 'hace unos segundos';
elseif($sCurTimeStamp-$iTimeStamp<60*10) $sDesc = 'hace unos minutos';
elseif($sCurTimeStamp-$iTimeStamp<60*20) $sDesc = 'hace un cuarto de hora';
elseif($sCurTimeStamp-$iTimeStamp<60*50) $sDesc = 'hace media hora';
elseif($sCurTimeStamp-$iTimeStamp<60*60*2) $sDesc = 'hace una hora';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24 && $sDay==$sCurDay) $sDesc = 'a las '.$sHour.'h';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24) $sDesc = 'ayer';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*7 && $sWeek==$sCurWeek) $sDesc = $asWeekDays[$sWeekDay-1];
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*7) $sDesc = 'el '.$asWeekDays[$sWeekDay-1].' pasado';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*9) $sDesc = 'hace una semana';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*12) $sDesc = 'hace 10 días';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*16) $sDesc = 'hace 2 semanas';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*23) $sDesc = 'hace 3 semanas';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*31 && $sMonth==$sCurMonth) $sDesc = 'el '.$sDay.' de '.$asMonths[$sMonth-1];
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*30*2 && $sMonth==($sCurMonth-1)) $sDesc = 'el mes pasado';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*365 && $sYear==$sCurYear) $sDesc = 'en '.$asMonths[$sMonth-1];
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*365) $sDesc = 'en '.$asMonths[$sMonth-1].' de '.$sYear;
elseif($sYear==($sCurYear-1)) $sDesc = 'el año pasado';
else $sDesc = 'en '.$sYear;
break;
}
//return self::mb_ucfirst($sDesc);