[xoops-svn] SF.net SVN: xoops-svn:[10386] XoopsCore/branches/2.6.x/2.6.0

[<tr...@us...>]

Revision: 10386
          http://sourceforge.net/p/xoops/svn/10386
Author:   trabis
Date:     2012-12-14 00:09:21 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Adding tabbed preferences for modules/system

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/simpleform.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/tableform.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/language/english/modinfo.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php

Added Paths:
-----------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php

Modified: XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/docs/changelog.26.txt	2012-12-14 00:09:21 UTC (rev 10386)
@@ -5,8 +5,7 @@
 ===============================
 Updating cache engines (trabis)
 Adding Xoops_Highlighter class (trabis)
-Adding Xoops_Debug class (trabis)
-Adding Xoops_Pdf class and htm2pdf (trabis)
+Adding support for module tabbed preferences (trabis)
 
 ===============================
 2012/08: Version 2.6.0 Alpha 1

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/simpleform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/simpleform.php	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/simpleform.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -29,6 +29,19 @@
 class XoopsSimpleForm extends XoopsForm
 {
     /**
+     * Insert an empty row in the table to serve as a separator.
+     *
+     * @param string $extra not in use.
+     * @param string $class not in use
+     */
+    public function insertBreak($extra = '', $class = '')
+    {
+        $value = '</ br>';
+        $ele = new XoopsFormRaw($value);
+        $this->addElement($ele);
+    }
+
+    /**
      * create HTML to output the form with minimal formatting
      *
      * @return string

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/tableform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/tableform.php	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/tableform.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -30,6 +30,19 @@
 class XoopsTableForm extends XoopsForm
 {
     /**
+     * Insert an empty row in the table to serve as a separator.
+     *
+     * @param string $extra not in use.
+     * @param string $class not in use
+     */
+    public function insertBreak($extra = '', $class = '')
+    {
+        $value = '<tr valign="top" align="left"><td></td></tr>';
+        $ele = new XoopsFormRaw($value);
+        $this->addElement($ele);
+    }
+
+    /**
      * create HTML to output the form as a table
      *
      * @return string

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/xoopsform/themeform.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -30,7 +30,7 @@
 class XoopsThemeForm extends XoopsForm
 {
     /**
-     * Insert an empty row in the table to serve as a seperator.
+     * Insert an empty row in the table to serve as a separator.
      *
      * @param string $extra HTML to be displayed in the empty row.
      * @param string $class CSS class name for <td> tag

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/language/english/modinfo.php	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/language/english/modinfo.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -277,10 +277,8 @@
 
 define("_MI_PUBLISHER_CONFCAT_FORMAT", "Format");
 define("_MI_PUBLISHER_CONFCAT_FORMAT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_PRINT", "Print page");
+define("_MI_PUBLISHER_CONFCAT_PRINT", "Print");
 define("_MI_PUBLISHER_CONFCAT_PRINT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_OTHERS", "Others");
-define("_MI_PUBLISHER_CONFCAT_OTHERS_DSC", "");
 
 define("_MI_PUBLISHER_CONFCAT_PERMISSIONS", "Permissions");
 define("_MI_PUBLISHER_CONFCAT_PERMISSIONS_DSC", "");
@@ -300,17 +298,17 @@
 define("_MI_PUBLISHER_CATEGORY_ITEMS_SEL", "Category items select");
 define("_MI_PUBLISHER_CATEGORY_ITEMS_SEL_DSC", "Shows a drop down select box with items grouped by category");
 
-define("_MI_PUBLISHER_CONFCAT_INDEX", "Index page");
+define("_MI_PUBLISHER_CONFCAT_INDEX", "Index");
 define("_MI_PUBLISHER_CONFCAT_INDEX_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_CATEGORY", "Category page");
+define("_MI_PUBLISHER_CONFCAT_CATEGORY", "Category");
 define("_MI_PUBLISHER_CONFCAT_CATEGORY_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_ITEM", "Item page");
+define("_MI_PUBLISHER_CONFCAT_ITEM", "Item");
 define("_MI_PUBLISHER_CONFCAT_ITEM_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_SUBMIT", "Submit page");
+define("_MI_PUBLISHER_CONFCAT_SUBMIT", "Submit");
 define("_MI_PUBLISHER_CONFCAT_SUBMIT_DSC", "Submit page layout and form default values");
-define("_MI_PUBLISHER_CONFCAT_INDEXCAT", "Index and category pages");
+define("_MI_PUBLISHER_CONFCAT_INDEXCAT", "Index and category");
 define("_MI_PUBLISHER_CONFCAT_INDEXCAT_DSC", "");
-define("_MI_PUBLISHER_CONFCAT_SEARCH", "Search page");
+define("_MI_PUBLISHER_CONFCAT_SEARCH", "Search");
 define("_MI_PUBLISHER_CONFCAT_SEARCH_DSC", "");
 
 define("_MI_PUBLISHER_SEO_METAKEYWORDS", "Meta Keywords");

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/publisher/xoops_version.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -767,7 +767,7 @@
 $i++;
 $modversion['config'][$i]['name'] = 'submit_editor_cols';
 $modversion['config'][$i]['title'] = '_MI_PUBLISHER_EDITOR_COLS';
-$modversion['config'][$i]['description'] = '_MI_PUBLISHER_EDITOR_COlS_DSC';
+$modversion['config'][$i]['description'] = '_MI_PUBLISHER_EDITOR_COLS_DSC';
 $modversion['config'][$i]['formtype'] = 'textbox';
 $modversion['config'][$i]['valuetype'] = 'text';
 $modversion['config'][$i]['default'] = '60';

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -102,9 +102,9 @@
         $admin_page->addBreadcrumbLink($module->getVar('name'));
         $admin_page->renderBreadcrumb();
 
-        /* @var $form SystemPreferenceForm */
-        $form = $xoops->getModuleForm(null, 'preference');
-        $form->getModuleForm($config, $module);
+        /* @var $form SystemModulepreferenceForm */
+        $form = $xoops->getModuleForm(null, 'modulepreference');
+        $form->getForm($config, $module);
         $xoops->tpl()->assign('form', $form->render());
         break;
 

Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -0,0 +1,216 @@
+<?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.
+*/
+
+/**
+ * Preference Form Class
+ *
+ * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @author          Andricq Nicolas (AKA MusS)
+ * @author          trabis <lus...@gm...>
+ * @package         system
+ * @subpackage      preferences
+ * @version         $Id$
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+class SystemModulepreferenceForm extends XoopsSimpleForm
+{
+    /**
+     * @param null $obj
+     */
+    public function __construct($obj = null)
+    {
+    }
+
+    /**
+     * @param $obj
+     * @param XoopsModule|XoopsObject $mod
+     * @return void
+     */
+    public function getForm(&$obj, XoopsModule &$mod)
+    {
+        $xoops = Xoops::getInstance();
+        $config_handler = $xoops->getHandlerConfig();
+
+        parent::__construct('', 'pref_form', 'admin.php?fct=preferences', 'post', true);
+        if ($mod->getVar('dirname') != 'system') {
+            $xoops->loadLanguage('modinfo', $mod->getVar('dirname'));
+        }
+        $configs = $mod->getInfo('config');
+        $configNames = array();
+        foreach (array_keys($configs) as $i) {
+            $configNames[$configs[$i]['name']] =& $configs[$i];
+        }
+        $configCats = $mod->getInfo('configcat');
+        if (!$configCats) {
+            $configCats = array(
+                'default' => array(
+                        'name' => _MD_AM_MODCONFIG,
+                        'description'=> ''
+                    )
+                );
+        }
+
+        if (!in_array('default', array_keys($configCats))) {
+            $configCats['default'] = array(
+                        'name' => _MD_AM_MODCONFIG,
+                        'description'=> ''
+                    );
+        }
+
+        foreach (array_keys($configNames) as $name) {
+            if (!isset($configNames[$name]['category'])) {
+                $configNames[$name]['category'] = 'default';
+            }
+        }
+
+        $tabtray = new XoopsFormTabTray('', 'pref_tabtay','redmond' );
+        $tabs = array();
+        foreach ($configCats as $name => $info) {
+            $tabs[$name] = new XoopsFormTab($info['name'], 'pref_tab_' . $name);
+            if(isset($info['description']) && $info['description'] != '') {
+                $tabs[$name]->addElement(new XoopsFormLabel('', $info['description']));
+            }
+        }
+
+        // if has comments feature, need comment lang file
+        if ($mod->getVar('hascomments') == 1) {
+            $xoops->loadLanguage('comment');
+        }
+        // RMV-NOTIFY
+        // if has notification feature, need notification lang file
+        if ($mod->getVar('hasnotification') == 1) {
+            $xoops->loadLanguage('notification');
+        }
+
+        //$modname = $module->getVar('name');
+        if (!empty($_REQUEST["redirect"])) {
+            $myts = MyTextSanitizer::getInstance();
+            $this->addElement(new XoopsFormHidden('redirect', $myts->htmlspecialchars($_REQUEST["redirect"])));
+        } elseif ($mod->getInfo('adminindex')) {
+            $this->addElement(new XoopsFormHidden('redirect', XOOPS_URL . '/modules/' . $mod->getVar('dirname') . '/' . $mod->getInfo('adminindex')));
+        }
+        $count = count($obj);
+        for ($i = 0; $i < $count; $i++) {
+            $title = constant($obj[$i]->getVar('conf_title'));
+            $desc = ($obj[$i]->getVar('conf_desc') != '') ? constant($obj[$i]->getVar('conf_desc')) : '';
+            switch ($obj[$i]->getVar('conf_formtype')) {
+
+                case 'textarea':
+                    $myts = MyTextSanitizer::getInstance();
+                    if ($obj[$i]->getVar('conf_valuetype') == 'array') {
+                        // this is exceptional.. only when value type is arrayneed a smarter way for this
+                        $ele = ($obj[$i]->getVar('conf_value') != '')
+                                ? new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $obj[$i]->getConfValueForOutput())), 5, 5)
+                                : new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), '', 5, 5);
+                    } else {
+                        $ele = new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()), 5, 5);
+                    }
+                    break;
+
+                case 'select':
+                    $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
+                    $options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
+                    $opcount = count($options);
+                    for ($j = 0; $j < $opcount; $j++) {
+                        $optval = defined($options[$j]->getVar('confop_value'))
+                                ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
+                        $optkey = defined($options[$j]->getVar('confop_name'))
+                                ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+                        $ele->addOption($optval, $optkey);
+                    }
+                    break;
+
+                case 'select_multi':
+                    $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), 5, true);
+                    $options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
+                    $opcount = count($options);
+                    for ($j = 0; $j < $opcount; $j++) {
+                        $optval = defined($options[$j]->getVar('confop_value'))
+                                ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
+                        $optkey = defined($options[$j]->getVar('confop_name'))
+                                ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+                        $ele->addOption($optval, $optkey);
+                    }
+                    break;
+
+                case 'yesno':
+                    $ele = new XoopsFormRadioYN($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), _YES, _NO);
+                    break;
+
+                case 'group':
+                    $ele = new XoopsFormSelectGroup($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 1, false);
+                    break;
+
+                case 'group_multi':
+                    $ele = new XoopsFormSelectGroup($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 5, true);
+                    break;
+
+                // RMV-NOTIFY: added 'user' and 'user_multi'
+                case 'user':
+                    $ele = new XoopsFormSelectUser($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 1, false);
+                    break;
+
+                case 'user_multi':
+                    $ele = new XoopsFormSelectUser($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 5, true);
+                    break;
+
+                case 'password':
+                    $myts = MyTextSanitizer::getInstance();
+                    $ele = new XoopsFormPassword($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+                    break;
+
+                case 'color':
+                    $myts = MyTextSanitizer::getInstance();
+                    $ele = new XoopsFormColorPicker($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+                    break;
+
+                case 'hidden':
+                    $myts = MyTextSanitizer::getInstance();
+                    $ele = new XoopsFormHidden($obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+                    break;
+
+                case 'textbox':
+                default:
+                    $myts = MyTextSanitizer::getInstance();
+                    $ele = new XoopsFormText($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
+                    break;
+
+            }
+            $hidden = new XoopsFormHidden('conf_ids[]', $obj[$i]->getVar('conf_id'));
+            if (isset($ele)) {
+                $ele->setDescription($desc);
+                if ($obj[$i]->getVar('conf_formtype') != 'hidden') {
+                    $name = 'default';
+                    if (isset($configNames[$obj[$i]->getVar('conf_name')]['category'])) {
+                        $name = $configNames[$obj[$i]->getVar('conf_name')]['category'];
+                    }
+                    $tabs[$name]->addElement($ele);
+                } else {
+                    $this->addElement($ele);
+                }
+                $this->addElement($hidden);
+                unset($ele);
+                unset($hidden);
+            }
+        }
+        foreach (array_keys($tabs) as $name) {
+            if ($tabs[$name]->getElements()) {
+                $tabtray->addElement($tabs[$name]);
+            }
+        }
+        $this->addElement($tabtray);
+        $this->addElement(new XoopsFormHidden('op', 'save'));
+        $this->addElement(new XoopsFormButton('', 'button', _SUBMIT, 'submit'));
+    }
+}


Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Author Date Id Rev URL
Added: svn:eol-style
   + native

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -228,138 +228,4 @@
         $this->addElement(new XoopsFormHidden('op', 'save'));
         $this->addElement(new XoopsFormButton('', 'button', _SUBMIT, 'submit'));
     }
