Thread: [xoops-svn] SF.net SVN: xoops-svn:[12687] XoopsModules/TDMCreate/branches/timgno/1.91/ tdmcreate

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 12687
          http://sourceforge.net/p/xoops/svn/12687
Author:   txmodxoops
Date:     2014-07-08 19:32:05 +0000 (Tue, 08 Jul 2014)
Log Message:
-----------
 - Fixed bugs 
 - Updated
 - Still work to do

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php
    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/classes/formelements.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/htmlsmartycodes.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.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
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/language/english/admin.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php
===================================================================

--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php	2014-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/admin/fields.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -158,7 +158,7 @@
 		if ( !$GLOBALS['xoopsSecurity']->check() ) {
             redirect_header('fields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         }	
-		$field_id = XoopsRequest::getInt('field_id');
+		$fieldId = XoopsRequest::getInt('field_id');
 		// Fields Handler
 		$fields = $tdmcreate->getHandler('fields');		
 		// Set Variables		
@@ -213,9 +213,9 @@
 			if (!$tdmcreate->getHandler('fieldelements')->insert($fieldelementObj) ) {
 				$GLOBALS['xoopsTpl']->assign('error', $fieldelementObj->getHtmlErrors() . ' Field element');
 			}			
-			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_SAVED_OK, $table_name));					
+			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_SAVED_OK, $table_name));					
 		} else {
-			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELD_FORM_UPDATED_OK, $table_name));
+			redirect_header('fields.php', 2, sprintf(_AM_TDMCREATE_FIELDS_FORM_UPDATED_OK, $table_name));
 		}
         //
 		$GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors()); 		      
@@ -232,8 +232,8 @@
 		$adminMenu->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'list');           
 		$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
 		// Form Edit
-		$field_id = XoopsRequest::getInt('field_id');
-		$fieldsObj = $tdmcreate->getHandler('fields')->get( $field_id );        		
+		$fieldId = XoopsRequest::getInt('field_id');
+		$fieldsObj = $tdmcreate->getHandler('fields')->get( $fieldId );        		
 		$form = $fieldsObj->getFormEdit($field_mid, $fieldTid);
 		$GLOBALS['xoopsTpl']->assign('form', $form->render());
 		// Test -> Will be removed
@@ -242,9 +242,9 @@
 
     case 'drag':        
         $side = TDMCreate_CleanVars( $_POST, 'field_id', 0, 'int' );
