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

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

Revision: 12704
          http://sourceforge.net/p/xoops/svn/12704
Author:   txmodxoops
Date:     2014-07-12 07:41:43 +0000 (Sat, 12 Jul 2014)
Log Message:
-----------
 - Fixed important bugs 
 - Updated
 - Still work to do

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/classes.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/sql/mysql.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_tables.tpl

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/classes.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/classes.php	2014-07-11 18:06:57 UTC (rev 12703)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/classes.php	2014-07-12 07:41:43 UTC (rev 12704)
@@ -81,44 +81,50 @@
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
 			$fieldType = $fields[$f]->getVar('field_type');
+			if($fieldType > 1) {					
+				$fType = $this->tdmcreate->getHandler('fieldtype')->get($fieldType);
+				$fieldTypeName = $fType->getVar('fieldtype_name');									
+			} else {
+				$fieldType = null;
+			}
 			switch($fieldType) {
-				case 'INT': 
-				case 'TINYINT': 
-				case 'MEDIUMINT': 
-				case 'SMALLINT':
+				case 2: 
+				case 3: 
+				case 4: 
+				case 5:
 					$ret .= $this->getInitVar($fieldName, 'INT');
 				break;
-				case 'CHAR': 
-				case 'VARCHAR': 				
-					$ret .= $this->getInitVar($fieldName, 'TXTBOX');
-				break;
-				case 'TEXT': 
-				case 'TINYTEXT': 
-				case 'MEDIUMTEXT': 
-				case 'LONGTEXT':
-					$ret .= $this->getInitVar($fieldName, 'TXTAREA');
-				break;				
-				case 'FLOAT': 				
+				case 6: 				
 					$ret .= $this->getInitVar($fieldName, 'FLOAT');
 				break;
-				case 'DECIMAL': 
-				case 'DOUBLE': 				
+				case 7: 
+				case 8: 				
 					$ret .= $this->getInitVar($fieldName, 'DECIMAL');
 				break;
-				case 'ENUM': 				
+				case 10: 				
 					$ret .= $this->getInitVar($fieldName, 'ENUM');
 				break;
-				case 'EMAIL': 				
+				case 11: 				
 					$ret .= $this->getInitVar($fieldName, 'EMAIL');
 				break;
-				case 'URL': 				
+				case 12: 				
 					$ret .= $this->getInitVar($fieldName, 'URL');
-				break;  
-				case 'DATE': 
-				case 'DATETIME': 
-				case 'TIMESTAMP': 
-				case 'TIME':
-				case 'YEAR':
+				break;
+				case 13: 
+				case 14: 				
+					$ret .= $this->getInitVar($fieldName, 'TXTBOX');
+				break;
+				case 15: 
+				case 16: 
+				case 17: 
+				case 18:
+					$ret .= $this->getInitVar($fieldName, 'TXTAREA');
+				break;				  
+				case 19: 
+				case 20: 
+				case 21: 
+				case 22:
+				case 23:
 					$ret .= $this->getInitVar($fieldName, 'LTIME');
 				break;
 			}

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/sql/mysql.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/sql/mysql.php	2014-07-11 18:06:57 UTC (rev 12703)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/sql/mysql.php	2014-07-12 07:41:43 UTC (rev 12704)
@@ -144,55 +144,73 @@
 			$fieldNull = $fields[$f]->getVar('field_null');
 			$fieldDefault = $fields[$f]->getVar('field_default');
 			$fieldKey = $fields[$f]->getVar('field_key');
+			if($fieldType > 1) {					
+				$fType = $this->tdmcreate->getHandler('fieldtype')->get($fieldType);
+				$fieldTypeName = $fType->getVar('fieldtype_name');									
+			} else {
+				$fieldType = null;
+			}
+			if($fieldAttribute > 1) {					
+				$fAttribute = $this->tdmcreate->getHandler('fieldattributes')->get($fieldAttribute);
+				$fieldAttribute = $fAttribute->getVar('fieldattribute_name');									
+			} else {
+				$fieldAttribute = null;
+			}
+			if($fieldNull > 1) {					
+				$fNull = $this->tdmcreate->getHandler('fieldnull')->get($fieldNull);
+				$fieldNull = $fNull->getVar('fieldnull_name');									
+			} else {
+				$fieldNull = null;
+			}			
 			if ( !empty($fieldName) )
 			{								
 				switch( $fieldType ) {
-					case 'TEXT':
-					case 'TINYTEXT':
-					case 'MEDIUMTEXT':
-					case 'LONGTEXT':
-					case 'DATE':	
-					case 'DATETIME':
-					case 'TIMESTAMP':
-						$type = $fieldType;
+					case 15:
+					case 16:
+					case 17:
+					case 18:
+					case 19:	
+					case 20:
+					case 21:
+						$type = $fieldTypeName;
 						$default = null;
                     break;					
 					default:
-						$type = $fieldType.'('.$fieldValue.')';
+						$type = $fieldTypeName.'('.$fieldValue.')';
 						$default = "DEFAULT '{$fieldDefault}'";
 					break;
 				}	
 				if( ($f == 0) && ($tableAutoincrement == 1) ) {
 					$row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, null, 'AUTO_INCREMENT');					
-					$comma[$j] = $this->getKey(1, $fieldName);
+					$comma[$j] = $this->getKey(2, $fieldName);
 					$j++;
 				} elseif( ($f == 0) && ($tableAutoincrement == 0) ) {
 					$row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default);					