-
-    /**
-     * @param $obj
-     * @param XoopsModule|XoopsObject $mod
-     * @return void
-     */
-    public function getModuleForm(&$obj, XoopsModule &$mod)
-    {
-        $xoops = Xoops::getInstance();
-        $config_handler = $xoops->getHandlerConfig();
-
-        parent::__construct(_MD_AM_MODCONFIG, 'pref_form', 'admin.php?fct=preferences', 'post', true);
-
-        // if has comments feature, need comment lang file
-        if ($mod->getVar('hascomments') == 1) {
-            $xoops->loadLanguage('comment');
-        }
-        // RMV-NOTIFY
-        // if has notification feature, need notification lang file
-        if ($mod->getVar('hasnotification') == 1) {
-            $xoops->loadLanguage('notification');
-        }
-
-        //$modname = $module->getVar('name');
-        if (!empty($_REQUEST["redirect"])) {
-            $myts = MyTextSanitizer::getInstance();
-            $this->addElement(new XoopsFormHidden('redirect', $myts->htmlspecialchars($_REQUEST["redirect"])));
-        } elseif ($mod->getInfo('adminindex')) {
-            $this->addElement(new XoopsFormHidden('redirect', XOOPS_URL . '/modules/' . $mod->getVar('dirname') . '/' . $mod->getInfo('adminindex')));
-        }
-        $count = count($obj);
-        for ($i = 0; $i < $count; $i++) {
-            $title = constant($obj[$i]->getVar('conf_title'));
-            $desc = ($obj[$i]->getVar('conf_desc') != '') ? constant($obj[$i]->getVar('conf_desc')) : '';
-            switch ($obj[$i]->getVar('conf_formtype')) {
-
-                case 'textarea':
-                    $myts = MyTextSanitizer::getInstance();
-                    if ($obj[$i]->getVar('conf_valuetype') == 'array') {
-                        // this is exceptional.. only when value type is arrayneed a smarter way for this
-                        $ele = ($obj[$i]->getVar('conf_value') != '')
-                                ? new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars(implode('|', $obj[$i]->getConfValueForOutput())), 5, 5)
-                                : new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), '', 5, 5);
-                    } else {
-                        $ele = new XoopsFormTextArea($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()), 5, 5);
-                    }
-                    break;
-
-                case 'select':
-                    $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
-                    $options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
-                    $opcount = count($options);
-                    for ($j = 0; $j < $opcount; $j++) {
-                        $optval = defined($options[$j]->getVar('confop_value'))
-                                ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
-                        $optkey = defined($options[$j]->getVar('confop_name'))
-                                ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
-                        $ele->addOption($optval, $optkey);
-                    }
-                    break;
-
-                case 'select_multi':
-                    $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), 5, true);
-                    $options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
-                    $opcount = count($options);
-                    for ($j = 0; $j < $opcount; $j++) {
-                        $optval = defined($options[$j]->getVar('confop_value'))
-                                ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
-                        $optkey = defined($options[$j]->getVar('confop_name'))
-                                ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
-                        $ele->addOption($optval, $optkey);
-                    }
-                    break;
-
-                case 'yesno':
-                    $ele = new XoopsFormRadioYN($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), _YES, _NO);
-                    break;
-
-                case 'group':
-                    $ele = new XoopsFormSelectGroup($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 1, false);
-                    break;
-
-                case 'group_multi':
-                    $ele = new XoopsFormSelectGroup($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 5, true);
-                    break;
-
-                // RMV-NOTIFY: added 'user' and 'user_multi'
-                case 'user':
-                    $ele = new XoopsFormSelectUser($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 1, false);
-                    break;
-
-                case 'user_multi':
-                    $ele = new XoopsFormSelectUser($title, $obj[$i]->getVar('conf_name'), false, $obj[$i]->getConfValueForOutput(), 5, true);
-                    break;
-
-                case 'password':
-                    $myts = MyTextSanitizer::getInstance();
-                    $ele = new XoopsFormPassword($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
-                    break;
-
-                case 'color':
-                    $myts = MyTextSanitizer::getInstance();
-                    $ele = new XoopsFormColorPicker($title, $obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
-                    break;
-
-                case 'hidden':
-                    $myts = MyTextSanitizer::getInstance();
-                    $ele = new XoopsFormHidden($obj[$i]->getVar('conf_name'), $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
-                    break;
-
-                case 'line_break':
-                    $myts = MyTextSanitizer::getInstance();
-                    $this->insertBreak($title, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
-                    break;
-
-                case 'textbox':
-                default:
-                    $myts = MyTextSanitizer::getInstance();
-                    $ele = new XoopsFormText($title, $obj[$i]->getVar('conf_name'), 5, 255, $myts->htmlspecialchars($obj[$i]->getConfValueForOutput()));
-                    break;
-
-            }
-            $hidden = new XoopsFormHidden('conf_ids[]', $obj[$i]->getVar('conf_id'));
-            if (isset($ele)) {
-                $this->addElement($ele);
-                $ele->setDescription($desc);
-                $this->addElement($hidden);
-                unset($ele);
-                unset($hidden);
-            }
-        }
-        $this->addElement(new XoopsFormHidden('op', 'save'));
-        $this->addElement(new XoopsFormButton('', 'button', _SUBMIT, 'submit'));
-    }
 }

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php	2012-12-13 23:10:06 UTC (rev 10385)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php	2012-12-14 00:09:21 UTC (rev 10386)
@@ -190,21 +190,34 @@
 // Menu
 $modversion['hasMain'] = 0;
 
