[Tikiwiki-cvs] tiki/lib/mypage mypagelib.php,1.38,1.39

[<ni...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib/mypage
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30414/lib/mypage

Modified Files:
	mypagelib.php 
Log Message:
[DEV] mypage/types: add editing of default values by types support


Index: mypagelib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/mypage/mypagelib.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- mypagelib.php	21 Aug 2007 20:33:04 -0000	1.38
+++ mypagelib.php	21 Aug 2007 21:14:35 -0000	1.39
@@ -321,6 +321,11 @@
 							 " mpt.description as description, ".
 							 " mpt.section as section, ".
 							 " mpt.permissions as permissions, ".
+							 " mpt.def_width as def_width, ".
+							 " mpt.def_height as def_height, ".
+							 " mpt.fix_dimensions as fix_dimensions, ".
+							 " mpt.def_bgcolor as def_bgcolor, ".
+							 " mpt.fix_bgcolor as fix_bgcolor, ".
 							 " mptc.compname as compname, ".
 							 " mptc.mincount as mincount, ".
 							 " mptc.maxcount as maxcount ".
@@ -340,6 +345,11 @@
 								'description' => $line['description'],
 								'section' => $line['section'],
 								'permissions' => $line['permissions'],
+								'def_width' => $line['def_width'],
+								'def_height' => $line['def_height'],
+								'fix_dimensions' => $line['fix_dimensions'],
+								'def_bgcolor' => $line['def_bgcolor'],
+								'fix_bgcolor' => $line['fix_bgcolor'],
 								'components' => array());
 			}
 			$lastline['components'][]=array('compname' => $line['compname'],
@@ -387,6 +397,11 @@
 								'description' => $line['description'],
 								'section' => $line['section'],
 								'permissions' => $line['permissions'],
+								'def_width' => $line['def_width'],
+								'def_height' => $line['def_height'],
+								'fix_dimensions' => $line['fix_dimensions'],
+								'def_bgcolor' => $line['def_bgcolor'],
+								'fix_bgcolor' => $line['fix_bgcolor'],
 								'components' => array());
 			}
 			$lastline['components'][]=array('compname' => $line['compname'],
@@ -431,6 +446,10 @@
 		foreach($tvals as $k => $v)
 			if (!in_array($k, $cols)) unset($tvals[$k]);
 
+		if (array_key_exists('def_width', $tvals) && empty($tvals['def_width'])) $tvals['def_width']=NULL;
+		if (array_key_exists('def_height', $tvals) && empty($tvals['def_height'])) $tvals['def_height']=NULL;
+		if (array_key_exists('def_bgcolor', $tvals) && empty($tvals['def_bgcolor'])) $tvals['def_bgcolor']=NULL;
+
 		if (count($tvals) > 0) {
 			$l=array();
 			$r=array();