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

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

Revision: 12673
          http://sourceforge.net/p/xoops/svn/12673
Author:   txmodxoops
Date:     2014-07-04 08:02:45 +0000 (Fri, 04 Jul 2014)
Log Message:
-----------
 - Fixed several bugs 
 - Still work to do

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/formelements.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php	2014-07-03 22:42:40 UTC (rev 12672)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php	2014-07-04 08:02:45 UTC (rev 12673)
@@ -63,7 +63,7 @@
 		$tables = $this->getTables();
 		$filename = $this->getFileName();
 		$moduleDirname = $module->getVar('mod_dirname');		
-		$ucfmod_name = ucfirst($moduleDirname);		
+		$ucfModuleName = ucfirst($moduleDirname);		
 		$language = $this->getLanguage('AM');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
@@ -76,7 +76,7 @@
 		if ( $table->getVar('table_name') != '' ) {
 			$content .= <<<EOT
 // Get instance of module
-\${$moduleDirname} = {$ucfmod_name}Helper::getInstance();\n
+\${$moduleDirname} = {$ucfModuleName}Helper::getInstance();\n
 EOT;
 		}	
 		$content .= <<<EOT

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/index.php	2014-07-03 22:42:40 UTC (rev 12672)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/index.php	2014-07-04 08:02:45 UTC (rev 12673)
@@ -65,13 +65,13 @@
 		$language_thereare = $this->getLanguage($moduleDirname, 'AM', 'THEREARE_');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
-include_once 'header.php';\n
+include_once 'header.php';
+// Count elements\n
 EOT;
 		foreach (array_keys($tables) as $i)
 		{
 			$tableName = $tables[$i]->getVar('table_name');
 			$content .= <<<EOT
-//count "{$tableName}"
 \$count_{$tableName} = \${$tableName}Handler->getCount();\n
 EOT;
 		}
@@ -80,14 +80,14 @@
 \$template_main = '{$moduleDirname}_admin_index.tpl';
 // InfoBox Statistics
 \$adminMenu->addInfoBox({$language}STATISTICS);
-// InfoBox\n
+// Info elements\n
 EOT;
 		foreach (array_keys($tables) as $i)
 		{
 			$tableName = $tables[$i]->getVar('table_name');
-			$ta_stutable_name = $language_thereare.strtoupper($tableName);
+			$stuTableName = $language_thereare.strtoupper($tableName);
 			$content .= <<<EOT
-\$adminMenu->addInfoBoxLine({$language}STATISTICS, '<label>'.{$ta_stutable_name}.'</label>', \$count_{$tableName});\n
+\$adminMenu->addInfoBoxLine({$language}STATISTICS, '<label>'.{$stuTableName}.'</label>', \$count_{$tableName});\n
 EOT;
 		}
 		$content .= <<<EOT

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php	2014-07-03 22:42:40 UTC (rev 12672)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php	2014-07-04 08:02:45 UTC (rev 12673)
@@ -26,7 +26,8 @@
 	*  @public function constructor
 	*  @param null
 	*/
-	public function __construct() {    
+	public function __construct() {
+        parent::__construct();    
 		$this->tdmcfile = TDMCreateFile::getInstance();
 	}
     /*

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-03 22:42:40 UTC (rev 12672)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/formelements.php	2014-07-04 08:02:45 UTC (rev 12673)
@@ -398,7 +398,7 @@
 						}				
 					break;
 				}
-				if ($field_element > 12) {
+				if ($fieldElement > 12) {
 					if($table->getVar('table_category') == 1) {
 						$ret .= $this->getXoopsFormTopic($language, $moduleDirname, $table, $fields, $required);
 					} else {

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-03 22:42:40 UTC (rev 12672)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php	2014-07-04 08:02:45 UTC (rev 12673)
@@ -71,9 +71,11 @@
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
 			$lang_fn = $language.strtoupper($fieldName);		
-			$ret .= <<<EOT
+			if($fields[$f]->getVar('field_inlist') == 1) { 
+				$ret .= <<<EOT
 				<th class="center"><{\$smarty.const.{$lang_fn}}></th>\n
 EOT;
+			}
 		}
 		$ret .= <<<EOT
 				<th class="center"><{\$smarty.const.{$language}FORMACTION}></th>
@@ -119,27 +121,29 @@
 				} 		
 			}
 			$lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
-			switch( $fieldElement ) {			    
-				case 8:			
-					$ret .= <<<EOT
+			if($fields[$f]->getVar('field_inlist') == 1) {	
+				switch( $fieldElement ) {			    
+					case 8:			
+						$ret .= <<<EOT
 					<td class="center"><span style="background-color: <{\$list.{$rp_field_name}}>;">&nbsp;&nbsp;&nbsp;&nbsp;</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
@@ -176,31 +180,44 @@
 		foreach(array_keys($fields) as $f) 
 		{
 			$fieldName = $fields[$f]->getVar('field_name');
-			$fieldElement = $fields[$f]->getVar('field_element');			
-			switch( $fieldElement ) {			    
-				case 8:			
-					$ret .= <<<EOT
+			$fieldElement = $fields[$f]->getVar('field_element');
+			if($f == 0) {
+				$field_id = $fieldName;							
+			}
+			if($fields[$f]->getVar('field_inlist') == 1) {	
+				switch( $fieldElement ) {			    
+					case 8:			
+						$ret .= <<<EOT
 					<td class="center"><span style="background-color: <{\$list.{$fieldName}}>;">\t\t</span></td>\n			
 EOT;
-				break;
-				case 9:
-					$ret .= <<<EOT
+					break;
+					case 9:
+						$ret .= <<<EOT
 					<td class="center"><img src="<{xoModuleIcons32}><{\$list.{$fieldName}}>" 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.{$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
+					<td class="center">
+						<a href="{$tableName}.php?op=edit&amp;{$field_id}=<{\$list.{$field_id}}>" title="<{\$smarty.const._EDIT}>">
+							<img src="<{xoModuleIcons16 edit.png}>" alt="<{\$smarty.const._EDIT}>" />
+						</a>                   
+						<a href="{$tableName}.php?op=delete&amp;{$field_id}=<{\$list.{$field_id}}>" title="<{\$smarty.const._DELETE}>">
+							<img src="<{xoModuleIcons16 delete.png}>" alt="<{\$smarty.const._DELETE}>" />
+						</a>
+					</td>
 				</tr>
 			<{/foreach}>
 		</tbody>