+// Config categories
+$i = 0;
+$modversion['configcat']['general']['name'] = _MI_SYSTEM_PREFERENCE_BREAK_GENERAL;
+$modversion['configcat']['general']['description'] = '';
+
+$i++;
+$modversion['configcat']['active']['name'] = _MI_SYSTEM_PREFERENCE_BREAK_ACTIVE;
+$modversion['configcat']['active']['description'] = '';
+
+$i++;
+$modversion['configcat']['pager']['name'] = _MI_SYSTEM_PREFERENCE_BREAK_PAGER;
+$modversion['configcat']['pager']['description'] = '';
+
+$i++;
+$modversion['configcat']['editor']['name'] = _MI_SYSTEM_PREFERENCE_BREAK_EDITOR;
+$modversion['configcat']['editor']['description'] = '';
+
+
 // Préférences
 $i = 0;
-$modversion['config'][$i]['name'] = 'break1';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_GENERAL';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'line_break';
-$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'break';
-$i++;
 $modversion['config'][$i]['name'] = 'usetips';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_TIPS';
 $modversion['config'][$i]['description'] = '_MI_SYSTEM_PREFERENCE_TIPS_DSC';
 $modversion['config'][$i]['formtype'] = 'yesno';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'general';
+
 $i++;
 $icons = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/icons');
 $modversion['config'][$i]['name'] = 'typeicons';
