Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11387] XoopsModules26/tdmcreate/branches/2.01/timgno /tdmcreate
|
From: <txm...@us...> - 2013-04-16 15:20:01
|
Revision: 11387
http://sourceforge.net/p/xoops/svn/11387
Author: txmodxoops
Date: 2013-04-16 15:19:57 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-04-16 15:19:57 UTC (rev 11387)
@@ -42,7 +42,7 @@
$criteria->setSort('table_name');
$criteria->setOrder('ASC');
$criteria->setStart($start);
- $criteria->setLimit($nb_pager);
+ $criteria->setLimit($limit);
$numrows_tables = $tables_Handler->getCount($criteria);
$table_arr = $tables_Handler->getAll($criteria);
$xoops->tpl()->assign('tables_count', $numrows_tables);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2013-04-16 15:19:57 UTC (rev 11387)
@@ -39,6 +39,6 @@
$op = $request->asStr('op', 'list');
$start = $request->asInt('start', 0);
// Parameters
-$nb_pager = $helper->getConfig('adminpager');
+$limit = $helper->getConfig('adminpager');
// Get admin menu istance
$admin_menu = new XoopsModuleAdmin();
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-04-16 15:19:57 UTC (rev 11387)
@@ -23,7 +23,6 @@
$mod_id = $system->cleanVars($_REQUEST, 'mod_id', 0, 'int');
// Get handler
$xoops->header('tdmcreate_modules.html');
-
$admin_menu->renderNavigation('modules.php');
switch ($op)
{
@@ -36,7 +35,7 @@
$criteria->setSort('mod_name');
$criteria->setOrder('ASC');
$criteria->setStart($start);
- $criteria->setLimit($nb_pager);
+ $criteria->setLimit($limit);
$numrows_mods = $modules_Handler->getCount($criteria);
$mod_arr = $modules_Handler->getAll($criteria);
// Assign Template variables
@@ -60,8 +59,8 @@
unset($mod);
}
// Display Page Navigation
- if ($numrows_mods > $nb_pager) {
- $nav = new XoopsPageNav($numrows_mods, $nb_pager, $start, 'start');
+ if ($numrows_mods > $limit) {
+ $nav = new XoopsPageNav($numrows_mods, $limit, $start, 'start');
$xoops->tpl()->assign('pagenav', $nav->renderNav(4));
}
} else {
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-04-16 15:19:57 UTC (rev 11387)
@@ -55,17 +55,7 @@
// Redirect if there aren't modules
/* if ( $numrows_mods == 0 ) {
$xoops->redirect('modules.php?op=new', 2, TDMCreateLocale::NOTMODULES );
- }*/
- $criteria = new CriteriaCompo();
- $criteria->setSort('table_name');
- $criteria->setOrder('ASC');
- $criteria->setStart($start);
- $criteria->setLimit($nb_pager);
- $numrows_tables = $tables_Handler->getCount($criteria);
- $tables_arr = $tables_Handler->getAll($criteria);
- $xoops->tpl()->assign('tables_count', $numrows_tables);
- $xoops->tpl()->assign('timg_path', TDMC_TABLES_URL_IMG);
- unset($criteria);
+ }*/
// Assign Template variables
$xoops->tpl()->assign('mods_count', $numrows_mods);
@@ -79,32 +69,46 @@
$mod['submenu'] = $mod_arr[$i]->getVar('mod_submenu');
$mod['search'] = $mod_arr[$i]->getVar('mod_search');
$mod['comments'] = $mod_arr[$i]->getVar('mod_comments');
- $mod['notifications'] = $mod_arr[$i]->getVar('mod_notifications');
+ $mod['notifications'] = $mod_arr[$i]->getVar('mod_notifications');
+ /*if (file_exists($timage = XOOPS_URL ."/uploads/tdmcreate/images/tables/".$table_image)) {
+ $table['image'] = $timage;
+ } elseif (file_exists($timage = XOOPS_URL ."/media/xoops/images/icons/32/".$table_image)) {
+ $table['image'] = $timage;
+ }*/
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('table_mid', $i));
+ $criteria->setSort('table_name');
+ $criteria->setOrder('ASC');
+ $criteria->setStart($start);
+ $criteria->setLimit($nb_pager);
+ $numrows_tables = $tables_Handler->getCount($criteria);
+ $tables_arr = $tables_Handler->getAll($criteria);
+ $xoops->tpl()->assign('tables_count', $numrows_tables);
+ $xoops->tpl()->assign('timg_path', TDMC_TABLES_URL_IMG);
+ unset($criteria);
+ $tables = array();
+ if ($numrows_tables > 0) {
+ foreach (array_keys($tables_arr) as $i)
+ {
+ $table['id'] = $tables_arr[$i]->getVar('table_id');
+ $table['name'] = $tables_arr[$i]->getVar('table_name');
+ $table['image'] = $tables_arr[$i]->getVar('table_image');
+ $table['nbfields'] = $tables_arr[$i]->getVar('table_nbfields');
+ $table['blocks'] = $tables_arr[$i]->getVar('table_blocks');
+ $table['admin'] = $tables_arr[$i]->getVar('table_admin');
+ $table['user'] = $tables_arr[$i]->getVar('table_user');
+ $table['submenu'] = $tables_arr[$i]->getVar('table_submenu');
+ $table['search'] = $tables_arr[$i]->getVar('table_search');
+ $table['comments'] = $tables_arr[$i]->getVar('table_comments');
+ $table['notifications'] = $tables_arr[$i]->getVar('table_notifications');
+ //$xoops->tpl()->append_by_ref('tables', $table);
+ $tables[] = $table;
+ unset($table);
+ }
+ }
+ $mod['tables'] = $tables;
$xoops->tpl()->append_by_ref('modules', $mod);
- unset($mod);
- }
- /*if (is_dir($timage = XOOPS_URL ."/uploads/tdmcreate/images/tables/".$table_image)) {
- $table['image'] = $timage;
- } elseif (is_dir($timage = XOOPS_URL ."/media/xoops/images/icons/32/".$table_image)) {
- $table['image'] = $timage;
- }*/
- if ($numrows_tables > 0) {
- foreach (array_keys($tables_arr) as $i)
- {
- $table['id'] = $tables_arr[$i]->getVar('table_id');
- $table['name'] = $tables_arr[$i]->getVar('table_name');
- $table['image'] = $tables_arr[$i]->getVar('table_image');
- $table['nbfields'] = $tables_arr[$i]->getVar('table_nbfields');
- $table['blocks'] = $tables_arr[$i]->getVar('table_blocks');
- $table['admin'] = $tables_arr[$i]->getVar('table_admin');
- $table['user'] = $tables_arr[$i]->getVar('table_user');
- $table['submenu'] = $tables_arr[$i]->getVar('table_submenu');
- $table['search'] = $tables_arr[$i]->getVar('table_search');
- $table['comments'] = $tables_arr[$i]->getVar('table_comments');
- $table['notifications'] = $tables_arr[$i]->getVar('table_notifications');
- $xoops->tpl()->append_by_ref('tables', $table);
- unset($tables);
- }
+ unset($mod);
}
// Display Page Navigation
if ($numrows_mods > $nb_pager) {
@@ -135,20 +139,22 @@
} else {
$obj = $tables_Handler->create();
}
- $mid = $request->asInt('mod_id', 0);
- //Form tables
- $obj->setVars(array('table_mid' => $_POST['table_mid'], 'table_name' => $_POST['table_name'],
- 'table_nbfields' => $_POST['table_nbfields'], 'table_fieldname' => $_POST['table_fieldname']));
+ $table_mid = $request->asInt('table_mid', 0);
+ $table_nbfields = $request->asInt('table_nbfields', 0);
+ $table_fieldname = $request->asStr('table_fieldname', '');
+ //Form tables
+ $obj->setVars(array('table_mid' => $table_mid, 'table_name' => $_POST['table_name'],
+ 'table_nbfields' => $table_nbfields, 'table_fieldname' => $table_fieldname));
//Form table_image
$pathIcon32 = XOOPS_ROOT_PATH . '/media/xoops/images/icons/32';
$uploaddir = ( is_dir($pathIcon32) && XoopsLoad::fileExists($pathIcon32) ) ? $pathIcon32 : TDMC_TABLES_PATH_IMG;
$uploader = new XoopsMediaUploader( $uploaddir, $xoops->getModuleConfig('mimetypes'),
$xoops->getModuleConfig('maxuploadsize'), null, null);
- if ($uploader->fetchMedia($_POST['tables_image'][0])) {
- $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['tables_image']['name']);
- $name_img = $_GET['table_name'].'.'.$extension;
- $uploader->setPrefix($name_img);
- $uploader->fetchMedia($_POST['tables_image'][0]);
+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+ $extension = preg_replace( '/^.+\.([^.]+)$/sU' , '\\1' , $_FILES['attachedfile']['name']);
+ $img_name = $_GET['table_name'].'.'.$extension;
+ $uploader->setPrefix($img_name);
+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$xoops->redirect('javascript:history.go(-1)',3, $uploader->getErrors());
} else {
@@ -170,12 +176,14 @@
'table_comments' => (($_REQUEST['table_comments'] == 1) ? '1' : '0'),
'table_notifications' => (($_REQUEST['table_notifications'] == 1) ? '1' : '0')));
- if( $tables_Handler->insert($obj) && $obj->isNew() ) {
- $tid = $xoops->db()->getInsertId();
- $xoops->redirect('fields.php?op=new&field_mid='.$mid.'&field_tid='.$tid.'&field_numb='.$table_nbfields.'&field_name='.$table_fieldname, 3, XoopsLocale::S_DATA_INSERTED);
- } elseif($tables_Handler->insert($obj) && !$obj->isNew() ) {
- $xoops->redirect('tables.php', 3, XoopsLocale::S_DATABASE_UPDATED);
- }
+ if( $tables_Handler->insert($obj) ) {
+ if( $obj->isNew() ) {
+ $tid = $xoops->db()->getInsertId();
+ $xoops->redirect('fields.php?op=new&field_mid='.$mid.'&field_tid='.$tid.'&field_numb='.$table_nbfields.'&field_name='.$table_fieldname, 3, XoopsLocale::S_DATA_INSERTED);
+ } else {
+ $xoops->redirect('tables.php', 3, XoopsLocale::S_DATABASE_UPDATED);
+ }
+ }
$xoops->error($obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'tables');
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php 2013-04-16 15:19:57 UTC (rev 11387)
@@ -25,7 +25,7 @@
/**
* @param TDMCreateFields|XoopsObject $obj
*/
- public function __construct(TDMCreateFields &$obj, $field_mid = 0, $field_tid = 0, $field_numb = null, $field_name = '')
+ public function __construct(TDMCreateFields &$obj, $field_mid = 0, $field_tid = 0, $field_numb = 0, $field_name = '')
{
$system = System::getInstance();
$xoops = Xoops::getInstance();
@@ -37,7 +37,7 @@
$this->setExtra('enctype="multipart/form-data"');
$tables_Handler = $xoops->getModuleHandler('tables');
- $criteria = new CriteriaCompo(new Criteria('table_mid', $field_mid)));
+ $criteria = new CriteriaCompo(new Criteria('table_mid', $field_mid));
$criteria->add(new Criteria('table_id', $field_tid));
$criteria->setSort('table_name');
$criteria->setOrder('ASC');
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php 2013-04-16 15:19:57 UTC (rev 11387)
@@ -48,12 +48,12 @@
$mod_tray->addElement($check_is_extension);
$tab1->addElement($mod_tray);
// Version module
- $tab1->addElement(new XoopsFormText(XoopsLocale::VERSION, 'mod_version', 30, 50, $obj->getVar('mod_version')), true);
+ $tab1->addElement(new XoopsFormText(XoopsLocale::VERSION, 'mod_version', 2, 4, $obj->getVar('mod_version')), true);
// Editor
$editor_configs=array();
$editor_configs['name'] = 'mod_description';
$editor_configs['value'] = $obj->getVar('mod_description', 'e');
- $editor_configs['rows'] = 5;
+ $editor_configs['rows'] = 4;
$editor_configs['cols'] = 80;
$editor_configs['width'] = '100%';
$editor_configs['height'] = '400px';
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php 2013-04-16 15:19:57 UTC (rev 11387)
@@ -66,7 +66,7 @@
$imgtray->addElement($imageselect);
$imgtray->addElement( new XoopsFormLabel( '', "<br /><img src='".XOOPS_URL."/".$uploadir."/".$table_image."' name='image3' id='image3' alt='' />" ) );
$fileseltray = new XoopsFormElementTray('','<br />');
- $fileseltray->addElement(new XoopsFormFile(XoopsLocale::A_UPLOAD , 'tables_image', $xoops->getModuleConfig('maxuploadsize')));
+ $fileseltray->addElement(new XoopsFormFile(XoopsLocale::A_UPLOAD, 'attachedfile', $xoops->getModuleConfig('maxuploadsize')));
$fileseltray->addElement(new XoopsFormLabel(''));
$imgtray->addElement($fileseltray);
$this->addElement($imgtray);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.html
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.html 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.html 2013-04-16 15:19:57 UTC (rev 11387)
@@ -22,7 +22,7 @@
</thead>
<tbody>
<{foreach item=mod from=$modules}>
- <tr class='<{cycle values='even,odd'}>'>
+ <tr class="<{cycle values='even,odd'}>">
<td class='txtcenter'><{$mod.id}></td>
<td class='txtcenter'><{$mod.name}></td>
<td class='txtcenter'><{$mod.version}></td>
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html 2013-04-16 12:56:37 UTC (rev 11386)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html 2013-04-16 15:19:57 UTC (rev 11387)
@@ -47,7 +47,7 @@
</td>
</tr>
<{if $tables_count > 0}>
- <{foreach item=table from=$tables}>
+ <{foreach item=table from=$module.tables}>
<tr class='<{cycle values='even,odd'}>'>
<td class='center'><{$table.id}></td>
<td class='center'><{$table.name}></td>
@@ -83,7 +83,7 @@
</table><br />
<{if $pagenav != ''}>
<{$pagenav}>
- <{/if}>
+ <{/if}>
<{/if}>
<!-- Display form (add,edit) -->
<{if $error_message}>
|
