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

Minor fixes

Browse Source
This commit is contained in:
Franzz
2021-05-24 21:47:32 +02:00
parent 3b3066c83b
commit cc58284478
3 changed files with 138 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/db.php
View File

@@ -383,7 +383,7 @@ class Db extends PhpObject
private function addQuotes($oData) private function addQuotes($oData)
{ {
//TODO remake //TODO remake
$asTrustedFunc = array('CURDATE()', 'NOW()'); $asTrustedFunc = array('CURDATE()', 'NOW()', 'NULL');
$sChar = "'"; $sChar = "'";
if(is_array($oData)) if(is_array($oData))
{ {
@@ -574,7 +574,7 @@ class Db extends PhpObject
{ {
if(is_array($asConstraints)) if(is_array($asConstraints))
{ {
if(array_key_exists($sField, $asInfo['constOpe']) && $asInfo['constOpe'][$sField]=='BETWEEN') { if(array_key_exists('constOpe', $asInfo) && array_key_exists($sField, $asInfo['constOpe']) && $asInfo['constOpe'][$sField]=='BETWEEN') {
//Between //Between
$asSelection[$sField] = $asConstraints['from'].' AND '.$asConstraints['to']; $asSelection[$sField] = $asConstraints['from'].' AND '.$asConstraints['to'];
$asInfo['constOpe'][$sField] = " BETWEEN "; $asInfo['constOpe'][$sField] = " BETWEEN ";

8
inc/rss.php
View File

@@ -232,16 +232,14 @@ class Feed extends PhpObject
private static function cleanRss($oText) private static function cleanRss($oText)
{ {
$asForbiddenChars = array('&', '<', '>', '"', "'");
$asReplacementCode = array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;');
if(!is_array($oText)) if(!is_array($oText))
{ {
return str_replace($asForbiddenChars, $asReplacementCode, $oText); return htmlspecialchars($oText, ENT_QUOTES);
} }
elseif(count($oText)>0) elseif(count($oText)>0)
{ {
$oTextKeys = array_map(array($this, 'cleanRss'), array_keys($oText)); $oTextKeys = array_map(array(self, 'cleanRss'), array_keys($oText));
$oTextValues = array_map(array($this, 'cleanRss'), array_values($oText)); $oTextValues = array_map(array(self, 'cleanRss'), array_values($oText));
return array_combine($oTextKeys, $oTextValues); return array_combine($oTextKeys, $oTextValues);
} }
else else

2
inc/toolbox.php
View File

@@ -538,7 +538,7 @@ class ToolBox
elseif($sCurTimeStamp-$iTimeStamp<60*20) $sDesc = '15 minutes ago'; elseif($sCurTimeStamp-$iTimeStamp<60*20) $sDesc = '15 minutes ago';
elseif($sCurTimeStamp-$iTimeStamp<60*50) $sDesc = 'half an hour ago'; elseif($sCurTimeStamp-$iTimeStamp<60*50) $sDesc = 'half an hour ago';
elseif($sCurTimeStamp-$iTimeStamp<60*60*2) $sDesc = 'an hour ago'; elseif($sCurTimeStamp-$iTimeStamp<60*60*2) $sDesc = 'an hour ago';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24 && $sDay==$sCurDay) $sDesc = 'at '.$sHour.' o\'clock'; elseif($sCurTimeStamp-$iTimeStamp<60*60*24 && $sDay==$sCurDay) $sDesc = 'at '.date('gA', $iTimeStamp);
elseif($sCurTimeStamp-$iTimeStamp<60*60*24) $sDesc = 'yesterday'; elseif($sCurTimeStamp-$iTimeStamp<60*60*24) $sDesc = 'yesterday';
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*7 && $sWeek==$sCurWeek) $sDesc = $asWeekDays[$sWeekDay-1]; elseif($sCurTimeStamp-$iTimeStamp<60*60*24*7 && $sWeek==$sCurWeek) $sDesc = $asWeekDays[$sWeekDay-1];
elseif($sCurTimeStamp-$iTimeStamp<60*60*24*7) $sDesc = 'last '.$asWeekDays[$sWeekDay-1]; elseif($sCurTimeStamp-$iTimeStamp<60*60*24*7) $sDesc = 'last '.$asWeekDays[$sWeekDay-1];