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

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

Revision: 12658
          http://sourceforge.net/p/xoops/svn/12658
Author:   txmodxoops
Date:     2014-06-27 14:22:17 +0000 (Fri, 27 Jun 2014)
Log Message:
-----------
 - Fixed bugs 
 - Updated
 - Renamed tdmcreate_slogo.png to logo.png
 - Personal logo copied by architecture.php file in uploads/tdmcreate/images/repository
 - Still work to do

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/update.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/mail.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.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-27 12:03:27 UTC (rev 12657)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php	2014-06-27 14:22:17 UTC (rev 12658)
@@ -102,6 +102,7 @@
 		//
 		$indexFile = $this->path.'/index.html';	
 		$docs_folder = $this->path.'/docs';
+		$logos_folder = $this->path.'/assets/images/logos';
 		$stl_module_name = str_replace(' ', '', strtolower($module->getVar('mod_name')));
 		$stl_module_author = str_replace(' ', '', strtolower($module->getVar('mod_author')));
 		// Creation of the Directory in repository
@@ -141,8 +142,13 @@
 		$this->structure->makeDirAndCopyFile('assets/images/icons/16', $indexFile, 'index.html');
 		// Creation of "images/icons/32" folder and index.html file
 		$this->structure->makeDirAndCopyFile('assets/images/icons/32', $indexFile, 'index.html');		
-		// Creation of 'txmodxoops_logo.png' file
-		$this->structure->copyFile('assets/images', $upload_images_folder.'/'.$stl_module_author.'_logo.gif', $stl_module_author.'_logo.gif');	
+		// Copy of 'module_author_logo.gif' file in uploads dir
+		$logo_gif_from = $upload_images_folder.'/'.$stl_module_author.'_logo.gif';
+		if (!file_exists($logo_gif_from)) {
+			copy($logos_folder.'/'.$stl_module_author.'_logo.gif', $logo_gif_from);
+		} 
+		// Creation of 'module_author_logo.gif' file
+		$this->structure->copyFile('assets/images', $logo_gif_from, $stl_module_author.'_logo.gif');	
 		// Creation of "images" folder and index.html file
 		$this->structure->makeDirAndCopyFile('assets/js', $indexFile, 'index.html');
 		// Creation of 'docs' folder and index.html file
@@ -183,7 +189,7 @@
 				$this->structure->makeDirAndCopyFile('sql', $indexFile, 'index.html');	
 			}
 			if ( $table->getVar('table_notifications') == 1 ) {
-				// Creation of "sql" folder and index.html file	
+				// Creation of "mail_template" folder and index.html file	
 				$this->structure->makeDirAndCopyFile('language/'.$GLOBALS['xoopsConfig']['language'].'/mail_template', $indexFile, 'index.html');	
 			}
 		}
@@ -339,8 +345,8 @@
 				$ret[] = $includeNotifications->render();
 				// Language Mail Template Category File 
 				$languageMailTpl = LanguageMailTpl::getInstance();	
-				$languageMailTpl->write($module, 'category_new_notify.tpl');
-				$ret[] = $languageMailTpl->render();
+				$languageMailTpl->write($module);
+				$ret[] = $languageMailTpl->renderFile('category_new_notify.tpl');
 			}
 			// Include Install File
 			$includeInstall = IncludeInstall::getInstance();

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/update.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/update.php	2014-06-27 12:03:27 UTC (rev 12657)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/update.php	2014-06-27 14:22:17 UTC (rev 12658)
@@ -54,10 +54,10 @@
 	}
 	
 	/*
-	*  @public function render
+	*  @public function renderFile
 	*  @param null
 	*/
-	public function render() {    
+	public function renderFile() {    
 		$module = $this->getModule();
 		$filename = $this->getFileName();
 		$module_name = strtolower($module->getVar('mod_name'));        				

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/mail.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/mail.php	2014-06-27 12:03:27 UTC (rev 12657)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/mail.php	2014-06-27 14:22:17 UTC (rev 12658)
@@ -55,7 +55,7 @@
 	*/
 	public function renderFile($filename) { 		
 		$module = $this->getModule();
-		$filename = $this->getFileName();
+		//$filename = $this->getFileName();
 		$module_name = strtolower($module->getVar('mod_name'));
 		$content = <<<EOT
 // ---------- Templates Mail Content Dummy ---------- //

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-06-27 12:03:27 UTC (rev 12657)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php	2014-06-27 14:22:17 UTC (rev 12658)
@@ -74,8 +74,8 @@
 include_once TDMC_PATH . $cfi .'functions.php';
 include_once TDMC_PATH . $cfi .'install.php';
 include_once TDMC_PATH . $cfi .'jquery.php';
-include_once TDMC_PATH . $cfi .'notifications.inc.php';
-include_once TDMC_PATH . $cfi .'search.inc.php';
+include_once TDMC_PATH . $cfi .'notifications.php';
+include_once TDMC_PATH . $cfi .'search.php';
 include_once TDMC_PATH . $cfi .'update.php';
 include_once TDMC_PATH . $cfl .'admin.php';
 include_once TDMC_PATH . $cfl .'blocks.php';

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php	2014-06-27 12:03:27 UTC (rev 12657)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php	2014-06-27 14:22:17 UTC (rev 12658)
@@ -35,7 +35,7 @@
 $modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/readme.txt";
 $modversion['manual'] = "MANUAL";
 $modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/manual.txt";
-$modversion['image'] = "assets/images/tdmcreate_slogo.png";
+$modversion['image'] = "assets/images/logo.png";
 $modversion['dirname'] = "{$dirname}";
 
 $modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';