Menu
▾
▴
xoops-svn
|
From: <txm...@us...> - 2015-05-04 13:07:36
|
Revision: 13056
http://sourceforge.net/p/xoops/svn/13056
Author: txmodxoops
Date: 2015-05-04 13:07:33 +0000 (Mon, 04 May 2015)
Log Message:
-----------
Minor adjustments to classes
Added to other files on the user side
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAbstract.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserHeader.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPrint.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRss.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/form/TDMCreateFormRadio.php
Added Paths:
-----------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserBroken.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserListTag.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPdf.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserRate.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserSingle.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserViewTag.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserVisit.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -19,9 +19,6 @@
* @version $Id: 1.91 fields.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-/*require_once 'html/TDMCreateFormLabel.php';
-require_once 'form/TDMCreateFormRadio.php';
-require_once 'form/TDMCreateThemeForm.php';*/
include __DIR__ . '/TDMCreateAutoload.php';
/*
@@ -142,27 +139,27 @@
/*
* @public function getFormNew
*
- * @param null $field_mid
- * @param null $field_tid
- * @param null $field_numb
- * @param null $field_name
+ * @param null $fieldMid
+ * @param null $fieldTid
+ * @param null $fieldNumb
+ * @param null $fieldName
* @param bool $action
* @return mixed
*/
- public function getFormNew($field_mid = null, $field_tid = null, $field_numb = null, $field_name = null, $action = false)
+ public function getFormNew($fieldMid = null, $fieldTid = null, $fieldNumb = null, $fieldName = null, $action = false)
{
// Header function class
$fieldsForm = TDMCreateFields::getInstance();
$form = $fieldsForm->getHeaderForm($action);
// Get handler tables
$table_obj = $this->tdmcreate->getHandler('tables'); // Changed by goffy
- $table_autoincrement = $table_obj->get($field_tid)->getVar('table_autoincrement'); // Added by goffy
+ $tableAutoincrement = $table_obj->get($fieldTid)->getVar('table_autoincrement'); // Added by goffy
// Loop for fields number
$class = 'even';
- for ($i = 1; $i <= $field_numb; ++$i) {
+ for ($i = 1; $i <= $fieldNumb; ++$i) {
$class = ($class == 'even') ? 'odd' : 'even';
// Replaced creation of new line by new function - goffy
- $this->getFormNewLine($form, $class, $i, $field_mid, $field_tid, $field_name, $table_autoincrement);
+ $this->getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fieldName, $tableAutoincrement);
}
// Footer form
@@ -175,129 +172,129 @@
* @param $form
* @param $class
* @param $i
- * @param $field_mid
- * @param $field_tid
- * @param $f_name
- * @param $table_autoincrement
+ * @param $fieldMid
+ * @param $fieldTid
+ * @param $fName
+ * @param $tableAutoincrement
*/
- private function getFormNewLine($form, $class, $i, $field_mid, $field_tid, $f_name, $table_autoincrement)
+ private function getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fName, $tableAutoincrement)
{
$form->addElement(new XoopsFormHidden('field_id[' . $i . ']', 0));
- $form->addElement(new XoopsFormHidden('field_mid', $field_mid));
- $form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+ $form->addElement(new XoopsFormHidden('field_mid', $fieldMid));
+ $form->addElement(new XoopsFormHidden('field_tid', $fieldTid));
$form->addElement(new TDMCreateFormLabel('<tr class="' . $class . '">'));
// Index ID
$form->addElement(new TDMCreateFormLabel('<td class="center">' . $i . '</td>'));
// Field Name
- $this_field_name = (!empty($f_name) ? ((1 == $i) ? $f_name . '_id' : $f_name . '_') : '');
- $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $i . ']', 15, 255, $this_field_name);
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_name->render() . '</td>'));
+ $thisFieldName = (!empty($fName) ? ((1 == $i) ? $fName . '_id' : $fName . '_') : '');
+ $fieldName = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $i . ']', 15, 255, $thisFieldName);
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldName->render() . '</td>'));
// Field Type
- $value = (1 == $i) && (1 == $table_autoincrement) ? '2' : '';
- $fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $i . ']', $value);
- $fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldtype_select->render() . '</td>'));
+ $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '';
+ $fieldTypeSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $i . ']', $value);
+ $fieldTypeSelect->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldTypeSelect->render() . '</td>'));
// Field Value
- $value = (1 == $i) && (1 == $table_autoincrement) ? '8' : '';
- $field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $i . ']', 5, 20, $value);
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_value->render() . '</td>'));
+ $value = (1 == $i) && (1 == $tableAutoincrement) ? '8' : '';
+ $fieldValue = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $i . ']', 5, 20, $value);
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldValue->render() . '</td>'));
// Field Attributes
- $value = (1 == $i) && (1 == $table_autoincrement) ? '3' : '';
- $field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $i . ']', $value);
- $field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_attributes_select->render() . '</td>'));
+ $value = (1 == $i) && (1 == $tableAutoincrement) ? '3' : '';
+ $fieldAttributesSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $i . ']', $value);
+ $fieldAttributesSelect->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>'));
// Field Null
- $value = (1 == $i) && (1 == $table_autoincrement) ? '2' : '';
- $field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value);
- $field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_null_select->render() . '</td>'));
+ $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '';
+ $fieldNullSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value);
+ $fieldNullSelect->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>'));
// Field Default
- $field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $i . ']', 15, 25);
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_default->render() . '</td>'));
+ $fieldDefault = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $i . ']', 15, 25);
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldDefault->render() . '</td>'));
// Field Key
- $value = (1 == $i) && (1 == $table_autoincrement) ? '2' : '';
- $field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $i . ']', $value);
- $field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_key_select->render() . '</td>'));
+ $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '';
+ $fieldKeySelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $i . ']', $value);
+ $fieldKeySelect->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldKeySelect->render() . '</td>'));
// Field Void
- if ((1 == $i) && (1 == $table_autoincrement)) {
+ if ((1 == $i) && (1 == $tableAutoincrement)) {
$form->addElement(new TDMCreateFormLabel('<td> </td></tr>'));
} else {
// Box header row
- $parameters_tray = new XoopsFormElementTray('', '<br />');
+ $parametersTray = new XoopsFormElementTray('', '<br />');
// Field Elements
- $criteria_element = new CriteriaCompo();
- $criteria_element->add(new Criteria('fieldelement_tid', 0));
- $criteria_table = new CriteriaCompo();
- $criteria_table->add(new Criteria('fieldelement_mid', $field_mid));
- $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $i . ']');
- $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element));
- $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table));
- unset($criteria_element, $criteria_table);
- $parameters_tray->addElement($field_elements_select);
+ $criteriaElement = new CriteriaCompo();
+ $criteriaElement->add(new Criteria('fieldelement_tid', 0));
+ $criteriaTable = new CriteriaCompo();
+ $criteriaTable->add(new Criteria('fieldelement_mid', $fieldMid));
+ $fieldElementsSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $i . ']');
+ $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaElement));
+ $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaTable));
+ unset($criteriaElement, $criteriaTable);
+ $parametersTray->addElement($fieldElementsSelect);
$field_parent = 0;
- $check_field_parent = new XoopsFormCheckBox(' ', 'field_parent[' . $i . ']');
- $check_field_parent->addOption($field_parent, _AM_TDMCREATE_FIELD_PARENT);
- $parameters_tray->addElement($check_field_parent);
- /*$field_parent = (1 == $table_autoincrement) ? 2 : 1;
- $check_field_parent = new TDMCreateFormRadio('', 'field_parent', $field_parent);
- $check_field_parent->addOption($i, _AM_TDMCREATE_FIELD_PARENT );
- $parameters_tray->addElement($check_field_parent);*/
+ $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $i . ']');
+ $checkFieldParent->addOption($field_parent, _AM_TDMCREATE_FIELD_PARENT);
+ $parametersTray->addElement($checkFieldParent);
+ /*$field_parent = (1 == $tableAutoincrement) ? 2 : 1;
+ $checkFieldParent = new TDMCreateFormRadio('', 'field_parent', $field_parent);
+ $checkFieldParent->addOption($i, _AM_TDMCREATE_FIELD_PARENT );
+ $parametersTray->addElement($checkFieldParent);*/
- $field_inlist = 0;
- $check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist[' . $i . ']', $field_inlist);
- $check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
- $parameters_tray->addElement($check_field_inlist);
+ $field_inlist = 0;
+ $checkFieldInList = new XoopsFormCheckBox(' ', 'field_inlist[' . $i . ']', $field_inlist);
+ $checkFieldInList->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
+ $parametersTray->addElement($checkFieldInList);
- $field_inform = 0;
- $check_field_inform = new XoopsFormCheckBox(' ', 'field_inform[' . $i . ']', $field_inform);
- $check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
- $parameters_tray->addElement($check_field_inform);
+ $field_inform = 0;
+ $checkFieldInForm = new XoopsFormCheckBox(' ', 'field_inform[' . $i . ']', $field_inform);
+ $checkFieldInForm->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
+ $parametersTray->addElement($checkFieldInForm);
- $field_admin = 0;
- $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin);
- $check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
- $parameters_tray->addElement($check_field_admin);
+ $field_admin = 0;
+ $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $i . ']', $field_admin);
+ $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+ $parametersTray->addElement($checkFieldAdmin);
- $field_user = 0;
- $check_field_user = new XoopsFormCheckBox(' ', 'field_user[' . $i . ']', $field_user);
- $check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
- $parameters_tray->addElement($check_field_user);
+ $field_user = 0;
+ $checkFieldUser = new XoopsFormCheckBox(' ', 'field_user[' . $i . ']', $field_user);
+ $checkFieldUser->addOption(1, _AM_TDMCREATE_FIELD_USER);
+ $parametersTray->addElement($checkFieldUser);
- $field_block = 0;
- $check_field_block = new XoopsFormCheckBox('', 'field_block[' . $i . ']', $field_block);
- $check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
- $parameters_tray->addElement($check_field_block);
+ $field_block = 0;
+ $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $i . ']', $field_block);
+ $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
+ $parametersTray->addElement($checkFieldBlock);
- $field_main = (1 == $table_autoincrement) ? 2 : 1;
- $check_field_main = new TDMCreateFormRadio('', 'field_main', $field_main);
- $check_field_main->addOption($i, _AM_TDMCREATE_FIELD_MAINFIELD);
- $parameters_tray->addElement($check_field_main);
+ $fieldMain = (1 == $tableAutoincrement) ? 2 : 1;
+ $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain);
+ $checkFieldMain->addOption($i, _AM_TDMCREATE_FIELD_MAINFIELD);
+ $parametersTray->addElement($checkFieldMain);
$field_search = 0;
$check_field_search = new XoopsFormCheckBox(' ', 'field_search[' . $i . ']', $field_search);
$check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
- $parameters_tray->addElement($check_field_search);
+ $parametersTray->addElement($check_field_search);
- $field_required = 0;
- $check_field_required = new XoopsFormCheckBox(' ', 'field_required[' . $i . ']', $field_required);
- $check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
- $parameters_tray->addElement($check_field_required);
- $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parameters_tray->render() . '</div></div></td></tr>'));
+ $field_required = 0;
+ $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $i . ']', $field_required);
+ $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
+ $parametersTray->addElement($checkFieldRequired);
+ $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>'));
}
}
/*
* @public function getFormEdit
*
- * @param null $field_mid
- * @param null $field_tid
+ * @param null $fieldMid
+ * @param null $fieldTid
* @param bool $action
* @return mixed
*/
- public function getFormEdit($field_mid = null, $field_tid = null, $action = false)
+ public function getFormEdit($fieldMid = null, $fieldTid = null, $action = false)
{
// Header function class
$fieldsForm = TDMCreateFields::getInstance();
@@ -305,117 +302,117 @@
//
$class = 'even';
// Get the number of fields - goffy
- $tablesHandler =& $this->tdmcreate->getHandler('tables');
- $table_autoincrement = $tablesHandler->get($field_tid)->getVar('table_autoincrement');
- $field_numb = $tablesHandler->get($field_tid)->getVar('table_nbfields');
- $f_name = $tablesHandler->get($field_tid)->getVar('table_fieldname');
+ $tablesHandler =& $this->tdmcreate->getHandler('tables');
+ $tableAutoincrement = $tablesHandler->get($fieldTid)->getVar('table_autoincrement');
+ $fieldNumb = $tablesHandler->get($fieldTid)->getVar('table_nbfields');
+ $fName = $tablesHandler->get($fieldTid)->getVar('table_fieldname');
// Get the list of fields
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('field_mid', $field_mid));
- $criteria->add(new Criteria('field_tid', $field_tid));
+ $criteria->add(new Criteria('field_mid', $fieldMid));
+ $criteria->add(new Criteria('field_tid', $fieldTid));
$criteria->setSort('field_id'); //added by goffy
$fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria);
unset($criteria);
$id = 1;
foreach ($fields as $field) {
- $class = ($class == 'even') ? 'odd' : 'even';
- $field_id = (int) ($field->getVar('field_id'));
- if ($id > $field_numb) { // delete additional fields, if number of fields is reduced - goffy
- $fieldsObj =& $this->tdmcreate->getHandler('fields')->get($field_id);
+ $class = ($class == 'even') ? 'odd' : 'even';
+ $fieldId = (int) ($field->getVar('field_id'));
+ if ($id > $fieldNumb) { // delete additional fields, if number of fields is reduced - goffy
+ $fieldsObj =& $this->tdmcreate->getHandler('fields')->get($fieldId);
$this->tdmcreate->getHandler('fields')->delete($fieldsObj, true);
} else {
// show field with settings
- $form->addElement(new XoopsFormHidden('field_id[' . $id . ']', $field_id));
- //$form->addElement(new XoopsFormHidden('field_mid', $field_mid));
- //$form->addElement(new XoopsFormHidden('field_tid', $field_tid));
+ $form->addElement(new XoopsFormHidden('field_id[' . $id . ']', $fieldId));
+ //$form->addElement(new XoopsFormHidden('field_mid', $fieldMid));
+ //$form->addElement(new XoopsFormHidden('field_tid', $fieldTid));
$form->addElement(new TDMCreateFormLabel('<tr class="' . $class . '">'));
// Index ID
$form->addElement(new TDMCreateFormLabel('<td class="center">' . $id . '</td>'));
// Field Name
- $field_name = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $id . ']', 15, 255, $field->getVar('field_name'));
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_name->render() . '</td>'));
+ $fieldName = new XoopsFormText(_AM_TDMCREATE_FIELD_NAME, 'field_name[' . $id . ']', 15, 255, $field->getVar('field_name'));
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldName->render() . '</td>'));
// Field Type
- $fieldtype_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $id . ']', $field->getVar('field_type'));
- $fieldtype_select->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldtype_select->render() . '</td>'));
+ $fieldTypeSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_type[' . $id . ']', $field->getVar('field_type'));
+ $fieldTypeSelect->addOptionArray($this->tdmcreate->getHandler('fieldtype')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldTypeSelect->render() . '</td>'));
// Field Value
- $field_value = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $id . ']', 5, 20, $field->getVar('field_value'));
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_value->render() . '</td>'));
+ $fieldValue = new XoopsFormText(_AM_TDMCREATE_FIELD_VALUE, 'field_value[' . $id . ']', 5, 20, $field->getVar('field_value'));
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldValue->render() . '</td>'));
// Field Attributes
- $field_attributes_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $id . ']', $field->getVar('field_attribute'));
- $field_attributes_select->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_attributes_select->render() . '</td>'));
+ $fieldAttributesSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_TYPE, 'field_attribute[' . $id . ']', $field->getVar('field_attribute'));
+ $fieldAttributesSelect->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>'));
// Field Null
- $field_null_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $id . ']', $field->getVar('field_null'));
- $field_null_select->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_null_select->render() . '</td>'));
+ $fieldNullSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $id . ']', $field->getVar('field_null'));
+ $fieldNullSelect->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>'));
// Field Default
- $field_default = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $id . ']', 15, 25, $field->getVar('field_default'));
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_default->render() . '</td>'));
+ $fieldDefault = new XoopsFormText(_AM_TDMCREATE_FIELD_DEFAULT, 'field_default[' . $id . ']', 15, 25, $field->getVar('field_default'));
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldDefault->render() . '</td>'));
// Field Key
- $field_key_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $id . ']', $field->getVar('field_key'));
- $field_key_select->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
- $form->addElement(new TDMCreateFormLabel('<td class="center">' . $field_key_select->render() . '</td>'));
+ $fieldKeySelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_KEY, 'field_key[' . $id . ']', $field->getVar('field_key'));
+ $fieldKeySelect->addOptionArray($this->tdmcreate->getHandler('fieldkey')->getList());
+ $form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldKeySelect->render() . '</td>'));
// Field Void
- if ((1 == $id) && (1 == $table_autoincrement)) {
+ if ((1 == $id) && (1 == $tableAutoincrement)) {
$form->addElement(new TDMCreateFormLabel('<td> </td></tr>'));
} else {
// Box header row
- $parameters_tray = new XoopsFormElementTray('', '<br />');
+ $parametersTray = new XoopsFormElementTray('', '<br />');
// Field Elements
- $criteria_element = new CriteriaCompo();
- $criteria_element->add(new Criteria('fieldelement_tid', 0));
- $criteria_table = new CriteriaCompo();
- $criteria_table->add(new Criteria('fieldelement_mid', $field_mid));
- $field_elements_select = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $id . ']', $field->getVar('field_element'));
- $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_element));
- $field_elements_select->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteria_table));
- unset($criteria_element, $criteria_table);
- $parameters_tray->addElement($field_elements_select);
+ $criteriaElement = new CriteriaCompo();
+ $criteriaElement->add(new Criteria('fieldelement_tid', 0));
+ $criteriaTable = new CriteriaCompo();
+ $criteriaTable->add(new Criteria('fieldelement_mid', $fieldMid));
+ $fieldElementsSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_ELEMENT_NAME, 'field_element[' . $id . ']', $field->getVar('field_element'));
+ $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaElement));
+ $fieldElementsSelect->addOptionArray($this->tdmcreate->getHandler('fieldelements')->getList($criteriaTable));
+ unset($criteriaElement, $criteriaTable);
+ $parametersTray->addElement($fieldElementsSelect);
- $check_field_parent = new XoopsFormCheckBox(' ', 'field_parent[' . $id . ']', $field->getVar('field_parent'));
- $check_field_parent->addOption(1, _AM_TDMCREATE_FIELD_PARENT);
- $parameters_tray->addElement($check_field_parent);
+ $checkFieldParent = new XoopsFormCheckBox(' ', 'field_parent[' . $id . ']', $field->getVar('field_parent'));
+ $checkFieldParent->addOption(1, _AM_TDMCREATE_FIELD_PARENT);
+ $parametersTray->addElement($checkFieldParent);
/*$field_parent = ($field->getVar('field_parent') == 1) ? $id : 1;
- $check_field_parent = new TDMCreateFormRadio('', 'field_parent', $field_parent);
- $check_field_parent->addOption($id, _AM_TDMCREATE_FIELD_PARENT );
- $parameters_tray->addElement($check_field_parent);*/
+ $checkFieldParent = new TDMCreateFormRadio('', 'field_parent', $field_parent);
+ $checkFieldParent->addOption($id, _AM_TDMCREATE_FIELD_PARENT );
+ $parametersTray->addElement($checkFieldParent);*/
- $check_field_inlist = new XoopsFormCheckBox(' ', 'field_inlist[' . $id . ']', $field->getVar('field_inlist'));
- $check_field_inlist->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
- $parameters_tray->addElement($check_field_inlist);
+ $checkFieldInList = new XoopsFormCheckBox(' ', 'field_inlist[' . $id . ']', $field->getVar('field_inlist'));
+ $checkFieldInList->addOption(1, _AM_TDMCREATE_FIELD_INLIST);
+ $parametersTray->addElement($checkFieldInList);
- $check_field_inform = new XoopsFormCheckBox(' ', 'field_inform[' . $id . ']', $field->getVar('field_inform'));
- $check_field_inform->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
- $parameters_tray->addElement($check_field_inform);
+ $checkFieldInForm = new XoopsFormCheckBox(' ', 'field_inform[' . $id . ']', $field->getVar('field_inform'));
+ $checkFieldInForm->addOption(1, _AM_TDMCREATE_FIELD_INFORM);
+ $parametersTray->addElement($checkFieldInForm);
- $check_field_admin = new XoopsFormCheckBox(' ', 'field_admin[' . $id . ']', $field->getVar('field_admin'));
- $check_field_admin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
- $parameters_tray->addElement($check_field_admin);
+ $checkFieldAdmin = new XoopsFormCheckBox(' ', 'field_admin[' . $id . ']', $field->getVar('field_admin'));
+ $checkFieldAdmin->addOption(1, _AM_TDMCREATE_FIELD_ADMIN);
+ $parametersTray->addElement($checkFieldAdmin);
- $check_field_user = new XoopsFormCheckBox(' ', 'field_user[' . $id . ']', $field->getVar('field_user'));
- $check_field_user->addOption(1, _AM_TDMCREATE_FIELD_USER);
- $parameters_tray->addElement($check_field_user);
+ $checkFieldUser = new XoopsFormCheckBox(' ', 'field_user[' . $id . ']', $field->getVar('field_user'));
+ $checkFieldUser->addOption(1, _AM_TDMCREATE_FIELD_USER);
+ $parametersTray->addElement($checkFieldUser);
- $check_field_block = new XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block'));
- $check_field_block->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
- $parameters_tray->addElement($check_field_block);
+ $checkFieldBlock = new XoopsFormCheckBox('', 'field_block[' . $id . ']', $field->getVar('field_block'));
+ $checkFieldBlock->addOption(1, _AM_TDMCREATE_FIELD_BLOCK);
+ $parametersTray->addElement($checkFieldBlock);
- $field_main = (1 == $field->getVar('field_main')) ? $id : 1;
- $check_field_main = new TDMCreateFormRadio('', 'field_main', $field_main);
- $check_field_main->addOption($id, _AM_TDMCREATE_FIELD_MAINFIELD);
- $parameters_tray->addElement($check_field_main);
+ $fieldMain = (1 == $field->getVar('field_main')) ? $id : 1;
+ $checkFieldMain = new TDMCreateFormRadio('', 'field_main', $fieldMain);
+ $checkFieldMain->addOption($id, _AM_TDMCREATE_FIELD_MAINFIELD);
+ $parametersTray->addElement($checkFieldMain);
$check_field_search = new XoopsFormCheckBox(' ', 'field_search[' . $id . ']', $field->getVar('field_search'));
$check_field_search->addOption(1, _AM_TDMCREATE_FIELD_SEARCH);
- $parameters_tray->addElement($check_field_search);
+ $parametersTray->addElement($check_field_search);
- $check_field_required = new XoopsFormCheckBox(' ', 'field_required[' . $id . ']', $field->getVar('field_required'));
- $check_field_required->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
- $parameters_tray->addElement($check_field_required);
- $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parameters_tray->render() . '</div></div></td></tr>'));
+ $checkFieldRequired = new XoopsFormCheckBox(' ', 'field_required[' . $id . ']', $field->getVar('field_required'));
+ $checkFieldRequired->addOption(1, _AM_TDMCREATE_FIELD_REQUIRED);
+ $parametersTray->addElement($checkFieldRequired);
+ $form->addElement(new TDMCreateFormLabel('<td><div class="portlet"><div class="portlet-header">' . _AM_TDMCREATE_FIELD_PARAMETERS_LIST . '</div><div class="portlet-content">' . $parametersTray->render() . '</div></div></td></tr>'));
}
}
++$id;
@@ -423,9 +420,9 @@
// If you change number fields in tables,
// adding missing fields or delete unnecessary fields
// By goffy
- for ($i = $id; $i <= $field_numb; ++$i) {
+ for ($i = $id; $i <= $fieldNumb; ++$i) {
$class = ($class == 'even') ? 'odd' : 'even';
- $this->getFormNewLine($form, $class, $i, $field_mid, $field_tid, $f_name, $table_autoincrement);
+ $this->getFormNewLine($form, $class, $i, $fieldMid, $fieldTid, $fName, $tableAutoincrement);
}
unset($id);
@@ -446,10 +443,10 @@
// Send Form Data
$form->addElement(new TDMCreateFormLabel('</tbody>'));
$form->addElement(new TDMCreateFormLabel('<tfoot><tr>'));
- $form_hidden = new XoopsFormHidden('op', 'save');
- $form_button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
- $form->addElement(new TDMCreateFormLabel('<td colspan="8">' . $form_hidden->render() . '</td>'));
- $form->addElement(new TDMCreateFormLabel('<td>' . $form_button->render() . '</td>'));
+ $formHidden = new XoopsFormHidden('op', 'save');
+ $formButton = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+ $form->addElement(new TDMCreateFormLabel('<td colspan="8">' . $formHidden->render() . '</td>'));
+ $form->addElement(new TDMCreateFormLabel('<td>' . $formButton->render() . '</td>'));
$form->addElement(new TDMCreateFormLabel('</tr></tfoot></table>'));
return $form;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAbstract.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAbstract.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateAbstract.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -16,17 +16,20 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: abstract.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: TDMCreateAbstract.php 12258 2014-01-02 09:33:29Z timgno $
*/
-
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
/**
* Abstract base class
*/
abstract class TDMCreateAbstract
{
- /**
+ /*
+ * @var mixed
+ */
+ protected $tdmcreate;
+
+ /**
* "module" attribute fot files
*
* @var mixed
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateArchitecture.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -243,7 +243,6 @@
// Module
$modId = $module->getVar('mod_id');
$moduleDirname = $module->getVar('mod_dirname');
- $uploadTablesIcons32 = $this->structure->getUploadPath() . '/images/tables';
$icon32 = 'assets/icons/32';
// Id of tables
$criteriaTables = new CriteriaCompo();
@@ -252,7 +251,7 @@
unset($criteriaTables);
$ret = array();
//
- $table = null;
+ $table = array();
foreach (array_keys($tables) as $t) {
$tableMid = $tables[$t]->getVar('table_mid');
$tableId = $tables[$t]->getVar('table_id');
@@ -268,7 +267,7 @@
// Get Table Object
$table = $this->tdmcreate->getHandler('tables')->get($tableId);
// Copy of tables images file
- if (file_exists($uploadTableImage = $uploadTablesIcons32 . '/' . $tableImage)) {
+ if (file_exists($uploadTableImage = TDMC_UPLOAD_IMGTAB_PATH . '/' . $tableImage)) {
$this->structure->copyFile($icon32, $uploadTableImage, $tableImage);
} elseif (file_exists($uploadTableImage = XOOPS_ICONS32_PATH . '/' . $tableImage)) {
$this->structure->copyFile($icon32, $uploadTableImage, $tableImage);
@@ -300,7 +299,7 @@
// Class Files
$classFiles = ClassFiles::getInstance();
$classFiles->write($module, $table, $tables);
- $ret[] = $classFiles->renderFile($tableName . '.php');
+ $ret[] = $classFiles->renderFile($tableName . '.php');
}
// Creation of user files
if (1 == $tableUser) {
@@ -381,16 +380,16 @@
$ret[] = $languageBlocks->render();
}
// Creation of admin permission files
- if (1 == $table->getVar('table_permissions')) {
- // Admin Permissions File
- $adminPermissions = AdminPermissions::getInstance();
- $adminPermissions->write($module, $tables, 'permissions.php');
- $ret[] = $adminPermissions->render();
- // Templates Admin Permissions File
- $adminTemplatesPermissions = TemplatesAdminPermissions::getInstance();
- $adminTemplatesPermissions->write($module, $moduleDirname . '_admin_permissions.tpl');
- $ret[] = $adminTemplatesPermissions->render();
- }
+ if (1 == $table->getVar('table_permissions')) {
+ // Admin Permissions File
+ $adminPermissions = AdminPermissions::getInstance();
+ $adminPermissions->write($module, $tables, 'permissions.php');
+ $ret[] = $adminPermissions->render();
+ // Templates Admin Permissions File
+ $adminTemplatesPermissions = TemplatesAdminPermissions::getInstance();
+ $adminTemplatesPermissions->write($module, $moduleDirname . '_admin_permissions.tpl');
+ $ret[] = $adminTemplatesPermissions->render();
+ }
// Creation of notifications files
if (1 == $table->getVar('table_notifications')) {
// Include Notifications File
@@ -447,7 +446,8 @@
$includeCommentFunctions->write($module, $table, 'comment_functions.php');
$ret[] = $includeCommentFunctions->renderFile();
}
- }
+
+ }
// Creation of admin files
if (1 == $module->getVar('mod_admin')) {
// Templates Index File
@@ -464,7 +464,7 @@
$ret[] = $userTemplatesHeader->render();
}
// Creation of user files
- if (1 == $module->getVar('mod_user')) {
+ if ((1 == $module->getVar('mod_user')) && (1 == $table->getVar('table_user'))) {
// User Footer File
$userFooter = UserFooter::getInstance();
$userFooter->write($module, 'footer.php');
@@ -474,11 +474,23 @@
$userHeader->write($module, $table, $tables, 'header.php');
$ret[] = $userHeader->render();
// User Notification Update File
- if ((1 == $module->getVar('mod_notifications'))) {
+ if ((1 == $module->getVar('mod_notifications')) && (1 == $table->getVar('table_notifications'))) {
$userNotificationUpdate = UserNotificationUpdate::getInstance();
$userNotificationUpdate->write($module, 'notification_update.php');
$ret[] = $userNotificationUpdate->render();
}
+ // User Print File
+ if ((1 == $table->getVar('table_print'))) {
+ $userPrint = UserPrint::getInstance();
+ $userPrint->write($module, $table, 'print.php');
+ $ret[] = $userPrint->render();
+ }
+ // User Rss File
+ if ((1 == $table->getVar('table_rss'))) {
+ $userRss = UserRss::getInstance();
+ $userRss->write($module, $table, 'rss.php');
+ $ret[] = $userRss->render();
+ }
// User Index File
$userIndex = UserIndex::getInstance();
$userIndex->write($module, 'index.php');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateFile.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -16,11 +16,10 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: file.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: TDMCreateFile.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'TDMCreateTableFields.php';
xoops_load('XoopsFile');
/**
@@ -116,24 +115,16 @@
return $instance;
}
- /*
- * @public function create
- * @param string $moduleDirname
- * @param string $subdir
- * @param string $fileName
- * @param string $content
- * @param mixed $created
- * @param mixed $notCreated
- * @param string $mode
- */
/**
- * @param $moduleDirname
- * @param null $subdir
- * @param $fileName
- * @param string $content
- * @param bool $created
- * @param bool $notCreated
- * @param string $mode
+ * @public function create
+ *
+ * @param $moduleDirname
+ * @param $subdir
+ * @param $fileName
+ * @param $content
+ * @param $created
+ * @param $notCreated
+ * @param $mode
*/
public function create($moduleDirname, $subdir = null, $fileName, $content = '', $created = false, $notCreated = false, $mode = 'w+')
{
@@ -141,7 +132,7 @@
$this->created = $created;
$this->notCreated = $notCreated;
$this->setMode($mode);
- $this->setModulePath($moduleDirname);
+ $this->setRepositoryPath($moduleDirname);
if (!empty($content) && is_string($content)) {
$this->setContent($content);
}
@@ -175,25 +166,25 @@
}
/*
- * @private function setModulePath
+ * @private function setRepositoryPath
* @param string $moduleDirname
*/
/**
* @param $moduleDirname
*/
- private function setModulePath($moduleDirname)
+ private function setRepositoryPath($moduleDirname)
{
$this->uploadPath = TDMC_UPLOAD_REPOSITORY_PATH . DIRECTORY_SEPARATOR . $moduleDirname;
}
/*
- * @private function getModulePath
+ * @private function getRepositoryPath
* @param null
*/
/**
* @return string
*/
- private function getModulePath()
+ private function getRepositoryPath()
{
return $this->uploadPath;
}
@@ -297,9 +288,9 @@
private function getUploadPath()
{
if ($this->getSubDir() != null) {
- $ret = $this->getModulePath() . DIRECTORY_SEPARATOR . $this->getSubDir();
+ $ret = $this->getRepositoryPath() . DIRECTORY_SEPARATOR . $this->getSubDir();
} else {
- $ret = $this->getModulePath();
+ $ret = $this->getRepositoryPath();
}
return $ret;
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateStructure.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -19,14 +19,12 @@
* @version $Id: TDMCreateStructure.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-xoops_load('XoopsFile');
-
/**
* Class TDMCreateStructure
*/
class TDMCreateStructure
-{
- /*
+{
+ /*
* @var mixed
*/
private $xoopsFile;
@@ -60,7 +58,8 @@
*/
public function __construct()
{
- $this->xoopsFile = XoopsFile::getInstance();
+ //parent::__construct();
+ $this->xoopsFile = XoopsFile::getInstance();
}
/*
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/TDMCreateTableFields.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -16,47 +16,34 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: tablefields.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: TDMCreateTableFields.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
-require_once 'TDMCreateAbstract.php';
-
/**
* Class TDMCreateTableFields
*/
class TDMCreateTableFields extends TDMCreateAbstract
{
- /*
- * @var string
- */
- protected $tdmcreate;
-
- /*
- * @public function constructor
- * @param mixed $table
- */
/**
- *
+ * @public function constructor
+ * @param mixed $table
*/
public function __construct()
{
$this->tdmcreate = TDMCreateHelper::getInstance();
}
- /*
- * @public function getTableFields
- * @param integer $table_id
- */
/**
- * @param $table_id
- * @return mixed
+ * @public function getTableFields
+ * @param $tableId
+ * @return mixed
*/
- public function getTableFields($table_id)
+ public function getTableFields($tableId)
{
- $criteriaFields = new CriteriaCompo();
- $criteriaFields->add(new Criteria('field_tid', $table_id));
- $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFields);
- unset($criteriaFields);
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria('field_tid', $tableId));
+ $fields = $this->tdmcreate->getHandler('fields')->getObjects($criteria);
+ unset($criteria);
return $fields;
}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminHeader.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -88,7 +88,7 @@
{
$ucfModuleDirname = ucfirst($moduleDirname);
$ret = <<<EOT
-\nrequire_once dirname(dirname(dirname(__DIR__))). '/include/cp_header.php';
+\ninclude dirname(dirname(dirname(__DIR__))). '/include/cp_header.php';
\$thisPath = dirname(__DIR__);
include_once \$thisPath.'/include/common.php';
\$sysPathIcon16 = '../' . \$GLOBALS['xoopsModule']->getInfo('sysicons16');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPermissions.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -16,7 +16,7 @@
* @package tdmcreate
* @since 2.5.0
* @author Txmod Xoops http://www.txmodxoops.org
- * @version $Id: admin_permissions.php 12258 2014-01-02 09:33:29Z timgno $
+ * @version $Id: AdminPermissions.php 12258 2014-01-02 09:33:29Z timgno $
*/
defined('XOOPS_ROOT_PATH') or die('Restricted access');
Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserBroken.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserBroken.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserBroken.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -0,0 +1,241 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * tdmcreate module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package tdmcreate
+ * @since 2.5.0
+ * @author Txmod Xoops http://www.txmodxoops.org
+ * @version $Id: UserBroken.php 12258 2014-01-02 09:33:29Z timgno $
+ */
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * Class UserBroken
+ */
+class UserBroken extends TDMCreateFile
+{
+ /*
+ * @public function constructor
+ * @param null
+ */
+ /**
+ *
+ */
+ public function __construct()
+ {
+ $this->tdmcfile = TDMCreateFile::getInstance();
+ }
+
+ /*
+ * @static function &getInstance
+ * @param null
+ */
+ /**
+ * @return UserBroken
+ */
+ public static function &getInstance()
+ {
+ static $instance = false;
+ if (!$instance) {
+ $instance = new self();
+ }
+
+ return $instance;
+ }
+
+ /*
+ * @public function write
+ * @param string $module
+ * @param mixed $table
+ * @param string $filename
+ */
+ /**
+ * @param $module
+ * @param $table
+ * @param $filename
+ */
+ public function write($module, $table, $filename)
+ {
+ $this->setModule($module);
+ $this->setTable($table);
+ $this->setFileName($filename);
+ }
+
+ /*
+ * @public function getUserBrokenHeader
+ * @param null
+ */
+ /**
+ * @param $moduleDirname
+ * @return string
+ */
+ public function getUserBrokenHeader($moduleDirname)
+ {
+ $ret = <<<EOT
+include __DIR__ . '/header.php';
+\$op = {$moduleDirname}_CleanVars(\$_REQUEST, 'op', 'list', 'string');
+// Template
+\$xoopsOption['template_main'] = '{$moduleDirname}_broken.tpl';
+include_once XOOPS_ROOT_PATH.'/header.php';
+\$xoTheme->addStylesheet( XOOPS_URL . '/modules/' . \$xoopsModule->getVar('dirname', 'n') . '/assets/css/style.css', null );
+//On recupere la valeur de l'argument op dans l'URL$
+// redirection if not permissions
+if (\$perm_submit == false) {
+ redirect_header('index.php', 2, _NOPERM);
+ exit();
+}
+//
+switch (\$op)
+{\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getAdminPagesList
+ * @param string $tableName
+ * @param string $language
+ */
+ /**
+ * @param $module
+ * @param $tableName
+ * @param $language
+ * @return string
+ */
+ public function getUserBrokenForm($module, $tableName, $language)
+ {
+ $stuModuleName = strtoupper($module->getVar('mod_name'));
+ $ret = <<<EOT
+ case 'list':
+ default:
+ //navigation
+ \$navigation = _MD_{$stuModuleName}_SUBMIT_PROPOSER;
+ \$GLOBALS['xoopsTpl']->assign('navigation', \$navigation);
+ // reference
+ // title of page
+ \$title = _MD_{$stuModuleName}_SUBMIT_PROPOSER . ' - ';
+ \$title .= \$GLOBALS['xoopsModule']->name();
+ \$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', \$title);
+ //description
+ \$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MD_{$stuModuleName}_SUBMIT_PROPOSER));
+ // Description
+ \$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags({$language}SUBMIT));
+
+ // Create
+ \${$tableName}Obj =& \${$tableName}Handler->create();
+ \$form = \${$tableName}Obj->getForm();
+ \$xoopsTpl->assign('form', \$form->render());\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getUserBrokenSave
+ * @param string $moduleDirname
+ * @param string $tableName
+ */
+ /**
+ * @param $moduleDirname
+ * @param $table_id
+ * @param $tableName
+ * @return string
+ */
+ public function getUserBrokenSave($moduleDirname, $table_id, $tableName)
+ {
+ $ret = <<<EOT
+ case 'save':
+ if ( !\$GLOBALS['xoopsSecurity']->check() ) {
+ redirect_header('{$tableName}.php', 3, implode(',', \$GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if (isset(\$_REQUEST['{$fpif}'])) {
+ \${$tableName}Obj =& \${$tableName}Handler->get(\$_REQUEST['{$fpif}']);
+ } else {
+ \${$tableName}Obj =& \${$tableName}Handler->create();
+ }
+EOT;
+ $fields = $this->getTableFields($table_id);
+ foreach (array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ if ((5 == $fieldElement) || (6 == $fieldElement)) {
+ $ret .= $this->adminobjects->getCheckBoxOrRadioYN($tableName, $fieldName);
+ } elseif (13 == $fieldElement) {
+ $ret .= $this->adminobjects->getUploadImage($moduleDirname, $tableName, $fieldName);
+ } elseif (14 == $fieldElement) {
+ $ret .= $this->adminobjects->getUploadFile($moduleDirname, $tableName, $fieldName);
+ } elseif (15 == $fieldElement) {
+ $ret .= $this->adminobjects->getTextDateSelect($tableName, $fieldName);
+ } else {
+ $ret .= $this->adminobjects->getSimpleSetVar($tableName, $fieldName);
+ }
+ }
+
+ $ret .= <<<EOT
+ if (\${$tableName}Handler->insert(\${$tableName}Obj)) {
+ redirect_header('index.php', 2, {$language}FORMOK);
+ }
+
+ echo \${$tableName}Obj->getHtmlErrors();
+ \$form =& \${$tableName}Obj->getForm();
+ \$form->display();
+ break;\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function getUserBrokenFooter
+ * @param null
+ */
+ /**
+ * @return string
+ */
+ public function getUserBrokenFooter()
+ {
+ $ret = <<<EOT
+include __DIR__ . '/footer.php';
+EOT;
+
+ return $ret;
+ }
+
+ /*
+ * @public function render
+ * @param null
+ */
+ /**
+ * @return bool|string
+ */
+ public function render()
+ {
+ $module = $this->getModule();
+ $table = $this->getTable();
+ $filename = $this->getFileName();
+ $moduleDirname = $module->getVar('mod_dirname');
+ $table_id = $table->getVar('table_id');
+ $tableName = $table->getVar('table_name');
+ $language = $this->getLanguage($moduleDirname, 'MA');
+ $content = $this->getHeaderFilesComments($module, $filename);
+ $content .= $this->getUserBrokenHeader($moduleDirname);
+ $content .= $this->getUserBrokenForm($module, $tableName, $language);
+ $content .= $this->getUserBrokenSave($moduleDirname, $table_id, $tableName);
+ $content .= $this->getUserBrokenFooter();
+ $this->tdmcfile->create($moduleDirname, '/', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
+
+ return $this->tdmcfile->renderFile();
+ }
+}
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserHeader.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserHeader.php 2015-05-03 20:24:25 UTC (rev 13055)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserHeader.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -93,7 +93,7 @@
$ucfModuleDirname = ucfirst($moduleDirname);
$content = $this->getHeaderFilesComments($module, $filename);
$content .= <<<EOT
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)) . '/mainfile.php';
\$dirname = \$GLOBALS['xoopsModule']->getVar('dirname');
\$pathname = XOOPS_ROOT_PATH. '/modules/'.\$dirname;
include_once \$pathname . '/include/common.php';
Added: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserListTag.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserListTag.php (rev 0)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserListTag.php 2015-05-04 13:07:33 UTC (rev 13056)
@@ -0,0 +1,109 @@
+<?php
+/*
+...
[truncated message content] |
|
From: <txm...@us...> - 2015-05-30 10:15:45
|
Revision: 13073
http://sourceforge.net/p/xoops/svn/13073
Author: txmodxoops
Date: 2015-05-30 10:15:43 +0000 (Sat, 30 May 2015)
Log Message:
-----------
Refactoring
Added & deleted superflues code
Modified Paths:
--------------
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php
XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/fields.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -205,7 +205,7 @@
$fieldAttributesSelect->addOptionArray($this->tdmcreate->getHandler('fieldattributes')->getList());
$form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldAttributesSelect->render() . '</td>'));
// Field Null
- $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '';
+ $value = (1 == $i) && (1 == $tableAutoincrement) ? '2' : '2';
$fieldNullSelect = new XoopsFormSelect(_AM_TDMCREATE_FIELD_NULL, 'field_null[' . $i . ']', $value);
$fieldNullSelect->addOptionArray($this->tdmcreate->getHandler('fieldnull')->getList());
$form->addElement(new TDMCreateFormLabel('<td class="center">' . $fieldNullSelect->render() . '</td>'));
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/admin/AdminPages.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -114,6 +114,7 @@
$tableName = $table->getVar('table_name');
$tableSoleName = $table->getVar('table_solename');
$tableFieldname = $table->getVar('table_fieldname');
+ $ucfTableName = ucfirst($tableName);
$stuTableName = strtoupper($tableName);
$stuTableSoleName = strtoupper($tableSoleName);
$stuTableFieldname = strtoupper($tableFieldname);
@@ -133,13 +134,8 @@
EOT;
}
$ret .= <<<EOT
- \$criteria = new CriteriaCompo();
- \$criteria->setStart(\$start);
- \$criteria->setLimit(\$limit);
- \$criteria->setSort('{$fieldId} ASC, {$fieldMain}');
- \$criteria->setOrder('ASC');
- \${$tableName}Count = \${$tableName}Handler->getCount(\$criteria);
- \${$tableName}All = \${$tableName}Handler->getAll(\$criteria);
+ \${$tableName}Count = \${$tableName}Handler->getCount{$ucfTableName}();
+ \${$tableName}All = \${$tableName}Handler->getAll{$ucfTableName}(\$start, \$limit);
unset(\$criteria);
\$GLOBALS['xoopsTpl']->assign('{$tableName}_count', \${$tableName}Count);
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_url', {$stuModuleDirname}_URL);
@@ -148,78 +144,11 @@
if (\${$tableName}Count > 0)
{
foreach (array_keys(\${$tableName}All) as \$i)
- {\n
-EOT;
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $fieldParent = $fields[$f]->getVar('field_parent');
- // Verify if table_fieldname is not empty
- $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableSoleName;
- $rpFieldName = $this->tdmcfile->getRightString($fieldName);
- //
- if($f < 1) {
- $ret .= $this->adminobjects->getIdGetVar($lpFieldName);
- }
- $fieldElement = $fields[$f]->getVar('field_element');
- if ((1 == $fields[$f]->getVar('field_admin')) || ((1 == $tableAutoincrement) && (1 == $fields[$f]->getVar('field_inlist')))) {
- switch ($fieldElement) {
- case 3:
- case 4:
- $ret .= $this->adminobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 8:
- $ret .= $this->adminobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 12:
- $ret .= $this->adminobjects->getUrlFileGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 13:
- $ret .= $this->adminobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 15:
- $ret .= $this->adminobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- default:
- if ($fieldElement > 15) {
- $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
- $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
- $fieldElementName = $fieldElements->getVar('fieldelement_name');
- $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName));
- if (1 == $fieldParent) {
- $criteriaFieldsTopic = new CriteriaCompo();
- $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid));
- $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic);
- unset($criteriaFieldsTopic);
- foreach (array_keys($fieldsTopic) as $ft) {
- if (1 == $fieldsTopic[$ft]->getVar('field_main')) {
- $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name');
- }
- }
- $ret .= $this->adminobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldName, $fieldNameTopic);
- } else {
- //
- $criteriaTablesTopic = new CriteriaCompo();
- $criteriaTablesTopic->add(new Criteria('table_id', $fieldElementTid));
- $tablesTopic = $this->tdmcreate->getHandler('tables')->getObjects($criteriaTablesTopic);
- unset($criteriaTablesTopic);
- foreach (array_keys($tablesTopic) as $ft) {
- $ucfTableSoleNameTopic = ucfirst($tablesTopic[$ft]->getVar('table_solename'));
- }
- $ret .= $this->adminobjects->getParentTopicGetVar($moduleDirname, $lpFieldName, $rpFieldName, $tableName, $ucfTableSoleNameTopic, $rpFieldElementName, $fieldName);
- }
- } else {
- $ret .= $this->adminobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- }
- break;
- }
+ {
+ \${$tableSoleName} = \${$tableName}All[\$i]->getValues();
+ \$GLOBALS['xoopsTpl']->appendByRef('{$tableName}_list', \${$tableSoleName});
+ unset(\${$tableSoleName});
}
- }
- $ret .= <<<EOT
- \$GLOBALS['xoopsTpl']->append('{$tableName}_list', \${$lpFieldName});
- unset(\${$lpFieldName});
- }\n
-EOT;
- $ret .= <<<EOT
if ( \${$tableName}Count > \$limit ) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
\$pagenav = new XoopsPageNav(\${$tableName}Count, \$limit, \$start, 'start', 'op=list&limit=' . \$limit);
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFiles.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -192,7 +192,8 @@
* @var mixed
*/
private \${$moduleDirname} = null;
- /*
+
+ /*
* Constructor
*
* @param null
@@ -200,7 +201,7 @@
public function __construct()
{
\$this->{$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();
-{$this->getInitVars($fields)}\t}
+{$this->getInitVars($fields)}\t}\n
/*
* @static function &getInstance
* @param null
@@ -212,7 +213,7 @@
\$instance = new self();
}
return \$instance;
- }\n
+ }\n\n
EOT;
return $ret;
@@ -327,7 +328,7 @@
\$form->addElement ( \$groupsCanSubmitCheckbox );
// For view
\$groupsCanViewCheckbox->addOptionArray ( \$groupList );
- \$form->addElement ( \$groupsCanViewCheckbox );\n
+ \$form->addElement ( \$groupsCanViewCheckbox );\n\n
EOT;
return $ret;
@@ -347,12 +348,65 @@
\$form->addElement(new XoopsFormHidden('op', 'save'));
\$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
return \$form;
- }\n
+ }\n\n
EOT;
return $ret;
}
+
+ /*
+ * @private function getToArray
+ * @param null
+ */
+ /**
+ * @return string
+ */
+ private function getValuesInForm($fields)
+ {
+ $ret = <<<EOT
+ /**
+ * Get Values
+ */
+ public function getValues(\$keys = null, \$format = null, \$maxDepth = null)
+ {
+ \$ret = parent::getValues(\$keys, \$format, \$maxDepth);\n
+EOT;
+ foreach (array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ switch ($fieldElement) {
+ case 3:
+ case 4:
+ $ret .= <<<EOT
+ \$ret['{$rpFieldName}'] = strip_tags(\$this->getVar('{$fieldName}'));\n
+EOT;
+ break;
+ case 8:
+ $ret .= <<<EOT
+ \$ret['{$rpFieldName}'] = XoopsUser::getUnameFromId(\$this->getVar('{$fieldName}'));\n
+EOT;
+ break;
+ case 15:
+ $ret .= <<<EOT
+ \$ret['{$rpFieldName}'] = formatTimeStamp(\$this->getVar('{$fieldName}'));\n
+EOT;
+ break;
+ default:
+ $ret .= <<<EOT
+ \$ret['{$rpFieldName}'] = \$this->getVar('{$fieldName}');\n
+EOT;
+ break;
+ }
+ }
+ $ret .= <<<EOT
+
+ return \$ret;
+ }\n\n
+EOT;
+ return $ret;
+ }
/*
* @private function getToArray
* @param null
@@ -360,7 +414,7 @@
/**
* @return string
*/
- private function getToArray()
+ private function getToArrayInForm()
{
$ret = <<<EOT
/**
@@ -377,12 +431,54 @@
}
return \$ret;
}
-}\n
+}\n\n
EOT;
return $ret;
}
+
+ /*
+ * @private function getOptionsCheck
+ * @param $table
+ */
+ /**
+ * @return string
+ */
+ private function getOptionsCheck($table)
+ {
+ $ret = <<<EOT
+ /**
+ * Get Options
+ */
+ public function getOptions()
+ {
+ \$ret = array();\n
+EOT;
+ $fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
+ foreach (array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldElement = $fields[$f]->getVar('field_element');
+ //
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementId = $fieldElements->getVar('fieldelement_id');
+ $rpFieldName = $this->tdmcfile->getRightString($fieldName);
+ if(5 == $fieldElementId) {
+ $ret .= <<<EOT
+ if (1 == \$this->getVar('{$fieldName}')) {
+ array_push(\$ret, '{$rpFieldName}');
+ }\n
+EOT;
+ }
+ }
+ $ret .= <<<EOT
+ return \$ret;
+ }
+}\n\n
+EOT;
+ return $ret;
+ }
+
/*
* @public function getClassHandler
* @param string $moduleDirname
@@ -399,7 +495,7 @@
* @param $fieldMain
* @return string
*/
- private function getClassHandler($moduleDirname, $table, $fieldId, $fieldMain)
+ private function getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldMain)
{
$tableName = $table->getVar('table_name');
$tableCategory = $table->getVar('table_category');
@@ -428,9 +524,21 @@
{
parent::__construct(\$db, '{$moduleDirname}_{$tableName}', '{$moduleDirname}{$tableName}', '{$fieldId}', '{$fieldMain}');
\$this->{$moduleDirname} = {$ucfModuleDirname}Helper::getInstance();
+ }\n\n
+EOT;
+
+ return $ret;
}
-
- /**
+
+ /**
+ * @public function getClassCreate
+ *
+ * @return string
+ */
+ private function getClassCreate()
+ {
+ $ret = <<<EOT
+ /**
* @param bool \$isNew
*
* @return object
@@ -438,9 +546,21 @@
public function &create(\$isNew = true)
{
return parent::create(\$isNew);
+ }\n\n
+EOT;
+
+ return $ret;
}
-
- /**
+
+ /**
+ * @public function getClassGet
+ *
+ * @return string
+ */
+ private function getClassGet()
+ {
+ $ret = <<<EOT
+ /**
* retrieve a field
*
* @param int \$i field id
@@ -449,8 +569,20 @@
public function &get(\$i = null, \$fields = null)
{
return parent::get(\$i, \$fields);
+ }\n\n
+EOT;
+
+ return $ret;
}
-
+
+ /**
+ * @public function getClassGetInsertId
+ *
+ * @return string
+ */
+ private function getClassGetInsertId()
+ {
+ $ret = <<<EOT
/**
* get inserted id
*
@@ -460,9 +592,21 @@
public function &getInsertId()
{
return \$this->db->getInsertId();
+ }\n\n
+EOT;
+
+ return $ret;
}
-
- /**
+
+ /**
+ * @public function getClassGetIds
+ *
+ * @return string
+ */
+ private function getClassGetIds()
+ {
+ $ret = <<<EOT
+ /**
* get IDs of objects matching a condition
*
* @param object \$criteria {@link CriteriaElement} to match
@@ -471,9 +615,21 @@
function &getIds(\$criteria)
{
return parent::getIds(\$criteria);
+ }\n\n
+EOT;
+
+ return $ret;
}
-
- /**
+
+ /**
+ * @public function getClassInsert
+ *
+ * @return string
+ */
+ private function getClassInsert()
+ {
+ $ret = <<<EOT
+ /**
* insert a new field in the database
*
* @param object \$field reference to the {@link TDMCreateFields} object
@@ -487,11 +643,115 @@
return false;
}
return true;
- }\n
+ }\n\n
EOT;
- if (1 == $tableCategory) {
- $ret .= <<<EOT
- \n\t/**
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassCounter
+ *
+ * @param $tableName
+ * @param $fieldId
+ * @param $fieldMain
+ * @return string
+ */
+ private function getClassCounter($tableName, $fieldId, $fieldMain)
+ {
+ $ucfTableName = ucfirst($tableName);
+ $ret = <<<EOT
+ /**
+ * Get Count {$ucfTableName}
+ */
+ public function getCount{$ucfTableName}(\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC')
+ {
+ \$criteria = new CriteriaCompo();
+ \$criteria->setSort(\$sort);
+ \$criteria->setOrder(\$order);
+ \$criteria->setStart(\$start);
+ \$criteria->setLimit(\$limit);
+ return parent::getCount(\$criteria);
+ }\n\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassAll
+ *
+ * @param $tableName
+ * @param $fieldId
+ * @param $fieldMain
+ * @return string
+ */
+ private function getClassAll($tableName, $fieldId, $fieldMain)
+ {
+ $ucfTableName = ucfirst($tableName);
+ $ret = <<<EOT
+ /**
+ * Get All {$ucfTableName}
+ */
+ public function getAll{$ucfTableName}(\$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC')
+ {
+ \$criteria = new CriteriaCompo();
+ \$criteria->setSort(\$sort);
+ \$criteria->setOrder(\$order);
+ \$criteria->setStart(\$start);
+ \$criteria->setLimit(\$limit);
+ return parent::getAll(\$criteria);
+ }\n\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassByCategory
+ *
+ * @param $tableName
+ * @param $fieldId
+ * @param $fieldMain
+ * @param $fieldParent
+ * @return string
+ */
+ private function getClassByCategory($tableName, $fieldId, $fieldMain, $fieldParent)
+ {
+ $ucfTableName = ucfirst($tableName);
+ $ret = <<<EOT
+ /**
+ * Get All {$ucfTableName} By Category Id
+ */
+ public function getAll{$ucfTableName}ByCategoryId(\$catId, \$start = 0, \$limit = 0, \$sort = '{$fieldId} ASC, {$fieldMain}', \$order = 'ASC')
+ {
+ \$criteria = new CriteriaCompo();
+ \$criteria->add(new Criteria('{$fieldParent}', \$catId));
+ \$criteria->setSort(\$sort);
+ \$criteria->setOrder(\$order);
+ \$criteria->setStart(\$start);
+ \$criteria->setLimit(\$limit);
+ return parent::getAll(\$criteria);
+ }\n\n
+EOT;
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassGetTableSolenameById
+ *
+ * @param $moduleDirname
+ * @param $table
+ * @return string
+ */
+ private function getClassGetTableSolenameById($moduleDirname, $table, $fieldMain)
+ {
+ $tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
+ $ucfTableSoleName = ucfirst($tableSoleName);
+ $ret = <<<EOT
+ /**
* Returns the {$ucfTableSoleName} from id
*
* @return string
@@ -508,15 +768,26 @@
}
}
return \${$tableSoleName};
- }\n
+ }
EOT;
- }
- $ret .= <<<EOT
-}
+
+ return $ret;
+ }
+
+ /**
+ * @public function getClassEnd
+ *
+ * @return null
+ */
+ private function getClassEnd()
+ {
+ $ret = <<<EOT
+}\n
EOT;
-
- return $ret;
+
+ return $ret;
}
+
/*
* @public function renderFile
@@ -531,30 +802,56 @@
$module = $this->getModule();
$table = $this->getTable();
$tableName = $table->getVar('table_name');
+ $tableCategory = $table->getVar('table_category');
$moduleDirname = $module->getVar('mod_dirname');
$fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
- foreach (array_keys($fields) as $f) {
- $fieldName = $fields[$f]->getVar('field_name');
- $fieldInForm = $fields[$f]->getVar('field_inform');
+ $fieldInForm = array();
+ $fieldParentId = array();
+ $fieldElementId = array();
+ foreach (array_keys($fields) as $f) {
+ $fieldName = $fields[$f]->getVar('field_name');
+ $fieldInForm[] = $fields[$f]->getVar('field_inform');
if ((0 == $f) && (1 == $table->getVar('table_autoincrement'))) {
$fieldId = $fieldName; // $fieldId = fields parameter index field
}
if (1 == $fields[$f]->getVar('field_main')) {
$fieldMain = $fieldName; // $fieldMain = fields parameter main field
}
+ if (1 == $fields[$f]->getVar('field_parent')) {
+ $fieldParent = $fieldName; // $fieldParent = fields parameter parent field
+ }
+ $fieldElement = $fields[$f]->getVar('field_element');
+ //
+ $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
+ $fieldElementId[] = $fieldElements->getVar('fieldelement_id');
}
$content = $this->getHeaderFilesComments($module, $filename);
$content .= $this->getHeadClass($moduleDirname, $tableName, $fields);
- if (1 == $fieldInForm) {
+ if (in_array(1, $fieldInForm)) {
$content .= $this->getHeadInForm($module, $table);
if (1 == $table->getVar('table_permissions')) {
$content .= $this->getPermissionsInForm($moduleDirname, $fieldId);
}
$content .= $this->getFootInForm();
}
- $content .= $this->getToArray();
- $content .= $this->getClassHandler($moduleDirname, $table, $fieldId, $fieldMain);
-
+ $content .= $this->getValuesInForm($fields);
+ $content .= $this->getToArrayInForm();
+ if(in_array(5, $fieldElementId)) {
+ $content .= $this->getOptionsCheck($table);
+ }
+ $content .= $this->getClassObjectHandler($moduleDirname, $table, $fieldId, $fieldMain);
+ $content .= $this->getClassCreate();
+ $content .= $this->getClassGet();
+ $content .= $this->getClassGetInsertId();
+ $content .= $this->getClassGetIds();
+ $content .= $this->getClassInsert();
+ $content .= $this->getClassCounter($tableName, $fieldId, $fieldMain);
+ $content .= $this->getClassAll($tableName, $fieldId, $fieldMain);
+ if (in_array(1, $fieldParentId)) {
+ $content .= $this->getClassByCategory($tableName, $fieldId, $fieldMain, $fieldParent);
+ $content .= $this->getClassGetTableSolenameById($moduleDirname, $table, $fieldMain);
+ }
+ $content .= $this->getClassEnd();
$this->tdmcfile->create($moduleDirname, 'class', $filename, $content, _AM_TDMCREATE_FILE_CREATED, _AM_TDMCREATE_FILE_NOTCREATED);
return $this->tdmcfile->renderFile();
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/classes/ClassFormElements.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -670,11 +670,11 @@
}
break;
}
- if (($fieldElement <= 15) && (1 == $fieldParent)) {
+ /*if (($fieldElement <= 15)) {
$ret .= $this->getXoopsFormTopic($language, $moduleDirname, $tableName, $fieldId, $fieldPid, $fieldMain, $required);
- }
+ }*/
if ($fieldElement > 15) {
- if (1 == $table->getVar('table_category')) {
+ if (1 == $table->getVar('table_category') || (1 == $fieldParent)) {
$fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
$fieldElementMid = $fieldElements->getVar('fieldelement_mid');
$fieldElementTid = $fieldElements->getVar('fieldelement_tid');
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserPages.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -85,6 +85,7 @@
{
$table = $this->getTable();
$tableName = $table->getVar('table_name');
+ $tableSoleName = $table->getVar('table_solename');
$tableFieldname = $table->getVar('table_fieldname');
$stuModuleDirname = strtoupper($moduleDirname);
$stuTableName = strtoupper($tableName);
@@ -104,77 +105,27 @@
//
\$GLOBALS['xoopsTpl']->assign('{$moduleDirname}_upload_url', {$stuModuleDirname}_UPLOAD_URL);
//
-\$criteria{$ucfTableName} = new CriteriaCompo();
-\${$stlTableName}Count = \${$stlTableName}Handler->getCount(\$criteria{$ucfTableName});
-\${$stlTableName}All = \${$stlTableName}Handler->getAll(\$criteria{$ucfTableName});
-unset(\$criteria{$ucfTableName});
+\${$stlTableName}Count = \${$stlTableName}Handler->getCount{$ucfTableName}();
+\${$stlTableName}All = \${$stlTableName}Handler->getAll{$ucfTableName}(\$start, \$limit);
\$keywords = array();
if (\${$stlTableName}Count > 0) {
- foreach (array_keys(\${$stlTableName}All) as \$i)
- {\n
+ // Get All {$ucfTableName}
+ foreach (array_keys(\${$stlTableName}All) as \$i)
+ {
+ \${$tableSoleName} = \${$tableName}All[\$i]->getValues();
+ \$GLOBALS['xoopsTpl']->appendByRef('{$tableName}_list', \${$tableSoleName});
+ unset(\${$tableSoleName});\n
EOT;
// Fields
$fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
foreach (array_keys($fields) as $f) {
$fieldName = $fields[$f]->getVar('field_name');
- $fieldParent = $fields[$f]->getVar('field_parent');
- // Verify if table_fieldname is not empty
- $lpFieldName = !empty($tableFieldname) ? substr($fieldName, 0, strpos($fieldName, '_')) : $tableName;
- $rpFieldName = $this->tdmcfile->getRightString($fieldName);
if (1 == $fields[$f]->getVar('field_main')) {
- $fpmf = $fieldName; // fpmf = fields parameters main field
- }
- $fieldElement = $fields[$f]->getVar('field_element');
- if ((1 == $table->getVar('table_autoincrement')) || (1 == $fields[$f]->getVar('field_user'))) {
- switch ($fieldElement) {
- case 3:
- case 4:
- $ret .= $this->userobjects->getTextAreaGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 8:
- $ret .= $this->userobjects->getSelectUserGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 12:
- $ret .= $this->userobjects->getUrlFileGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 13:
- $ret .= $this->userobjects->getUploadImageGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- case 15:
- $ret .= $this->userobjects->getTextDateSelectGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- break;
- default:
- if ((1 == $fieldParent) && !$table->getVar('table_category')) {
- if ($fieldElement > 15) {
- $fieldElements = $this->tdmcreate->getHandler('fieldelements')->get($fieldElement);
- $fieldElementTid = $fieldElements->getVar('fieldelement_tid');
- $fieldElementName = $fieldElements->getVar('fieldelement_name');
- $rpFieldElementName = strtolower(str_replace('Table : ', '', $fieldElementName));
- //
- $fieldNameParent = $fieldName;
- //
- $criteriaFieldsTopic = new CriteriaCompo();
- $criteriaFieldsTopic->add(new Criteria('field_tid', $fieldElementTid));
- $fieldsTopic = $this->tdmcreate->getHandler('fields')->getObjects($criteriaFieldsTopic);
- unset($criteriaFieldsTopic);
- foreach (array_keys($fieldsTopic) as $ft) {
- if (1 == $fieldsTopic[$ft]->getVar('field_main')) {
- $fieldNameTopic = $fieldsTopic[$ft]->getVar('field_name');
- }
- }
- $ret .= $this->userobjects->getTopicGetVar($lpFieldName, $rpFieldName, $tableName, $rpFieldElementName, $fieldNameParent, $fieldNameTopic);
- }
- } else {
- $ret .= $this->userobjects->getSimpleGetVar($lpFieldName, $rpFieldName, $tableName, $fieldName);
- }
- break;
- }
- }
+ $fieldMain = $fieldName; // fieldMain = fields parameters main field
+ }
}
$ret .= <<<EOT
- \$GLOBALS['xoopsTpl']->append('{$stlTableName}', \${$lpFieldName});
- \$keywords[] = \${$stlTableName}All[\$i]->getVar('{$fpmf}');
- unset(\${$lpFieldName});
+ \$keywords[] = \${$stlTableName}All[\$i]->getVar('{$fieldMain}');
}
// Display Navigation
if (\${$stlTableName}Count > \$limit) {
Modified: XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-27 14:19:05 UTC (rev 13072)
+++ XoopsModules/TDMCreate/branches/timgno/1.91a2/tdmcreate/class/files/user/UserXoopsVersion.php 2015-05-30 10:15:43 UTC (rev 13073)
@@ -130,7 +130,7 @@
$ret = <<<EOT
defined('XOOPS_ROOT_PATH') or die('Restricted access');
//
-\$dirname = basename(__DIR__) ;
+\$dirname = basename(__DIR__);
// ------------------- Informations ------------------- //
\$modversion = array(
'name' => {$language}NAME,
@@ -325,6 +325,23 @@
}
/*
+ * @private function getXoopsVersionTemplatesUserLine
+ * @param $moduleDirname
+ */
+ /**
+ * @param $moduleDirname
+ * @return string
+ */
+ private function getXoopsVersionTemplatesUserLine($moduleDirname, $type)
+ {
+ $ret = <<<EOT
+\$modversion['templates'][] = array('file' => '{$moduleDirname}_{$type}.tpl', 'description' => '');\n
+EOT;
+
+ return $ret;
+ }
+
+ /*
* @private function getXoopsVersionTemplatesUser
* @param $moduleDirname
*/
@@ -346,44 +363,28 @@
EOT;
}
if(1 == $table->getVar('table_broken')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_broken.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'broken');
}
if(1 == $table->getVar('table_pdf')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_pdf.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'pdf');
}
if(1 == $table->getVar('table_print')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_print.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'print');
}
if(1 == $table->getVar('table_rate')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_rate.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'rate');
}
if(1 == $table->getVar('table_rss')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_rss.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'rss');
}
if(1 == $table->getVar('table_search')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_search.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'search');
}
if(1 == $table->getVar('table_single')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_single.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'single');
}
if(1 == $table->getVar('table_submit')) {
- $ret .= <<<EOT
-\$modversion['templates'][] = array('file' => '{$moduleDirname}_submit.tpl', 'description' => '');\n
-EOT;
+ $ret .= $this->getXoopsVersionTemplatesUserLine($moduleDirname, 'submit');
}
$ret .= <<<EOT
\$modversion['templates'][] = array('file' => '{$moduleDirname}_footer.tpl', 'description' => '');\n\n
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X