@@ -214,7 +227,8 @@
 $modversion['config'][$i]['valuetype'] = 'text';
 $modversion['config'][$i]['default'] = 'default';
 $modversion['config'][$i]['options'] = $icons;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'general';
+
 $i++;
 $breadcrumb = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/breadcrumb');
 $modversion['config'][$i]['name'] = 'typebreadcrumb';
@@ -224,7 +238,7 @@
 $modversion['config'][$i]['valuetype'] = 'text';
 $modversion['config'][$i]['default'] = 'default';
 $modversion['config'][$i]['options'] = $breadcrumb;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'general';
 $i++;
 $jquery_theme = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/css/ui');
 $modversion['config'][$i]['name'] = 'jquery_theme';
@@ -234,21 +248,17 @@
 $modversion['config'][$i]['valuetype'] = 'text';
 $modversion['config'][$i]['default'] = 'base';
 $modversion['config'][$i]['options'] = $jquery_theme;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'general';
+
 $i++;
-$modversion['config'][$i]['name'] = 'break2';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_ACTIVE';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'line_break';
-$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'break';
-$i++;
 $modversion['config'][$i]['name'] = 'active_blocksadmin';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN';
 $modversion['config'][$i]['description'] = '';
 $modversion['config'][$i]['formtype'] = 'hidden';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_comments';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_COMMENTS';
