Merged revisions 2916-2941 from stable branch.

tbrehm

2012-02-22 dec0dfa3a81e23a5a123be56ae8b36e0f1ed9137

 interface/lib/classes/listform.inc.php

@@ -282,7 +282,7 @@
    public function decode($record) 
    {
        global $conf, $app;
        if(is_array($record)) {
        if(is_array($record) && count($record) > 0 && is_array($this->listDef['item'])) {
            foreach($this->listDef['item'] as $field){
                $key = $field['field'];
            if(isset($record[$key])) {
@@ -295,7 +295,7 @@
                    case 'DATETSTAMP':
                        if ($record[$key] > 0) {
                     // is value int?
                     if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
                     if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
                              $record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
                     } else {
                              $record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
@@ -305,7 +305,7 @@
               case 'DATE':
                        if ($record[$key] > 0) {
                     // is value int?
                     if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
                     if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
                              $record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
                     } else {
                              $record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
@@ -316,7 +316,7 @@
                    case 'DATETIME':
                        if ($record[$key] > 0) {
                     // is value int?
                     if (preg_match("/^[0-9]+[.]?[0-9]*$/", $record[$key], $p)) {
                     if (preg_match("/^[0-9]+[\.]?[0-9]*$/", $record[$key], $p)) {
                              $record[$key] = date($this->lng('conf_format_datetime'), $record[$key]);
                     } else {
                              $record[$key] = date($this->lng('conf_format_datetime'), strtotime($record[$key]));
@@ -347,6 +347,7 @@

    public function encode($record)
    {
   global $app;
        if(is_array($record)) {
            foreach($this->listDef['item'] as $field){
                $key = $field['field'];
@@ -355,7 +356,7 @@
                    case 'VARCHAR':
                    case 'TEXT':
                        if(!is_array($record[$key])) {
                            $record[$key] = mysql_real_escape_string($record[$key]);
                            $record[$key] = $app->db->quote($record[$key]);
                        } else {
                            $record[$key] = implode($this->tableDef[$key]['separator'],$record[$key]);
                        }
@@ -384,7 +385,7 @@
                        break;

                    case 'DOUBLE':
                        $record[$key] = mysql_real_escape_string($record[$key]);
                        $record[$key] = $app->db->quote($record[$key]);
                        break;

                    case 'CURRENCY':
@@ -422,4 +423,4 @@

}

?>
?>