[xoops-svn] SF.net SVN: xoops-svn:[10598] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /system

[<du...@us...>]

Revision: 10598
          http://sourceforge.net/p/xoops/svn/10598
Author:   dugris
Date:     2012-12-29 02:12:09 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
delete unnecessary things
USE : Xoops::getInstance()->>isActiveModule('dirname')
ADD : configuration options in each module

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php

Removed Paths:
-------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php	2012-12-29 02:00:28 UTC (rev 10597)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php	2012-12-29 02:12:09 UTC (rev 10598)
@@ -27,20 +27,14 @@
 define("_MI_SYSTEM_BNAME13", "Themes");
 
 // Names of admin menu items
-define("_MI_SYSTEM_ADMENU1","Banners");
 define("_MI_SYSTEM_ADMENU2","Blocks");
 define("_MI_SYSTEM_ADMENU3","Groups");
 define("_MI_SYSTEM_ADMENU5","Modules");
 define("_MI_SYSTEM_ADMENU6","Preferences");
-define("_MI_SYSTEM_ADMENU7","Smilies");
-define("_MI_SYSTEM_ADMENU9","User Ranks");
 define("_MI_SYSTEM_ADMENU10","Edit User");
-define("_MI_SYSTEM_ADMENU11","Email Users");
 define("_MI_SYSTEM_ADMENU12", "Find Users");
 define("_MI_SYSTEM_ADMENU13", "Images");
-define("_MI_SYSTEM_ADMENU14", "Avatars");
 define("_MI_SYSTEM_ADMENU15", "Templates");
-define("_MI_SYSTEM_ADMENU16", "Comments");
 
 //Site preference
 define("_MI_SYSTEM_GENERAL", "General Settings");
@@ -94,7 +88,6 @@
 define("_MI_SYSTEM_PREFERENCE_BREAK_ACTIVE","Active Section");
 
 define("_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_COMMENTS","Active Comments");
 define("_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER","Active File Manager");
 define("_MI_SYSTEM_PREFERENCE_ACTIVE_GROUPS","");
 define("_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES","Active Images Manager");
@@ -106,7 +99,6 @@
 define("_MI_SYSTEM_PREFERENCE_ACTIVE_THEMES","Themes");
 
 define("_MI_SYSTEM_PREFERENCE_BREAK_PAGER","Number of rows to display in the administration");
-define("_MI_SYSTEM_PREFERENCE_COMMENTS_PAGER","Number of comments to display per page");
 define("_MI_SYSTEM_PREFERENCE_GROUPS_PAGER","Number of groups to display per page");
 define("_MI_SYSTEM_PREFERENCE_IMAGES_PAGER","Number of images to display per page");
 define("_MI_SYSTEM_PREFERENCE_USERS_PAGER","Number of users to display per page");
@@ -125,13 +117,4 @@
 
 //2.6.0 Alpha 2
 
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_AVATARS","Active Avatars");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_BANNERS","Active Banners");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_MAILUSERS","Active Mail Users");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_MAINTENANCE","Active Maintenance");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_SMILIES","Active Smilies");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_USERRANK","Active User Rank");
-define("_MI_SYSTEM_PREFERENCE_AVATARS_PAGER","Avatars Pager");
-define("_MI_SYSTEM_PREFERENCE_BANNERS_PAGER","Banner Pager");
-define("_MI_SYSTEM_PREFERENCE_SMILIES_PAGER","Smilies Pager");
 define("_MI_SYSTEM_PREFERENCE_USERRANKS_PAGER","User Rank Pager");