@@ -256,6 +266,8 @@
 $modversion['config'][$i]['formtype'] = 'yesno';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_filemanager';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER';
@@ -263,6 +275,8 @@
 $modversion['config'][$i]['formtype'] = 'hidden';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_groups';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_GROUPS';
@@ -270,6 +284,8 @@
 $modversion['config'][$i]['formtype'] = 'hidden';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_images';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES';
@@ -277,6 +293,8 @@
 $modversion['config'][$i]['formtype'] = 'yesno';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_modulesadmin';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN';
@@ -284,6 +302,8 @@
 $modversion['config'][$i]['formtype'] = 'hidden';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_preferences';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_PREFERENCES';
@@ -291,6 +311,8 @@
 $modversion['config'][$i]['formtype'] = 'hidden';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_tplsets';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS';
@@ -298,6 +320,8 @@
 $modversion['config'][$i]['formtype'] = 'hidden';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_users';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_USERS';
@@ -305,6 +329,8 @@
 $modversion['config'][$i]['formtype'] = 'yesno';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_extensions';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_EXTENSIONS';
@@ -312,6 +338,8 @@
 $modversion['config'][$i]['formtype'] = 'hidden';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
+$modversion['config'][$i]['category'] = 'active';
+
 $i++;
 $modversion['config'][$i]['name'] = 'active_themes';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_THEMES';
