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

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

Revision: 12647
          http://sourceforge.net/p/xoops/svn/12647
Author:   txmodxoops
Date:     2014-06-25 19:02:35 +0000 (Wed, 25 Jun 2014)
Log Message:
-----------
 - Fixed bugs 
 - Still work to do

Modified Paths:
--------------
    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/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/modinfo.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/index.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/xoopsversion.php

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-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/index.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -77,7 +77,7 @@
 		}
 		$content .= <<<EOT
 // Template Index
-\$template_main = 'admin_index.tpl';
+\$template_main = '{$module_name}_index.tpl';
 // InfoBox Statistics
 \$adminMenu->addInfoBox({$language}STATISTICS);
 // InfoBox\n

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-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -65,7 +65,7 @@
 		$menu = 1;
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= <<<EOT
-\n\$dirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+\$dirname = basename( dirname( dirname( __FILE__ ) ) ) ;
 \$module_handler =& xoops_gethandler('module');
 \$xoopsModule =& XoopsModule::getByDirname(\$dirname);
 \$moduleInfo =& \$module_handler->get(\$xoopsModule->getVar('mid'));
@@ -75,7 +75,7 @@
 \$adminmenu[\$i]['title'] = {$language}{$menu};
 \$adminmenu[\$i]['link'] = 'admin/index.php';
 \$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/home.png';
-\$i++;
+\$i++;\n
 EOT;
 		foreach (array_keys($tables) as $i)
 		{		
@@ -84,25 +84,25 @@
 			{   
 			    $menu++;
 				$content .= <<<EOT
-\n\$adminmenu[\$i]['title'] = {$language}{$menu};
+\$adminmenu[\$i]['title'] = {$language}{$menu};
 \$adminmenu[\$i]['link'] = 'admin/{$tables[$i]->getVar('table_name')}.php';
 \$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/{$tables[$i]->getVar('table_image')}';
-\$i++;
+\$i++;\n
 EOT;
 			}
 		}
 		if( $table_permissions == 1 ) {
 			$menu++;
 			$content .= <<<EOT
-\n\$adminmenu[\$i]['title'] = {$language}{$menu};
+\$adminmenu[\$i]['title'] = {$language}{$menu};
 \$adminmenu[\$i]['link'] = 'admin/permissions.php';
 \$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/permissions.png';
-\$i++;
+\$i++;\n
 EOT;
 		}
 		$menu++;
 		$content .= <<<EOT
-\n\$adminmenu[\$i]['title'] = {$language}{$menu};
+\$adminmenu[\$i]['title'] = {$language}{$menu};
 \$adminmenu[\$i]['link']  = 'admin/about.php';
 \$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/about.png';
 unset( \$i );

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php	2014-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -91,7 +91,7 @@
 		\$limit = xoops_getModuleOption('adminpager');
 		\$start = {$module_name}_CleanVars(\$_REQUEST, 'start', 0);
 		\$adminMenu->addItemButton({$language}ADD_{$stu_table_fieldname}, '{$table_name}.php?op=new', 'add');
-		\$template_main = 'admin_{$table_name}.tpl';
+		\$template_main = '{$stl_mod_name}_{$table_name}.tpl';
 		echo \$adminMenu->renderButton();
 		\$criteria = new CriteriaCompo();
 		\$criteria->setSort('{$fpif} ASC, {$fpmf}');
@@ -101,7 +101,6 @@
 		unset(\$criteria);
 		\$GLOBALS['xoopsTpl']->assign('{$stl_mod_name}_url', {$stu_mod_name}_URL);
 		\$GLOBALS['xoopsTpl']->assign('{$stl_mod_name}_upload_url', {$stu_mod_name}_UPLOAD_URL);
-		\$GLOBALS['xoopsTpl']->assign('{$table_name}_list', true);
 		// Table view
 		if (\${$table_name}_rows > 0) 
 		{						
@@ -124,7 +123,7 @@
 EOT;
 		}
 			$ret .= <<<EOT
