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

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

Revision: 12670
          http://sourceforge.net/p/xoops/svn/12670
Author:   txmodxoops
Date:     2014-07-02 16:54:58 +0000 (Wed, 02 Jul 2014)
Log Message:
-----------
 - Fixed bugs 
 - Updated
 - Still work to do

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/formelements.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php

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-07-02 16:00:01 UTC (rev 12669)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php	2014-07-02 16:54:58 UTC (rev 12670)
@@ -142,6 +142,10 @@
 class {$ucf_module_dirname}{$ucf_table_name} extends XoopsObject
 { 
 	/*
+	* @var mixed
+	*/
+	private {$module_dirname} = null;
+	/*
 	 * Constructor
 	 *
 	 * @param null
@@ -188,12 +192,12 @@
 		if (\$action === false) {
 			\$action = \$_SERVER['REQUEST_URI'];
 		}
-	
+		// Title
 		\$title = \$this->isNew() ? sprintf({$language}{$stu_table_name}_ADD) : sprintf({$language}{$stu_table_name}_EDIT);
-
+		// Get Theme Form
 		xoops_load('XoopsFormLoader');
 		\$form = new XoopsThemeForm(\$title, 'form', \$action, 'post', true);
-		\$form->setExtra('enctype="multipart/form-data"');\n		
+		\$form->setExtra('enctype="multipart/form-data"');		
 {$this->formelements->renderElements()}
 EOT;
 		return $ret;

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-02 16:00:01 UTC (rev 12669)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/formelements.php	2014-07-02 16:54:58 UTC (rev 12670)
@@ -58,7 +58,9 @@
 	*  @param string $required
 	*/
 	private function getXoopsFormText($language, $field_name, $required = 'false') {    
+		
 		$ret = <<<EOT
+		// Form Text {$field_name}
 		\$form->addElement( new XoopsFormText({$language}, '{$field_name}', 50, 255, \$this->getVar('{$field_name}')){$required} );\n
 EOT;
 		return $ret;
@@ -71,6 +73,7 @@
 	*/
 	private function getXoopsFormTextArea($language, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form Text Area
 		\$form->addElement( new XoopsFormTextArea({$language}, '{$field_name}', \$this->getVar('{$field_name}'), 4, 47){$required} );\n
 EOT;
 		return $ret;
@@ -84,6 +87,7 @@
 	*/
 	private function getXoopsFormDhtmlTextArea($language, $module_dirname, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form Dhtml Text Area
 		\$editor_configs = array();
 		\$editor_configs['name'] = '{$field_name}';
 		\$editor_configs['value'] = \$this->getVar('{$field_name}', 'e');
@@ -104,6 +108,7 @@
 	*/
 	private function getXoopsFormCheckBox($language, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form Check Box
 		\${$field_name} = \$this->isNew() ? 0 : \$this->getVar('{$field_name}');
 		\$check_{$field_name} = new XoopsFormCheckBox({$language}, '{$field_name}', \${$field_name});
 		\$check_{$field_name}->addOption(1, " ");
@@ -117,6 +122,7 @@
 	*/
 	private function getXoopsFormHidden($field_name) {    
 		$ret = <<<EOT
+		// Form Hidden
 		\$form->addElement( new XoopsFormHidden('{$field_name}', \$this->getVar('{$field_name}')) );\n
 EOT;
 		return $ret;
@@ -129,6 +135,7 @@
 	*/
 	private function getXoopsFormUploadFile($language, $module_dirname, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form file
 		\$form->addElement( new XoopsFormFile({$language}, '{$field_name}', \$this->{$module_dirname}->getConfig('maxsize')){$required} );\n
 EOT;
 		return $ret;
@@ -143,25 +150,17 @@
 	private function getXoopsFormUploadImage($language, $module_dirname, $table_name, $field_name, $required = 'false') {		
 		$stu_field_name = strtoupper($field_name);
 		$ret = <<<EOT
-		//\$form->addElement(new XoopsFormImage({$language}, '{$field_name}', \$this->{$module_dirname}->getConfig('maxsize')){$required});
+		// Form image file
 		\$get_{$field_name} = \$this->getVar('{$field_name}');
 		\${$field_name} = \$get_{$field_name} ? \$get_{$field_name} : 'blank.gif';
 		\$iconsdir = '/Frameworks/moduleclasses/icons/32';
 		\$uploads_dir = '/uploads/'.\$GLOBALS['xoopsModule']->dirname().'/images/{$table_name}';
-        if(is_dir(XOOPS_ROOT_PATH . \$iconsdir)){
-		    \$iconsdirectory = \$iconsdir;
-		}else{
-		    \$iconsdirectory = \$uploads_dir;
-		}
+        \$iconsdirectory = is_dir(XOOPS_ROOT_PATH . \$iconsdir) ? \$iconsdir : \$uploads_dir;		
         //		
-		\$imgtray1 = new XoopsFormElementTray({$language}{$stu_field_name},'<br />');
-		if(is_dir(XOOPS_ROOT_PATH . \$iconsdir)) {
-		    \$imgpath = sprintf({$language}FORMIMAGE_PATH, ".{\$iconsdir}/");
-		}else{
-		    \$imgpath = sprintf({$language}FORMIMAGE_PATH, \$uploads_dir);
-		}
-		\$imgpath1 = sprintf({$language}FORMIMAGE_PATH, ".{\$iconsdirectory}/");
-		\$imageselect1 = new XoopsFormSelect(\$imgpath1, '{$field_name}', \${$field_name}, 10);
+		\$imgtray1 = new XoopsFormElementTray({$language}{$stu_field_name},'<br />');		
+		\$imgpath = is_dir(XOOPS_ROOT_PATH . \$iconsdir) ? sprintf({$language}FORMIMAGE_PATH, ".{\$iconsdir}/") : sprintf({$language}FORMIMAGE_PATH, \$uploads_dir);
+		//\$imgpath1 = sprintf({$language}FORMIMAGE_PATH, ".{\$iconsdirectory}/");
+		\$imageselect1 = new XoopsFormSelect(\$imgpath, '{$field_name}', \${$field_name}, 10);
 		\$image_array1 = XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH . \$iconsdirectory );
 		foreach( \$image_array1 as \$image1 ) {
 			\$imageselect1->addOption("{\$image1}", \$image1);
@@ -169,6 +168,7 @@
 		\$imageselect1->setExtra( "onchange='showImgSelected(\"image1\", \"{$field_name}\", \"".\$iconsdirectory."\", \"\", \"".XOOPS_URL."\")'" );
 		\$imgtray1->addElement(\$imageselect1, false);
 		\$imgtray1->addElement( new XoopsFormLabel( '', "<br /><img src='".XOOPS_URL."/".\$iconsdirectory."/".\${$field_name}."' name='image1' id='image1' alt='' />" ) );		
+		// Form File
 		\$fileseltray1 = new XoopsFormElementTray('','<br />');
 		\$fileseltray1->addElement(new XoopsFormFile({$language}FORMUPLOAD , 'attachedfile', \$this->{$module_dirname}->getConfig('maxsize')));
 		\$fileseltray1->addElement(new XoopsFormLabel(''));
@@ -185,6 +185,7 @@
 	*/
 	private function getXoopsFormColorPicker($language, $module_dirname, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form Color Picker
 		\$form->addElement( new XoopsFormColorPicker({$language}, '{$field_name}', \$this->{$module_dirname}->getConfig('maxsize')){$required} );\n
 EOT;
 		return $ret;
@@ -198,6 +199,7 @@
 	*/
 	private function getXoopsFormSelect($language, $table_name, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form Select
 		\${$field_name}_select = new XoopsFormSelect({$language}, '{$field_name}', \$this->getVar('{$field_name}'));
 		\${$field_name}_select->addOption('Empty'); 
 		\${$field_name}_select->addOptionArray({$table_name}Handler->getList()); 
@@ -213,6 +215,7 @@
 	*/
 	private function getXoopsFormSelectUser($language, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form Select User
 		\$form->addElement( new XoopsFormSelectUser({$language}, '{$field_name}', false, \$this->getVar('{$field_name}'), 1, false){$required} );\n
 EOT;
 		return $ret;
@@ -225,6 +228,7 @@
 	*/
 	private function getXoopsFormRadioYN($language, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form Radio Yes/No
 		${$field_name} = \$this->isNew() ? 0 : \$this->getVar('{$field_name}');
 		\$form->addElement( new XoopsFormRadioYN({$language}, '{$field_name}', ${$field_name}){$required} );\n
 EOT;
@@ -238,6 +242,7 @@
 	*/
 	private function getXoopsFormTextDateSelect($language, $module_dirname, $field_name, $required = 'false') {    
 		$ret = <<<EOT
+		// Form Text Date Select
 		\$form->addElement( new XoopsFormTextDateSelect({$language}, '{$field_name}', '', \$this->getVar('{$field_name}')){$required} );\n
 EOT;
 		return $ret;
@@ -260,6 +265,7 @@
 			}						
 		}
 		$ret = <<<EOT
+		// Form Table
 		\${$table_name}Handler =& \$this->{$module_dirname}->getHandler('{$table_name}');				
 		\${$field_name}_select = new XoopsFormSelect({$language}, '{$field_name}', \$this->getVar('{$field_name}'));
 		\${$field_name}_select->addOptionArray(\${$field_name}Handler->getList());
@@ -278,6 +284,7 @@
 	private function getXoopsFormTopic($language, $module_dirname, $table, $fields, $required = 'false') 
 	{    
 		$table_name = $table->getVar('table_name');
+		$ucf_table_name = ucfirst($table_name);
 		foreach(array_keys($fields) as $f) 
 		{	
 			$field_name = $fields[$f]->getVar('field_name');			
@@ -292,6 +299,7 @@
 			}			
 		}
 		$ret = <<<EOT
+		// Form Topic {$ucf_table_name}
 		include_once(XOOPS_ROOT_PATH . '/class/tree.php');				
 		\${$table_name}Handler = \$this->{$module_dirname}->getHandler('{$table_name}');
 		\$criteria = new CriteriaCompo();

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php	2014-07-02 16:00:01 UTC (rev 12669)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php	2014-07-02 16:54:58 UTC (rev 12670)
@@ -420,5 +420,5 @@
 $modversion['config'][$i]['description'] = "";
 $modversion['config'][$i]['formtype'] = "textbox";
 $modversion['config'][$i]['valuetype'] = "text";
-$modversion['config'][$i]['default'] = '12662';
+$modversion['config'][$i]['default'] = '12670';
 unset($i);
\ No newline at end of file