Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12675] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-07-05 08:07:20
|
Revision: 12675
http://sourceforge.net/p/xoops/svn/12675
Author: txmodxoops
Date: 2014-07-05 08:07:11 +0000 (Sat, 05 Jul 2014)
Log Message:
-----------
- Fixed bugs
- Updated
- Still work to do
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.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/classes/formelements.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-07-04 09:29:45 UTC (rev 12674)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/fields.php 2014-07-05 08:07:11 UTC (rev 12675)
@@ -23,13 +23,13 @@
$op = XoopsRequest::getString('op', 'list');
// Get fields Variables
$field_mid = TDMCreate_CleanVars($_REQUEST, 'field_mid');
-$field_tid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
-$field_numb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
-$field_name = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');/**/
+$fieldTid = TDMCreate_CleanVars($_REQUEST, 'field_tid');
+$fieldNumb = TDMCreate_CleanVars($_REQUEST, 'field_numb');
+$fieldName = TDMCreate_CleanVars($_REQUEST, 'field_name', '', 'string');/**/
/*$field_mid = XoopsRequest::getInt('field_mid');
-$field_tid = XoopsRequest::getInt('field_tid');
-$field_numb = XoopsRequest::getInt('field_numb');
-$field_name = XoopsRequest::getString('field_name', ''); */
+$fieldTid = XoopsRequest::getInt('field_tid');
+$fieldNumb = XoopsRequest::getInt('field_numb');
+$fieldName = XoopsRequest::getString('field_name', ''); */
//
switch ($op)
{
@@ -144,13 +144,13 @@
$GLOBALS['xoopsTpl']->assign('buttons', $adminMenu->renderButton());
// Form Add
$fieldsObj =& $tdmcreate->getHandler('fields')->create();
- $form = $fieldsObj->getFormNew($field_mid, $field_tid, $field_numb, $field_name);
+ $form = $fieldsObj->getFormNew($field_mid, $fieldTid, $fieldNumb, $fieldName);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
// Test -> Will be removed
var_dump($field_mid);
- var_dump($field_tid);
- var_dump($field_numb);
- var_dump($field_name);
+ var_dump($fieldTid);
+ var_dump($fieldNumb);
+ var_dump($fieldName);
break;
case 'save':
@@ -172,11 +172,11 @@
$fieldsObj =& $fields->get($value);
break;
}
- if (isset($field_mid) && isset($field_tid) && !empty($_POST['field_name'][$key])) {
+ if (isset($field_mid) && isset($fieldTid) && !empty($_POST['field_name'][$key])) {
// Set Data
$fieldsObj->setVar( 'field_mid', $field_mid );
- $fieldsObj->setVar( 'field_tid', $field_tid );
- $fieldsObj->setVar( 'field_numb', $field_numb );
+ $fieldsObj->setVar( 'field_tid', $fieldTid );
+ $fieldsObj->setVar( 'field_numb', $fieldNumb );
$fieldsObj->setVar( 'field_name', (isset($_POST['field_name'][$key]) ? $_POST['field_name'][$key] : '') );
$fieldsObj->setVar( 'field_type', (isset($_POST['field_type'][$key]) ? $_POST['field_type'][$key] : '') );
$fieldsObj->setVar( 'field_value', (isset($_POST['field_value'][$key]) ? $_POST['field_value'][$key] : '') );
@@ -199,14 +199,14 @@
}
}
// Get table name from field table id
- $tables =& $tdmcreate->getHandler('tables')->get($field_tid);
+ $tables =& $tdmcreate->getHandler('tables')->get($fieldTid);
$table_name = $tables->getVar('table_name');
// Set field elements
if ($fieldsObj->isNew()) {
// Fields Elements Handler
$fieldelementObj =& $tdmcreate->getHandler('fieldelements')->create();
$fieldelementObj->setVar( 'fieldelement_mid', $field_mid );
- $fieldelementObj->setVar( 'fieldelement_tid', $field_tid );
+ $fieldelementObj->setVar( 'fieldelement_tid', $fieldTid );
$fieldelementObj->setVar( 'fieldelement_name', 'Table : '.ucfirst($table_name) );
$fieldelementObj->setVar( 'fieldelement_value', 'XoopsFormTables-'.ucfirst($table_name) );
// Insert new field element id for table name
@@ -219,7 +219,7 @@
}
//
$GLOBALS['xoopsTpl']->assign('error', $fieldsObj->getHtmlErrors());
- $form = $fieldsObj->getForm(null, $field_tid);
+ $form = $fieldsObj->getForm(null, $fieldTid);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
break;
@@ -234,10 +234,10 @@
// Form Edit
$field_id = XoopsRequest::getInt('field_id');
$fieldsObj = $tdmcreate->getHandler('fields')->get( $field_id );
- $form = $fieldsObj->getFormEdit($field_mid, $field_tid);
+ $form = $fieldsObj->getFormEdit($field_mid, $fieldTid);
$GLOBALS['xoopsTpl']->assign('form', $form->render());
// Test -> Will be removed
- var_dump($field_tid);
+ var_dump($fieldTid);
break;
case 'drag':
@@ -273,7 +273,7 @@
case 'display':
// Get the list of fields
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_tid', $field_tid));
+ $criteria->add(new Criteria('field_tid', $fieldTid));
$fields = $tdmcreate->getHandler('fields')->getObjects($criteria);
$fieldsObj =& $tdmcreate->getHandler('fields')->get($field_id);
if (isset($_GET['field_tid'])) {
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-04 09:29:45 UTC (rev 12674)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php 2014-07-05 08:07:11 UTC (rev 12675)
@@ -45,7 +45,6 @@
/*
* @public function write
* @param string $module
- * @param mixed $table
* @param mixed $tables
* @param string $filename
*/
@@ -55,23 +54,55 @@
$this->setFileName($filename);
}
/*
- * @private function getAdminMenuPath
+ * @private function getAdminMenuHeader
+ * @param null
+ */
+ private function getAdminMenuHeader() {
+ $ret = <<<EOT
+\$dirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+\$module_handler =& xoops_gethandler('module');
+\$xoopsModule =& XoopsModule::getByDirname(\$dirname);
+\$moduleInfo =& \$module_handler->get(\$xoopsModule->getVar('mid'));
+\$sysPathIcon32 = \$moduleInfo->getInfo('sysicons32');\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @private function getAdminMenuDashboard
+ * @param string $language
+ * @param integer $menu
+ */
+ private function getAdminMenuDashboard($language, $menu) {
+ $ret = <<<EOT
+\$i = 1;
+\$adminmenu[\$i]['title'] = {$language}{$menu};
+\$adminmenu[\$i]['link'] = 'admin/index.php';
+\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/dashboard.png';
+\$i++;\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @private function getAdminMenuImagesPath
* @param array $tables
* @param integer $t
*/
- private function getAdminMenuPath($tables, $t) {
+ private function getAdminMenuImagesPath($tables, $t) {
$fields = $this->getTableFields($tables[$t]->getVar('table_id'));
foreach (array_keys($fields) as $f)
{
$fieldElement = $fields[$f]->getVar('field_element');
- if( ($fieldElement == 9) || ( $fieldElement != 10 ) ) {
- $ret = <<<EOT
+ switch( $fieldElement ) {
+ case 10:
+ $ret = <<<EOT
+\$adminmenu[\$i]['icon'] = 'assets/images/icons/32/{$tables[$t]->getVar('table_image')}';\n
+EOT;
+ break;
+ default:
+ $ret = <<<EOT
\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/{$tables[$t]->getVar('table_image')}';\n
EOT;
- } elseif( $fieldElement == 10 ) {
- $ret = <<<EOT
-\$adminmenu[\$i]['icon'] = 'assets/images/icons/32/{$tables[$t]->getVar('table_image')}';\n
-EOT;
+ break;
}
}
return $ret;
@@ -88,19 +119,8 @@
$language = $this->getLanguage($moduleDirname, 'MI', 'ADMENU');
$menu = 1;
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= <<<EOT
-\$dirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-\$module_handler =& xoops_gethandler('module');
-\$xoopsModule =& XoopsModule::getByDirname(\$dirname);
-\$moduleInfo =& \$module_handler->get(\$xoopsModule->getVar('mid'));
-\$sysPathIcon32 = \$moduleInfo->getInfo('sysicons32');
-\$adminmenu = array();
-\$i = 1;
-\$adminmenu[\$i]['title'] = {$language}{$menu};
-\$adminmenu[\$i]['link'] = 'admin/index.php';
-\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/dashboard.png';
-\$i++;\n
-EOT;
+ $content .= $this->getAdminMenuHeader();
+ $content .= $this->getAdminMenuDashboard($language, $menu);
foreach (array_keys($tables) as $t)
{
$tablePermissions = $tables[$t]->getVar('table_permissions');
@@ -109,9 +129,10 @@
$menu++;
$content .= <<<EOT
\$adminmenu[\$i]['title'] = {$language}{$menu};
-\$adminmenu[\$i]['link'] = 'admin/{$tables[$t]->getVar('table_name')}.php';\n
+\$adminmenu[\$i]['link'] = 'admin/{$tables[$t]->getVar('table_name')}.php';
+\$adminmenu[\$i]['icon'] = \$sysPathIcon32.'/{$tables[$t]->getVar('table_image')}';\n
EOT;
- $content .= $this->getAdminMenuPath($tables, $t);
+ //$content .= $this->getAdminMenuImagesPath($tables, $t);
$content .= <<<EOT
\$i++;\n
EOT;
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-07-04 09:29:45 UTC (rev 12674)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php 2014-07-05 08:07:11 UTC (rev 12675)
@@ -167,10 +167,10 @@
\$adminMenu->addItemButton({$language}{$stu_table_name}_LIST, '{$tableName}.php', 'list');
\$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
\$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());
- // Get Form
+ // Get Form
\${$tableName}Obj =& \${$tableName}Handler->create();
\$form = \${$tableName}Obj->getForm();
- \$form->display();
+ \$GLOBALS['xoopsTpl']->assign('form', \$form->render());
break;\n
EOT;
return $ret;
@@ -234,9 +234,9 @@
redirect_header('{$tableName}.php?op=list', 2, {$language}FORMOK);
}
// Get Form
- echo \${$tableName}Obj->getHtmlErrors();
+ \$GLOBALS['xoopsTpl']->assign('error', \${$tableName}Obj->getHtmlErrors());
\$form =& \${$tableName}Obj->getForm();
- \$form->display();
+ \$GLOBALS['xoopsTpl']->assign('form', \$form->render());
break;\n
EOT;
return $ret;
@@ -263,7 +263,7 @@
// Get Form
\${$tableName}Obj = \${$tableName}Handler->get(\$_REQUEST['{$fpif}']);
\$form = \${$tableName}Obj->getForm();
- \$form->display();
+ \$GLOBALS['xoopsTpl']->assign('form', \$form->render());
break;\n
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-04 09:29:45 UTC (rev 12674)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/formelements.php 2014-07-05 08:07:11 UTC (rev 12675)
@@ -136,7 +136,7 @@
private function getXoopsFormUploadFile($language, $moduleDirname, $fieldName, $required = 'false') {
$ret = <<<EOT
// Form file
- \$form->addElement( new XoopsFormFile({$language}, '{$fieldName}', \$this->{$moduleDirname}->getConfig('maxsize')){$required} );\n
+ \$form->addElement( new XoopsFormFile({$language}FORM_UPLOAD_FILE, '{$fieldName}', \$this->{$moduleDirname}->getConfig('maxsize')){$required} );\n
EOT;
return $ret;
}
@@ -171,7 +171,7 @@
\$imgtray1->addElement( new XoopsFormLabel( '', "<br /><img src='".XOOPS_URL."/".\$iconsdirectory."/".\${$fieldName}."' name='image1' id='image1' alt='' />" ) );
// Form File
\$fileseltray = new XoopsFormElementTray('','<br />');
- \$fileseltray->addElement(new XoopsFormFile({$language}FORMUPLOADIMAGELIST , 'attachedfile', \$this->{$moduleDirname}->getConfig('maxsize')));
+ \$fileseltray->addElement(new XoopsFormFile({$language}FORM_UPLOAD_IMAGE_LIST , 'attachedfile', \$this->{$moduleDirname}->getConfig('maxsize')));
\$fileseltray->addElement(new XoopsFormLabel(''));
\$imgtray1->addElement(\$fileseltray);
\$form->addElement( \$imgtray1{$required} );\n
@@ -187,11 +187,8 @@
private function getXoopsFormUploadImage($language, $moduleDirname, $required = 'false') {
$ret = <<<EOT
// Form Upload Image
- \$fileseltray1 = new XoopsFormElementTray('','<br />');
- \$fileseltray1->addElement(new XoopsFormFile({$language}FORMUPLOADIMAGE , 'attachedfile', \$this->{$moduleDirname}->getConfig('maxsize')));
- \$fileseltray1->addElement(new XoopsFormLabel(''));
- \$imgtray1->addElement(\$fileseltray1);
- \$form->addElement( \$imgtray1{$required} );\n
+ \$formImage = new XoopsFormFile({$language}FORM_UPLOAD_IMAGE , 'attachedfile', \$this->{$moduleDirname}->getConfig('maxsize'));
+ \$form->addElement( \$formImage{$required} );\n
EOT;
return $ret;
}
@@ -383,7 +380,7 @@
$ret .= $this->getXoopsFormImageList($language_funct, $moduleDirname, $tableName, $fieldName, $required);
break;
case 10:
- $ret .= $this->getXoopsFormUploadImage($language, $moduleDirname, $tableName, $fieldName, $required);
+ $ret .= $this->getXoopsFormUploadImage($language_funct, $moduleDirname, $required);
break;
case 11:
$ret .= $this->getXoopsFormUploadFile($language, $moduleDirname, $fieldName, $required);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php 2014-07-04 09:29:45 UTC (rev 12674)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php 2014-07-05 08:07:11 UTC (rev 12675)
@@ -156,12 +156,31 @@
$fields = $this->getTableFields($tableId);
foreach(array_keys($fields) as $f)
{
- $field_name = $fields[$f]->getVar('field_name');
- $stu_field_name = strtoupper($field_name);
- $field_name_desc = ucfirst(str_replace('_', ' ', $field_name));
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ $stu_field_name = strtoupper($fieldName);
+ $fieldNameDesc = ucfirst(str_replace('_', ' ', $fieldName));
$ret .= <<<EOT
-define('{$language}{$stu_field_name}', "{$field_name_desc}");\n
+define('{$language}{$stu_field_name}', "{$fieldNameDesc}");\n
EOT;
+ switch($fieldElement)
+ {
+ case 9:
+ $ret .= <<<EOT
+define('{$language}FORM_UPLOAD_IMAGE_LIST', "{$fieldNameDesc} in list");\n
+EOT;
+ break;
+ case 10:
+ $ret .= <<<EOT
+define('{$language}FORM_UPLOAD_IMAGE', "{$fieldNameDesc} in upload");\n
+EOT;
+ break;
+ case 11:
+ $ret .= <<<EOT
+define('{$language}FORM_UPLOAD_FILE', "{$fieldNameDesc} in upload");\n
+EOT;
+ break;
+ }
}
}
$ret .= <<<EOT
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-07-04 09:29:45 UTC (rev 12674)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php 2014-07-05 08:07:11 UTC (rev 12675)
@@ -241,7 +241,8 @@
<strong><{\$error}></strong>
</div>
<{/if}>
-<{else}>
+<{/if}>
+<{if \$form}>
<!-- Display form (add,edit) -->
<div class="spacer"><{\$form}></div>
<{/if}>
|
