[xoops-svn] SF.net SVN: xoops-svn:[12661] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/class/files

[<txm...@us...>]

Revision: 12661
          http://sourceforge.net/p/xoops/svn/12661
Author:   txmodxoops
Date:     2014-06-28 14:04:32 +0000 (Sat, 28 Jun 2014)
Log Message:
-----------
 - Fixed bugs for field_name empty
 - Still work to do

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/blocks/blocks.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/user/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php	2014-06-28 09:55:59 UTC (rev 12660)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php	2014-06-28 14:04:32 UTC (rev 12661)
@@ -111,21 +111,31 @@
 		{
 			$field_name = $fields[$f]->getVar('field_name');
 			$rp_field_name = $field_name;
-			if(strpos($field_name, '_')) {       
-				$str = strpos($field_name, '_'); 
-				if($str !== false){ 
-					$rp_field_name = substr($field_name, $str + 1, strlen($field_name));
-				} 		
-			}
-			$lp_field_name = substr($field_name, 0, strpos($field_name, '_'));
-			$ret .= <<<EOT
+			// Verify if table_fieldname is not empty
+			if(!empty($table_fieldname)) {
+				if(strpos($field_name, '_')) {       
+					$str = strpos($field_name, '_'); 
+					if($str !== false){ 
+						$rp_field_name = substr($field_name, $str + 1, strlen($field_name));
+					} 		
+				}
+				$lp_field_name = substr($field_name, 0, strpos($field_name, '_'));
+				$ret .= <<<EOT
 				\${$lp_field_name}['{$rp_field_name}'] = \${$table_name}_arr[\$i]->getVar('{$field_name}');\n
 EOT;
+			} else {
+				$lp_field_name = $table_name;
+				$ret .= <<<EOT
+				\${$lp_field_name}['{$rp_field_name}'] = \${$table_name}_arr[\$i]->getVar('{$field_name}');\n
+EOT;
+			}
 		}
 			$ret .= <<<EOT
 				\$GLOBALS['xoopsTpl']->append('{$table_name}_list', \${$lp_field_name});
                 unset(\${$lp_field_name});
-			}
+			}\n
+EOT;
+			$ret .= <<<EOT
 			if ( \${$table_name}_rows > \$limit ) {
 				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
 				\$pagenav = new XoopsPageNav(\${$table_name}_rows, \$limit, \$start, 'start', 'op=list&limit=' . \$limit);

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php	2014-06-28 09:55:59 UTC (rev 12660)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php	2014-06-28 14:04:32 UTC (rev 12661)
@@ -101,15 +101,24 @@
 		{	    
 			$field_name = $fields[$f]->getVar('field_name');
 			$rp_field_name = $field_name;
-			if(strpos($field_name, '_')) {       
-				$str = strpos($field_name, '_'); 
-				if($str !== false){ 
-					$rp_field_name = substr($field_name, $str + 1, strlen($field_name));
-				} 		
+			// Verify if table_fieldname is not empty
+			if(!empty($table_fieldname)) {
+				if(strpos($field_name, '_')) {       
+					$str = strpos($field_name, '_'); 
+					if($str !== false){ 
+						$rp_field_name = substr($field_name, $str + 1, strlen($field_name));
+					} 		
+				}
+				$tname = $table_fieldname;
+				$ret .= <<<EOT
+		\${$tname}['{$rp_field_name}'] = \${$table_name}_arr[\$i]->getVar('{$field_name}');\n
+EOT;
+		    } else {
+				$tname = $table_name;
+				$ret .= <<<EOT
+		\${$tname}['{$rp_field_name}'] = \${$table_name}_arr[\$i]->getVar('{$field_name}');\n
+EOT;
 			}
-			$ret .= <<<EOT
-		\${$table_fieldname}['{$rp_field_name}'] = \${$table_name}_arr[\$i]->getVar('{$field_name}');\n
-EOT;
 		}
 		$ret .= <<<EOT
 	}

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php	2014-06-28 09:55:59 UTC (rev 12660)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php	2014-06-28 14:04:32 UTC (rev 12661)
@@ -52,20 +52,15 @@
 		$this->setTable($table);
 	}
 	/*
-	*  @public function render
-	*  @param null
+	*  @private function getTemplatesAdminPagesHeader
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
 	*/
