Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13054] XoopsModules/TDMCreate/branches/timgno/1.91a2 /tdmcreate
|
From: <txm...@us...> - 2015-05-03 12:51:27
|
Revision: 13054
http://sourceforge.net/p/xoops/svn/13054
Author: txmodxoops
Date: 2015-05-03 12:51:24 +0000 (Sun, 03 May 2015)
Log Message:
-----------
Added field table_solename in tables to distinguish the singular name from the plural to the singular name.
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserObjects.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/admin/tables.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -171,10 +171,11 @@
$tablesObj->setVars(array(
'table_mid' => $tableMid,
'table_name' => $_POST['table_name'],
+ 'table_solename' => $_POST['table_solename'],
'table_category' => ((1 == $_REQUEST['table_category']) ? 1 : 0),
+ 'table_fieldname' => $tableFieldname,
'table_nbfields' => $tableNumbFields,
- 'table_order' => $order,
- 'table_fieldname' => $tableFieldname));
+ 'table_order' => $order));
//Form table_image
include_once XOOPS_ROOT_PATH . '/class/uploader.php';
$uploaddir = is_dir(XOOPS_ICONS32_PATH) ? XOOPS_ICONS32_PATH : TDMC_UPLOAD_IMGTAB_PATH;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -244,7 +244,6 @@
$modId = $module->getVar('mod_id');
$moduleDirname = $module->getVar('mod_dirname');
$uploadTablesIcons32 = $this->structure->getUploadPath() . '/images/tables';
- $framePathIcon32 = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32';
$icon32 = 'assets/icons/32';
// Id of tables
$criteriaTables = new CriteriaCompo();
@@ -271,7 +270,7 @@
// Copy of tables images file
if (file_exists($uploadTableImage = $uploadTablesIcons32 . '/' . $tableImage)) {
$this->structure->copyFile($icon32, $uploadTableImage, $tableImage);
- } elseif (file_exists($uploadTableImage = $framePathIcon32 . '/' . $tableImage)) {
+ } elseif (file_exists($uploadTableImage = XOOPS_ICONS32_PATH . '/' . $tableImage)) {
$this->structure->copyFile($icon32, $uploadTableImage, $tableImage);
}
// Creation of admin files
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -96,7 +96,8 @@
switch (\$op)
{\n
EOT;
- return $ret;
+
+ return $ret;
}
/*
@@ -111,13 +112,16 @@
* @param $fpmf
* @return string
*/
- public function getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fieldInForm, $fpmf)
+ public function getAdminPagesList($moduleDirname, $table, $language, $fields, $fpif, $fieldInForm, $fpmf)
{
$stuModuleDirname = strtoupper($moduleDirname);
$tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
+ $tableFieldname = $table->getVar('table_fieldname');
+ $stuTableName = strtoupper($tableName);
+ $stuTableSoleName = strtoupper($tableSoleName);
+ $stuTableFieldname = strtoupper($tableFieldname);
$tableAutoincrement = $table->getVar('table_autoincrement');
- $stuTableName = strtoupper($tableName);
- $stuTableFieldname = strtoupper($tableFieldname);
$ret = <<<EOT
case 'list':
default:
@@ -128,7 +132,7 @@
EOT;
if (1 == $fieldInForm) {
$ret .= <<<EOT
- \$adminMenu->addItemButton({$language}ADD_{$stuTableFieldname}, '{$tableName}.php?op=new', 'add');
+ \$adminMenu->addItemButton({$language}ADD_{$stuTableSoleName}, '{$tableName}.php?op=new', 'add');
\$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());\n
EOT;
}
@@ -153,7 +157,7 @@
$fieldName = $fields[$f]->getVar('field_name');
$fieldParent = $fields[$f]->getVar('field_parent');
// Verify if table_fieldname is not empty
- $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
+ $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableSoleName;
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
//
$fieldElement = $fields[$f]->getVar('field_element');
@@ -219,7 +223,8 @@
}
break;\n
EOT;
- return $ret;
+
+ return $ret;
}
/*
@@ -244,7 +249,8 @@
\$GLOBALS['xoopsTpl']->assign('form', \$form->render());
break;\n
EOT;
- return $ret;
+
+ return $ret;
}
/*
@@ -312,7 +318,8 @@
\$GLOBALS['xoopsTpl']->assign('form', \$form->render());
break;\n
EOT;
- return $ret;
+
+ return $ret;
}
/*
@@ -324,14 +331,18 @@
* @param string $fpif
* @return string
*/
- public function getAdminPagesEdit($moduleDirname, $tableName, $tableFieldname, $language, $fpif)
+ public function getAdminPagesEdit($moduleDirname, $table, $language, $fpif)
{
- $stuTableName = strtoupper($tableName);
+ $tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
+ $tableFieldname = $table->getVar('table_fieldname');
+ $stuTableName = strtoupper($tableName);
+ $stuTableSoleName = strtoupper($tableSoleName);
$stuTableFieldname = strtoupper($tableFieldname);
$ret = <<<EOT
case 'edit':
\$template_main = '{$moduleDirname}_admin_{$tableName}.tpl';
- \$adminMenu->addItemButton({$language}ADD_{$stuTableFieldname}, '{$tableName}.php?op=new', 'add');
+ \$adminMenu->addItemButton({$language}ADD_{$stuTableSoleName}, '{$tableName}.php?op=new', 'add');
\$adminMenu->addItemButton({$language}{$stuTableName}_LIST, '{$tableName}.php', 'list');
\$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
\$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());
@@ -341,7 +352,8 @@
\$GLOBALS['xoopsTpl']->assign('form', \$form->render());
break;\n
EOT;
- return $ret;
+
+ return $ret;
}
/*
@@ -400,7 +412,8 @@
echo \${$tableName}Obj->getHtmlErrors();
break;\n
EOT;
- return $ret;
+
+ return $ret;
}
/*
@@ -416,7 +429,8 @@
}
include __DIR__ . '/footer.php';
EOT;
- return $ret;
+
+ return $ret;
}
/*
@@ -432,8 +446,7 @@
$module = $this->getModule();
$table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
- $tableName = $table->getVar('table_name');
- $tableFieldname = $table->getVar('table_fieldname');
+ $tableName = $table->getVar('table_name');
$language = $this->tdmcfile->getLanguage($moduleDirname, 'AM');
$fields = $this->tdmcfile->getTableFields($table->getVar('table_id'));
foreach (array_keys($fields) as $f) {
@@ -448,11 +461,11 @@
}
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getAdminPagesHeader($moduleDirname, $tableName, $fpif);
- $content .= $this->getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fieldInForm, $fpmf);
+ $content .= $this->getAdminPagesList($moduleDirname, $table, $language, $fields, $fpif, $fieldInForm, $fpmf);
if (1 == $fieldInForm) {
$content .= $this->getAdminPagesNew($moduleDirname, $tableName, $language);
$content .= $this->getAdminPagesSave($moduleDirname, $tableName, $language, $fields, $fpif, $fpmf);
- $content .= $this->getAdminPagesEdit($moduleDirname, $tableName, $tableFieldname, $language, $fpif);
+ $content .= $this->getAdminPagesEdit($moduleDirname, $table, $language, $fpif);
}
$content .= $this->getAdminPagesDelete($tableName, $language, $fpif, $fpmf);
$content .= $this->getAdminPagesFooter();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -140,9 +140,7 @@
\$formTitle = {$language}GLOBAL;
\$permName = '{$moduleDirname}_ac';
\$permDesc = {$language}GLOBAL_DESC;
- \$globalPerms = array( '4' => {$language}GLOBAL_4,
- '8' => {$language}GLOBAL_8,
- '16' => {$language}GLOBAL_16 );
+ \$globalPerms = array( '4' => {$language}GLOBAL_4, '8' => {$language}GLOBAL_8, '16' => {$language}GLOBAL_16 );
break;
case 2:
\$formTitle = {$language}APPROVE;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -233,8 +233,9 @@
{
$moduleDirname = $module->getVar('mod_dirname');
$tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
$ucfTableName = ucfirst($tableName);
- $stuTableName = strtoupper($tableName);
+ $stuTableSoleName = strtoupper($tableSoleName);
$language = $this->getLanguage($moduleDirname, 'AM');
$this->formelements->initForm($module, $table);
$ret = <<<EOT
@@ -249,7 +250,7 @@
\$action = \$_SERVER['REQUEST_URI'];
}
// Title
- \$title = \$this->isNew() ? sprintf({$language}{$stuTableName}_ADD) : sprintf({$language}{$stuTableName}_EDIT);
+ \$title = \$this->isNew() ? sprintf({$language}{$stuTableSoleName}_ADD) : sprintf({$language}{$stuTableSoleName}_EDIT);
// Get Theme Form
xoops_load('XoopsFormLoader');
\$form = new XoopsThemeForm(\$title, 'form', \$action, 'post', true);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -36,6 +36,7 @@
{
parent::__construct();
$this->tdmcreate = TDMCreateHelper::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
}
/*
@@ -590,6 +591,7 @@
$table = $this->getTable();
$moduleDirname = $module->getVar('mod_dirname');
$tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
$language_funct = $this->getLanguage($moduleDirname, 'AM');
//$language_table = $language_funct . strtoupper($tableName);
$ret = '';
@@ -609,7 +611,8 @@
if (1 == $fields[$f]->getVar('field_main')) {
$fieldMain = $fieldName;
}
- $language = $language_funct . strtoupper($fieldName);
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ $language = $language_funct . strtoupper($tableSoleName) . '_' . strtoupper($rpFieldName);
$required = (1 == $fields[$f]->getVar('field_required')) ? ', true' : '';
//
if (1 == $fieldInForm) {
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/include/IncludeInstall.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -253,14 +253,17 @@
$fieldElement = $fields[$f]->getVar('field_element');
// All fields elements selected
switch ($fieldElement) {
- case 11:
+ case 10:
+ case 13:
$content .= $this->getInstallImagesFolder($moduleDirname);
foreach (array_keys($tables) as $t) {
$tableName = $tables[$t]->getVar('table_name');
$content .= $this->getInstallTableImagesFolder($tableName);
}
break;
- case 12:
+ case 11:
+ case 12:
+ case 14:
$content .= $this->getInstallFilesFolder($moduleDirname);
foreach (array_keys($tables) as $t) {
$tableName = $tables[$t]->getVar('table_name');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageAdmin.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -123,10 +123,10 @@
//
foreach (array_keys($tables) as $t) {
$tableName = $tables[$t]->getVar('table_name');
- $tableFieldname = $tables[$t]->getVar('table_fieldname');
- $stuTableFieldname = strtoupper($tableFieldname);
- $ucfTableFieldname = ucfirst($tableFieldname);
- $ret .= $this->defines->getDefine($language, "ADD_{$stuTableFieldname}", "Add {$ucfTableFieldname}");
+ $tableSoleName = $tables[$t]->getVar('table_solename');
+ $stuTableSoleName = strtoupper($tableSoleName);
+ $ucfTableSoleName = ucfirst($tableSoleName);
+ $ret .= $this->defines->getDefine($language, "ADD_{$stuTableSoleName}", "Add New {$ucfTableSoleName}");
}
$ret .= $this->defines->getAboveDefines('Lists');
//
@@ -152,28 +152,40 @@
$ret = $this->defines->getAboveHeadDefines('Admin Classes');
//
foreach (array_keys($tables) as $t) {
- $tableId = $tables[$t]->getVar('table_id');
- $tableName = $tables[$t]->getVar('table_name');
- $stuTableName = strtoupper($tableName);
- $ucfTableName = ucfirst($tableName);
- $ret .= $this->defines->getAboveDefines("{$ucfTableName} add/edit");
- $ret .= $this->defines->getDefine($language, "{$stuTableName}_ADD", "Add {$tableName}");
- $ret .= $this->defines->getDefine($language, "{$stuTableName}_EDIT", "Edit {$tableName}");
- $ret .= $this->defines->getAboveDefines("Elements of {$ucfTableName}");
+ $tableId = $tables[$t]->getVar('table_id');
+ $tableName = $tables[$t]->getVar('table_name');
+ $tableSoleName = $tables[$t]->getVar('table_solename');
+ $ucfTableSoleName = ucfirst($tableSoleName);
//
- $fields = $this->getTableFields($tableId);
+ $fields = $this->getTableFields($tableId);
+ foreach (array_keys($fields) as $f) {
+ $fieldInForm = $fields[$f]->getVar('field_inform');
+ }
+ if(1 == $fieldInForm) {
+ $ret .= $this->defines->getAboveDefines("{$ucfTableSoleName} add/edit");
+ $ret .= $this->defines->getDefine($language, "{$tableSoleName}_ADD", "Add {$ucfTableSoleName}");
+ $ret .= $this->defines->getDefine($language, "{$tableSoleName}_EDIT", "Edit {$ucfTableSoleName}");
+ }
+ $ret .= $this->defines->getAboveDefines("Elements of {$ucfTableSoleName}");
+ //
foreach (array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
$stuFieldName = strtoupper($fieldName);
//
$rpFieldName = $this->tdmcfile->getRightString($fieldName);
- $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_'));
+ if ($fieldElement > 15) {
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
+ $fieldElementName = $fieldElements->getVar('fieldelement_name');
+ $fieldNameDesc = substr($fieldElementName, strrpos($fieldElementName, ':'), strlen($fieldElementName));
+ $fieldNameDesc = str_replace(': ', '', $fieldNameDesc);
+ } else {
+ $fieldNameDesc = ucfirst($rpFieldName);
+ }
//
- $fieldNameDesc = ucfirst($rpFieldName);
+ $ret .= $this->defines->getDefine($language, $tableSoleName .'_'. $rpFieldName, $fieldNameDesc);
//
- $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc);
- //
switch ($fieldElement) {
case 10:
$ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_LIST_{$stuTableName}", "{$fieldNameDesc} in frameworks images");
@@ -253,7 +265,6 @@
public function render()
{
$module = $this->getModule();
- $table = $this->getTable();
$tables = $this->getTables();
$filename = $this->getFileName();
$moduleDirname = $module->getVar('mod_dirname');
@@ -263,9 +274,7 @@
$content .= $this->getLanguageAdminIndex($language, $tables);
$content .= $this->getLanguageAdminPages($language, $tables);
$content .= $this->getLanguageAdminClass($language, $tables);
- if (1 == $table->getVar('table_permissions')) {
- $content .= $this->getLanguageAdminPermissions($language);
- }
+ $content .= $this->getLanguageAdminPermissions($language);
}
$content .= $this->getLanguageAdminFoot($language);
//
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/language/LanguageDefines.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -87,7 +87,8 @@
*/
public function getDefine($language, $defined, $description)
{
- $ret = <<<EOT
+ $defined = strtoupper($defined);
+ $ret = <<<EOT
define('{$language}{$defined}', "{$description}");\n
EOT;
return $ret;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/sql/SqlFile.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -57,10 +57,10 @@
/*
* @public function write
- * @param string $module
- * @param string $table
- * @param string $tables
- * @param string $filename
+ * @param $module
+ * @param $table
+ * @param $tables
+ * @param $filename
*/
/**
* @param $module
@@ -76,7 +76,7 @@
/*
* @private function getHeaderSqlComments
- * @param string $moduleName
+ * @param $moduleName
*/
/**
* @param $moduleName
@@ -105,8 +105,8 @@
/*
* @private function getHeadDatabaseTable
- * @param string $moduleDirname
- * @param string $tableName
+ * @param $moduleDirname
+ * @param $tableName
* @param integer $fieldsNumb
*
* Unused IF NOT EXISTS
@@ -126,7 +126,7 @@
/*
* @private function getDatabaseTables
- * @param string $moduleDirname
+ * @param $moduleDirname
* @return null|string
*/
private function getDatabaseTables($moduleDirname)
@@ -146,10 +146,10 @@
/*
* @private function getDatabaseFields
- * @param string $moduleDirname
- * @param string $tableName
- * @param integer $tableAutoincrement
- * @param integer $fieldsNumb
+ * @param $moduleDirname
+ * @param $tableName
+ * @param $tableAutoincrement
+ * @param $fieldsNumb
* @return null|string
*/
private function getDatabaseFields($moduleDirname, $tableId, $tableName, $tableAutoincrement, $fieldsNumb)
@@ -276,12 +276,12 @@
/*
* @private function getFieldRow
- * @param string $fieldName
- * @param string $fieldTypeValue
- * @param string $fieldAttribute
- * @param string $fieldNull
- * @param string $fieldDefault
- * @param string $autoincrement
+ * @param $fieldName
+ * @param $fieldTypeValue
+ * @param $fieldAttribute
+ * @param $fieldNull
+ * @param $fieldDefault
+ * @param $autoincrement
* @return string
*/
private function getFieldRow($fieldName, $fieldTypeValue, $fieldAttribute = null, $fieldNull = null, $fieldDefault = null, $autoincrement = null)
@@ -349,8 +349,8 @@
/*
* @private function getComma
- * @param array $row
- * @param string $comma
+ * @param $row
+ * @param $comma
* @return string
*/
private function getComma($row, $comma = null)
@@ -364,8 +364,8 @@
/*
* @private function getCommaCicle
- * @param array $comma
- * @param integer $index
+ * @param $comma
+ * @param $index
* @return string
*/
private function getCommaCicle($comma, $index)
@@ -394,7 +394,7 @@
$moduleName = strtolower($module->getVar('mod_name'));
$moduleDirname = strtolower($module->getVar('mod_dirname'));
$content = $this->getHeaderSqlComments($moduleName);
- $content .= $this->getDatabaseTables($moduleDirname);
+ $content .= $this->getDatabaseTables($moduleDirname);
//
$this->tdmcfile->create($moduleDirname, 'sql', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -77,8 +77,9 @@
*/
private function getTemplatesAdminPagesHeader($moduleDirname, $table, $fields, $language)
{
- $tableName = $table->getVar('table_name');
- $ret = <<<EOT
+ $tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
+ $ret = <<<EOT
<{include file="db:{$moduleDirname}_admin_header.tpl"}>
<{if {$tableName}_list}>
<table class="outer {$tableName} width100">
@@ -86,8 +87,9 @@
<tr class="head">\n
EOT;
foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $lang_fn = $language . strtoupper($fieldName);
+ $fieldName = $fields[$f]->getVar('field_name');
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ $lang_fn = $language . strtoupper($tableSoleName) . '_' . strtoupper($rpFieldName);
if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_inlist'))) {
$ret .= <<<EOT
<th class="center"><{\$smarty.const.{$lang_fn}}></th>\n
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserObjects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserObjects.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserObjects.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -51,7 +51,7 @@
public function getUserHeader($moduleDirname, $tableName)
{
$ret = <<<EOT
-include_once 'header.php';
+include __DIR__ . '/header.php';
\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl';
include_once XOOPS_ROOT_PATH.'/header.php';\n
EOT;
@@ -66,7 +66,7 @@
public function getUserIndex($moduleDirname)
{
$ret = <<<EOT
-include_once 'header.php';
+include __DIR__ . '/header.php';
\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_index.tpl';
include_once XOOPS_ROOT_PATH.'/header.php';\n
EOT;
@@ -83,7 +83,7 @@
public function getUserFooter()
{
$ret = <<<EOT
-include_once 'footer.php';
+include __DIR__ . '/footer.php';
EOT;
return $ret;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -62,10 +62,10 @@
/*
* @public function write
- * @param string $module
+ * @param $module
* @param mixed $table
* @param mixed $tables
- * @param string $filename
+ * @param $filename
*/
/**
* @param $module
@@ -115,7 +115,7 @@
/*
* @private function getXoopsVersionHeader
- * @param string $language
+ * @param $language
*/
/**
* @param $module
@@ -211,8 +211,8 @@
/*
* @private function getXoopsVersionMySQL
- * @param string $moduleDirname
- * @param string $table
+ * @param $moduleDirname
+ * @param $table
*/
/**
* @param $moduleDirname
@@ -245,7 +245,7 @@
/*
* @private function getXoopsVersionSearch
- * @param string $moduleDirname
+ * @param $moduleDirname
*/
/**
* @param $moduleDirname
@@ -265,7 +265,7 @@
/*
* @private function getXoopsVersionComments
- * @param string $moduleDirname
+ * @param $moduleDirname
*/
/**
* @param $moduleDirname
@@ -288,7 +288,7 @@
/*
* @private function getXoopsVersionTemplatesAdmin
- * @param string $moduleDirname
+ * @param $moduleDirname
*/
/**
* @param $moduleDirname
@@ -325,7 +325,7 @@
/*
* @private function getXoopsVersionTemplatesUser
- * @param string $moduleDirname
+ * @param $moduleDirname
*/
/**
* @param $moduleDirname
@@ -353,7 +353,7 @@
/*
* @private function getXoopsVersionSubmenu
- * @param string $language
+ * @param $language
*/
/**
* @param $language
@@ -384,8 +384,8 @@
/*
* @private function getXoopsVersionBlocks
- * @param string $moduleDirname
- * @param string $language
+ * @param $moduleDirname
+ * @param $language
*/
/**
* @param $moduleDirname
@@ -420,8 +420,8 @@
/*
* @private function getXoopsVersionConfig
- * @param string $moduleDirname
- * @param string $language
+ * @param $moduleDirname
+ * @param $language
*/
/**
* @param $module
@@ -596,15 +596,15 @@
/*
* @private function getTypeNotifications
- * @param string $language
- * @param string $type
- * @param string $tableName
- * @param string $item
- * @param string $typeOfNotify
+ * @param $language
+ * @param $type
+ * @param $tableName
+ * @param $item
+ * @param $typeOfNotify
*/
/**
* @param $language
- * @param string $type
+ * @param $type
* @param $tableName
* @param $notifyFile
* @param $item
@@ -647,8 +647,8 @@
/*
* @private function getXoopsVersionNotifications
- * @param string $moduleDirname
- * @param string $language
+ * @param $moduleDirname
+ * @param $language
*/
/**
* @param $moduleDirname
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/tables.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -51,6 +51,7 @@
$this->initVar('table_mid', XOBJ_DTYPE_INT);
$this->initVar('table_category', XOBJ_DTYPE_INT);
$this->initVar('table_name', XOBJ_DTYPE_TXTBOX);
+ $this->initVar('table_solename', XOBJ_DTYPE_TXTBOX);
$this->initVar('table_fieldname', XOBJ_DTYPE_TXTBOX);
$this->initVar('table_nbfields', XOBJ_DTYPE_INT);
$this->initVar('table_order', XOBJ_DTYPE_INT);
@@ -137,9 +138,13 @@
}
$form->addElement($mods_select, true);
//
- $table_name_field = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, 'table_name', 50, 255, $table_name);
+ $table_name_field = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, 'table_name', 40, 150, $table_name);
$table_name_field->setDescription(_AM_TDMCREATE_TABLE_NAME_DESC);
$form->addElement($table_name_field, true);
+ //
+ $table_solename_field = new XoopsFormText(_AM_TDMCREATE_TABLE_SOLENAME, 'table_solename', 40, 150, $this->getVar('table_solename'));
+ $table_solename_field->setDescription(_AM_TDMCREATE_TABLE_SOLENAME_DESC);
+ $form->addElement($table_solename_field, true);
//
$tablesHandler =& $this->tdmcreate->getHandler('tables');
$criteria = new CriteriaCompo(new Criteria('table_category', 0), 'AND');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/language/english/admin.php 2015-05-03 12:51:24 UTC (rev 13054)
@@ -137,6 +137,10 @@
define('_AM_TDMCREATE_TABLE_MODULES', "Choose a module");
define('_AM_TDMCREATE_TABLE_NAME', "Table Name");
define('_AM_TDMCREATE_TABLE_NAME_DESC', "Unique Name: It's recommended to use plural word (i.e.: <span style='text-decoration: underline;'>categorie</span><span class='white bold'>s</span>)");
+// Added in version 1.91
+define('_AM_TDMCREATE_TABLE_SOLENAME', "Table Singular Name");
+define('_AM_TDMCREATE_TABLE_SOLENAME_DESC', "Singular Name: It's recommended to use singular word (i.e.: <span style='text-decoration: underline;'>category</span> for admin buttons)");
+
define('_AM_TDMCREATE_TABLE_CATEGORY', "This table is a category or topic?");
define('_AM_TDMCREATE_TABLE_CATEGORY_DESC', "<b class='red bold'>WARNING</b>: <i>Once you have used this option for this module, and edit this table,<br />will not be displayed following the creation of other tables</i>");
define('_AM_TDMCREATE_TABLE_NBFIELDS', "Number fields");
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql 2015-05-03 07:22:23 UTC (rev 13053)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/sql/mysql.sql 2015-05-03 12:51:24 UTC (rev 13054)
@@ -62,6 +62,7 @@
`table_mid` INT(5) UNSIGNED NOT NULL DEFAULT '0',
`table_category` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0',
`table_name` VARCHAR(150) NOT NULL DEFAULT '',
+ `table_solename` VARCHAR(150) NOT NULL DEFAULT '',
`table_fieldname` VARCHAR(150) NOT NULL DEFAULT '',
`table_nbfields` INT(5) UNSIGNED NOT NULL DEFAULT '0',
`table_order` INT(5) UNSIGNED NOT NULL DEFAULT '0',
|