\ No newline at end of file

Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php	2012-12-29 02:00:28 UTC (rev 10597)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/testform.php	2012-12-29 02:12:09 UTC (rev 10598)
@@ -1,142 +0,0 @@
-<?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.
-*/
-
-/**
- * Form Test
- *
- * @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         test
- * @since           2.6.0
- * @author          Mage Gr\xE9gory (AKA Mage)
- * @version         $Id$
- */
-include dirname(__FILE__) . '/header.php';
-$xoops->header();
-// Form Horizontal
-$form = new XoopsThemeForm('Form Horizontal', 'form_horizontal', 'testform.php', 'post', true, 'horizontal');
-
-$code = new XoopsFormText('Code', 'code', 2, 25, '','Code...');
-$code->setDescription('Description code');
-$code->setPattern('^.{3,}$', 'You need at least 3 characters');
-$code->setDatalist(array('list 1','list 2','list 3'));
-$form->addElement($code, true);
-
-$password = new XoopsFormPassword('Password', 'password', 3, 25, '', false, 'Your Password');
-$password->setDescription('Description password');
-$password->setPattern('^.{8,}$', 'You need at least 8 characters');
-$form->addElement($password, true);
-
-$description = new XoopsFormTextArea('Description', 'description', '', 5, 6, 'Your description');
-$description->setDescription('Put the description');
-$form->addElement($description, true);
-
-$description_2 = new XoopsFormDhtmlTextArea('Description_2', 'description_2', '', 6, 7);
-$description_2->setDescription('Put the description_2');
-$form->addElement($description_2, true);
-
-
-$form->addElement(new XoopsFormRadioYN('Yes or No', 'yesorno', 0), false);
-
-$radio_inline = new XoopsFormRadio('Radio Inline', 'radio_inline', 1, true);
-$radio_inline->addOption(1, 'Radio Inline 1');
-$radio_inline->addOption(2, 'Radio Inline 2');
-$radio_inline->addOption(3, 'Radio Inline 3');
-$radio_inline->setDescription('Description Radio Inline');
-$form->addElement($radio_inline, false);
-
-$radio = new XoopsFormRadio('Radio', 'radio', 2, false);
-$radio->addOption(1, 'Radio 1');
-$radio->addOption(2, 'Radio 2');
-$radio->addOption(3, 'Radio 3');
-$radio->setDescription('Description Radio');
-$form->addElement($radio, false);
-
-$checkbox_inline = new XoopsFormCheckbox('Checkbox Inline', 'checkbox_inline', 1, true);
-$checkbox_inline->addOption(1, 'Checkbox Inline 1');
-$checkbox_inline->addOption(2, 'Checkbox Inline 2');
-$checkbox_inline->addOption(3, 'Checkbox Inline 3');
-$checkbox_inline->setDescription('Description Checkbox Inline');
-$form->addElement($checkbox_inline, true);
-
-$checkbox = new XoopsFormCheckbox('Checkbox', 'checkbox', 2, false);
-$checkbox->addOption(1, 'Checkbox 1');
-$checkbox->addOption(2, 'Checkbox 2');
-$checkbox->addOption(3, 'Checkbox 3');
-$checkbox->setDescription('Description Checkbox');
-$form->addElement($checkbox, true);
-
-$label= new XoopsFormLabel('Label', 'label', 'label');
-$label->setDescription('Description Label');
-$form->addElement($label, true);
-
-
-$color = new XoopsFormColorPicker('Color', 'color');
-$color->setDescription('Description Color');
-$form->addElement($color, true);
-
-$file = new XoopsFormFile('File', 'file', 500000);
-$file->setDescription('Description File');
-$form->addElement($file, true);
-
-$select = new XoopsFormSelect('Select', 'select', '', 1, false);
-$select->addOption(1, 'Select 1');
-$select->addOption(2, 'Select 2');
-$select->addOption(3, 'Select 3');
-$select->setDescription('Description Select');
-$select->setClass('span2');
-$form->addElement($select, true);
-
-$select_optgroup = new XoopsFormSelect('Select Optgroup', 'select_optgroup', '', 1, false);
-$select_optgroup->addOptgroup('Swiss', array(1 => 'Geneva', 2 => 'Bern', 3 => 'Zurich'));
-$select_optgroup->addOptgroup('France', array(4 => 'Paris', 5 => 'Lyon', 6 => 'Grenoble', 7 => 'Marseille'));
-$select_optgroup->setDescription('Description Select Optgroup');
-$select_optgroup->setClass('span3');
-$form->addElement($select_optgroup, true);
-
-$date = new XoopsFormTextDateSelect('Date', 'date', 2,'','Date...');
-$date->setDescription('Description Date');
-$form->addElement($date, true);
-
-$date_time = new XoopsFormDateTime('Date time', 'date_time', 3,'','Date...');
-$date_time->setDescription('Description Date time');
-$form->addElement($date_time, true);
-
-$form->addElement(new XoopsFormCaptcha('Captcha', 'captcha', false), true);
-
-$testtray = new XoopsFormElementTray('Test tray');
-$select_tray = new XoopsFormSelect('Select_tray', 'select_tray', '', 4, true);
-$select_tray->addOption(1, 'Select_tray 1');
-$select_tray->addOption(2, 'Select_tray 2');
-$select_tray->addOption(3, 'Select_tray 3');
-$select_tray->addOption(4, 'Select_tray 4');
-$select_tray->addOption(5, 'Select_tray 5');
-$select_tray->addOption(6, 'Select_tray 6');
-$select_tray->setDescription('Description Select_tray');
-$select_tray->setClass('span2');
-$testtray ->addElement($select_tray, true);
-$testtray ->addElement($select_tray);
-$form->addElement($testtray);
-
-$button = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-$form->addElement($button);
-
-$button_2 = new XoopsFormButton('', 'reset', _RESET, 'reset');
-$button_2->setClass('btn btn-danger');
-$form->addElement($button_2);
-
-$button_tray = new XoopsFormButtonTray('button_tray', 'submit', _SUBMIT, '', true);
-$button_tray->setClass('btn btn-inverse');
-$form->addElement($button_tray);
-
-
-$form->display();
-$xoops->footer();
\ No newline at end of file

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-29 02:00:28 UTC (rev 10597)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php	2012-12-29 02:12:09 UTC (rev 10598)
@@ -891,20 +891,6 @@
 $modversion['config'][$i]['options']        = $jquery_theme;
 
 $i++;
