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

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

Revision: 12691
          http://sourceforge.net/p/xoops/svn/12691
Author:   txmodxoops
Date:     2014-07-09 13:47:01 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
 - Updated
 - Still work to do

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/formelements.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php	2014-07-09 07:54:43 UTC (rev 12690)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php	2014-07-09 13:47:01 UTC (rev 12691)
@@ -47,11 +47,11 @@
 		return $ret;
 	}
 	/*
-	*  @public function getTextDateSelect
+	*  @public function getTextDateSelectSetVar
 	*  @param string $tableName
 	*  @param string $fieldName
 	*/
-	public function getTextDateSelect($tableName, $fieldName) {    
+	public function getTextDateSelectSetVar($tableName, $fieldName) {    
 		$ret = <<<EOT
 		// Set Var {$fieldName}
 		\${$tableName}Obj->setVar('{$fieldName}', strtotime(\$_POST['{$fieldName}']));\n
@@ -59,11 +59,11 @@
 		return $ret;
 	}
 	/*
-	*  @public function getCheckBoxOrRadioYN
+	*  @public function getCheckBoxOrRadioYNSetVar
 	*  @param string $tableName
 	*  @param string $fieldName
 	*/
-	public function getCheckBoxOrRadioYN($tableName, $fieldName) {    
+	public function getCheckBoxOrRadioYNSetVar($tableName, $fieldName) {    
 		$ret = <<<EOT
 		// Set Var {$fieldName}
 		\${$tableName}Obj->setVar('{$fieldName}', ((\$_REQUEST['{$fieldName}'] == 1) ? '1' : '0'));\n
@@ -71,12 +71,12 @@
 		return $ret;
 	}
 	/*
-	*  @public function getImageList
+	*  @public function getImageListSetVar
 	*  @param string $moduleDirname
 	*  @param string $tableName
 	*  @param string $fieldName
 	*/
-	public function getImageList($moduleDirname, $tableName, $fieldName) {    
+	public function getImageListSetVar($moduleDirname, $tableName, $fieldName) {    
 		$ret = <<<EOT
 		// Set Var {$fieldName}
 		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
@@ -99,12 +99,12 @@
 		return $ret;
 	}
 	/*
-	*  @public function getUploadImage
+	*  @public function getUploadImageSetVar
 	*  @param string $moduleDirname
 	*  @param string $tableName
 	*  @param string $fieldName
 	*/
-	public function getUploadImage($moduleDirname, $tableName, $fieldName) {    
+	public function getUploadImageSetVar($moduleDirname, $tableName, $fieldName) {    
 		$stuModuleDirname = strtoupper($moduleDirname);
 		$ret = <<<EOT
 		// Set Var {$fieldName}
@@ -128,12 +128,12 @@
 		return $ret;
 	}
 	/*
-	*  @public function getUploadFile
+	*  @public function getUploadFileSetVar
 	*  @param string $moduleDirname
 	*  @param string $tableName
 	*  @param string $fieldName
 	*/
-	public function getUploadFile($moduleDirname, $tableName, $fieldName) {    
+	public function getUploadFileSetVar($moduleDirname, $tableName, $fieldName) {    
 		$stuModuleDirname = strtoupper($moduleDirname);
 		$ret = <<<EOT
 		// Set Var {$fieldName}
@@ -153,5 +153,61 @@
 		}\n
 EOT;
 		return $ret;
-	}	
+	}
+	/*
+	*  @public function getSimpleGetVar
+	*  @param string $lpFieldName
+	*  @param string $rpFieldName
+	*  @param string $tableName
+	*  @param string $fieldName	
+	*/
+	public function getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {    
+		$ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
+EOT;
+		return $ret;
+	}
+	/*
+	*  @public function getTextAreaGetVar
+	*  @param string $lpFieldName
+	*  @param string $rpFieldName
+	*  @param string $tableName
+	*  @param string $fieldName	
+	*/
+	public function getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {    
+		$ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = strip_tags(\${$tableName}_arr[\$i]->getVar('{$fieldName}'));\n
+EOT;
+		return $ret;
+	}
+	/*
+	*  @public function getSelectUserGetVar
+	*  @param string $lpFieldName
+	*  @param string $rpFieldName
+	*  @param string $tableName
+	*  @param string $fieldName	
+	*/
+	public function getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {    
+		$ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = XoopsUser::getUnameFromId(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
+EOT;
+		return $ret;
+	}
+	/*
+	*  @public function getTextDateSelectGetVar
+	*  @param string $lpFieldName
+	*  @param string $rpFieldName
+	*  @param string $tableName
+	*  @param string $fieldName	
+	*/
+	public function getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {    
+		$ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = formatTimeStamp(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
+EOT;
+		return $ret;
+	}
 }
\ No newline at end of file

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-09 07:54:43 UTC (rev 12690)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php	2014-07-09 13:47:01 UTC (rev 12691)
@@ -116,31 +116,37 @@
 		foreach(array_keys($fields) as $f) 
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
-			$rp_field_name = $fieldName;
-			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
-				\${$lp_field_name}['{$rp_field_name}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
-EOT;
-				}
+			$rpFieldName = $fieldName;			
+			// Verify if table_fieldname is not empty
+			$lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;				
+			if(strpos($fieldName, '_')) {       
+				$str = strpos($fieldName, '_'); 
+				if($str !== false){ 
+					$rpFieldName = substr($fieldName, $str + 1, strlen($fieldName));
+				} 		
+			}				
+			$fieldElement = $fields[$f]->getVar('field_element');				
+			if( ($fields[$f]->getVar('field_admin') == 1) || ($tableAutoincrement == 1) ) {	
+				switch($fieldElement) {
+					case 2:
+					case 3:
+						$ret .= $this->adminobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+					break;
+					case 7:
+						$ret .= $this->adminobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+					break;						
+					case 12:
+						$ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+					break;
+					default:
+						$ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+					break;
+				}				
 			}
 		}
 			$ret .= <<<EOT
-				\$GLOBALS['xoopsTpl']->append('{$tableName}_list', \${$lp_field_name});
-                unset(\${$lp_field_name});
+				\$GLOBALS['xoopsTpl']->append('{$tableName}_list', \${$lpFieldName});
+                unset(\${$lpFieldName});
 			}\n
 EOT;
 			$ret .= <<<EOT
@@ -211,19 +217,19 @@
 				switch($fieldElement) {
 					case 4:
 					case 5:
-						$ret .= $this->adminobjects->getCheckBoxOrRadioYN($tableName, $fieldName);
+						$ret .= $this->adminobjects->getCheckBoxOrRadioYNSetVar($tableName, $fieldName);
 					break;
 					case 9:
-						$ret .= $this->adminobjects->getImageList($moduleDirname, $tableName, $fieldName);
+						$ret .= $this->adminobjects->getImageListSetVar($moduleDirname, $tableName, $fieldName);
 					break;
 					case 10:
-						$ret .= $this->adminobjects->getUploadImage($moduleDirname, $tableName, $fieldName);
+						$ret .= $this->adminobjects->getUploadImageSetVar($moduleDirname, $tableName, $fieldName);
 					break;
 					case 11:
-						$ret .= $this->adminobjects->getUploadFile($moduleDirname, $tableName, $fieldName);
+						$ret .= $this->adminobjects->getUploadFileSetVar($moduleDirname, $tableName, $fieldName);
 					break;
 					case 12:
-						$ret .= $this->adminobjects->getTextDateSelect($tableName, $fieldName);
+						$ret .= $this->adminobjects->getTextDateSelectSetVar($tableName, $fieldName);
 					break;
 					default:
 						$ret .= $this->adminobjects->getSimpleSetVar($tableName, $fieldName);

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-09 07:54:43 UTC (rev 12690)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/formelements.php	2014-07-09 13:47:01 UTC (rev 12691)
@@ -272,37 +272,30 @@
 	*  @private function getXoopsFormTable
 	*  @param string $language
 	*  @param string $moduleDirname
-	*  @param string $tableName
+	*  @param string $table
 	*  @param string $fields
 	*  @param string $required
 	*/
-	private function getXoopsFormTable($language, $moduleDirname, $table, $fields, $required = 'false') 
+	private function getXoopsFormTable($language, $moduleDirname, $tableName, $fields, $required = 'false') 
 	{    
-		$tableId = $table->getVar('table_id');
-		$tableName = $table->getVar('table_name');
 		$ucfTableName = ucfirst($tableName);
 		foreach(array_keys($fields) as $f) 
 		{			
 			if($fields[$f]->getVar('field_parent') == 1) {
 				$fieldName = $fields[$f]->getVar('field_name');
-			}	
-			if($fields[$f]->getVar('field_element') > 12) {
-				$criteriaElement = new CriteriaCompo();				
-				$criteriaElement->add(new Criteria('fieldelement_tid', $tableId));
-				$fieldelement = $this->tdmcreate->getHandler('fieldelements')->getObjects($criteriaElement);
-				unset($criteriaElement);
-				foreach(array_keys($fieldelement) as $fe) 
-				{
-					$fieldelementName = $fieldelement[$fe]->getVar('fieldelement_name');
-					//$elementTableName = $tableName;
+				$field_element = $fields[$f]->getVar('field_element');
+				if($field_element > 12) {					
+					$fieldelement = $this->tdmcreate->getHandler('fieldelements')->get($field_element);
+					$fieldelementName = $fieldelement->getVar('fieldelement_name');
+					$rpFieldelementName = strtolower(str_replace('Table : ', '', $fieldelementName));						
 				}
 			}
 		}		
 		$ret = <<<EOT
 		// Form Topic {$ucfTableName}
-		\${$fieldelementName}Handler =& \$this->{$moduleDirname}->getHandler('{$fieldelementName}');				
+		\${$rpFieldelementName}Handler =& \$this->{$moduleDirname}->getHandler('{$rpFieldelementName}');				
 		\${$fieldName}_select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}'));
-		\${$fieldName}_select->addOptionArray(\${$fieldelementName}Handler->getList());
+		\${$fieldName}_select->addOptionArray(\${$rpFieldelementName}Handler->getList());
 		\$form->addElement( \${$fieldName}_select{$required} );\n
 EOT;
 		return $ret;
@@ -311,14 +304,14 @@
 	*  @private function getXoopsFormTopic
 	*  @param string $language
 	*  @param string $moduleDirname
-	*  @param string $tableName
+	*  @param string $table
 	*  @param string $fields
 	*  @param string $required
 	*/
 	private function getXoopsFormTopic($language, $moduleDirname, $table, $fields, $required = 'false') 
 	{    
 		$tableName = $table->getVar('table_name');
-		$ucf_table_name = ucfirst($tableName);
+		$ucfTableName = ucfirst($tableName);
 		foreach(array_keys($fields) as $f) 
 		{	
 			$fieldName = $fields[$f]->getVar('field_name');			
@@ -333,12 +326,12 @@
 			}			
 		}
 		$ret = <<<EOT
-		// Form Topic {$ucf_table_name}
-		include_once(XOOPS_ROOT_PATH . '/class/tree.php');				
-		\${$tableName}Handler = \$this->{$moduleDirname}->getHandler('{$tableName}');
+		// Form Topic {$ucfTableName}						
+		//\${$tableName}Handler = \$this->{$moduleDirname}->getHandler('{$tableName}');
 		\$criteria = new CriteriaCompo();
 		\${$tableName} = \${$tableName}Handler->getObjects( \$criteria );
 		if(\${$tableName}) {
+			include_once(XOOPS_ROOT_PATH . '/class/tree.php');
 			\${$tableName}_tree = new XoopsObjectTree( \${$tableName}, '{$field_id}', '{$field_pid}' );
 			\${$field_pid} = \${$tableName}_tree->makeSelBox( '{$field_pid}', '{$field_main}', '--', \$this->getVar('{$field_pid}', 'e' ), true );
 			\$form->addElement( new XoopsFormLabel ( {$language}, \${$field_pid} ){$required} );
@@ -418,7 +411,7 @@
 					if($table->getVar('table_category') == 1) {
 						$ret .= $this->getXoopsFormTopic($language, $moduleDirname, $table, $fields, $required);
 					} else {
-						$ret .= $this->getXoopsFormTable($language, $moduleDirname, $table, $fields, $required);
+						$ret .= $this->getXoopsFormTable($language, $moduleDirname, $tableName, $fields, $required);
 					}
 				}				
 			}