-		$field_id = XoopsRequest::getInt('field_id');
-        if ( $field_id > 0 ) {
-            $fieldsObj = $tdmcreate->getHandler('fields')->get( $field_id );
+		$fieldId = XoopsRequest::getInt('field_id');
+        if ( $fieldId > 0 ) {
+            $fieldsObj = $tdmcreate->getHandler('fields')->get( $fieldId );
             $fieldsObj->setVar('field_id', $side);
             if (!$tdmcreate->getHandler('fields')->insert( $fieldsObj )) {
                 redirect_header('fields.php', 5, _AM_TDMCREATE_FIELD_SIDE_ERROR);
@@ -271,11 +271,12 @@
     break;	
 	
 	case 'display':
+		$fieldId = XoopsRequest::getInt('field_id');
 		// Get the list of fields
 		$criteria = new CriteriaCompo();
 		$criteria->add(new Criteria('field_tid', $fieldTid));
 	    $fields = $tdmcreate->getHandler('fields')->getObjects($criteria);
-        $fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
+        $fieldsObj =& $tdmcreate->getHandler('fields')->get($fieldId);
 		if (isset($_GET['field_tid'])) {
             if (isset($_GET['field_parent'])) {
 				foreach ($fields as $field) {

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-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -61,12 +61,14 @@
 	*  @param string $moduleDirname
 	*  @param string $tableName
 	*/
-	public function getAdminPagesHeader($moduleDirname, $tableName) {  
+	public function getAdminPagesHeader($moduleDirname, $tableName, $fpif) {  
 		
 		$ret = <<<EOT
 include_once 'header.php';
 //It recovered the value of argument op in URL$
-\$op = {$moduleDirname}_CleanVars(\$_REQUEST, 'op', 'list', 'string');
+\$op = XoopsRequest::getString('op', 'list');
+// Request {$fpif}
+\${$fpif} = XoopsRequest::getInt('{$fpif}');
 // Switch options
 switch (\$op) 
 {\n
@@ -84,18 +86,18 @@
 	*  @param string $fpif
 	*  @param string $fpmf
 	*/
-	public function getAdminPagesList($moduleDirname, $tableName, $tableFieldname, $language, $fields, $fpif, $fpmf) {  
-		$stu_module_dirname = strtoupper($moduleDirname);
-		$stu_table_name = strtoupper($tableName);
-		$stu_table_fieldname = strtoupper($tableFieldname);
+	public function getAdminPagesList($moduleDirname, $tableName, $tableFieldname, $tableAutoincrement, $language, $fields, $fpif, $fpmf) {  
+		$stuModuleDirname = strtoupper($moduleDirname);
+		$stuTableName = strtoupper($tableName);
+		$stuTableFieldname = strtoupper($tableFieldname);
 		$ret = <<<EOT
     case 'list': 
     default:  
-		\$limit = \${$moduleDirname}->getConfig('adminpager');
-		\$start = {$moduleDirname}_CleanVars(\$_REQUEST, 'start', 0);
+		\$start = XoopsRequest::getInt('start', 0);
+		\$limit = XoopsRequest::getInt('limit', \${$moduleDirname}->getConfig('adminpager'));		
 		\$template_main = '{$moduleDirname}_admin_{$tableName}.tpl';
 		\$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
-		\$adminMenu->addItemButton({$language}ADD_{$stu_table_fieldname}, '{$tableName}.php?op=new', 'add');		
+		\$adminMenu->addItemButton({$language}ADD_{$stuTableFieldname}, '{$tableName}.php?op=new', 'add');		
 		\$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());
 		\$criteria = new CriteriaCompo();
 		\$criteria->setSort('{$fpif} ASC, {$fpmf}');
@@ -103,8 +105,8 @@
 		\${$tableName}_rows = \${$tableName}Handler->getCount(\$criteria);
 		\${$tableName}_arr = \${$tableName}Handler->getAll(\$criteria);
 		unset(\$criteria);
-		\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_url', {$stu_module_dirname}_URL);
-		\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stu_module_dirname}_UPLOAD_URL);
+		\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_url', {$stuModuleDirname}_URL);
+		\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
 		// Table view
 		if (\${$tableName}_rows > 0) 
 		{						
@@ -115,23 +117,25 @@
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
 			$rp_field_name = $fieldName;
-			// Verify if table_fieldname is not empty
-			if(!empty($tableFieldname)) {
-				if(strpos($fieldName, '_')) {       
-					$str = strpos($fieldName, '_'); 
-					if($str !== false){ 
-						$rp_field_name = substr($fieldName, $str + 1, strlen($fieldName));
-					} 		
-				}
-				$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
-				$ret .= <<<EOT
+			if( ($fields[$f]->getVar('field_admin') == 1) || ($tableAutoincrement == 1) ) {
+				// Verify if table_fieldname is not empty
+				if(!empty($tableFieldname)) {
+					if(strpos($fieldName, '_')) {       
+						$str = strpos($fieldName, '_'); 
+						if($str !== false){ 
+							$rp_field_name = substr($fieldName, $str + 1, strlen($fieldName));
+						} 		
+					}
+					$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
+					$ret .= <<<EOT
 				\${$lp_field_name}['{$rp_field_name}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
 EOT;
-			} else {
-				$lp_field_name = $tableName;
-				$ret .= <<<EOT
+				} else {
+					$lp_field_name = $tableName;
+					$ret .= <<<EOT
 				\${$lp_field_name}['{$rp_field_name}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
 EOT;
+				}
 			}
 		}
 			$ret .= <<<EOT
@@ -146,7 +150,7 @@
 				\$GLOBALS['xoopsTpl']->assign('pagenav', \$pagenav->renderNav(4));
 			}
         } else {
-			\$GLOBALS['xoopsTpl']->assign('error', {$language}THEREARENT_{$stu_table_name});
+			\$GLOBALS['xoopsTpl']->assign('error', {$language}THEREARENT_{$stuTableName});
 		}	
     break;\n
 EOT;
@@ -160,11 +164,11 @@
 	*  @param string $language
 	*/
 	public function getAdminPagesNew($moduleDirname, $tableName, $language) {  
-		$stu_table_name = strtoupper($tableName);
+		$stuTableName = strtoupper($tableName);
 		$ret = <<<EOT
 	case 'new':		
 		\$template_main = '{$moduleDirname}_admin_{$tableName}.tpl';
-        \$adminMenu->addItemButton({$language}{$stu_table_name}_LIST, '{$tableName}.php', 'list');
+        \$adminMenu->addItemButton({$language}{$stuTableName}_LIST, '{$tableName}.php', 'list');
         \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
 		\$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());	
 		// Get Form		
@@ -192,8 +196,8 @@
 		if ( !\$GLOBALS['xoopsSecurity']->check() ) {
            redirect_header('{$tableName}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors()));
         }
-        if (isset(\$_REQUEST['{$fpif}'])) {
-           \${$tableName}Obj =& \${$tableName}Handler->get(\$_REQUEST['{$fpif}']);
+        if (isset(\${$fpif})) {
+           \${$tableName}Obj =& \${$tableName}Handler->get(\${$fpif});
         } else {
            \${$tableName}Obj =& \${$tableName}Handler->create();
         }
@@ -251,17 +255,17 @@
 	*  @param string $fpif
 	*/
 	public function getAdminPagesEdit($moduleDirname, $tableName, $tableFieldname, $language, $fpif) {  
-		$stu_table_name = strtoupper($tableName);
-		$stu_table_fieldname = strtoupper($tableFieldname);
+		$stuTableName = strtoupper($tableName);
+		$stuTableFieldname = strtoupper($tableFieldname);
 		$ret = <<<EOT
 	case 'edit':	    
 		\$template_main = '{$moduleDirname}_admin_{$tableName}.tpl';
-        \$adminMenu->addItemButton({$language}ADD_{$stu_table_fieldname}, '{$tableName}.php?op=new', 'add');
-		\$adminMenu->addItemButton({$language}{$stu_table_name}_LIST, '{$tableName}.php', 'list');
+        \$adminMenu->addItemButton({$language}ADD_{$stuTableFieldname}, '{$tableName}.php?op=new', 'add');
+		\$adminMenu->addItemButton({$language}{$stuTableName}_LIST, '{$tableName}.php', 'list');
         \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
 		\$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());	
 		// Get Form
-		\${$tableName}Obj = \${$tableName}Handler->get(\$_REQUEST['{$fpif}']);
+		\${$tableName}Obj = \${$tableName}Handler->get(\${$fpif});
 		\$form = \${$tableName}Obj->getForm();
 		\$GLOBALS['xoopsTpl']->assign('form', \$form->render());
 	break;\n
@@ -278,7 +282,7 @@
 		
 		$ret = <<<EOT
 	case 'delete':
-		\${$tableName}Obj =& \${$tableName}Handler->get(\$_REQUEST['{$fpif}']);
+		\${$tableName}Obj =& \${$tableName}Handler->get(\${$fpif});
 		if (isset(\$_REQUEST['ok']) && \$_REQUEST['ok'] == 1) {
 			if ( !\$GLOBALS['xoopsSecurity']->check() ) {
 				redirect_header('{$tableName}.php', 3, implode(', ', \$GLOBALS['xoopsSecurity']->getErrors()));
@@ -289,7 +293,7 @@
 				echo \${$tableName}Obj->getHtmlErrors();
 			}
 		} else {
-			xoops_confirm(array('ok' => 1, '{$fpif}' => \$_REQUEST['{$fpif}'], 'op' => 'delete'), \$_SERVER['REQUEST_URI'], sprintf({$language}FORMSUREDEL, \${$tableName}Obj->getVar('{$fpmf}')));
+			xoops_confirm(array('ok' => 1, '{$fpif}' => \${$fpif}, 'op' => 'delete'), \$_SERVER['REQUEST_URI'], sprintf({$language}FORMSUREDEL, \${$tableName}Obj->getVar('{$fpmf}')));
 		}
 	break;\n
 EOT;
@@ -318,7 +322,8 @@
 		$table = $this->getTable();
 		$moduleDirname = $module->getVar('mod_dirname');      
 		$tableName = $table->getVar('table_name');	
-		$tableFieldname = $table->getVar('table_fieldname');	
+		$tableFieldname = $table->getVar('table_fieldname');
+		$tableAutoincrement = $table->getVar('table_autoincrement');
 		$language = $this->getLanguage($moduleDirname, 'AM');
 		$fields = $this->getTableFields($table->getVar('table_id'));
 		foreach(array_keys($fields) as $f) 
@@ -332,8 +337,8 @@
 			}
 		}		
 		$content = $this->getHeaderFilesComments($module, $filename);
-		$content .=	$this->getAdminPagesHeader($moduleDirname, $tableName);
-		$content .=	$this->getAdminPagesList($moduleDirname, $tableName, $tableFieldname, $language, $fields, $fpif, $fpmf);
+		$content .=	$this->getAdminPagesHeader($moduleDirname, $tableName, $fpif);
+		$content .=	$this->getAdminPagesList($moduleDirname, $tableName, $tableFieldname, $tableAutoincrement, $language, $fields, $fpif, $fpmf);
 		$content .=	$this->getAdminPagesNew($moduleDirname, $tableName, $language);		
 		$content .=	$this->getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fpif, $fpmf);
 		$content .=	$this->getAdminPagesEdit($moduleDirname, $tableName, $tableFieldname, $language, $fpif);

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-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/blocks/blocks.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -101,23 +101,25 @@
 		{	    
 			$fieldName = $fields[$f]->getVar('field_name');
 			$rp_field_name = $fieldName;
-			// Verify if table_fieldname is not empty
-			if(!empty($tableFieldname)) {
-				if(strpos($fieldName, '_')) {       
-					$str = strpos($fieldName, '_'); 
-					if($str !== false){ 
-						$rp_field_name = substr($fieldName, $str + 1, strlen($fieldName));
-					} 		
-				}
-				$tname = $tableFieldname;
-				$ret .= <<<EOT
+			if( $fields[$f]->getVar('field_block') == 1 ) {
+				// Verify if table_fieldname is not empty
+				if(!empty($tableFieldname)) {
+					if(strpos($fieldName, '_')) {       
+						$str = strpos($fieldName, '_'); 
+						if($str !== false){ 
+							$rp_field_name = substr($fieldName, $str + 1, strlen($fieldName));
+						} 		
+					}
+					$tname = $tableFieldname;
+					$ret .= <<<EOT
 		\${$tname}['{$rp_field_name}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
 EOT;
-		    } else {
-				$tname = $tableName;
-				$ret .= <<<EOT
+				} else {
+					$tname = $tableName;
+					$ret .= <<<EOT
 		\${$tname}['{$rp_field_name}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
 EOT;
+				}
 			}
 		}
 		$ret .= <<<EOT

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/formelements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/formelements.php	2014-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/formelements.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -223,7 +223,7 @@
 		// Form Select
 		\${$fieldName}_select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}'));
 		\${$fieldName}_select->addOption('Empty'); 
-		\${$fieldName}_select->addOptionArray({$tableName}Handler->getList()); 
+		\${$fieldName}_select->addOptionArray(\${$tableName}Handler->getList()); 
 		\$form->addElement( \${$fieldName}_select{$required} );\n
 EOT;
 		return $ret;
@@ -279,6 +279,7 @@
 	private function getXoopsFormTable($language, $moduleDirname, $tableName, $fields, $required = 'false') 
 	{    
 	    $fieldName = '';
+		$ucf_table_name = ucfirst($tableName);
 		foreach(array_keys($fields) as $f) 
 		{			
 			if(($fields[$f]->getVar('field_parent') == 1)) {
@@ -286,10 +287,10 @@
 			}						
 		}
 		$ret = <<<EOT
-		// Form Table
+		// Form Topic {$ucf_table_name}
 		\${$tableName}Handler =& \$this->{$moduleDirname}->getHandler('{$tableName}');				
 		\${$fieldName}_select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}'));
-		\${$fieldName}_select->addOptionArray(\${$fieldName}Handler->getList());
+		\${$fieldName}_select->addOptionArray(\${$tableName}Handler->getList());
 		\$form->addElement( \${$fieldName}_select{$required} );\n
 EOT;
 		return $ret;

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/htmlsmartycodes.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/htmlsmartycodes.php	2014-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/htmlsmartycodes.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -121,7 +121,7 @@
 		return $ret;
 	}
 	/*
-	*  @public function getHtmlTable
+	*  @public function getHtmlTableThead
 	*  @param string $class
 	*  @param string $content
 	*/
@@ -134,7 +134,7 @@
 		return $ret;
 	}
 	/*
-	*  @public function getHtmlTable
+	*  @public function getHtmlTableTbody
 	*  @param string $class
 	*  @param string $content
 	*/
@@ -197,22 +197,33 @@
 	/*
 	*  @public function getSmartyConst
 	*  @param string $language
-	*  @param mixed $field_name
+	*  @param mixed $fieldName
 	*/
-	public function getSmartyConst($language, $field_name) {		
+	public function getSmartyConst($language, $fieldName) {		
 		$ret = <<<EOT
-		<{\$smarty.const.{$language}{$field_name}}>
+		<{\$smarty.const.{$language}{$fieldName}}>
 EOT;
 		return $ret;
 	}
 	/*
+	*  @public function getSmartyTableFieldNameEmptyData
+	*  @param string $tableName
+	*  @param string $fieldName
+	*/
+	public function getSmartyTableFieldNameEmptyData($tableName = '', $fieldName = '') {    
+		$ret = <<<EOT
+		<{\${$tableName}.{$fieldName}}>
+EOT;
+		return $ret;
+	}
+	/*
 	*  @public function getSmartyTableField
-	*  @param string $table_fieldname
-	*  @param string $field_name
+	*  @param string $tableFieldname
+	*  @param string $fieldName
 	*/
-	public function getSmartyTableFieldData($table_fieldname = '', $fieldname = '') {    
+	public function getSmartyTableFieldData($tableFieldname = '', $fieldName = '') {    
 		$ret = <<<EOT
-		<{\${$table_fieldname}.{$fieldname}}>
+		<{\${$tableFieldname}.{$fieldName}}>
 EOT;
 		return $ret;
 	}
@@ -220,9 +231,9 @@
 	*  @public function getSmartyIncludeFile
 	*  @param string $name
 	*/
-	public function getSmartyIncludeFile($module_name, $fieldname = 'header') {    
+	public function getSmartyIncludeFile($moduleDirname, $tableName = 'header') {    
 		$ret = <<<EOT
-		<{include file='db:{$module_name}_{$fieldname}.html'}>
+		<{include file='db:{$moduleDirname}_{$tableName}.html'}>
 EOT;
 		return $ret;
 	}

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-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -54,11 +54,11 @@
 	/*
 	*  @private function getTemplatesAdminPagesHeader
 	*  @param string $moduleDirname
-	*  @param string $table
+	*  @param string $tableName
+	*  @param string $fields
 	*  @param string $language
 	*/
-	private function getTemplatesAdminPagesHeader($moduleDirname, $table, $language) {    
-		$tableName = $table->getVar('table_name');
+	private function getTemplatesAdminPagesHeader($moduleDirname, $tableName, $fields, $language) {    
 		$ret = <<<EOT
 <{include file="db:{$moduleDirname}_admin_header.tpl"}>
 <{if {$tableName}_list}>
@@ -66,12 +66,11 @@
 		<thead>
 			<tr class="head">\n
 EOT;
-		$fields = $this->getTableFields($table->getVar('table_id'));
 		foreach(array_keys($fields) as $f)
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
 			$lang_fn = $language.strtoupper($fieldName);			
-			if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) { 
+			if( $fields[$f]->getVar('field_inlist') == 1 ) { 
 				$ret .= <<<EOT
 				<th class="center"><{\$smarty.const.{$lang_fn}}></th>\n
 EOT;
@@ -87,19 +86,17 @@
 	/*
 	*  @private function getTemplatesAdminPagesBody
 	*  @param string $moduleDirname
-	*  @param string $table
+	*  @param string $tableName
+	*  @param string $fields
 	*  @param string $language
 	*/
-	private function getTemplatesAdminPagesBody($moduleDirname, $table, $language) 
+	private function getTemplatesAdminPagesBody($moduleDirname, $tableName, $fields, $language) 
 	{    
-		$moduleDirname = strtolower($moduleDirname);
-		$tableName = $table->getVar('table_name');
 		$ret = <<<EOT
 		<tbody>
 			<{foreach item=list from=\${$tableName}_list}>	
 				<tr class="<{cycle values='odd, even'}>">\n
 EOT;
-		$fields = $this->getTableFields($table->getVar('table_id'));
 		foreach(array_keys($fields) as $f) 
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
@@ -121,7 +118,7 @@
 				} 		
 			}
 			$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
-			if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) {	
+			if( $fields[$f]->getVar('field_inlist') == 1 ) {	
 				switch( $fieldElement ) {			    
 					case 8:			
 						$ret .= <<<EOT
@@ -165,18 +162,17 @@
 	/*
 	*  @private function getTemplatesAdminPagesBodyFieldnameEmpty
 	*  @param string $moduleDirname
-	*  @param string $table
+	*  @param string $tableName
+	*  @param string $fields
 	*  @param string $language
 	*/
-	private function getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $table, $language) 
+	private function getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $tableName, $fields, $language) 
 	{ 		
-		$tableName = $table->getVar('table_name');		
 		$ret = <<<EOT
 	<tbody>
 			<{foreach item=list from=\${$tableName}_list}>	
 				<tr class="<{cycle values='odd, even'}>">\n
 EOT;
-		$fields = $this->getTableFields($table->getVar('table_id'));
 		foreach(array_keys($fields) as $f) 
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
@@ -184,7 +180,7 @@
 			if($f == 0) {
 				$field_id = $fieldName;							
 			}
-			if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) { 
+			if( $fields[$f]->getVar('field_inlist') == 1 ) { 
 				switch( $fieldElement ) {			    
 					case 8:			
 						$ret .= <<<EOT
@@ -262,13 +258,14 @@
 		$moduleDirname = $module->getVar('mod_dirname');		
 		$tableName = $table->getVar('table_name');
 		$tableFieldname = $table->getVar('table_fieldname');		
-		$language = $this->getLanguage($moduleDirname, 'AM');			
-		$content = $this->getTemplatesAdminPagesHeader($moduleDirname, $table, $language);
+		$language = $this->getLanguage($moduleDirname, 'AM');	
+		$fields = $this->getTableFields($table->getVar('table_id'));
+		$content = $this->getTemplatesAdminPagesHeader($moduleDirname, $tableName, $fields, $language);
 		// Verify if table_fieldname is not empty
 		if(!empty($tableFieldname)) {
-			$content .= $this->getTemplatesAdminPagesBody($moduleDirname, $table, $language);
+			$content .= $this->getTemplatesAdminPagesBody($moduleDirname, $tableName, $fields, $language);
 		} else {
-			$content .= $this->getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $table, $language);
+			$content .= $this->getTemplatesAdminPagesBodyFieldnameEmpty($moduleDirname, $tableName, $fields, $language);
 		}
 		$content .= $this->getTemplatesAdminPagesFooter($moduleDirname);
 		//

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-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/user/pages.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -71,9 +71,11 @@
 		{
 			$fieldName = $fields[$f]->getVar('field_name');			
 			$lang_stu_field_name = $language.strtoupper($fieldName);
-			$ret .= <<<EOT
+			if( $fields[$f]->getVar('field_user') == 1 ) {	
+				$ret .= <<<EOT
 			<th class="center"><{\$smarty.const.{$lang_stu_field_name}}></th>\n
 EOT;
+			}
 		}
 		$ret .= <<<EOT
 		</tr>
@@ -107,27 +109,29 @@
 					$rp_field_name = substr($fieldName, $str + 1, strlen($fieldName));
 				} 		
 			}
-			switch( $field_element ) { 			    
-				case 8:			
-					$ret .= <<<EOT
+			if( $fields[$f]->getVar('field_user') == 1 ) {
+				switch( $field_element ) { 			    
+					case 8:							
+						$ret .= <<<EOT
 				<td class="center"><span style="background-color: <{\$list.{$rp_field_name}}>;">\t\t</span></td>\n
 EOT;
-				break;
-				case 9:
-					$ret .= <<<EOT
+					break;
+					case 9:
+						$ret .= <<<EOT
 				<td class="center"><img src="<{xoModuleIcons32}><{\$list.{$rp_field_name}}>" alt="{$tableName}"></td>\n
 EOT;
-				break;
-				case 10:
-					$ret .= <<<EOT
+					break;
+					case 10:
+						$ret .= <<<EOT
 				<td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$rp_field_name}}>" alt="{$tableName}"></td>\n
 EOT;
-				break;
-				default:
-					$ret .= <<<EOT
+					break;
+					default:
+						$ret .= <<<EOT
 				<td class="center"><{\$list.{$rp_field_name}}></td>\n
 EOT;
-				break;
+					break;
+				}
 			}			
 		}
 		$ret .= <<<EOT
@@ -157,23 +161,25 @@
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
 			$field_element = $fields[$f]->getVar('field_element');			
-			switch( $field_element ) { 			    
-				case 8:			
-					$ret .= <<<EOT
+			if( $fields[$f]->getVar('field_user') == 1 ) {	
+				switch( $field_element ) { 			    
+					case 8:			
+						$ret .= <<<EOT
 			<td class="center"><span style="background-color: <{\$list.{$fieldName}}>;"></span></td>\n
 EOT;
-				break;
-				case 9:
-					$ret .= <<<EOT
+					break;
+					case 9:
+						$ret .= <<<EOT
 			<td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$fieldName}}>" alt="{$tableName}"></td>\n
 EOT;
-				break;
-				default:
-					$ret .= <<<EOT
+					break;
+					default:
+						$ret .= <<<EOT
 			<td class="center"><{\$list.{$fieldName}}></td>\n
 EOT;
-				break;
-			}			
+					break;
+				}	
+			}
 		}
 		$ret .= <<<EOT
 			</tr>

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-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -92,46 +92,48 @@
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
 			$rp_field_name = $fieldName;
-			// Verify if table_fieldname is not empty
-			if(!empty($tableFieldname)) {				
-				if(strpos($fieldName, '_')) {       
-					$str = strpos($fieldName, '_'); 
-					if($str !== false){ 
-						$rp_field_name = substr($fieldName, $str + 1, strlen($fieldName));
-					} 		
-				}
-				$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
-				$tname = $lp_field_name;
-				$fieldElement = $fields[$f]->getVar('field_element');
-				if ( $fields[$f]->getVar('field_main') == 1 ) {
-					$fpmf = $fieldName; // fpmf = fields parameters main field
-				}
-				// Verify if this is a textarea or dhtmltextarea
-				if (  $fieldElement == 2 || $fieldElement == 3 ) {
-					$ret .= <<<EOT
+			if( $fields[$f]->getVar('field_user') == 1 ) {
+				// Verify if table_fieldname is not empty
+				if(!empty($tableFieldname)) {				
+					if(strpos($fieldName, '_')) {       
+						$str = strpos($fieldName, '_'); 
+						if($str !== false){ 
+							$rp_field_name = substr($fieldName, $str + 1, strlen($fieldName));
+						} 		
+					}
+					$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
+					$tname = $lp_field_name;
+					$fieldElement = $fields[$f]->getVar('field_element');
+					if ( $fields[$f]->getVar('field_main') == 1 ) {
+						$fpmf = $fieldName; // fpmf = fields parameters main field
+					}
+					// Verify if this is a textarea or dhtmltextarea
+					if (  $fieldElement == 2 || $fieldElement == 3 ) {
+						$ret .= <<<EOT
 		\${$tname}['{$rp_field_name}'] = strip_tags(\${$stl_table_name}_arr[\$i]->getVar('{$fieldName}'));\n
 EOT;
-				} else {
-					$ret .= <<<EOT
+					} else {
+						$ret .= <<<EOT
 		\${$tname}['{$rp_field_name}'] = \${$stl_table_name}_arr[\$i]->getVar('{$fieldName}');\n
 EOT;
-				}
-			} else {
-			    $tname = $tableName;
-				$fieldElement = $fields[$f]->getVar('field_element');
-				if ( $fields[$f]->getVar('field_main') == 1 ) {
-					$fpmf = $fieldName; // fpmf = fields parameters main field
-				}
-				// Verify if this is a textarea or dhtmltextarea
-				if (  $fieldElement == 2 || $fieldElement == 3 ) {
-					$ret .= <<<EOT
+					}
+				} else {
+					$tname = $tableName;
+					$fieldElement = $fields[$f]->getVar('field_element');
+					if ( $fields[$f]->getVar('field_main') == 1 ) {
+						$fpmf = $fieldName; // fpmf = fields parameters main field
+					}
+					// Verify if this is a textarea or dhtmltextarea
+					if (  $fieldElement == 2 || $fieldElement == 3 ) {
+						$ret .= <<<EOT
 		\${$tname}['{$rp_field_name}'] = strip_tags(\${$stl_table_name}_arr[\$i]->getVar('{$fieldName}'));\n
 EOT;
-				} else {
-					$ret .= <<<EOT
+					} else {
+						$ret .= <<<EOT
 		\${$tname}['{$rp_field_name}'] = \${$stl_table_name}_arr[\$i]->getVar('{$fieldName}');\n
 EOT;
-				}			
+					}			
+				}
 			}
 		}
 		$ret .= <<<EOT
@@ -147,7 +149,7 @@
     }
 }
 // keywords
-{$moduleDirname}_meta_keywords(xoops_getModuleOption('keywords', \$dirname) .', '. implode(', ', \$keywords));
+{$moduleDirname}_meta_keywords(\${$moduleDirname}->getConfig('keywords').', '. implode(', ', \$keywords));
 unset(\$keywords);
 // description
 {$moduleDirname}_meta_description({$language}{$stu_table_name}_DESC);

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/language/english/admin.php	2014-07-07 15:24:03 UTC (rev 12686)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/language/english/admin.php	2014-07-08 19:32:05 UTC (rev 12687)
@@ -30,16 +30,6 @@
 define('_AM_TDMCREATE_THEREARE_NUMMODULES', "There are <span class='red bold'>%s</span> modules stored in the Database");
 define('_AM_TDMCREATE_THEREARE_NUMTABLES', "There are <span class='red bold'>%s</span> tables stored in the Database");
 define('_AM_TDMCREATE_THEREARE_NUMFIELDS', "There are <span class='red bold'>%s</span> fields stored in the Database");
-
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_ELEMENTS', "Forms: Elements");
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_PARENT_ID', "Parent: Category id");
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_ADMIN', "Page: Show admin");
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_DISPLAY_USER', "Page: View User");
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_BLOC', "Block: View");
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_MAIN_FIELD', "Table: Main Field");
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_SEARCH', "Search: Index");
-define('_AM_TDMCREATE_TABLES_FIELDS_MORE_REQUIRED', "Forms: Required field");
-
 // General
 define('_AM_TDMCREATE_FORMOK', "Successfully saved");
 define('_AM_TDMCREATE_FORMDELOK', "Successfully deleted");
@@ -54,7 +44,7 @@
 define('_AM_TDMCREATE_FORM_INFO_TABLE_OPTIONAL_FIELD', "Optional fields");
 define('_AM_TDMCREATE_FORM_INFO_TABLE_STRUCTURES_FIELD', "Structures fields");
 define('_AM_TDMCREATE_FORM_INFO_TABLE_ICON_FIELD', "Icon fields");
-
+//
 define('_AM_TDMCREATE_ID', "ID");
 define('_AM_TDMCREATE_NAME', "Name");
 define('_AM_TDMCREATE_BLOCKS', "Blocks");
@@ -70,8 +60,7 @@
 //Form
 define('_AM_TDMCREATE_MODULE_NEW', "New module");
 define('_AM_TDMCREATE_MODULE_EDIT', "Edit module");
-//define('_AM_TDMCREATE_MODULE_IMPORTANT', "Required Information");
-
+//
 define('_AM_TDMCREATE_MODULE_IMPORTANT', "<span style='color: #FF0000'>Required - Information</span>");
 define('_AM_TDMCREATE_MODULE_NOTIMPORTANT', "<span style='color: #00FF00'>Optional - Information</span>");
 define('_AM_TDMCREATE_MODULE_ID', "Id");
@@ -175,7 +164,6 @@
 define('_AM_TDMCREATE_TABLE_IMAGE_DESC', "<span class='red bold'>WARNING</span>: If you want to choose a new image, is best to name it with the module name before and follow with the name of the image so as not to overwrite any images with the same name, in the <span class='bold'>Frameworks/moduleclasses/moduleadmin/icons/32/</span>. Otherwise an other solution, would be to insert the images in the module, a new folder is created, with the creation of the same module - <span class='bold'>images/32</span>.");
 define('_AM_TDMCREATE_TABLE_FORM_CREATED_OK', "The table <b class='green'>%s</b> is successfully created");
 define('_AM_TDMCREATE_TABLE_FORM_UPDATED_OK', "The table <b class='green'>%s</b> is successfully updated");
-
 // ------------------ Form Fields ------------------
 // Caption
 define('_AM_TDMCREATE_FIELDS_NEW', "New fields");
@@ -298,8 +286,8 @@
 define('_AM_TDMCREATE_BUILD_MODSELOPT', "Select and build a Module");
 define('_AM_TDMCREATE_NOTMODULES', "There aren't modules, pleace create one first");
 define('_AM_TDMCREATE_NOTTABLES', "There aren't tables, pleace create one first");
-define('_AM_TDMCREATE_FIELD_FORM_SAVED_OK', "Fields of table %s successfully saved");
-define('_AM_TDMCREATE_FIELD_FORM_UPDATED_OK', "Fields of table %s successfully updated");
+define('_AM_TDMCREATE_FIELDS_FORM_SAVED_OK', "Fields of table <b class='green'>%s</b> successfully saved");
+define('_AM_TDMCREATE_FIELDS_FORM_UPDATED_OK', "Fields of table <b class='green'>%s</b> successfully updated");
 //
 define('_AM_TDMCREATE_THEREARENT_MODULES', "There aren't modules");
 define('_AM_TDMCREATE_THEREARENT_TABLES', "There aren't tables");





Thread: [xoops-svn] SF.net SVN: xoops-svn:[12687] XoopsModules/TDMCreate/branches/timgno/1.91/ tdmcreate

The world's leading content management systems (CMS) written in PHP

xoops-svn