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

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

Revision: 12693
          http://sourceforge.net/p/xoops/svn/12693
Author:   txmodxoops
Date:     2014-07-10 18:14:17 +0000 (Thu, 10 Jul 2014)
Log Message:
-----------
 - Fixed bugs 
 - Updated
 - Still work to do

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/menu.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php

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-09 18:25:13 UTC (rev 12692)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/menu.php	2014-07-10 18:14:17 UTC (rev 12693)
@@ -130,7 +130,7 @@
 				$content .= <<<EOT
 \$adminmenu[\$i]['title'] = {$language}{$menu};
 \$adminmenu[\$i]['link'] = 'admin/{$tables[$t]->getVar('table_name')}.php';
-\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/{$tables[$t]->getVar('table_image')}';\n
+\$adminmenu[\$i]['icon'] = 'assets/images/icons/32/{$tables[$t]->getVar('table_image')}';\n
 EOT;
 				//$content .= $this->getAdminMenuImagesPath($tables, $t);
 				$content .= <<<EOT

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php	2014-07-09 18:25:13 UTC (rev 12692)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php	2014-07-10 18:14:17 UTC (rev 12693)
@@ -106,7 +106,7 @@
 		$stlModuleAuthor = str_replace(' ', '', strtolower($module->getVar('mod_author')));
 		// Creation of the Directory in repository
 		$targetDirectory = $this->uploadPath.'/repository/'. $stlModuleDirname;			
-		$uploadImagesFolder = $this->uploadPath.'/images/repository';			
+		$uploadImagesRepository = $this->uploadPath.'/images/repository';	
 		// Creation of "module" folder
 		$this->structure->getPath($targetDirectory);
 		// Creation of "module" folder
@@ -133,7 +133,7 @@
 		$this->structure->makeDirAndCopyFile('assets/images', $indexFile, 'index.html');	
 		//Copy the logo of the module
 		$modImage = str_replace(' ', '', strtolower($module->getVar('mod_image')));
-		$this->structure->copyFile('assets/images', $uploadImagesFolder.'/'.$modImage, $modImage);				
+		$this->structure->copyFile('assets/images', $uploadImagesRepository.'/'.$modImage, $modImage);				
 		// Creation of 'images/icons' folder and index.html file - Added in Version 1.15
 		$this->structure->makeDirAndCopyFile('assets/images/icons', $indexFile, 'index.html');	
 		// Creation of "images/icons/16" folder and index.html file
@@ -141,7 +141,7 @@
 		// Creation of "images/icons/32" folder and index.html file
 		$this->structure->makeDirAndCopyFile('assets/images/icons/32', $indexFile, 'index.html');		
 		// Copy of 'module_author_logo.gif' file in uploads dir
-		$logoGifFrom = $uploadImagesFolder.'/'.$stlModuleAuthor.'_logo.gif';
+		$logoGifFrom = $uploadImagesRepository.'/'.$stlModuleAuthor.'_logo.gif';
 		if (!file_exists($logoGifFrom)) {
 			copy($logosFolder.'/'.$stlModuleAuthor.'_logo.gif', $logoGifFrom);
 		} 
@@ -203,6 +203,7 @@
 		$modId = $module->getVar('mod_id');
         $moduleDirname = $module->getVar('mod_dirname');
 		$uploadTablesIcons32 = $this->uploadPath.'/images/tables';
+		$framePathIcon32 = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32';
 		// Id of tables
 		$criteriaTables = new CriteriaCompo();
 		$criteriaTables->add(new Criteria('table_mid', $modId));		
@@ -227,9 +228,11 @@
 			// Get Table Object		
 			$table = $this->tdmcreate->getHandler('tables')->get($tableId);
 			// Copy of tables images file
-			if( file_exists($uploadTableImage = $uploadTablesIcons32.'/'.$tableImage)) {
+			if( file_exists($uploadTableImage = $uploadTablesIcons32.'/'.$tableImage )) {
 				$this->structure->copyFile('assets/images/icons/32', $uploadTableImage, $tableImage);
-			}										
+			} elseif( file_exists($uploadTableImage = $framePathIcon32.'/'.$tableImage )) {
+				$this->structure->copyFile('assets/images/icons/32', $uploadTableImage, $tableImage);
+			}									
 			// Creation of admin files
 			if ( $tableAdmin == 1) {	
 				// Admin Pages File

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php	2014-07-09 18:25:13 UTC (rev 12692)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php	2014-07-10 18:14:17 UTC (rev 12693)
@@ -21,7 +21,7 @@
 if (!defined('XOOPS_ROOT_PATH')){ exit(); }
 $dirname = basename( dirname( __FILE__ ) ) ;
 
-$modversion['name'] = "{$dirname}";
+$modversion['name'] = _MI_TDMCREATE_NAME;
 $modversion['version'] = 1.91;
 $modversion['description'] = _MI_TDMCREATE_DESC;
 $modversion['author'] = "Xoops TDM";