1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00

Admin UI - convertToData() problems solved

This commit is contained in:
secretr
2010-02-12 16:35:43 +00:00
parent 3cf39974e9
commit bad780c356

View File

@@ -2525,39 +2525,42 @@ class e_admin_controller_ui extends e_admin_controller
{ {
$model = new e_model($data); $model = new e_model($data);
$data = $model->getData();
foreach ($this->getFields() as $key => $attributes) foreach ($this->getFields() as $key => $attributes)
{ {
$value = vartrue($attributes['dataPath']) ? $model->getData($attributes['dataPath']) : $model->get($data[$key]); $value = vartrue($attributes['dataPath']) ? $model->getData($attributes['dataPath']) : $model->get($key);
if(null === $value) if(null === $value)
{ {
//FIXME - value appears to always be NULL. continue;
// continue;
} }
switch($attributes['type']) switch($attributes['type'])
{ {
case 'datestamp': case 'datestamp':
$value = $data[$key]; //FIXME temporary fix so that dates are converted
if(!is_numeric($value)) if(!is_numeric($value))
{ {
$value = trim($value) ? e107::getDateConvert()->toTime($value, 'input') : 0; $value = trim($value) ? e107::getDateConvert()->toTime($value, 'input') : 0;
} }
$data[$key] = $value; //FIXME temporary fix so that date is actually saved.
break; break;
case 'ip': // TODO - ask Steve if this check is required case 'ip': // TODO - ask Steve if this check is required
if(strpos($value, '.') !== FALSE) //if(strpos($value, '.') !== FALSE)
{ {
$value = trim($value) ? e107::getInstance()->ipEncode($value) : ''; $value = trim($value) ? e107::getInstance()->ipEncode($value) : '';
} }
break; break;
} }
if(vartrue($attributes['dataPath']))
{
$model->setData($attributes['dataPath'], $value);
}
else
{
$model->set($key, $value);
}
} }
$data = $model->getData();
unset($model); unset($model);
$this->toData($data); $this->toData($data);
} }