Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12665] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate
|
From: <txm...@us...> - 2014-06-29 21:44:19
|
Revision: 12665
http://sourceforge.net/p/xoops/svn/12665
Author: txmodxoops
Date: 2014-06-29 21:44:03 +0000 (Sun, 29 Jun 2014)
Log Message:
-----------
Added mod_dirname field in modules to avoid conflicts with the names of the modules
and to have more freedom of choice for the names of the modules directory
- Fixed bugs
- Updated
- Still work to do
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/about.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php
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/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/permissions.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.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/classes/formelements.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/helper.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/css/styles.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs/changelog.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/docs/docs.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/file.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/comment_functions.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/comments.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/functions.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/install.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/jquery.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/notifications.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/search.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/include/update.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/help.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/mail.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/main.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/sql/mysql.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/about.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/blocks/blocks.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/user/footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/user/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/user/index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/footer.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/header.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/index.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/notification_update.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/print.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/rss.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/submit.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/user/xoopsversion.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/include/common.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/admin.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/language/english/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/sql/mysql.sql
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/templates/admin/permissions.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-06-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/building.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -27,12 +27,12 @@
case 'build':
$template_main = 'tdmcreate_building.tpl';
$GLOBALS['xoopsTpl']->assign('navigation', $adminMenu->addNavigation('building.php'));
- // Get var module name
- $mod_name = $moduleObj->getVar('mod_name');
+ // Get var module dirname
+ $mod_dirname = $moduleObj->getVar('mod_dirname');
// Directories for copy from to
- $from_dir = TDMC_UPLOAD_REPOSITORY_PATH.'/'.strtolower($mod_name);
- $to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_name);
- if(isset($mod_name)) {
+ $from_dir = TDMC_UPLOAD_REPOSITORY_PATH.'/'.strtolower($mod_dirname);
+ $to_dir = XOOPS_ROOT_PATH.'/modules/'.strtolower($mod_dirname);
+ if(isset($mod_dirname)) {
// Clear this module if it's in repository
if(is_dir($from_dir)) {
TDMCreate_clearDir($from_dir);
@@ -65,7 +65,7 @@
}
unset($build);
// Directory to saved all files
- $GLOBALS['xoopsTpl']->assign('building_directory', sprintf(_AM_TDMCREATE_BUILDING_DIRECTORY, str_replace(' ', '', strtolower($mod_name))));
+ $GLOBALS['xoopsTpl']->assign('building_directory', sprintf(_AM_TDMCREATE_BUILDING_DIRECTORY, $mod_dirname));
// Copy this module in root modules
if ( $moduleObj->getVar('mod_inroot_copy') == 1 ) {
TDMCreate_copyr($from_dir, $to_dir);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-06-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/admin/modules.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -103,6 +103,7 @@
}
//Form module save
$obj->setVars(array('mod_name' => $_POST['mod_name'],
+ 'mod_dirname' => preg_replace('/[^a-zA-Z0-9]\s+/', '', strtolower($_POST['mod_dirname'])),
'mod_version' => $_POST['mod_version'],
'mod_since' => $_POST['mod_since'],
'mod_min_php' => $_POST['mod_min_php'],
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/about.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/about.php 2014-06-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/about.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -57,17 +57,17 @@
public function render() {
$module = $this->getModule();
$filename = $this->getFileName();
- $module_name = strtolower($module->getVar('mod_name'));
+ $module_dirname = $module->getVar('mod_dirname');
$module_donations = $module->getVar('mod_donations');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
include 'header.php';
-\$template_main = '{$module_name}_about.tpl';
+\$template_main = '{$module_dirname}_admin_about.tpl';
\$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('about.php'));
\$GLOBALS['xoopsTpl']->assign('about', \$adminMenu->renderAbout('{$module_donations}', false));
include 'footer.php';
EOT;
- $this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/footer.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/footer.php 2014-06-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/footer.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -58,7 +58,7 @@
public function render() {
$module = $this->getModule();
$filename = $this->getFileName();
- $module_name = strtolower($module->getVar('mod_name'));
+ $module_dirname = $module->getVar('mod_dirname');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
if ( isset(\$template_main) ) {
@@ -67,7 +67,7 @@
xoops_cp_footer();
?>
EOT;
- $this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php 2014-06-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/header.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -62,9 +62,8 @@
$table = $this->getTable();
$tables = $this->getTables();
$filename = $this->getFileName();
- $module_name = $module->getVar('mod_name');
- $stl_mod_name = strtolower($module_name);
- $ucfmod_name = ucfirst($module_name);
+ $module_dirname = $module->getVar('mod_dirname');
+ $ucfmod_name = ucfirst($module_dirname);
$language = $this->getLanguage('AM');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
@@ -77,7 +76,7 @@
if ( $table->getVar('table_name') != '' ) {
$content .= <<<EOT
// Get instance of module
-\${$stl_mod_name} = {$ucfmod_name}Helper::getInstance();\n
+\${$module_dirname} = {$ucfmod_name}Helper::getInstance();\n
EOT;
}
$content .= <<<EOT
@@ -94,7 +93,7 @@
{
$table_name = $tables[$i]->getVar('table_name');
$content .= <<<EOT
-\${$table_name}Handler =& \${$stl_mod_name}->getHandler('{$table_name}');\n
+\${$table_name}Handler =& \${$module_dirname}->getHandler('{$table_name}');\n
EOT;
}
$content .=<<<EOT
@@ -123,7 +122,7 @@
xoops_cp_header();
\$adminMenu = new ModuleAdmin();
EOT;
- $this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
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-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/index.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -60,9 +60,9 @@
$module = $this->getModule();
$tables = $this->getTables();
$filename = $this->getFileName();
- $module_name = strtolower($module->getVar('mod_name'));
- $language = $this->getLanguage($module_name, 'AM');
- $language_thereare = $this->getLanguage($module_name, 'AM', 'THEREARE_');
+ $module_dirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($module_dirname, 'AM');
+ $language_thereare = $this->getLanguage($module_dirname, 'AM', 'THEREARE_');
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
include_once 'header.php';\n
@@ -77,7 +77,7 @@
}
$content .= <<<EOT
// Template Index
-\$template_main = '{$module_name}_index.tpl';
+\$template_main = '{$module_dirname}_admin_index.tpl';
// InfoBox Statistics
\$adminMenu->addInfoBox({$language}STATISTICS);
// InfoBox\n
@@ -96,7 +96,7 @@
echo \$adminMenu->renderIndex();
include_once 'footer.php';
EOT;
- $this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
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-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/menu.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -60,8 +60,8 @@
$module = $this->getModule();
$tables = $this->getTables();
$filename = $this->getFileName();
- $module_name = $module->getVar('mod_name');
- $language = $this->getLanguage($module_name, 'MI', 'ADMENU');
+ $module_dirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($module_dirname, 'MI', 'ADMENU');
$menu = 1;
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
@@ -109,7 +109,7 @@
EOT;
unset( $menu );
- $this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/objects.php 2014-06-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/objects.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -69,17 +69,17 @@
}
/*
* @public function getUploadImage
- * @param string $module_name
+ * @param string $module_dirname
* @param string $table_name
* @param string $field_name
*/
- public function getUploadImage($module_name, $table_name, $field_name) {
+ public function getUploadImage($module_dirname, $table_name, $field_name) {
$ret = <<<EOT
// Set Var Image
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- \$uploaddir = XOOPS_UPLOAD_PATH.'/{$module_name}/images/{$table_name}/';
- \$uploader = new XoopsMediaUploader(\$uploaddir, xoops_getModuleOption('mimetypes', '{$module_name}'),
- xoops_getModuleOption('maxsize', '{$module_name}'), null, null);
+ \$uploaddir = XOOPS_UPLOAD_PATH.'/{$module_dirname}/images/{$table_name}/';
+ \$uploader = new XoopsMediaUploader(\$uploaddir, \${$module_dirname}->getConfig('mimetypes'),
+ \${$module_dirname}->getConfig('maxsize'), null, null);
if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) {
\$uploader->setPrefix('{$field_name}_');
\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]);
@@ -97,17 +97,17 @@
}
/*
* @public function getUploadFile
- * @param string $module_name
+ * @param string $module_dirname
* @param string $table_name
* @param string $field_name
*/
- public function getUploadFile($module_name, $table_name, $field_name) {
+ public function getUploadFile($module_dirname, $table_name, $field_name) {
$ret = <<<EOT
// Set Var File
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
- \$uploaddir = XOOPS_UPLOAD_PATH.'/{$module_name}/files/{$table_name}/';
- \$uploader = new XoopsMediaUploader(\$uploaddir, xoops_getModuleOption('mimetypes', '{$module_name}'),
- xoops_getModuleOption('maxsize', '{$module_name}'), null, null);
+ \$uploaddir = XOOPS_UPLOAD_PATH.'/{$module_dirname}/files/{$table_name}/';
+ \$uploader = new XoopsMediaUploader(\$uploaddir, \${$module_dirname}->getConfig('mimetypes'),
+ \${$module_dirname}->getConfig('maxsize'), null, null);
if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) {
\$uploader->setPrefix('{$field_name}_') ;
\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]);
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-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -58,15 +58,15 @@
}
/*
* @public function getAdminPagesHeader
- * @param string $mod_name
+ * @param string $module_dirname
* @param string $table_name
*/
- public function getAdminPagesHeader($mod_name, $table_name) {
+ public function getAdminPagesHeader($module_dirname, $table_name) {
$ret = <<<EOT
\ninclude_once 'header.php';
//It recovered the value of argument op in URL$
-\$op = {$mod_name}_CleanVars(\$_REQUEST, 'op', 'list', 'string');
+\$op = {$module_dirname}_CleanVars(\$_REQUEST, 'op', 'list', 'string');
// Navigation
echo \$adminMenu->addNavigation('{$table_name}.php');
switch (\$op)
@@ -80,18 +80,17 @@
* @param string $table_name
* @param string $language
*/
- public function getAdminPagesList($module_name, $table_name, $table_fieldname, $language, $fields, $fpif, $fpmf) {
- $stu_mod_name = strtoupper($module_name);
- $stl_mod_name = strtolower($module_name);
+ public function getAdminPagesList($module_dirname, $table_name, $table_fieldname, $language, $fields, $fpif, $fpmf) {
+ $stu_module_dirname = strtoupper($module_dirname);
$stu_table_name = strtoupper($table_name);
$stu_table_fieldname = strtoupper($table_fieldname);
$ret = <<<EOT
case 'list':
default:
- \$limit = xoops_getModuleOption('adminpager');
- \$start = {$module_name}_CleanVars(\$_REQUEST, 'start', 0);
+ \$limit = \${$module_dirname}->getConfig('adminpager');
+ \$start = {$module_dirname}_CleanVars(\$_REQUEST, 'start', 0);
\$adminMenu->addItemButton({$language}ADD_{$stu_table_fieldname}, '{$table_name}.php?op=new', 'add');
- \$template_main = '{$stl_mod_name}_{$table_name}.tpl';
+ \$template_main = '{$module_dirname}_admin_{$table_name}.tpl';
echo \$adminMenu->renderButton();
\$criteria = new CriteriaCompo();
\$criteria->setSort('{$fpif} ASC, {$fpmf}');
@@ -99,8 +98,8 @@
\${$table_name}_rows = \${$table_name}Handler->getCount(\$criteria);
\${$table_name}_arr = \${$table_name}Handler->getAll(\$criteria);
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('{$module_dirname}_url', {$stu_module_dirname}_URL);
+ \$GLOBALS['xoopsTpl']->assign('{$module_dirname}_upload_url', {$stu_module_dirname}_UPLOAD_URL);
// Table view
if (\${$table_name}_rows > 0)
{
@@ -154,12 +153,11 @@
* @param string $table_name
* @param string $language
*/
- public function getAdminPagesNew($module_name, $table_name, $language) {
- $stl_mod_name = strtolower($module_name);
+ public function getAdminPagesNew($module_dirname, $table_name, $language) {
$stu_table_name = strtoupper($table_name);
$ret = <<<EOT
case 'new':
- \$template_main = '{$stl_mod_name}_{$table_name}.tpl';
+ \$template_main = '{$module_dirname}_admin_{$table_name}.tpl';
\$adminMenu->addItemButton({$language}{$stu_table_name}_LIST, '{$table_name}.php', 'list');
echo \$adminMenu->renderButton();
// Get Form
@@ -176,7 +174,7 @@
* @param string $table_name
* @param string $language
*/
- public function getAdminPagesSave($module_name, $table_name, $language, $fields, $fpif, $fpmf)
+ public function getAdminPagesSave($module_dirname, $table_name, $language, $fields, $fpif, $fpmf)
{
$ret = <<<EOT
case 'save':
@@ -201,10 +199,10 @@
$ret .= $this->adminobjects->getCheckBoxOrRadioYN($table_name, $field_name);
break;
case 9:
- $ret .= $this->adminobjects->getUploadImage($module_name, $table_name, $field_name);
+ $ret .= $this->adminobjects->getUploadImage($module_dirname, $table_name, $field_name);
break;
case 10:
- $ret .= $this->adminobjects->getUploadFile($module_name, $table_name, $field_name);
+ $ret .= $this->adminobjects->getUploadFile($module_dirname, $table_name, $field_name);
break;
case 11:
$ret .= $this->adminobjects->getTextDateSelect($table_name, $field_name);
@@ -235,12 +233,11 @@
* @param string $table_name
* @param string $language
*/
- public function getAdminPagesEdit($module_name, $table_name, $language, $fpif) {
- $stl_mod_name = strtolower($module_name);
+ public function getAdminPagesEdit($module_dirname, $table_name, $language, $fpif) {
$stu_table_name = strtoupper($table_name);
$ret = <<<EOT
case 'edit':
- \$template_main = '{$stl_mod_name}_{$table_name}.tpl';
+ \$template_main = '{$module_dirname}_admin_{$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();
@@ -300,10 +297,10 @@
{
$module = $this->getModule();
$table = $this->getTable();
- $module_name = $module->getVar('mod_name');
+ $module_dirname = $module->getVar('mod_dirname');
$table_name = $table->getVar('table_name');
$table_fieldname = $table->getVar('table_fieldname');
- $language = $this->getLanguage($module_name, 'AM');
+ $language = $this->getLanguage($module_dirname, 'AM');
$fields = $this->getTableFields($table->getVar('table_id'));
foreach(array_keys($fields) as $f)
{
@@ -316,15 +313,15 @@
}
}
$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($module_name, $table_name, $language);
- $content .= $this->getAdminPagesSave($module_name, $table_name, $language, $fields, $fpif, $fpmf);
- $content .= $this->getAdminPagesEdit($module_name, $table_name, $language, $fpif);
+ $content .= $this->getAdminPagesHeader($module_dirname, $table_name);
+ $content .= $this->getAdminPagesList($module_dirname, $table_name, $table_fieldname, $language, $fields, $fpif, $fpmf);
+ $content .= $this->getAdminPagesNew($module_dirname, $table_name, $language);
+ $content .= $this->getAdminPagesSave($module_dirname, $table_name, $language, $fields, $fpif, $fpmf);
+ $content .= $this->getAdminPagesEdit($module_dirname, $table_name, $language, $fpif);
$content .= $this->getAdminPagesDelete($table_name, $language, $fpif, $fpmf);
$content .= $this->getAdminPagesFooter();
//
- $this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/permissions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/permissions.php 2014-06-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/permissions.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -45,21 +45,20 @@
/*
* @public function write
* @param string $module
- * @param mixed $table
* @param mixed $tables
* @param string $filename
*/
public function write($module, $tables, $filename) {
$this->setModule($module);
+ $this->setTables($tables);
$this->setFileName($filename);
- $this->setTables($tables);
}
/*
* @private function getPermissionsCodeHeader
- * @param string $module_name
+ * @param string $module_dirname
* @param string $language
*/
- private function getPermissionsCodeHeader($module_name, $language)
+ private function getPermissionsCodeHeader($module_dirname, $language)
{
$ret = <<<PRM
\ninclude_once 'header.php';
@@ -74,10 +73,10 @@
if (count ( array_intersect ( \$group, \$groups ) ) <= 0) {
redirect_header ( 'index.php', 3, _NOPERM );
}*/
-
+\$template_main = '{$module_dirname}_admin_permissions.tpl';
echo \$adminMenu->addNavigation('permissions.php');
-\$permission = {$module_name}_CleanVars(\$_REQUEST, 'permission', 1, 'int');
+\$permission = {$module_dirname}_CleanVars(\$_REQUEST, 'permission', 1, 'int');
\$selected = array('', '', '', '');
\$selected[\$permission-1] = ' selected';
xoops_load('XoopsFormLoader');
@@ -96,10 +95,10 @@
/*
* @private function getPermissionsCodeSwitch
- * @param string $module_name
+ * @param string $module_dirname
* @param string $language
*/
- private function getPermissionsCodeSwitch($module_name, $language)
+ private function getPermissionsCodeSwitch($module_dirname, $language)
{
$ret = <<<PRM
\$module_id = \$xoopsModule->getVar('mid');
@@ -107,7 +106,7 @@
{
case 1:
\$formTitle = {$language}GLOBAL;
- \$permName = '{$module_name}_ac';
+ \$permName = '{$module_dirname}_ac';
\$permDesc = {$language}GLOBAL_DESC;
\$globalPerms = array( '4' => {$language}GLOBAL_4,
'8' => {$language}GLOBAL_8,
@@ -115,17 +114,17 @@
break;
case 2:
\$formTitle = {$language}APPROVE;
- \$permName = '{$module_name}_access';
+ \$permName = '{$module_dirname}_access';
\$permDesc = {$language}APPROVE_DESC;
break;
case 3:
\$formTitle = {$language}SUBMIT;
- \$permName = '{$module_name}_submit';
+ \$permName = '{$module_dirname}_submit';
\$permDesc = {$language}SUBMIT_DESC;
break;
case 4:
\$formTitle = {$language}VIEW;
- \$permName = '{$module_name}_view';
+ \$permName = '{$module_dirname}_view';
\$permDesc = {$language}VIEW_DESC;
break;
}\n
@@ -135,11 +134,11 @@
/*
* @private function getPermissionsCodeBody
- * @param string $module_name
+ * @param string $module_dirname
* @param string $table_name
* @param string $language
*/
- private function getPermissionsCodeBody($module_name, $language)
+ private function getPermissionsCodeBody($module_dirname, $language)
{
$tables = $this->getTables();
foreach(array_keys($tables) as $t)
@@ -209,15 +208,15 @@
public function render() {
$module = $this->getModule();
$filename = $this->getFileName();
- $module_name = strtolower($module->getVar('mod_name'));
- $language = $this->getLanguage($module_name, 'AM');
+ $module_dirname = strtolower($module->getVar('mod_dirname'));
+ $language = $this->getLanguage($module_dirname, 'AM');
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getPermissionsCodeHeader($module_name, $language);
- $content .= $this->getPermissionsCodeSwitch($module_name, $language);
- $content .= $this->getPermissionsCodeBody($module_name, $language);
+ $content .= $this->getPermissionsCodeHeader($module_dirname, $language);
+ $content .= $this->getPermissionsCodeSwitch($module_dirname, $language);
+ $content .= $this->getPermissionsCodeBody($module_dirname, $language);
$content .= $this->getPermissionsCodeFooter();
//
- $this->tdmcfile->create($module_name, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
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-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/architecture.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -103,7 +103,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_name = $module->getVar('mod_dirname');
$stl_module_author = str_replace(' ', '', strtolower($module->getVar('mod_author')));
// Creation of the Directory in repository
$targetDirectory = $this->upload_path.'/repository/'. $stl_module_name;
@@ -203,8 +203,7 @@
{
// Module
$mod_id = $module->getVar('mod_id');
- $mod_name = $module->getVar('mod_name');
- $stl_mod_name = strtolower($mod_name);
+ $mod_dirname = $module->getVar('mod_dirname');
// Id of tables
$criteria_tables = new CriteriaCompo();
$criteria_tables->add(new Criteria('table_mid', $mod_id));
@@ -237,7 +236,7 @@
// Admin Templates File
$adminTemplatesPages = TemplatesAdminPages::getInstance();
$adminTemplatesPages->write($module, $table);
- $ret[] = $adminTemplatesPages->renderFile($stl_mod_name.'_'.$table_name.'.tpl');
+ $ret[] = $adminTemplatesPages->renderFile($mod_dirname.'_admin_'.$table_name.'.tpl');
}
// Creation of blocks
if ( $table_blocks == 1) {
@@ -248,7 +247,7 @@
// Templates Blocks Files
$templatesFiles = TemplatesBlocks::getInstance();
$templatesFiles->write($module, $table);
- $ret[] = $templatesFiles->renderFile($stl_mod_name.'_block_'.$table_name.'.tpl');
+ $ret[] = $templatesFiles->renderFile($mod_dirname.'_block_'.$table_name.'.tpl');
}
// Blocks Templates File
/*$blocksTemplates = BlocksTemplates::getInstance();
@@ -270,7 +269,7 @@
// User Templates File
$userTemplatesPages = TemplatesUserPages::getInstance();
$userTemplatesPages->write($module, $table);
- $ret[] = $userTemplatesPages->renderFile($stl_mod_name.'_'.$table_name.'.tpl');
+ $ret[] = $userTemplatesPages->renderFile($mod_dirname.'_'.$table_name.'.tpl');
}
/*var_dump($table_name); */
}
@@ -306,7 +305,11 @@
// Admin Permissions File
$adminPermissions = AdminPermissions::getInstance();
$adminPermissions->write($module, $tables, 'permissions.php');
- $ret[] = $adminPermissions->render();
+ $ret[] = $adminPermissions->render();
+ // Templates Admin Permissions File
+ $adminTemplatesPermissions = TemplatesAdminPermissions::getInstance();
+ $adminTemplatesPermissions->write($module, $mod_dirname.'_admin_permissions.tpl');
+ $ret[] = $adminTemplatesPermissions->render();
}
// Admin Aboutr File
$adminAbout = AdminAbout::getInstance();
@@ -320,21 +323,21 @@
$languageAdmin = LanguageAdmin::getInstance();
$languageAdmin->write($module, $tables, 'admin.php');
$ret[] = $languageAdmin->render();
- // Templates Index File
+ // Templates Admin About File
$adminTemplatesAbout = TemplatesAdminAbout::getInstance();
- $adminTemplatesAbout->write($module, $stl_mod_name.'_about.tpl');
+ $adminTemplatesAbout->write($module, $mod_dirname.'_admin_about.tpl');
$ret[] = $adminTemplatesAbout->render();
- // Templates Index File
+ // Templates Admin Index File
$adminTemplatesIndex = TemplatesAdminIndex::getInstance();
- $adminTemplatesIndex->write($module, $stl_mod_name.'_index.tpl');
+ $adminTemplatesIndex->write($module, $mod_dirname.'_admin_index.tpl');
$ret[] = $adminTemplatesIndex->render();
- // Templates Footer File
+ // Templates Admin Footer File
$adminTemplatesFooter = TemplatesAdminFooter::getInstance();
- $adminTemplatesFooter->write($module, $stl_mod_name.'_footer.tpl');
+ $adminTemplatesFooter->write($module, $mod_dirname.'_admin_footer.tpl');
$ret[] = $adminTemplatesFooter->render();
- // Templates Header File
+ // Templates Admin Header File
$adminTemplatesHeader = TemplatesAdminHeader::getInstance();
- $adminTemplatesHeader->write($module, $stl_mod_name.'_header.tpl');
+ $adminTemplatesHeader->write($module, $mod_dirname.'_admin_header.tpl');
$ret[] = $adminTemplatesHeader->render();
}
// Creation of notifications files
@@ -397,15 +400,15 @@
if ( ($table->getVar('table_user') == 1)) {
// Templates Index File
$userTemplatesIndex = TemplatesUserIndex::getInstance();
- $userTemplatesIndex->write($module, $stl_mod_name.'_index.tpl');
+ $userTemplatesIndex->write($module, $mod_dirname.'_index.tpl');
$ret[] = $userTemplatesIndex->render();
// Templates Footer File
$userTemplatesFooter = TemplatesUserFooter::getInstance();
- $userTemplatesFooter->write($module, $table, $stl_mod_name.'_footer.tpl');
+ $userTemplatesFooter->write($module, $table, $mod_dirname.'_footer.tpl');
$ret[] = $userTemplatesFooter->render();
// Templates Header File
$userTemplatesHeader = TemplatesUserHeader::getInstance();
- $userTemplatesHeader->write($module, $tables, $stl_mod_name.'_header.tpl');
+ $userTemplatesHeader->write($module, $tables, $mod_dirname.'_header.tpl');
$ret[] = $userTemplatesHeader->render();
// User Footer File
$userFooter = UserFooter::getInstance();
@@ -436,7 +439,7 @@
$classHelper->write($module, 'helper.php');
$ret[] = $classHelper->render();
// Css Styles File
- $cssStyles = CssStyles::getInstance($module, 'style.css');
+ $cssStyles = CssStyles::getInstance();
$cssStyles->write($module, 'style.css');
$ret[] = $cssStyles->render();
// Include Common File
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-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/blocks/blocks.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -55,23 +55,23 @@
* @public function getBlocksShow
* @param null
*/
- public function getBlocksShow($module_name, $table_name, $table_fieldname, $table_category, $fields, $fpif) {
- $stu_module_name = strtoupper($module_name);
- $stl_module_name = strtolower($module_name);
+ public function getBlocksShow($module_dirname, $table_name, $table_fieldname, $table_category, $fields, $fpif) {
+ $stu_module_dirname = strtoupper($module_dirname);
+ $ucfmod_name = ucfirst($module_dirname);
$ret = <<<EOT
-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/{$module_dirname}/include/common.php';
+include_once XOOPS_ROOT_PATH.'/modules/{$module_dirname}/include/functions.php';
+function b_{$module_dirname}_{$table_name}_show(\$options)
{
- include_once XOOPS_ROOT_PATH.'/modules/{$stl_module_name}/class/{$table_name}.php';
+ include_once XOOPS_ROOT_PATH.'/modules/{$module_dirname}/class/{$table_name}.php';
\$myts =& MyTextSanitizer::getInstance();
- \$GLOBALS['xoopsTpl']->assign('{$stl_module_name}_upload_url', {$stu_module_name}_UPLOAD_URL);
+ \$GLOBALS['xoopsTpl']->assign('{$module_dirname}_upload_url', {$stu_module_dirname}_UPLOAD_URL);
\${$table_fieldname} = array();
\$type_block = \$options[0];
\$nb_{$table_name} = \$options[1];
\$lenght_title = \$options[2];
-
- \${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$module_name}');
+ \${$module_dirname} = {$ucfmod_name}Helper::getInstance();
+ \${$table_name}Handler =& \${$module_dirname}->getHandler('{$table_name}');
\$criteria = new CriteriaCompo();
array_shift(\$options);
array_shift(\$options);
@@ -80,7 +80,7 @@
if ( $table_category == 1 ) {
$ret .= <<<EOT
if (!(count(\$options) == 1 && \$options[0] == 0)) {
- \$criteria->add(new Criteria('{$table_fieldname}_category', {$module_name}_block_addCatSelect(\$options), 'IN'));
+ \$criteria->add(new Criteria('{$table_fieldname}_category', {$module_dirname}_block_addCatSelect(\$options), 'IN'));
}\n
EOT;
}
@@ -129,21 +129,22 @@
}
/*
* @public function getBlocksEdit
- * @param string $module_name
+ * @param string $module_dirname
* @param string $table_name
* @param string $fpif
* @param string $fpmf
* @param string $language
*/
- public function getBlocksEdit($module_name, $table_name, $fpif, $fpmf, $language) {
- $stu_module_name = strtoupper($module_name);
- $stl_module_name = strtolower($module_name);
+ public function getBlocksEdit($module_dirname, $table_name, $fpif, $fpmf, $language) {
+ $stu_module_dirname = strtoupper($module_dirname);
+ $ucfmod_name = ucfirst($module_dirname);
$ret = <<<EOT
-function b_{$stl_module_name}_{$table_name}_edit(\$options)
+function b_{$module_dirname}_{$table_name}_edit(\$options)
{
- 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);
+ include_once XOOPS_ROOT_PATH.'/modules/{$module_dirname}/class/{$table_name}.php';
+ \${$module_dirname} = {$ucfmod_name}Helper::getInstance();
+ \${$table_name}Handler =& \${$module_dirname}->getHandler('{$table_name}');
+ \$GLOBALS['xoopsTpl']->assign('{$module_dirname}_upload_url', {$stu_module_dirname}_UPLOAD_URL);
\$form = {$language}DISPLAY;
\$form .= "<input type='hidden' name='options[0]' value='".\$options[0]."' />";
\$form .= "<input name='options[1]' size='5' maxlength='255' value='".\$options[1]."' type='text' /> <br />";
@@ -177,11 +178,11 @@
{
$module = $this->getModule();
$table = $this->getTable();
- $module_name = strtolower($module->getVar('mod_name'));
+ $module_dirname = $module->getVar('mod_dirname');
$table_name = $table->getVar('table_name');
$table_fieldname = $table->getVar('table_fieldname');
$table_category = $table->getVar('table_category');
- $language = $this->getLanguage($module_name, 'MB');
+ $language = $this->getLanguage($module_dirname, 'MB');
$fields = $this->getTableFields($table->getVar('table_id'));
foreach(array_keys($fields) as $f)
{
@@ -193,10 +194,10 @@
}
}
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getBlocksShow($module_name, $table_name, $table_fieldname, $table_category, $fields, $fpif);
- $content .= $this->getBlocksEdit($module_name, $table_name, $fpif, $fpmf, $language);
+ $content .= $this->getBlocksShow($module_dirname, $table_name, $table_fieldname, $table_category, $fields, $fpif);
+ $content .= $this->getBlocksEdit($module_dirname, $table_name, $fpif, $fpmf, $language);
//
- $this->tdmcfile->create($module_name, 'blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'blocks', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
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-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/classes.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -127,19 +127,19 @@
}
/*
* @public function getHeadClass
- * @param string $module_name
+ * @param string $module_dirname
* @param string $table_name
* @param array $fields
*/
- public function getHeadClass($module_name, $table_name, $fields) {
- $ucf_module_name = ucfirst($module_name);
- $ucf_table_name = ucfirst($table_name);
+ public function getHeadClass($module_dirname, $table_name, $fields) {
+ $ucf_module_dirname = ucfirst($module_dirname);
+ $ucf_table_name = ucfirst($table_name);
$ret = <<<EOT
defined('XOOPS_ROOT_PATH') or die("Restricted access");
/*
- * Class Object {$ucf_module_name}{$ucf_table_name}
+ * Class Object {$ucf_module_dirname}{$ucf_table_name}
*/
-class {$ucf_module_name}{$ucf_table_name} extends XoopsObject
+class {$ucf_module_dirname}{$ucf_table_name} extends XoopsObject
{
/*
* Constructor
@@ -148,7 +148,7 @@
*/
public function __construct()
{
- \$this->XoopsObject();
+ \$this->{$module_dirname} = {$ucf_module_dirname}Helper::getInstance();
{$this->getInitVars($fields)}\t}
/*
* @static function &getInstance
@@ -173,8 +173,8 @@
*/
public function getHeadFunctionForm($module, $table)
{
- $module_name = strtolower($module->getVar('mod_name'));
- $language = $this->getLanguage($module_name, 'AM');
+ $module_dirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($module_dirname, 'AM');
$stu_table_name = strtoupper($table->getVar('table_name'));
$this->formelements->initForm($module, $table);
$ret = <<<EOT
@@ -200,13 +200,13 @@
}
/*
* @public function getPermissionsInFunctionForm
- * @param string $module_name
+ * @param string $module_dirname
* @param string $fpif
*/
- public function getPermissionsInFunctionForm($module_name, $fpif) {
- $perm_approve = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_APPROVE');
- $perm_submit = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_SUBMIT');
- $perm_view = $this->getLanguage($module_name, 'AM', 'PERMISSIONS_VIEW');
+ public function getPermissionsInFunctionForm($module_dirname, $fpif) {
+ $perm_approve = $this->getLanguage($module_dirname, 'AM', 'PERMISSIONS_APPROVE');
+ $perm_submit = $this->getLanguage($module_dirname, 'AM', 'PERMISSIONS_SUBMIT');
+ $perm_view = $this->getLanguage($module_dirname, 'AM', 'PERMISSIONS_VIEW');
$ret = <<<EOT
// Permissions
\$member_handler = & xoops_gethandler ( 'member' );
@@ -215,9 +215,9 @@
\$full_list = array_keys ( \$group_list );
global \$xoopsModule;
if ( !\$this->isNew() ) {
- \$groups_ids_approve = \$gperm_handler->getGroupIds ( '{$module_name}_approve', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
- \$groups_ids_submit = \$gperm_handler->getGroupIds ( '{$module_name}_submit', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
- \$groups_ids_view = \$gperm_handler->getGroupIds ( '{$module_name}_view', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
+ \$groups_ids_approve = \$gperm_handler->getGroupIds ( '{$module_dirname}_approve', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
+ \$groups_ids_submit = \$gperm_handler->getGroupIds ( '{$module_dirname}_submit', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
+ \$groups_ids_view = \$gperm_handler->getGroupIds ( '{$module_dirname}_view', \$this->getVar ( '{$fpif}' ), \$xoopsModule->getVar ( 'mid' ) );
\$groups_ids_approve = array_values ( \$groups_ids_approve );
\$groups_can_approve_checkbox = new XoopsFormCheckBox ( {$perm_approve}, 'groups_approve[]', \$groups_ids_approve );
\$groups_ids_submit = array_values ( \$groups_ids_submit );
@@ -258,18 +258,18 @@
}
/*
* @public function getClassHandler
- * @param string $module_name
+ * @param string $module_dirname
* @param string $table_name
* @param string $fpif
* @param string $fpmf
*/
- public function getClassHandler($module_name, $table_name, $fpif, $fpmf) {
- $ucf_module_name = ucfirst($module_name);
+ public function getClassHandler($module_dirname, $table_name, $fpif, $fpmf) {
+ $ucf_module_dirname = ucfirst($module_dirname);
$ucf_table_name = ucfirst($table_name);
- $ucf_mod_table_handler = $ucf_module_name . $ucf_table_name;
+ $ucf_mod_table_handler = $ucf_module_dirname . $ucf_table_name;
$ret = <<<EOT
/*
- * Class Object Handler {$ucf_module_name}{$ucf_table_name}
+ * Class Object Handler {$ucf_module_dirname}{$ucf_table_name}
*/
class {$ucf_mod_table_handler}Handler extends XoopsPersistableObjectHandler
{
@@ -280,7 +280,7 @@
*/
public function __construct(&\$db)
{
- parent::__construct(\$db, '{$module_name}_{$table_name}', '{$module_name}{$table_name}', '{$fpif}', '{$fpmf}');
+ parent::__construct(\$db, '{$module_dirname}_{$table_name}', '{$module_dirname}{$table_name}', '{$fpif}', '{$fpmf}');
}
}
EOT;
@@ -295,7 +295,7 @@
$table = $this->getTable();
$table_nbfields = $table->getVar('table_nbfields');
$table_name = $table->getVar('table_name');
- $module_name = strtolower($module->getVar('mod_name'));
+ $module_dirname = $module->getVar('mod_dirname');
$fields = $this->getTableFields($table->getVar('table_id'));
foreach(array_keys($fields) as $f)
{
@@ -308,15 +308,15 @@
}
}
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getHeadClass($module_name, $table_name, $fields);
+ $content .= $this->getHeadClass($module_dirname, $table_name, $fields);
$content .= $this->getHeadFunctionForm($module, $table);
if ($table->getVar('table_permissions') == 1) {
- $content .= $this->getPermissionsInFunctionForm($module_name, $fpif);
+ $content .= $this->getPermissionsInFunctionForm($module_dirname, $fpif);
}
$content .= $this->getFootFunctionForm();
- $content .= $this->getClassHandler($module_name, $table_name, $fpif, $fpmf);
+ $content .= $this->getClassHandler($module_dirname, $table_name, $fpif, $fpmf);
- $this->tdmcfile->create($module_name, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($module_dirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
}
\ No newline at end of file
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-06-29 03:11:49 UTC (rev 12664)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/classes/formelements.php 2014-06-29 21:44:03 UTC (rev 12665)
@@ -68,7 +68,7 @@
*/
public function getXoopsFormText($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormText({$language}, '{$field_name}', 50, 255, \$this->getVar('{$field_name}')){$required});\n
+ \$form->addElement( new XoopsFormText({$language}, '{$field_name}', 50, 255, \$this->getVar('{$field_name}')){$required} );\n
EOT;
return $ret;
}
@@ -80,18 +80,18 @@
*/
public function getXoopsFormTextArea($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormTextArea({$language}, '{$field_name}', \$this->getVar('{$field_name}'), 4, 47){$required});\n
+ \$form->addElement( new XoopsFormTextArea({$language}, '{$field_name}', \$this->getVar('{$field_name}'), 4, 47){$required} );\n
EOT;
return $ret;
}
/*
* @public function getXoopsFormDhtmlTextArea
* @param string $language
- * @param string $module_name
+ * @param string $module_dirname
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormDhtmlTextArea($language, $module_name, $field_name, $required = 'false') {
+ public function getXoopsFormDhtmlTextArea($language, $module_dirname, $field_name, $required = 'false') {
$ret = <<<EOT
\$editor_configs = array();
\$editor_configs['name'] = '{$field_name}';
@@ -100,8 +100,8 @@
\$editor_configs['cols'] = 40;
\$editor_configs['width'] = '100%';
\$editor_configs['height'] = '400px';
- \$editor_configs['editor'] = xoops_getModuleOption('{$module_name}_editor', '{$module_name}');
- \$form->addElement( new XoopsFormEditor({$language}, '{$field_name}', \$editor_configs){$required});\n
+ \$editor_configs['editor'] = \$this->{$module_dirname}->getConfig('{$module_dirname}_editor');
+ \$form->addElement( new XoopsFormEditor({$language}, '{$field_name}', \$editor_configs){$required} );\n
EOT;
return $ret;
}
@@ -116,7 +116,7 @@
\${$field_name} = \$this->isNew() ? 0 : \$this->getVar('{$field_name}');
\$check_{$field_name} = new XoopsFormCheckBox({$language}, '{$field_name}', \${$field_name});
\$check_{$field_name}->addOption(1, " ");
- \$form->addElement(\$check_{$field_name}{$required});\n
+ \$form->addElement( \$check_{$field_name}{$required} );\n
EOT;
return $ret;
}
@@ -126,7 +126,7 @@
*/
public function getXoopsFormHidden($field_name) {
$ret = <<<EOT
- \$form->addElement(new XoopsFormHidden('{$field_name}', \$this->getVar('{$field_name}')));\n
+ \$form->addElement( new XoopsFormHidden('{$field_name}', \$this->getVar('{$field_name}')) );\n
EOT;
return $ret;
}
@@ -136,9 +136,9 @@
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormUploadFile($language, $field_name, $required = 'false') {
+ public function getXoopsFormUploadFile($language, $module_dirname, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormUploadFile({$language}, '{$field_name}', \$GLOBALS['xoopsModuleConfig']['maxsize']){$required});\n
+ \$form->addElement( new XoopsFormFile({$language}, '{$field_name}', \$this->{$module_dirname}->getConfig('maxsize')){$required} );\n
EOT;
return $ret;
}
@@ -149,10 +149,10 @@
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormUploadImage($language, $table_name, $field_name, $required = 'false') {
+ public function getXoopsFormUploadImage($language, $module_dirname, $table_name, $field_name, $required = 'false') {
$stu_field_name = strtoupper($field_name);
$ret = <<<EOT
- //\$form->addElement(new XoopsFormUploadImage({$language}, '{$field_name}', \$GLOBALS['xoopsModuleConfig']['maxsize']){$required});
+ //\$form->addElement(new XoopsFormImage({$language}, '{$field_name}', \$this->{$module_dirname}->getConfig('maxsize')){$required});
\$get_{$field_name} = \$this->getVar('{$field_name}');
\${$field_name} = \$get_{$field_name} ? \$get_{$field_name} : 'blank.gif';
\$iconsdir = '/Frameworks/moduleclasses/icons/32';
@@ -179,10 +179,10 @@
\$imgtray1->addElement(\$imageselect1, false);
\$imgtray1->addElement( new XoopsFormLabel( '', "<br /><img src='".XOOPS_URL."/".\$iconsdirectory."/".\${$field_name}."' name='image1' id='image1' alt='' />" ) );
\$fileseltray1 = new XoopsFormElementTray('','<br />');
- \$fileseltray1->addElement(new XoopsFormFile({$language}FORMUPLOAD , 'attachedfile', \$GLOBALS['xoopsModuleConfig']['maxsize']));
+ \$fileseltray1->addElement(new XoopsFormFile({$language}FORMUPLOAD , 'attachedfile', \$this->{$module_dirname}->getConfig('maxsize')));
\$fileseltray1->addElement(new XoopsFormLabel(''));
\$imgtray1->addElement(\$fileseltray1);
- \$form->addElement(\$imgtray1{$required});\n
+ \$form->addElement( \$imgtray1{$required} );\n
EOT;
return $ret;
}
@@ -192,9 +192,9 @@
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormColorPicker($language, $field_name, $required = 'false') {
+ public function getXoopsFormColorPicker($language, $module_dirname, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormColorPicker({$language}, '{$field_name}', \$xoopsModuleConfig['maxsize']){$required});\n
+ \$form->addElement( new XoopsFormColorPicker({$language}, '{$field_name}', \$this->{$module_dirname}->getConfig('maxsize')){$required} );\n
EOT;
return $ret;
}
@@ -209,7 +209,7 @@
$ret = <<<EOT
\${$field_name}_select = new XoopsFormSelect({$language}, '{$field_name}', \$this->getVar('{$field_name}'));
\${$field_name}_select->addOptionArray({$table_name}Handler->getList());
- \$form->addElement(\${$field_name}_select{$required});\n
+ \$form->addElement( \${$field_name}_select{$required} );\n
EOT;
return $ret;
}
@@ -221,7 +221,7 @@
*/
public function getXoopsFormSelectUser($language, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormSelectUser({$language}, '{$field_name}', false, \$this->getVar('{$field_name}'), 1, false){$required});\n
+ \$form->addElement( new XoopsFormSelectUser({$language}, '{$field_name}', false, \$this->getVar('{$field_name}'), 1, false){$required} );\n
EOT;
return $ret;
}
@@ -234,7 +234,7 @@
public function getXoopsFormRadioYN($language, $field_name, $required = 'false') {
$ret = <<<EOT
${$field_name} = \$this->isNew() ? 0 : \$this->getVar('{$field_name}');
- \$form->addElement(new XoopsFormRadioYN({$language}, '{$field_name}', ${$field_name}){$required});\n
+ \$form->addElement( new XoopsFormRadioYN({$language}, '{$field_name}', ${$field_name}){$required} );\n
EOT;
return $ret;
}
@@ -244,21 +244,21 @@
* @param string $field_name
* @param string $required
*/
- public function getXoopsFormTextDateSelect($language, $field_name, $required = 'false') {
+ public function getXoopsFormTextDateSelect($language, $module_dirname, $field_name, $required = 'false') {
$ret = <<<EOT
- \$form->addElement(new XoopsFormTextDateSelect({$language}, '{$field_name}', '', \$this->getVar('{$field_name}')){$required});\n
+ \$form->addElement( new XoopsFormTextDateSelect({$language}, '{$field_name}', '', \$this->getVar('{$field_name}')){$required} );\n
EOT;
return $ret;
}
/*
* @public function getXoopsFormTable
* @param string $language
- * @param string $module_name
+ * @param string $module_dirname
* @param string $table_name
* @param string $fields
* @param string $required
*/
- public function getXoopsFormTable($language, $module_name, $table_name, $fields, $required = 'false')
+ public function getXoopsFormTable($language, $module_dirname, $table_name, $fields, $required = 'false')
{
$field_name = '';
foreach(array_keys($fields) as $f)
@@ -268,22 +268,22 @@
}
}
$ret = <<<XFT
- \${$table_name}Handler =& xoops_getModuleHandler('{$table_name}', '{$module_name}');
+ \${$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());
- \$form->addElement(\${$field_name}_select{$required});\n
+ \$form->addElement( \${$field_name}_select{$required} );\n
XFT;
return $ret;
}
/*
* @public function getXoopsFormTopic
* @param string $language
- * @param string $module_name
+ * @param string $module_dirname
* @param string $table_name
* @param string $fields
* @param string $required
*/
- public function getXoopsFormTopic($language, $module_name, $table_name, $fields, $required = 'false')
+ public function getXoopsFormTopic($language, $module_dirname, $table_name, $fields, $required = 'false')
{
foreach(array_keys($fields) as $f)
{
@@ -300,13 +300,13 @@
}
$ret = <<<XFT
include_once(XOOPS_ROOT_PATH . '/class/tree.php');
- \${$table_name}Handler = xoops_getModuleHandler('{$table_name}', '\${$module_name}' );
+ \${$table_name}Handler = \$this->{$module_dirname}->getHandler('{$table_name}');
\$criteria = new CriteriaCompo();
\${$table_name} = \${$table_name}Handler->getObjects( \$criteria );
if(\${$table_name}) {
\${$table_name}_tree = new XoopsObjectTree( \${$table_name}, '{$field_id}', '{$field_pid}' );
\${$field_pid} = \${$table_name}_tree->makeSelBox( '{$field_pid}', '{$field_main}','--', \$this->getVar('{$field_pid}', 'e' ), true );
- \$form->addElement( new XoopsFormLabel ( {$language}, \${$field_pid} ){$required});
+ \$form->addElement( new XoopsFormLabel ( {$language}, \${$field_pid} ){$required} );
}\n
XFT;
return $ret;
@@ -318,9 +318,9 @@
public function renderElements() {
$module = $this->getModule();
$table = $this->getTable();
- $module_name = $module->getVar('mod_name');
+ $module_dirname = $module->getVar('mod_dirname');
$table_name = $table->getVar('table_name');
- $language_funct = $this->getLanguage($module_name, 'AM');
+ $language_funct = $this->getLanguage($module_dirname, 'AM');
$language_table = $language_funct . strtoupper($table_name);
$ret = '';
$fields = $this->getTableFields($table->getVar('table_id'));
@@ -341,7 +341,7 @@
$ret .= $this->getXoopsFormTextArea($language, $field_name, $required);
break;
case 3:
- $ret .= $this->getXoopsFormDhtmlTextArea($language, $module_name, $field_name, $required);
+ $ret .= $this->getXoopsFormDhtmlTextArea($language, $module_dirname, $field_name, $required);
break;
case 4:
$ret .= $this->getXoopsFormCheckBox($language, $field_name, $required);
@@ -356,16 +356,16 @@
$ret .= $this->getXoopsFormSelectUser($language, $field_name, $required);
break;
case 8:
- $ret .= $this->getXoopsFormColorPicker($language, $field_name, $required);
+ $ret .= $this->getXoopsFormColorPicker($language, $module_dirname, $field_name, $required);
break;
case 9:
- $ret .= $this->getXoopsFormUploadImage($language_funct, $table_name, $field_name, $required);
+ $ret .= $this->getXoopsFormUploadImage($language_funct, $module_dirname, $table_name, $field_name, $required);
break;
case 10:
- $ret .= $this->getXoopsFormUploadFile...
[truncated message content] |