-	public function renderFile($filename) {    
-		$module = $this->getModule();
-		$table = $this->getTable(); 	
-		$module_name = $module->getVar('mod_name');		
-        $stl_mod_name = strtolower($module_name);		
+	private function getTemplatesAdminPagesHeader($module_name, $table, $language) {    
+		$stl_mod_name = strtolower($module_name);
 		$table_name = $table->getVar('table_name');
-		$table_fieldname = $table->getVar('table_fieldname');		
-		//
-		$stu_module_name = strtoupper($module_name);	 
-		$language = $this->getLanguage($module_name, 'AM');			
-		$content = <<<EOT
+		$ret = <<<EOT
 <{include file="db:{$stl_mod_name}_header.tpl"}>
 <{if {$table_name}_list}>
 	<table class="outer {$table_name} width100">
@@ -77,17 +72,32 @@
 		{
 			$field_name = $fields[$f]->getVar('field_name');
 			$lang_fn = $language.strtoupper($field_name);		
-			$content .= <<<EOT
+			$ret .= <<<EOT
 				<th class="center"><{\$smarty.const.{$lang_fn}}></th>\n
 EOT;
 		}
-		$content .= <<<EOT
+		$ret .= <<<EOT
 			</tr>
-		</thead>		
+		</thead>\n
+EOT;
+		return $ret;
+	}
+	/*
+	*  @private function getTemplatesAdminPagesBody
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
+	*/
+	private function getTemplatesAdminPagesBody($module_name, $table, $language) 
+	{    
+		$stl_mod_name = strtolower($module_name);
+		$table_name = $table->getVar('table_name');
+		$ret = <<<EOT
 		<tbody>
-			<{foreach item={$table_fieldname} from=\${$table_name}_list}>	
+			<{foreach item=list from=\${$table_name}_list}>	
 				<tr class="<{cycle values='odd, even'}>">\n
 EOT;
+		$fields = $this->getTableFields($table->getVar('table_id'));
 		foreach(array_keys($fields) as $f) 
 		{
 			$field_name = $fields[$f]->getVar('field_name');
@@ -101,27 +111,83 @@
 			}
 			switch( $field_element ) {			    
 				case 8:			
-					$content .= <<<EOT
-					<td class="center"><span style="background-color: <{\${$table_fieldname}.{$rp_field_name}}>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td>\n			
+					$ret .= <<<EOT
+					<td class="center"><span style="background-color: <{\$list.{$rp_field_name}}>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td>\n			
 EOT;
 				break;
 				case 9:
-					$content .= <<<EOT
-					<td class="center"><img src="<{\${$stl_mod_name}_upload_url}>/images/{$table_name}/<{\${$table_fieldname}.{$rp_field_name}}>" alt="{$table_name}"></td>\n
+					$ret .= <<<EOT
+					<td class="center"><img src="<{\${$stl_mod_name}_upload_url}>/images/{$table_name}/<{\$list.{$rp_field_name}}>" alt="{$table_name}"></td>\n
 EOT;
 				break;
 				default:
-					$content .= <<<EOT
-					<td class="center"><{\${$table_fieldname}.{$rp_field_name}}></td>\n
+					$ret .= <<<EOT
+					<td class="center"><{\$list.{$rp_field_name}}></td>\n
 EOT;
 				break;
 			}
 		}
-		$content .= <<<EOT
+		$ret .= <<<EOT
 				</tr>
 			<{/foreach}>
 		</tbody>
-	</table>	
+	</table>\n
+EOT;
+		return $ret;
+	}
+	/*
+	*  @private function getTemplatesAdminPagesBodyFieldnameEmpty
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
+	*/
+	private function getTemplatesAdminPagesBodyFieldnameEmpty($module_name, $table, $language) 
+	{ 		
+		$stl_mod_name = strtolower($module_name);
+		$table_name = $table->getVar('table_name');		
+		$ret = <<<EOT
+	<tbody>
+			<{foreach item=list from=\${$table_name}_list}>	
+				<tr class="<{cycle values='odd, even'}>">\n
+EOT;
+		$fields = $this->getTableFields($table->getVar('table_id'));
+		foreach(array_keys($fields) as $f) 
+		{
+			$field_name = $fields[$f]->getVar('field_name');
+			$field_element = $fields[$f]->getVar('field_element');			
+			switch( $field_element ) {			    
+				case 8:			
+					$ret .= <<<EOT
+					<td class="center"><span style="background-color: <{\$list.{$field_name}}>;">\t\t</span></td>\n			
+EOT;
+				break;
+				case 9:
+					$ret .= <<<EOT
+					<td class="center"><img src="<{\${$stl_mod_name}_upload_url}>/images/{$table_name}/<{\$list.{$field_name}}>" alt="{$table_name}"></td>\n
+EOT;
+				break;
+				default:
+					$ret .= <<<EOT
+					<td class="center"><{\$list.{$field_name}}></td>\n
+EOT;
+				break;
+			}
+		}
+		$ret .= <<<EOT
+				</tr>
+			<{/foreach}>
+		</tbody>
+	</table>\n
+EOT;
+		return $ret;
+	}
+	/*
+	*  @private function getTemplatesAdminPagesFooter
+	*  @param string $module_name
+	*/
+	private function getTemplatesAdminPagesFooter($module_name) {    
+		$stl_mod_name = strtolower($module_name);
+		$ret = <<<EOT
 	<div class="clear">&nbsp;</div>
 	<{if \$pagenav}><br />
 		<!-- Display navigation -->
@@ -141,6 +207,31 @@
 <!-- Footer -->
 <{include file="db:{$stl_mod_name}_footer.tpl"}>
 EOT;
+		return $ret;
+	}
+	/*
+	*  @public function render
+	*  @param null
+	*/
+	public function renderFile($filename) {    
+		$module = $this->getModule();
+		$table = $this->getTable(); 	
+		$module_name = $module->getVar('mod_name');		
+        $stl_mod_name = strtolower($module_name);		
+		$table_name = $table->getVar('table_name');
+		$table_fieldname = $table->getVar('table_fieldname');		
+		//
+		$stu_module_name = strtoupper($module_name);	 
+		$language = $this->getLanguage($module_name, 'AM');			
+		$content = $this->getTemplatesAdminPagesHeader($module_name, $table, $language);
+		// Verify if table_fieldname is not empty
+		if(!empty($table_fieldname)) {
+			$content .= $this->getTemplatesAdminPagesBody($module_name, $table, $language);
+		} else {
+			$content .= $this->getTemplatesAdminPagesBodyFieldnameEmpty($module_name, $table, $language);
+		}
+		$content .= $this->getTemplatesAdminPagesFooter($module_name);
+		//
 		$this->tdmcfile->create($module_name, 'templates/admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/blocks/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/blocks/blocks.php	2014-06-28 09:55:59 UTC (rev 12660)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/blocks/blocks.php	2014-06-28 14:04:32 UTC (rev 12661)
@@ -46,25 +46,21 @@
 	*  @public function write
 	*  @param string $module
 	*  @param string $table
-	*  @param string $filename
 	*/
 	public function write($module, $table) {    
 		$this->setModule($module);
 		$this->setTable($table);
-	}		
+	}
 	/*
-	*  @public function renderFile
-	*  @param string $filename
+	*  @private function getTemplatesBlocksHeader
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
 	*/
-	public function renderFile($filename) {    
-		$module = $this->getModule();		
-		$table = $this->getTable();
-		$module_name = strtolower($module->getVar('mod_name'));
+	private function getTemplatesBlocksHeader($module_name, $table, $language) {    
+		$stl_mod_name = strtolower($module_name);
 		$table_name = $table->getVar('table_name');
-		$table_fieldname = $table->getVar('table_fieldname');
-		//$filename = $this->getFileName();		
-        $language = $this->getLanguage($module_name, 'MB');		
-		$content = <<<EOT
+		$ret = <<<EOT
 <table class="{$table_name} width100">
 	<thead>
 		<tr class="head">\n
@@ -74,17 +70,32 @@
 		{
 			$field_name = $fields[$f]->getVar('field_name');			
 			$lang_stu_field_name = $language.strtoupper($field_name);
-			$content .= <<<EOT
+			$ret .= <<<EOT
 			<th class="center"><{\$smarty.const.{$lang_stu_field_name}}></th>\n
 EOT;
 		}
-		$content .= <<<EOT
+		$ret .= <<<EOT
 		</tr>
-	</thead>
+	</thead>\n	
+EOT;
+		return $ret;
+	}
+	/*
+	*  @private function getTemplatesBlocksBody
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
+	*/
+	private function getTemplatesBlocksBody($module_name, $table, $language) 
+	{    
+		$stl_mod_name = strtolower($module_name);
+		$table_name = $table->getVar('table_name');
+		$ret = <<<EOT
 	<tbody>
-		<{foreach item={$table_fieldname} from=\${$table_name}}>	
+		<{foreach item=list from=\${$table_name}}>	
 			<tr class="<{cycle values='odd, even'}>">\n
 EOT;
+		$fields = $this->getTableFields($table->getVar('table_id'));
 		foreach(array_keys($fields) as $f) 
 		{
 			$field_name = $fields[$f]->getVar('field_name');
@@ -97,27 +108,93 @@
 				} 		
 			}
 			if( $field_element == 9 ) {
-			$content .= <<<EOT
+				$ret .= <<<EOT
 				<td class="center">
-					<img src="<{\${$module_name}_upload_url}>/images/{$table_name}/<{\${$table_fieldname}.{$rp_field_name}}>" alt="{$table_name}">
+					<img src="<{\${$module_name}_upload_url}>/images/{$table_name}/<{\$list.{$rp_field_name}}>" alt="{$table_name}">
 				</td>\n
 EOT;
 			} elseif( $field_element == 8 ) {			
-			$content .= <<<EOT
-				<td class="center"><span style="background-color: <{\${$table_fieldname}.{$rp_field_name}}>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td>\n
+				$ret .= <<<EOT
+				<td class="center"><span style="background-color: <{\$list.{$rp_field_name}}>;">\t\t</span></td>\n
 EOT;
 			} else {
-				$content .= <<<EOT
-				<td class="center"><{\${$table_fieldname}.{$rp_field_name}}></td>\n
+				$ret .= <<<EOT
+				<td class="center"><{\$list.{$rp_field_name}}></td>\n
 EOT;
 			}
 		}
-		$content .= <<<EOT
+		$ret .= <<<EOT
 			</tr>
 		<{/foreach}>
     </tbody>
 </table>
 EOT;
+		return $ret;
+	}
+	/*
+	*  @private function getTemplatesBlocksBodyFieldnameEmpty
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
+	*/
+	private function getTemplatesBlocksBodyFieldnameEmpty($module_name, $table, $language) 
+	{ 		
+		$stl_mod_name = strtolower($module_name);
+		$table_name = $table->getVar('table_name');		
+		$ret = <<<EOT
+	<tbody>
+		<{foreach item=list from=\${$table_name}}>	
+			<tr class="<{cycle values='odd, even'}>">\n
+EOT;
+		$fields = $this->getTableFields($table->getVar('table_id'));
+		foreach(array_keys($fields) as $f) 
+		{
+			$field_name = $fields[$f]->getVar('field_name');
+			$field_element = $fields[$f]->getVar('field_element');			
+			if( $field_element == 9 ) {
+				$ret .= <<<EOT
+				<td class="center">
+					<img src="<{\${$module_name}_upload_url}>/images/{$table_name}/<{\$list.{$field_name}}>" alt="{$table_name}">
+				</td>\n
+EOT;
+			} elseif( $field_element == 8 ) {			
+				$ret .= <<<EOT
+				<td class="center"><span style="background-color: <{\$list.{$field_name}}>;">\t\t</span></td>\n
+EOT;
+			} else {
+				$ret .= <<<EOT
+				<td class="center"><{\$list.{$field_name}}></td>\n
+EOT;
+			}
+		}
+		$ret .= <<<EOT
+			</tr>
+		<{/foreach}>
+    </tbody>
+</table>
+EOT;
+		return $ret;
+	}	
+	/*
+	*  @public function renderFile
+	*  @param string $filename
+	*/
+	public function renderFile($filename) {    
+		$module = $this->getModule();		
+		$table = $this->getTable();
+		$module_name = strtolower($module->getVar('mod_name'));
+		$table_name = $table->getVar('table_name');
+		$table_fieldname = $table->getVar('table_fieldname');
+        $language = $this->getLanguage($module_name, 'MB');		
+		$content = $this->getTemplatesBlocksHeader($module_name, $table, $language);
+		// Verify if table_fieldname is not empty
+		if(!empty($table_fieldname)) {
+			$content .= $this->getTemplatesBlocksBody($module_name, $table, $language);
+		} else {
+			$content .= $this->getTemplatesBlocksBodyFieldnameEmpty($module_name, $table, $language);
+		}
+		//$content .= $this->getTemplatesBlocksFooter($module_name);
+		//
 		$this->tdmcfile->create($module_name, 'templates/blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/user/pages.php	2014-06-28 09:55:59 UTC (rev 12660)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/user/pages.php	2014-06-28 14:04:32 UTC (rev 12661)
@@ -51,21 +51,16 @@
 	public function write($module, $table) {    
 		$this->setModule($module);
 		$this->setTable($table);
-	}		
-	/*
-	*  @public function renderFile
-	*  @param string $filename
+	}
+    /*
+	*  @private function getTemplatesUserPagesHeader
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
 	*/
-	public function renderFile($filename) {    
-		$module = $this->getModule();		
-		$table = $this->getTable();
-		$module_name = $module->getVar('mod_name');
-        $stl_mod_name = strtolower($module_name);
-		$table_name = $table->getVar('table_name');
-		$table_fieldname = $table->getVar('table_fieldname');
-		//$filename = $this->getFileName();		
-        $language = $this->getLanguage($module_name, 'MA');		
-		$content = <<<EOT
+	private function getTemplatesUserPagesHeader($module_name, $table, $language) {    
+		$stl_mod_name = strtolower($module_name);
+		$ret = <<<EOT
 <{include file="db:{$stl_mod_name}_header.tpl"}>
 <table class="{$module_name}">
 	<thead class="outer">
@@ -76,17 +71,32 @@
 		{
 			$field_name = $fields[$f]->getVar('field_name');			
 			$lang_stu_field_name = $language.strtoupper($field_name);
-			$content .= <<<EOT
+			$ret .= <<<EOT
 			<th class="center"><{\$smarty.const.{$lang_stu_field_name}}></th>\n
 EOT;
 		}
-		$content .= <<<EOT
+		$ret .= <<<EOT
 		</tr>
-	</thead>
+	</thead>\n
+EOT;
+		return $ret;
+	}
+	/*
+	*  @private function getTemplatesUserPagesBody
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
+	*/
+	private function getTemplatesUserPagesBody($module_name, $table, $language) 
+	{    
+		$stl_mod_name = strtolower($module_name);
+		$table_name = $table->getVar('table_name');
+		$ret = <<<EOT
 	<tbody>
-		<{foreach item={$table_fieldname} from=\${$table_name}}>	
+		<{foreach item=list from=\${$table_name}}>	
 			<tr class="<{cycle values='odd, even'}>">\n
 EOT;
+		$fields = $this->getTableFields($table->getVar('table_id'));
 		foreach(array_keys($fields) as $f) 
 		{
 			$field_name = $fields[$f]->getVar('field_name');
@@ -100,31 +110,106 @@
 			}
 			switch( $field_element ) { 			    
 				case 8:			
-					$content .= <<<EOT
-				<td class="center"><span style="background-color: <{\${$table_fieldname}.{$rp_field_name}}>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td>\n
+					$ret .= <<<EOT
+			<td class="center"><span style="background-color: <{\$list.{$rp_field_name}}>;">\t\t</span></td>\n
 EOT;
 				break;
 				case 9:
-					$content .= <<<EOT
-				<td class="center"><img src="<{\${$stl_mod_name}_upload_url}>/images/{$table_name}/<{\${$table_fieldname}.{$rp_field_name}}>" alt="{$table_name}"></td>\n
+					$ret .= <<<EOT
+			<td class="center"><img src="<{\${$stl_mod_name}_upload_url}>/images/{$table_name}/<{\$list.{$rp_field_name}}>" alt="{$table_name}"></td>\n
 EOT;
 				break;
 				default:
-					$content .= <<<EOT
-				<td class="center"><{\${$table_fieldname}.{$rp_field_name}}></td>\n
+					$ret .= <<<EOT
+			<td class="center"><{\$list.{$rp_field_name}}></td>\n
 EOT;
 				break;
-			}
+			}			
 		}
-		$content .= <<<EOT
+		$ret .= <<<EOT
 			</tr>
 		<{/foreach}>
 	</tbody>
 </table>\n
 EOT;
-		$content .= <<<EOT
+		return $ret;
+	}
+	/*
+	*  @private function getTemplatesUserPagesBodyFieldnameEmpty
+	*  @param string $module_name
+	*  @param string $table
+	*  @param string $language
+	*/
+	private function getTemplatesUserPagesBodyFieldnameEmpty($module_name, $table, $language) 
+	{ 		
+		$stl_mod_name = strtolower($module_name);
+		$table_name = $table->getVar('table_name');		
+		$ret = <<<EOT
+	<tbody>
+		<{foreach item=list from=\${$table_name}}>	
+			<tr class="<{cycle values='odd, even'}>">\n
+EOT;
+		$fields = $this->getTableFields($table->getVar('table_id'));
+		foreach(array_keys($fields) as $f) 
+		{
+			$field_name = $fields[$f]->getVar('field_name');
+			$field_element = $fields[$f]->getVar('field_element');			
+			switch( $field_element ) { 			    
+				case 8:			
+					$ret .= <<<EOT
+			<td class="center"><span style="background-color: <{\$list.{$field_name}}>;"></span></td>\n
+EOT;
+				break;
+				case 9:
+					$ret .= <<<EOT
+			<td class="center"><img src="<{\${$stl_mod_name}_upload_url}>/images/{$table_name}/<{\$list.{$field_name}}>" alt="{$table_name}"></td>\n
+EOT;
+				break;
+				default:
+					$ret .= <<<EOT
+			<td class="center"><{\$list.{$field_name}}></td>\n
+EOT;
+				break;
+			}			
+		}
+		$ret .= <<<EOT
+			</tr>
+		<{/foreach}>
+	</tbody>
+</table>\n
+EOT;
+		return $ret;
+	}
+	/*
+	*  @private function getTemplatesUserPagesFooter
+	*  @param string $module_name
+	*/
+	private function getTemplatesUserPagesFooter($module_name) {    
+		$stl_mod_name = strtolower($module_name);
+		$ret = <<<EOT
 <{include file="db:{$stl_mod_name}_footer.tpl"}>
 EOT;
+		return $ret;
+	}
+	/*
+	*  @public function renderFile
+	*  @param string $filename
+	*/
+	public function renderFile($filename) {    
+		$module = $this->getModule();		
+		$table = $this->getTable();
+		$module_name = $module->getVar('mod_name');
+		$table_fieldname = $table->getVar('table_fieldname');
+        $language = $this->getLanguage($module_name, 'MA');		
+		$content = $this->getTemplatesUserPagesHeader($module_name, $table, $language);
+		// Verify if table_fieldname is not empty
+		if(!empty($table_fieldname)) {
+			$content .= $this->getTemplatesUserPagesBody($module_name, $table, $language);
+		} else {
+			$content .= $this->getTemplatesUserPagesBodyFieldnameEmpty($module_name, $table, $language);
+		}
+		$content .= $this->getTemplatesUserPagesFooter($module_name);
+		//
 		$this->tdmcfile->create($module_name, 'templates', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php	2014-06-28 09:55:59 UTC (rev 12660)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php	2014-06-28 14:04:32 UTC (rev 12661)
@@ -51,83 +51,21 @@
 		$this->setModule($module);
 		$this->setTable($table);
 	}
+		
 	/*
-	*  @public function getAdminPagesList
-	*  @param string $table_name
+	*  @private function getUserPages
 	*  @param string $language
 	*/
-	public function getUserPagesList($table_name, $language, $fields, $fpif, $fpmf) {  
-		$stu_table_name = strtoupper($table_name);		
-		$ret = <<<EOT
-    case 'list': 
-    default:  
-		\$limit = xoops_getModuleOption('adminpager');
-		\$start = TDMCreate_CleanVars(\$_REQUEST, 'start', 0);
-		\$adminMenu->addItemButton({$language}ADD_{$stu_table_name}, '{$table_name}.php?op=new', 'add');
-		echo \$adminMenu->renderButton();
-		\$criteria = new CriteriaCompo();
-		\$criteria->setSort('{$fpif} ASC, {$fpmf}');
-		\$criteria->setOrder('ASC');
-		\${$table_name}_rows = \${$table_name}Handler->getCount();
-		\${$table_name}_arr = \${$table_name}Handler->getAll(\$criteria);
-		unset(\$criteria);
-		
-		// Table view
-		if (\${$table_name}_rows > 0) 
-		{						
-			foreach (array_keys(\${$table_name}_arr) as \$i)
-			{\n
-EOT;
-		
-		foreach(array_keys($fields) as $f) 
-		{
-			$field_name = $fields[$f]->getVar('field_name');
-			$rp_field_name = $field_name;
-			if(strpos($field_name, '_')) {       
-				$str = strpos($field_name, '_'); 
-				if($str !== false){ 
-					$rp_field_name = substr($field_name, $str + 1, strlen($field_name));
-				} 		
-			}
-			$lp_field_name = substr($field_name, 0, strpos($field_name, '_'));
-			$ret .= <<<EOT
-				\${$lp_field_name}['{$rp_field_name}'] = \${$table_name}_arr[\$i]->getVar('{$field_name}');\n
-EOT;
-		}
-			$ret .= <<<EOT
-				\$GLOBALS['xoopsTpl']->append('{$table_name}_list', \${$lp_field_name});
-                unset(\${$lp_field_name});
-			}
-			if ( \${$table_name}_rows > \$limit ) {
-				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-				\$pagenav = new XoopsPageNav(\${$table_name}_rows, \$limit, \$start, 'start', 'op=list&limit=' . \$limit);
-				\$GLOBALS['xoopsTpl']->assign('pagenav', \$pagenav->renderNav(4));
-			}
-        } else {
-			\$GLOBALS['xoopsTpl']->assign('error', {$language}THEREARENT_{$stu_table_name});
-		}	
-    break;\n
-EOT;
-		return $ret;
-	}
-	
-	/*
-	*  @public function render
-	*  @param null
-	*/
-	public function renderFile($filename) {    
-		$module = $this->getModule();
+	private function getUserPages($module_name, $language)
+	{  
 		$table = $this->getTable();        		
-		$module_name = $module->getVar('mod_name');
 		$table_name = $table->getVar('table_name');
 		$table_fieldname = $table->getVar('table_fieldname');
 		$stu_mod_name = strtoupper($module_name);
         $stl_mod_name = strtolower($module_name);
         $stu_table_name = strtoupper($table_name);
-        $stl_table_name = strtolower($table_name);		
-		$language = $this->getLanguage($module_name, 'MA');			
-		$content = $this->getHeaderFilesComments($module, $filename);	
-		$content .= <<<EOT
+        $stl_table_name = strtolower($table_name);
+		$ret = <<<EOT
 \ninclude_once 'header.php';
 \$xoopsOption['template_main'] = '{$stl_mod_name}_{$table_name}.tpl';	
 include_once XOOPS_ROOT_PATH . '/header.php';
@@ -153,33 +91,52 @@
 		{
 			$field_name = $fields[$f]->getVar('field_name');
 			$rp_field_name = $field_name;
-			if(strpos($field_name, '_')) {       
-				$str = strpos($field_name, '_'); 
-				if($str !== false){ 
-					$rp_field_name = substr($field_name, $str + 1, strlen($field_name));
-				} 		
-			}
-			$lp_field_name = substr($field_name, 0, strpos($field_name, '_'));
-			$field_element = $fields[$f]->getVar('field_element');
-			if ( $fields[$f]->getVar('field_main') == 1 ) {
-				$fpmf = $field_name; // fpmf = fields parameters main field
-			}
-
-			// Verify if this is a textarea or dhtmltextarea
-			if (  $field_element == 2 || $field_element == 3 ) {
-				$content .= <<<EOT
-		\${$lp_field_name}['{$rp_field_name}'] = strip_tags(\${$stl_table_name}_arr[\$i]->getVar('{$field_name}'));\n
+			// Verify if table_fieldname is not empty
+			if(!empty($table_fieldname)) {				
+				if(strpos($field_name, '_')) {       
+					$str = strpos($field_name, '_'); 
+					if($str !== false){ 
+						$rp_field_name = substr($field_name, $str + 1, strlen($field_name));
+					} 		
+				}
+				$lp_field_name = substr($field_name, 0, strpos($field_name, '_'));
+				$tname = $lp_field_name;
+				$field_element = $fields[$f]->getVar('field_element');
+				if ( $fields[$f]->getVar('field_main') == 1 ) {
+					$fpmf = $field_name; // fpmf = fields parameters main field
+				}
+				// Verify if this is a textarea or dhtmltextarea
+				if (  $field_element == 2 || $field_element == 3 ) {
+					$ret .= <<<EOT
+		\${$tname}['{$rp_field_name}'] = strip_tags(\${$stl_table_name}_arr[\$i]->getVar('{$field_name}'));\n
 EOT;
+				} else {
+					$ret .= <<<EOT
+		\${$tname}['{$rp_field_name}'] = \${$stl_table_name}_arr[\$i]->getVar('{$field_name}');\n
+EOT;
+				}
 			} else {
-				$content .= <<<EOT
-		\${$lp_field_name}['{$rp_field_name}'] = \${$stl_table_name}_arr[\$i]->getVar('{$field_name}');\n
+			    $tname = $table_name;
+				$field_element = $fields[$f]->getVar('field_element');
+				if ( $fields[$f]->getVar('field_main') == 1 ) {
+					$fpmf = $field_name; // fpmf = fields parameters main field
+				}
+				// Verify if this is a textarea or dhtmltextarea
+				if (  $field_element == 2 || $field_element == 3 ) {
+					$ret .= <<<EOT
+		\${$tname}['{$rp_field_name}'] = strip_tags(\${$stl_table_name}_arr[\$i]->getVar('{$field_name}'));\n
 EOT;
+				} else {
+					$ret .= <<<EOT
+		\${$tname}['{$rp_field_name}'] = \${$stl_table_name}_arr[\$i]->getVar('{$field_name}');\n
+EOT;
+				}			
 			}
 		}
-		$content .= <<<EOT
-		\$GLOBALS['xoopsTpl']->append('{$stl_table_name}', \${$table_fieldname});
+		$ret .= <<<EOT
+		\$GLOBALS['xoopsTpl']->append('{$stl_table_name}', \${$tname});
 		\$keywords[] = \${$stl_table_name}_arr[\$i]->getVar('{$fpmf}');
-        unset(\${$table_fieldname});
+        unset(\${$tname});
     }
 	// Display Navigation
     if (\${$stl_table_name}_count > \$limit) {
@@ -188,15 +145,28 @@
         \$GLOBALS['xoopsTpl']->assign('pagenav', \$nav->renderNav(4));
     }
 }
-//keywords
+// keywords
 {$stl_mod_name}_meta_keywords(xoops_getModuleOption('keywords', \$dirname) .', '. implode(', ', \$keywords));
-//description
+// description
 {$stl_mod_name}_meta_description({$language}{$stu_table_name}_DESC);
 //
 \$GLOBALS['xoopsTpl']->assign('xoops_mpageurl', {$stu_mod_name}_URL.'/{$stl_table_name}.php');
 //
 include_once 'footer.php';	
 EOT;
+		return $ret;
+	}
+	/*
+	*  @public function render
+	*  @param null
+	*/
+	public function renderFile($filename) {    
+		$module = $this->getModule();
+		$module_name = $module->getVar('mod_name');				
+		$language = $this->getLanguage($module_name, 'MA');			
+		$content = $this->getHeaderFilesComments($module, $filename);	
+		$content .= $this->getUserPages($module_name, $language);	
+		//
 		$this->tdmcfile->create($module_name, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
 		return $this->tdmcfile->renderFile();
 	}