-				\$GLOBALS['xoopsTpl']->append('{$table_name}', \${$lp_field_name});
+				\$GLOBALS['xoopsTpl']->append('{$table_name}_list', \${$lp_field_name});
                 unset(\${$lp_field_name});
 			}
 			if ( \${$table_name}_rows > \$limit ) {
@@ -145,14 +144,14 @@
 	*  @param string $table_name	
 	*  @param string $language
 	*/
-	public function getAdminPagesNew($table_name, $language) {  
+	public function getAdminPagesNew($module_name, $table_name, $language) {  
+		$stl_mod_name = strtolower($module_name);
 		$stu_table_name = strtoupper($table_name);
 		$ret = <<<EOT
-	case 'new':
-		\$template_main = 'admin_{$table_name}.tpl';
+	case 'new':		
+		\$template_main = '{$stl_mod_name}_{$table_name}.tpl';
         \$adminMenu->addItemButton({$language}{$stu_table_name}_LIST, '{$table_name}.php', 'list');
-        echo \$adminMenu->renderButton();
-		\$GLOBALS['xoopsTpl']->append('{$table_name}_list', false);
+        echo \$adminMenu->renderButton();		
 		// Get Form
         \${$table_name}Obj =& \${$table_name}Handler->create();
         \$form = \${$table_name}Obj->getForm();
@@ -226,15 +225,15 @@
 	*  @param string $table_name	
 	*  @param string $language
 	*/
-	public function getAdminPagesEdit($table_name, $language, $fpif) {  
+	public function getAdminPagesEdit($module_name, $table_name, $language, $fpif) {  
+		$stl_mod_name = strtolower($module_name);
 		$stu_table_name = strtoupper($table_name);
 		$ret = <<<EOT
-	case 'edit':
-	    \$template_main = 'admin_{$table_name}.tpl';
+	case 'edit':	    
+		\$template_main = '{$stl_mod_name}_{$table_name}.tpl';
         \$adminMenu->addItemButton({$language}ADD_{$stu_table_name}, '{$table_name}.php?op=new', 'add');
 		\$adminMenu->addItemButton({$language}{$stu_table_name}_LIST, '{$table_name}.php', 'list');
-        echo \$adminMenu->renderButton();
-		\$GLOBALS['xoopsTpl']->assign('{$table_name}_list', false);
+        echo \$adminMenu->renderButton();		
 		// Get Form
 		\${$table_name}Obj = \${$table_name}Handler->get(\$_REQUEST['{$fpif}']);
 		\$form = \${$table_name}Obj->getForm();
@@ -309,9 +308,9 @@
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .=	$this->getAdminPagesHeader($module_name, $table_name);
 		$content .=	$this->getAdminPagesList($module_name, $table_name, $table_fieldname, $language, $fields, $fpif, $fpmf);
-		$content .=	$this->getAdminPagesNew($table_name, $language);		
+		$content .=	$this->getAdminPagesNew($module_name, $table_name, $language);		
 		$content .=	$this->getAdminPagesSave($module_name, $table_name, $language, $fields, $fpif, $fpmf);
-		$content .=	$this->getAdminPagesEdit($table_name, $language, $fpif);
+		$content .=	$this->getAdminPagesEdit($module_name, $table_name, $language, $fpif);
 		$content .=	$this->getAdminPagesDelete($table_name, $language, $fpif, $fpmf);
 		$content .= $this->getAdminPagesFooter();
 		//

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php	2014-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -59,7 +59,8 @@
 		$stu_module_name = strtoupper($module_name);
 		$stl_module_name = strtolower($module_name);
 		$ret = <<<EOT
-include_once XOOPS_ROOT_PATH.'/modules/{$module_name}/include/functions.php';	
+include_once XOOPS_ROOT_PATH.'/modules/{$stl_module_name}/include/common.php';
+include_once XOOPS_ROOT_PATH.'/modules/{$stl_module_name}/include/functions.php';	
 function b_{$stl_module_name}_{$table_name}_show(\$options) 
 {
 	include_once XOOPS_ROOT_PATH.'/modules/{$stl_module_name}/class/{$table_name}.php';
@@ -131,7 +132,7 @@
 		$ret = <<<EOT
 function b_{$stl_module_name}_{$table_name}_edit(\$options) 
 {	
-	include_once XOOPS_ROOT_PATH.'/modules/{$stl_module_name}/class/{$table_name}.php';	
+    include_once XOOPS_ROOT_PATH.'/modules/{$stl_module_name}/class/{$table_name}.php';		
 	\${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$module_name}');
 	\$GLOBALS['xoopsTpl']->assign('{$stl_module_name}_upload_url', {$stu_module_name}_UPLOAD_URL);	
 	\$form = {$language}DISPLAY;
@@ -146,7 +147,7 @@
 	\$criteria->setSort('{$fpif}');
 	\$criteria->setOrder('ASC');
 	\${$table_name}_arr = \${$table_name}Handler->getAll(\$criteria);
-	unset(\$criteria)
+	unset(\$criteria);
 	\$form .= {$language}CATTODISPLAY."<br /><select name='options[]' multiple='multiple' size='5'>";
 	\$form .= "<option value='0' " . (array_search(0, \$options) === false ? "" : "selected='selected'") . ">" .{$language}ALLCAT . "</option>";
 	foreach (array_keys(\${$table_name}_arr) as \$i) {

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-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -280,7 +280,7 @@
 	 */
 	public function __construct(&\$db) 
 	{
-		parent::__construct(\$db, 'mod_{$module_name}_{$table_name}', '{$module_name}{$table_name}', '{$fpif}', '{$fpmf}');
+		parent::__construct(\$db, '{$module_name}_{$table_name}', '{$module_name}{$table_name}', '{$fpif}', '{$fpmf}');
 	}
 }
 EOT;

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/modinfo.php	2014-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/modinfo.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -56,11 +56,11 @@
 		$this->setFileName($filename);
 	}
 	/*
-	*  @public function getMain
+	*  @private function getMain
 	*  @param string $language
 	*  @param string $module	
 	*/
-	public function getMain($language, $module) {    
+	private function getMain($language, $module) {    
 		$ret = <<<EOT
 // Main
 define('{$language}NAME', "{$module->getVar('mod_name')}");
@@ -69,11 +69,11 @@
 		return $ret;
 	}
 	/*
-	*  @public function getMenu
+	*  @private function getMenu
 	*  @param string $language
 	*  @param array $tables
 	*/
-	public function getMenu($language, $table, $tables) {
+	private function getMenu($language, $table, $tables) {
 		$menu = 1;
 		$ret = <<<EOT
 // Admin Menu 
@@ -103,10 +103,10 @@
 		return $ret;
 	}
 	/*
-	*  @public function getAdmin
+	*  @private function getAdmin
 	*  @param string $language
 	*/
-	public function getAdmin($language) { 		
+	private function getAdmin($language) { 		
 		$ret = <<<EOT
 // Admin
 define('{$language}ADMINPAGER', "Admin pager");
@@ -115,11 +115,11 @@
 		return $ret;
 	}
 	/*
-	*  @public function getSubmenu
+	*  @private function getSubmenu
 	*  @param string $language
 	*  @param array $tables
 	*/
-	public function getSubmenu($language, $tables) { 		
+	private function getSubmenu($language, $tables) { 		
 		$ret = <<<EOT
 // Blocks\n
 EOT;
@@ -138,11 +138,11 @@
 		return $ret;
 	}
 	/*
-	*  @public function getBlocks
+	*  @private function getBlocks
 	*  @param string $language
 	*  @param array $tables
 	*/
-	public function getBlocks($language, $tables) { 		
+	private function getBlocks($language, $tables) { 		
 		$ret = <<<EOT
 // Blocks\n
 EOT;
@@ -160,10 +160,10 @@
 		return $ret;
 	}
 	/*
-	*  @public function getUser
+	*  @private function getUser
 	*  @param string $language
 	*/
-	public function getUser($language) { 		
+	private function getUser($language) { 		
 		$ret = <<<EOT
 // User
 define('{$language}USERPAGER', "User pager");
@@ -172,11 +172,11 @@
 		return $ret;
 	}
 	/*
-	*  @public function getConfig
+	*  @private function getConfig
 	*  @param string $language
 	*  @param string $table_image
 	*/
-	public function getConfig($language, $table) {    
+	private function getConfig($language, $table) {    
 		$ret = <<<EOT
 // Config
 define('{$language}EDITOR', "Editor");
@@ -206,11 +206,11 @@
 		return $ret;
 	}
 	/*
-	*  @public function getNotifications
+	*  @private function getNotifications
 	*  @param string $language
 	*  @param mixed $table
 	*/
-	public function getNotifications($language) {    
+	private function getNotifications($language) {    
 		$ret = <<<EOT
 // Notifications
 define('{$language}GLOBAL_NOTIFY', "Allow Facebook comments in the form");
@@ -255,10 +255,10 @@
 		return $ret;
 	}
 	/*
-	*  @public function getPermissions
+	*  @private function getPermissions
 	*  @param string $language
 	*/
-	public function getPermissions($language) {    
+	private function getPermissions($language) {    
 		$ret = <<<EOT
 // Permissions Groups
 define('{$language}GROUPS', "Groups access");
@@ -281,9 +281,13 @@
 		$language = $this->getLanguage($module_name, 'MI');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= $this->getMain($language, $module);			
-		$content .= $this->getAdmin($language);		
-		$content .= $this->getUser($language);		
 		if (is_object($table)) {
+			if ( $table->getVar('table_admin') == 1 ) {
+				$content .= $this->getAdmin($language);	
+			}
+			if ( $table->getVar('table_user') == 1 ) {
+				$content .= $this->getUser($language);		
+			}
 			if ( $table->getVar('table_submenu') == 1 ) {
 				$content .= $this->getSubmenu($language, $tables);
 			}

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-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -85,7 +85,7 @@
 			</tr>
 		</thead>		
 		<tbody>
-			<{foreach item={$table_fieldname} from=\${$table_name}}>	
+			<{foreach item={$table_fieldname} from=\${$table_name}_list}>	
 				<tr class="<{cycle values='odd, even'}>">\n
 EOT;
 		foreach(array_keys($fields) as $f) 
@@ -121,20 +121,21 @@
 				</tr>
 			<{/foreach}>
 		</tbody>
-	</table>
-	<!-- Display navigation -->
+	</table>	
 	<div class="clear">&nbsp;</div>
-	<{if \$pagenav}><br /><div class="xo-pagenav floatright"><{\$pagenav}></div><div class="clear spacer"></div><{/if}>
+	<{if \$pagenav}><br />
+		<!-- Display navigation -->
+	    <div class="xo-pagenav floatright"><{\$pagenav}></div><div class="clear spacer"></div>
+	<{/if}>
 	<{if \$error}>
-	<div class="errorMsg">
-		<strong><{\$error}></strong>
-	</div>
+		<div class="errorMsg">
+			<strong><{\$error}></strong>
+		</div>
 	<{/if}>
-<{else}>
+<{/if}>
+<{if \$form}>
 	<!-- Display form (add,edit) -->
-	<{if \$form}>
 	<div class="spacer"><{\$form}></div>
-	<{/if}>	
 <{/if}>
 <br />
 <!-- Footer -->

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/index.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/index.php	2014-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/index.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -64,7 +64,7 @@
 		$content = $this->getHeaderFilesComments($module, $filename);	
 		$content .= <<<EOT
 \ninclude_once 'header.php';
-\$xoopsOption['template_main'] = 'user_index.tpl';
+\$xoopsOption['template_main'] = '{$stl_mod_name}_index.tpl';
 include_once XOOPS_ROOT_PATH.'/header.php';
 // Define Stylesheet
 \$xoTheme->addStylesheet( \$style );

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php	2014-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -129,7 +129,7 @@
 		$content = $this->getHeaderFilesComments($module, $filename);	
 		$content .= <<<EOT
 \ninclude_once 'header.php';
-\$xoopsOption['template_main'] = 'user_{$table_name}.tpl';	
+\$xoopsOption['template_main'] = '{$stl_mod_name}_{$table_name}.tpl';	
 include_once XOOPS_ROOT_PATH . '/header.php';
 \$start = {$stl_mod_name}_CleanVars( \$_REQUEST, 'start', 0);
 \$limit = xoops_getModuleOption('userpager', \$dirname);

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-06-25 08:46:21 UTC (rev 12646)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/xoopsversion.php	2014-06-25 19:02:35 UTC (rev 12647)
@@ -202,7 +202,7 @@
 			foreach (array_keys($tables) as $t)	
 			{
 				$ret .= <<<EOT
-\$modversion['tables'][{$n}] = "mod_{$stl_mod_name}_{$tables[$t]->getVar('table_name')}";\n
+\$modversion['tables'][{$n}] = "{$stl_mod_name}_{$tables[$t]->getVar('table_name')}";\n
 EOT;
 				$n++;
 			}  
@@ -221,7 +221,7 @@
 		$ret = '';
 		if ( $module->getVar('mod_search') == 1 ) {
 			$ret .= <<<EOT
-//Search
+// Search
 \$modversion['hasSearch'] = 1;
 \$modversion['search']['file'] = "include/search.inc.php";
 \$modversion['search']['func'] = "{$stl_mod_name}_search";\n
@@ -367,7 +367,10 @@
 		$module_name = $module->getVar('mod_name');
 		$stl_mod_name = strtolower($module_name);				
 		$ret = <<<EOT
-// Config
+// ------------------- Config -------------------\n
+EOT;
+        $ret .= <<<EOT
+// Editor
 xoops_load('xoopseditorhandler');
 \$editor_handler = XoopsEditorHandler::getInstance();
 \$modversion['config'][] = array(
@@ -414,7 +417,7 @@
     'default' => \$admin_groups);\n\n
 EOT;
 		}		
-		$key = implode(', ', $this->getKeywords());
+		$keyword = implode(', ', $this->getKeywords());
 		$ret .= <<<EOT
 \$modversion['config'][] = array(
     'name' => "keywords",
@@ -422,7 +425,7 @@
     'description' => "{$language}KEYWORDS_DESC",
     'formtype' => "textbox",
     'valuetype' => "text",
-    'default' => "{$stl_mod_name}, {$key}");\n
+    'default' => "{$stl_mod_name}, {$keyword}");\n
 EOT;
 		unset($this->keywords);
 		if ($table->getVar('table_name') != '')