fixing a few "todos"

This commit is contained in:
2014-10-31 21:50:55 +01:00
parent 0520bdc6b6
commit 7b0fd369cc
2 changed files with 7 additions and 3 deletions

View File

@@ -1999,7 +1999,7 @@ class Databap extends PhpObject
$asInfo['from'] = self::MSG_TABLE;
$asInfo['constraint'] = array('type'=>self::MESSAGE_NEWS);
$asInfo['orderBy'] = array('led'=>'DESC');
if($bExport) $asInfo['limit'] = 3;
if($bExport) $asInfo['limit'] = self::MAX_NB_NEWS;
$asNews = $this->oMySql->selectRows($asInfo);
//Status
@@ -2620,6 +2620,11 @@ class Databap extends PhpObject
return $sStyle;
}
public function addUncaughtError($sError)
{
$this->addError('Uncaught errors:'."\n".$sError);
}
public static function getDateFormat($oTime, $sFormat=Databap::DATE_TIME_FORMAT)
{
$iTimeStamp = is_numeric($oTime)?$oTime:strtotime($oTime);

View File

@@ -256,9 +256,8 @@ else
}
//clean unwanted error log
//TODO unify file name with PhpObject Class
$sDebug = ob_get_clean();
if(Settings::DEBUG && $sDebug!='') file_put_contents('log.html', print_r($sDebug, true)."\n\n", FILE_APPEND);
if(Settings::DEBUG && $sDebug!='') $oDatabap->addUncaughtError($sDebug);
echo $sResult;
//echo json_encode($sDebug);