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

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

Revision: 12640
          http://sourceforge.net/p/xoops/svn/12640
Author:   txmodxoops
Date:     2014-06-24 19:22:55 +0000 (Tue, 24 Jun 2014)
Log Message:
-----------
If there are any errors, try to comment out lines 80 and 82 of the file class/files/abstract.php

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-06-24 18:45:37 UTC (rev 12639)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-06-24 19:22:55 UTC (rev 12640)
@@ -91,10 +91,12 @@
 		//
 		foreach (array_keys($tables) as $t)
 		{			
+			$table_id = $tables[$t]->getVar('table_id');
 			$table_name = $tables[$t]->getVar('table_name');
 			$table_admin = $tables[$t]->getVar('table_admin');
 			$table_user = $tables[$t]->getVar('table_user');
-			$table_blocks = $tables[$t]->getVar('table_blocks');			
+			$table_blocks = $tables[$t]->getVar('table_blocks');
+			$table = $this->tdmcreate->getHandler('tables')->get($table_id);
 		}
 		//
 		$indexFile = $this->path.'/index.html';	
@@ -111,15 +113,15 @@
 		$this->structure->makeDir($targetDirectory);
 		// Copied of index.html file in "root module" folder	
 		$this->structure->copyFile('', $indexFile, 'index.html');
-		if ( $table_admin == 1) {
+		if ( $table->getVar('table_admin') == 1) {
 			// Creation of "admin" folder and index.html file
 			$this->structure->makeDirAndCopyFile('admin', $indexFile, 'index.html');
 		}
-		if ( $table_blocks == 1) {
+		if ( $table->getVar('table_blocks') == 1) {
 			// Creation of "blocks" folder and index.html file
 			$this->structure->makeDirAndCopyFile('blocks', $indexFile, 'index.html');
 		}
-		if ( $table_name != null) {
+		if ( $table->getVar('table_name') != null) {
 			// Creation of "class" folder and index.html file
 			$this->structure->makeDirAndCopyFile('class', $indexFile, 'index.html');
 		}
@@ -162,19 +164,19 @@
 		$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language'], $indexFile, 'index.html');	
 		// Creation of "language/local_language/help" folder and index.html file	
 		$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language']. '/help', $indexFile, 'index.html');
-		if (( $table_user == 1) || ( $table_admin == 1 )) {
+		if (( $table->getVar('table_user') == 1) || ( $table->getVar('table_admin') == 1 )) {
 			// Creation of "templates" folder and index.html file	
 			$this->structure->makeDirAndCopyFile('templates', $indexFile, 'index.html');
 		}
-		if ( $table_admin == 1 ) {
+		if ( $table->getVar('table_admin') == 1 ) {
 			// Creation of "templates/admin" folder and index.html file	
 			$this->structure->makeDirAndCopyFile('templates/admin', $indexFile, 'index.html');	
 		}
-		if ( $table_blocks == 1 ) {
+		if ( $table->getVar('table_blocks') == 1 ) {
 			// Creation of "templates/blocks" folder and index.html file	
 			$this->structure->makeDirAndCopyFile('templates/blocks', $indexFile, 'index.html');
 		}
-		if ( $table_name != null ) {
+		if ( $table->getVar('table_name') != null ) {
 			// Creation of "sql" folder and index.html file	
 			$this->structure->makeDirAndCopyFile('sql', $indexFile, 'index.html');	
 		}
@@ -259,7 +261,7 @@
 			/*var_dump($table_name); */           						
 		}		
 		// Creation of blocks language file
-		if ( $table_blocks == 1) {			
+		if ( $table->getVar('table_blocks') == 1) {			
 			// Language Blocks File 
 			$languageBlocks = LanguageBlocks::getInstance();
 			$languageBlocks->write($module, $tables, 'blocks.php');
@@ -270,7 +272,7 @@
 		$languageModinfo->write($module, $table, $tables, 'modinfo.php');
 		$ret[] = $languageModinfo->render();		
 		// Creation of admin files
-		if ( $table_admin == 1) {					
+		if ( $table->getVar('table_admin') == 1) {					
 			// Admin Header File 
 			$adminHeader = AdminHeader::getInstance();
 			$adminHeader->write($module, $table, $tables, 'header.php');
@@ -284,7 +286,7 @@
 			$adminMenu->write($module, $tables, 'menu.php');
 			$ret[] = $adminMenu->render();
 			// Creation of admin permission file
-			if (( $table_permissions == 1)) {
+			if (( $table->getVar('table_permissions') == 1)) {
 				// Admin Permissions File
 				$adminPermissions = AdminPermissions::getInstance();
 				$adminPermissions->write($module, $tables, 'permissions.php');
@@ -320,7 +322,7 @@
 			$ret[] = $adminTemplatesHeader->render();
 		}		
 		// Creation of notifications files
-		if ( $table_notifications == 1 ) {
+		if ( $table->getVar('table_notifications') == 1 ) {
 			// Include Notifications File
 			$includeNotifications = IncludeNotifications::getInstance();
 			$includeNotifications->write($module, $table, 'notifications.php');
@@ -331,14 +333,14 @@
 		$includeInstall->write($module, $tables, 'install.php');
 		$ret[] = $includeInstall->render();
 		// Creation of sql file
-		if ( $table_name != null) {
+		if ( $table->getVar('table_name') != null) {
 			// Sql File
 			$sqlFile = SqlFile::getInstance();
 			$sqlFile->write($module, $tables, 'mysql.sql');
 			$ret[] = $sqlFile->render();	
 		}
 		// Creation of search file
-		if ( $table_search == 1) {
+		if ( $table->getVar('table_search') == 1) {
 			// Include Search File
 			$includeSearch = IncludeSearch::getInstance();
 			$includeSearch->write($module, $table, 'search.php');
@@ -368,7 +370,7 @@
 			$ret[] = $includeComments->renderCommentsNew($module, 'comment_new');				
 		}
 		// Creation of user files
-		if ( ($table_user == 1)){							
+		if ( ($table->getVar('table_user') == 1)) {							
 			// Templates Index File
 			$userTemplatesIndex = TemplatesUserIndex::getInstance();
 			$userTemplatesIndex->write($module, $stl_mod_name.'_index.tpl');
@@ -390,7 +392,7 @@
 			$userHeader->write($module, 'header.php');
 			$ret[] = $userHeader->render();
 			// User Notification Update File
-			if ( ($table_notifications == 1 )){				
+			if ( ($table->getVar('table_notifications') == 1 )) {				
 				$userNotificationUpdate = UserNotificationUpdate::getInstance();
 				$userNotificationUpdate->write($module, 'notification_update.php');
 				$ret[] = $userNotificationUpdate->render();