www/dbq/dbq.php

diff --git a/lib/php/db/field.php b/lib/php/db/field.php
index 1a10a4576adc45e1a9c5741742ee21adbaff5d71..1922757764106c23d29f8b33db086179fc5485fd 100644 (file)
--- a/lib/php/db/field.php
+++ b/lib/php/db/field.php
@@ -4,6 +4,7 @@ class field extends nb {
   private $table;
   public $name;
   public $type = 'text';
+  # NB 07.09.24 public $mime = 'text/plain';
   public $null = true;
   public $key = 0;
   public $uniq = 0;

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 68285512bac89b01d463269e093675d6016783d7..eed585bc51a84ac563b0272c2cec338585eef94c 100644 (file)
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -1102,8 +1102,10 @@ Class Table extends nb {
                if ($opt['is_html'] and !$opt['use_out']) {
                        foreach ($row as $k=>$v) {
                                if (!isset($this->extras[$k])) $row[$k] = $this->db()->out->format($v);
+                               # NB 07.09.24 $field=$this->field($k);
+                               # NB 07.09.24 if (!$field) continue;
+                               # NB 07.09.24 $row[$k] = $field->htmlValue($row[$k]);
                        }
-
                }
 
                //
@@ -1251,8 +1253,6 @@ Class Table extends nb {
 
                        # Function name should be format
                        $this->db()->out->type($format);
-# NB 20.06.18 Why ?????
-# NB 20.06.18                  self::$params += array_values($this->db()->out->types());
 
                        if (empty($out_conf['enclose'])) $out_conf['enclose'] = ['',''];
                        debug('Using out module!',3);

diff --git a/lib/php/mime.php b/lib/php/mime.php
index d299c08449e046086e222f411c66dabba1fb74bb..a2897a3e467ae1d76cf164918469fe88130193fe 100644 (file)
--- a/lib/php/mime.php
+++ b/lib/php/mime.php
@@ -1035,6 +1035,7 @@ class Mime {
                #return $str .= '|'.$mime;
 
                if ($default === null) $default = $str;
+               # NB 07.09.24 if (preg_match('/<\/\w+/',$default)) return $default; # already html
                if (strpos($mime,'text/')===0) $default = htmlentities($default);
                return $default;
        }

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index 88d27af3b0114784a926b83c10882211b0d6deb5..43cc94dcad3290cb9b030a5965cd2d96a4efefbb 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -603,6 +603,8 @@ class DbQ extends nb {
                                        .$hidden
                                        .'</form>'
                                );
+                               # NB 07.09.24 $this->table->add_fields([ 'view' ]);
+                               # NB 07.09.24 $this->table->fields('view')->type = 'html';
 
                                if ($this->perm < self::DELETE) return;
                                static $delete = 1;
@@ -648,12 +650,18 @@ class DbQ extends nb {
                return $rm;
        }
 
-       public static function form_hidden($r) {
+       # NB 07.09.24 public static function form_hidden($r) {
+       public function form_hidden($r) {
                $h = '';
                #debug($r);
 
                foreach ($r as $k => $values) {
                        $values = (array)$values;
+
+                       # NB 07.09.24: Now html content field  
+                       $field = $this->table->field($k);
+                       if ($field and $field->type == 'html') continue;
+
                        $suff = count($values)>1 ? '[]' : '';
                        foreach ($values as $v) {
                                $h .= '<input type="hidden" name="'.htmlentities($k).$suff.'" value="'.htmlentities($v).'"/>';