-$modversion['config'][$i]['name'] = 'active_avatars';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_AVATARS';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = '1';
-$i++;
-$modversion['config'][$i]['name'] = 'active_banners';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_BANNERS';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = '1';
-$i++;
 $modversion['config'][$i]['name'] = 'active_blocksadmin';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN';
 $modversion['config'][$i]['description'] = '';
@@ -933,20 +919,6 @@
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = '1';
 $i++;
-$modversion['config'][$i]['name'] = 'active_mailusers';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_MAILUSERS';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = '1';
-$i++;
-$modversion['config'][$i]['name'] = 'active_maintenance';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_MAINTENANCE';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = '1';
-$i++;
 $modversion['config'][$i]['name'] = 'active_modulesadmin';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN';
 $modversion['config'][$i]['description'] = '';
@@ -961,13 +933,6 @@
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
 $i++;
-$modversion['config'][$i]['name'] = 'active_smilies';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_SMILIES';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = '1';
-$i++;
 $modversion['config'][$i]['name'] = 'active_tplsets';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS';
 $modversion['config'][$i]['description'] = '';
@@ -975,13 +940,6 @@
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 1;
 $i++;
-$modversion['config'][$i]['name'] = 'active_userrank';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_USERRANK';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'yesno';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = '1';
-$i++;
 $modversion['config'][$i]['name'] = 'active_users';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_USERS';
 $modversion['config'][$i]['description'] = '';
@@ -990,20 +948,6 @@
 $modversion['config'][$i]['default'] = '1';
 
 $i++;
-$modversion['config'][$i]['name'] = 'avatars_pager';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_AVATARS_PAGER';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 10;
-$i++;
-$modversion['config'][$i]['name'] = 'banners_pager';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BANNERS_PAGER';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 10;
-$i++;
 $modversion['config'][$i]['name'] = 'groups_pager';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_GROUPS_PAGER';
 $modversion['config'][$i]['description'] = '';
@@ -1018,20 +962,6 @@
 $modversion['config'][$i]['valuetype'] = 'int';
 $modversion['config'][$i]['default'] = 15;
 $i++;
-$modversion['config'][$i]['name'] = 'smilies_pager';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_SMILIES_PAGER';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 20;
-$i++;
-$modversion['config'][$i]['name'] = 'userranks_pager';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_USERRANKS_PAGER';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 20;
-$i++;
 $modversion['config'][$i]['name'] = 'users_pager';
 $modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_USERS_PAGER';
 $modversion['config'][$i]['description'] = '';