Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12713] XoopsModules/TDMCreate/branches/timgno/1.91/ tdmcreate/class/files
|
From: <txm...@us...> - 2014-07-15 21:47:45
|
Revision: 12713
http://sourceforge.net/p/xoops/svn/12713
Author: txmodxoops
Date: 2014-07-15 21:47:39 +0000 (Tue, 15 Jul 2014)
Log Message:
-----------
- Updated
- added defines class file for languages
- Still work to do
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.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/main.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/defines.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -430,7 +430,7 @@
$ret[] = $userIndex->render();
// Language Main File
$languageMain = LanguageMain::getInstance();
- $languageMain->write($module, $table, $tables, 'main.php');
+ $languageMain->write($module, $tables, 'main.php');
$ret[] = $languageMain->render();
}
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -19,16 +19,21 @@
* @version $Id: admin.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'defines.php';
class LanguageAdmin extends TDMCreateFile
{
/*
+ * @var mixed
+ */
+ private $defines = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
* @static function &getInstance
@@ -60,19 +65,15 @@
*/
public function getLanguageAdminIndex($language, $tables)
{
- $ret = <<<EOT
-// ---------------- Admin Index ----------------
-define('{$language}STATISTICS', "Statistics");
-// There are\n
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Index ----------------');
+ $ret .= $this->defines->getDefine($language, 'STATISTICS', "Statistics");
+ $ret .= $this->defines->getAboveDefines('There are');
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
$stuTableName = strtoupper($tableName);
$stlTableName = strtolower($tableName);
- $ret .= <<<EOT
-define('{$language}THEREARE_{$stuTableName}', "There are <span class='bold'>%s</span> {$stlTableName} in the database");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "THEREARE_{$stuTableName}", "There are <span class='bold'>%s</span> {$stlTableName} in the database");
}
return $ret;
}
@@ -83,51 +84,39 @@
*/
public function getLanguageAdminPages($language, $tables)
{
- $ret = <<<EOT
-// ---------------- Admin Files ----------------
-// There aren't\n
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Files ----------------');
+ $ret .= $this->defines->getAboveDefines('There aren\'t');
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
$stuTableName = strtoupper($tableName);
$stlTableName = strtolower($tableName);
- $ret .= <<<EOT
-define('{$language}THEREARENT_{$stuTableName}', "There aren't {$stlTableName}");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "THEREARENT_{$stuTableName}", "There aren't {$stlTableName}");
}
- $ret .= <<<EOT
-// Save/Delete
-define('{$language}FORMOK', "Successfully saved");
-define('{$language}FORMDELOK', "Successfully deleted");
-define('{$language}FORMSUREDEL', "Are you sure to delete: <b><span style='color : Red'>%s </span></b>");
-define('{$language}FORMSURERENEW', "Are you sure to update: <b><span style='color : Red'>%s </span></b>");\n
-EOT;
- $ret .= <<<EOT
-// Buttons\n
-EOT;
+ $ret .= $this->defines->getAboveDefines('Save/Delete');
+ $ret .= $this->defines->getDefine($language, "FORMOK", "Successfully saved");
+ $ret .= $this->defines->getDefine($language, "FORMDELOK", "Successfully deleted");
+ $ret .= $this->defines->getDefine($language, "FORMSUREDEL", "Are you sure to delete: <b><span style='color : Red'>%s </span></b>");
+ $ret .= $this->defines->getDefine($language, "FORMSURERENEW", "Are you sure to update: <b><span style='color : Red'>%s </span></b>");
+ $ret .= $this->defines->getAboveDefines('Buttons');
+ //
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
$tableFieldname = $tables[$t]->getVar('table_fieldname');
$stuTableFieldname = strtoupper($tableFieldname);
- $ucfTableFieldname = ucfirst($tableFieldname);
- $ret .= <<<EOT
-define('{$language}ADD_{$stuTableFieldname}', "Add {$ucfTableFieldname}");\n
-EOT;
+ $ucfTableFieldname = ucfirst($tableFieldname);
+ $ret .= $this->defines->getDefine($language, "ADD_{$stuTableFieldname}", "Add {$ucfTableFieldname}");
}
- $ret .= <<<EOT
-// Lists\n
-EOT;
+ $ret .= $this->defines->getAboveDefines('Lists');
+ //
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
$tableFieldname = $tables[$t]->getVar('table_fieldname');
$stuTableName = strtoupper($tableName);
- $ucfTableName = ucfirst($tableName);
- $ret .= <<<EOT
-define('{$language}{$stuTableName}_LIST', "List of {$ucfTableName}");\n
-EOT;
+ $ucfTableName = ucfirst($tableName);
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_LIST", "List of {$ucfTableName}");
}
return $ret;
}
@@ -138,65 +127,57 @@
*/
public function getLanguageAdminClass($language, $tables)
{
- $ret = <<<EOT
-// ---------------- Admin Classes ----------------\n
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Classes ----------------');
+ //
foreach (array_keys($tables) as $t)
{
$tableId = $tables[$t]->getVar('table_id');
$tableName = $tables[$t]->getVar('table_name');
$stuTableName = strtoupper($tableName);
$ucfTableName = ucfirst($tableName);
- $ret .= <<<EOT
-// {$ucfTableName} add/edit
-define('{$language}{$stuTableName}_ADD', "Add {$tableName}");
-define('{$language}{$stuTableName}_EDIT', "Edit {$tableName}");
-// Elements of {$ucfTableName}\n
-EOT;
+ $ret .= $this->defines->getAboveDefines("{$ucfTableName} add/edit");
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_ADD", "Add {$tableName}");
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_EDIT", "Edit {$tableName}");
+ $ret .= $this->defines->getAboveDefines("Elements of {$ucfTableName}");
+ //
$fields = $this->getTableFields($tableId);
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
$stuFieldName = strtoupper($fieldName);
- $fieldNameDesc = ucfirst(str_replace('_', ' ', $fieldName));
- $ret .= <<<EOT
-define('{$language}{$stuFieldName}', "{$fieldNameDesc}");\n
-EOT;
+ //
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_'));
+ //
+ $fieldNameDesc = ucfirst($rpFieldName);
+ //
+ $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc);
+ //
switch($fieldElement)
{
case 10:
- $ret .= <<<EOT
-define('{$language}FORM_UPLOAD_IMAGE_LIST_{$stuTableName}', "{$fieldNameDesc} in frameworks images");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_LIST_{$stuTableName}", "{$fieldNameDesc} in frameworks images");
break;
case 11:
- $ret .= <<<EOT
-define('{$language}FORM_UPLOAD_IMAGE_{$stuTableName}', "{$fieldNameDesc} in uploads images");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_IMAGE_{$stuTableName}", "{$fieldNameDesc} in uploads images");
break;
case 12:
- $ret .= <<<EOT
-define('{$language}FORM_UPLOAD_FILE_{$stuTableName}', "{$fieldNameDesc} in uploads files");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "FORM_UPLOAD_FILE_{$stuTableName}", "{$fieldNameDesc} in uploads files");
break;
}
}
}
- $ret .= <<<EOT
-// General
-define('{$language}FORMUPLOAD', "Upload file");
-define('{$language}FORMIMAGE_PATH', "Files in %s ");
-define('{$language}FORMACTION', "Action");
-define('{$language}FORMEDIT', "Modification");
-define('{$language}FORMDEL', "Clear");\n
-EOT;
- $ret .= <<<EOT
-// Permissions
-define('{$language}PERMISSIONS_APPROVE', "Permissions to approve");
-define('{$language}PERMISSIONS_SUBMIT', "Permissions to submit");
-define('{$language}PERMISSIONS_VIEW', "Permissions to view");\n
-EOT;
+ $ret .= $this->defines->getAboveDefines('General');
+ $ret .= $this->defines->getDefine($language, 'FORMUPLOAD', "Upload file");
+ $ret .= $this->defines->getDefine($language, 'FORMIMAGE_PATH', "Files in %s ");
+ $ret .= $this->defines->getDefine($language, 'FORMACTION', "Action");
+ $ret .= $this->defines->getDefine($language, 'FORMEDIT', "Modification");
+ $ret .= $this->defines->getDefine($language, 'FORMDEL', "Clear");
+ $ret .= $this->defines->getAboveDefines('Permissions');
+ $ret .= $this->defines->getDefine($language, 'PERMISSIONS_APPROVE', "Permissions to approve");
+ $ret .= $this->defines->getDefine($language, 'PERMISSIONS_SUBMIT', "Permissions to submit");
+ $ret .= $this->defines->getDefine($language, 'PERMISSIONS_VIEW', "Permissions to view");
return $ret;
}
/*
@@ -205,35 +186,31 @@
*/
public function getLanguageAdminPermissions($language)
{
- $ret = <<<EOT
-// ---------------- Admin Permissions ----------------
-// Permissions
-define('{$language}GLOBAL', "Permissions global");
-define('{$language}GLOBAL_DESC', "Permissions global");
-define('{$language}GLOBAL_4', "Permissions global");
-define('{$language}GLOBAL_8', "Permissions global");
-define('{$language}GLOBAL_16', "Permissions global");
-define('{$language}APPROVE', "Permissions to approve");
-define('{$language}APPROVE_DESC', "Permissions to approve");
-define('{$language}SUBMIT', "Permissions to submit");
-define('{$language}SUBMIT_DESC', "Permissions to submit");
-define('{$language}VIEW', "Permissions to view");
-define('{$language}VIEW_DESC', "Permissions to view");
-define('{$language}NOPERMSSET', "No permission set");\n
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Permissions ----------------');
+ $ret .= $this->defines->getAboveDefines('Permissions');
+ $ret .= $this->defines->getDefine($language, 'GLOBAL', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'GLOBAL_DESC', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'GLOBAL_4', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'GLOBAL_8', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'GLOBAL_16', "Permissions global");
+ $ret .= $this->defines->getDefine($language, 'APPROVE', "Permissions to approve");
+ $ret .= $this->defines->getDefine($language, 'APPROVE_DESC', "Permissions to approve");
+ $ret .= $this->defines->getDefine($language, 'SUBMIT', "Permissions to submit");
+ $ret .= $this->defines->getDefine($language, 'SUBMIT_DESC', "Permissions to submit");
+ $ret .= $this->defines->getDefine($language, 'VIEW', "Permissions to view");
+ $ret .= $this->defines->getDefine($language, 'VIEW_DESC', "Permissions to view");
+ $ret .= $this->defines->getDefine($language, 'NOPERMSSET', "No permission set");
return $ret;
}
/*
* @public function getLanguageAdminFoot
- * @param null
+ * @param string $language
*/
public function getLanguageAdminFoot($language)
{
- $ret = <<<EOT
-// ---------------- Admin Others ----------------
-define('{$language}MAINTAINEDBY', " is maintained by ");
-// ---------------- ----------------
-EOT;
+ $ret = $this->defines->getAboveDefines('---------------- Admin Others ----------------');
+ $ret .= $this->defines->getDefine($language, 'MAINTAINEDBY', " is maintained by ");
+ $ret .= $this->defines->getBelowDefines('---------------- End ----------------');
return $ret;
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -19,16 +19,21 @@
* @version $Id: blocks.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'defines.php';
class LanguageBlocks extends TDMCreateFile
{
/*
+ * @var mixed
+ */
+ private $defines = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
* @static function &getInstance
@@ -54,41 +59,67 @@
$this->setTables($tables);
}
/*
- * @public function render
- * @param null
+ * @private function getLanguageBlock
+ * @param string $language
+ * @param string $module
*/
- public function render() {
- $module = $this->getModule();
- $tables = $this->getTables();
- $filename = $this->getFileName();
- $moduleDirname = $module->getVar('mod_dirname');
- $language = $this->getLanguage($moduleDirname, 'MB');
- $content = $this->getHeaderFilesComments($module, $filename);
- $content .= <<<EOT
-// Main
-define('{$language}DISPLAY', "How Many Tables to Display");
-define('{$language}TITLELENGTH', "Title Length");
-define('{$language}CATTODISPLAY', "Categories to Display");
-define('{$language}ALLCAT', "All Categories");\n
+ private function getLanguageBlock($module, $language)
+ {
+ $tables = $this->getTables();
+ $ret = <<<EOT
+// Admin Edit\n
EOT;
+ $ret .= $this->defines->getDefine($language, 'DISPLAY', "How Many Tables to Display");
+ $ret .= $this->defines->getDefine($language, 'TITLELENGTH', "Title Length");
+ $ret .= $this->defines->getDefine($language, 'CATTODISPLAY', "Categories to Display");
+ $ret .= $this->defines->getDefine($language, 'ALLCAT', "All Categories");
foreach (array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
- $ucf_table_name = ucfirst($tableName);
- $content .= <<<EOT
-// {$ucf_table_name}\n
+ $ucfTableName = ucfirst($tableName);
+ $ret .= <<<EOT
+// {$ucfTableName}\n
EOT;
$fields = $this->getTableFields($tables[$t]->getVar('table_id'));
foreach (array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
- $lng_fields = $language.strtoupper($fieldName);
- $ucf_table_field = ucfirst($tableName.' '.str_replace('_', ' ', $fieldName));
- $content .= <<<EOT
-define('{$lng_fields}', "{$ucf_table_field}");\n
+ $stuFieldName = strtoupper($fieldName);
+ //
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_'));
+ //
+ $fieldNameDesc = ucfirst($rpFieldName);
+ //
+ $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc);
+ }
+ }
+ return $ret;
+ }
+ /*
+ * @private function getFooter
+ * @param null
+ */
+ private function getLanguageFooter()
+ {
+ $ret = <<<EOT
+// ---------------- End ----------------
EOT;
- }
- }
+ return $ret;
+ }
+ /*
+ * @public function render
+ * @param null
+ */
+ public function render() {
+ $module = $this->getModule();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($moduleDirname, 'MB');
+ $content = $this->getHeaderFilesComments($module, $filename);
+ $content .= $this->getLanguageBlock($module, $language);
+ $content .= $this->getLanguageFooter();
+ //
$this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
Added: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/defines.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/defines.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/defines.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -0,0 +1,88 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: defines.php 12258 2014-01-02 09:33:29Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class LanguageDefines
+{
+ /*
+ * @public function constructor
+ * @param null
+ */
+ public function __construct() { }
+ /*
+ * @static function &getInstance
+ * @param null
+ */
+ public static function &getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+ return $instance;
+ }
+ /*
+ * @public function getAboveHeadDefines
+ * @param string $string
+ */
+ public function getAboveHeadDefines($string)
+ {
+ $ret = <<<EOT
+// ---------------- {$string} ----------------\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getAboveDefines
+ * @param string $string
+ */
+ public function getAboveDefines($string)
+ {
+ $ret = <<<EOT
+// {$string}\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getDefine
+ * @param string $language
+ * @param string $defined
+ * @param string $description
+ */
+ public function getDefine($language, $defined, $description)
+ {
+ $ret = <<<EOT
+define('{$language}{$defined}', "{$description}");\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getBelowDefines
+ * @param string $string
+ */
+ public function getBelowDefines($string)
+ {
+ $ret = <<<EOT
+// ---------------- {$string} ----------------
+EOT;
+ return $ret;
+ }
+}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -19,16 +19,21 @@
* @version $Id: include_search.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'defines.php';
class LanguageMain extends TDMCreateFile
{
/*
+ * @var mixed
+ */
+ private $defines = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
* @static function &getInstance
@@ -45,65 +50,76 @@
/*
* @public function write
* @param string $module
- * @param mixed $table
* @param mixed $tables
* @param string $filename
*/
- public function write($module, $table, $tables, $filename) {
+ public function write($module, $tables, $filename) {
$this->setModule($module);
$this->setFileName($filename);
- $this->setTable($table);
$this->setTables($tables);
}
/*
- * @public function render
- * @param null
+ * @private function geLanguagetMain
+ * @param string $module
+ * @param string $language
*/
- public function render() {
- $module = $this->getModule();
+ private function geLanguagetMain($module, $language)
+ {
$tables = $this->getTables();
- $filename = $this->getFileName();
- $moduleName = $module->getVar('mod_name');
- $moduleDirname = $module->getVar('mod_dirname');
- $moduleDescription = $module->getVar('mod_description');
- $ucf_mod_name = ucfirst($moduleName);
- $language = $this->getLanguage($moduleDirname, 'MA');
- $content = $this->getHeaderFilesComments($module, $filename);
- $content .= <<<EOT
-// ---------------- Main ----------------
-define('{$language}INDEX', "Home");
-define('{$language}TITLE', "{$ucf_mod_name}");
-define('{$language}DESC', "{$moduleDescription}");
-define('{$language}INDEX_DESC', "Welcome to the homepage of your new module!<br />
-As you can see, you've created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.");\n
-EOT;
+ $ret = $this->defines->getAboveHeadDefines('Main');
+ $ret .= $this->defines->getDefine($language, 'INDEX', "Home");
+ $ret .= $this->defines->getDefine($language, 'TITLE', "{$module->getVar('mod_name')}");
+ $ret .= $this->defines->getDefine($language, 'DESC', "{$module->getVar('mod_description')}");
+ $ret .= $this->defines->getDefine($language, 'INDEX_DESC', "Welcome to the homepage of your new module!<br />
+As you can see, you've created a page with a list of links at the top to navigate between the pages of your module. This description is only visible on the homepage of this module, the other pages you will see the content you created when you built this module with the module TDMCreate, and after creating new content in admin of this module. In order to expand this module with other resources, just add the code you need to extend the functionality of the same. The files are grouped by type, from the header to the footer to see how divided the source code.");
+ $ret .= $this->defines->getAboveHeadDefines('Contents');
foreach (array_keys($tables) as $i)
{
$tableName = $tables[$i]->getVar('table_name');
- $lng_stu_table_name = $language.strtoupper($tableName);
- $ucf_table_name = UcFirstAndToLower($tableName);
- $content .= <<<EOT
-// {$ucf_table_name}
-define('{$lng_stu_table_name}', "{$ucf_table_name}");
-define('{$lng_stu_table_name}_DESC', "{$ucf_table_name} description");
-// Caption of {$ucf_table_name}\n
-EOT;
+ $stuTableName = strtoupper($tableName);
+ $ucfTableName = UcFirstAndToLower($tableName);
+ $ret .= $this->defines->getAboveDefines($ucfTableName);
+ $ret .= $this->defines->getDefine($language, $stuTableName, $ucfTableName);
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_DESC", "{$ucfTableName} description");
+ $ret .= $this->defines->getAboveDefines("Caption of {$ucfTableName}");
$fields = $this->getTableFields($tables[$i]->getVar('table_id'));
foreach (array_keys($fields) as $f)
{
- $field_name = $fields[$f]->getVar('field_name');
- $lng_stu_fields = $language.strtoupper($field_name);
- $ucf_field_name = ucfirst(str_replace('_', ' ', $field_name));
- $content .= <<<EOT
-define('{$lng_stu_fields}', "{$ucf_field_name}");\n
-EOT;
- }
+ $fieldName = $fields[$f]->getVar('field_name');
+ $stuFieldName = strtoupper($fieldName);
+ //
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ $lpFieldName = substr($fieldName, 0, strpos($fieldName, '_'));
+ //
+ $fieldNameDesc = ucfirst($rpFieldName);
+ //
+ $ret .= $this->defines->getDefine($language, $stuFieldName, $fieldNameDesc);
+ }
}
- $content .= <<<EOT
-// Admin link
-define('{$language}ADMIN', "Admin");
-// ---------------- ----------------
-EOT;
+ return $ret;
+ }
+ /*
+ * @private function geLanguagetMainFooter
+ * @param null
+ */
+ private function geLanguagetMainFooter()
+ {
+ $ret = $this->defines->getBelowDefines('End');
+ return $ret;
+ }
+ /*
+ * @public function render
+ * @param null
+ */
+ public function render() {
+ $module = $this->getModule();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $language = $this->getLanguage($moduleDirname, 'MA');
+ $content = $this->getHeaderFilesComments($module, $filename);
+ $content .= $this->geLanguagetMain($module, $language);
+ $content .= $this->geLanguagetMainFooter();
+ //
$this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -19,16 +19,21 @@
* @version $Id: include_search.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'defines.php';
class LanguageModinfo extends TDMCreateFile
{
/*
+ * @var mixed
+ */
+ private $defines = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->defines = LanguageDefines::getInstance();
}
/*
* @static function &getInstance
@@ -56,80 +61,68 @@
$this->setFileName($filename);
}
/*
- * @private function getMain
+ * @private function getLanguageMain
* @param string $language
* @param string $module
*/
- private function getMain($language, $module) {
- $ret = <<<EOT
-// Main
-define('{$language}NAME', "{$module->getVar('mod_name')}");
-define('{$language}DESC', "{$module->getVar('mod_description')}");\n
-EOT;
+ private function getLanguageMain($language, $module)
+ {
+ $ret = $this->defines->getAboveHeadDefines('Admin Main');
+ $ret .= $this->defines->getDefine($language, "NAME", "{$module->getVar('mod_name')}");
+ $ret .= $this->defines->getDefine($language, "DESC", "{$module->getVar('mod_description')}");
return $ret;
}
/*
- * @private function getMenu
+ * @private function getLanguageMenu
* @param string $language
+ * @param array $table
* @param array $tables
*/
- private function getMenu($language, $table, $tables) {
+ private function getLanguageMenu($language, $table, $tables)
+ {
$menu = 1;
- $ret = <<<EOT
-// Admin Menu
-define('{$language}ADMENU{$menu}', "Dashboard");\n
-EOT;
-
+ $ret = $this->defines->getAboveHeadDefines('Admin Menu');
+ $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "Dashboard");
foreach (array_keys($tables) as $i)
{
$menu++;
- $ucfTableName = ucfirst(str_replace('_', ' ', $tables[$i]->getVar('table_name')));
- $ret .= <<<EOT
-define('{$language}ADMENU{$menu}', "{$ucfTableName}");\n
-EOT;
+ $ucfTableName = ucfirst($tables[$i]->getVar('table_name'));
+ $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "{$ucfTableName}");
}
if (is_object($table) && $table->getVar('table_permissions') == 1) {
$menu++;
- $ret .= <<<EOT
-define('{$language}ADMENU{$menu}', "Permissions");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "Permissions");
}
$menu++;
- $ret .= <<<EOT
-define('{$language}ADMENU{$menu}', "About");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "ADMENU{$menu}", "About");
unset( $menu );
return $ret;
}
/*
- * @private function getAdmin
+ * @private function getLanguageAdmin
* @param string $language
*/
- private function getAdmin($language) {
- $ret = <<<EOT
-// Admin
-define('{$language}ADMINPAGER', "Admin pager");
-define('{$language}ADMINPAGER_DESC', "Admin per page list");\n
-EOT;
+ private function getLanguageAdmin($language)
+ {
+ $ret = $this->defines->getAboveHeadDefines('Admin Nav');
+ $ret .= $this->defines->getDefine($language, "ADMINPAGER", "Admin pager");
+ $ret .= $this->defines->getDefine($language, "ADMINPAGER_DESC", "Admin per page list");
return $ret;
}
/*
- * @private function getSubmenu
+ * @private function getLanguageSubmenu
* @param string $language
* @param array $tables
*/
- private function getSubmenu($language, $tables) {
- $ret = <<<EOT
-// Blocks\n
-EOT;
+ private function getLanguageSubmenu($language, $tables)
+ {
+ $ret = $this->defines->getAboveDefines('Submenu');
$i = 1;
- foreach (array_keys($tables) as $t)
+ foreach(array_keys($tables) as $t)
{
$tableName = $tables[$t]->getVar('table_name');
- if ( $tables[$t]->getVar('table_submenu') == 1 ) {
- $ret .= <<<EOT
-define('{$language}SMNAME{$i}', "{$tableName}");\n
-EOT;
+ if( $tables[$t]->getVar('table_submenu') == 1 ) {
+ $ret .= $this->defines->getDefine($language, "SMNAME{$i}", "{$tableName}");
}
$i++;
}
@@ -137,137 +130,135 @@
return $ret;
}
/*
- * @private function getBlocks
+ * @private function getLanguageBlocks
* @param string $language
* @param array $tables
*/
- private function getBlocks($language, $tables) {
- $ret = <<<EOT
-// Blocks\n
-EOT;
+ private function getLanguageBlocks($language, $tables)
+ {
+ $ret = $this->defines->getAboveDefines('Blocks');
foreach (array_keys($tables) as $i)
{
$tableName = $tables[$i]->getVar('table_name');
- $language1 = $language.strtoupper($tableName);
- $ucfTableName = str_replace("_", " ", ucfirst($tableName));
- if ( $tables[$i]->getVar('table_blocks') == 1 ) {
- $ret .= <<<EOT
-define('{$language1}_BLOCK', "{$ucfTableName} block");\n
-EOT;
+ $stuTableName = strtoupper($tableName);
+ $ucfTableName = ucfirst($tableName);
+ if( $tables[$i]->getVar('table_blocks') == 1 ) {
+ $ret .= $this->defines->getDefine($language, "{$stuTableName}_BLOCK", "{$ucfTableName} block");
}
}
return $ret;
}
/*
- * @private function getUser
+ * @private function getLanguageUser
* @param string $language
*/
- private function getUser($language) {
- $ret = <<<EOT
-// User
-define('{$language}USERPAGER', "User pager");
-define('{$language}USERPAGER_DESC', "User per page list");\n
-EOT;
+ private function getLanguageUser($language)
+ {
+ $ret = $this->defines->getAboveDefines('User');
+ $ret .= $this->defines->getDefine($language, "USERPAGER", "User pager");
+ $ret .= $this->defines->getDefine($language, "USERPAGER_DESC", "User per page list");
return $ret;
}
/*
- * @private function getConfig
+ * @private function getLanguageConfig
* @param string $language
- * @param string $table_image
+ * @param string $table
*/
- private function getConfig($language, $table) {
- $ret = <<<EOT
-// Config
-define('{$language}EDITOR', "Editor");
-define('{$language}EDITOR_DESC', "Select the Editor to use");
-define('{$language}KEYWORDS', "Keywords");
-define('{$language}KEYWORDS_DESC', "Insert here the keywords (separate by comma)");\n
-EOT;
+ private function getLanguageConfig($language, $table)
+ {
+ $ret = $this->defines->getAboveDefines('Config');
+ $ret .= $this->defines->getDefine($language, "EDITOR", "Editor");
+ $ret .= $this->defines->getDefine($language, "EDITOR_DESC", "Select the Editor to use");
+ $ret .= $this->defines->getDefine($language, "KEYWORDS", "Keywords");
+ $ret .= $this->defines->getDefine($language, "KEYWORDS_DESC", "Insert here the keywords (separate by comma)");
if ( $table->getVar('table_image') != '' )
{
- $ret .= <<<EOT
-define('{$language}MAXSIZE', "Max size");
-define('{$language}MAXSIZE_DESC', "Set a number of max size uploads file in byte");
-define('{$language}MIMETYPES', "Mime Types");
-define('{$language}MIMETYPES_DESC', "Set the mime types selected");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "MAXSIZE", "Max size");
+ $ret .= $this->defines->getDefine($language, "MAXSIZE_DESC", "Set a number of max size uploads file in byte");
+ $ret .= $this->defines->getDefine($language, "MIMETYPES", "Mime Types");
+ $ret .= $this->defines->getDefine($language, "MIMETYPES_DESC", "Set the mime types selected");
}
- $ret .= <<<EOT
-define('{$language}IDPAYPAL', "Paypal ID");
-define('{$language}IDPAYPAL_DESC', "Insert here your PayPal ID for donactions.");
-define('{$language}ADVERTISE', "Advertisement Code");
-define('{$language}ADVERTISE_DESC', "Insert here the advertisement code");
-define('{$language}BOOKMARKS', "Social Bookmarks");
-define('{$language}BOOKMARKS_DESC', "Show Social Bookmarks in the form");
-define('{$language}FBCOMMENTS', "Facebook comments");
-define('{$language}FBCOMMENTS_DESC', "Allow Facebook comments in the form");\n
-EOT;
+ $ret .= $this->defines->getDefine($language, "IDPAYPAL", "Paypal ID");
+ $ret .= $this->defines->getDefine($language, "IDPAYPAL_DESC", "Insert here your PayPal ID for donactions.");
+ $ret .= $this->defines->getDefine($language, "ADVERTISE", "Advertisement Code");
+ $ret .= $this->defines->getDefine($language, "ADVERTISE_DESC", "Insert here the advertisement code");
+ $ret .= $this->defines->getDefine($language, "BOOKMARKS", "Social Bookmarks");
+ $ret .= $this->defines->getDefine($language, "BOOKMARKS_DESC", "Show Social Bookmarks in the form");
+ $ret .= $this->defines->getDefine($language, "FBCOMMENTS", "Facebook comments");
+ $ret .= $this->defines->getDefine($language, "FBCOMMENTS_DESC", "Allow Facebook comments in the form");
return $ret;
}
/*
- * @private function getNotifications
+ * @private function getLanguageNotifications
* @param string $language
* @param mixed $table
*/
- private function getNotifications($language) {
- $ret = <<<EOT
-// Notifications
-define('{$language}GLOBAL_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}FILE_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}FILE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWCATEGORY_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWCATEGORY_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWCATEGORY_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWCATEGORY_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEMODIFY_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEMODIFY_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEMODIFY_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEMODIFY_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEBROKEN_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEBROKEN_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEBROKEN_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILEBROKEN_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILESUBMIT_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILESUBMIT_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILESUBMIT_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_FILESUBMIT_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWFILE_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWFILE_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWFILE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}GLOBAL_NEWFILE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_FILESUBMIT_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_FILESUBMIT_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_FILESUBMIT_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_FILESUBMIT_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NEWFILE_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NEWFILE_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NEWFILE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}CATEGORY_NEWFILE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY_CAPTION', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY_DESC', "Allow Facebook comments in the form");
-define('{$language}FILE_APPROVE_NOTIFY_SUBJECT', "Allow Facebook comments in the form");\n
-EOT;
+ private function getLanguageNotifications($language)
+ {
+ $ret = $this->defines->getAboveDefines('Notifications');
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NOTIFY", "Global notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NOTIFY_DESC", "Global notify desc");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NOTIFY", "Category notify");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NOTIFY_DESC", "Category notify desc");
+ $ret .= $this->defines->getDefine($language, "FILE_NOTIFY", "File notify");
+ $ret .= $this->defines->getDefine($language, "FILE_NOTIFY_DESC", "File notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWCATEGORY_NOTIFY", "Global newcategory notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWCATEGORY_NOTIFY_CAPTION", "Global newcategory notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWCATEGORY_NOTIFY_DESC", "Global newcategory notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWCATEGORY_NOTIFY_SUBJECT", "Global newcategory notify subject");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEMODIFY_NOTIFY", "Global filemodify notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEMODIFY_NOTIFY_CAPTION", "Global filemodify notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEMODIFY_NOTIFY_DESC", "Global filemodify notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEMODIFY_NOTIFY_SUBJECT", "Global filemodify notify subject");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEBROKEN_NOTIFY", "Global filebroken notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEBROKEN_NOTIFY_CAPTION", "Global filebroken notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEBROKEN_NOTIFY_DESC", "Global filebroken notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILEBROKEN_NOTIFY_SUBJECT", "Global filebroken notify subject");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILESUBMIT_NOTIFY", "Global filesubmit notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILESUBMIT_NOTIFY_CAPTION", "Global filesubmit notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILESUBMIT_NOTIFY_DESC", "Global filesubmit notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_FILESUBMIT_NOTIFY_SUBJECT", "Global filesubmit notify subject");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWFILE_NOTIFY", "Global newfile notify");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWFILE_NOTIFY_CAPTION", "Global newfile notify caption");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWFILE_NOTIFY_DESC", "Global newfile notify desc");
+ $ret .= $this->defines->getDefine($language, "GLOBAL_NEWFILE_NOTIFY_SUBJECT", "Global newfile notify subject");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_FILESUBMIT_NOTIFY", "Category filesubmit notify");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_FILESUBMIT_NOTIFY_CAPTION", "Category filesubmit notify caption");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_FILESUBMIT_NOTIFY_DESC", "Category filesubmit notify desc");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_FILESUBMIT_NOTIFY_SUBJECT", "Category filesubmit notify subject");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NEWFILE_NOTIFY", "Category newfile notify");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NEWFILE_NOTIFY_CAPTION", "Category newfile notify caption");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NEWFILE_NOTIFY_DESC", "Category newfile notify desc");
+ $ret .= $this->defines->getDefine($language, "CATEGORY_NEWFILE_NOTIFY_SUBJECT", "Category newfile notify subject");
+ $ret .= $this->defines->getDefine($language, "FILE_APPROVE_NOTIFY", "File approve notify");
+ $ret .= $this->defines->getDefine($language, "FILE_APPROVE_NOTIFY_CAPTION", "File approve notify caption");
+ $ret .= $this->defines->getDefine($language, "FILE_APPROVE_NOTIFY_DESC", "File approve notify desc");
+ $ret .= $this->defines->getDefine($language, "FILE_APPROVE_NOTIFY_SUBJECT", "File approve notify subject");
return $ret;
}
/*
- * @private function getPermissions
+ * @private function getLanguagePermissions
* @param string $language
*/
- private function getPermissions($language) {
- $ret = <<<EOT
-// Permissions Groups
-define('{$language}GROUPS', "Groups access");
-define('{$language}GROUPS_DESC', "Select general access permission for groups.");
-define('{$language}ADMINGROUPS', "Admin Group Permissions");
-define('{$language}ADMINGROUPS_DESC', "Which groups have access to tools and permissions page");
-EOT;
+ private function getLanguagePermissions($language)
+ {
+ $ret = $this->defines->getAboveDefines('Permissions Groups');
+ $ret .= $this->defines->getDefine($language, "GROUPS", "Groups access");
+ $ret .= $this->defines->getDefine($language, "GROUPS_DESC", "Select general access permission for groups.");
+ $ret .= $this->defines->getDefine($language, "ADMINGROUPS", "Admin Group Permissions");
+ $ret .= $this->defines->getDefine($language, "ADMINGROUPS_DESC", "Which groups have access to tools and permissions page");
return $ret;
}
/*
+ * @private function getFooter
+ * @param null
+ */
+ private function getLanguageFooter()
+ {
+ $ret = $this->defines->getBelowDefines('End');
+ return $ret;
+ }
+ /*
* @public function render
* @param null
*/
@@ -279,28 +270,29 @@
$moduleDirname = $module->getVar('mod_dirname');
$language = $this->getLanguage($moduleDirname, 'MI');
$content = $this->getHeaderFilesComments($module, $filename);
- $content .= $this->getMain($language, $module);
- $content .= $this->getMenu($language, $table, $tables);
+ $content .= $this->getLanguageMain($language, $module);
+ $content .= $this->getLanguageMenu($language, $table, $tables);
if (is_object($table)) {
if ( $table->getVar('table_admin') == 1 ) {
- $content .= $this->getAdmin($language);
+ $content .= $this->getLanguageAdmin($language);
}
if ( $table->getVar('table_user') == 1 ) {
- $content .= $this->getUser($language);
+ $content .= $this->getLanguageUser($language);
}
if ( $table->getVar('table_submenu') == 1 ) {
- $content .= $this->getSubmenu($language, $tables);
+ $content .= $this->getLanguageSubmenu($language, $tables);
}
- $content .= $this->getBlocks($language, $tables);
- $content .= $this->getConfig($language, $table);
+ $content .= $this->getLanguageBlocks($language, $tables);
+ $content .= $this->getLanguageConfig($language, $table);
if ( $table->getVar('table_notifications') == 1 )
{
- $content .= $this->getNotifications($language);
+ $content .= $this->getLanguageNotifications($language);
}
if ( $table->getVar('table_permissions') == 1 ) {
- $content .= $this->getPermissions($language);
+ $content .= $this->getLanguagePermissions($language);
}
}
+ $content .= $this->getLanguageFooter();
//
$this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php 2014-07-14 07:53:04 UTC (rev 12712)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/templates/admin/pages.php 2014-07-15 21:47:39 UTC (rev 12713)
@@ -105,13 +105,10 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$fieldElement = $fields[$f]->getVar('field_element');
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
if($f == 0) {
- $field_id = $fieldName;
- $rpFieldName = $this->tdmcfile->getRightString($field_id);
- } else {
- $rpFieldName = $this->tdmcfile->getRightString($fieldName);
- }
- $lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
+ $field_id = $fieldName;
+ }
if( ($fields[$f]->getVar('field_inlist') == 1) || ($table->getVar('table_autoincrement') == 1) ) {
switch( $fieldElement ) {
case 9:
|
