Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13041] XoopsModules/TDMCreate/branches/timgno/1.91a1 /tdmcreate
|
From: <txm...@us...> - 2015-04-24 17:26:27
|
Revision: 13041
http://sourceforge.net/p/xoops/svn/13041
Author: txmodxoops
Date: 2015-04-24 17:26:17 +0000 (Fri, 24 Apr 2015)
Log Message:
-----------
Changed elements index, added more elements
Work in progress
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/modules.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/tables.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/icons/32/category.png
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/icons/32/stats.png
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/js/functions.js
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/TDMCreateArchitecture.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminMenu.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminObjects.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminPermissions.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/classes/ClassFiles.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/classes/ClassFormElements.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/language/LanguageAdmin.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/language/LanguageModinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/blocks/TemplatesBlocks.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/user/TemplatesUserPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserHeader.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserSubmit.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserXoopsVersion.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/logoGenerator.php
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/sql/mysql.sql
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/images/tdmcreate_logo.png
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/fields.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/fields.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -61,6 +61,8 @@
unset($countTables);
// Get the list of tables
$criteria = new CriteriaCompo();
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
$criteria->setSort('table_id ASC, table_name');
$criteria->setOrder('ASC');
$countTables = $tdmcreate->getHandler('tables')->getCount($criteria);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/modules.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/modules.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -42,6 +42,8 @@
$GLOBALS['xoopsTpl']->assign('modPathIcon16', $modPathIcon16);
$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
$criteria = new CriteriaCompo();
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
$criteria->setSort('mod_id ASC, mod_name');
$criteria->setOrder('ASC');
$nb_modules = $tdmcreate->getHandler('modules')->getCount( $criteria );
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/tables.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/admin/tables.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -53,6 +53,8 @@
$GLOBALS['xoopsTpl']->assign('sysPathIcon32', $sysPathIcon32);
// Get the list of modules
$criteria = new CriteriaCompo();
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
$criteria->setSort('mod_id ASC, mod_name');
$criteria->setOrder('ASC');
$numbModules = $tdmcreate->getHandler('modules')->getCount($criteria);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/icons/32/category.png
===================================================================
(Binary files differ)
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/icons/32/stats.png
===================================================================
(Binary files differ)
Added: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/images/tdmcreate_logo.png
===================================================================
(Binary files differ)
Index: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/images/tdmcreate_logo.png
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/images/tdmcreate_logo.png 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/images/tdmcreate_logo.png 2015-04-24 17:26:17 UTC (rev 13041)
Property changes on: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/images/tdmcreate_logo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/js/functions.js
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/js/functions.js 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/assets/js/functions.js 2015-04-24 17:26:17 UTC (rev 13041)
@@ -1,3 +1,7 @@
+/*
+ * JQuery javascript functions
+ *
+ */
function swapImg(swap) {
obj = document.getElementById(swap);
obj.src = !(obj.src == img_minus) ? img_minus : img_plus;
@@ -12,7 +16,7 @@
if (selectDom.options[selectDom.selectedIndex].value != "") {
imgDom.src = xoopsUrl + imgDir + "/" + selectDom.options[selectDom.selectedIndex].value + extra;
} else {
- imgDom.src = xoopsUrl + "/modules/TDMCreate/assets/images/icons/blank.gif";
+ imgDom.src = xoopsUrl + "/modules/tdmcreate/assets/icons/blank.gif";
}
}
@@ -35,7 +39,7 @@
//alert(data1);
logoDom.src = data1.split('\n')[0];//the data returned has too many lines. We need only the link to the image
logoDom.load; //refresh the logo
- mycheck=caption+'_slogo.png'; //name of the new logo file
+ mycheck=caption+'_logo.png'; //name of the new logo file
//if file is not in the list of logo files, add it to the dropdown menu
var fileExist;
elems = moduleImageDom.options;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/fields.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/fields.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -226,7 +226,11 @@
$field_parent = 0;
$check_field_parent = new XoopsFormCheckBox(' ', 'field_parent['.$i.']');
$check_field_parent->addOption($field_parent, _AM_TDMCREATE_FIELD_PARENT );
- $parameters_tray->addElement($check_field_parent);
+ $parameters_tray->addElement($check_field_parent);
+ /*$field_parent = ($table_autoincrement == 1) ? 2 : 1;
+ $check_field_parent = new TDMCreateFormRadio('', 'field_parent', $field_parent);
+ $check_field_parent->addOption($i, _AM_TDMCREATE_FIELD_PARENT );
+ $parameters_tray->addElement($check_field_parent);*/
$field_inlist = 0;
$check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$i.']', $field_inlist);
@@ -359,7 +363,11 @@
$check_field_parent = new XoopsFormCheckBox(' ', 'field_parent['.$id.']', $field->getVar('field_parent'));
$check_field_parent->addOption(1, _AM_TDMCREATE_FIELD_PARENT );
- $parameters_tray->addElement($check_field_parent);
+ $parameters_tray->addElement($check_field_parent);
+ /*$field_parent = ($field->getVar('field_parent') == 1) ? $id : 1;
+ $check_field_parent = new TDMCreateFormRadio('', 'field_parent', $field_parent);
+ $check_field_parent->addOption($id, _AM_TDMCREATE_FIELD_PARENT );
+ $parameters_tray->addElement($check_field_parent);*/
$check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist['.$id.']', $field->getVar('field_inlist'));
$check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/TDMCreateArchitecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/TDMCreateArchitecture.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/TDMCreateArchitecture.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -347,20 +347,17 @@
$languageBlocks->write($module, $tables, 'blocks.php');
$ret[] = $languageBlocks->render();
}
- // Creation of admin files
- if ( $table->getVar('table_admin') == 1) {
- // Creation of admin permission file
- if (( $table->getVar('table_permissions') == 1)) {
- // Admin Permissions File
- $adminPermissions = AdminPermissions::getInstance();
- $adminPermissions->write($module, $tables, 'permissions.php');
- $ret[] = $adminPermissions->render();
- // Templates Admin Permissions File
- $adminTemplatesPermissions = TemplatesAdminPermissions::getInstance();
- $adminTemplatesPermissions->write($module, $moduleDirname.'_admin_permissions.tpl');
- $ret[] = $adminTemplatesPermissions->render();
- }
- }
+ // Creation of admin permission file
+ if ( $table->getVar('table_permissions') == 1 ) {
+ // Admin Permissions File
+ $adminPermissions = AdminPermissions::getInstance();
+ $adminPermissions->write($module, $tables, 'permissions.php');
+ $ret[] = $adminPermissions->render();
+ // Templates Admin Permissions File
+ $adminTemplatesPermissions = TemplatesAdminPermissions::getInstance();
+ $adminTemplatesPermissions->write($module, $moduleDirname.'_admin_permissions.tpl');
+ $ret[] = $adminTemplatesPermissions->render();
+ }
// Creation of notifications files
if ( $table->getVar('table_notifications') == 1 ) {
// Include Notifications File
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminMenu.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminMenu.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminMenu.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -95,7 +95,7 @@
{
$fieldElement = $fields[$f]->getVar('field_element');
switch( $fieldElement ) {
- case 11:
+ case 13:
$ret = <<<EOT
\$adminmenu[\$i]['icon'] = 'assets/icons/32/{$tables[$t]->getVar('table_image')}';\n
EOT;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminObjects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminObjects.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminObjects.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -71,6 +71,18 @@
return $ret;
}
/*
+ * @public function getUrlFileSetVar
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getUrlFileSetVar($tableName, $fieldName) {
+ $ret = <<<EOT
+ // Set Var {$fieldName}
+ \${$tableName}Obj->setVar('{$fieldName}', formtUrl(\$_REQUEST['{$fieldName}']));\n
+EOT;
+ return $ret;
+ }
+ /*
* @public function getImageListSetVar
* @param string $moduleDirname
* @param string $tableName
@@ -83,9 +95,9 @@
\$uploaddir = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32';
\$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'),
\${$moduleDirname}->getConfig('maxsize'), null, null);
- if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) {
+ if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) {
//\$uploader->setPrefix('{$fieldName}_');
- //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]);
+ //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][]);
if (!\$uploader->upload()) {
\$errors = \$uploader->getErrors();
redirect_header('javascript:history.go(-1)', 3, \$errors);
@@ -112,9 +124,9 @@
\$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/images/{$tableName}';
\$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'),
\${$moduleDirname}->getConfig('maxsize'), null, null);
- if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) {
+ if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) {
//\$uploader->setPrefix('{$fieldName}_');
- //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]);
+ //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][]);
if (!\$uploader->upload()) {
\$errors = \$uploader->getErrors();
redirect_header('javascript:history.go(-1)', 3, \$errors);
@@ -141,9 +153,9 @@
\$uploaddir = {$stuModuleDirname}_UPLOAD_PATH.'/files/{$tableName}';
\$uploader = new XoopsMediaUploader(\$uploaddir, \${$moduleDirname}->getConfig('mimetypes'),
\${$moduleDirname}->getConfig('maxsize'), null, null);
- if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0])) {
+ if (\$uploader->fetchMedia(\$_POST['xoops_upload_file'][])) {
//\$uploader->setPrefix('{$fieldName}_') ;
- //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][0]);
+ //\$uploader->fetchMedia(\$_POST['xoops_upload_file'][]);
if (!\$uploader->upload()) {
\$errors = \$uploader->getErrors();
redirect_header('javascript:history.go(-1)', 3, \$errors);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminPages.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminPages.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -86,7 +86,7 @@
* @param string $fpif
* @param string $fpmf
*/
- public function getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fpmf) {
+ public function getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fieldInForm, $fpmf) {
$stuModuleDirname = strtoupper($moduleDirname);
$tableName = $table->getVar('table_name');
$tableAutoincrement = $table->getVar('table_autoincrement');
@@ -98,10 +98,18 @@
\$start = XoopsRequest::getInt('start', 0);
\$limit = XoopsRequest::getInt('limit', \${$moduleDirname}->getConfig('adminpager'));
\$template_main = '{$moduleDirname}_admin_{$tableName}.tpl';
- \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));
+ \$GLOBALS['xoopsTpl']->assign('navigation', \$adminMenu->addNavigation('{$tableName}.php'));\n
+EOT;
+ if ($fieldInForm == 1) {
+ $ret .= <<<EOT
\$adminMenu->addItemButton({$language}ADD_{$stuTableFieldname}, '{$tableName}.php?op=new', 'add');
- \$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());
+ \$GLOBALS['xoopsTpl']->assign('buttons', \$adminMenu->renderButton());\n
+EOT;
+ }
+ $ret .= <<<EOT
\$criteria = new CriteriaCompo();
+ \$criteria->setStart(\$start);
+ \$criteria->setLimit(\$limit);
\$criteria->setSort('{$fpif} ASC, {$fpmf}');
\$criteria->setOrder('ASC');
\${$tableName}Count = \${$tableName}Handler->getCount(\$criteria);
@@ -134,14 +142,17 @@
$ret .= $this->adminobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
case 12:
+ $ret .= $this->adminobjects->getUrlFileGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ case 13:
$ret .= $this->adminobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
- case 14:
+ case 15:
$ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
default:
- if( ($fieldParent == 1) && !$table->getVar('table_category') ) {
- if($fieldElement > 13) {
+ if( ($fieldParent == 1) && $table->getVar('table_category') == 0 ) {
+ if($fieldElement > 15) {
$fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
$fieldElementTid = $fieldElements->getVar('fieldelement_tid');
$fieldElementName = $fieldElements->getVar('fieldelement_name');
@@ -243,16 +254,19 @@
case 6:
$ret .= $this->adminobjects->getCheckBoxOrRadioYNSetVar($tableName, $fieldName);
break;
- case 10:
+ case 11:
$ret .= $this->adminobjects->getImageListSetVar($moduleDirname, $tableName, $fieldName);
break;
- case 11:
+ case 12:
+ $ret .= $this->adminobjects->getUrlFileSetVar($tableName, $fieldName);
+ break;
+ case 13:
$ret .= $this->adminobjects->getUploadImageSetVar($moduleDirname, $tableName, $fieldName);
break;
- case 12:
+ case 14:
$ret .= $this->adminobjects->getUploadFileSetVar($moduleDirname, $tableName, $fieldName);
break;
- case 13:
+ case 15:
$ret .= $this->adminobjects->getTextDateSelectSetVar($tableName, $fieldName);
break;
default:
@@ -387,6 +401,7 @@
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
+ $fieldInForm = $fields[$f]->getVar('field_inform');
if($f == 0) {
$fpif = $fieldName;
}
@@ -396,10 +411,12 @@
}
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getAdminPagesHeader($moduleDirname, $tableName, $fpif);
- $content .= $this->getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fpmf);
- $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->getAdminPagesList($moduleDirname, $table, $tableFieldname, $language, $fields, $fpif, $fieldInForm, $fpmf);
+ if ($fieldInForm == 1) {
+ $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->getAdminPagesDelete($tableName, $language, $fpif, $fpmf);
$content .= $this->getAdminPagesFooter();
//
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminPermissions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminPermissions.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/admin/AdminPermissions.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -54,11 +54,11 @@
$this->setFileName($filename);
}
/*
- * @private function getPermissionsCodeHeader
+ * @private function getPermissionsHeader
* @param string $moduleDirname
* @param string $language
*/
- private function getPermissionsCodeHeader($moduleDirname, $language)
+ private function getPermissionsHeader($moduleDirname, $language)
{
$ret = <<<PRM
\ninclude_once 'header.php';
@@ -94,11 +94,11 @@
}
/*
- * @private function getPermissionsCodeSwitch
+ * @private function getPermissionsSwitch
* @param string $moduleDirname
* @param string $language
*/
- private function getPermissionsCodeSwitch($moduleDirname, $language)
+ private function getPermissionsSwitch($moduleDirname, $language)
{
$ret = <<<PRM
\$module_id = \$xoopsModule->getVar('mid');
@@ -133,12 +133,12 @@
}
/*
- * @private function getPermissionsCodeBody
+ * @private function getPermissionsBody
* @param string $moduleDirname
* @param string $tableName
* @param string $language
*/
- private function getPermissionsCodeBody($moduleDirname, $language)
+ private function getPermissionsBody($moduleDirname, $language)
{
$tables = $this->getTables();
foreach(array_keys($tables) as $t)
@@ -151,11 +151,12 @@
$fields = $this->getTableFields($tableId);
foreach(array_keys($fields) as $f)
{
+ $fieldName = $fields[$f]->getVar('field_name');
if($f == 0) {
- $fpif = $fields[$f]->getVar('field_name');
+ $fpif = $fieldName;
}
if($fields[$f]->getVar('field_main') == 1) {
- $fpmf = $fields[$f]->getVar('field_name');
+ $fpmf = $fieldName;
}
}
$ret = <<<PRM
@@ -189,10 +190,10 @@
}
/*
- * @private function getPermissionsCodeFooter
+ * @private function getPermissionsFooter
* @param null
*/
- private function getPermissionsCodeFooter() {
+ private function getPermissionsFooter() {
$ret = <<<PRM
}
unset(\$permform);
@@ -211,10 +212,10 @@
$moduleDirname = $module->getVar('mod_dirname');
$language = $this->getLanguage($moduleDirname, 'AM');
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getPermissionsCodeHeader($moduleDirname, $language);
- $content .= $this->getPermissionsCodeSwitch($moduleDirname, $language);
- $content .= $this->getPermissionsCodeBody($moduleDirname, $language);
- $content .= $this->getPermissionsCodeFooter();
+ $content .= $this->getPermissionsHeader($moduleDirname, $language);
+ $content .= $this->getPermissionsSwitch($moduleDirname, $language);
+ $content .= $this->getPermissionsBody($moduleDirname, $language);
+ $content .= $this->getPermissionsFooter();
//
$this->tdmcfile->create($moduleDirname, 'admin', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/classes/ClassFiles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/classes/ClassFiles.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/classes/ClassFiles.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -422,6 +422,7 @@
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
+ $fieldInForm = $fields[$f]->getVar('field_inform');
if(($f == 0) && ($table->getVar('table_autoincrement') == 1)) {
$fpif = $fieldName; // $fpif = fields parameter index field
}
@@ -431,11 +432,13 @@
}
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getHeadClass($moduleDirname, $tableName, $fields);
- $content .= $this->getHeadInForm($module, $table);
- if ($table->getVar('table_permissions') == 1) {
- $content .= $this->getPermissionsInForm($moduleDirname, $fpif);
+ if ($fieldInForm == 1) {
+ $content .= $this->getHeadInForm($module, $table);
+ if ($table->getVar('table_permissions') == 1) {
+ $content .= $this->getPermissionsInForm($moduleDirname, $fpif);
+ }
+ $content .= $this->getFootInForm();
}
- $content .= $this->getFootInForm();
$content .= $this->getToArray();
$content .= $this->getClassHandler($moduleDirname, $tableName, $tableCategory, $tableFieldname, $fpif, $fpmf);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/classes/ClassFormElements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/classes/ClassFormElements.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/classes/ClassFormElements.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -167,6 +167,46 @@
return $ret;
}
/*
+ * @private function getXoopsFormSelectFile
+ * @param string $language
+ * @param string $moduleDirname
+ * @param string $fieldName
+ * @param string $fieldDefault
+ * @param string $fieldElement
+ * @param string $required
+ */
+ private function getXoopsFormSelectFile($language, $moduleDirname, $fieldName, $fieldElement, $required = 'false') {
+ $ret = <<<EOT
+ // Image Select or Upload
+ if ( \$this->{$moduleDirname}->getConfig('useshots') ){
+ \${$fieldName} = \$this->getVar('{$fieldName}');
+ \$uploadirectory = '/uploads/{$moduleDirname}/images/shots';
+ \$uploaddir = XOOPS_ROOT_PATH . \$uploadirectory . '/' . \${$fieldName};
+ \${$moduleDirname}cat_img = \${$fieldName} ? \${$fieldName} : 'blank.gif';
+ if (!is_file(\$uploaddir)){
+ \${$moduleDirname}cat_img = 'blank.gif';
+ }
+ \$imgtray = new XoopsFormElementTray({$language}_FORMIMG,'<br />');
+ \$imgpath = sprintf({$language}_FORMPATH, \$uploadirectory );
+ \$imageselect = new XoopsFormSelect(\$imgpath, 'selected_img',\${$moduleDirname}cat_img);
+ \${$fieldName}_array = XoopsLists :: getImgListAsArray( XOOPS_ROOT_PATH . \$uploadirectory );
+ foreach( \${$fieldName}_array as \$image ) {
+ \$imageselect->addOption("\$image", \$image);
+ }
+ \$imageselect->setExtra( "onchange='showImgSelected(\"image3\", \"selected_img\", \"" . \$uploadirectory . "\", \"\", \"" . XOOPS_URL . "\")'" );
+ \$imgtray->addElement(\$imageselect,false);
+ \$imgtray -> addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_URL . "/" . \$uploadirectory . "/" . \${$moduleDirname}cat_img . "' name='image3' id='image3' alt='' />" ) );
+ \$fileseltray= new XoopsFormElementTray('','<br />');
+ //if (\$perm_upload == true) {
+ \$fileseltray->addElement(new XoopsFormFile({$language}_FORMUPLOAD , 'attachedimage', \$this->{$moduleDirname}->getConfig('maxuploadsize')){$required});
+ //}
+ \$imgtray->addElement(\$fileseltray);
+ \$form->addElement(\$imgtray);
+ }\n
+EOT;
+ return $ret;
+ }
+ /*
* @private function getXoopsFormTextFile
* @param string $language
* @param string $moduleDirname
@@ -175,16 +215,12 @@
* @param string $fieldElement
* @param string $required
*/
- private function getXoopsFormTextFile($language, $moduleDirname, $fieldName, $fieldDefault, $fieldElement, $required = 'false') {
- if($fieldElement == 11 ) {
- $f_text = $fieldName;
- $f_default = $fieldDefault;
- }
+ private function getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, $fieldElement, $required = 'false') {
$ret = <<<EOT
// Form Text File
\$formTextFile = new XoopsFormElementTray({$language}FORM_FILE,'<br /><br />');
- \$field_text = \$this->isNew() ? '{$f_default}' : \$this->getVar('{$f_text}');
- \$formText = new XoopsFormText({$language}FORM_TEXT, '{$f_text}', 75, 255, \$field_text);
+ \$field_text = \$this->isNew() ? '{$fieldDefault}' : \$this->getVar('{$fieldName}');
+ \$formText = new XoopsFormText({$language}FORM_TEXT, '{$fieldName}', 75, 255, \$field_text);
\$formTextFile->addElement(\$formText{$required} );
\$formTextFile->addElement(new XoopsFormFile({$language}FORM_UPLOAD , 'attachedfile', \$this->{$moduleDirname}->getConfig('maxsize')){$required});
\$form->addElement(\$formTextFile);\n
@@ -237,13 +273,13 @@
return $ret;
}
/*
- * @private function getXoopsFormSelect
+ * @private function getXoopsFormSelectBox
* @param string $language
* @param string $tableName
* @param string $fieldName
* @param string $required
*/
- private function getXoopsFormSelect($language, $tableName, $fieldName, $required = 'false') {
+ private function getXoopsFormSelectBox($language, $tableName, $fieldName, $required = 'false') {
$ret = <<<EOT
// Form Select
\${$fieldName}_select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}'));
@@ -304,7 +340,7 @@
private function getXoopsFormTable($language, $moduleDirname, $tableName, $fieldName, $fieldElement, $required = 'false')
{
$ucfTableName = ucfirst($tableName);
- if($fieldElement > 14) {
+ if($fieldElement > 15) {
$fElement = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
$rpFieldelementName = strtolower(str_replace('Table : ', '', $fElement->getVar('fieldelement_name')));
}
@@ -410,7 +446,7 @@
$ret .= $this->getXoopsFormRadioYN($language, $fieldName, $required);
break;
case 7:
- $ret .= $this->getXoopsFormSelect($language, $tableName, $fieldName, $required);
+ $ret .= $this->getXoopsFormSelectBox($language, $tableName, $fieldName, $required);
break;
case 8:
$ret .= $this->getXoopsFormSelectUser($language, $fieldName, $required);
@@ -422,15 +458,18 @@
$ret .= $this->getXoopsFormImageList($language_funct, $moduleDirname, $tableName, $fieldName, $required);
break;
case 11:
- $ret .= $this->getXoopsFormTextFile($language, $moduleDirname, $fieldName, $fieldDefault, $fieldElement, $required);
+ $ret .= $this->getXoopsFormSelectFile($language, $moduleDirname, $fieldName, $fieldElement, $required);
break;
case 12:
+ $ret .= $this->getXoopsFormUrlFile($language, $moduleDirname, $fieldName, $fieldDefault, $fieldElement, $required);
+ break;
+ case 13:
$ret .= $this->getXoopsFormUploadImage($language_funct, $moduleDirname, $tableName, $required);
break;
- case 13:
+ case 14:
$ret .= $this->getXoopsFormUploadFile($language, $moduleDirname, $tableName, $fieldName, $required);
break;
- case 14:
+ case 15:
$ret .= $this->getXoopsFormTextDateSelect($language, $moduleDirname, $fieldName, $required);
break;
default:
@@ -440,8 +479,8 @@
}
break;
}
- if ($fieldElement > 14) {
- if($table->getVar('table_category') == 1) {
+ if ($fieldElement > 15) {
+ if(($table->getVar('table_category') == 1) || ($fieldParent == 1)) {
$ret .= $this->getXoopsFormTopic($language, $moduleDirname, $table, $fields, $required);
} else {
$ret .= $this->getXoopsFormTable($language, $moduleDirname, $tableName, $fieldName, $fieldElement, $required);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/language/LanguageAdmin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/language/LanguageAdmin.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/language/LanguageAdmin.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -159,10 +159,10 @@
case 10:
$ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_LIST_{$stuTableName}", "{$fieldNameDesc} in frameworks images");
break;
- case 11:
+ case 13:
$ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_{$stuTableName}", "{$fieldNameDesc} in uploads images");
break;
- case 12:
+ case 14:
$ret .= $this->defines->getDefine($language, "FORM_UPLOAD_FILE_{$stuTableName}", "{$fieldNameDesc} in uploads files");
break;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/language/LanguageModinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/language/LanguageModinfo.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/language/LanguageModinfo.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -184,6 +184,11 @@
$ret .= $this->defines->getDefine($language, "MIMETYPES", "Mime Types");
$ret .= $this->defines->getDefine($language, "MIMETYPES_DESC", "Set the mime types selected");
}
+ if ( $table->getVar('table_tag') != 0 )
+ {
+ $ret .= $this->defines->getDefine($language, "USE_TAG", "Use TAG");
+ $ret .= $this->defines->getDefine($language, "USE_TAG_DESC", "If you use tag module, check this option to yes");
+ }
}
$ret .= $this->defines->getDefine($language, "IDPAYPAL", "Paypal ID");
$ret .= $this->defines->getDefine($language, "IDPAYPAL_DESC", "Insert here your PayPal ID for donactions.");
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/admin/TemplatesAdminPages.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -121,7 +121,7 @@
<td class="center"><img src="<{xoModuleIcons32}><{\$list.{$rpFieldName}}>" alt="{$tableName}"></td>\n
EOT;
break;
- case 11:
+ case 13:
$ret .= <<<EOT
<td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$rpFieldName}}>" alt="{$tableName}"></td>\n
EOT;
@@ -184,7 +184,7 @@
<td class="center"><img src="<{xoModuleIcons32}><{\$list.{$fieldName}}>" alt="{$tableName}"></td>\n
EOT;
break;
- case 11:
+ case 13:
$ret .= <<<EOT
<td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$fieldName}}>" alt="{$tableName}"></td>\n
EOT;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/blocks/TemplatesBlocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/blocks/TemplatesBlocks.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/blocks/TemplatesBlocks.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -112,7 +112,7 @@
</td>\n
EOT;
break;
- case 11:
+ case 13:
$ret .= <<<EOT
<td class="center">
<img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$rpFieldName}}>" alt="{$tableName}">
@@ -166,7 +166,7 @@
</td>\n
EOT;
break;
- case 11:
+ case 13:
$ret .= <<<EOT
<td class="center">
<img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$fieldName}}>" alt="{$tableName}">
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/user/TemplatesUserPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/user/TemplatesUserPages.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/templates/user/TemplatesUserPages.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -115,7 +115,7 @@
<td class="center"><img src="<{xoModuleIcons32}><{\$list.{$rpFieldName}}>" alt="{$tableName}"></td>\n
EOT;
break;
- case 11:
+ case 13:
$ret .= <<<EOT
<td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$rpFieldName}}>" alt="{$tableName}"></td>\n
EOT;
@@ -162,7 +162,7 @@
<td class="center"><span style="background-color: #<{\$list.{$fieldName}}>;"></span></td>\n
EOT;
break;
- case 10:
+ case 13:
$ret .= <<<EOT
<td class="center"><img src="<{\${$moduleDirname}_upload_url}>/images/{$tableName}/<{\$list.{$fieldName}}>" alt="{$tableName}"></td>\n
EOT;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserHeader.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserHeader.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserHeader.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -73,19 +73,7 @@
\$pathname = XOOPS_ROOT_PATH. '/modules/'.\$dirname;
include_once \$pathname . '/include/common.php';
// Get instance of module
-\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();\n
-EOT;
- if (is_object($table)) {
- foreach (array_keys($tables) as $t)
- {
- $tableName = $tables[$t]->getVar('table_name');
- $content .= <<<EOT
-// {$tableName}
-\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}');\n
-EOT;
- }
- }
- $content .=<<<EOT
+\${$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();
//
\$myts =& MyTextSanitizer::getInstance();
\$style = {$stuModuleDirname}_URL . '/assets/css/style.css';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserPages.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserPages.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -72,7 +72,10 @@
$stlTableName = strtolower($tableName);
$ucfTableName = ucfirst($tableName);
$ret = <<<EOT
-\ninclude_once 'header.php';
+\ninclude_once 'header.php';
+// {$tableName}
+\${$tableName}Handler =& \${$moduleDirname}->getHandler('{$tableName}');
+//
\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl';
include_once XOOPS_ROOT_PATH . '/header.php';
\$start = {$moduleDirname}_CleanVars( \$_REQUEST, 'start', 0);
@@ -112,16 +115,19 @@
break;
case 8:
$ret .= $this->userobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 11:
+ break;
+ case 12:
+ $ret .= $this->adminobjects->getUrlFileGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ case 13:
$ret .= $this->userobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
- case 13:
+ case 15:
$ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
break;
default:
if( ($fieldParent == 1) && !$table->getVar('table_category') ) {
- if($fieldElement > 13) {
+ if($fieldElement > 15) {
$fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
$fieldElementTid = $fieldElements->getVar('fieldelement_tid');
$fieldElementName = $fieldElements->getVar('fieldelement_name');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserSubmit.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserSubmit.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserSubmit.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -133,13 +133,13 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
- if(($fieldElement == 4) || ($fieldElement == 5)) {
+ if(($fieldElement == 5) || ($fieldElement == 6)) {
$ret .= $this->adminobjects->getCheckBoxOrRadioYN($tableName, $fieldName);
- } elseif($fieldElement == 9) {
+ } elseif($fieldElement == 13) {
$ret .= $this->adminobjects->getUploadImage($moduleDirname, $tableName, $fieldName);
- } elseif($fieldElement == 10) {
+ } elseif($fieldElement == 14) {
$ret .= $this->adminobjects->getUploadFile($moduleDirname, $tableName, $fieldName);
- } elseif($fieldElement == 11) {
+ } elseif($fieldElement == 15) {
$ret .= $this->adminobjects->getTextDateSelect($tableName, $fieldName);
} else {
$ret .= $this->adminobjects->getSimpleSetVar($tableName, $fieldName);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserXoopsVersion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserXoopsVersion.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/files/user/UserXoopsVersion.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -422,11 +422,13 @@
'default' => "{$moduleDirname}, {$keyword}");\n\n
EOT;
unset($this->keywords);
- if (is_object($table)) {
+ if (is_object($table))
+ {
foreach (array_keys($fields) as $f)
{
$fieldElement = $fields[$f]->getVar('field_element');
- if(( $fieldElement == 9 ) || ( $fieldElement == 10 )) {
+ if(( $fieldElement == 10 ) || ( $fieldElement == 11 ) ||
+ ( $fieldElement == 12 ) || ( $fieldElement == 13 ) || ( $fieldElement == 14 )) {
$ret .= <<<EOT
//Uploads : maxsize of image
\$modversion['config'][] = array(
@@ -449,8 +451,8 @@
"jpeg" => "image/jpeg","jpg" => "image/jpg","jpe" => "image/jpe",
"png" => "image/png"));\n\n
EOT;
+ }
}
- }
if ($table->getVar('table_admin') == 1) {
$ret .= <<<EOT
\$modversion['config'][] = array(
@@ -474,6 +476,17 @@
EOT;
}
}
+ if ($table->getVar('table_tag') == 1) {
+ $ret .= <<<EOT
+\$modversion['config'][] = array(
+ 'name' => "usetag",
+ 'title' => "{$language}USE_TAG",
+ 'description' => "{$language}USE_TAG_DESC",
+ 'formtype' => "yesno",
+ 'valuetype' => "int",
+ 'default' => 0);\n\n
+EOT;
+ }
$ret .= <<<EOT
\$modversion['config'][] = array(
'name' => "advertise",
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/logoGenerator.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/logoGenerator.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/class/logoGenerator.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -53,9 +53,9 @@
$iconFileName = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/icons/32/".basename($logoIcon);
//$dirlogos = TDMC_PATH . "/assets/images/logos";
- $dirlogos = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/logos";
- if (!file_exists($imageBase = $dirlogos . "/xoops2.png") ||
- !file_exists($font = $dirlogos . "/VeraBd.ttf") ||
+ //$dirlogos = XOOPS_ROOT_PATH . "/modules/" . $dirname . "/assets/images/logos";
+ if (!file_exists($imageBase = TDMC_IMAGE_LOGOS_PATH . "/xoops2.png") ||
+ !file_exists($font = TDMC_IMAGE_LOGOS_PATH . "/VeraBd.ttf") ||
!file_exists($iconFile = $iconFileName)) {
return false;
}
@@ -70,8 +70,8 @@
imagecopy($imageModule, $imageIcon, 29, 2, 0, 0, 32, 32);
- //$targetImage = TDMC_UPLOAD_IMGMOD_URL . "/" . $moduleDirname . "_slogo.png";
- $targetImage = "/uploads/" . $dirname . "/images/repository/" . $moduleDirname . "_logo.png";
+ $targetImage = TDMC_UPLOAD_IMGMOD_URL . "/" . $moduleDirname . "_logo.png";
+ //$targetImage = "/uploads/" . $dirname . "/images/repository/" . $moduleDirname . "_logo.png";
imagepng($imageModule, XOOPS_ROOT_PATH . $targetImage );
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/sql/mysql.sql
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/sql/mysql.sql 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/sql/mysql.sql 2015-04-24 17:26:17 UTC (rev 13041)
@@ -254,7 +254,8 @@
(8, 0, 0, 'SelectUser', 'XoopsFormSelectUser'),
(9, 0, 0, 'ColorPicker', 'XoopsFormColorPicker'),
(10, 0, 0, 'ImageList', 'XoopsFormImageList'),
- (11, 0, 0, 'TextFile', 'XoopsFormTextFile'),
- (12, 0, 0, 'UploadImage', 'XoopsFormUploadImage'),
- (13, 0, 0, 'UploadFile', 'XoopsFormUploadFile'),
- (14, 0, 0, 'TextDateSelect', 'XoopsFormTextDateSelect');
\ No newline at end of file
+ (11, 0, 0, 'SelectFile', 'XoopsFormSelectFile'),
+ (12, 0, 0, 'UrlFile', 'XoopsFormUrlFile'),
+ (13, 0, 0, 'UploadImage', 'XoopsFormUploadImage'),
+ (14, 0, 0, 'UploadFile', 'XoopsFormUploadFile'),
+ (15, 0, 0, 'TextDateSelect', 'XoopsFormTextDateSelect');
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/xoops_version.php 2015-04-21 17:27:59 UTC (rev 13040)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a1/tdmcreate/xoops_version.php 2015-04-24 17:26:17 UTC (rev 13041)
@@ -35,7 +35,7 @@
$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/readme.txt";
$modversion['manual'] = "MANUAL";
$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/manual.txt";
-$modversion['image'] = "assets/images/logo.png";
+$modversion['image'] = "assets/images/{$dirname}_logo.png";
$modversion['dirname'] = "{$dirname}";
$modversion['dirmoduleadmin'] = "/Frameworks/moduleclasses/moduleadmin";
|
