Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12692] XoopsModules/TDMCreate/branches/timgno/1.91/ tdmcreate
|
From: <txm...@us...> - 2014-07-09 18:25:22
|
Revision: 12692
http://sourceforge.net/p/xoops/svn/12692
Author: txmodxoops
Date: 2014-07-09 18:25:13 +0000 (Wed, 09 Jul 2014)
Log Message:
-----------
- Updated
- Still work to do
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/docs/changelog.txt
XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php
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 13:47:01 UTC (rev 12691)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/admin/pages.php 2014-07-09 18:25:13 UTC (rev 12692)
@@ -16,7 +16,7 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: admin_pages.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: pages.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
require_once 'objects.php';
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-09 13:47:01 UTC (rev 12691)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/objects.php 2014-07-09 18:25:13 UTC (rev 12692)
@@ -35,11 +35,11 @@
return $instance;
}
/*
- * @public function getPhpUserHeader
+ * @public function getUserHeader
* @param string $moduleDirname
* @param string $tableName
*/
- public function getPhpUserHeader($moduleDirname, $tableName) {
+ public function getUserHeader($moduleDirname, $tableName) {
$ret = <<<EOT
include_once 'header.php';
\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl';
@@ -48,10 +48,10 @@
return $ret;
}
/*
- * @public function getPhpUserIndex
+ * @public function getUserIndex
* @param string $moduleDirname
*/
- public function getPhpUserIndex($moduleDirname) {
+ public function getUserIndex($moduleDirname) {
$ret = <<<EOT
include_once 'header.php';
\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_index.tpl';
@@ -60,13 +60,69 @@
return $ret;
}
/*
- * @public function getPhpUserFooter
+ * @public function getUserFooter
* @param null
*/
- public function getPhpUserFooter() {
+ public function getUserFooter() {
$ret = <<<EOT
include_once 'footer.php';
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// Get Var {$fieldName}
+\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// Get Var {$fieldName}
+\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// Get Var {$fieldName}
+\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// Get Var {$fieldName}
+\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/user/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-09 13:47:01 UTC (rev 12691)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/class/files/user/pages.php 2014-07-09 18:25:13 UTC (rev 12692)
@@ -16,19 +16,24 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: user_pages.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: pages.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
+require_once 'objects.php';
class UserPages extends TDMCreateFile
{
/*
+ * @var string
+ */
+ private $userobjects = null;
+ /*
* @public function constructor
* @param null
*/
public function __construct() {
parent::__construct();
- $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ $this->userobjects = UserObjects::getInstance();
}
/*
* @static function &getInstance
@@ -62,9 +67,10 @@
$table = $this->getTable();
$tableName = $table->getVar('table_name');
$tableFieldname = $table->getVar('table_fieldname');
- $stu_mod_name = strtoupper($moduleDirname);
- $stu_table_name = strtoupper($tableName);
- $stl_table_name = strtolower($tableName);
+ $tableAutoincrement = $table->getVar('table_autoincrement');
+ $stuModuleDirname = strtoupper($moduleDirname);
+ $stuTableName = strtoupper($tableName);
+ $stlTableName = strtolower($tableName);
$ret = <<<EOT
\ninclude_once 'header.php';
\$GLOBALS['xoopsOption']['template_main'] = '{$moduleDirname}_{$tableName}.tpl';
@@ -74,16 +80,16 @@
// Define Stylesheet
\$xoTheme->addStylesheet( \$style );
// Get Handler
-\${$stl_table_name}Handler =& \${$moduleDirname}->getHandler('{$stl_table_name}');
+\${$stlTableName}Handler =& \${$moduleDirname}->getHandler('{$stlTableName}');
//
-\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stu_mod_name}_UPLOAD_URL);
+\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
//
\$criteria = new CriteriaCompo();
-\${$stl_table_name}_count = \${$stl_table_name}Handler->getCount(\$criteria);
-\${$stl_table_name}_arr = \${$stl_table_name}Handler->getAll(\$criteria);
+\${$stlTableName}_count = \${$stlTableName}Handler->getCount(\$criteria);
+\${$stlTableName}_arr = \${$stlTableName}Handler->getAll(\$criteria);
\$keywords = array();
-if (\${$stl_table_name}_count > 0) {
- foreach (array_keys(\${$stl_table_name}_arr) as \$i)
+if (\${$stlTableName}_count > 0) {
+ foreach (array_keys(\${$stlTableName}_arr) as \$i)
{\n
EOT;
// Fields
@@ -92,59 +98,45 @@
{
$fieldName = $fields[$f]->getVar('field_name');
$rp_field_name = $fieldName;
- if( $fields[$f]->getVar('field_user') == 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, '_'));
- $tname = $lp_field_name;
- $fieldElement = $fields[$f]->getVar('field_element');
- if ( $fields[$f]->getVar('field_main') == 1 ) {
- $fpmf = $fieldName; // fpmf = fields parameters main field
- }
- // Verify if this is a textarea or dhtmltextarea
- if ( $fieldElement == 2 || $fieldElement == 3 ) {
- $ret .= <<<EOT
- \${$tname}['{$rp_field_name}'] = strip_tags(\${$stl_table_name}_arr[\$i]->getVar('{$fieldName}'));\n
-EOT;
- } else {
- $ret .= <<<EOT
- \${$tname}['{$rp_field_name}'] = \${$stl_table_name}_arr[\$i]->getVar('{$fieldName}');\n
-EOT;
- }
- } else {
- $tname = $tableName;
- $fieldElement = $fields[$f]->getVar('field_element');
- if ( $fields[$f]->getVar('field_main') == 1 ) {
- $fpmf = $fieldName; // fpmf = fields parameters main field
- }
- // Verify if this is a textarea or dhtmltextarea
- if ( $fieldElement == 2 || $fieldElement == 3 ) {
- $ret .= <<<EOT
- \${$tname}['{$rp_field_name}'] = strip_tags(\${$stl_table_name}_arr[\$i]->getVar('{$fieldName}'));\n
-EOT;
- } else {
- $ret .= <<<EOT
- \${$tname}['{$rp_field_name}'] = \${$stl_table_name}_arr[\$i]->getVar('{$fieldName}');\n
-EOT;
- }
- }
+ // 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));
+ }
+ }
+ if ( $fields[$f]->getVar('field_main') == 1 ) {
+ $fpmf = $fieldName; // fpmf = fields parameters main field
}
+ $fieldElement = $fields[$f]->getVar('field_element');
+ if( ($fields[$f]->getVar('field_user') == 1) || ($tableAutoincrement == 1) ) {
+ switch($fieldElement) {
+ case 2:
+ case 3:
+ $ret .= $this->userobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ case 7:
+ $ret .= $this->userobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ case 12:
+ $ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ default:
+ $ret .= $this->userobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
+ break;
+ }
+ }
}
$ret .= <<<EOT
- \$GLOBALS['xoopsTpl']->append('{$stl_table_name}', \${$tname});
- \$keywords[] = \${$stl_table_name}_arr[\$i]->getVar('{$fpmf}');
- unset(\${$tname});
+ \$GLOBALS['xoopsTpl']->append('{$stlTableName}', \${$lpFieldName});
+ \$keywords[] = \${$stlTableName}_arr[\$i]->getVar('{$fpmf}');
+ unset(\${$lpFieldName});
}
// Display Navigation
- if (\${$stl_table_name}_count > \$limit) {
+ if (\${$stlTableName}_count > \$limit) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- \$nav = new XoopsPageNav(\${$stl_table_name}_count, \$limit, \$start, 'start');
+ \$nav = new XoopsPageNav(\${$stlTableName}_count, \$limit, \$start, 'start');
\$GLOBALS['xoopsTpl']->assign('pagenav', \$nav->renderNav(4));
}
}
@@ -152,9 +144,9 @@
{$moduleDirname}_meta_keywords(\${$moduleDirname}->getConfig('keywords').', '. implode(', ', \$keywords));
unset(\$keywords);
// description
-{$moduleDirname}_meta_description({$language}{$stu_table_name}_DESC);
+{$moduleDirname}_meta_description({$language}{$stuTableName}_DESC);
//
-\$GLOBALS['xoopsTpl']->assign('xoops_mpageurl', {$stu_mod_name}_URL.'/{$stl_table_name}.php');
+\$GLOBALS['xoopsTpl']->assign('xoops_mpageurl', {$stuModuleDirname}_URL.'/{$stlTableName}.php');
//
include_once 'footer.php';
EOT;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/docs/changelog.txt
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/docs/changelog.txt 2014-07-09 13:47:01 UTC (rev 12691)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/docs/changelog.txt 2014-07-09 18:25:13 UTC (rev 12692)
@@ -2,7 +2,11 @@
2014/01/02: Version 1.91 alpha 1
=================================
-- Under Construction
+- Refactoring
+- Rewritten from scratch
+- Added templates admin
+- Added fields table
+- Added more parameters in fields form
=================================
2013/05/12: Version 1.39 RC 1
Modified: XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php 2014-07-09 13:47:01 UTC (rev 12691)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/tdmcreate/xoops_version.php 2014-07-09 18:25:13 UTC (rev 12692)
@@ -24,12 +24,12 @@
$modversion['name'] = "{$dirname}";
$modversion['version'] = 1.91;
$modversion['description'] = _MI_TDMCREATE_DESC;
-$modversion['author'] = 'Xoops TDM';
+$modversion['author'] = "Xoops TDM";
$modversion['author_website_url'] = "http://www.xoops.org/";
$modversion['author_website_name'] = "Xoops Team Developers Module";
$modversion['credits'] = "Mamba(Xoops), Timgno(Txmod Xoops)";
-$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU GPL 2.0 or later';
+$modversion['help'] = "page=help";
+$modversion['license'] = "GNU GPL 2.0 or later";
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
$modversion['release_info'] = "README";
$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/readme.txt";
@@ -38,16 +38,16 @@
$modversion['image'] = "assets/images/logo.png";
$modversion['dirname'] = "{$dirname}";
-$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['sysicons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['sysicons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['dirmoduleadmin'] = "/Frameworks/moduleclasses/moduleadmin";
+$modversion['sysicons16'] = "../../Frameworks/moduleclasses/icons/16";
+$modversion['sysicons32'] = "../../Frameworks/moduleclasses/icons/32";
// Local icons
-$modversion['modicons16'] = XOOPS_URL . '/modules/'.$dirname.'/assets/images/icons/16';
-$modversion['modicons32'] = XOOPS_URL . '/modules/'.$dirname.'/assets/images/icons/32';
+$modversion['modicons16'] = XOOPS_URL . "/modules/{$dirname}/assets/images/icons/16";
+$modversion['modicons32'] = XOOPS_URL . "/modules/{$dirname}/assets/images/icons/32";
$modversion['targetdir'] = XOOPS_ROOT_PATH . "/modules/{$dirname}/modules/";
-$modversion['release_date'] = '2014/02/07';
+$modversion['release_date'] = "2014/02/07";
$modversion['module_website_url'] = "http://www.xoops.org/";
$modversion['module_website_name'] = "XOOPS";
$modversion['module_status'] = "Alpha 1";
@@ -59,8 +59,8 @@
//about
$modversion['demo_site_url'] = "http://www.xoops.org/";
$modversion['demo_site_name'] = "Xoops TDM";
-$modversion['forum_site_url'] = "http://xoops.org/modules/newbb/viewtopic.php?post_id=352671";
-$modversion['forum_site_name'] = "TDMCreate - testers needed";
+$modversion['forum_site_url'] = "http://xoops.org/modules/newbb/viewtopic.php?post_id=358118";
+$modversion['forum_site_name'] = "TDMCreate 1.91 alpha 1 for Testing";
$modversion['module_website_name'] = "Xoops TDM";
// Admin things
$modversion['system_menu'] = 1;
|