@@ -319,20 +347,18 @@
 $modversion['config'][$i]['formtype'] = 'yesno';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = '1';
+$modversion['config'][$i]['category'] = 'active';
+
+
 $i++;
-$modversion['config'][$i]['name'] = 'break3';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_PAGER';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'line_break';
-$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'break';
-$i++;
 $modversion['config'][$i]['name'] = 'comments_pager';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_COMMENTS_PAGER';
 $modversion['config'][$i]['description'] = '';
 $modversion['config'][$i]['formtype'] = 'textbox';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 20;
+$modversion['config'][$i]['category'] = 'pager';
+
 $i++;
 $modversion['config'][$i]['name'] = 'groups_pager';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_GROUPS_PAGER';
@@ -340,6 +366,8 @@
 $modversion['config'][$i]['formtype'] = 'textbox';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 15;
+$modversion['config'][$i]['category'] = 'pager';
+
 $i++;
 $modversion['config'][$i]['name'] = 'images_pager';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_IMAGES_PAGER';
@@ -347,6 +375,8 @@
 $modversion['config'][$i]['formtype'] = 'textbox';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 15;
+$modversion['config'][$i]['category'] = 'pager';
+
 $i++;
 $modversion['config'][$i]['name'] = 'users_pager';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_USERS_PAGER';
@@ -354,14 +384,9 @@
 $modversion['config'][$i]['formtype'] = 'textbox';
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 20;
+$modversion['config'][$i]['category'] = 'pager';
+
 $i++;
-$modversion['config'][$i]['name'] = 'break4';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_EDITOR';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'line_break';
-$modversion['config'][$i]['valuetype'] = 'textbox';
-$modversion['config'][$i]['default'] = 'break';
-$i++;
 $editors = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/class/xoopseditor');
 $modversion['config'][$i]['name'] = 'blocks_editor';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR';
@@ -370,7 +395,8 @@
 $modversion['config'][$i]['valuetype'] = 'text';
 $modversion['config'][$i]['default'] = 'dhtmltextarea';
 $modversion['config'][$i]['options'] = $editors;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'editor';
+
 $i++;
 $modversion['config'][$i]['name'] = 'comments_editor';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR';
@@ -379,7 +405,8 @@
 $modversion['config'][$i]['valuetype'] = 'text';
 $modversion['config'][$i]['default'] = 'dhtmltextarea';
 $modversion['config'][$i]['options'] = $editors;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'editor';
+
 $i++;
 $modversion['config'][$i]['name'] = 'general_editor';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR';
@@ -388,7 +415,8 @@
 $modversion['config'][$i]['valuetype'] = 'text';
 $modversion['config'][$i]['default'] = 'dhtmltextarea';
 $modversion['config'][$i]['options'] = $editors;
-$modversion['config'][$i]['category'] = 'global';
+$modversion['config'][$i]['category'] = 'editor';
+
 $i++;
 $modversion['config'][$i]['name'] = 'redirect';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_REDIRECT';
@@ -396,6 +424,7 @@
 $modversion['config'][$i]['formtype'] = 'hidden';
 $modversion['config'][$i]['valuetype'] = 'textbox';
 $modversion['config'][$i]['default'] = 'admin.php?fct=preferences';
+
 $i++;
 $modversion['config'][$i]['name'] = 'com_anonpost';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ANONPOST';