-					$comma[$j] = $this->getKey(1, $fieldName);
+					$comma[$j] = $this->getKey(2, $fieldName);
 					$j++;
 				} else {
-					if( $fieldKey == 'UNIQUE' || $fieldKey == 'KEY' || $fieldKey == 'INDEX' || $fieldKey == 'FULLTEXT')
+					if( $fieldKey == 3 || $fieldKey == 4 || $fieldKey == 5 || $fieldKey == 6)
 					{
 						switch( $fieldKey ) {					
-							case 'UNIQUE':
+							case 3:
 								$row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default);
-								$comma[$j] = $this->getKey(2, $fieldName);
-								$j++;
-							break;
-							case 'KEY':
-								$row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default);
 								$comma[$j] = $this->getKey(3, $fieldName);
 								$j++;
 							break;
-							case 'INDEX':
+							case 4:
 								$row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default);
 								$comma[$j] = $this->getKey(4, $fieldName);
 								$j++;
 							break;
-							case 'FULLTEXT':
+							case 5:
 								$row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default);
 								$comma[$j] = $this->getKey(5, $fieldName);
 								$j++;
+							break;
+							case 6:
+								$row[] = $this->getFieldRow($fieldName, $type, $fieldAttribute, $fieldNull, $default);
+								$comma[$j] = $this->getKey(6, $fieldName);
+								$j++;
 							break;											
 						}	
 					} else {
@@ -266,27 +284,27 @@
 	*/
 	private function getKey($key, $fieldName) {    
 		switch( $key ) {
-			case 1: // PRIMARY KEY
+			case 2: // PRIMARY KEY
 				$ret = <<<SQL
   PRIMARY KEY (`{$fieldName}`)
 SQL;
 			break;
-			case 2: // UNIQUE KEY
+			case 3: // UNIQUE KEY
 				$ret = <<<SQL
   UNIQUE KEY `{$fieldName}` (`{$fieldName}`)
 SQL;
 			break;
-			case 3: // KEY
+			case 4: // KEY
 				$ret = <<<SQL
   KEY `{$fieldName}` (`{$fieldName}`)
 SQL;
 			break;
-			case 4: // INDEX
+			case 5: // INDEX
 				$ret = <<<SQL
   INDEX (`{$fieldName}`)
 SQL;
 			break;
-			case 5: // FULLTEXT KEY
+			case 6: // FULLTEXT KEY
 				$ret = <<<SQL
   FULLTEXT KEY `{$fieldName}` (`{$fieldName}`)
 SQL;

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-11 18:06:57 UTC (rev 12703)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php	2014-07-12 07:41:43 UTC (rev 12704)
@@ -135,10 +135,10 @@
 		}
 		$ret .= <<<EOT
 					<td class="center">
-						<a href="{$tableName}.php?op=edit&amp;{$field_id}=<{\$list.{$rp_field_id}}>" title="<{\$smarty.const._EDIT}>">
+						<a href="{$tableName}.php?op=edit&amp;{$field_id}=<{\$list.{$rpFieldName}}>" title="<{\$smarty.const._EDIT}>">
 							<img src="<{xoModuleIcons16 edit.png}>" alt="<{\$smarty.const._EDIT}>" />
 						</a>                   
-						<a href="{$tableName}.php?op=delete&amp;{$field_id}=<{\$list.{$rp_field_id}}>" title="<{\$smarty.const._DELETE}>">
+						<a href="{$tableName}.php?op=delete&amp;{$field_id}=<{\$list.{$rpFieldName}}>" title="<{\$smarty.const._DELETE}>">
 							<img src="<{xoModuleIcons16 delete.png}>" alt="<{\$smarty.const._DELETE}>" />
 						</a>
 					</td>

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php	2014-07-11 18:06:57 UTC (rev 12703)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php	2014-07-12 07:41:43 UTC (rev 12704)
@@ -359,7 +359,7 @@
         $fields = $this->getTableFields($table->getVar('table_id'));
 		foreach (array_keys($fields) as $f) 
 		{		
-			if( $fields[$f]->getVar('field_element') == 3 ) {
+			if( $fields[$f]->getVar('field_element') == 4 ) {
 				$ret .= <<<EOT
 // Editor
 xoops_load('xoopseditorhandler');

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql	2014-07-11 18:06:57 UTC (rev 12703)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/sql/mysql.sql	2014-07-12 07:41:43 UTC (rev 12704)
@@ -140,7 +140,7 @@
 )ENGINE =MyISAM;
 
 INSERT INTO `tdmcreate_fieldtype` (`fieldtype_id`, `fieldtype_name`, `fieldtype_value`) VALUES
-  (1, '', ''),
+  (1, '...', ''),
   (2, 'INT', 'INT'),
   (3, 'TINYINT', 'TINYINT'),
   (4, 'MEDIUMINT', 'MEDIUMINT'),
@@ -177,7 +177,7 @@
 )ENGINE =MyISAM;
 
 INSERT INTO `tdmcreate_fieldattributes` (`fieldattribute_id`, `fieldattribute_name`, `fieldattribute_value`) VALUES
-  (1, '', ''),
+  (1, '...', ''),
   (2, 'BINARY', 'BINARY'),
   (3, 'UNSIGNED', 'UNSIGNED'),
   (4, 'UNSIGNED_ZEROFILL', 'UNSIGNED_ZEROFILL'),
@@ -196,7 +196,7 @@
 )ENGINE =MyISAM;
 
 INSERT INTO `tdmcreate_fieldnull` (`fieldnull_id`, `fieldnull_name`, `fieldnull_value`) VALUES
-  (1, '', ''),
+  (1, '...', ''),
   (2, 'NOT NULL', 'NOT NULL'),
   (3, 'NULL', 'NULL');
 
@@ -213,7 +213,7 @@
 )ENGINE =MyISAM;
 
 INSERT INTO `tdmcreate_fieldkey` (`fieldkey_id`, `fieldkey_name`, `fieldkey_value`) VALUES
-  (1, '', ''),
+  (1, '...', ''),
   (2, 'PRIMARY', 'PRIMARY'),
   (3, 'UNIQUE', 'UNIQUE'),
   (4, 'KEY', 'KEY'),
@@ -236,7 +236,7 @@
 )ENGINE =MyISAM;
 
 INSERT INTO `tdmcreate_fieldelements` (`fieldelement_id`, `fieldelement_mid`, `fieldelement_tid`, `fieldelement_name`, `fieldelement_value`) VALUES
