From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 1 Feb 2018 04:46:00 +0000 (+0000)
Subject: lib/php/db/table.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=d53e0b68c6733d869584171aa11aec678991eb5c;p=nb.git

lib/php/db/table.php
---

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index c16b0666..20c3fe33 100644
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -34,8 +34,6 @@ Class Table extends nb {
 	public $created;
 	public static $is_admin = true;
 	public $key_preff = '_key_';
-# NB 19.10.17 TODO
-	public $field_preff = '';
 
 	public $fields = [];
 	public $fields_only = [];
@@ -59,13 +57,9 @@ Class Table extends nb {
 			$opt = $name;
 			#$name = $opt['name'];
 			$name = isset($opt['name']) ? $opt['name'] : '';
-
 		}
 
 		if(!empty($name)) $opt['name'] = $this->name = $name;
-		#debug($opt);
-
-		#unset($opt['db']); bye($opt);
 
 		// Type
 		if (isset($opt['sql'])) {
@@ -452,7 +446,7 @@ Class Table extends nb {
 
 		foreach ($keys as $name => $field) {
 			if (isset($values[$name]))
-				$url[] = $this->field_preff.$name . '=' .urlencode($values[$name])
+				$url[] = $this->ppreff().$name . '=' .urlencode($values[$name])
 			;
 		}
 
@@ -853,7 +847,25 @@ Class Table extends nb {
 
 	}
 
-	public function add_extras($extras) {
+# NB 01.02.18 	private function add_fields($fields) {
+# NB 01.02.18 		foreach ($fields as $k => $v) {
+# NB 01.02.18 
+# NB 01.02.18 			if (is_scalar($v)) {
+# NB 01.02.18 				$this->fields[] = new Field([
+# NB 01.02.18 					'name' => $k,
+# NB 01.02.18 					'type' => 'text',
+# NB 01.02.18 					'table' => $this,
+# NB 01.02.18 				]);
+# NB 01.02.18 
+# NB 01.02.18 			} else {
+# NB 01.02.18 				$this->fields[$k] = $v;
+# NB 01.02.18 
+# NB 01.02.18 			}
+# NB 01.02.18 
+# NB 01.02.18 		}
+# NB 01.02.18 	}
+
+	private function add_extras($extras) {
 		if ($this->p('extras') === '0') return false;
 
 		foreach ($extras as $k => $v) {
@@ -1023,7 +1035,7 @@ Class Table extends nb {
 					'name' => $name,
 					'dyn' => true,
 					'table' => $this,
-					'preffix' => $this->field_preff,
+					'preffix' => $this->ppreff(),
 				])
 			;
 
@@ -1618,7 +1630,7 @@ Class Table extends nb {
 
 			if ($field->extras) continue;
 
-			$value = $post[$this->field_preff.$name];
+			$value = $post[$this->ppreff().$name];
 
 			if ($field->key) {
 				$keys[] = $name;
@@ -1673,11 +1685,11 @@ Class Table extends nb {
 		foreach ($this->fields() as $name => $field) {
 			if ($field->key and $field->autoincrement()) continue;
 
-			if (!isset($post[$this->field_preff.$name])) {
+			if (!isset($post[$this->ppreff().$name])) {
 
 				# For postgres and replace mode, we want to update timestamp for example
 				if (!empty($info['fct']) and isset($field->default)) {
-					$post[$this->field_preff.$name] = $field->default;
+					$post[$this->ppreff().$name] = $field->default;
 				} else {
 					continue;
 				}
@@ -1686,7 +1698,7 @@ Class Table extends nb {
 
 			$fields[$name] = $field;
 			$sql_names[$name] = $field->sql_name();
-			$values[] = $post[$this->field_preff.$name];
+			$values[] = $post[$this->ppreff().$name];
 		}
 
 		if (empty($fields)) $this->bye('insert(): No fields for table');
@@ -1745,7 +1757,7 @@ Class Table extends nb {
 
 			if ($field->extras) continue;
 
-			$value = $post[$this->field_preff.$name];
+			$value = $post[$this->ppreff().$name];
 
 			if ($field->key) {
 				$keys[] = $name;
@@ -2157,7 +2169,7 @@ Class Table extends nb {
 			$r .= ''
 				.'<span class="label '.$k.'">'
 				. '<label>'.prettyText($k).'</label>'
-				. '<input type="text" id="'.$k.'" name="'.$this->field_preff.$k.'" value="'.$v.'" />'
+				. '<input type="text" id="'.$k.'" name="'.$this->ppreff().$k.'" value="'.$v.'" />'
 				.'</span>'
 			;
 
diff --git a/lib/php/nb.php b/lib/php/nb.php
index 421a28aa..748c7b24 100644
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -101,14 +101,22 @@ class NB {
 	 * Function: p
 	 * Return a param
 	 */
+	public static function ppreff($set_preff=null) {
+		static $preff = '';
+		if ($set_preff !== null) $preff = $set_preff;
+		return $preff;
+	}
+
 	protected static function _p_get($name=null,$default=null) {
 		if ($name === null) return isset($_GET) ? $_GET : [];
+		$name = self::ppreff() . $name;
 		return isset($_GET[$name]) ? $_GET[$name] : $default;
 	}
 
 	public static function p($name=null,$default=null) {
 		if(NB_P_GET) return self::_p_get($name,$default);
 		if ($name === null) return isset($_REQUEST) ? $_REQUEST : [];
+		$name = self::ppreff() . $name;
 		return isset($_REQUEST[$name]) ? $_REQUEST[$name] : $default;
 	}