Menu
▾
▴
xoops-svn
|
From: <txm...@us...> - 2014-07-09 13:47:09
|
Revision: 12691
http://sourceforge.net/p/xoops/svn/12691
Author: txmodxoops
Date: 2014-07-09 13:47:01 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
- Updated
- Still work to do
Modified Paths:
--------------
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/classes/formelements.php
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-07-09 07:54:43 UTC (rev 12690)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/objects.php 2014-07-09 13:47:01 UTC (rev 12691)
@@ -47,11 +47,11 @@
return $ret;
}
/*
- * @public function getTextDateSelect
+ * @public function getTextDateSelectSetVar
* @param string $tableName
* @param string $fieldName
*/
- public function getTextDateSelect($tableName, $fieldName) {
+ public function getTextDateSelectSetVar($tableName, $fieldName) {
$ret = <<<EOT
// Set Var {$fieldName}
\${$tableName}Obj->setVar('{$fieldName}', strtotime(\$_POST['{$fieldName}']));\n
@@ -59,11 +59,11 @@
return $ret;
}
/*
- * @public function getCheckBoxOrRadioYN
+ * @public function getCheckBoxOrRadioYNSetVar
* @param string $tableName
* @param string $fieldName
*/
- public function getCheckBoxOrRadioYN($tableName, $fieldName) {
+ public function getCheckBoxOrRadioYNSetVar($tableName, $fieldName) {
$ret = <<<EOT
// Set Var {$fieldName}
\${$tableName}Obj->setVar('{$fieldName}', ((\$_REQUEST['{$fieldName}'] == 1) ? '1' : '0'));\n
@@ -71,12 +71,12 @@
return $ret;
}
/*
- * @public function getImageList
+ * @public function getImageListSetVar
* @param string $moduleDirname
* @param string $tableName
* @param string $fieldName
*/
- public function getImageList($moduleDirname, $tableName, $fieldName) {
+ public function getImageListSetVar($moduleDirname, $tableName, $fieldName) {
$ret = <<<EOT
// Set Var {$fieldName}
include_once XOOPS_ROOT_PATH.'/class/uploader.php';
@@ -99,12 +99,12 @@
return $ret;
}
/*
- * @public function getUploadImage
+ * @public function getUploadImageSetVar
* @param string $moduleDirname
* @param string $tableName
* @param string $fieldName
*/
- public function getUploadImage($moduleDirname, $tableName, $fieldName) {
+ public function getUploadImageSetVar($moduleDirname, $tableName, $fieldName) {
$stuModuleDirname = strtoupper($moduleDirname);
$ret = <<<EOT
// Set Var {$fieldName}
@@ -128,12 +128,12 @@
return $ret;
}
/*
- * @public function getUploadFile
+ * @public function getUploadFileSetVar
* @param string $moduleDirname
* @param string $tableName
* @param string $fieldName
*/
- public function getUploadFile($moduleDirname, $tableName, $fieldName) {
+ public function getUploadFileSetVar($moduleDirname, $tableName, $fieldName) {
$stuModuleDirname = strtoupper($moduleDirname);
$ret = <<<EOT
// Set Var {$fieldName}
@@ -153,5 +153,61 @@
}\n
EOT;
return $ret;
- }
+ }
+ /*
+ * @public function getSimpleGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
+ $ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getTextAreaGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
+ $ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = strip_tags(\${$tableName}_arr[\$i]->getVar('{$fieldName}'));\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getSelectUserGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
+ $ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = XoopsUser::getUnameFromId(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
+EOT;
+ return $ret;
+ }
+ /*
+ * @public function getTextDateSelectGetVar
+ * @param string $lpFieldName
+ * @param string $rpFieldName
+ * @param string $tableName
+ * @param string $fieldName
+ */
+ public function getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName) {
+ $ret = <<<EOT
+\t\t\t\t// Get Var {$fieldName}
+\t\t\t\t\${$lpFieldName}['{$rpFieldName}'] = formatTimeStamp(\${$tableName}_arr[\$i]->getVar('{$fieldName}'), 's');\n
+EOT;
+ return $ret;
+ }
}
\ No newline at end of file
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-09 07:54:43 UTC (rev 12690)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-09 13:47:01 UTC (rev 12691)
@@ -116,31 +116,37 @@
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
- $rp_field_name = $fieldName;
- if( ($fields[$f]->getVar('field_admin') == 1) || ($tableAutoincrement == 1) ) {
- // Verify if table_fieldname is not empty
- if(!empty($tableFieldname)) {
- if(strpos($fieldName, '_')) {
- $str = strpos($fieldName, '_');
- if($str !== false){
- $rp_field_name = substr($fieldName, $str + 1, strlen($fieldName));
- }
- }
- $lp_field_name = substr($fieldName, 0, strpos($fieldName, '_'));
- $ret .= <<<EOT
- \${$lp_field_name}['{$rp_field_name}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
-EOT;
- } else {
- $lp_field_name = $tableName;
- $ret .= <<<EOT
- \${$lp_field_name}['{$rp_field_name}'] = \${$tableName}_arr[\$i]->getVar('{$fieldName}');\n
-EOT;
- }
+ $rpFieldName = $fieldName;
+ // Verify if table_fieldname is not empty
+ $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
+ if(strpos($fieldName, '_')) {
+ $str = strpos($fieldName, '_');
+ if($str !== false){
+ $rpFieldName = substr($fieldName, $str + 1, strlen($fieldName));
+ }
+ }
+ $fieldElement = $fields[$f]->getVar('field_element');
+ if( ($fields[$f]->getVar('field_admin') == 1) || ($tableAutoincrement == 1) ) {
+ switch($fieldElement) {
+ case 2:
+ case 3:
+ $ret .= $this->adminobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ case 7:
+ $ret .= $this->adminobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ case 12:
+ $ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ default:
+ $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ }
}
}
$ret .= <<<EOT
- \$GLOBALS['xoopsTpl']->append('{$tableName}_list', \${$lp_field_name});
- unset(\${$lp_field_name});
+ \$GLOBALS['xoopsTpl']->append('{$tableName}_list', \${$lpFieldName});
+ unset(\${$lpFieldName});
}\n
EOT;
$ret .= <<<EOT
@@ -211,19 +217,19 @@
switch($fieldElement) {
case 4:
case 5:
- $ret .= $this->adminobjects->getCheckBoxOrRadioYN($tableName, $fieldName);
+ $ret .= $this->adminobjects->getCheckBoxOrRadioYNSetVar($tableName, $fieldName);
break;
case 9:
- $ret .= $this->adminobjects->getImageList($moduleDirname, $tableName, $fieldName);
+ $ret .= $this->adminobjects->getImageListSetVar($moduleDirname, $tableName, $fieldName);
break;
case 10:
- $ret .= $this->adminobjects->getUploadImage($moduleDirname, $tableName, $fieldName);
+ $ret .= $this->adminobjects->getUploadImageSetVar($moduleDirname, $tableName, $fieldName);
break;
case 11:
- $ret .= $this->adminobjects->getUploadFile($moduleDirname, $tableName, $fieldName);
+ $ret .= $this->adminobjects->getUploadFileSetVar($moduleDirname, $tableName, $fieldName);
break;
case 12:
- $ret .= $this->adminobjects->getTextDateSelect($tableName, $fieldName);
+ $ret .= $this->adminobjects->getTextDateSelectSetVar($tableName, $fieldName);
break;
default:
$ret .= $this->adminobjects->getSimpleSetVar($tableName, $fieldName);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/formelements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/formelements.php 2014-07-09 07:54:43 UTC (rev 12690)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/classes/formelements.php 2014-07-09 13:47:01 UTC (rev 12691)
@@ -272,37 +272,30 @@
* @private function getXoopsFormTable
* @param string $language
* @param string $moduleDirname
- * @param string $tableName
+ * @param string $table
* @param string $fields
* @param string $required
*/
- private function getXoopsFormTable($language, $moduleDirname, $table, $fields, $required = 'false')
+ private function getXoopsFormTable($language, $moduleDirname, $tableName, $fields, $required = 'false')
{
- $tableId = $table->getVar('table_id');
- $tableName = $table->getVar('table_name');
$ucfTableName = ucfirst($tableName);
foreach(array_keys($fields) as $f)
{
if($fields[$f]->getVar('field_parent') == 1) {
$fieldName = $fields[$f]->getVar('field_name');
- }
- if($fields[$f]->getVar('field_element') > 12) {
- $criteriaElement = new CriteriaCompo();
- $criteriaElement->add(new Criteria('fieldelement_tid', $tableId));
- $fieldelement = $this->tdmcreate->getHandler('fieldelements')->getObjects($criteriaElement);
- unset($criteriaElement);
- foreach(array_keys($fieldelement) as $fe)
- {
- $fieldelementName = $fieldelement[$fe]->getVar('fieldelement_name');
- //$elementTableName = $tableName;
+ $field_element = $fields[$f]->getVar('field_element');
+ if($field_element > 12) {
+ $fieldelement = $this->tdmcreate->getHandler('fieldelements')->get($field_element);
+ $fieldelementName = $fieldelement->getVar('fieldelement_name');
+ $rpFieldelementName = strtolower(str_replace('Table : ', '', $fieldelementName));
}
}
}
$ret = <<<EOT
// Form Topic {$ucfTableName}
- \${$fieldelementName}Handler =& \$this->{$moduleDirname}->getHandler('{$fieldelementName}');
+ \${$rpFieldelementName}Handler =& \$this->{$moduleDirname}->getHandler('{$rpFieldelementName}');
\${$fieldName}_select = new XoopsFormSelect({$language}, '{$fieldName}', \$this->getVar('{$fieldName}'));
- \${$fieldName}_select->addOptionArray(\${$fieldelementName}Handler->getList());
+ \${$fieldName}_select->addOptionArray(\${$rpFieldelementName}Handler->getList());
\$form->addElement( \${$fieldName}_select{$required} );\n
EOT;
return $ret;
@@ -311,14 +304,14 @@
* @private function getXoopsFormTopic
* @param string $language
* @param string $moduleDirname
- * @param string $tableName
+ * @param string $table
* @param string $fields
* @param string $required
*/
private function getXoopsFormTopic($language, $moduleDirname, $table, $fields, $required = 'false')
{
$tableName = $table->getVar('table_name');
- $ucf_table_name = ucfirst($tableName);
+ $ucfTableName = ucfirst($tableName);
foreach(array_keys($fields) as $f)
{
$fieldName = $fields[$f]->getVar('field_name');
@@ -333,12 +326,12 @@
}
}
$ret = <<<EOT
- // Form Topic {$ucf_table_name}
- include_once(XOOPS_ROOT_PATH . '/class/tree.php');
- \${$tableName}Handler = \$this->{$moduleDirname}->getHandler('{$tableName}');
+ // Form Topic {$ucfTableName}
+ //\${$tableName}Handler = \$this->{$moduleDirname}->getHandler('{$tableName}');
\$criteria = new CriteriaCompo();
\${$tableName} = \${$tableName}Handler->getObjects( \$criteria );
if(\${$tableName}) {
+ include_once(XOOPS_ROOT_PATH . '/class/tree.php');
\${$tableName}_tree = new XoopsObjectTree( \${$tableName}, '{$field_id}', '{$field_pid}' );
\${$field_pid} = \${$tableName}_tree->makeSelBox( '{$field_pid}', '{$field_main}', '--', \$this->getVar('{$field_pid}', 'e' ), true );
\$form->addElement( new XoopsFormLabel ( {$language}, \${$field_pid} ){$required} );
@@ -418,7 +411,7 @@
if($table->getVar('table_category') == 1) {
$ret .= $this->getXoopsFormTopic($language, $moduleDirname, $table, $fields, $required);
} else {
- $ret .= $this->getXoopsFormTable($language, $moduleDirname, $table, $fields, $required);
+ $ret .= $this->getXoopsFormTable($language, $moduleDirname, $tableName, $fields, $required);
}
}
}
|
|
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...
[truncated message content] |
|
From: <txm...@us...> - 2014-07-28 20:17:59
|
Revision: 12733
http://sourceforge.net/p/xoops/svn/12733
Author: txmodxoops
Date: 2014-07-28 20:17:51 +0000 (Mon, 28 Jul 2014)
Log Message:
-----------
- Updated
- Default language is english
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/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/structure.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.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-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/architecture.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -31,16 +31,8 @@
/*
* @var mixed
*/
- private $structure = null;
+ private $structure = null;
/*
- * @var mixed
- */
- private $path = null;
- /*
- * @var mixed
- */
- private $uploadPath = null;
- /*
* @public function constructor class
* @param null
*/
@@ -166,13 +158,15 @@
$this->structure->makeDirAndCopyFile('language', $indexFile, 'index.html');
// Creation of 'default english' folder
if($language != 'english' ) {
- // Creation of "english" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/english', $indexFile, 'index.html');
+ // Creation of "language/local_language" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/'.$language, $indexFile, 'index.html');
+ // Creation of "language/local_language/help" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/'.$language. '/help', $indexFile, 'index.html');
}
- // Creation of "language/local_language" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$language, $indexFile, 'index.html');
- // Creation of "language/local_language/help" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$language. '/help', $indexFile, 'index.html');
+ // Creation of "english" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/english', $indexFile, 'index.html');
+ // Creation of "language/english/help" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/english/help', $indexFile, 'index.html');
if( $module->getVar('mod_admin') == 1 ) {
// Creation of "templates" folder and index.html file
$this->structure->makeDirAndCopyFile('templates', $indexFile, 'index.html');
@@ -191,8 +185,12 @@
$this->structure->makeDirAndCopyFile('sql', $indexFile, 'index.html');
}
if( $table->getVar('table_notifications') == 1 ) {
- // Creation of "mail_template" folder and index.html file
- $this->structure->makeDirAndCopyFile('language/'.$language.'/mail_template', $indexFile, 'index.html');
+ // Creation of "language/english/mail_template" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/english/mail_template', $indexFile, 'index.html');
+ if($language != 'english' ) {
+ // Creation of "language/local_language/mail_template" folder and index.html file
+ $this->structure->makeDirAndCopyFile('language/'.$language.'/mail_template', $indexFile, 'index.html');
+ }
}
}
}
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-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/admin.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -232,7 +232,7 @@
}
$content .= $this->getLanguageAdminFoot($language);
//
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english', $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/language/blocks.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/blocks.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -114,7 +114,7 @@
$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);
+ $this->tdmcfile->create($moduleDirname, 'language/english', $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/language/help.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/help.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/help.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -59,6 +59,7 @@
$filename = $this->getFileName();
$moduleName = $module->getVar('mod_name');
$moduleDirname = $module->getVar('mod_dirname');
+ $language = $GLOBALS['xoopsConfig']['language'];
$content = <<<EOT
<div id="help-template" class="outer">
<h1 class="head">Help:
@@ -88,7 +89,10 @@
<!-- -----Help Content ---------- -->
</div>
EOT;
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'].'/help', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ if($language != 'english' ) {
+ $this->tdmcfile->create($moduleDirname, 'language/'.$language.'/help', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ }
+ $this->tdmcfile->create($moduleDirname, 'language/english/help', $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/language/mail.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/mail.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/mail.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -80,7 +80,7 @@
webmaster
{X_ADMINMAIL}
EOT;
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'].'/mail_template', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english/mail_template', $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/language/main.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/main.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -122,7 +122,7 @@
$content .= $this->geLanguagetMain($module, $language);
$content .= $this->geLanguagetMainFooter($language);
//
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english', $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/language/modinfo.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/language/modinfo.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -303,7 +303,7 @@
}
$content .= $this->getLanguageFooter();
//
- $this->tdmcfile->create($moduleDirname, 'language/'.$GLOBALS['xoopsConfig']['language'], $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+ $this->tdmcfile->create($moduleDirname, 'language/english', $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/structure.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/structure.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -41,11 +41,11 @@
/*
* @var string
*/
- private $path = null;
+ protected $path = null;
/*
* @var mixed
*/
- //private $uploadPath = null;
+ protected $uploadPath = null;
/*
* @var string
*/
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php 2014-07-28 17:13:26 UTC (rev 12732)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/xoopsversion.php 2014-07-28 20:17:51 UTC (rev 12733)
@@ -93,12 +93,13 @@
*/
private function getXoopsVersionHeader($module, $table, $language)
{
- $date = date('Y/m/d');
+ //$dateString = preg_replace('/[^0-9]/', '/', _DBDATESTRING);
+ $date = date(_DBDATESTRING); // _DBDATESTRING
$ret = <<<EOT
defined('XOOPS_ROOT_PATH') or die('Restricted access');
//
\$dirname = basename( dirname( __FILE__ ) ) ;
-// ---------------------- Informations ---------------------- //
+// ------------------- Informations ------------------- //
\$modversion = array(
'name' => {$language}NAME,
'version' => {$module->getVar('mod_version')},
@@ -148,16 +149,14 @@
'adminindex' => "admin/index.php",
'adminmenu' => "admin/menu.php",\n
EOT;
- if (is_object($table)) {
- if ( $table->getVar('table_user') == 1 ) {
+ if ( $module->getVar('mod_user') == 1 ) {
$ret .= <<<EOT
- // Menu
+ // Main things
'hasMain' => 1,\n
EOT;
- }
} else {
$ret .= <<<EOT
- // Menu
+ // Main things
'hasMain' => 0,\n
EOT;
}
@@ -189,7 +188,7 @@
$ret = '';
if ( !empty($tableName) ) {
$ret .= <<<EOT
-// ---------------------- Mysql ---------------------- //
+// ------------------- Mysql ------------------- //
\$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
// Tables\n
EOT;
@@ -212,7 +211,7 @@
private function getXoopsVersionSearch($moduleDirname)
{
$ret = <<<EOT
-// ---------------------- Search ---------------------- //
+// ------------------- Search ------------------- //
\$modversion['hasSearch'] = 1;
\$modversion['search']['file'] = "include/search.inc.php";
\$modversion['search']['func'] = "{$moduleDirname}_search";\n
@@ -226,7 +225,7 @@
private function getXoopsVersionComments($moduleDirname)
{
$ret = <<<EOT
-// ---------------------- Comments ---------------------- //
+// ------------------- Comments ------------------- //
\$modversion['comments']['pageName'] = "comments.php";
\$modversion['comments']['itemName'] = "com_id";
// Comment callback functions
@@ -244,7 +243,7 @@
{
$tables = $this->getTables();
$ret = <<<EOT
-// ---------------------- Templates ---------------------- //
+// ------------------- Templates ------------------- //
// Admin
\$modversion['templates'][] = array('file' => '{$moduleDirname}_admin_about.tpl', 'description' => '', 'type' => 'admin');
\$modversion['templates'][] = array('file' => '{$moduleDirname}_admin_header.tpl', 'description' => '', 'type' => 'admin');
@@ -297,7 +296,7 @@
private function getXoopsVersionSubmenu($language)
{
$ret = <<<EOT
-// ---------------------- Submenu ---------------------- //\n
+// ------------------- Submenu ------------------- //\n
EOT;
$tables = $this->getTables();
$i = 1;
@@ -325,7 +324,7 @@
{
$tables = $this->getTables();
$ret = <<<EOT
-// ---------------------- Blocks ---------------------- //\n
+// ------------------- Blocks ------------------- //\n
EOT;
foreach (array_keys($tables) as $i) {
$tableName = $tables[$i]->getVar('table_name');
@@ -703,9 +702,7 @@
}
if ($table->getVar('table_blocks') == 1) {
$content .= $this->getXoopsVersionBlocks($moduleDirname, $language);
- }
-
-
+ }
}
$content .= $this->getXoopsVersionConfig($module, $table, $language);
if (is_object($table)) {
|
Thanks for helping keep SourceForge clean.
X