-  (1, 0, 0, '', ''),
+  (1, 0, 0, '...', ''),
   (2, 0, 0, 'Text', 'XoopsFormText'),
   (3, 0, 0, 'TextArea', 'XoopsFormTextArea'),
   (4, 0, 0, 'DhtmlTextArea', 'XoopsFormDhtmlTextArea'),

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_tables.tpl
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_tables.tpl	2014-07-11 18:06:57 UTC (rev 12703)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/templates/admin/tdmcreate_tables.tpl	2014-07-12 07:41:43 UTC (rev 12704)
@@ -32,7 +32,7 @@
             </td>
             <td class='center bold green'><{$module.name}></td>
             <td class='center'><img src="<{$tdmc_upload_imgmod_url}>/<{$module.image}>" alt="" height="35" /></td>
-	    <td class='center'><img src="<{$modPathIcon16}>/nb_fields.png" alt="16" /></td>
+	    <td class='center'><img src="<{$modPathIcon16}>/fields.png" alt="16" /></td>
 	    <td class='center'><img src="<{$modPathIcon16}>/blocks.png" alt="16" /></td>
 	    <td class='center'><img id="loading_img_admin<{$module.id}>" src="<{$modPathIcon16}>/spinner.gif" style="display:none;" title="<{$smarty.const._AM_SYSTEM_LOADING}>" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img style="cursor:pointer;" class="tooltip" id="img_admin<{$module.id}>" onclick="tdmcreate_setStatus( { op: 'display', mod_id: <{$module.id}>, mod_admin: <{if $module.admin == 1}>0<{else}>1<{/if}> }, 'img_admin<{$module.id}>', 'modules.php' )" src="<{xoModuleIcons16}><{$module.admin}>.png" alt="<{$smarty.const._AM_TDMCREATE_CHANGE_DISPLAY}>&nbsp;<{$module.name}>" title="<{$smarty.const._AM_TDMCREATE_CHANGE_DISPLAY}>&nbsp;<{$module.name}>" />
             </td>