Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10720] XoopsModules26/tdmcreate/branches/2.01/timgno /tdmcreate
|
From: <txm...@us...> - 2013-01-09 17:43:17
|
Revision: 10720
http://sourceforge.net/p/xoops/svn/10720
Author: txmodxoops
Date: 2013-01-09 17:43:10 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
Updated
Modified Paths:
--------------
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.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/architecture.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/extensions.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/extensions.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/fields.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/import.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/class/import.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/modules.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/tables.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/include/install.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/language/english/admin.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/language/english/modinfo.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/sql/mysql.sql
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_extensions.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_modules.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/templates/admin/tdmcreate_tables.html
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/xoops_version.php
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2013-01-09 06:24:03 UTC (rev 10719)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2013-01-09 17:43:10 UTC (rev 10720)
@@ -26,206 +26,27 @@
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
// heaser
-$xoops->header();
+$xoops->header('tdmcreate_building.html');
// Get handler
+/* @var $modules_handler TDMCreateModulesHandler */
+$modules_Handler = $xoops->getModuleHandler('modules');
/* @var $extensions_handler TDMCreateExtensionsHandler */
+$extensions_Handler = $xoops->getModuleHandler('extensions');
+/* @var $tables_handler TDMCreateExtensionsHandler */
$tables_Handler = $xoops->getModuleHandler('tables');
$admin_page = new XoopsModuleAdmin();
$admin_page->renderNavigation('building.php');
-/*switch ($op) {
- case "creation":
- $mods =& $modulesHandler->get($_REQUEST['module_name']);
- $mods_name = $mods->getVar('module_name');
- //$mods_fname = $mods->getVar('module_fname');
- $mods_desc = $mods->getVar('module_description');
- $mods_a_w_name = $mods->getVar('module_author_website_name');
- $mods_a_w_url = $mods->getVar('module_author_website_url');
- $mods_image = $mods->getVar('module_image');
- $mods_display_admin = $mods->getVar('module_display_admin');
- $mods_display_user = $mods->getVar('module_display_user');
- $mods_display_submenu = $mods->getVar('module_display_submenu');
- //Remove the new module directory if it exists
- TDMCreate_clearDir($modPath.'/modules/'.$mods_name);
-
- //Nom des tables et combien de tables
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria('table_module', $_REQUEST['module_name']));
- $nb_tables = $tablesHandler->getCount($criteria);
- $tbls_arr = $tablesHandler->getall($criteria);
-
- //Debut
- OpenTable();*/
- /************************************************/
- /*Structure*/
- /************************************************/
- //Creation de l'architecture
- /*const_architecture($mods_name, $mods_image);
- //Creation du changelog.txt
- const_changelog($mods, $mods_name);
-
- // Files cicles
- foreach (array_keys($tbls_arr) as $i)
- {
- //Variables
- $tbls_id = $tbls_arr[$i]->getVar('table_id');
- $tbls_name = $tbls_arr[$i]->getVar('table_name');
- $tbls_module = $tbls_arr[$i]->getVar('table_module');
- $tbls_field = $tbls_arr[$i]->getVar('table_field');
- $tbls_img = $tbls_arr[$i]->getVar('table_img');
- $tbls_nbfields = $tbls_arr[$i]->getVar('table_nbfields');
- $tbls_blocks = $tbls_arr[$i]->getVar('table_blocks');
- $tbls_display_admin = $tbls_arr[$i]->getVar('table_display_admin');
- $tbls_display_user = $tbls_arr[$i]->getVar('table_display_user');
- $tbls_online = $tbls_arr[$i]->getVar('table_online');
- $tbls_submenu = $tbls_arr[$i]->getVar('table_submenu');
- $tbls_search = $tbls_arr[$i]->getVar('table_search');
- $tbls_coms = $tbls_arr[$i]->getVar('table_coms');
-
- //Creation of the file mysql.sql
- const_sql($mods_name, $tbls_module_table, $tbls_name, $tbls_champs);
- $result = $xoopsDB->queryF("SELECT COUNT(*) FROM " . $xoopsDB->prefix("tdmcreate_tables")." WHERE table_name = ".$mods_name."'_topic'");
- list( $topic ) = $xoopsDB->fetchRow($result);
-
- //Fabrication
- //Copie of images tables
- $tbls_img1 = $modPath."/images/uploads/tables/".$tbls_img;
- if (file_exists($tbls_img1)) {
- copy($tbls_img1, $modPath."/modules/".$mods_name."/images/deco/".$tbls_img);
- }
- //Creation des classes
- const_class($mods, $mods_name, $tbls_module_table, $tbls_name, $tbls_champs, $tbls_parametres);
-
- //Creation of pages admin
- if ( $mods_display_admin == 1 ) {
- const_admin_pages($mods, $mods_name, $tbls_id, $tbls_module_table, $tbls_name, $tbls_img, $tbls_champs, $tbls_parametres, $topic);
- }
- //Creation of pages and templates user
- if ( $mods_display_user == 1 ) {
- const_user_pages($mods, $mods_name, $tbls_name, $tbls_champs, $tbls_parametres, $topic);
- // Creation of templates pages
- const_templates_pages($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
- }
- //Creation of search
- if ( $tbls_search == 1 ) {
- const_include_search($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres, $tbls_img);
- }
- //Creation of the comments
- if ( $tbls_coms == 1 ) {
- const_user_comments($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
- }
-
- //Creation of the blocks
- if ( $tbls_blocks != 1 ) {
- const_blocks($mods, $mods_name, $tbls_module_table, $tbls_name, $tbls_champs, $tbls_parametres, $topic);
- //Creation of template blocks
- const_blocks_templates($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
- }
- }
- //Variables
- $tbls_id = $tablesHandler->getVar('table_id');
- $tbls_name = $tablesHandler->getVar('table_name');
- $tbls_module_table = $tablesHandler->getVar('table_module_table');
- $tbls_img = $tablesHandler->getVar('table_img');
- $tbls_champs = $tablesHandler->getVar('table_champ');
- $tbls_parametres = $tablesHandler->getVar('table_parametres');
- $tbls_blocks = $tablesHandler->getVar('table_blocks');
- $tbls_display_admin = $tablesHandler->getVar('table_display_admin');
- $tbls_display_user = $tablesHandler->getVar('table_display_user');
- $tbls_online = $tablesHandler->getVar('table_online');
- $tbls_submenu = $tablesHandler->getVar('table_submenu');
- $tbls_search = $tablesHandler->getVar('table_search');
- $tbls_coms = $tablesHandler->getVar('table_coms');
- //Creation of xoopsversion.php file
- //Xoops version set to integrate the end of the block, etc.
- const_xoopsversion($mods, $mods_name, $tbls_arr, $tbls_module_table, $tbls_blocks, $tbls_submenu, $tbls_search, $tbls_coms);
- if($mods_display_user == 1){
- // Creation of template index
- const_templates_index($mods, $mods_name, $tbls_name, $tbls_module_table, $tbls_champs, $tbls_parametres);
- // Creation of template header
- const_templates_header($mods, $mods_name, $mods_desc);
- // Creation of template footer
- const_templates_footer($mods, $mods_name, $tbls_module_table);
- }
- //Creation of the file permissions
- $topic = 0;
- if ( $topic == 1 || $tbls_module_table != null) { //
- const_admin_permissions($mods, $mods_name, $tbls_name, $topic);
- }
-
- //Include
- const_js_jquery($mods, $mods_name);
- //Configs
- const_include_configs($mods, $mods_name, $mods_a_w_name, $mods_a_w_url); // a_w = author_website
- //Style
- //const_css_admin($mods, $mods_name);
- const_css_style($mods, $mods_name);
- //Functions
- const_include_functions($mods, $mods_name);
- //Creation of the install file for uploads
- const_include_install($mods, $mods_name, $tbls_arr);
- //Language
- ///////////////////////////////////////////////////////////////////////
- //Creation of language main.php
- const_main_language($mods, $mods_name, $mods_desc, $tbls_arr);
- //Creation of language modinfo.php
- const_modinfo_language($mods, $mods_name, $mods_desc, $tbls_arr, $topic);
- //Creation of language admin.php
- const_admin_language($mods, $mods_name, $tbls_arr, $topic);
- //Creation of language blocks.php
- const_blocks_language($mods, $mods_name, $tbls_arr);
- //Creation of language help.php
- const_help_language($mods, $mods_name, $mods_desc);*/
- //Creation of language
- //const_language($mods, $mods_name);
- ///////////////////////////////////////////////////////////////////////
- /************************************************/
- /*Admin*/
- /************************************************/
- /*if ( $mods_display_admin == 1 ) {
- //Creation of admin file admin_header.php
- const_admin_header($mods, $mods_name, $tbls_arr);
- //Creation of admin file admin_footer.php
- const_admin_footer($mods, $mods_name, $tbls_arr);
- //Creation of admin file menu.php
- const_admin_menu($mods, $mods_name, $tbls_arr, $topic);
- //Creation of admin file about.php
- const_admin_about($mods, $mods_name);
- //Creation of admin file index.php
- const_admin_index($mods, $mods_name, $tbls_arr);
- }
- /************************************************/
- //*User*/
- /************************************************/
- /*if ( $mods_display_user == 1 ) {
- const_user_header($mods, $mods_name, $tbls_arr, $tbls_name, $tbls_module_table);
- const_user_index($mods, $mods_name);
- }
- CloseTable();
-
+switch ($op) {
+ case "default":
+ default:
+ //tdmcreate_getBuildingForm();
break;
- case "default":
- default:
- $mod_arr = $modulesHandler->getall();
- $numrowsmod = count( $mod_arr );
- // Redirect if there aren't modules
- if ( $numrowsmod == 0 ) {
- redirect_header('modules.php?op=add_module', 3, _AM_TDMCREATE_NOTMODULES );
- }
+ case "build":
+ $mods =& $modules_Handler->get($_REQUEST['mod_name']);
+ $mods_name = $mods->getVar('mod_name');
- include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
- $action = $_SERVER['REQUEST_URI'];
-
- $form = new XoopsThemeForm(_AM_TDMCREATE_ADMIN_CONST, 'form_creation', $action, 'post', true);
-
- $mods_select = new XoopsFormSelect(_AM_TDMCREATE_CONST_MODULES, 'module_name', 'module_name');
- $mods_select->addOptionArray($modulesHandler->getList());
- $form->addElement($mods_select, true);
-
- $form->addElement(new XoopsFormHidden('op', 'creation'));
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- $form->display();
- break;
-}*/
+ break;
+}
$xoops->footer();
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php 2013-01-09 06:24:03 UTC (rev 10719)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php 2013-01-09 17:43:10 UTC (rev 10720)
@@ -10,7 +10,7 @@
*/
/**
- * tdmcreate module
+ * tdmcreate extension
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
@@ -23,10 +23,16 @@
// Get main instance
$system = System::getInstance();
$xoops = Xoops::getInstance();
+// Preferences Limit
+$nb_pager = $xoops->getModuleConfig('pager');
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+// Get limit pager
+$limit = $system->cleanVars($_REQUEST, 'limit', 0, 'int');
+// Get start pager
+$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
// heaser
-$xoops->header();
+$xoops->header('tdmcreate_extensions.html');
// Get handler
/* @var $extensions_handler TDMCreateExtensionsHandler */
$extensions_Handler = $xoops->getModuleHandler('extensions');
@@ -40,174 +46,127 @@
$admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_EXTENSION, 'extensions.php?op=new', 'add');
$admin_page->renderButton();
$criteria = new CriteriaCompo();
- $criteria->setSort("module_id ASC, module_name");
+ $criteria->setSort("ext_name");
$criteria->setOrder("ASC");
- $numrows = $extensions_Handler->getCount();
- if (isset($_REQUEST['limit'])) {
- $criteria->setLimit($_REQUEST['limit']);
- $limit = $_REQUEST['limit'];
- } else {
- $criteria->setLimit($GLOBALS['xoopsModuleConfig']['pager']);
- $limit = $GLOBALS['xoopsModuleConfig']['pager'];
- }
- if (isset($_REQUEST['start'])) {
- $criteria->setStart($_REQUEST['start']);
- $start = $_REQUEST['start'];
- } else {
- $criteria->setStart(0);
- $start = 0;
- }
- $mods_arr = $extensions_Handler->getall($criteria);
- if ( $numrows > $limit ) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
- //Display modules list
- if ($numrows>0)
- {
- $yes = "<img src='../images/16/green.png' alt='"._YES."' title='"._YES."' />";
- $no = "<img src='../images/16/red.png' alt='"._NO."' title='"._NO."' />";
- echo "<table width='100%' cellspacing='1' class='outer'>
- <tr>
- <th class='center'>"._AM_TDMCREATE_MODULE_ID."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_NAME."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_VERSION."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_IMAGE."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_RELEASE."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_STATUS."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_DISPLAY_ADMIN_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_DISPLAY_USER_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_DISPLAY_SUBMENU_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_ACTIVE_SEARCH_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_ACTIVE_COMS_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_ACTIVE_NOTIFY_LIST."</th>
- <th class='center' width='5%'>"._AM_TDMCREATE_FORMACTION."</th>
- </tr>";
- $class = "odd";
- foreach (array_keys($mods_arr) as $i)
- {
- echo "<tr class='".$class."'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>".$i."</td>";
- echo "<td class='center'>".$mods_arr[$i]->getVar("module_name")."</td>";
- echo "<td class='center'>".$mods_arr[$i]->getVar("module_version")."</td>";
- echo "<td class='center'><img src='".TDMC_UPLOAD_URL."/images/modules/".$mods_arr[$i]->getVar("module_image")."' height='30px' title='module_image' alt='module_image'></td>";
- echo "<td class='center'>".$mods_arr[$i]->getVar("module_release")."</td>";
- echo "<td class='center'>".$mods_arr[$i]->getVar("module_status")."</td>";
-
- $verif_module_display_admin = ( $mods_arr[$i]->getVar("module_display_admin") == 1 ) ? $yes : $no;
- echo "<td class='center'>".$verif_module_display_admin."</td>";
- $verif_module_display_user = ( $mods_arr[$i]->getVar("module_display_user") == 1 ) ? $yes : $no;
- echo "<td class='center'>".$verif_module_display_user."</td>";
- $verif_module_display_submenu = ( $mods_arr[$i]->getVar("module_display_submenu") == 1 ) ? $yes : $no;
- echo "<td class='center'>".$verif_module_display_submenu."</td>";
- $verif_module_active_search = ( $mods_arr[$i]->getVar("module_active_search") == 1 ) ? $yes : $no;
- echo "<td class='center'>".$verif_module_active_search."</td>";
- $verif_module_active_coms = ( $mods_arr[$i]->getVar("module_active_comments") == 1 ) ? $yes : $no;
- echo "<td class='center'>".$verif_module_active_coms."</td>";
- $verif_module_active_notify = ( $mods_arr[$i]->getVar("module_active_notifies") == 1 ) ? $yes : $no;
- echo "<td class='center'>".$verif_module_active_notify."</td>";
-
- echo "<td class='center' width='5%'>
- <a href='modules.php?op=edit_module&module_id=".$i."'><img src='".$pathIcon16."/edit.png' alt='"._EDIT."' title='"._EDIT."'></a>
- <a href='modules.php?op=delete_module&module_id=".$i."'><img src='".$pathIcon16."/delete.png' alt='"._DELETE."' title='"._DELETE."'></a>
- </td>";
- echo "</tr>";
- }
- echo "</table><br><br>";
- echo "<div class='center'>".$pagenav."</div>";
- } else {
- echo "<table width='100%' cellspacing='1' class='outer'>
- <tr>
- <th class='center'>"._AM_TDMCREATE_MODULE_NAME."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_VERSION."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_IMAGE."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_RELEASE."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_STATUS."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_DISPLAY_ADMIN_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_DISPLAY_USER_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_DISPLAY_SUBMENU_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_ACTIVE_SEARCH_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_ACTIVE_COMS_LIST."</th>
- <th class='center'>"._AM_TDMCREATE_MODULE_ACTIVE_NOTIFY_LIST."</th>
- <th class='center' width='5%'>"._AM_TDMCREATE_FORMACTION."</th>
- </tr><tr><td class='errorMsg' colspan='12'>No Modules</td></tr>";
- echo "</table><br><br>";
- }
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $numrows = $extensions_Handler->getCount($criteria);
+ $xoops->tpl()->assign('eimg_path', XOOPS_UPLOAD_URL.'/tdmcreate/images/extensions/');
+ $xoops->tpl()->assign('extensions', $extensions_Handler->getObjects($criteria, true, false));
+ $xoops->tpl()->assign('extensions_list', true);
+ $xoops->tpl()->assign('extension', true);
+ unset($criteria);
+ // Display Page Navigation
+ if ($numrows > $nb_pager) {
+ $nav = new XoopsPageNav($numrows, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
break;
case "new":
- $obj =& $extensions_Handler->create();
- $form = $obj->getExtensionsForm();
- $form->display();
+ $admin_page->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
+ $admin_page->renderButton();
+
+ $obj = $extensions_Handler->create();
+ $form = $xoops->getModuleForm($obj, 'extensions');
+ $xoops->tpl()->assign('form', $form->render());
break;
case "save":
if (!$xoops->security()->check()) {
- $xoops->redirect('extensions.php', 3, implode(',', $xoops->security()->getErrors()));
- }
- if (isset($_REQUEST["field_id"])) {
- $obj =& $extensions_Handler->get($_REQUEST["field_id"]);
+ $xoops->redirect('extensions.php', 3, implode(',', $xoops->security()->getErrors()));
+ }
+ $id = $system->cleanVars($_REQUEST, 'ext_id', 0, 'int');
+ if ($id > 0) {
+ $obj = $extensions_Handler->get($id);
} else {
- $obj =& $extensions_Handler->create();
+ $obj = $extensions_Handler->create();
+ }
+ //Form extension save
+ $obj->setVars(array("ext_name" => $_POST["ext_name"], "ext_version" => $_POST["ext_version"],
+ "ext_description" => $_POST["ext_description"], "ext_author" => $_POST["ext_author"],
+ "ext_author_mail" => $_POST["ext_author_mail"], "ext_author_website_url" => $_POST["ext_author_website_url"],
+ "ext_author_website_name" => $_POST["ext_author_website_name"], "ext_credits" => $_POST["ext_credits"],
+ "ext_license" => $_POST["ext_license"], "ext_release_info" => $_POST["ext_release_info"],
+ "ext_release_file" => $_POST["ext_release_file"], "ext_manual" => $_POST["ext_manual"],
+ "ext_manual_file" => $_POST["ext_manual_file"]));
+
+ //Form extension_image
+ $uploaddir = XOOPS_UPLOAD_PATH."/tdmcreate/images/extensions/";
+ $uploader_img = new XoopsMediaUploader($uploaddir, $xoops->getModuleConfig('mimetypes'),
+ $xoops->getModuleConfig('maxsize'), null, null);
+ if ($uploader_img->fetchMedia("extensions_image")) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["ext_image"]['name']);
+ $name_img = $_GET['ext_name'].'_slogo.'.$extension;
+ $uploader_img->setPrefix($name_img);
+ $uploader_img->fetchMedia("extensions_image");
+ if (!$uploader_img->upload()) {
+ $errors = $uploader_img->getErrors();
+ $xoops->redirect("javascript:history.go(-1)", 3, $errors);
+ } else {
+ $obj->setVar("extensions_image", $uploaddir . $uploader_img->getSavedFileName());
+ }
+ } else {
+ if ($_POST["extensions_image"] == 'blank.gif') {
+ $obj->setVar("ext_image", $_POST["ext_image"]);
+ } else {
+ $obj->setVar("ext_image", $uploaddir . $_POST["ext_image"]);
+ }
}
- //Form fields
- $obj->setVars(array("field_table" => $_POST["field_table"], "field_name" => $_POST["field_name"], "field_type" => $_POST["field_type"], "field_value" => $_POST["field_value"], "field_attribute" => $_POST["field_attribute"], "field_null" => $_POST["field_null"], "field_default" => $_POST["field_default"], "field_key" => $_POST["field_key"], "field_elements" => $_POST["field_elements"]));
- //Form field_display_admin
- $verif_field_display_admin = ($_REQUEST["field_display_admin"] == 1) ? "1" : "0";
- //Form field_display_user
- $verif_field_display_user = ($_REQUEST["field_display_user"] == 1) ? "1" : "0";
- //Form field_display_block
- $verif_field_display_block = ($_REQUEST["field_display_block"] == 1) ? "1" : "0";
- //Form field_mainfield
- $verif_field_mainfield = ($_REQUEST["field_mainfield"] == 1) ? "1" : "0";
- //Form field_search
- $verif_field_search = ($_REQUEST["field_search"] == 1) ? "1" : "0";
- //Form fields
- $verif_field_required = ($_REQUEST["field_required"] == 1) ? "1" : "0";
- $obj->setVars(array("field_display_admin" => $verif_field_display_admin, "field_display_user" => $verif_field_display_user, "field_display_block" => $verif_field_display_block, "field_mainfield" => $verif_field_mainfield, "field_search" => $verif_field_search, "field_required" => $verif_field_required));
-
+ //Form extension save
+ $obj->setVars(array("ext_demo_site_url" => $_POST["ext_demo_site_url"], "ext_demo_site_name" => $_POST["ext_demo_site_name"],
+ "ext_forum_site_url" => $_POST["ext_forum_site_url"], "ext_forum_site_name" => $_POST["ext_forum_site_name"],
+ "ext_website_url" => $_POST["ext_website_url"], "ext_website_name" => $_POST["ext_website_name"],
+ "ext_release" => $_POST["ext_release"], "ext_status" => $_POST["ext_status"],
+ "ext_display_admin" => (($_REQUEST["ext_display_admin"] == 1) ? "1" : "0"),
+ "ext_display_user" => (($_REQUEST["ext_display_user"] == 1) ? "1" : "0"),
+ "ext_display_submenu" => (($_REQUEST["ext_display_submenu"] == 1) ? "1" : "0"),
+ "ext_active_search" => (($_REQUEST["ext_active_search"] == 1) ? "1" : "0"),
+ "ext_active_comments" => (($_REQUEST["ext_active_comments"] == 1) ? "1" : "0"),
+ "ext_active_notifies" => (($_REQUEST["ext_active_notifies"] == 1) ? "1" : "0")));
+ // Insert Data
if ($extensions_Handler->insert($obj)) {
redirect_header("extensions.php?op=list", 2, _AM_TDMCREATE_FORMOK);
}
- echo $obj->getHtmlErrors();
- $form =& $obj->getForm();
- $form->display();
+ // Form Data
+ $xoops->error($obj->getHtmlErrors());
+ $form = $xoops->getModuleForm($obj, 'extensions');
+ $xoops->tpl()->assign('form', $form->render());
break;
- case "edit":
- $obj = $extensions_Handler->get($_REQUEST["field_id"]);
- $form = $obj->getForm();
- $form->display();
- break;
-
- case "delete":
+ case "edit":
$admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_EXTENSION, 'extensions.php?op=new', 'add');
- $admin_page->addItemButton(_AM_TDMCREATE_EXTENSION_LIST, 'extensions.php', 'application-view-detail');
- $admin_page->renderButton();
- $id = $system->cleanVars($_REQUEST, 'id', 0, 'int');
+ $admin_page->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php', 'application-view-detail');
+ $admin_page->renderButton();
+
+ $id = $system->cleanVars($_REQUEST, 'ext_id', 0, 'int');
if ($id > 0) {
$obj = $extensions_Handler->get($id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ $form = $xoops->getModuleForm($obj, 'extensions');
+ $xoops->tpl()->assign('form', $form->render());
+ } else {
+ $xoops->redirect('extensions.php', 1, _AM_SYSTEM_DBERROR);
+ }
+ break;
+
+ case "delete":
+ $id = $system->cleanVars($_REQUEST, 'ext_id', 0, 'int');
+ if ($id > 0) {
+ $obj = $extensions_Handler->get($id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
if (!$xoops->security()->check()) {
$xoops->redirect("extensions.php", 3, implode(",", $xoops->security()->getErrors()));
}
- if ($extensions_Handler->deleteFields($obj)) {
- $xoops->redirect("extensions.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_CATEGORY));
+ if ($extensions_Handler->delete($obj)) {
+ $xoops->redirect("extensions.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_EXTENSION));
} else {
$xoops->error($obj->getHtmlErrors());
}
- } else {
- // Define Stylesheet
- $xoops->theme()->addStylesheet('modules/system/css/admin.css');
- $xoops->tpl()->assign('form', false);
- $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'extensions.php', sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')) . '<br />');
- }
- } else {
- $xoops->redirect('extensions.php', 1, _AM_SYSTEM_DBERROR);
- }
- break;
+ } else {
+ $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'extensions.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('ext_name')) . '<br />');
+ }
+ } else {
+ $xoops->redirect('extensions.php', 1, _AM_SYSTEM_DBERROR);
+ }
+ break;
}
$xoops->footer();
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-01-09 06:24:03 UTC (rev 10719)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-01-09 17:43:10 UTC (rev 10720)
@@ -23,22 +23,67 @@
// Get main instance
$system = System::getInstance();
$xoops = Xoops::getInstance();
+// Preferences Limit
+$nb_pager = $xoops->getModuleConfig('pager');
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+// Get limit pager
+$limit = $system->cleanVars($_REQUEST, 'limit', 0, 'int');
+// Get start pager
+$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
// heaser
-$xoops->header();
+$xoops->header('tdmcreate_fields.html');
// Get handler
-/* @var $extensions_handler TDMCreateExtensionsHandler */
-$extensions_Handler = $xoops->getModuleHandler('fields');
+/* @var $tables_handler TDMCreateTablesHandler */
+$tables_Handler = $xoops->getModuleHandler('tables');
+/* @var $fields_handler TDMCreateFieldsHandler */
+$fields_Handler = $xoops->getModuleHandler('fields');
$admin_page = new XoopsModuleAdmin();
$admin_page->renderNavigation('fields.php');
-/*switch ($op)
+switch ($op)
{
+ case "list":
+ default:
+ $admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
+ $admin_page->renderButton();
+ // Get tables list
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('table_name');
+ $criteria->setOrder('ASC');
+ $criteria->setStart($start);
+ $criteria->setLimit($nb_pager);
+ $numrows_tabs = $tables_Handler->getCount($criteria);
+ // Redirect if there aren't modules
+ /* if ( $numrows_mods == 0 ) {
+ redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
+ }*/
+ $xoops->tpl()->assign('timg_path', XOOPS_UPLOAD_URL.'/tdmcreate/images/tables/');
+ $xoops->tpl()->assign('tables', $tables_Handler->getObjects($criteria, true, false));
+ $xoops->tpl()->assign('table', true);
+ unset($criteria);
+ // Get fields list
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("field_name");
+ $criteria->setOrder("ASC");
+ $xoops->tpl()->assign('fimg_path', XOOPS_UPLOAD_URL.'/tdmcreate/images/fields/');
+ $xoops->tpl()->assign('fields', $fields_Handler->getObjects($criteria, true, false));
+ $xoops->tpl()->assign('field', true);
+ unset($criteria);
+ // Display Page Navigation
+ if ($numrows_tabs > $nb_pager) {
+ $nav = new XoopsPageNav($numrows_tabs, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
+ break;
+
case "new":
- $obj =& $fieldsHandler->create();
- $form = $obj->getForm();
- $form->display();
+ $admin_page->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $admin_page->renderButton();
+
+ $obj = $fields_Handler->create();
+ $form = $xoops->getModuleForm($obj, 'fields');
+ $xoops->tpl()->assign('form', $form->render());
break;
case "save":
@@ -51,34 +96,60 @@
$obj =& $fieldsHandler->create();
}
//Form fields
- $obj->setVars(array("field_table" => $_POST["field_table"], "field_name" => $_POST["field_name"], "field_type" => $_POST["field_type"], "field_value" => $_POST["field_value"], "field_attribute" => $_POST["field_attribute"], "field_null" => $_POST["field_null"], "field_default" => $_POST["field_default"], "field_key" => $_POST["field_key"], "field_elements" => $_POST["field_elements"]));
- //Form field_display_admin
- $verif_field_display_admin = ($_REQUEST["field_display_admin"] == 1) ? "1" : "0";
- //Form field_display_user
- $verif_field_display_user = ($_REQUEST["field_display_user"] == 1) ? "1" : "0";
- //Form field_display_block
- $verif_field_display_block = ($_REQUEST["field_display_block"] == 1) ? "1" : "0";
- //Form field_mainfield
- $verif_field_mainfield = ($_REQUEST["field_mainfield"] == 1) ? "1" : "0";
- //Form field_search
- $verif_field_search = ($_REQUEST["field_search"] == 1) ? "1" : "0";
- //Form fields
- $verif_field_required = ($_REQUEST["field_required"] == 1) ? "1" : "0";
- $obj->setVars(array("field_display_admin" => $verif_field_display_admin, "field_display_user" => $verif_field_display_user, "field_display_block" => $verif_field_display_block, "field_mainfield" => $verif_field_mainfield, "field_search" => $verif_field_search, "field_required" => $verif_field_required));
+ $obj->setVars(array("field_table" => $_POST["field_table"], "field_name" => $_POST["field_name"],
+ "field_type" => $_POST["field_type"], "field_value" => $_POST["field_value"],
+ "field_attribute" => $_POST["field_attribute"], "field_null" => $_POST["field_null"],
+ "field_default" => $_POST["field_default"], "field_key" => $_POST["field_key"],
+ "field_elements" => $_POST["field_elements"],
+ "field_display_admin" => (($_REQUEST["field_display_admin"] == 1) ? "1" : "0"),
+ "field_display_user" => (($_REQUEST["field_display_user"] == 1) ? "1" : "0"),
+ "field_display_block" => (($_REQUEST["field_display_block"] == 1) ? "1" : "0"),
+ "field_mainfield" => (($_REQUEST["field_mainfield"] == 1) ? "1" : "0"),
+ "field_search" => (($_REQUEST["field_search"] == 1) ? "1" : "0"),
+ "field_required" => (($_REQUEST["field_required"] == 1) ? "1" : "0")));
if ($fieldsHandler->insert($obj)) {
- redirect_header("tables.php?op=list", 2, _AM_TDMCREATE_FORMOK);
+ redirect_header("fields.php?op=list", 2, _AM_TDMCREATE_FORMOK);
}
- echo $obj->getHtmlErrors();
- $form =& $obj->getForm();
- $form->display();
- break;
+
+ $xoops->error($obj->getHtmlErrors());
+ $form = $xoops->getModuleForm($obj, 'fields');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
- case "edit":
- echo $adminMenu->addNavigation('tables.php');
- $obj = $fieldsHandler->get($_REQUEST["field_id"]);
- $form = $obj->getForm();
- $form->display();
+ case "edit":
+ $admin_page->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
+ $admin_page->renderButton();
+
+ $id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int');
+ if ($id > 0) {
+ $obj = $tables_Handler->get($id);
+ $form = $xoops->getModuleForm($obj, 'fields');
+ $xoops->tpl()->assign('form', $form->render());
+ } else {
+ $xoops->redirect('fields.php', 1, _AM_SYSTEM_DBERROR);
+ }
break;
-}*/
+
+ case "delete":
+ $id = $system->cleanVars($_REQUEST, 'field_id', 0, 'int');
+ if ($id > 0) {
+ $obj = $fields_Handler->get($id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (!$xoops->security()->check()) {
+ $xoops->redirect("fields.php", 3, implode(",", $xoops->security()->getErrors()));
+ }
+ if ($fields_Handler->delete($obj)) {
+ $xoops->redirect("fields.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_TABLE));
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
+ } else {
+ $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'fields.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('field_name')) . '<br />');
+ }
+ } else {
+ $xoops->redirect('fields.php', 1, _AM_SYSTEM_DBERROR);
+ }
+ break;
+}
$xoops->footer();
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php 2013-01-09 06:24:03 UTC (rev 10719)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php 2013-01-09 17:43:10 UTC (rev 10720)
@@ -26,7 +26,7 @@
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
// heaser
-$xoops->header();
+$xoops->header('tdmcreate_import.html');
// Get handler
/* @var $import_handler TDMCreateImportHandler */
$import_Handler = $xoops->getModuleHandler('import');
@@ -34,19 +34,93 @@
$admin_page = new XoopsModuleAdmin();
$admin_page->renderNavigation('import.php');
switch ($op)
-{
- case "list":
- default:
- // Import old modules by sql
+{
+ case "list":
+ $admin_page->addItemButton(_AM_TDMCREATE_IMPORT, 'import.php?op=import', 'add');
+ $admin_page->renderButton();
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("import_name");
+ $criteria->setOrder("ASC");
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $numrows = $import_Handler->getCount($criteria);
+ $xoops->tpl()->assign('imports', $import_Handler->getObjects($criteria, true, false));
+ $xoops->tpl()->assign('import', true);
+ unset($criteria);
+ // Display Page Navigation
+ if ($numrows > $nb_pager) {
+ $nav = new XoopsPageNav($numrows, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
break;
- case "save":
+ case "import":
+ $admin_page->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
+ $admin_page->renderButton();
+
+ $obj = $import_Handler->create();
+ $form = $xoops->getModuleForm($obj, 'import');
+ $xoops->tpl()->assign('form', $form->render());
break;
- case "edit":
+ case "save":
+ if (!$xoops->security()->check()) {
+ $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
+ }
+ $id = $system->cleanVars($_REQUEST, 'import_id', 0, 'int');
+ if ($id > 0) {
+ $obj = $import_Handler->get($id);
+ } else {
+ $obj = $import_Handler->create();
+ }
+ //Form module save
+ $obj->setVars(array("import_mid" => $_POST["import_mid"], "import_name" => $_POST["import_name"],
+ "import_nbtables" => $_POST["import_nbtables"], "import_tablename" => $_POST["import_tablename"],
+ "import_nbfields" => $_POST["import_nbfields"], "import_fieldname" => $_POST["import_fieldname"]));
+
+ if ($import_Handler->insert($obj)) {
+ redirect_header("import.php?op=list", 3, _AM_TDMCREATE_FORMOK);
+ }
+
+ $xoops->error($obj->getHtmlErrors());
+ $form = $xoops->getModuleForm($obj, 'import');
+ $xoops->tpl()->assign('form', $form->render());
+ break;
+
+ case "edit":
+ $admin_page->addItemButton(_AM_TDMCREATE_IMPORT, 'import.php?op=import', 'add');
+ $admin_page->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
+ $admin_page->renderButton();
+
+ $id = $system->cleanVars($_REQUEST, 'import_id', 0, 'int');
+ if ($id > 0) {
+ $obj = $import_Handler->get($id);
+ $form = $xoops->getModuleForm($obj, 'import');
+ $xoops->tpl()->assign('form', $form->render());
+ } else {
+ $xoops->redirect('import.php', 2, _AM_SYSTEM_DBERROR);
+ }
break;
- case "delete":
+ case "delete":
+ $id = $system->cleanVars($_REQUEST, 'import_id', 0, 'int');
+ if ($id > 0) {
+ $obj = $import_Handler->get($id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (!$xoops->security()->check()) {
+ $xoops->redirect("import.php", 3, implode(",", $xoops->security()->getErrors()));
+ }
+ if ($import_Handler->delete($obj)) {
+ $xoops->redirect("import.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_IMPORT));
+ } else {
+ $xoops->error($obj->getHtmlErrors());
+ }
+ } else {
+ $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'import.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('import_name')) . '<br />');
+ }
+ } else {
+ $xoops->redirect('import.php', 1, _AM_SYSTEM_DBERROR);
+ }
break;
}
$xoops->footer();
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2013-01-09 06:24:03 UTC (rev 10719)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/index.php 2013-01-09 17:43:10 UTC (rev 10720)
@@ -17,31 +17,44 @@
* @package tdmcreate
* @since 2.6.0
* @author TDM Xoops (AKA Developers)
- * @version $Id: about.php 10665 2012-12-27 10:14:15Z timgno $
+ * @version $Id: index.php 10665 2012-12-27 10:14:15Z timgno $
*/
include dirname(__FILE__) . '/header.php';
$xoops = Xoops::getInstance();
// Get banners handler
-//$modules_Handler = $xoops->getModuleHandler('tdmcreate_modules');
-//$tables_Handler = $xoops->getModuleHandler('tdmcreate_tables');
+$modules_Handler = $xoops->getModuleHandler('modules');
+$extensions_Handler = $xoops->getModuleHandler('extensions');
+$tables_Handler = $xoops->getModuleHandler('tables');
+$import_Handler = $xoops->getModuleHandler('import');
// heaser
$xoops->header();
// tdmcreate modules
-//$criteria = new CriteriaCompo();
-//$tdmcreate_modules = $modules_Handler->getCount($criteria);
+$criteria = new CriteriaCompo();
+$tdmcreate_modules = $modules_Handler->getCount($criteria);
+// tdmcreate extensions
+$criteria = new CriteriaCompo();
+$tdmcreate_extensions = $extensions_Handler->getCount($criteria);
// tdmcreate tables
-//$criteria = new CriteriaCompo();
-//$tdmcreate_tables = $tables_Handler->getCount($criteria);
+$criteria = new CriteriaCompo();
+$tdmcreate_tables = $tables_Handler->getCount($criteria);
+// tdmcreate import
+$criteria = new CriteriaCompo();
+$tdmcreate_import = $import_Handler->getCount($criteria);
// folder path
$folder_path = XOOPS_ROOT_PATH . '/uploads/tdmcreate';
$r = "red"; $g = "green";
-//$modules_color = $tdmcreate_modules == 0 ? $r : $g;
-//$tables_color = $tdmcreate_tables == 0 ? $r : $g;
+$modules_color = $tdmcreate_modules == 0 ? $r : $g;
+$extensions_color = $tdmcreate_extensions == 0 ? $r : $g;
+$tables_color = $tdmcreate_tables == 0 ? $r : $g;
+$import_color = $tdmcreate_import == 0 ? $r : $g;
+
$admin_page = new XoopsModuleAdmin();
$admin_page->addInfoBox(_AM_TDMCREATE_STATISTICS);
-//$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NMTOTAL, '<span class="'.$modules_color.'">' . $tdmcreate_modules . '</span>'));
-//$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NTTOTAL, '<span class="'.$tables_color.'">' . $tdmcreate_tables . '</span>'));
+$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NMTOTAL, '<span class="'.$modules_color.'">' . $tdmcreate_modules . '</span>'));
+$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NETOTAL, '<span class="'.$extensions_color.'">' . $tdmcreate_extensions . '</span>'));
+$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NTTOTAL, '<span class="'.$tables_color.'">' . $tdmcreate_tables . '</span>'));
+$admin_page->addInfoBoxLine(sprintf(_AM_TDMCREATE_INDEX_NITOTAL, '<span class="'.$import_color.'">' . $tdmcreate_import . '</span>'));
$admin_page->addConfigBoxLine($folder_path, 'folder');
$admin_page->addConfigBoxLine(array($folder_path, '777'), 'chmod');
$admin_page->displayNavigation('index.php');
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-01-09 06:24:03 UTC (rev 10719)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-01-09 17:43:10 UTC (rev 10720)
@@ -23,8 +23,14 @@
// Get main instance
$system = System::getInstance();
$xoops = Xoops::getInstance();
+// Preferences Limit
+$nb_pager = $xoops->getModuleConfig('pager');
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+// Get limit pager
+$limit = $system->cleanVars($_REQUEST, 'limit', 0, 'int');
+// Get start pager
+$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
// heaser
$xoops->header('tdmcreate_modules.html');
// Get handler
@@ -40,65 +46,27 @@
$admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_MODULE, 'modules.php?op=new', 'add');
$admin_page->renderButton();
$criteria = new CriteriaCompo();
- $criteria->setSort("mod_id ASC, mod_name");
- $criteria->setOrder("ASC");
- $numrows = $modules_Handler->getCount();
- if (isset($_REQUEST['limit'])) {
- $criteria->setLimit($_REQUEST['limit']);
- $limit = $_REQUEST['limit'];
- } else {
- $criteria->setLimit($GLOBALS['xoopsModuleConfig']['pager']);
- $limit = $GLOBALS['xoopsModuleConfig']['pager'];
- }
- if (isset($_REQUEST['start'])) {
- $criteria->setStart($_REQUEST['start']);
- $start = $_REQUEST['start'];
- } else {
- $criteria->setStart(0);
- $start = 0;
- }
- $mods_arr = $modules_Handler->getall($criteria);
- unset($criteria);
- $xoops->tpl()->assign('numrows', $numrows);
- if ( $numrows > $limit ) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
- //Display modules list
- if ($numrows > 0)
- {
- $yes = "<img src='../images/16/green.png' alt='"._YES."' title='"._YES."' />";
- $no = "<img src='../images/16/red.png' alt='"._NO."' title='"._NO."' />";
-
- foreach (array_keys($mods_arr) as $i)
- {
- $arr_modules['id'] = $i;
- $arr_modules['name'] = $mods_arr[$i]->getVar('mod_name');
- $arr_modules['version'] = $mods_arr[$i]->getVar('mod_version');
- $arr_modules['image'] = XOOPS_UPLOAD_URL.'/tdmcreate/images/modules/'.$mods_arr[$i]->getVar('mod_image');
- $arr_modules['release'] = $mods_arr[$i]->getVar('mod_release');
- $arr_modules['status'] = $mods_arr[$i]->getVar('mod_status');
- $arr_modules['display_admin'] = ( $mods_arr[$i]->getVar('mod_display_admin') == 1 ) ? $yes : $no;
- $arr_modules['display_user'] = ( $mods_arr[$i]->getVar('mod_display_user') == 1 ) ? $yes : $no;
- $arr_modules['display_submenu'] = ( $mods_arr[$i]->getVar("mod_display_submenu") == 1 ) ? $yes : $no;
- $arr_modules['active_search'] = ( $mods_arr[$i]->getVar("mod_active_search") == 1 ) ? $yes : $no;
- $arr_modules['active_comments'] = ( $mods_arr[$i]->getVar("mod_active_comments") == 1 ) ? $yes : $no;
- $arr_modules['active_notifies'] = ( $mods_arr[$i]->getVar("mod_active_notifies") == 1 ) ? $yes : $no;
- $arr_modules['edit'] = 'modules.php?op=edit&mod_id='.$i;
- $arr_modules['delete'] = 'modules.php?op=delete&mod_id='.$i;
- }
- $xoops->tpl()->assign('arr_modules', $arr_modules);
- $xoops->tpl()->assign('pagenav', $pagenav);
- }
+ $criteria->setSort("mod_name");
+ $criteria->setOrder("ASC");
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $numrows = $modules_Handler->getCount($criteria);
+ $xoops->tpl()->assign('mimg_path', XOOPS_UPLOAD_URL.'/tdmcreate/images/modules/');
+ $xoops->tpl()->assign('modules', $modules_Handler->getObjects($criteria, true, false));
+ $xoops->tpl()->assign('modules_list', true);
+ $xoops->tpl()->assign('module', true);
+ unset($criteria);
+ // Display Page Navigation
+ if ($numrows > $nb_pager) {
+ $nav = new XoopsPageNav($numrows, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
break;
case "new":
- $admin_page->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=list', 'list');
+ $admin_page->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'application-view-detail');
$admin_page->renderButton();
-
+
$obj = $modules_Handler->create();
$form = $xoops->getModuleForm($obj, 'modules');
$xoops->tpl()->assign('form', $form->render());
@@ -115,49 +83,55 @@
$obj = $modules_Handler->create();
}
//Form module save
- $obj->setVars(array("mod_name" => $_POST["mod_name"], "mod_version" => $_POST["mod_version"], "mod_description" => $_POST["mod_description"], "mod_author" => $_POST["mod_author"], "mod_author_mail" => $_POST["mod_author_mail"], "mod_author_website_url" => $_POST["mod_author_website_url"], "mod_author_website_name" => $_POST["mod_author_website_name"], "mod_credits" => $_POST["mod_credits"], "mod_license" => $_POST["mod_license"], "mod_release_info" => $_POST["mod_release_info"], "mod_release_file" => $_POST["mod_release_file"], "mod_manual" => $_POST["mod_manual"], "mod_manual_file" => $_POST["mod_manual_file"]));
- //Form module_image
- include_once XOOPS_ROOT_PATH . "/class/uploader.php";
- $uploaddir = XOOPS_UPLOAD_PATH."/tdmcreate/images/modules/";
- $uploader = new XoopsMediaUploader($uploaddir, $GLOBALS["xoopsModuleConfig"]["mimetypes"],
- $GLOBALS["xoopsModuleConfig"]["maxsize"], null, null);
- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
- $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["mod_image"]['name']);
- $name_img = $_GET['module_name'].'_slogo.'.$extension;
- $uploader->setPrefix($name_img);
- $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
- if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- redirect_header("javascript:history.go(-1)",3, $errors);
- } else {
- $obj->setVar("mod_image", $uploader->getSavedFileName());
- }
- } else {
- $obj->setVar("mod_image", $_POST["mod_image"]);
- }
- //Form module save
- $obj->setVars(array("mod_demo_site_url" => $_POST["mod_demo_site_url"], "mod_demo_site_name" => $_POST["mod_demo_site_name"], "mod_forum_site_url" => $_POST["mod_forum_site_url"], "mod_forum_site_name" => $_POST["mod_forum_site_name"], "mod_website_url" => $_POST["mod_website_url"], "mod_website_name" => $_POST["mod_website_name"], "mod_release" => $_POST["mod_release"], "mod_status" => $_POST["mod_status"]));
- //Form module_display_admin
- $verif_module_display_admin = ($_REQUEST["mod_display_admin"] == 1) ? "1" : "0";
- //Form module_display_user
- $verif_module_display_user = ($_REQUEST["mod_display_user"] == 1) ? "1" : "0";
- //Form module_display_submenu
- $verif_module_display_submenu = ($_REQUEST["mod_display_submenu"] == 1) ? "1" : "0";
- //Form module_active_search
- $verif_module_active_search = ($_REQUEST["mod_active_search"] == 1) ? "1" : "0";
- //Form module_active_coms
- $verif_module_active_coms = ($_REQUEST["mod_active_comments"] == 1) ? "1" : "0";
- //Form module_active_notify
- $verif_module_active_notify = ($_REQUEST["mod_active_notifies"] == 1) ? "1" : "0";
- $obj->setVars(array("mod_display_admin" => $verif_module_display_admin, "mod_display_user" => $verif_module_display_user, "mod_display_submenu" => $verif_module_display_submenu, "mod_active_search" => $verif_module_active_search, "mod_active_comments" => $verif_module_active_coms, "mod_active_notifies" => $verif_module_active_notify));
-
+ $obj->setVars(array("mod_name" => $_POST["mod_name"], "mod_version" => $_POST["mod_version"],
+ "mod_description" => $_POST["mod_description"], "mod_author" => $_POST["mod_author"],
+ "mod_author_mail" => $_POST["mod_author_mail"], "mod_author_website_url" => $_POST["mod_author_website_url"],
+ "mod_author_website_name" => $_POST["mod_author_website_name"], "mod_credits" => $_POST["mod_credits"],
+ "mod_license" => $_POST["mod_license"], "mod_release_info" => $_POST["mod_release_info"],
+ "mod_release_file" => $_POST["mod_release_file"], "mod_manual" => $_POST["mod_manual"],
+ "mod_manual_file" => $_POST["mod_manual_file"]));
+ //Form module_image
+ $uploaddir_url = XOOPS_UPLOAD_URL."/tdmcreate/images/modules/";
+ $uploader_img = new XoopsMediaUploader( XOOPS_UPLOAD_PATH."/tdmcreate/images/modules",
+ $xoops->getModuleConfig('mimetypes'),
+ $xoops->getModuleConfig('maxsize'), null, null);
+ if ($uploader_img->fetchMedia("modules_imgurl")) {
+ $extension = preg_replace( "/^.+\.([^.]+)$/sU" , "\\1" , $_FILES["module_image"]['name']);
+ $img_name = 'logo.'.$extension;
+ $uploader_img->setPrefix($img_name);
+ $uploader_img->fetchMedia("modules_imgurl");
+ if (!$uploader_img->upload()) {
+ $errors = $uploader_img->getErrors();
+ $xoops->redirect("javascript:history.go(-1)", 3, $errors);
+ } else {
+ $obj->setVar("mod_image", $uploaddir_url . $uploader_img->getSavedFileName());
+ }
+ } else {
+ if ($_POST["modules_imgurl"] == 'blank.gif') {
+ $obj->setVar("mod_image", $_POST["mod_image"]);
+ } else {
+ $obj->setVar("mod_image", $uploaddir_url . $_POST["modules_imgurl"]);
+ }
+ }
+ //Form module save
+ $obj->setVars(array("mod_demo_site_url" => $_POST["mod_demo_site_url"], "mod_demo_site_name" => $_POST["mod_demo_site_name"],
+ "mod_forum_site_url" => $_POST["mod_forum_site_url"], "mod_forum_site_name" => $_POST["mod_forum_site_name"],
+ "mod_website_url" => $_POST["mod_website_url"], "mod_website_name" => $_POST["mod_website_name"],
+ "mod_release" => $_POST["mod_release"], "mod_status" => $_POST["mod_status"],
+ "mod_display_admin" => (($_REQUEST["mod_display_admin"] == 1) ? "1" : "0"),
+ "mod_display_user" => (($_REQUEST["mod_display_user"] == 1) ? "1" : "0"),
+ "mod_display_submenu" => (($_REQUEST["mod_display_submenu"] == 1) ? "1" : "0"),
+ "mod_active_search" => (($_REQUEST["mod_active_search"] == 1) ? "1" : "0"),
+ "mod_active_comments" => (($_REQUEST["mod_active_comments"] == 1) ? "1" : "0"),
+ "mod_active_notifies" => (($_REQUEST["mod_active_notifies"] == 1) ? "1" : "0")));
+ // Insert Data
if ($modules_Handler->insert($obj)) {
redirect_header("modules.php?op=list", 2, _AM_TDMCREATE_FORMOK);
}
-
+ // Form Data
$xoops->error($obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'modules');
- $form->display();
+ $xoops->tpl()->assign('form', $form->render());
break;
case "edit":
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-01-09 06:24:03 UTC (rev 10719)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-01-09 17:43:10 UTC (rev 10720)
@@ -23,10 +23,16 @@
// Get main instance
$system = System::getInstance();
$xoops = Xoops::getInstance();
+// Preferences Limit
+$nb_pager = $xoops->getModuleConfig('pager');
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+// Get limit pager
+$limit = $system->cleanVars($_REQUEST, 'limit', 0, 'int');
+// Get start pager
+$start = $system->cleanVars($_REQUEST, 'start', 0, 'int');
// heaser
-$xoops->header();
+$xoops->header('tdmcreate_tables.html');
// Get handler
/* @var $modules_handler TDMCreateModulesHandler */
$modules_Handler = $xoops->getModuleHandler('modules');
@@ -41,158 +47,95 @@
default:
$admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
$admin_page->renderButton();
- // Get the list of modules
+ // Get modules list
$criteria = new CriteriaCompo();
- $criteria->setSort('mod_id ASC, mod_name');
- $criteria->setOrder('ASC');
+ $criteria->setSort('mod_name');
+ $criteria->setOrder('ASC');
+ $criteria->setStart($start);
+ $criteria->setLimit($nb_pager);
$numrows_mods = $modules_Handler->getCount($criteria);
// Redirect if there aren't modules
- if ( $numrows_mods == 0 ) {
+ /* if ( $numrows_mods == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
- }
- if (isset($_REQUEST['limit'])) {
- $criteria->setLimit($_REQUEST['limit']);
- $limit = $_REQUEST['limit'];
- } else {
- $criteria->setLimit($GLOBALS['xoopsModuleConfig']['pager']);
- $limit = $GLOBALS['xoopsModuleConfig']['pager'];
- }
- if (isset($_REQUEST['start'])) {
- $criteria->setStart($_REQUEST['start']);
- $start = $_REQUEST['start'];
- } else {
- $criteria->setStart(0);
- $start = 0;
- }
- $mods_arr = $modules_Handler->getall($criteria);
+ }*/
+ $xoops->tpl()->assign('mimg_path', XOOPS_UPLOAD_URL.'/tdmcreate/images/modules/');
+ $xoops->tpl()->assign('modules', $modules_Handler->getObjects($criteria, true, false));
+ $xoops->tpl()->assign('module', true);
unset($criteria);
- $xoops->tpl()->assign('numrows_modules', $numrows_mods);
- if ( $numrows_mods > $limit ) {
- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
- $pagenav = new XoopsPageNav($numrows_mods, $limit, $start, 'start', 'op=list&limit=' . $limit);
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
- // Display the list of modules
- if ( $numrows_mods > 0 )
- {
- $_yes = "<img src='../images/16/yellow.png' alt='"._YES."' title='"._YES."' />";
- $_no = "<img src='../images/16/red.png' alt='"._NO."' title='"._NO."' />";
-
- foreach (array_keys($mods_arr) as $m)
- {
- $arr_modules['id'] = $m;
- $arr_modules['name'] = $mods_arr[$m]->getVar('mod_name');
- $arr_modules['version'] = $mods_arr[$m]->getVar('mod_version');
- $arr_modules['image'] = XOOPS_UPLOAD_URL.'/tdmcreate/images/modules/'.$mods_arr[$m]->getVar('mod_image');
- $arr_modules['release'] = $mods_arr[$m]->getVar('mod_release');
- $arr_modules['status'] = $mods_arr[$m]->getVar('mod_status');
- $arr_modules['display_admin'] = ( $mods_arr[$m]->getVar('mod_display_admin') == 1 ) ? $yes : $no;
- $arr_modules['display_user'] = ( $mods_arr[$m]->getVar('mod_display_user') == 1 ) ? $yes : $no;
- $arr_modules['display_submenu'] = ( $mods_arr[$m]->getVar("mod_display_submenu") == 1 ) ? $yes : $no;
- $arr_modules['active_search'] = ( $mods_arr[$m]->getVar("mod_active_search") == 1 ) ? $yes : $no;
- $arr_modules['active_comments'] = ( $mods_arr[$m]->getVar("mod_active_comments") == 1 ) ? $yes : $no;
- $arr_modules['active_notifies'] = ( $mods_arr[$m]->getVar("mod_active_notifies") == 1 ) ? $yes : $no;
- $arr_modules['edit'] = 'modules.php?op=edit&mod_id='.$m;
- $arr_modules['delete'] = 'modules.php?op=delete&mod_id='.$m;
-
- // Get the list of tables
- $criteria = new CriteriaCompo();
- $criteria->setSort("table_id ASC, table_name");
- $criteria->setOrder("ASC");
- $numrows_tables = $tables_Handler->getCount();
- $tables_arr = $tables_Handler->getall($cr...
[truncated message content] |
