Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10991] XoopsModules26/tdmcreate/branches/2.01/timgno /tdmcreate
|
From: <txm...@us...> - 2013-02-05 21:20:48
|
Revision: 10991
http://sourceforge.net/p/xoops/svn/10991
Author: txmodxoops
Date: 2013-02-05 21:20:43 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
Review all files with minor modifications
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/header.php
XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.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/form/extensions.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/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/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-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/building.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -38,14 +38,15 @@
$admin_page = new XoopsModuleAdmin();
$admin_page->renderNavigation('building.php');
switch ($op) {
+ case "default":
+ default:
+ //tdmcreate_getBuildingForm();
+ break;
+
case "build":
$mods =& $modules_Handler->get($_REQUEST['mod_name']);
$mods_name = $mods->getVar('mod_name');
- break;
-
- case "default":
- default:
- //tdmcreate_getBuildingForm();
+
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-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/extensions.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -53,7 +53,8 @@
$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('extension', true);
+ $xoops->tpl()->assign('extensions_list', true);
+ $xoops->tpl()->assign('extension', true);
unset($criteria);
// Display Page Navigation
if ($numrows > $nb_pager) {
@@ -62,9 +63,9 @@
}
break;
case "new":
- $admin_page->addItemButton(_AM_TDMCREATE_EXTENSIONS_LIST, 'extensions.php?op=list', 'list');
+ $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());
@@ -122,11 +123,11 @@
"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);
}
-
+ // Form Data
$xoops->error($obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'extensions');
$xoops->tpl()->assign('form', $form->render());
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/fields.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -78,7 +78,7 @@
break;
case "new":
- $admin_page->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=list', 'list');
+ $admin_page->addItemButton(_AM_TDMCREATE_FIELDS_LIST, 'fields.php', 'application-view-detail');
$admin_page->renderButton();
$obj = $fields_Handler->create();
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/header.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -20,6 +20,12 @@
* @version $Id: header.php 10665 2012-12-27 10:14:15Z timgno $
*/
require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-// Get XoopsLoad
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+include_once dirname(dirname(__FILE__)) . '/include/functions.php';
+// Get XoopsLoad system
+XoopsLoad::load('system', 'system');
+// Get main instance
+$system = System::getInstance();
$xoops = Xoops::getInstance();
-XoopsLoad::load('system', 'system');
\ No newline at end of file
+// Get admin menu istance
+$admin_menu = new XoopsModuleAdmin();
\ 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-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/import.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -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_import.html');
// Get handler
@@ -44,7 +50,8 @@
$criteria->setStart($start);
$criteria->setLimit($limit);
$numrows = $import_Handler->getCount($criteria);
- $xoops->tpl()->assign('imports', $import_Handler->getObjects($criteria, true, false));
+ $xoops->tpl()->assign('imports', $import_Handler->getObjects($criteria, true, false));
+ $xoops->tpl()->assign('imports_list', true);
$xoops->tpl()->assign('import', true);
unset($criteria);
// Display Page Navigation
@@ -55,7 +62,7 @@
break;
case "import":
- $admin_page->addItemButton(_AM_TDMCREATE_IMPORT_LIST, 'import.php?op=list', 'list');
+ $admin_page->addItemButton(_AM_TDMCREATE_IMPORTS_LIST, 'import.php', 'application-view-detail');
$admin_page->renderButton();
$obj = $import_Handler->create();
@@ -73,14 +80,66 @@
} else {
$obj = $import_Handler->create();
}
- //Form module save
- $obj->setVars(array("import_mid" => $_POST["import_mid"], "import_name" => $_POST["import_name"],
+
+ // File recovery
+ $file = $_FILES['import_oldmod'];
+ // Temporary file name
+ $filename = $file['tmp_name'];
+ // File size
+ $filesize = $file['size'];
+
+ // Check that the file was inserted and that there is
+ if ( ($handle = fopen($filename, "r") ) !== false) {
+ // Use a counter to see what line are comments
+ $counts = 0;
+ // Use the fgets function to retrieve the information in the sql file
+ // The second parameter is the size of the file, we have recovered over
+ while ( ( $data = fget($handle, $filesize) ) !== false ) {
+ if ( preg_match( '/\#/', $data ) ) {
+ $counts++;
+ // Check for a $fields_table variable, the first row of the field name of the sql
+ $fields_table = $data;
+ } else {
+ // Recupero i nomi dei campi
+ $campo_nome = $fields_table[0];
+ $campo_cognome = $fields_table[1];
+ $campo_indirizzo = $fields_table[2];
+ $campo_mail = $fields_table[3];
+ $campo_telefono = $fields_table[4];
+
+ // Recupero i valori dei campi
+ $nome = $data[0];
+ $cognome = $data[1];
+ $indirizzo = $data[2];
+ $mail = $data[3];
+ $telefono = $data[4];
+
+ // Creo una query di inserimento e la eseguo
+ $sql = "
+ INSERT INTO utenti SET
+ $campo_nome = '$nome',
+ $campo_cognome = '$cognome',
+ $campo_indirizzo = '$indirizzo',
+ $campo_mail = '$mail',
+ $campo_telefono = '$telefono'
+ ";
+ $rssql = mysql_query( $sql );
+ // Controllo che l'importazione sia avvenuta con successo
+ //Form imported 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"]));
-
+ "import_nbfields" => $_POST["import_nbfields"], "import_fieldname" => $_POST["import_fieldname"]));
+ }
+ }
+ }
+ else
+ redirect_header("import.php?op=list", 3, "Nessun file inserito");
+
+ fclose($handle);
+
if ($import_Handler->insert($obj)) {
redirect_header("import.php?op=list", 3, _AM_TDMCREATE_FORMOK);
- }
+ }
$xoops->error($obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'import');
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/modules.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -8,7 +8,6 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-
/**
* tdmcreate module
*
@@ -20,58 +19,73 @@
* @version $Id: modules.php 10665 2012-12-27 10:14:15Z timgno $
*/
include dirname(__FILE__) . '/header.php';
-// Get main instance
-$system = System::getInstance();
-$xoops = Xoops::getInstance();
// Preferences Limit
-$nb_pager = $xoops->getModuleConfig('pager');
+$nb_pager = $xoops->getModuleConfig('adminpager');
// 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
+// Get handler
$xoops->header('tdmcreate_modules.html');
-// Get handler
-/* @var $extensions_handler TDMCreateExtensionsHandler */
+/* @var $modules_handler TDMCreateModulesHandler */
$modules_Handler = $xoops->getModuleHandler('modules');
-$admin_page = new XoopsModuleAdmin();
-$admin_page->renderNavigation('modules.php');
+$admin_menu->renderNavigation('modules.php');
switch ($op)
{
- case "list":
+ case 'list':
default:
- $admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_MODULE, 'modules.php?op=new', 'add');
- $admin_page->renderButton();
- $criteria = new CriteriaCompo();
- $criteria->setSort("mod_name");
- $criteria->setOrder("ASC");
+ $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_MODULE, 'modules.php?op=new', 'add');
+ $admin_menu->renderButton();
+ // Get modules list
+ $criteria = new CriteriaCompo();
+ $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('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));
- }
+ $criteria->setLimit($nb_pager);
+ $numrows_mods = $modules_Handler->getCount($criteria);
+ $mod_arr = $modules_Handler->getAll($criteria);
+ // Assign Template variables
+ $xoops->tpl()->assign('modules_count', $numrows_mods);
+ unset($criteria);
+ if ($numrows_mods > 0) {
+ foreach (array_keys($mod_arr) as $i) {
+ $mod['id'] = $mod_arr[$i]->getVar('mod_id');
+ $mod['name'] = $mod_arr[$i]->getVar('mod_name');
+ $mod['version'] = $mod_arr[$i]->getVar('mod_version');
+ $mod['release'] = $mod_arr[$i]->getVar('mod_release');
+ $mod['status'] = $mod_arr[$i]->getVar('mod_status');
+ $mod['admin'] = $mod_arr[$i]->getVar('mod_admin');
+ $mod['user'] = $mod_arr[$i]->getVar('mod_user');
+ $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');
+ $xoops->tpl()->append_by_ref('modules', $mod);
+ unset($mod);
+ }
+ // Display Page Navigation
+ if ($numrows_mods > $nb_pager) {
+ $nav = new XoopsPageNav($numrows_mods, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl()->assign('error_message', _AM_TDMCREATE_TABLE_ERROR_NOMODULES);
+ }
break;
- case "new":
- $admin_page->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php?op=list', 'list');
- $admin_page->renderButton();
-
+ case 'new':
+ $admin_menu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'application-view-detail');
+ $admin_menu->renderButton();
+
$obj = $modules_Handler->create();
$form = $xoops->getModuleForm($obj, 'modules');
$xoops->tpl()->assign('form', $form->render());
break;
- case "save":
+ case 'save':
if (!$xoops->security()->check()) {
$xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
}
@@ -82,63 +96,60 @@
$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"]));
-
+ $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_path = XOOPS_UPLOAD_PATH."/tdmcreate/images/modules";
- $uploaddir_url = XOOPS_UPLOAD_URL."/tdmcreate/images/modules/";
- $uploader_img = new XoopsMediaUploader($uploaddir_path, $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 = $_GET['mod_name'].'_slogo.'.$extension;
- $uploader_img->setPrefix($img_name);
- $uploader_img->fetchMedia("modules_imgurl");
+ $uploader_img = new XoopsMediaUploader( TDMC_MODULES_PATH_IMG, $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);
+ $xoops->redirect('javascript:history.go(-1)', 3, $errors);
} else {
- $obj->setVar("mod_image", $uploaddir_url . $uploader_img->getSavedFileName());
+ $obj->setVar('mod_image', TDMC_MODULES_URL_IMG . '/' . $uploader_img->getSavedFileName());
}
} else {
- if ($_POST["modules_imgurl"] == 'blank.gif') {
- $obj->setVar("mod_image", $_POST["mod_image"]);
+ if ($_POST['modules_imgurl'] == 'blank.gif') {
+ $obj->setVar('mod_image', $_POST['mod_image']);
} else {
- $obj->setVar("mod_image", $uploaddir_url . $_POST["modules_imgurl"]);
+ $obj->setVar('mod_image', TDMC_MODULES_URL_IMG . '/' . $_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")));
-
+ $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_admin' => (($_REQUEST['mod_admin'] == 1) ? '1' : '0'),
+ 'mod_user' => (($_REQUEST['mod_user'] == 1) ? '1' : '0'),
+ 'mod_submenu' => (($_REQUEST['mod_submenu'] == 1) ? '1' : '0'),
+ 'mod_search' => (($_REQUEST['mod_search'] == 1) ? '1' : '0'),
+ 'mod_comments' => (($_REQUEST['mod_comments'] == 1) ? '1' : '0'),
+ 'mod_notifications' => (($_REQUEST['mod_notifications'] == 1) ? '1' : '0'),
+ 'mod_paypal' => $_REQUEST['mod_paypal'],
+ 'mod_subversion' => $_REQUEST['mod_subversion']));
+ // Insert Data
if ($modules_Handler->insert($obj)) {
- redirect_header("modules.php?op=list", 2, _AM_TDMCREATE_FORMOK);
+ redirect_header('modules.php?op=list', 2, _AM_TDMCREATE_FORMOK);
}
-
+ // Form Data
$xoops->error($obj->getHtmlErrors());
$form = $xoops->getModuleForm($obj, 'modules');
$xoops->tpl()->assign('form', $form->render());
break;
- case "edit":
- $admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_MODULE, 'modules.php?op=new', 'add');
- $admin_page->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'application-view-detail');
- $admin_page->renderButton();
+ case 'edit':
+ $admin_menu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_MODULE, 'modules.php?op=new', 'add');
+ $admin_menu->addItemButton(_AM_TDMCREATE_MODULES_LIST, 'modules.php', 'application-view-detail');
+ $admin_menu->renderButton();
$id = $system->cleanVars($_REQUEST, 'mod_id', 0, 'int');
if ($id > 0) {
@@ -150,21 +161,21 @@
}
break;
- case "delete":
+ case 'delete':
$id = $system->cleanVars($_REQUEST, 'mod_id', 0, 'int');
if ($id > 0) {
$obj = $modules_Handler->get($id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if (isset($_POST['ok']) && $_POST['ok'] == 1) {
if (!$xoops->security()->check()) {
- $xoops->redirect("modules.php", 3, implode(",", $xoops->security()->getErrors()));
+ $xoops->redirect('modules.php', 3, implode(',', $xoops->security()->getErrors()));
}
if ($modules_Handler->delete($obj)) {
- $xoops->redirect("modules.php", 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_MODULE));
+ $xoops->redirect('modules.php', 2, sprintf(_AM_TDMCREATE_DELETEDSUCCESS, _AM_TDMCREATE_MODULE));
} else {
$xoops->error($obj->getHtmlErrors());
}
} else {
- $xoops->confirm(array("ok" => 1, "id" => $id, "op" => "delete"), 'modules.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('mod_name')) . '<br />');
+ $xoops->confirm(array('ok' => 1, 'id' => $id, 'op' => 'delete'), 'modules.php', sprintf(_AM_TDMCREATE_RUSUREDEL, $obj->getVar('mod_name')) . '<br />');
}
} else {
$xoops->redirect('modules.php', 1, _AM_SYSTEM_DBERROR);
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/admin/tables.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -20,15 +20,10 @@
* @version $Id: tables.php 10665 2012-12-27 10:14:15Z timgno $
*/
include dirname(__FILE__) . '/header.php';
-// Get main instance
-$system = System::getInstance();
-$xoops = Xoops::getInstance();
// Preferences Limit
-$nb_pager = $xoops->getModuleConfig('pager');
+$nb_pager = $xoops->getModuleConfig('adminpager');
// 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
@@ -39,14 +34,13 @@
/* @var $tables_handler TDMCreateTablesHandler */
$tables_Handler = $xoops->getModuleHandler('tables');
-$admin_page = new XoopsModuleAdmin();
-$admin_page->renderNavigation('tables.php');
+$admin_manu->renderNavigation('tables.php');
switch ($op)
{
case "list":
default:
- $admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
- $admin_page->renderButton();
+ $admin_manu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
+ $admin_manu->renderButton();
// Get modules list
$criteria = new CriteriaCompo();
$criteria->setSort('mod_name');
@@ -54,33 +48,67 @@
$criteria->setStart($start);
$criteria->setLimit($nb_pager);
$numrows_mods = $modules_Handler->getCount($criteria);
+ $module_arr = $modules_Handler->getAll($criteria);
+ $xoops->tpl()->assign('modules_count', $numrows_mods);
+ unset($criteria);
// Redirect if there aren't modules
/* if ( $numrows_mods == 0 ) {
redirect_header('modules.php?op=new', 2, _AM_TDMCREATE_NOTMODULES );
}*/
- $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);
- // Get tables list
$criteria = new CriteriaCompo();
- $criteria->setSort("table_name");
- $criteria->setOrder("ASC");
- $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);
- // Display Page Navigation
- if ($numrows_mods > $nb_pager) {
- $nav = new XoopsPageNav($numrows_mods, $nb_pager, $start, 'start');
- $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
- }
+ $criteria->setSort('table_name');
+ $criteria->setOrder('ASC');
+ $criteria->setStart($start);
+ $criteria->setLimit($nb_pager);
+ $numrows_tables = $tables_Handler->getCount($criteria);
+ $table_arr = $tables_Handler->getAll($criteria);
+ $xoops->tpl()->assign('mods_count', $numrows_tables);
+ unset($criteria);
+
+ // Assign Template variables
+ $xoops->tpl()->assign('mods_count', $numrows);
+ $mytree = new XoopsObjectTree($table_arr, 'table_id', 'table_mid');
+ if ($numrows_mods > 0) {
+ foreach (array_keys($module_arr) as $i) {
+ $mod['id'] = $mod_arr[$i]->getVar('mod_id');
+ $mod['name'] = $mod_arr[$i]->getVar('mod_name');
+ $mod['version'] = $mod_arr[$i]->getVar('mod_version');
+ $mod['release'] = $mod_arr[$i]->getVar('mod_release');
+ $mod['status'] = $mod_arr[$i]->getVar('mod_status');
+ $mod['admin'] = $mod_arr[$i]->getVar('mod_admin');
+ $mod['user'] = $mod_arr[$i]->getVar('mod_user');
+ $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');
+ $xoops->tpl()->append_by_ref('modules', $mod);
+ unset($mod);
+ if ($numrows_tables > 0) {
+ foreach (array_keys($table_arr) as $i) {
+ $tables['id'] = $table_arr[$i]->getVar('table_id');
+ $tables['name'] = $table_arr[$i]->getVar('table_name');
+ $tables['modname'] = TDMCreate_getPathTree($mytree, $table_arr[$i]->getVar('table_mid'), $table_arr, 'table_name');
+ $tables['image'] = $table_arr[$i]->getVar('table_image');
+ $tables['submenu'] = $table_arr[$i]->getVar('mod_submenu');
+ $xoops->tpl()->append_by_ref('tables', $tables);
+ unset($tables);
+ }
+ }
+ }
+ // Display Page Navigation
+ if ($numrows_mods > $nb_pager) {
+ $nav = new XoopsPageNav($numrows_mods, $nb_pager, $start, 'start');
+ $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
+ }
+ } else {
+ $xoops->tpl()->assign('error_message', _AM_TDMCREATE_TABLE_ERROR_NOMODULES);
+ }
break;
case "new":
- $admin_page->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php?op=list', 'list');
- $admin_page->renderButton();
-
+ $admin_manu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
+ $admin_manu->renderButton();
+
$obj = $tables_Handler->create();
$form = $xoops->getModuleForm($obj, 'tables');
$xoops->tpl()->assign('form', $form->render());
@@ -99,7 +127,8 @@
//Form tables
$obj->setVars(array("table_module" => $_POST["table_module"], "table_name" => $_POST["table_name"],
"table_nbfields" => $_POST["table_nbfields"], "table_fieldname" => $_POST["table_fieldname"]));
- //Form table_image
+ //Form table_image
+ $pathIcon32 = XOOPS_ROOT_PATH . "/media/xoops/images/icons/32";
if(is_dir($pathIcon32)){
$uploaddir = $pathIcon32;
}else{
@@ -117,7 +146,7 @@
$errors = $uploader_img->getErrors();
$xoops->redirect("javascript:history.go(-1)", 3, $errors);
} else {
- $obj->setVar("tables_image", $uploaddir . $uploader_img->getSavedFileName());
+ $obj->setVar("table_image", $uploaddir . $uploader_img->getSavedFileName());
}
} else {
if ($_POST["tables_image"] == 'blank.gif') {
@@ -136,11 +165,10 @@
"table_comments" => (($_REQUEST["table_comments"] == 1) ? "1" : "0"),
"table_notify" => (($_REQUEST["table_notify"] == 1) ? "1" : "0")));
- if( $tables_Handler->insert($obj) ) {
- // if( $tables_Handler->isNew() )
- redirect_header("fields.php?op=add_fields", 3, _AM_TDMCREATE_FORMOK);
- //else
- // redirect_header("tables.php?op=list", 3, _AM_TDMCREATE_FORMOK);
+ if( $tables_Handler->insert($obj) && $obj->isNew() ) {
+ redirect_header("fields.php?op=new", 3, _AM_TDMCREATE_FORMOK);
+ } else {
+ redirect_header("tables.php?op=list", 3, _AM_TDMCREATE_FORMOK);
}
$xoops->error($obj->getHtmlErrors());
@@ -149,9 +177,9 @@
break;
case "edit":
- $admin_page->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
- $admin_page->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
- $admin_page->renderButton();
+ $admin_manu->addItemButton(_ADD . ' ' . _AM_TDMCREATE_TABLE, 'tables.php?op=new', 'add');
+ $admin_manu->addItemButton(_AM_TDMCREATE_TABLES_LIST, 'tables.php', 'application-view-detail');
+ $admin_manu->renderButton();
$id = $system->cleanVars($_REQUEST, 'table_id', 0, 'int');
if ($id > 0) {
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/architecture.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/architecture.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/architecture.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -19,23 +19,69 @@
* @author Timgno <txm...@gm...>
* @version $Id: architecture.php 10665 2012-12-27 10:14:15Z timgno $
*/
-if (!defined('XOOPS_ROOT_PATH')) {
- die('XOOPS root path not defined');
-}
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
class TDMCreateFolder extends XoopsFolderHandler
{
-
+ /**
+ * Constructor.
+ *
+ * @param string $path Path to folder
+ * @param bool $create Create folder if not found
+ * @param mixed $mode Mode (CHMOD) to apply to created folder, false to ignore
+ */
+ public function __construct($path = '', $create = true, $mode = false)
+ {
+ parent::__construct($path, $create, $mode);
+ }
+
+ /**
+ * Create a directory.
+ *
+ * @param string $path The directory structure to create
+ * @param int|bool $mode octal value 0755
+ * @access public
+ */
+ public function create($path = '', $mode = false)
+ {
+ $this->create($path, $mode);
+ }
+
+ /**
+ * Change the mode on a directory structure recursively.
+ *
+ * @param string $path The path to chmod
+ * @param int|bool $mode octal value 0755
+ * @param bool $recursive chmod recursively
+ * @param array $exceptions array of files, directories to skip
+ * @return bool Returns TRUE on success, FALSE on failure
+ * @access public
+ */
+ public function chmod($path, $mode)
+ {
+ $this->chmod($path, $mode);
+ }
}
class TDMCreateFile extends XoopsFileHandler
{
-
+ /**
+ * Constructor
+ *
+ * @param string $path Path to file
+ * @param boolean $create Create file if it does not exist (if true)
+ * @param integer $mode Mode to apply to the folder holding the file
+ * @access private
+ */
+ function __construct($path, $create = false, $mode = 0755)
+ {
+ parent::__construct($path, $create, $mode);
+ }
}
-class TDMCreateStructure
+class TDMCreateStructure extends TDMCreateFile
{
- /**
+ /**
* folder object of the File
*
* @var XoopsFolderHandler
@@ -43,23 +89,15 @@
*/
public $mod_name = null;
- /**
+ /**
* folder object of the File
*
* @var XoopsFolderHandler
* @access public
- */
- public $folder_name = null;
-
- /**
- * folder object of the File
- *
- * @var XoopsFolderHandler
- * @access public
*/
public $file_name = null;
- /**
+ /**
* folder object of the File
*
* @var XoopsFolderHandler
@@ -67,7 +105,7 @@
*/
public $path = null;
- /**
+ /**
* folder object of the File
*
* @var XoopsFolderHandler
@@ -75,7 +113,7 @@
*/
public $copyFile = null;
- /**
+ /**
* Constructor.
*
* @param string $path Path to folder
@@ -86,10 +124,11 @@
$this->path = $path;
}
- /*
- * @pubblic function makeDir
- * @param string $path
- */
+ /**
+ *
+ * @pubblic function makeDir
+ * @param string $path
+ */
public function makeDir($path)
{
$this->path = $path;
@@ -98,37 +137,38 @@
chmod($this->path, 0705);
}
}
- /*
- * @pubblic function makeDirModule
- * @param string $folder_name
- */
+ /**
+ *
+ * @pubblic function makeDirModule
+ * @param string $folder_name
+ */
public function makeDirInModule($folder_name)
{
- $this->folder_name = $folder_name;
- $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name;
+ $this->folder = $folder_name;
+ $fname = $this->path . "/" .$this->mod_name. "/" .$this->folder;
if(!is_dir($fname)) {
mkdir($fname, 0705);
chmod($fname, 0705);
}
}
- /*
- * @pubblic function makeDir & copy file
- * @param string $folder_name
- * @param string $copyFile
- * @param string $file
- */
+ /**
+ * @pubblic function makeDir & copy file
+ * @param string $folder_name
+ * @param string $copyFile
+ * @param string $file
+ */
public function makeDirAndCopyFile($folder_name, $copyFile, $file)
{
$this->file_name = $file;
- $this->folder_name = $folder_name;
+ $this->folder = $folder_name;
$this->copyFile = $copyFile;
- $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name;
+ $fname = $this->path . "/" .$this->mod_name. "/" .$this->folder;
if(!is_dir($fname)) {
mkdir($fname, 0705);
chmod($fname, 0705);
- $this->copyFile($this->folder_name, $this->copyFile, $this->file_name);
+ $this->copyFile($this->folder, $this->copyFile, $this->file_name);
} else {
- $this->copyFile($this->folder_name, $this->copyFile, $this->file_name);
+ $this->copyFile($this->folder, $this->copyFile, $this->file_name);
}
}
/*
@@ -140,9 +180,9 @@
public function copyFile($folder_name, $copyFile, $file)
{
$this->file_name = $file;
- $this->folder_name = $folder_name;
+ $this->folder = $folder_name;
$this->copyFile = $copyFile;
- $fname = $this->path . "/" .$this->module_name. "/" .$this->folder_name. "/". $this->file_name;
+ $fname = $this->path . "/" .$this->mod_name. "/" .$this->folder. "/". $this->file_name;
/*if(!file_exists($fname)) {
chmod($fname, 0777);
copy($this->copieFile, $fname);
@@ -150,4 +190,31 @@
copy($this->copyFile, $fname);
//}
}
+}
+
+class TDMCreateXoopsVersion extends TDMCreateFile
+{
+ /**
+ * Constructor
+ *
+ * @param string $path Path to file
+ * @param boolean $create Create file if it does not exist (if true)
+ * @param integer $mode Mode to apply to the folder holding the file
+ * @access private
+ */
+ function __construct($path, $create = false, $mode = 0755)
+ {
+ parent::__construct($path, $create, $mode);
+ }
+
+ /*
+ * @pubblic function createXoopsVersion
+ * @param string $folder
+ * @param string $file
+ */
+ public function createXoopsVersion($folder, $file, $elements = array())
+ {
+ $this->file = $file;
+ $this->folder = $folder;
+ }
}
\ No newline at end of file
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/extensions.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/extensions.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/extensions.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -30,14 +30,14 @@
{
$xoops = Xoops::getInstance();
- $title = $obj->isNew() ? sprintf(_AM_TDMCREATE_MODULE_ADD) : sprintf(_AM_TDMCREATE_MODULE_EDIT);
+ $title = $obj->isNew() ? sprintf(_AM_TDMCREATE_EXTENSION_ADD) : sprintf(_AM_TDMCREATE_EXTENSION_EDIT);
parent::__construct($title, 'form', 'extensions.php', 'post', true);
$this->setExtra('enctype="multipart/form-data"');
- $this->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULE_IMPORTANT.'</b></div>','head');
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_NAME, "ext_name", 50, 255, $obj->getVar('ext_name')), true);
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_VERSION, "ext_version", 10, 25, $obj->getVar('ext_version')), true);
+ $this->insertBreak('<div class="center"><b>'._AM_TDMCREATE_EXTENSION_IMPORTANT.'</b></div>','head');
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_NAME, "ext_name", 50, 255, $obj->getVar('ext_name')), true);
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_VERSION, "ext_version", 30, 50, $obj->getVar('ext_version')), true);
$editor_configs=array();
$editor_configs["name"] = 'ext_description';
$editor_configs["value"] = $obj->getVar('ext_description', 'e');
@@ -46,39 +46,39 @@
$editor_configs["width"] = "100%";
$editor_configs["height"] = "400px";
$editor_configs["editor"] = $xoops->getModuleConfig('editor');
- $this->addElement( new XoopsFormEditor(_AM_TDMCREATE_MODULE_DESCRIPTION, "ext_description", $editor_configs), true );
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR, "ext_author", 50, 255, $obj->getVar('ext_author')), true);
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_LICENSE, "ext_license", 50, 255, $obj->getVar('ext_license')), true);
+ $this->addElement( new XoopsFormEditor(_AM_TDMCREATE_EXTENSION_DESCRIPTION, "ext_description", $editor_configs), true );
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_AUTHOR, "ext_author", 50, 255, $obj->getVar('ext_author')), true);
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_LICENSE, "ext_license", 50, 255, $obj->getVar('ext_license')), true);
$option_tray = new XoopsFormElementTray(_OPTIONS, ' ');
$display_admin = $obj->isNew() ? 0 : $obj->getVar('ext_display_admin');
$check_display_admin = new XoopsFormCheckBox(" ", "ext_display_admin", $display_admin);
- $check_display_admin->addOption(1, _AM_TDMCREATE_MODULE_DISPLAY_ADMIN);
+ $check_display_admin->addOption(1, _AM_TDMCREATE_EXTENSION_DISPLAY_ADMIN);
$option_tray->addElement($check_display_admin);
$display_user = $obj->isNew() ? 0 : $obj->getVar('ext_display_user');
$check_display_user = new XoopsFormCheckBox(" ", "ext_display_user", $display_user);
- $check_display_user->addOption(1, _AM_TDMCREATE_MODULE_DISPLAY_USER);
+ $check_display_user->addOption(1, _AM_TDMCREATE_EXTENSION_DISPLAY_USER);
$option_tray->addElement($check_display_user);
$display_submenu = $obj->isNew() ? 0 : $obj->getVar('ext_display_submenu');
$check_display_submenu = new XoopsFormCheckBox(" ", "ext_display_submenu", $display_submenu);
- $check_display_submenu->addOption(1, _AM_TDMCREATE_MODULE_DISPLAY_SUBMENU);
+ $check_display_submenu->addOption(1, _AM_TDMCREATE_EXTENSION_DISPLAY_SUBMENU);
$option_tray->addElement($check_display_submenu);
$active_search = $obj->isNew() ? 0 : $obj->getVar('ext_active_search');
$check_active_search = new XoopsFormCheckBox(" ", "ext_active_search", $active_search);
- $check_active_search->addOption(1, _AM_TDMCREATE_MODULE_ACTIVE_SEARCH);
+ $check_active_search->addOption(1, _AM_TDMCREATE_EXTENSION_ACTIVE_SEARCH);
$option_tray->addElement($check_active_search);
$active_comments = $obj->isNew() ? 0 : $obj->getVar('ext_active_comments');
$check_active_comments = new XoopsFormCheckBox(" ", "ext_active_comments", $active_comments);
- $check_active_comments->addOption(1, _AM_TDMCREATE_MODULE_ACTIVE_COMMENTS);
+ $check_active_comments->addOption(1, _AM_TDMCREATE_EXTENSION_ACTIVE_COMMENTS);
$option_tray->addElement($check_active_comments);
$active_notifies = $obj->isNew() ? 0 : $obj->getVar('ext_active_notifies');
$check_active_notifies = new XoopsFormCheckBox(" ", "ext_active_notifies", $active_notifies);
- $check_active_notifies->addOption(1, _AM_TDMCREATE_MODULE_ACTIVE_NOTIFIES);
+ $check_active_notifies->addOption(1, _AM_TDMCREATE_EXTENSION_ACTIVE_NOTIFIES);
$option_tray->addElement($check_active_notifies);
$this->addElement($option_tray);
$ext_image = $obj->getVar("ext_image") ? $obj->getVar("ext_image") : 'default_slogo.png';
$uploadir = 'uploads/tdmcreate/images/extensions';
- $imgtray = new XoopsFormElementTray(_AM_TDMCREATE_MODULE_IMAGE,'<br />');
+ $imgtray = new XoopsFormElementTray(_AM_TDMCREATE_EXTENSION_IMAGE,'<br />');
$imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './'.$uploadir.'/');
$imageselect = new XoopsFormSelect($imgpath, 'extensions_image', $ext_image);
$image_array = XoopsLists::getImgListAsArray( XOOPS_ROOT_PATH."/".$uploadir );
@@ -94,26 +94,26 @@
$imgtray->addElement($fileseltray);
$this->addElement($imgtray);
- $this->insertBreak('<div class="center"><b>'._AM_TDMCREATE_MODULE_NOTIMPORTANT.'</b></div>','head');
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_MAIL, "ext_author_mail", 50, 255, $obj->getVar('ext_author_mail')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_URL, "ext_author_website_url", 50, 255, $obj->getVar('ext_author_website_url')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_AUTHOR_WEBSITE_NAME, "ext_author_website_name", 50, 255, $obj->getVar('ext_author_website_name')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_CREDITS, "ext_credits", 50, 255, $obj->getVar('ext_credits')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE_INFO, "ext_release_info", 50, 255, $obj->getVar('ext_release_info')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE_FILE, "ext_release_file", 50, 255, $obj->getVar('ext_release_file')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MANUAL, "ext_manual", 50, 255, $obj->getVar('ext_manual')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_MANUAL_FILE, "ext_manual_file", 50, 255, $obj->getVar('ext_manual_file')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_DEMO_SITE_URL, "ext_demo_site_url", 50, 255, $obj->getVar('ext_demo_site_url')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_DEMO_SITE_NAME, "ext_demo_site_name", 50, 255, $obj->getVar('ext_demo_site_name')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_FORUM_SITE_URL, "ext_forum_site_url", 50, 255, $obj->getVar('ext_forum_site_url')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_FORUM_SITE_NAME, "ext_forum_site_name", 50, 255, $obj->getVar('ext_forum_site_name')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_URL, "ext_website_url", 50, 255, $obj->getVar('ext_website_url')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_WEBSITE_NAME, "ext_website_name", 50, 255, $obj->getVar('ext_website_name')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_RELEASE, "ext_release", 50, 255, $obj->getVar('ext_release')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_STATUS, "ext_status", 50, 255, $obj->getVar('ext_status')));
+ $this->insertBreak('<div class="center"><b>'._AM_TDMCREATE_EXTENSION_NOTIMPORTANT.'</b></div>','head');
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_AUTHOR_MAIL, "ext_author_mail", 50, 255, $obj->getVar('ext_author_mail')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_AUTHOR_WEBSITE_URL, "ext_author_website_url", 50, 255, $obj->getVar('ext_author_website_url')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_AUTHOR_WEBSITE_NAME, "ext_author_website_name", 50, 255, $obj->getVar('ext_author_website_name')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_CREDITS, "ext_credits", 50, 255, $obj->getVar('ext_credits')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_RELEASE_INFO, "ext_release_info", 50, 255, $obj->getVar('ext_release_info')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_RELEASE_FILE, "ext_release_file", 50, 255, $obj->getVar('ext_release_file')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_MANUAL, "ext_manual", 50, 255, $obj->getVar('ext_manual')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_MANUAL_FILE, "ext_manual_file", 50, 255, $obj->getVar('ext_manual_file')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_DEMO_SITE_URL, "ext_demo_site_url", 50, 255, $obj->getVar('ext_demo_site_url')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_DEMO_SITE_NAME, "ext_demo_site_name", 50, 255, $obj->getVar('ext_demo_site_name')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_FORUM_SITE_URL, "ext_forum_site_url", 50, 255, $obj->getVar('ext_forum_site_url')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_FORUM_SITE_NAME, "ext_forum_site_name", 50, 255, $obj->getVar('ext_forum_site_name')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_WEBSITE_URL, "ext_website_url", 50, 255, $obj->getVar('ext_website_url')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_WEBSITE_NAME, "ext_website_name", 50, 255, $obj->getVar('ext_website_name')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_RELEASE, "ext_release", 50, 255, $obj->getVar('ext_release')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_STATUS, "ext_status", 50, 255, $obj->getVar('ext_status')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_PAYPALBTN, "ext_paypal_button", 50, 255, $obj->getVar('ext_paypal_button')));
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_SVN, "ext_subversion", 50, 255, $obj->getVar('ext_subversion')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_PAYPALBTN, "ext_paypal_button", 50, 255, $obj->getVar('ext_paypal_button')));
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_EXTENSION_SVN, "ext_subversion", 50, 255, $obj->getVar('ext_subversion')));
if (!$obj->isNew()) {
$this->addElement(new XoopsFormHidden( 'id', $obj->getVar('ext_id') ) );
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/modules.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -40,7 +40,7 @@
$this->addElement(new XoopsFormHidden( 'id', $obj->getVar('mod_id') ) );
}
$this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_NAME, "mod_name", 50, 255, $obj->getVar('mod_name')), true);
- $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_VERSION, "mod_version", 10, 25, $obj->getVar('mod_version')), true);
+ $this->addElement(new XoopsFormText(_AM_TDMCREATE_MODULE_VERSION, "mod_version", 30, 50, $obj->getVar('mod_version')), true);
$editor_configs=array();
$editor_configs["name"] = 'mod_description';
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/form/tables.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -34,40 +34,39 @@
parent::__construct($title, 'form', false, 'post', true);
$this->setExtra('enctype="multipart/form-data"');
+
+ if (!$obj->isNew()) {
+ $this->addElement(new XoopsFormHidden('id', $obj->getVar('table_id')));
+ }
$modules_Handler =& $xoops->getModuleHandler('modules');
- $mods_select = new XoopsFormSelect(_AM_TDMCREATE_MODULES, 'table_mid', $obj->getVar('table_mid'));
+ $mods_select = new XoopsFormSelect(_AM_TDMCREATE_MODULES_LIST, 'table_mid', $obj->getVar('table_mid'));
$mods_select->addOptionArray($modules_Handler->getList());
$this->addElement($mods_select, true);
- $table_name = new XoopsFormText(_AM_TDMCREATE_NAME, "table_name", 50, 255, $obj->getVar('table_name'));
- $table_name->setDescription(_AM_TDMCREATE_NAME_DESC);
+ $table_name = new XoopsFormText(_AM_TDMCREATE_TABLE_NAME, "table_name", 50, 255, $obj->getVar('table_name'));
+ //$table_name->setDescription(_AM_TDMCREATE_TABLENAME_DESC);
$this->addElement($table_name, true);
- $table_fieldname = new XoopsFormText(_AM_TDMCREATE_FIELDNAME, "table_fieldname", 30, 50, $obj->getVar('table_fieldname'));
- $table_fieldname->setDescription(_AM_TDMCREATE_FIELDNAME_DESC);
+ $table_fieldname = new XoopsFormText(_AM_TDMCREATE_TABLE_FIELDNAME, "table_fieldname", 30, 50, $obj->getVar('table_fieldname'));
+ //$table_fieldname->setDescription(_AM_TDMCREATE_FIELDNAME_DESC);
$this->addElement($table_fieldname);
- $table_nbfield = new XoopsFormText(_AM_TDMCREATE_NBFIELDS, "table_nbfields", 10, 25, $obj->getVar('table_nbfields'));
- $table_nbfield->setDescription(_AM_TDMCREATE_NBFIELDS_DESC);
+ $table_nbfield = new XoopsFormText(_AM_TDMCREATE_TABLE_NBFIELDS, "table_nbfields", 30, 50, $obj->getVar('table_nbfields'));
+ //$table_nbfield->setDescription(_AM_TDMCREATE_NBFIELDS_DESC);
$this->addElement($table_nbfield, true);
$table_image = $obj->getVar('table_image') ? $obj->getVar('table_image') : 'blank.gif';
- $uploadirFrame = "Frameworks/moduleclasses/icons/32";
- $uploadirMedia = "media/xoops/images/icons/32";
+ $dirFrame = "Frameworks/moduleclasses/icons/32";
+ $dirMedia = "media/xoops/images/icons/32";
$uploads_dir = "uploads/tdmcreate/images/tables";
- if(is_dir(XOOPS_ROOT_PATH . $uploadirFrame)){
- $uploadirectory = $uploadirFrame;
- }elseif(is_dir(XOOPS_ROOT_PATH . $uploadirMedia)){
- $uploadirectory = $uploadirMedia;
+ if(is_dir(XOOPS_ROOT_PATH . $dirFrame)){
+ $uploadirectory = $dirFrame;
+ }elseif(is_dir(XOOPS_ROOT_PATH . $dirMedia)){
+ $uploadirectory = $dirMedia;
}else{
- $uploadirectory = $uploads_dir;
+ $uploadirectory = $uploads_dir;/**/
}
//
- $imgtray1 = new XoopsFormElementTray(_AM_TDMCREATE_IMAGE,'<br />');
- if(is_dir(XOOPS_ROOT_PATH . $uploadir)) {
- $imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, '.'.$uploadir.'/');
- }else{
- $imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, $uploads_dir);
- }
+ $imgtray1 = new XoopsFormElementTray(_AM_TDMCREATE_IMAGE,'<br />');
$imgpath_img = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './'.$uploadirectory.'/');
$imageselect1 = new XoopsFormSelect($imgpath_img, 'table_image', $table_image, 4);
$image_array1 = XoopsLists :: getImgListAsArray( XOOPS_ROOT_PATH.'/'.$uploadirectory );
@@ -83,7 +82,7 @@
$imgtray1->addElement($fileseltray1);
$this->addElement($imgtray1);
- $options_tray = new XoopsFormElementTray(_OPTIONS, '<br />');
+ $options_tray = new XoopsFormElementTray(_OPTIONS, '');
$table_blocks = $obj->isNew() ? 0 : $obj->getVar('table_blocks');
$check_blocks = new XoopsFormCheckBox(' ', "table_blocks", $table_blocks);
$check_blocks->addOption(1, _AM_TDMCREATE_BLOCKS);
@@ -110,13 +109,10 @@
$options_tray->addElement($check_comments);
$table_notify = $obj->isNew() ? 0 : $obj->getVar('table_notify');
$check_notify = new XoopsFormCheckBox(' ', "table_notify", $table_notify);
- $check_notify->addOption(1, _AM_TDMCREATE_NOTIFY);
+ $check_notify->addOption(1, _AM_TDMCREATE_NOTIFIES);
$options_tray->addElement($check_notify);
- $this->addElement($options_tray);
-
- if (!$obj->isNew()) {
- $this->addElement(new XoopsFormHidden('id', $obj->getVar('table_id')));
- }
+ $this->addElement($options_tray);
+
$this->addElement(new XoopsFormHidden('op', 'save')); //$sendAction
$this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/modules.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/modules.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/modules.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -8,7 +8,6 @@
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-
/**
* tdmcreate module
*
@@ -53,12 +52,12 @@
$this->initVar('mod_website_name',XOBJ_DTYPE_TXTBOX, $xoops->getModuleConfig('website_name'));
$this->initVar('mod_release',XOBJ_DTYPE_TXTBOX, $xoops->getModuleConfig('release'));
$this->initVar('mod_status',XOBJ_DTYPE_TXTBOX, $xoops->getModuleConfig('status'));
- $this->initVar('mod_display_admin',XOBJ_DTYPE_INT,$xoops->getModuleConfig('display_admin'));
- $this->initVar('mod_display_user',XOBJ_DTYPE_INT, $xoops->getModuleConfig('display_user'));
- $this->initVar('mod_display_submenu', XOBJ_DTYPE_INT, $xoops->getModuleConfig('display_submenu'));
- $this->initVar('mod_active_search',XOBJ_DTYPE_INT, $xoops->getModuleConfig('active_search'));
- $this->initVar('mod_active_comments',XOBJ_DTYPE_INT, $xoops->getModuleConfig('active_comments'));
- $this->initVar('mod_active_notifies', XOBJ_DTYPE_INT, $xoops->getModuleConfig('active_notifies'));
+ $this->initVar('mod_admin',XOBJ_DTYPE_INT,$xoops->getModuleConfig('display_admin'));
+ $this->initVar('mod_user',XOBJ_DTYPE_INT, $xoops->getModuleConfig('display_user'));
+ $this->initVar('mod_submenu', XOBJ_DTYPE_INT, $xoops->getModuleConfig('display_submenu'));
+ $this->initVar('mod_search',XOBJ_DTYPE_INT, $xoops->getModuleConfig('active_search'));
+ $this->initVar('mod_comments',XOBJ_DTYPE_INT, $xoops->getModuleConfig('active_comments'));
+ $this->initVar('mod_notifies', XOBJ_DTYPE_INT, $xoops->getModuleConfig('active_notifies'));
$this->initVar('mod_paypal_button', XOBJ_DTYPE_TXTBOX, $xoops->getModuleConfig('paypal_button'));
$this->initVar('mod_subversion', XOBJ_DTYPE_TXTBOX, $xoops->getModuleConfig('subversion'));
}
Modified: XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/tables.php
===================================================================
--- XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/tables.php 2013-02-05 21:11:19 UTC (rev 10990)
+++ XoopsModules26/tdmcreate/branches/2.01/timgno/tdmcreate/class/tables.php 2013-02-05 21:20:43 UTC (rev 10991)
@@ -28,19 +28,19 @@
*/
public function __construct()
{
- $this->initVar("table_id", XOBJ_DTYPE_INT, null, true);
- $this->initVar("table_mid", XOBJ_DTYPE_INT, null);
- $this->initVar("table_name", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("table_nbfields", XOBJ_DTYPE_INT, null);
- $this->initVar("table_fieldname", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("table_image", XOBJ_DTYPE_TXTBOX, null);
- $this->initVar("table_blocks", XOBJ_DTYPE_INT, null);
- $this->initVar("table_display_admin", XOBJ_DTYPE_INT, null);
- $this->initVar("table_display_user", XOBJ_DTYPE_INT, null);
- $this->initVar("table_submenu", XOBJ_DTYPE_INT, null);
- $this->initVar("table_search", XOBJ_DTYPE_INT, null);
- $this->initVar("table_comments", XOBJ_DTYPE_INT, null);
- $this->initVar("table_notify", XOBJ_DTYPE_INT, null);
+ $this->initVar('table_id', XOBJ_DTYPE_INT, null, true);
+ $this->initVar('table_mid', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_name', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('table_nbfields', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_fieldname', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('table_image', XOBJ_DTYPE_TXTBOX, null);
+ $this->initVar('table_blocks', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_display_admin', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_display_user', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_submenu', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_search', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_comments', XOBJ_DTYPE_INT, null);
+ $this->initVar('table_notify', XOBJ_DTYPE_INT, null);
}
}
@@ -51,7 +51,6 @@
*/
public function __construct(XoopsDatabase $db = null)
{
- parent::__construct($db, "tdmcreate_tables", "tdmcreatetables", "table_id", "table_name");
+ parent::__construct($db, 'tdmcreate_tables', 'tdmcreatetables', 'table_id', 'table_name');
}
-}
-?>
\ No newline at en...
[truncated message content] |
