Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9199] XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/ profile
|
From: <be...@us...> - 2012-03-26 11:00:53
|
Revision: 9199
http://xoops.svn.sourceforge.net/xoops/?rev=9199&view=rev
Author: beckmi
Date: 2012-03-26 11:00:43 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Added column for "Required" field
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/admin/field.php
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/language/english/admin.php
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/templates/profile_admin_fieldlist.html
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/images/actions/
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/images/actions/0.png
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/images/actions/1.png
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/admin/field.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/admin/field.php 2012-03-26 09:47:45 UTC (rev 9198)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/admin/field.php 2012-03-26 11:00:43 UTC (rev 9199)
@@ -3,7 +3,7 @@
* Extended User Profile
*
* 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
+ * 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
@@ -20,287 +20,310 @@
include 'admin_header.php';
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
-echo $indexAdmin->addNavigation('field.php');
+echo $indexAdmin->addNavigation('field.php');
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list');
$profilefield_handler =& xoops_getmodulehandler('field');
-switch($op ) {
-default:
-case "list":
- $fields = $profilefield_handler->getObjects(null, true, false);
+switch ($op) {
+ default:
+ case "list":
+ $fields = $profilefield_handler->getObjects(null, true, false);
- $module_handler =& xoops_gethandler('module');
- $modules = $module_handler->getObjects(null, true);
+ $module_handler =& xoops_gethandler('module');
+ $modules = $module_handler->getObjects(null, true);
- $cat_handler =& xoops_getmodulehandler('category');
- $criteria = new CriteriaCompo();
- $criteria->setSort('cat_weight');
- $cats = $cat_handler->getObjects($criteria, true);
- unset($criteria);
+ $cat_handler =& xoops_getmodulehandler('category');
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('cat_weight');
+ $cats = $cat_handler->getObjects($criteria, true);
+ unset($criteria);
- $categories[0] = _PROFILE_AM_DEFAULT;
- if ( count($cats) > 0 ) {
- foreach (array_keys($cats) as $i ) {
- $categories[$cats[$i]->getVar('cat_id')] = $cats[$i]->getVar('cat_title');
+ $categories[0] = _PROFILE_AM_DEFAULT;
+ if (count($cats) > 0) {
+ foreach (array_keys($cats) as $i) {
+ $categories[$cats[$i]->getVar('cat_id')] = $cats[$i]->getVar('cat_title');
+ }
}
- }
- $GLOBALS['xoopsTpl']->assign('categories', $categories);
- unset($categories);
- $valuetypes = array(XOBJ_DTYPE_ARRAY => _PROFILE_AM_ARRAY,
- XOBJ_DTYPE_EMAIL => _PROFILE_AM_EMAIL,
- XOBJ_DTYPE_INT => _PROFILE_AM_INT,
- XOBJ_DTYPE_TXTAREA => _PROFILE_AM_TXTAREA,
- XOBJ_DTYPE_TXTBOX => _PROFILE_AM_TXTBOX,
- XOBJ_DTYPE_URL => _PROFILE_AM_URL,
- XOBJ_DTYPE_OTHER => _PROFILE_AM_OTHER,
- XOBJ_DTYPE_MTIME => _PROFILE_AM_DATE);
+ $GLOBALS['xoopsTpl']->assign('categories', $categories);
+ unset($categories);
+ $valuetypes = array( XOBJ_DTYPE_ARRAY => _PROFILE_AM_ARRAY,
+ XOBJ_DTYPE_EMAIL => _PROFILE_AM_EMAIL,
+ XOBJ_DTYPE_INT => _PROFILE_AM_INT,
+ XOBJ_DTYPE_TXTAREA => _PROFILE_AM_TXTAREA,
+ XOBJ_DTYPE_TXTBOX => _PROFILE_AM_TXTBOX,
+ XOBJ_DTYPE_URL => _PROFILE_AM_URL,
+ XOBJ_DTYPE_OTHER => _PROFILE_AM_OTHER,
+ XOBJ_DTYPE_MTIME => _PROFILE_AM_DATE );
- $fieldtypes = array('checkbox' => _PROFILE_AM_CHECKBOX,
- 'group' => _PROFILE_AM_GROUP,
- 'group_multi' => _PROFILE_AM_GROUPMULTI,
- 'language' => _PROFILE_AM_LANGUAGE,
- 'radio' => _PROFILE_AM_RADIO,
- 'select' => _PROFILE_AM_SELECT,
- 'select_multi' => _PROFILE_AM_SELECTMULTI,
- 'textarea' => _PROFILE_AM_TEXTAREA,
- 'dhtml' => _PROFILE_AM_DHTMLTEXTAREA,
- 'textbox' => _PROFILE_AM_TEXTBOX,
- 'timezone' => _PROFILE_AM_TIMEZONE,
- 'yesno' => _PROFILE_AM_YESNO,
- 'date' => _PROFILE_AM_DATE,
- 'datetime' => _PROFILE_AM_DATETIME,
- 'longdate' => _PROFILE_AM_LONGDATE,
- 'theme' => _PROFILE_AM_THEME,
- 'autotext' => _PROFILE_AM_AUTOTEXT,
- 'rank' => _PROFILE_AM_RANK);
+ $fieldtypes = array('checkbox' => _PROFILE_AM_CHECKBOX,
+ 'group' => _PROFILE_AM_GROUP,
+ 'group_multi' => _PROFILE_AM_GROUPMULTI,
+ 'language' => _PROFILE_AM_LANGUAGE,
+ 'radio' => _PROFILE_AM_RADIO,
+ 'select' => _PROFILE_AM_SELECT,
+ 'select_multi' => _PROFILE_AM_SELECTMULTI,
+ 'textarea' => _PROFILE_AM_TEXTAREA,
+ 'dhtml' => _PROFILE_AM_DHTMLTEXTAREA,
+ 'textbox' => _PROFILE_AM_TEXTBOX,
+ 'timezone' => _PROFILE_AM_TIMEZONE,
+ 'yesno' => _PROFILE_AM_YESNO,
+ 'date' => _PROFILE_AM_DATE,
+ 'datetime' => _PROFILE_AM_DATETIME,
+ 'longdate' => _PROFILE_AM_LONGDATE,
+ 'theme' => _PROFILE_AM_THEME,
+ 'autotext' => _PROFILE_AM_AUTOTEXT,
+ 'rank' => _PROFILE_AM_RANK);
- foreach (array_keys($fields) as $i ) {
- $fields[$i]['canEdit'] = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
- $fields[$i]['canDelete'] = $fields[$i]['field_config'];
- $fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
- $fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
- $categories[$fields[$i]['cat_id']][] = $fields[$i];
- $weights[$fields[$i]['cat_id']][] = $fields[$i]['field_weight'];
- }
- //sort fields order in categories
- foreach (array_keys($categories) as $i ) {
- array_multisort($weights[$i], SORT_ASC, array_keys($categories[$i]), SORT_ASC, $categories[$i]);
- }
- ksort($categories);
- $GLOBALS['xoopsTpl']->assign('fieldcategories', $categories);
- $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
- $template_main = "profile_admin_fieldlist.html";
- break;
+ foreach (array_keys($fields) as $i) {
+ $fields[$i]['canEdit']=$fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
+ $fields[$i]['canDelete'] = $fields[$i]['field_config'];
+ $fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
+ $fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
+ $categories[$fields[$i]['cat_id']][] = $fields[$i];
+ $weights[$fields[$i]['cat_id']][] = $fields[$i]['field_weight'];
-case "new":
- include_once('../include/forms.php');
- $obj =& $profilefield_handler->create();
- $form = profile_getFieldForm($obj);
- $form->display();
- break;
+ }
+ //sort fields order in categories
+ foreach (array_keys($categories) as $i) {
+ array_multisort($weights[$i], SORT_ASC, array_keys($categories[$i]), SORT_ASC, $categories[$i]);
+ }
+ ksort($categories);
+ $GLOBALS['xoopsTpl']->assign('fieldcategories', $categories);
+ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
+ $template_main = "profile_admin_fieldlist.html";
+ break;
-case "edit":
- $obj =& $profilefield_handler->get($_REQUEST['id']);
- if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit') ) { //If no configs exist
- redirect_header('field.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
- }
- include_once('../include/forms.php');
- $form = profile_getFieldForm($obj);
- $form->display();
- break;
+ case "new":
+ include_once('../include/forms.php');
+ $obj =& $profilefield_handler->create();
+ $form = profile_getFieldForm($obj);
+ $form->display();
+ break;
-case "reorder":
- if ( !$GLOBALS['xoopsSecurity']->check() ) {
- redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
- }
- if ( isset($_POST['field_ids']) && count($_POST['field_ids']) > 0 ) {
- $oldweight = $_POST['oldweight'];
- $oldcat = $_POST['oldcat'];
- $category = $_POST['category'];
- $weight = $_POST['weight'];
- $ids = array();
- foreach ($_POST['field_ids'] as $field_id ) {
- if ( $oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id] ) {
- //if field has changed
- $ids[] = intval($field_id);
- }
+ case "edit":
+ $obj =& $profilefield_handler->get($_REQUEST['id']);
+ if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
+ redirect_header('field.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
}
- if ( count($ids) > 0 ) {
- $errors = array();
- //if there are changed fields, fetch the fieldcategory objects
- $field_handler =& xoops_getmodulehandler('field');
- $fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true);
- foreach ($ids as $i ) {
- $fields[$i]->setVar('field_weight', intval($weight[$i]) );
- $fields[$i]->setVar('cat_id', intval($category[$i]) );
- if ( !$field_handler->insert($fields[$i]) ) {
- $errors = array_merge($errors, $fields[$i]->getErrors() );
+ include_once('../include/forms.php');
+ $form = profile_getFieldForm($obj);
+ $form->display();
+ break;
+
+ case "reorder":
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if (isset($_POST['field_ids']) && count($_POST['field_ids']) > 0) {
+ $oldweight = $_POST['oldweight'];
+ $oldcat = $_POST['oldcat'];
+ $category = $_POST['category'];
+ $weight = $_POST['weight'];
+ $ids = array();
+ foreach ($_POST['field_ids'] as $field_id) {
+ if ($oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id]) {
+ //if field has changed
+ $ids[] = intval($field_id);
}
}
- if ( count($errors) == 0 ) {
- //no errors
- redirect_header('field.php', 2, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELDS) );
- } else {
- redirect_header('field.php', 3, implode('<br />', $errors) );
+ if (count($ids) > 0) {
+ $errors = array();
+ //if there are changed fields, fetch the fieldcategory objects
+ $field_handler =& xoops_getmodulehandler('field');
+ $fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true);
+ foreach ($ids as $i) {
+ $fields[$i]->setVar('field_weight', intval($weight[$i]));
+ $fields[$i]->setVar('cat_id', intval($category[$i]));
+ if (!$field_handler->insert($fields[$i])) {
+ $errors = array_merge($errors, $fields[$i]->getErrors());
+ }
+ }
+ if (count($errors) == 0) {
+ //no errors
+ redirect_header('field.php', 2, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELDS));
+ } else {
+ redirect_header('field.php', 3, implode('<br />', $errors));
+ }
}
}
- }
- break;
+ break;
-case "save":
- if ( !$GLOBALS['xoopsSecurity']->check() ) {
- redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
- }
- $redirect_to_edit = false;
- if ( isset($_REQUEST['id']) ) {
- $obj =& $profilefield_handler->get($_REQUEST['id']);
- if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit') ) { //If no configs exist
- redirect_header('admin.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
+ case "save":
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- } else {
- $obj =& $profilefield_handler->create();
- $obj->setVar('field_name', $_REQUEST['field_name']);
- $obj->setVar('field_moduleid', $GLOBALS['xoopsModule']->getVar('mid') );
- $obj->setVar('field_show', 1);
- $obj->setVar('field_edit', 1);
- $obj->setVar('field_config', 1);
- $redirect_to_edit = true;
- }
- $obj->setVar('field_title', $_REQUEST['field_title']);
- $obj->setVar('field_description', $_REQUEST['field_description']);
- if ( $obj->getVar('field_config') ) {
- $obj->setVar('field_type', $_REQUEST['field_type']);
- if ( isset($_REQUEST['field_valuetype']) ) {
- $obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
- }
- $options = $obj->getVar('field_options');
-
- if ( isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions']) ) {
- foreach ($_REQUEST['removeOptions'] as $index ) {
- unset($options[$index]);
+ $redirect_to_edit = false;
+ if (isset($_REQUEST['id'])) {
+ $obj =& $profilefield_handler->get($_REQUEST['id']);
+ if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
+ redirect_header('admin.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
}
+ } else {
+ $obj =& $profilefield_handler->create();
+ $obj->setVar('field_name', $_REQUEST['field_name']);
+ $obj->setVar('field_moduleid', $GLOBALS['xoopsModule']->getVar('mid'));
+ $obj->setVar('field_show', 1);
+ $obj->setVar('field_edit', 1);
+ $obj->setVar('field_config', 1);
$redirect_to_edit = true;
}
-
- if ( !empty($_REQUEST['addOption']) ) {
- foreach ($_REQUEST['addOption'] as $option ) {
- if ( empty($option['value']) ) continue;
- $options[$option['key']] = $option['value'];
+ $obj->setVar('field_title', $_REQUEST['field_title']);
+ $obj->setVar('field_description', $_REQUEST['field_description']);
+ if ($obj->getVar('field_config')) {
+ $obj->setVar('field_type', $_REQUEST['field_type']);
+ if (isset($_REQUEST['field_valuetype'])) {
+ $obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
+ }
+ $options = $obj->getVar('field_options');
+
+ if (isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions'])) {
+ foreach ($_REQUEST['removeOptions'] as $index) {
+ unset($options[$index]);
+ }
$redirect_to_edit = true;
}
+
+ if (!empty($_REQUEST['addOption'])) {
+ foreach ($_REQUEST['addOption'] as $option) {
+ if (empty($option['value'])) continue;
+ $options[$option['key']] = $option['value'];
+ $redirect_to_edit = true;
+ }
+ }
+ $obj->setVar('field_options', $options);
}
- $obj->setVar('field_options', $options);
- }
- if ( $obj->getVar('field_edit') ) {
- $required = isset($_REQUEST['field_required']) ? $_REQUEST['field_required'] : 0;
- $obj->setVar('field_required', $required); //0 = no, 1 = yes
- if ( isset($_REQUEST['field_maxlength']) ) {
- $obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
- }
- if ( isset($_REQUEST['field_default']) ) {
- $field_default = $obj->getValueForSave($_REQUEST['field_default']);
- //Check for multiple selections
- if ( is_array($field_default) ) {
- $obj->setVar('field_default', serialize($field_default) );
- } else {
- $obj->setVar('field_default', $field_default);
+ if ($obj->getVar('field_edit')) {
+ $required = isset($_REQUEST['field_required']) ? $_REQUEST['field_required'] : 0;
+ $obj->setVar('field_required', $required); //0 = no, 1 = yes
+ if (isset($_REQUEST['field_maxlength'])) {
+ $obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
}
+ if (isset($_REQUEST['field_default'])) {
+ $field_default = $obj->getValueForSave($_REQUEST['field_default']);
+ //Check for multiple selections
+ if (is_array($field_default)) {
+ $obj->setVar('field_default', serialize($field_default));
+ } else {
+ $obj->setVar('field_default', $field_default);
+ }
+ }
}
- }
- if ( $obj->getVar('field_show') ) {
- $obj->setVar('field_weight', $_REQUEST['field_weight']);
- $obj->setVar('cat_id', $_REQUEST['field_category']);
- }
- if ( /*$obj->getVar('field_edit') && */isset($_REQUEST['step_id']) ) {
- $obj->setVar('step_id', $_REQUEST['step_id']);
- }
- if ( $profilefield_handler->insert($obj) ) {
- $groupperm_handler =& xoops_gethandler('groupperm');
-
- $perm_arr = array();
- if ( $obj->getVar('field_show') ) {
- $perm_arr[] = 'profile_show';
- $perm_arr[] = 'profile_visible';
+ if ($obj->getVar('field_show')) {
+ $obj->setVar('field_weight', $_REQUEST['field_weight']);
+ $obj->setVar('cat_id', $_REQUEST['field_category']);
}
- if ( $obj->getVar('field_edit') ) {
- $perm_arr[] = 'profile_edit';
+ if ( /*$obj->getVar('field_edit') && */isset($_REQUEST['step_id']) ) {
+ $obj->setVar('step_id', $_REQUEST['step_id']);
}
- if ( $obj->getVar('field_edit') || $obj->getVar('field_show') ) {
- $perm_arr[] = 'profile_search';
- }
- if ( count($perm_arr) > 0 ) {
- foreach ($perm_arr as $perm ) {
- $criteria = new CriteriaCompo(new Criteria('gperm_name', $perm) );
- $criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id') )) );
- $criteria->add(new Criteria('gperm_modid', intval($GLOBALS['xoopsModule']->getVar('mid') )) );
- if ( isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm]) ) {
- $perms = $groupperm_handler->getObjects($criteria);
- if ( count($perms) > 0 ) {
- foreach (array_keys($perms) as $i ) {
- $groups[$perms[$i]->getVar('gperm_groupid')] =& $perms[$i];
+ if ($profilefield_handler->insert($obj)) {
+ $groupperm_handler =& xoops_gethandler('groupperm');
+
+ $perm_arr = array();
+ if ($obj->getVar('field_show')) {
+ $perm_arr[] = 'profile_show';
+ $perm_arr[] = 'profile_visible';
+ }
+ if ($obj->getVar('field_edit')) {
+ $perm_arr[] = 'profile_edit';
+ }
+ if ($obj->getVar('field_edit') || $obj->getVar('field_show')) {
+ $perm_arr[] = 'profile_search';
+ }
+ if (count($perm_arr) > 0) {
+ foreach ($perm_arr as $perm) {
+ $criteria = new CriteriaCompo(new Criteria('gperm_name', $perm));
+ $criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id'))));
+ $criteria->add(new Criteria('gperm_modid', intval($GLOBALS['xoopsModule']->getVar('mid'))));
+ if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
+ $perms = $groupperm_handler->getObjects($criteria);
+ if (count($perms) > 0) {
+ foreach (array_keys($perms) as $i) {
+ $groups[$perms[$i]->getVar('gperm_groupid')] =& $perms[$i];
+ }
+ } else {
+ $groups = array();
}
+ foreach ($_REQUEST[$perm] as $groupid) {
+ $groupid = intval($groupid);
+ if (!isset($groups[$groupid])) {
+ $perm_obj =& $groupperm_handler->create();
+ $perm_obj->setVar('gperm_name', $perm);
+ $perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id')));
+ $perm_obj->setVar('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid'));
+ $perm_obj->setVar('gperm_groupid', $groupid);
+ $groupperm_handler->insert($perm_obj);
+ unset($perm_obj);
+ }
+ }
+ $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
+ if (count($removed_groups) > 0) {
+ $criteria->add(new Criteria('gperm_groupid', "(" . implode(',', $removed_groups) . ")", "IN"));
+ $groupperm_handler->deleteAll($criteria);
+ }
+ unset($groups);
+
} else {
- $groups = array();
- }
- foreach ($_REQUEST[$perm] as $groupid ) {
- $groupid = intval($groupid);
- if ( !isset($groups[$groupid]) ) {
- $perm_obj =& $groupperm_handler->create();
- $perm_obj->setVar('gperm_name', $perm);
- $perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id') ));
- $perm_obj->setVar('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid') );
- $perm_obj->setVar('gperm_groupid', $groupid);
- $groupperm_handler->insert($perm_obj);
- unset($perm_obj);
- }
- }
- $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
- if ( count($removed_groups) > 0 ) {
- $criteria->add(new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN") );
$groupperm_handler->deleteAll($criteria);
}
- unset($groups);
-
- } else {
- $groupperm_handler->deleteAll($criteria);
+ unset($criteria);
}
- unset($criteria);
}
+ $url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
+ redirect_header($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD));
}
- $url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
- redirect_header($url, 3, sprintf(_PROFILE_AM_SAVEDSUCCESS, _PROFILE_AM_FIELD) );
- }
- include_once('../include/forms.php');
- echo $obj->getHtmlErrors();
- $form = profile_getFieldForm($obj);
- $form->display();
- break;
+ include_once('../include/forms.php');
+ echo $obj->getHtmlErrors();
+ $form = profile_getFieldForm($obj);
+ $form->display();
+ break;
-case "delete":
- $obj =& $profilefield_handler->get($_REQUEST['id']);
- if ( !$obj->getVar('field_config') ) {
- redirect_header('index.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
- }
- if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) {
- if ( !$GLOBALS['xoopsSecurity']->check() ) {
- redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+ case "delete":
+ $obj =& $profilefield_handler->get($_REQUEST['id']);
+ if (!$obj->getVar('field_config')) {
+ redirect_header('index.php', 2, _PROFILE_AM_FIELDNOTCONFIGURABLE);
}
- if ( $profilefield_handler->delete($obj) ) {
- redirect_header('field.php', 3, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_FIELD) );
+ if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if ($profilefield_handler->delete($obj)) {
+ redirect_header('field.php', 3, sprintf(_PROFILE_AM_DELETEDSUCCESS, _PROFILE_AM_FIELD));
+ } else {
+ echo $obj->getHtmlErrors();
+ }
} else {
- echo $obj->getHtmlErrors();
+ xoops_confirm(array('ok' => 1,'id' => $_REQUEST['id'],'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title')));
}
- } else {
- xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_PROFILE_AM_RUSUREDEL, $obj->getVar('field_title') ));
- }
- break;
+ break;
+
+ case 'toggle':
+ if (isset($_REQUEST['field_id'])) {
+ $field_id=$_REQUEST['field_id'];
+ if (isset($_REQUEST['field_required'])) {
+ $field_required = isset($_GET['field_required']) ? intval($_GET['field_required']) : (isset($_POST['field_required']) ? intval($_POST['field_required']) : 0);
+ profile_visible_toggle($field_id, $field_required);
+ redirect_header('field.php', 1, _PROFILE_AM_REQUIRED_TOGGLE_SUCCESS);
+ break;
+ }
+ }
}
-if ( isset($template_main) ) {
+if (isset($template_main)) {
$GLOBALS['xoopsTpl']->display("db:{$template_main}");
}
+
+function profile_visible_toggle($field_id, $field_required)
+{
+ $field_required = ($field_required == 1) ? 0 : 1;
+ $this_handler =& xoops_getModuleHandler('field', 'profile');
+ $obj = $this_handler->get($field_id);
+ $obj->setVar('field_required', intval($field_required));
+ $this_handler->insert($obj,true);
+}
+
+
include 'admin_footer.php';
//xoops_cp_footer();
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/docs/changelog.txt 2012-03-26 09:47:45 UTC (rev 9198)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/docs/changelog.txt 2012-03-26 11:00:43 UTC (rev 9199)
@@ -1,3 +1,7 @@
+Version 1.63
+-------------------
+- added "Required" column in Fields with Toggle functionality (mamba)
+
Version 1.62 RC
-------------------
- umode has wrong fieldtype, should be a string (trabis)
Added: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/images/actions/0.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/images/actions/0.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/images/actions/1.png
===================================================================
(Binary files differ)
Property changes on: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/images/actions/1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/language/english/admin.php 2012-03-26 09:47:45 UTC (rev 9198)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/language/english/admin.php 2012-03-26 11:00:43 UTC (rev 9199)
@@ -112,4 +112,9 @@
define("_PROFILE_AM_STEPINTRO", "Step description");
//1.62
define('_PROFILE_AM_ACTION', 'Action');
+//1.63
+define('_PROFILE_AM_REQUIRED_TOGGLE', 'Toggle Required');
+define('_PROFILE_AM_REQUIRED_TOGGLE_SUCCESS', 'Successfully Changed Required Field ');
+
+
?>
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/templates/profile_admin_fieldlist.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/templates/profile_admin_fieldlist.html 2012-03-26 09:47:45 UTC (rev 9198)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/profile/templates/profile_admin_fieldlist.html 2012-03-26 11:00:43 UTC (rev 9199)
@@ -7,6 +7,7 @@
<th><{$smarty.const._PROFILE_AM_TYPE}></th>
<th><{$smarty.const._PROFILE_AM_CATEGORY}></th>
<th><{$smarty.const._PROFILE_AM_WEIGHT}></th>
+ <th><{$smarty.const._PROFILE_AM_REQUIRED}></th>
<th><{$smarty.const._PROFILE_AM_ACTION}></th>
<{foreach item=category from=$fieldcategories}>
<{foreach item=field from=$category}>
@@ -25,6 +26,15 @@
<input type="text" name="weight[<{$field.field_id}>]" size="5" maxlength="5" value="<{$field.field_weight}>" />
<{/if}>
</td>
+
+ <!-- ___________adding "Required" status" //mb -->
+ <td align="center">
+ <{if $field.canEdit}>
+ <a href="field.php?op=toggle&field_required=<{$field.field_required}>&field_id=<{$field.field_id}>"><img src="<{$xoops_url}>/modules/profile/images/actions/<{$field.field_required}>.png" title="<{$smarty.const._PROFILE_AM_REQUIRED_TOGGLE}>" alt="<{$smarty.const._PROFILE_AM_REQUIRED_TOGGLE}>" /></a>
+ <{/if}>
+ </td>
+ <!-- end __________"Required" status" //mb -->
+
<td align= "center">
<{if $field.canEdit}>
<input type="hidden" name="oldweight[<{$field.field_id}>]" value="<{$field.field_weight}>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
