Menu
▾
▴
xoops-svn
|
From: <du...@us...> - 2012-10-18 12:42:30
|
Revision: 10227
http://sourceforge.net/p/xoops/svn/10227
Author: dugris
Date: 2012-10-18 12:42:23 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
Fix menu for extensions
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
Property Changed:
----------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2012-10-17 08:19:31 UTC (rev 10226)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2012-10-18 12:42:23 UTC (rev 10227)
@@ -36,9 +36,18 @@
}
}
$system->loadLanguage('modulesadmin','system');
+
// Get Action type
$op = $system->cleanVars($_REQUEST, 'op', 'list', 'string');
+$module = $system->cleanVars($_REQUEST, 'module', '', 'string');
+if (in_array($op, array('install', 'update', 'uninstall'))) {
+ if (!$xoops->security->check()) {
+ $op = 'list';
+ }
+}
+$myts = MyTextsanitizer::getInstance();
+
switch ($op) {
case 'list':
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-10-17 08:19:31 UTC (rev 10226)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-10-18 12:42:23 UTC (rev 10227)
@@ -1,204 +1,208 @@
-<?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.
- */
-
-
-/*
- * Xoops Cpanel default GUI class
- *
- * @copyright The XOOPS project http://sf.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package system
- * @usbpackage GUI
- * @since 2.4
- * @author Mamba XXXXXXXXXXXXXXXXXXX
- * @author Mojtabajml <jam...@gm...>
- * @author Voltan <djv...@gm...>
- * @author BitC3R0 <Bi...@gm...>
- * @author trabis <lus...@gm...>
- * @version 1.2
- * @version $Id$
- */
-
-class XoopsGuiDefault
-{
-
- function header()
- {
- $xoops = Xoops::getInstance();
- $xoops->loadLanguage('admin', 'system');
- $xoops->loadLanguage('cpanel', 'system');
- $xoops->loadLanguage('modinfo', 'system');
-
- $xoops->theme->addStylesheet('media/xoops/css/moduladmin.css');
- $xoops->theme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');
- $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/xoops.bootstrap.css'));
-
-
- $xoops->theme->addScript($xoops->url('/media/jquery/jquery.js'));
- $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
- $xoops->theme->addScript($xoops->url('/media/bootstrap/js/bootstrap.min.js'));
- // ddsmoothmenu
- $xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/ddsmoothmenu.js');
- $xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tooltip.js');
-
- $quick = array();
- $quick[] = array('title' => _DEFAULT_CPHOME, 'link' => XOOPS_URL . '/admin.php');
- $quick[] = array('title' => _YOURHOME, 'link' => XOOPS_URL);
- $quick[] = array('title' => _DEFAULT_NEWS, 'link' => XOOPS_URL . '/admin.php?xoopsorgnews=1');
- $quick[] = array('title' => 'separator');
- $quick[] = array('title' => _LOGOUT, 'link' => XOOPS_URL . '/user.php?op=logout');
- $xoops->tpl->assign('quick_menu', $quick);
-
- XoopsLoad::load('module', 'system');
- XoopsLoad::load('extension', 'system');
- $system_module = new SystemModule();
- $system_extension = new SystemExtension();
-
- $adminmenu = null;
- include dirname(__FILE__) . '/menu.php';
- if (!$xoops->isModule() || 'system' == $xoops->module->getVar('dirname', 'n')) {
- $modpath = XOOPS_URL . '/admin.php';
- $modname = _DEFAULT_SYSOPTIONS;
- $modid = 1;
- $moddir = 'system';
-
- $mod_options = $adminmenu;
- foreach (array_keys($mod_options) as $item) {
- $mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
- ? XOOPS_URL . '/modules/' . $moddir . '/' . $mod_options[$item]['link']
- : $mod_options[$item]['link'];
- $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? ''
- : XOOPS_ADMINTHEME_URL . '/default/' . $mod_options[$item]['icon'];
- unset($mod_options[$item]['icon_small']);
- }
-
- } else {
- $moddir = $xoops->module->getVar('dirname', 'n');
- $modpath = XOOPS_URL . '/modules/' . $moddir;
- $modname = $xoops->module->getVar('name');
- $modid = $xoops->module->getVar('mid');
-
- $mod_options = $xoops->module->getAdminMenu();
- foreach (array_keys($mod_options) as $item) {
- $mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
- ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
- $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? ''
- : XOOPS_URL . "/media/xoops/images/icons/32/" . $mod_options[$item]['icon'];
- }
- }
- $xoops->tpl->assign('mod_options', $mod_options);
- $xoops->tpl->assign('modpath', $modpath);
- $xoops->tpl->assign('modname', $modname);
- $xoops->tpl->assign('modid', $modid);
- $xoops->tpl->assign('moddir', $moddir);
-
- // Modules list
- $module_list = $system_module->getModuleList();
- $xoops->tpl->assign('module_menu', $module_list);
- unset($module_list);
-
- // Extensions list
- $extension_list = $system_extension->getExtensionList();
- $xoops->tpl->assign('extension_menu', $extension_list);
- unset($extension_list);
-
- $extension_mod = $system_extension->getExtension( $moddir );
- $xoops->tpl->assign('extension_mod', $extension_mod);
-
- // add preferences menu
- $menu = array();
-
- $OPT = array();
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=show&confcat_id=1', 'title' => _DEFAULT_GENERAL,
- 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
- );
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=show&confcat_id=2', 'title' => _DEFAULT_USERSETTINGS,
- 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
- );
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=show&confcat_id=3', 'title' => _DEFAULT_METAFOOTER,
- 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
- );
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=show&confcat_id=4', 'title' => _DEFAULT_CENSOR,
- 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
- );
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=show&confcat_id=5', 'title' => _DEFAULT_SEARCH,
- 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
- );
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=show&confcat_id=6', 'title' => _DEFAULT_MAILER,
- 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
- );
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=show&confcat_id=7', 'title' => _DEFAULT_AUTHENTICATION,
- 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
- );
- $OPT[] = array(
- 'link' => 'admin.php?fct=preferences&op=showmod&mod=1', 'title' => _DEFAULT_MODULESETTINGS,
- 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
- );
-
-
- $menu[] = array(
- 'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'title' => _DEFAULT_SYSOPTIONS,
- 'absolute' => 1, 'url' => XOOPS_URL . '/modules/system/', 'options' => $OPT
- );
- $menu[] = array('title' => 'separator');
-
- // Module adminmenu
- if ($xoops->isModule() && $xoops->module->getVar('dirname') != 'system') {
-
- if ($xoops->module->getInfo('system_menu')) {
- //$xoops->theme->addStylesheet('modules/system/css/menu.css');
-
- $xoops->module->loadAdminMenu();
- // Get menu tab handler
- /* @var $menu_handler SystemMenuHandler */
- $menu_handler = $xoops->getModuleHandler('menu', 'system');
- // Define top navigation
- $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoops->module->getVar('mid', 'e'), _AM_SYSTEM_PREF);
- $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoops->module->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE);
- if ($xoops->module->getInfo('blocks')) {
- $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoops->module->getVar('mid', 'e') . "&selmod=-2&selgrp=-1&selvis=-1", _AM_SYSTEM_BLOCKS);
- }
- if ($xoops->module->getInfo('hasMain')) {
- $menu_handler->addMenuTop(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'e') . "/", _AM_SYSTEM_GOTOMODULE);
- }
- // Define main tab navigation
- $i = 0;
- $current = $i;
- foreach ($xoops->module->adminmenu as $menu) {
- if (stripos($_SERVER['REQUEST_URI'], $menu['link']) !== false) {
- $current = $i;
- }
- $menu_handler->addMenuTabs( $xoops->url('modules/' . $xoops->module->getVar('dirname') . '/' . $menu['link']), $menu['title']);
- $i++;
- }
- if ($xoops->module->getInfo('help')) {
- if (stripos($_SERVER['REQUEST_URI'], 'admin/' . $xoops->module->getInfo('help')) !== false) {
- $current = $i;
- }
- $menu_handler->addMenuTabs('../../system/help.php?mid=' . $xoops->module->getVar('mid', 's') . '&' . $xoops->module->getInfo('help'), _AM_SYSTEM_HELP);
- }
-
- // Display navigation tabs
- $xoops->tpl->assign('xo_system_menu', $menu_handler->render($current, false));
- }
- }
-
- }
-}
-
+<?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.
+ */
+
+
+/*
+ * Xoops Cpanel default GUI class
+ *
+ * @copyright The XOOPS project http://sf.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package system
+ * @usbpackage GUI
+ * @since 2.4
+ * @author Mamba XXXXXXXXXXXXXXXXXXX
+ * @author Mojtabajml <jam...@gm...>
+ * @author Voltan <djv...@gm...>
+ * @author BitC3R0 <Bi...@gm...>
+ * @author trabis <lus...@gm...>
+ * @version 1.2
+ * @version $Id$
+ */
+
+class XoopsGuiDefault
+{
+
+ function header()
+ {
+ $xoops = Xoops::getInstance();
+ $xoops->loadLanguage('admin', 'system');
+ $xoops->loadLanguage('cpanel', 'system');
+ $xoops->loadLanguage('modinfo', 'system');
+
+ $xoops->theme->addStylesheet('media/xoops/css/moduladmin.css');
+ $xoops->theme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');
+ $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/xoops.bootstrap.css'));
+
+
+ $xoops->theme->addScript($xoops->url('/media/jquery/jquery.js'));
+ $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
+ $xoops->theme->addScript($xoops->url('/media/bootstrap/js/bootstrap.min.js'));
+ // ddsmoothmenu
+ $xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/ddsmoothmenu.js');
+ $xoops->theme->addScript(XOOPS_ADMINTHEME_URL . '/default/js/tooltip.js');
+
+ $quick = array();
+ $quick[] = array('title' => _DEFAULT_CPHOME, 'link' => XOOPS_URL . '/admin.php');
+ $quick[] = array('title' => _YOURHOME, 'link' => XOOPS_URL);
+ $quick[] = array('title' => _DEFAULT_NEWS, 'link' => XOOPS_URL . '/admin.php?xoopsorgnews=1');
+ $quick[] = array('title' => 'separator');
+ $quick[] = array('title' => _LOGOUT, 'link' => XOOPS_URL . '/user.php?op=logout');
+ $xoops->tpl->assign('quick_menu', $quick);
+
+ XoopsLoad::load('module', 'system');
+ XoopsLoad::load('extension', 'system');
+ $system_module = new SystemModule();
+ $system_extension = new SystemExtension();
+
+ $adminmenu = null;
+ include dirname(__FILE__) . '/menu.php';
+ if (!$xoops->isModule() || 'system' == $xoops->module->getVar('dirname', 'n')) {
+ $modpath = XOOPS_URL . '/admin.php';
+ $modname = _DEFAULT_SYSOPTIONS;
+ $modid = 1;
+ $moddir = 'system';
+
+ $mod_options = $adminmenu;
+ foreach (array_keys($mod_options) as $item) {
+ $mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
+ ? XOOPS_URL . '/modules/' . $moddir . '/' . $mod_options[$item]['link']
+ : $mod_options[$item]['link'];
+ $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? ''
+ : XOOPS_ADMINTHEME_URL . '/default/' . $mod_options[$item]['icon'];
+ unset($mod_options[$item]['icon_small']);
+ }
+
+ } else {
+ $moddir = $xoops->module->getVar('dirname', 'n');
+ $modpath = XOOPS_URL . '/modules/' . $moddir;
+ $modname = $xoops->module->getVar('name');
+ $modid = $xoops->module->getVar('mid');
+
+ $mod_options = $xoops->module->getAdminMenu();
+ foreach (array_keys($mod_options) as $item) {
+ $mod_options[$item]['link'] = empty($mod_options[$item]['absolute'])
+ ? XOOPS_URL . "/modules/{$moddir}/" . $mod_options[$item]['link'] : $mod_options[$item]['link'];
+ $mod_options[$item]['icon'] = empty($mod_options[$item]['icon']) ? ''
+ : XOOPS_URL . "/media/xoops/images/icons/32/" . $mod_options[$item]['icon'];
+ }
+ }
+ $xoops->tpl->assign('mod_options', $mod_options);
+ $xoops->tpl->assign('modpath', $modpath);
+ $xoops->tpl->assign('modname', $modname);
+ $xoops->tpl->assign('modid', $modid);
+ $xoops->tpl->assign('moddir', $moddir);
+
+ // Modules list
+ $module_list = $system_module->getModuleList();
+ $xoops->tpl->assign('module_menu', $module_list);
+ unset($module_list);
+
+ // Extensions list
+ $extension_list = $system_extension->getExtensionList();
+ $xoops->tpl->assign('extension_menu', $extension_list);
+ unset($extension_list);
+
+ $extension_mod = $system_extension->getExtension( $moddir );
+ $xoops->tpl->assign('extension_mod', $extension_mod);
+
+ // add preferences menu
+ $menu = array();
+
+ $OPT = array();
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=1', 'title' => _DEFAULT_GENERAL,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=2', 'title' => _DEFAULT_USERSETTINGS,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=3', 'title' => _DEFAULT_METAFOOTER,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=4', 'title' => _DEFAULT_CENSOR,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=5', 'title' => _DEFAULT_SEARCH,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=6', 'title' => _DEFAULT_MAILER,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=show&confcat_id=7', 'title' => _DEFAULT_AUTHENTICATION,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+ $OPT[] = array(
+ 'link' => 'admin.php?fct=preferences&op=showmod&mod=1', 'title' => _DEFAULT_MODULESETTINGS,
+ 'absolute' => 1, 'icon' => XOOPS_ADMINTHEME_URL . '/default/icons/prefs_small.png'
+ );
+
+
+ $menu[] = array(
+ 'link' => XOOPS_URL . '/modules/system/admin.php?fct=preferences', 'title' => _DEFAULT_SYSOPTIONS,
+ 'absolute' => 1, 'url' => XOOPS_URL . '/modules/system/', 'options' => $OPT
+ );
+ $menu[] = array('title' => 'separator');
+
+ // Module adminmenu
+ if ($xoops->isModule() && $xoops->module->getVar('dirname') != 'system') {
+
+ if ($xoops->module->getInfo('system_menu')) {
+ //$xoops->theme->addStylesheet('modules/system/css/menu.css');
+
+ $xoops->module->loadAdminMenu();
+ // Get menu tab handler
+ /* @var $menu_handler SystemMenuHandler */
+ $menu_handler = $xoops->getModuleHandler('menu', 'system');
+ // Define top navigation
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoops->module->getVar('mid', 'e'), _AM_SYSTEM_PREF);
+ if ($xoops->module->getInfo('extension')) {
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=extensions&op=update&module=" . $xoops->module->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE);
+ } else {
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoops->module->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE);
+ }
+ if ($xoops->module->getInfo('blocks')) {
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoops->module->getVar('mid', 'e') . "&selmod=-2&selgrp=-1&selvis=-1", _AM_SYSTEM_BLOCKS);
+ }
+ if ($xoops->module->getInfo('hasMain')) {
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/" . $xoops->module->getVar('dirname', 'e') . "/", _AM_SYSTEM_GOTOMODULE);
+ }
+ // Define main tab navigation
+ $i = 0;
+ $current = $i;
+ foreach ($xoops->module->adminmenu as $menu) {
+ if (stripos($_SERVER['REQUEST_URI'], $menu['link']) !== false) {
+ $current = $i;
+ }
+ $menu_handler->addMenuTabs( $xoops->url('modules/' . $xoops->module->getVar('dirname') . '/' . $menu['link']), $menu['title']);
+ $i++;
+ }
+ if ($xoops->module->getInfo('help')) {
+ if (stripos($_SERVER['REQUEST_URI'], 'admin/' . $xoops->module->getInfo('help')) !== false) {
+ $current = $i;
+ }
+ $menu_handler->addMenuTabs('../../system/help.php?mid=' . $xoops->module->getVar('mid', 's') . '&' . $xoops->module->getInfo('help'), _AM_SYSTEM_HELP);
+ }
+
+ // Display navigation tabs
+ $xoops->tpl->assign('xo_system_menu', $menu_handler->render($current, false));
+ }
+ }
+
+ }
+}
+
?>
\ No newline at end of file
Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
___________________________________________________________________
Deleted: svn:eol-style
- native
|
|
From: <tr...@us...> - 2012-12-16 19:09:41
|
Revision: 10413
http://sourceforge.net/p/xoops/svn/10413
Author: trabis
Date: 2012-12-16 19:09:38 +0000 (Sun, 16 Dec 2012)
Log Message:
-----------
Updating preferences
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
Removed 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/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-12-16 19:06:26 UTC (rev 10412)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2012-12-16 19:09:38 UTC (rev 10413)
@@ -58,26 +58,6 @@
switch ($op) {
case 'show':
- if (empty($confcat_id)) {
- $confcat_id = 1;
- }
- $confcat_handler = $xoops->getHandlerConfigcategory();
- $confcat = $confcat_handler->get($confcat_id);
- if (!is_object($confcat)) {
- $xoops->redirect('admin.php?fct=preferences', 1);
- }
- // Define Breadcrumb and tips
- $admin_page = new XoopsModuleAdmin();
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('preferences', 'adminpath'));
- $admin_page->addBreadcrumbLink(constant($confcat->getVar('confcat_name')));
- $admin_page->renderBreadcrumb();
- /* @var $form SystemPreferenceForm */
- $form = $xoops->getModuleForm(null, 'preference');
- $form->getForm($confcat);
- $xoops->tpl()->assign('form', $form->render());
- break;
-
case 'showmod':
$mod = $system->cleanVars($_GET, 'mod', 1, 'int');
if (!$mod) {
@@ -102,8 +82,8 @@
$admin_page->addBreadcrumbLink($module->getVar('name'));
$admin_page->renderBreadcrumb();
- /* @var $form SystemModulepreferenceForm */
- $form = $xoops->getModuleForm(null, 'modulepreference');
+ /* @var $form SystemPreferencesForm */
+ $form = $xoops->getModuleForm(null, 'preferences');
$form->getForm($config, $module);
$xoops->tpl()->assign('form', $form->render());
break;
Deleted: 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 2012-12-16 19:06:26 UTC (rev 10412)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/modulepreference.php 2012-12-16 19:09:38 UTC (rev 10413)
@@ -1,286 +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.
-*/
-
-/**
- * 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', $xoops->getModuleConfig('jquery_theme', 'system'));
- $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 'theme':
- case 'theme_multi':
- $ele = ($obj[$i]->getVar('conf_formtype') != 'theme_multi') ? new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), 5, true);
- $dirlist = XoopsLists::getThemesList();
- if (!empty($dirlist)) {
- asort($dirlist);
- $ele->addOptionArray($dirlist);
- }
- break;
- case 'tplset':
- $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
- $tplset_handler = $xoops->getHandlerTplset();
- $tplsetlist = $tplset_handler->getNameList();
- asort($tplsetlist);
- foreach ($tplsetlist as $key => $name) {
- $ele->addOption($key, $name);
- }
- break;
-
- case 'cpanel':
- $ele = new XoopsFormHidden($obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
- /*
- $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
- XoopsLoad::load("cpanel", "system");
- $list = XoopsSystemCpanel::getGuis();
- $ele->addOptionArray($list); */
- break;
-
- case 'timezone':
- $ele = new XoopsFormSelectTimezone($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
- break;
-
- case 'language':
- $ele = new XoopsFormSelectLang($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
- break;
-
- case 'startpage':
- $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
-
- $module_handler = $xoops->getHandlerModule();
- $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
- $criteria->add(new Criteria('isactive', 1));
- $moduleslist = $module_handler->getNameList($criteria, true);
- $moduleslist['--'] = _MD_AM_NONE;
- $ele->addOptionArray($moduleslist);
- 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 'module_cache':
- $module_handler = $xoops->getHandlerModule();
- $modules = $module_handler->getObjectsArray(new Criteria('hasmain', 1), true);
- $currrent_val = $obj[$i]->getConfValueForOutput();
- $cache_options = array(
- '0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE,
- '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR,
- '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK
- );
- if (count($modules) > 0) {
- $ele = new XoopsFormElementTray($title, '<br />');
- foreach (array_keys($modules) as $mid) {
- $c_val = isset($currrent_val[$mid]) ? intval($currrent_val[$mid]) : null;
- $selform = new XoopsFormSelect($modules[$mid]->getVar('name'), $obj[$i]->getVar('conf_name') . "[$mid]", $c_val);
- $selform->addOptionArray($cache_options);
- $ele->addElement($selform);
- unset($selform);
- }
- } else {
- $ele = new XoopsFormLabel($title, _MD_AM_NOMODULE);
- }
- break;
-
- case 'site_cache':
- $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
- $ele->addOptionArray(array(
- '0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE,
- '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR,
- '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK
- ));
- 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'));
- }
-}
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php (from rev 10410, 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/preferences.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php 2012-12-16 19:09:38 UTC (rev 10413)
@@ -0,0 +1,286 @@
+<?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 SystemPreferencesForm 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', $xoops->getModuleConfig('jquery_theme', 'system'));
+ $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 'theme':
+ case 'theme_multi':
+ $ele = ($obj[$i]->getVar('conf_formtype') != 'theme_multi') ? new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput()) : new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput(), 5, true);
+ $dirlist = XoopsLists::getThemesList();
+ if (!empty($dirlist)) {
+ asort($dirlist);
+ $ele->addOptionArray($dirlist);
+ }
+ break;
+ case 'tplset':
+ $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
+ $tplset_handler = $xoops->getHandlerTplset();
+ $tplsetlist = $tplset_handler->getNameList();
+ asort($tplsetlist);
+ foreach ($tplsetlist as $key => $name) {
+ $ele->addOption($key, $name);
+ }
+ break;
+
+ case 'cpanel':
+ $ele = new XoopsFormHidden($obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
+ /*
+ $ele = new XoopsFormSelect($title, $config[$i]->getVar('conf_name'), $config[$i]->getConfValueForOutput());
+ XoopsLoad::load("cpanel", "system");
+ $list = XoopsSystemCpanel::getGuis();
+ $ele->addOptionArray($list); */
+ break;
+
+ case 'timezone':
+ $ele = new XoopsFormSelectTimezone($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
+ break;
+
+ case 'language':
+ $ele = new XoopsFormSelectLang($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
+ break;
+
+ case 'startpage':
+ $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
+
+ $module_handler = $xoops->getHandlerModule();
+ $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
+ $criteria->add(new Criteria('isactive', 1));
+ $moduleslist = $module_handler->getNameList($criteria, true);
+ $moduleslist['--'] = _MD_AM_NONE;
+ $ele->addOptionArray($moduleslist);
+ 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 'module_cache':
+ $module_handler = $xoops->getHandlerModule();
+ $modules = $module_handler->getObjectsArray(new Criteria('hasmain', 1), true);
+ $currrent_val = $obj[$i]->getConfValueForOutput();
+ $cache_options = array(
+ '0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE,
+ '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR,
+ '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK
+ );
+ if (count($modules) > 0) {
+ $ele = new XoopsFormElementTray($title, '<br />');
+ foreach (array_keys($modules) as $mid) {
+ $c_val = isset($currrent_val[$mid]) ? intval($currrent_val[$mid]) : null;
+ $selform = new XoopsFormSelect($modules[$mid]->getVar('name'), $obj[$i]->getVar('conf_name') . "[$mid]", $c_val);
+ $selform->addOptionArray($cache_options);
+ $ele->addElement($selform);
+ unset($selform);
+ }
+ } else {
+ $ele = new XoopsFormLabel($title, _MD_AM_NOMODULE);
+ }
+ break;
+
+ case 'site_cache':
+ $ele = new XoopsFormSelect($title, $obj[$i]->getVar('conf_name'), $obj[$i]->getConfValueForOutput());
+ $ele->addOptionArray(array(
+ '0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE,
+ '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR,
+ '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK
+ ));
+ 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'));
+ }
+}
|
|
From: <tr...@us...> - 2012-12-16 19:57:49
|
Revision: 10419
http://sourceforge.net/p/xoops/svn/10419
Author: trabis
Date: 2012-12-16 19:57:47 +0000 (Sun, 16 Dec 2012)
Log Message:
-----------
Updating caches after module uninstall
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/system.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2012-12-16 19:28:32 UTC (rev 10418)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/extensions/main.php 2012-12-16 19:57:47 UTC (rev 10419)
@@ -138,6 +138,8 @@
}
$folder = array(1, 3);
$system->CleanCache($folder);
+ //Set active modules in cache folder
+ $xoops->setActiveModules();
// Call Footer
$xoops->footer();
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2012-12-16 19:28:32 UTC (rev 10418)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/modulesadmin/main.php 2012-12-16 19:57:47 UTC (rev 10419)
@@ -228,6 +228,8 @@
}
$folder = array(1, 3);
$system->CleanCache($folder);
+ //Set active modules in cache folder
+ $xoops->setActiveModules();
// Call Footer
$xoops->footer();
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/system.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/system.php 2012-12-16 19:28:32 UTC (rev 10418)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/system.php 2012-12-16 19:57:47 UTC (rev 10419)
@@ -150,6 +150,7 @@
$xoops = Xoops::getInstance();
$path = $xoops->path('modules/system/admin/' . $version . '/xoops_version.php');
if (file_exists($path)) {
+ $modversion = array();
include $path;
$retvalue = $modversion[$value];
$tblVersion[$version . '.' . $value] = $retvalue;
|
|
From: <du...@us...> - 2012-12-19 23:02:31
|
Revision: 10474
http://sourceforge.net/p/xoops/svn/10474
Author: dugris
Date: 2012-12-19 23:02:28 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
Fix rev: 10403 (preferences : Email setup)
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
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-19 21:49:59 UTC (rev 10473)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php 2012-12-19 23:02:28 UTC (rev 10474)
@@ -46,6 +46,7 @@
define("_MI_SYSTEM_GENERAL", "General Settings");
define("_MI_SYSTEM_USERSETTINGS", "User Info Settings");
define("_MI_SYSTEM_METAFOOTER", "Meta Tags and Footer");
+define("_MI_SYSTEM_MAIL", "Email Setup");
define("_MI_SYSTEM_CENSOR", "Word Censoring Options");
define("_MI_SYSTEM_AUTHENTICATION", "Authentication Options");
define("_MI_SYSTEM_SITEPREFERENCE_ANON", "Anonymous");
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-19 21:49:59 UTC (rev 10473)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-19 23:02:28 UTC (rev 10474)
@@ -195,6 +195,9 @@
$modversion['configcat']['meta']['name'] = _MI_SYSTEM_METAFOOTER;
$modversion['configcat']['meta']['description'] = '';
$i++;
+$modversion['configcat']['mail']['name'] = _MI_SYSTEM_MAIL;
+$modversion['configcat']['mail']['description'] = '';
+$i++;
$modversion['configcat']['censor']['name'] = _MI_SYSTEM_CENSOR;
$modversion['configcat']['censor']['description'] = '';
$i++;
@@ -636,6 +639,72 @@
$modversion['config'][$i]['valuetype'] = 'text';
$modversion['config'][$i]['default'] = "Powered by XOOPS © 2001-" . date('Y', time()) . " <a href=\"http://xoops.sourceforge.net\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>";
$i++;
+// Category mail
+$modversion['config'][$i]['name'] = 'from';
+$modversion['config'][$i]['title'] = '_MD_AM_MAILFROM';
+$modversion['config'][$i]['description'] = '_MD_AM_MAILFROMDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
+$modversion['config'][$i]['name'] = 'fromname';
+$modversion['config'][$i]['title'] = '_MD_AM_MAILFROMNAME';
+$modversion['config'][$i]['description'] = '_MD_AM_MAILFROMNAMEDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
+$modversion['config'][$i]['name'] = 'fromuid';
+$modversion['config'][$i]['title'] = '_MD_AM_MAILFROMUID';
+$modversion['config'][$i]['description'] = '_MD_AM_MAILFROMUIDDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'user';
+$modversion['config'][$i]['valuetype'] = 'int';
+$modversion['config'][$i]['default'] = 1;
+$i++;
+$modversion['config'][$i]['name'] = 'mailmethod';
+$modversion['config'][$i]['title'] = '_MD_AM_MAILERMETHOD';
+$modversion['config'][$i]['description'] = '_MD_AM_MAILERMETHODDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['options'] = array('PHP mail()' => 'mail', 'sendmail' => 'sendmail', 'SMTP' => 'smtp', 'SMTPAuth' => 'smtpauth');
+$modversion['config'][$i]['default'] = 'mail';
+$i++;
+$modversion['config'][$i]['name'] = 'sendmailpath';
+$modversion['config'][$i]['title'] = '_MD_AM_SENDMAILPATH';
+$modversion['config'][$i]['description'] = '_MD_AM_SENDMAILPATHDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '/usr/sbin/sendmail';
+$i++;
+$modversion['config'][$i]['name'] = 'smtphost';
+$modversion['config'][$i]['title'] = '_MD_AM_SMTPHOST';
+$modversion['config'][$i]['description'] = '_MD_AM_SMTPHOSTDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textarea';
+$modversion['config'][$i]['valuetype'] = 'array';
+$modversion['config'][$i]['default'] = 'a:1:{i:0;s:0:\"\";}';
+$i++;
+$modversion['config'][$i]['name'] = 'smtpuser';
+$modversion['config'][$i]['title'] = '_MD_AM_SMTPUSER';
+$modversion['config'][$i]['description'] = '_MD_AM_SMTPUSERDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'textbox';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
+$modversion['config'][$i]['name'] = 'smtppass';
+$modversion['config'][$i]['title'] = '_MD_AM_SMTPPASS';
+$modversion['config'][$i]['description'] = '_MD_AM_SMTPPASSDESC';
+$modversion['config'][$i]['category'] = 'mail';
+$modversion['config'][$i]['formtype'] = 'password';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '';
+$i++;
// Category censor
$modversion['config'][$i]['name'] = 'censor_enable';
$modversion['config'][$i]['title'] = '_MD_AM_DOCENSOR';
|
|
From: <tr...@us...> - 2012-12-21 20:11:37
|
Revision: 10478
http://sourceforge.net/p/xoops/svn/10478
Author: trabis
Date: 2012-12-21 20:11:34 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
assigning is admin on block
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-12-21 20:00:34 UTC (rev 10477)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-12-21 20:11:34 UTC (rev 10478)
@@ -173,6 +173,7 @@
$block['lang_editaccount'] = _MB_SYSTEM_EACNT;
$block['lang_notifications'] = _MB_SYSTEM_NOTIF;
$block['uid'] = $xoops->user->getVar('uid');
+ $block['isadmin'] = $xoops->isAdmin();
$block['lang_logout'] = _MB_SYSTEM_LOUT;
$criteria = new CriteriaCompo(new Criteria('read_msg', 0));
$criteria->add(new Criteria('to_userid', $xoops->user->getVar('uid')));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-12-21 20:00:34 UTC (rev 10477)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-12-21 20:11:34 UTC (rev 10478)
@@ -1,5 +1,5 @@
<ul class="nav nav-list">
- <{if $xoops_isadmin}>
+ <{if $block.isadmin}>
<li>
<a href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>" rel="external">
<i class="icon-wrench"></i>
|
|
From: <du...@us...> - 2012-12-22 18:31:49
|
Revision: 10487
http://sourceforge.net/p/xoops/svn/10487
Author: dugris
Date: 2012-12-22 18:31:46 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Remove notifications templates and blocks
Modified Paths:
--------------
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/templates/blocks/system_block_notification.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_list.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-12-22 18:14:26 UTC (rev 10486)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-12-22 18:31:46 UTC (rev 10487)
@@ -1,28 +0,0 @@
-<form action="<{$block.target_page}>" method="post">
- <table class="outer">
- <{foreach item=category from=$block.categories}>
- <{foreach name=inner item=event from=$category.events}>
- <{if $smarty.foreach.inner.first}>
- <tr>
- <td class="head" colspan="2"><{$category.title}></td>
- </tr>
- <{/if}>
- <tr>
- <td class="odd">
- <{counter assign=index}>
- <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
- <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
- </td>
- <td class="odd"><{$event.caption}></td>
- </tr>
- <{/foreach}>
- <{/foreach}>
- <tr>
- <td class="foot" colspan="2">
- <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>">
- <input type="hidden" value="<{$block.notification_token}>" name="XOOPS_TOKEN_REQUEST" />
- <input type="submit" name="not_submit" value="<{$block.submit_button}>" />
- </td>
- </tr>
- </table>
-</form>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_list.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_list.html 2012-12-22 18:14:26 UTC (rev 10486)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_list.html 2012-12-22 18:31:46 UTC (rev 10487)
@@ -1,40 +0,0 @@
-<h4><{$lang_activenotifications}></h4>
-<form name="notificationlist" action="notifications.php" method="post">
-<table class="outer">
- <tr>
- <th><input name="allbox" id="allbox" onclick="xoopsCheckAll('notificationlist', 'allbox');" type="checkbox" value="<{$lang_checkall}>" /></th>
- <th><{$lang_event}></th>
- <th><{$lang_category}></th>
- <th><{$lang_itemid}></th>
- <th><{$lang_itemname}></th>
- </tr>
- <{foreach item=module from=$modules}>
- <tr>
- <td class="head"><input name="del_mod[<{$module.id}>]" id="del_mod[]" onclick="xoopsCheckGroup('notificationlist', 'del_mod[<{$module.id}>]', 'del_not[<{$module.id}>][]');" type="checkbox" value="<{$module.id}>" /></td>
- <td class="head" colspan="4"><{$lang_module}>: <{$module.name}></td>
- </tr>
- <{foreach item=category from=$module.categories}>
- <{foreach item=item from=$category.items}>
- <{foreach item=notification from=$item.notifications}>
- <tr>
- <{cycle values=odd,even assign=class}>
- <td class="<{$class}>"><input type="checkbox" name="del_not[<{$module.id}>][]" id="del_not[<{$module.id}>]" value="<{$notification.id}>" /></td>
- <td class="<{$class}>"><{$notification.event_title}></td>
- <td class="<{$class}>"><{$notification.category_title}></td>
- <td class="<{$class}>"><{if $item.id != 0}><{$item.id}><{/if}></td>
- <td class="<{$class}>"><{if $item.id != 0}><{if $item.url != ''}><a href="<{$item.url}>" title="<{$item.name}>"><{/if}><{$item.name}><{if $item.url != ''}></a><{/if}><{/if}></td>
- </tr>
- <{/foreach}>
- <{/foreach}>
- <{/foreach}>
- <{/foreach}>
- <tr>
- <td class="foot" colspan="5">
- <input type="submit" name="delete_cancel" value="<{$lang_cancel}>" />
- <input type="reset" name="delete_reset" value="<{$lang_clear}>" />
- <input type="submit" name="delete" value="<{$lang_delete}>" />
- <input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{$notification_token}>" />
- </td>
- </tr>
-</table>
-</form>
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html 2012-12-22 18:14:26 UTC (rev 10486)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_notification_select.html 2012-12-22 18:31:46 UTC (rev 10487)
@@ -1,36 +0,0 @@
-<{if $xoops_notification.show}>
- <form name="notification_select" action="<{$xoops_notification.target_page}>" method="post">
- <h4 class="txtcenter"><{$lang_activenotifications}></h4>
- <input type="hidden" name="not_redirect" value="<{$xoops_notification.redirect_script}>" />
- <input type="hidden" name="XOOPS_TOKEN_REQUEST" value="<{php}>echo Xoops::getInstance()->security()->createToken();<{/php}>" />
- <table class="outer">
- <tr><th colspan="3"><{$lang_notificationoptions}></th></tr>
- <tr>
- <td class="head"><{$lang_category}></td>
- <td class="head"><input name="allbox" id="allbox" onclick="xoopsCheckAll('notification_select','allbox');" type="checkbox" value="<{$lang_checkall}>" /></td>
- <td class="head"><{$lang_events}></td>
- </tr>
- <{foreach name=outer item=category from=$xoops_notification.categories}>
- <{foreach name=inner item=event from=$category.events}>
- <tr>
- <{if $smarty.foreach.inner.first}>
- <td class="even" rowspan="<{$smarty.foreach.inner.total}>"><{$category.title}></td>
- <{/if}>
- <td class="odd">
- <{counter assign=index}>
- <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
- <input type="checkbox" id="not_list[]" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
- </td>
- <td class="odd"><{$event.caption}></td>
- </tr>
- <{/foreach}>
- <{/foreach}>
- <tr>
- <td class="foot txtcenter" colspan="3"><input type="submit" name="not_submit" value="<{$lang_updatenow}>" /></td>
- </tr>
- </table>
- <div class="txtcenter">
- <{$lang_notificationmethodis}>: <{$user_method}> [<a href="<{$editprofile_url}>" title="<{$lang_change}>"><{$lang_change}></a>]
- </div>
- </form>
-<{/if}>
\ 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-22 18:14:26 UTC (rev 10486)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-22 18:31:46 UTC (rev 10487)
@@ -71,116 +71,85 @@
$modversion['templates'][] = array('file' => 'system_comments_nest.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_siteclosed.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_dummy.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_notification_list.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_notification_select.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_block_dummy.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_homepage.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_form.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_confirm.html', 'description' => '');
// Admin Templates
-/*$modversion['templates'][] = array('file' => 'system_header.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_modules.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_modules_install.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_modules_confirm.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_modules_result.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_avatars.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_smilies.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_blocks.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_blocks_item.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_comments.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_comments_list.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_userrank.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_users.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_preferences.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_mailusers.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_groups.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_images.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_templates.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_filemanager.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_index.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_maintenance.html', 'description' => '', 'type' => 'admin');
-$modversion['templates'][] = array('file' => 'system_help.html', 'description' => '', 'type' => 'admin');
-*/
// Blocks
-$modversion['blocks'][] = array(
- 'file' => 'system_blocks.php', 'name' => _MI_SYSTEM_BNAME2, 'description' => 'Shows user block',
- 'show_func' => 'b_system_user_show', 'template' => 'system_block_user.html'
-);
+$i=0;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME2;
+$modversion['blocks'][$i]['description'] = 'Shows user block';
+$modversion['blocks'][$i]['show_func'] = 'b_system_user_show';
+$modversion['blocks'][$i]['template'] = 'system_block_user.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME3;
+$modversion['blocks'][$i]['description'] = 'Shows login form';
+$modversion['blocks'][$i]['show_func'] = 'b_system_login_show';
+$modversion['blocks'][$i]['template'] = 'system_block_login.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME5;
+$modversion['blocks'][$i]['description'] = 'Shows contents waiting for approval';
+$modversion['blocks'][$i]['show_func'] = 'b_system_waiting_show';
+$modversion['blocks'][$i]['template'] = 'system_block_waiting.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME6;
+$modversion['blocks'][$i]['description'] = 'Shows the main navigation menu of the site';
+$modversion['blocks'][$i]['show_func'] = 'b_system_main_show';
+$modversion['blocks'][$i]['edit_func'] = 'b_system_main_edit';
+$modversion['blocks'][$i]['template'] = 'system_block_mainmenu.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME7;
+$modversion['blocks'][$i]['description'] = 'Shows basic info about the site and a link to Recommend Us pop up window';
+$modversion['blocks'][$i]['show_func'] = 'b_system_info_show';
+$modversion['blocks'][$i]['edit_func'] = 'b_system_info_edit';
+$modversion['blocks'][$i]['options'] = '320|190|s_poweredby.gif|1';
+$modversion['blocks'][$i]['template'] = 'system_block_siteinfo.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME8;
+$modversion['blocks'][$i]['description'] = 'Displays users/guests currently online';
+$modversion['blocks'][$i]['show_func'] = 'b_system_online_show';
+$modversion['blocks'][$i]['template'] = 'system_block_online.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME9;
+$modversion['blocks'][$i]['description'] = 'Top posters';
+$modversion['blocks'][$i]['show_func'] = 'b_system_topposters_show';
+$modversion['blocks'][$i]['options'] = '10|1';
+$modversion['blocks'][$i]['edit_func'] = 'b_system_topposters_edit';
+$modversion['blocks'][$i]['template'] = 'system_block_topusers.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME10;
+$modversion['blocks'][$i]['description'] = 'Shows most recent users';
+$modversion['blocks'][$i]['show_func'] = 'b_system_newmembers_show';
+$modversion['blocks'][$i]['options'] = '10|1';
+$modversion['blocks'][$i]['edit_func'] = 'b_system_newmembers_edit';
+$modversion['blocks'][$i]['template'] = 'system_block_newusers.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME11;
+$modversion['blocks'][$i]['description'] = 'Shows most recent comments';
+$modversion['blocks'][$i]['show_func'] = 'b_system_comments_show';
+$modversion['blocks'][$i]['options'] = '10';
+$modversion['blocks'][$i]['edit_func'] = 'b_system_comments_edit';
+$modversion['blocks'][$i]['template'] = 'system_block_comments.html';
+$i++;
+$modversion['blocks'][$i]['file'] = 'system_blocks.php';
+$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME13;
+$modversion['blocks'][$i]['description'] = 'Shows theme selection box';
+$modversion['blocks'][$i]['show_func'] = 'b_system_themes_show';
+$modversion['blocks'][$i]['options'] = '0|80';
+$modversion['blocks'][$i]['edit_func'] = 'b_system_themes_edit';
+$modversion['blocks'][$i]['template'] = 'system_block_themes.html';
-$modversion['blocks'][2]['file'] = 'system_blocks.php';
-$modversion['blocks'][2]['name'] = _MI_SYSTEM_BNAME3;
-$modversion['blocks'][2]['description'] = 'Shows login form';
-$modversion['blocks'][2]['show_func'] = 'b_system_login_show';
-$modversion['blocks'][2]['template'] = 'system_block_login.html';
-
-$modversion['blocks'][4]['file'] = 'system_blocks.php';
-$modversion['blocks'][4]['name'] = _MI_SYSTEM_BNAME5;
-$modversion['blocks'][4]['description'] = 'Shows contents waiting for approval';
-$modversion['blocks'][4]['show_func'] = 'b_system_waiting_show';
-$modversion['blocks'][4]['template'] = 'system_block_waiting.html';
-
-$modversion['blocks'][5]['file'] = 'system_blocks.php';
-$modversion['blocks'][5]['name'] = _MI_SYSTEM_BNAME6;
-$modversion['blocks'][5]['description'] = 'Shows the main navigation menu of the site';
-$modversion['blocks'][5]['show_func'] = 'b_system_main_show';
-$modversion['blocks'][5]['edit_func'] = 'b_system_main_edit';
-$modversion['blocks'][5]['template'] = 'system_block_mainmenu.html';
-
-$modversion['blocks'][6]['file'] = 'system_blocks.php';
-$modversion['blocks'][6]['name'] = _MI_SYSTEM_BNAME7;
-$modversion['blocks'][6]['description'] = 'Shows basic info about the site and a link to Recommend Us pop up window';
-$modversion['blocks'][6]['show_func'] = 'b_system_info_show';
-$modversion['blocks'][6]['edit_func'] = 'b_system_info_edit';
-$modversion['blocks'][6]['options'] = '320|190|s_poweredby.gif|1';
-$modversion['blocks'][6]['template'] = 'system_block_siteinfo.html';
-
-$modversion['blocks'][7]['file'] = 'system_blocks.php';
-$modversion['blocks'][7]['name'] = _MI_SYSTEM_BNAME8;
-$modversion['blocks'][7]['description'] = 'Displays users/guests currently online';
-$modversion['blocks'][7]['show_func'] = 'b_system_online_show';
-$modversion['blocks'][7]['template'] = 'system_block_online.html';
-
-$modversion['blocks'][8]['file'] = 'system_blocks.php';
-$modversion['blocks'][8]['name'] = _MI_SYSTEM_BNAME9;
-$modversion['blocks'][8]['description'] = 'Top posters';
-$modversion['blocks'][8]['show_func'] = 'b_system_topposters_show';
-$modversion['blocks'][8]['options'] = '10|1';
-$modversion['blocks'][8]['edit_func'] = 'b_system_topposters_edit';
-$modversion['blocks'][8]['template'] = 'system_block_topusers.html';
-
-$modversion['blocks'][9]['file'] = 'system_blocks.php';
-$modversion['blocks'][9]['name'] = _MI_SYSTEM_BNAME10;
-$modversion['blocks'][9]['description'] = 'Shows most recent users';
-$modversion['blocks'][9]['show_func'] = 'b_system_newmembers_show';
-$modversion['blocks'][9]['options'] = '10|1';
-$modversion['blocks'][9]['edit_func'] = 'b_system_newmembers_edit';
-$modversion['blocks'][9]['template'] = 'system_block_newusers.html';
-
-$modversion['blocks'][10]['file'] = 'system_blocks.php';
-$modversion['blocks'][10]['name'] = _MI_SYSTEM_BNAME11;
-$modversion['blocks'][10]['description'] = 'Shows most recent comments';
-$modversion['blocks'][10]['show_func'] = 'b_system_comments_show';
-$modversion['blocks'][10]['options'] = '10';
-$modversion['blocks'][10]['edit_func'] = 'b_system_comments_edit';
-$modversion['blocks'][10]['template'] = 'system_block_comments.html';
-
-// RMV-NOTIFY:
-// Adding a block...
-$modversion['blocks'][11]['file'] = 'system_blocks.php';
-$modversion['blocks'][11]['name'] = _MI_SYSTEM_BNAME12;
-$modversion['blocks'][11]['description'] = 'Shows notification options';
-$modversion['blocks'][11]['show_func'] = 'b_system_notification_show';
-$modversion['blocks'][11]['template'] = 'system_block_notification.html';
-
-$modversion['blocks'][12]['file'] = 'system_blocks.php';
-$modversion['blocks'][12]['name'] = _MI_SYSTEM_BNAME13;
-$modversion['blocks'][12]['description'] = 'Shows theme selection box';
-$modversion['blocks'][12]['show_func'] = 'b_system_themes_show';
-$modversion['blocks'][12]['options'] = '0|80';
-$modversion['blocks'][12]['edit_func'] = 'b_system_themes_edit';
-$modversion['blocks'][12]['template'] = 'system_block_themes.html';
-
// Menu
$modversion['hasMain'] = 0;
|
|
From: <du...@us...> - 2012-12-24 00:06:44
|
Revision: 10533
http://sourceforge.net/p/xoops/svn/10533
Author: dugris
Date: 2012-12-24 00:06:38 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
Remove comments and notifications from system module
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.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/templates/system_comment.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_flat.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_nest.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_thread.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-12-23 20:28:55 UTC (rev 10532)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-12-24 00:06:38 UTC (rev 10533)
@@ -388,121 +388,6 @@
return $block;
}
-
-function b_system_comments_show($options)
-{
- $xoops = Xoops::getInstance();
- $block = array();
- include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
- $comment_handler = $xoops->getHandlerComment();
- $criteria = new CriteriaCompo(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
- $criteria->setLimit(intval($options[0]));
- $criteria->setSort('com_created');
- $criteria->setOrder('DESC');
-
- // Check modules permissions
- $moduleperm_handler = $xoops->getHandlerGroupperm();
- $gperm_groupid = $xoops->isUser() ? $xoops->user->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
- $criteria1 = new CriteriaCompo(new Criteria('gperm_name', 'module_read', '='));
- $criteria1->add(new Criteria('gperm_groupid', '(' . implode(',', $gperm_groupid) . ')', 'IN'));
- $perms = $moduleperm_handler->getObjects($criteria1, true);
- $modIds = array();
- foreach ($perms as $item) {
- $modIds[] = $item->getVar('gperm_itemid');
- }
- if (count($modIds) > 0) {
- $modIds = array_unique($modIds);
- $criteria->add(new Criteria('com_modid', '(' . implode(',', $modIds) . ')', 'IN'));
- }
- // Check modules permissions
-
- $comments = $comment_handler->getObjects($criteria, true);
- $member_handler = $xoops->getHandlerMember();
- $module_handler = $xoops->getHandlerModule();
- $modules = $module_handler->getObjectsArray(new Criteria('hascomments', 1), true);
- $comment_config = array();
- foreach (array_keys($comments) as $i) {
- $mid = $comments[$i]->getVar('com_modid');
- $com['module'] = '<a href="' . XOOPS_URL . '/modules/' . $modules[$mid]->getVar('dirname') . '/">' . $modules[$mid]->getVar('name') . '</a>';
- if (!isset($comment_config[$mid])) {
- $comment_config[$mid] = $modules[$mid]->getInfo('comments');
- }
- $com['id'] = $i;
- $com['title'] = '<a href="' . XOOPS_URL . '/modules/' . $modules[$mid]->getVar('dirname') . '/' . $comment_config[$mid]['pageName'] . '?' . $comment_config[$mid]['itemName'] . '=' . $comments[$i]->getVar('com_itemid') . '&com_id=' . $i . '&com_rootid=' . $comments[$i]->getVar('com_rootid') . '&' . htmlspecialchars($comments[$i]->getVar('com_exparams')) . '#comment' . $i . '">' . $comments[$i]->getVar('com_title') . '</a>';
- $com['icon'] = htmlspecialchars($comments[$i]->getVar('com_icon'), ENT_QUOTES);
- $com['icon'] = ($com['icon'] != '') ? $com['icon'] : 'icon1.gif';
- $com['time'] = XoopsLocal::formatTimestamp($comments[$i]->getVar('com_created'), 'm');
- if ($comments[$i]->getVar('com_uid') > 0) {
- $poster = $member_handler->getUser($comments[$i]->getVar('com_uid'));
- if (is_object($poster)) {
- $com['poster'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $comments[$i]->getVar('com_uid') . '">' . $poster->getVar('uname') . '</a>';
- } else {
- $com['poster'] = $xoops->getConfig('anonymous');
- }
- } else {
- $com['poster'] = $xoops->getConfig('anonymous');
- }
- $block['comments'][] = $com;
- unset($com);
- }
- return $block;
-}
-
-// RMV-NOTIFY
-function b_system_notification_show()
-{
- include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
- $xoops = Xoops::getInstance();
- $xoops->loadLanguage('notification');
- // Notification must be enabled, and user must be logged in
- if (!$xoops->isUser() || !notificationEnabled('block')) {
- return false; // do not display block
- }
- $notification_handler = $xoops->getHandlerNotification();
- // Now build the a nested associative array of info to pass
- // to the block template.
- $block = array();
- $categories = notificationSubscribableCategoryInfo();
- if (empty($categories)) {
- return false;
- }
- foreach ($categories as $category) {
- $section['name'] = $category['name'];
- $section['title'] = $category['title'];
- $section['description'] = $category['description'];
- $section['itemid'] = $category['item_id'];
- $section['events'] = array();
- $subscribed_events = $notification_handler->getSubscribedEvents($category['name'], $category['item_id'], $xoops->module->getVar('mid'), $xoops->user->getVar('uid'));
- foreach (notificationEvents($category['name'], true) as $event) {
- if (!empty($event['admin_only']) && !$xoops->user->isAdmin($xoops->module->getVar('mid'))) {
- continue;
- }
- $subscribed = in_array($event['name'], $subscribed_events) ? 1 : 0;
- $section['events'][$event['name']] = array(
- 'name' => $event['name'], 'title' => $event['title'], 'caption' => $event['caption'],
- 'description' => $event['description'], 'subscribed' => $subscribed
- );
- }
- $block['categories'][$category['name']] = $section;
- }
- // Additional form data
- $block['target_page'] = "notification_update.php";
- // FIXME: better or more standardized way to do this?
- $script_url = explode('/', $_SERVER['PHP_SELF']);
- $script_name = $script_url[count($script_url) - 1];
- $block['redirect_script'] = $script_name;
- $block['submit_button'] = _NOT_UPDATENOW;
- $block['notification_token'] = $xoops->security()->createToken();
- return $block;
-}
-
-function b_system_comments_edit($options)
-{
- $inputtag = "<input type='text' name='options[]' value='" . intval($options[0]) . "' />";
- $form = sprintf(_MB_SYSTEM_DISPLAYC, $inputtag);
- return $form;
-}
-
function b_system_topposters_edit($options)
{
include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comment.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comment.html 2012-12-23 20:28:55 UTC (rev 10532)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comment.html 2012-12-24 00:06:38 UTC (rev 10533)
@@ -1,63 +0,0 @@
-<!-- start comment post -->
- <tr>
- <td class="head"><a id="comment<{$comment.id}>"></a> <{$comment.poster.uname}></td>
- <td class="head"><div class="comDate"><span class="comDateCaption"><{$lang_posted}>:</span> <{$comment.date_posted}> <span class="comDateCaption"><{$lang_updated}>:</span> <{$comment.date_modified}></div></td>
- </tr>
- <tr>
-
- <{if $comment.poster.id != 0}>
-
- <td class="odd">
- <div class="comUserRank">
- <div class="comUserRankText"><{$comment.poster.rank_title}></div>
- <img class="comUserRankImg" src="<{$xoops_upload_url}>/<{$comment.poster.rank_image}>" alt="" />
- </div>
- <img class="comUserImg" src="<{$xoops_upload_url}>/<{$comment.poster.avatar}>" alt="" />
- <div class="comUserStat"><span class="comUserStatCaption"><{$lang_joined}>:</span> <{$comment.poster.regdate}></div>
- <div class="comUserStat"><span class="comUserStatCaption"><{$lang_from}>:</span> <{$comment.poster.from}></div>
- <div class="comUserStat"><span class="comUserStatCaption"><{$lang_posts}>:</span> <{$comment.poster.postnum}></div>
- <div class="comUserStatus"><{$comment.poster.status}></div></td>
-
- <{else}>
-
- <td class="odd"> </td>
-
- <{/if}>
-
- <td class="odd">
- <div class="comTitle"><{$comment.image}><{$comment.title}></div>
- <div class="comText"><{$comment.text}></div>
- </td>
- </tr>
- <tr>
- <td class="even"></td>
-
- <{if $xoops_iscommentadmin == true}>
-
- <td class="even txtright">
- <a href="<{$editcomment_link}>&com_id=<{$comment.id}>" title="<{$lang_edit}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a>
- <a href="<{$deletecomment_link}>&com_id=<{$comment.id}>" title="<{$lang_delete}>"><img src="<{$xoops_url}>/images/icons/delete.gif" alt="<{$lang_delete}>" /></a>
- <a href="<{$replycomment_link}>&com_id=<{$comment.id}>" title="<{$lang_reply}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
- </td>
-
- <{elseif $xoops_isuser == true && $xoops_userid == $comment.poster.id}>
-
- <td class="even txtright">
- <a href="<{$editcomment_link}>&com_id=<{$comment.id}>" title="<{$lang_edit}>"><img src="<{$xoops_url}>/images/icons/edit.gif" alt="<{$lang_edit}>" /></a>
- <a href="<{$replycomment_link}>&com_id=<{$comment.id}>" title="<{$lang_reply}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
- </td>
-
- <{elseif $xoops_isuser == true || $anon_canpost == true}>
-
- <td class="even txtright">
- <a href="<{$replycomment_link}>&com_id=<{$comment.id}>"><img src="<{$xoops_url}>/images/icons/reply.gif" alt="<{$lang_reply}>" /></a>
- </td>
-
- <{else}>
-
- <td class="even"> </td>
-
- <{/if}>
-
- </tr>
-<!-- end comment post -->
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_flat.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_flat.html 2012-12-23 20:28:55 UTC (rev 10532)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_flat.html 2012-12-24 00:06:38 UTC (rev 10533)
@@ -1,9 +0,0 @@
-<table class="outer" cellpadding="5" cellspacing="1">
- <tr>
- <th class="width20"><{$lang_poster}></th>
- <th><{$lang_thread}></th>
- </tr>
- <{foreach item=comment from=$comments}>
- <{include file="module:system|system_comment.html" comment=$comment}>
- <{/foreach}>
-</table>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_nest.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_nest.html 2012-12-23 20:28:55 UTC (rev 10532)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_nest.html 2012-12-24 00:06:38 UTC (rev 10533)
@@ -1,30 +0,0 @@
-<{section name=i loop=$comments}>
-<br />
-<table cellspacing="1" class="outer">
- <tr>
- <th class="width20"><{$lang_poster}></th>
- <th><{$lang_thread}></th>
- </tr>
- <{include file="module:system|system_comment.html" comment=$comments[i]}>
-</table>
-
-<!-- start comment replies -->
-<{foreach item=reply from=$comments[i].replies}>
-<br />
-<table class="bnone collapse">
- <tr>
- <td width="<{$reply.prefix}>"></td>
- <td>
- <table class="outer" cellspacing="1">
- <tr>
- <th class="width20"><{$lang_poster}></th>
- <th><{$lang_thread}></th>
- </tr>
- <{include file="module:system|system_comment.html" comment=$reply}>
- </table>
- </td>
- </tr>
-</table>
-<{/foreach}>
-<!-- end comment tree -->
-<{/section}>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_thread.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_thread.html 2012-12-23 20:28:55 UTC (rev 10532)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_comments_thread.html 2012-12-24 00:06:38 UTC (rev 10533)
@@ -1,37 +0,0 @@
-<{section name=i loop=$comments}>
-<br />
-<table cellspacing="1" class="outer">
- <tr>
- <th class="width20"><{$lang_poster}></th>
- <th><{$lang_thread}></th>
- </tr>
- <{include file="module:system|system_comment.html" comment=$comments[i]}>
-</table>
-
-<{if $show_threadnav == true}>
-<div class="txtleft marg3 pad5">
-<a href="<{$comment_url}>" title="<{$lang_top}>"><{$lang_top}></a> | <a href="<{$comment_url}>&com_id=<{$comments[i].pid}>&com_rootid=<{$comments[i].rootid}>#newscomment<{$comments[i].pid}>"><{$lang_parent}></a>
-</div>
-<{/if}>
-
-<{if $comments[i].show_replies == true}>
-<!-- start comment tree -->
-<br />
-<table cellspacing="1" class="outer">
- <tr>
- <th class="width50"><{$lang_subject}></th>
- <th class="width20 txtcenter"><{$lang_poster}></th>
- <th class="txtright"><{$lang_posted}></th>
- </tr>
- <{foreach item=reply from=$comments[i].replies}>
- <tr>
- <td class="even"><{$reply.prefix}> <a href="<{$comment_url}>&com_id=<{$reply.id}>&com_rootid=<{$reply.root_id}>" title=""><{$reply.title}></a></td>
- <td class="odd txtcenter"><{$reply.poster.uname}></td>
- <td class="even right"><{$reply.date_posted}></td>
- </tr>
- <{/foreach}>
-</table>
-<!-- end comment tree -->
-<{/if}>
-
-<{/section}>
\ 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-23 20:28:55 UTC (rev 10532)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2012-12-24 00:06:38 UTC (rev 10533)
@@ -65,10 +65,6 @@
$modversion['templates'][] = array('file' => 'system_userform.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_rss.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_redirect.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_comment.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_comments_flat.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_comments_thread.html', 'description' => '');
-$modversion['templates'][] = array('file' => 'system_comments_nest.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_siteclosed.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_dummy.html', 'description' => '');
$modversion['templates'][] = array('file' => 'system_block_dummy.html', 'description' => '');
@@ -135,14 +131,6 @@
$modversion['blocks'][$i]['template'] = 'system_block_newusers.html';
$i++;
$modversion['blocks'][$i]['file'] = 'system_blocks.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME11;
-$modversion['blocks'][$i]['description'] = 'Shows most recent comments';
-$modversion['blocks'][$i]['show_func'] = 'b_system_comments_show';
-$modversion['blocks'][$i]['options'] = '10';
-$modversion['blocks'][$i]['edit_func'] = 'b_system_comments_edit';
-$modversion['blocks'][$i]['template'] = 'system_block_comments.html';
-$i++;
-$modversion['blocks'][$i]['file'] = 'system_blocks.php';
$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME13;
$modversion['blocks'][$i]['description'] = 'Shows theme selection box';
$modversion['blocks'][$i]['show_func'] = 'b_system_themes_show';
@@ -920,13 +908,6 @@
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 1;
$i++;
-$modversion['config'][$i]['name'] = 'active_comments';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_COMMENTS';
-$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_filemanager';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER';
$modversion['config'][$i]['description'] = '';
@@ -1019,13 +1000,6 @@
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 10;
$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;
-$i++;
$modversion['config'][$i]['name'] = 'groups_pager';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_GROUPS_PAGER';
$modversion['config'][$i]['description'] = '';
@@ -1071,14 +1045,6 @@
$modversion['config'][$i]['default'] = 'dhtmltextarea';
$modversion['config'][$i]['options'] = $editors;
$i++;
-$modversion['config'][$i]['name'] = 'comments_editor';
-$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR';
-$modversion['config'][$i]['description'] = '_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR_DSC';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'dhtmltextarea';
-$modversion['config'][$i]['options'] = $editors;
-$i++;
$modversion['config'][$i]['name'] = 'general_editor';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR';
$modversion['config'][$i]['description'] = '_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR_DSC';
|
|
From: <ma...@us...> - 2012-12-26 09:56:24
|
Revision: 10555
http://sourceforge.net/p/xoops/svn/10555
Author: mageg
Date: 2012-12-26 09:56:22 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
remove comments in system module
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/comments/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_comments.html
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_comments.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_comments.html 2012-12-26 05:46:29 UTC (rev 10554)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_comments.html 2012-12-26 09:56:22 UTC (rev 10555)
@@ -1,71 +0,0 @@
-<{includeq file="admin:system|admin_breadcrumb.html"}>
-<{includeq file="admin:system|admin_tips.html"}>
-<{includeq file="admin:system|admin_buttons.html"}>
-<!--Comments-->
-<{if $form}>
-<{$form}>
-<{else}>
-<div class="floatleft"><{$form_sort}></div>
-<div class="floatright">
- <div class="xo-buttons">
- <button class="btn" onclick="self.location.href='admin.php?fct=comments&op=comments_form_purge'">
- <img src="<{xoAdminIcons clear.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_FORM_PURGE}>" />
- <{$smarty.const._AM_SYSTEM_COMMENTS_FORM_PURGE}>
- </button>
- </div>
-</div>
-<div class="clear"></div>
-<form name='commentslist' id='commentslist' action='<{$php_selft}>' method="post">
- <table id="xo-comment-sorter" class="outer tablesorter">
- <thead>
- <tr>
- <th class="txtcenter width5"><input name='allbox' id='allbox' onclick='xoopsCheckAll("commentslist", "allbox");' type='checkbox' value='Check All' /></th>
- <th class="txtcenter width5"></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_TITLE}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_POSTED}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_IP}></th>
- <th class="txtcenter"><{$smarty.const._DATE}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_MODULE}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_COMMENTS_STATUS}></th>
- <th class="txtcenter width10"><{$smarty.const._AM_SYSTEM_COMMENTS_ACTION}></th>
- </tr>
- </thead>
- <tbody>
- <{foreach item=comments from=$comments}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td class="txtcenter"><input type='checkbox' name='commentslist_id[]' id='commentslist_id[]' value='<{$comments.comments_id}>'/></td>
- <td class="txtcenter"><{$comments.comments_icon}></td>
- <td class="txtcenter"><{$comments.comments_title}></td>
- <td class="txtcenter"><{$comments.comments_poster}></td>
- <td class="txtcenter"><{$comments.comments_ip}></td>
- <td class="txtcenter"><{$comments.comments_date}></td>
- <td class="txtcenter"><{$comments.comments_modid}></td>
- <td class="txtcenter"><{$comments.comments_status}></td>
- <td class="xo-actions txtcenter">
- <img class="cursorpointer" onclick="display_dialog('<{$comments.comments_id}>', true, true, 'slide', 'slide', 300, 500);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" />
- <a href="admin/comments/comment_edit.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._EDIT}>">
- <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>">
- </a>
- <a href="admin/comments/comment_delete.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._DELETE}>">
- <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>">
- </a>
- </td>
- </tr>
- <{/foreach}>
- </tbody>
- <tr>
- <td><input class='btn' type='submit' name='<{$smarty.const._DELETE}>' value='<{$smarty.const._DELETE}>' /></td>
- <td colspan="8"> </td>
- </tr>
- </table>
-</form>
-<{foreach item=comments from=$comments_popup}>
-<!--Pop-pup-->
-<div id='dialog<{$comments.comments_id}>' title='<{$comments.comments_icon}> <{$comments.comments_title}>' style='display:none;'>
- <img src="<{xoAdminIcons comment.png}>" alt="comments" title="comments" class="xo-commentsimg" />
- <p><{$comments.comments_text}></p>
-</div>
-<{/foreach}>
-<!--Pop-pup-->
-<div class="txtright"><{$nav}></div>
-<{/if}>
|
|
From: <du...@us...> - 2012-12-29 02:12:13
|
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'] = '';
|
|
From: <ma...@us...> - 2013-01-01 22:57:59
|
Revision: 10627
http://sourceforge.net/p/xoops/svn/10627
Author: mageg
Date: 2013-01-01 22:57:55 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
removal of unnecessary things
Modified Paths:
--------------
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/admin/images/
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/avatar.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/banner.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/bannerclient.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/image.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/imagecat.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/mail.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/ranks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/smilies.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_auth.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_mail.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_main.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_meta.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_mods.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_search.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_user.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_word.png
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/comments.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/images.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/mailusers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/images.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/mailusers.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_images.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_mailusers.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_smilies.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_userrank.html
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/avatar.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/avatar.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/avatar.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,81 +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.
-*/
-
-/**
- * Avatar 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 Gregory Mage (AKA Mage)
- * @author trabis <lus...@gm...>
- * @package system
- * @subpackage avatar
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemAvatarForm extends XoopsThemeForm
-{
- /**
- * @param XoopsAvatar|XoopsObject $obj
- */
- public function __construct(XoopsAvatar &$obj)
- {
- if ($obj->isNew()) {
- $blank_img = 'blank.gif';
- } else {
- $blank_img = str_replace('avatars/', '', $obj->getVar('avatar_file', 'e'));
- }
- // Get User Config
- $xoops = Xoops::getInstance();
- $xoopsConfigUser = $xoops->getConfigs();
-
- // New and edit form
- parent::__construct(_AM_SYSTEM_AVATAR_ADD, 'avatar_form', 'admin.php', "post", true);
- $this->setExtra('enctype="multipart/form-data"');
- // Name
- $this->addElement(new XoopsFormText(_IMAGENAME, 'avatar_name', 50, 255, $obj->getVar('avatar_name', 'e')), true);
- // Name description
- $maxpixel = '<div>' . _US_MAXPIXEL . ' : ' . $xoopsConfigUser['avatar_width'] . ' x ' . $xoopsConfigUser['avatar_height'] . '</div>';
- $maxsize = '<div>' . _US_MAXIMGSZ . ' : ' . $xoopsConfigUser['avatar_maxsize'] . '</div>';
- // Upload part
- $imgtray_img = new XoopsFormElementTray(_IMAGEFILE, '<br />');
- $imgtray_img->setDescription($maxpixel . $maxsize);
- $imageselect_img = new XoopsFormSelect(sprintf(_AM_SYSTEM_AVATAR_USE_FILE, XOOPS_UPLOAD_PATH . '/avatars/'), 'avatar_file', $blank_img);
- $image_array_img = XoopsLists::getImgListAsArray(XOOPS_UPLOAD_PATH . '/avatars');
- $imageselect_img->addOption("$blank_img", $blank_img);
- foreach ($image_array_img as $image_img) {
- $imageselect_img->addOption("$image_img", $image_img);
- }
- $imageselect_img->setExtra("onchange='showImgSelected(\"xo-avatar-img\", \"avatar_file\", \"avatars\", \"\", \"" . XOOPS_UPLOAD_URL . "\")'");
- $imgtray_img->addElement($imageselect_img, false);
- $imgtray_img->addElement(new XoopsFormLabel('', "<br /><img src='" . XOOPS_UPLOAD_URL . "/avatars/" . $blank_img . "' name='image_img' id='xo-avatar-img' alt='' />"));
- $fileseltray_img = new XoopsFormElementTray('<br />', '<br /><br />');
- $fileseltray_img->addElement(new XoopsFormFile(_AM_SYSTEM_AVATAR_UPLOAD, 'avatar_file', 500000), false);
- $imgtray_img->addElement($fileseltray_img);
- $this->addElement($imgtray_img);
- // Weight
- $this->addElement(new XoopsFormText(_IMGWEIGHT, 'avatar_weight', 3, 4, $obj->getVar('avatar_weight', 'e')));
- // Display
- $this->addElement(new XoopsFormRadioYN(_IMGDISPLAY, 'avatar_display', $obj->getVar('avatar_display', 'e'), _YES, _NO));
- // Hidden
- if ($obj->isNew()) {
- $this->addElement(new XoopsFormHidden('avatar_type', 's'));
- }
- $this->addElement(new XoopsFormHidden('op', 'save'));
- $this->addElement(new XoopsFormHidden('fct', 'avatars'));
- $this->addElement(new XoopsFormHidden('avatar_id', $obj->getVar('avatar_id', 'e')));
- // Button
- $this->addElement(new XoopsFormButton('', 'avt_button', _SUBMIT, 'submit'));
- }
-
-}
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/banner.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/banner.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/banner.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,58 +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.
-*/
-
-/**
- * Banner 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)
- * @package system
- * @subpackage banner
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemBannerForm extends XoopsThemeForm
-{
- /**
- * @param XoopsBanner|XoopsObject $obj
- */
- public function __construct(XoopsBanner &$obj)
- {
- $xoops = Xoops::getInstance();
-
- $title = $obj->isNew() ? sprintf( _AM_SYSTEM_BANNERS_ADDNWBNR ) : sprintf( _AM_SYSTEM_BANNERS_EDITBNR );
-
- parent::__construct($title, 'form', 'admin.php', 'post', true);
-
- $banner_client_Handler = $xoops->getModuleHandler('bannerclient', 'system');
- $client_select = new XoopsFormSelect( _AM_SYSTEM_BANNERS_CLINAMET, 'cid', $obj->getVar('cid') );
- $client_select->addOptionArray($banner_client_Handler->getList());
- $this->addElement($client_select, true);
-
- $this->addElement(new XoopsFormText( _AM_SYSTEM_BANNERS_IMPPURCHT, 'imptotal', 20, 255, $obj->getVar('imptotal') ), true );
- $this->addElement(new XoopsFormText( _AM_SYSTEM_BANNERS_IMGURLT, 'imageurl', 80, 255, $obj->getVar('imageurl') ), false );
- $this->addElement(new XoopsFormText( _AM_SYSTEM_BANNERS_CLICKURLT, 'clickurl', 80, 255, $obj->getVar('clickurl') ), false );
-
- $html_banner = $obj->isNew() ? 0 : $obj->getVar('htmlbanner');
- $this->addElement(new XoopsFormRadioYN( _AM_SYSTEM_BANNERS_USEHTML, 'htmlbanner', $html_banner, _YES, _NO) );
-
- $this->addElement(new xoopsFormTextArea( _AM_SYSTEM_BANNERS_CODEHTML, 'htmlcode', $obj->getVar('htmlcode'), 5, 50), false );
- if (!$obj->isNew()) {
- $this->addElement(new XoopsFormHidden( 'bid', $obj->getVar('bid') ) );
- }
- $this->addElement(new XoopsFormHidden('fct', 'banners'));
- $this->addElement(new XoopsFormHidden('op', 'banner_save' ) );
- $this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit' ) );
- }
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/bannerclient.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/bannerclient.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/bannerclient.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,49 +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.
-*/
-
-/**
- * Banner 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)
- * @package system
- * @subpackage bannerclient
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemBannerclientForm extends XoopsThemeForm
-{
- /**
- * @param XoopsBannerClient|XoopsObject $obj
- */
- public function __construct(XoopsBannerClient &$obj)
- {
- $title = $obj->isNew() ? sprintf( _AM_SYSTEM_BANNERS_ADDNWCLI ) : sprintf( _AM_SYSTEM_BANNERS_EDITADVCLI );
-
- parent::__construct($title, 'form', 'admin.php', 'post', true);
-
- $this->addElement(new XoopsFormText( _AM_SYSTEM_BANNERS_CLINAMET, 'name', 50, 255, $obj->getVar('name') ), true );
- $this->addElement(new XoopsFormText( _AM_SYSTEM_BANNERS_CONTNAMET, 'contact', 50, 255, $obj->getVar('contact') ) );
- $this->addElement(new XoopsFormText( _AM_SYSTEM_BANNERS_CONTMAILT, 'email', 50, 255, $obj->getVar('email') ) );
- $this->addElement(new XoopsFormText( _AM_SYSTEM_BANNERS_CLILOGINT, 'login', 50, 255, $obj->getVar('login') ) );
- $this->addElement(new XoopsFormText( _AM_SYSTEM_BANNERS_CLIPASST, 'passwd', 50, 255, $obj->getVar('passwd') ) );
- $this->addElement(new xoopsFormTextArea( _AM_SYSTEM_BANNERS_EXTINFO, 'extrainfo', $obj->getVar('extrainfo'), 5, 50 ), false );
- if (!$obj->isNew()) {
- $this->addElement(new XoopsFormHidden( 'cid', $obj->getVar('cid') ) );
- }
- $this->addElement(new XoopsFormHidden('fct', 'banners'));
- $this->addElement(new XoopsFormHidden( 'op', 'banner_client_save' ) );
- $this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit' ) );
- }
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/image.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/image.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/image.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,66 +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.
-*/
-
-/**
- * Image 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)
- * @package system
- * @subpackage images
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemImageForm extends XoopsThemeForm
-{
-
- /**
- * @param XoopsImage|XoopsObject $obj
- */
- public function __construct(XoopsImage &$obj)
- {
- $xoops = Xoops::getInstance();
-
- $imgcat_handler = $xoops->getHandlerImagecategory();
- $groups = $xoops->isUser() ? $xoops->user->getGroups() : XOOPS_GROUP_ANONYMOUS;
-
- if ($obj->isNew()) {
- $op = 'addfile';
- $title = _ADDIMAGE;
- $form = 'image_form';
- $id = 0;
- $cat = $imgcat_handler->getListByPermission($groups, 'imgcat_write');
- } else {
- $op = 'save';
- $title = _AM_SYSTEM_IMAGES_EDITIMG;
- $form = 'edit_form';
- $id = $obj->getVar('image_id');
- $cat = $imgcat_handler->getListByPermission($groups, 'imgcat_write', $obj->getVar('imgcat_id'));
- }
-
- parent::__construct($title, $form, 'admin.php', 'post', true);
- $this->setExtra('enctype="multipart/form-data"');
- $this->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255, $obj->getVar('image_nicename')), true);
- $select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id', $obj->getVar('imgcat_id'));
- $select->addOptionArray($cat);
- $this->addElement($select, true);
- $this->addElement(new XoopsFormFile(_IMAGEFILE, 'image_file', 5000000));
- $this->addElement(new XoopsFormText(_IMGWEIGHT, 'image_weight', 3, 4, $obj->getVar('image_weight')));
- $this->addElement(new XoopsFormRadioYN(_IMGDISPLAY, 'image_display', $obj->getVar('image_display'), _YES, _NO));
- $this->addElement(new XoopsFormHidden('image_id', $id));
- $this->addElement(new XoopsFormHidden('op', $op));
- $this->addElement(new XoopsFormHidden('fct', 'images'));
- $this->addElement(new XoopsFormButton('', 'img_button', _SUBMIT, 'submit'));
- }
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/imagecat.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/imagecat.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/imagecat.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,82 +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.
-*/
-
-/**
- * Image Category 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)
- * @package system
- * @subpackage images
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemImagecatForm extends XoopsThemeForm
-{
- /**
- * @param XoopsImagecategory $obj
- */
- public function __construct(XoopsImagecategory &$obj)
- {
- $xoops = Xoops::getInstance();
-
- $perm_handler = $xoops->getHandlerGroupperm();
-
- if ($obj->isNew()) {
- $op = 'addcat';
- $title = _AM_SYSTEM_IMAGES_ADDCAT;
- $id = 0;
- $read = XOOPS_GROUP_ADMIN;
- $write = XOOPS_GROUP_ADMIN;
- $maxsize = 50000;
- $maxwidth = 120;
- $maxheight = 120;
- $weight = 0;
- $display = 1;
- } else {
- $op = 'updatecat';
- $title = _AM_SYSTEM_IMAGES_EDITCAT;
- $id = $obj->getVar('imgcat_id');
- $read = $perm_handler->getGroupIds('imgcat_read', $obj->getVar('imgcat_id'));
- $write = $perm_handler->getGroupIds('imgcat_write', $obj->getVar('imgcat_id'));
- $maxsize = $obj->getVar('imgcat_maxsize');
- $maxwidth = $obj->getVar('imgcat_maxwidth');
- $maxheight = $obj->getVar('imgcat_maxheight');
- $weight = $obj->getVar('imgcat_weight');
- $display = $obj->getVar('imgcat_display');
- }
-
- parent::__construct($title, 'imagecat_form', 'admin.php', 'post', true);
- $this->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATNAME, 'imgcat_name', 50, 255, $obj->getVar('imgcat_name')), true);
- $this->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATRGRP, 'readgroup', true, $read, 5, true));
- $this->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATWGRP, 'writegroup', true, $write, 5, true));
- $this->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, $maxsize));
- $this->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, $maxwidth));
- $this->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, $maxheight));
- $this->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATWEIGHT, 'imgcat_weight', 3, 4, $weight));
- $this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_IMAGES_IMGCATDISPLAY, 'imgcat_display', $display, _YES, _NO));
- if ($obj->isNew()) {
- $store = new XoopsFormRadio(_MD_IMGCATSTRTYPE . '<div class="red">' . _MD_STRTYOPENG . '</div>', 'imgcat_storetype', 'file');
- $store->addOptionArray(array('file' => _MD_ASFILE, 'db' => _MD_INDB));
- $this->addElement($store);
- } else {
- $store = array('db' => _AM_SYSTEM_IMAGES_INDB, 'file' => _AM_SYSTEM_IMAGES_ASFILE);
- $this->addElement(new XoopsFormLabel(_AM_SYSTEM_IMAGES_IMGCATSTRTYPE, $store[$obj->getVar('imgcat_storetype')]));
- }
- $this->addElement(new XoopsFormHidden('imgcat_id', $id));
- $this->addElement(new XoopsFormHidden('op', $op));
- $this->addElement(new XoopsFormHidden('fct', 'images'));
- $this->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
- }
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/mail.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/mail.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/mail.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,33 +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.
-*/
-
-/**
- *
- *
- * @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)
- * @package
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemMailForm extends XoopsThemeForm
-{
- /**
- * @param null $obj
- */
- public function __construct($obj = null)
- {
- }
-
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/ranks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/ranks.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/ranks.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,84 +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.
-*/
-
-/**
- * Ranks 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)
- * @package system
- * @subpackage userrank
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemRanksForm extends XoopsThemeForm
-{
- /**
- * @param XoopsRank|XoopsObject $obj
- */
- public function __construct(XoopsRank &$obj)
- {
- if ($obj->isNew()) {
- $blank_img = 'blank.gif';
- } else {
- $blank_img = str_replace( 'ranks/', '', $obj->getVar('rank_image', 'e'));
- }
-
- $title = $obj->isNew() ? sprintf(_AM_SYSTEM_USERRANK_ADD) : sprintf(_AM_SYSTEM_USERRANK_EDIT);
-
- parent::__construct($title, 'form', 'admin.php', 'post', true);
- $this->setExtra('enctype="multipart/form-data"');
-
- $this->addElement( new XoopsFormText( _AM_SYSTEM_USERRANK_TITLE, 'rank_title', 50, 50, $obj->getVar('rank_title'), true ) );
- $this->addElement( new XoopsFormText( _AM_SYSTEM_USERRANK_MINPOST, 'rank_min', 10, 10, $obj->getVar('rank_min') ) );
- $this->addElement( new XoopsFormText( _AM_SYSTEM_USERRANK_MAXPOST, 'rank_max', 10, 10, $obj->getVar('rank_max') ) );
-
- $imgtray_img = new XoopsFormElementTray( _AM_SYSTEM_USERRANK_IMAGE, '<br />' );
- $imgpath_img = sprintf( _AM_SYSTEM_USERRANK_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/ranks/' );
- $imageselect_img = new XoopsFormSelect( $imgpath_img, 'rank_image', $blank_img);
- $image_array_img = XoopsLists::getImgListAsArray( XOOPS_UPLOAD_PATH . '/ranks' );
- $imageselect_img->addOption( "$blank_img", $blank_img );
- foreach ($image_array_img as $image_img) {
- $imageselect_img->addOption( "$image_img", $image_img );
- }
- $imageselect_img->setExtra( "onchange='showImgSelected(\"xo-ranks-img\", \"rank_image\", \"ranks\", \"\", \"" . XOOPS_UPLOAD_URL . "\")'" );
- $imgtray_img->addElement( $imageselect_img, false );
- $imgtray_img->addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_UPLOAD_URL . "/ranks/" . $blank_img . "' name='image_img' id='xo-ranks-img' alt='' />" ) );
-
- $fileseltray_img = new XoopsFormElementTray('<br />','<br /><br />');
- $fileseltray_img->addElement( new XoopsFormFile( _AM_SYSTEM_USERRANK_UPLOAD , 'rank_image', 500000 ), false );
- $fileseltray_img->addElement( new XoopsFormLabel(''), false );
- $imgtray_img->addElement( $fileseltray_img );
- $this->addElement( $imgtray_img );
-
- if (!$obj->isNew()) {
- $rank_special = $obj->getVar('rank_special');
- } else {
- $rank_special = 0;
- }
-
- $special_tray = new XoopsFormElementTray(_AM_SYSTEM_USERRANK_SPECIAL, '<br />');
- $special_tray->setDescription( _AM_SYSTEM_USERRANK_SPECIAL_CAN );
- $special_tray->addElement( new XoopsFormRadioYN( '', 'rank_special', $rank_special ) );
- $this->addElement( $special_tray );
- if ( !$obj->isNew() ) {
- $this->addElement( new XoopsFormHidden( 'rank_id', $obj->getVar('rank_id')) );
- }
- $this->addElement( new XoopsFormHidden( 'fct', 'userrank') );
- $this->addElement( new XoopsFormHidden( 'op', 'userrank_save') );
- $this->addElement( new XoopsFormButton( '', 'submit', _SUBMIT, 'submit') );
- }
-
-
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/smilies.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/smilies.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/smilies.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,77 +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.
-*/
-
-/**
- * Smilies Class Form
- *
- * @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)
- * @package system
- * @subpackage smilies
- * @version $Id$
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-class SystemSmiliesForm extends XoopsThemeForm
-{
- /**
- * @param XoopsSmilies|XoopsObject $obj
- */
- public function __construct(XoopsSmilies &$obj)
- {
- if ($obj->isNew()) {
- $blank_img = 'blank.gif';
- } else {
- $blank_img = str_replace( 'smilies/', '', $obj->getVar('smile_url', 'e') );
- }
-
-
- $title = $obj->isNew() ? sprintf(_AM_SYSTEM_SMILIES_ADD) : sprintf(_AM_SYSTEM_SMILIES_EDIT);
-
- parent::__construct($title, 'form', 'admin.php', 'post', true);
- $this->setExtra('enctype="multipart/form-data"');
- $this->addElement(new XoopsFormText(_AM_SYSTEM_SMILIES_CODE, 'code', 26, 25, $obj->getVar('code')), true);
- $this->addElement(new XoopsFormText(_AM_SYSTEM_SMILIES_DESCRIPTION, 'emotion', 50, 50, $obj->getVar('emotion')), true);
-
- $imgtray_img = new XoopsFormElementTray( _AM_SYSTEM_SMILIES_FILE, '<br />' );
- $imgpath_img = sprintf( _AM_SYSTEM_SMILIES_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/smilies/' );
- $imageselect_img = new XoopsFormSelect( $imgpath_img, 'smile_url', $blank_img );
- $image_array_img = XoopsLists::getImgListAsArray( XOOPS_UPLOAD_PATH . '/smilies' );
- $imageselect_img->addOption("$blank_img", $blank_img);
- foreach ($image_array_img as $image_img) {
- $imageselect_img->addOption("$image_img", $image_img);
- }
- $imageselect_img->setExtra( 'onchange="showImgSelected(\'xo-smilies-img\', \'smile_url\', \'smilies\', \'\', \'' . XOOPS_UPLOAD_URL . '\' )"' );
- $imgtray_img->addElement( $imageselect_img, false);
- $imgtray_img->addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_UPLOAD_URL . "/smilies/" . $blank_img . "' name='image_img' id='xo-smilies-img' alt='' />" ) );
-
- $fileseltray_img = new XoopsFormElementTray('<br />','<br /><br />');
- $fileseltray_img->addElement(new XoopsFormFile(_AM_SYSTEM_SMILIES_UPLOADS , 'smile_url', 500000),false);
- $fileseltray_img->addElement(new XoopsFormLabel(''), false);
- $imgtray_img->addElement($fileseltray_img);
- $this->addElement($imgtray_img);
-
- if (!$obj->isNew()) {
- $this->addElement(new XoopsFormHidden('smilies_id', $obj->getVar('id')));
- $display = $obj->getVar('display');
- } else {
- $display = 0;
- }
-
- $this->addElement(new XoopsFormRadioYN(_AM_SYSTEM_SMILIES_OFF, 'display', $display));
- $this->addElement(new XoopsFormHidden('fct', 'smilies'));
- $this->addElement(new XoopsFormHidden('op', 'save_smilie'));
- $this->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- }
-
-}
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_auth.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_mail.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_main.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_meta.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_mods.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_search.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_user.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/images/icons/default/xoops/system_word.png
===================================================================
(Binary files differ)
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/comments.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/comments.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/comments.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,51 +0,0 @@
-<?php
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * _LANGCODE en
- * _CHARSET UTF-8
- * @version $Id$
- */
-
-// Manager
-define("_AM_SYSTEM_COMMENTS_NAV_MANAGER","Comment Management");
-define("_AM_SYSTEM_COMMENTS_NAV_MAIN","List");
-define("_AM_SYSTEM_COMMENTS_NAV_PURGE","Purge");
-
-// Nav
-define("_AM_SYSTEM_COMMENTS_MODULE_ADMIN","Modules Administration");
-
-// Tips
-define("_AM_SYSTEM_COMMENTS_NAV_TIPS","
-<ul>
-<li>Manage comments for all your modules.</li>
-<li>Delete comments easily with the purge.</li>
-</ul>");
-
-// Form
-define("_AM_SYSTEM_COMMENTS_FORM_LIST_COMMENTS","List Comments");
-define("_AM_SYSTEM_COMMENTS_FORM_ALL_MODS","All modules");
-define("_AM_SYSTEM_COMMENTS_FORM_ALL_STATUS","Any status");
-
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE","Purge");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_DATE_AFTER","After this date (leave empty for any date)");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_DATE_BEFORE","Before this date (leave empty for any date)");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_GROUPS","Groups");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_USER","User name");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_STATUS","Status");
-define("_AM_SYSTEM_COMMENTS_FORM_PURGE_MODULES","Modules");
-
-// Tab
-define("_AM_SYSTEM_COMMENTS_TITLE","Title");
-define("_AM_SYSTEM_COMMENTS_POSTED","Author");
-define("_AM_SYSTEM_COMMENTS_IP","IP");
-define("_AM_SYSTEM_COMMENTS_MODULE","Module");
-define("_AM_SYSTEM_COMMENTS_STATUS","Status");
-define("_AM_SYSTEM_COMMENTS_ACTION","Action");
-define("_AM_SYSTEM_COMMENTS_VIEW","See comment");
-
-define("_AM_SYSTEM_COMMENTS_NO_COMMENTS","No comments");
-define("_AM_SYSTEM_COMMENTS_COMMENTS_FOUND","%s comment(s) found.");
-
-//since 2.6
-define("_AM_SYSTEM_COMMENTS_DELETE_LIMIT","Sorry, you can delete only 4000 comments at a time.");
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/images.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/images.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/images.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,55 +0,0 @@
-<?php
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * _LANGCODE en
- * _CHARSET UTF-8
- * @version $Id$
- */
-
-// Navigation
-define("_AM_SYSTEM_IMAGES_MANAGER","Image Manager");
-define("_AM_SYSTEM_IMAGES_MAIN","Main");
-define("_AM_SYSTEM_IMAGES_IMGLIST","Image List");
-
-// Main
-define("_AM_SYSTEM_IMAGES_ADDCAT","Add Category");
-define("_AM_SYSTEM_IMAGES_EDITCAT","Edit Category");
-define("_AM_SYSTEM_IMAGES_ADDIMG","Add Image");
-define("_AM_SYSTEM_IMAGES_EDITIMG","Edit Image");
-define("_AM_SYSTEM_IMAGES_CATLIST","Category List");
-define("_AM_SYSTEM_IMAGES_NOCAT","No Category Available");
-define("_AM_SYSTEM_IMAGES_NAME","Name");
-define("_AM_SYSTEM_IMAGES_NBIMAGES","Images");
-define("_AM_SYSTEM_IMAGES_MAXSIZE","Max size");
-define("_AM_SYSTEM_IMAGES_MAXWIDTH","Max width");
-define("_AM_SYSTEM_IMAGES_MAXHEIGHT","Max height");
-define("_AM_SYSTEM_IMAGES_DISPLAY","Display");
-define("_AM_SYSTEM_IMAGES_ACTIONS","Actions");
-define("_AM_SYSTEM_IMAGES_VIEW","View");
-define("_AM_SYSTEM_IMAGES_INDB",' Store in the database (as binary "blob" data)');
-define("_AM_SYSTEM_IMAGES_ASFILE"," Store as files (in uploads directory)<br />");
-define("_AM_SYSTEM_IMAGES_IMGCATNAME","Category Name:");
-define("_AM_SYSTEM_IMAGES_IMGCATRGRP",'Select groups for image manager use:<br /><br /><span style="font-weight: normal;">These are groups allowed to use the image manager for selecting images but not uploading. Webmaster has automatic access.</span>');
-define("_AM_SYSTEM_IMAGES_IMGCATWGRP",'Select groups allowed to upload images:<br /><br /><span style="font-weight: normal;">Typical usage is for moderator and admin groups.</span>');
-define("_AM_SYSTEM_IMAGES_IMGCATDISPLAY","Display this category ?");
-define("_AM_SYSTEM_IMAGES_IMGCATSTRTYPE","Images are uploaded to:");
-define("_AM_SYSTEM_IMAGES_STRTYOPENG","This can not be changed afterwards!");
-define("_AM_SYSTEM_IMAGES_IMGCATWEIGHT","Display order in image manager:");
-define("_AM_SYSTEM_IMAGES_OFF","Display in image manager");
-define("_AM_SYSTEM_IMAGES_ON","Does not display in image manager");
-define("_AM_SYSTEM_IMAGES_URL","Show image URL");
-
-// Messages
-define("_AM_SYSTEM_IMAGES_RUDELIMG","Are you sure to delete this images file?");
-define("_AM_SYSTEM_IMAGES_FAILSAVE","Failed save image %s into the database");
-define("_AM_SYSTEM_IMAGES_RUDELIMGCAT","Are you sure to delete this category and all of its images files?");
-define("_AM_SYSTEM_IMAGES_FAILDEL","Failed deleting image %s from the database");
-define("_AM_SYSTEM_IMAGES_FAILDELCAT","Failed deleting image category %s from the database");
-define("_AM_SYSTEM_IMAGES_FAILUNLINK","Failed deleting image %s from the server directory");
-define("_AM_SYSTEM_IMAGES_SCATDELNG","Can't delete this category");
-
-// Tips
-define("_AM_SYSTEM_IMAGES_TIPS","<ul><li>Manage categories of images and users permissions</li></ul>");
-
-?>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/mailusers.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/mailusers.php 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/mailusers.php 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,54 +0,0 @@
-<?php
-/**
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * _LANGCODE en
- * _CHARSET UTF-8
- * @version $Id$
- */
-
-define("_AM_SYSTEM_MAILUSERS_AMIFCHECKD", "If this is checked, all the above plus private messaging will be ignored");
-define("_AM_SYSTEM_MAILUSERS_EMAIL","Email");
-define("_AM_SYSTEM_MAILUSERS_GROUPIS", " - Group:");
-define("_AM_SYSTEM_MAILUSERS_DAY", " - Last Login days ago:");
-define("_AM_SYSTEM_MAILUSERS_IDLEMORE", "more than X");
-define("_AM_SYSTEM_MAILUSERS_IDLELESS", "less than X");
-
-define("_AM_SYSTEM_MAILUSERS_DATE", " - Last Login date:");
-define("_AM_SYSTEM_MAILUSERS_LASTLOGMAX", "before");
-define("_AM_SYSTEM_MAILUSERS_LASTLOGMIN", "after");
-
-define("_AM_SYSTEM_MAILUSERS_REGDATE", " - Registered date:");
-define("_AM_SYSTEM_MAILUSERS_REGDMIN", "after");
-define("_AM_SYSTEM_MAILUSERS_REGDMAX", "before");
-
-define("_AM_SYSTEM_MAILUSERS_INACTIVE","Send message to inactive users only");
-define("_AM_SYSTEM_MAILUSERS_MAILOK","Send message only to users that accept notification messages");
-
-define("_AM_SYSTEM_MAILUSERS_OPTIONAL", "Optional value");
-
-define("_AM_SYSTEM_MAILUSERS_LIST", "Send Message to Users");
-define("_AM_SYSTEM_MAILUSERS_MAILBODY","Body");
-define("_AM_SYSTEM_MAILUSERS_MAILFNAME","From Name (email only)");
-define("_AM_SYSTEM_MAILUSERS_MAILFMAIL","From Email (email only)");
-
-define("_AM_SYSTEM_MAILUSERS_MAILTAGS","Useful Tags:");
-define("_AM_SYSTEM_MAILUSERS_MAILTAGS1","{X_UID} will print user id");
-define("_AM_SYSTEM_MAILUSERS_MAILTAGS2","{X_UNAME} will print user name");
-define("_AM_SYSTEM_MAILUSERS_MAILTAGS3","{X_UEMAIL} will print user email");
-define("_AM_SYSTEM_MAILUSERS_MAILTAGS4","{X_UACTLINK} will print user activation link");
-define("_AM_SYSTEM_MAILUSERS_MAILSUBJECT","Subject");
-define("_AM_SYSTEM_MAILUSERS_MANAGER", "User Message Manager");
-define("_AM_SYSTEM_MAILUSERS_SENDNEXT", "Next");
-define("_AM_SYSTEM_MAILUSERS_NOUSERMATCH", "No user matched");
-define("_AM_SYSTEM_MAILUSERS_PM","Private Message");
-
-define("_AM_SYSTEM_MAILUSERS_SENDCOMP", "Sending message completed.");
-define("_AM_SYSTEM_MAILUSERS_SENDTO","Send to");
-define("_AM_SYSTEM_MAILUSERS_SENDTOUSERS","Send message to users whose:");
-define("_AM_SYSTEM_MAILUSERS_SENDTOUSERS2","Send to:");
-define("_AM_SYSTEM_MAILUSERS_SENT", "Sent Users");
-define("_AM_SYSTEM_MAILUSERS_SENTNUM", "%s - %s (total: %s users)");
-define("_AM_SYSTEM_MAILUSERS_TIMEFORMAT", "(Format yyyy-mm-dd, optional)");
-
-?>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/comments.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/comments.html 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/comments.html 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,12 +0,0 @@
-<h1>Help: Comments</h1>
-
-<h4>Description</h4>
-<p>
-Site administrators have the option of providing a comments section for users. Comments can be added to many modules and displayed in a variety of ways. Comments can be screened, filtered, and made available to selected groups. This provides quick easy interaction from site users, while maintaining good moderation and security.<br /><br />
-
-The Comment Manager allows the Site administrator to edit and delete any comment that has been posted to the site, originating in any module that supports the comments feature.
-Like the Blocks Administration page, some filters options are available to help the site administrator manage the comments. <br /><br />
-
-You can also select several comments and delete them at once.
-
-</p>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/images.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/images.html 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/images.html 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,9 +0,0 @@
-<h1>Help: Image Manager</h1>
-
-<h4>Description</h4>
-<p>
-The Image Manager is a tool that enables people to upload, organize and retrieve images for use throughout the site. You must configure the image manager before you can use it - this involves creating some categories to store your images and setting preferences on issues such as maximum image dimensions, file size and user group access rights. Each category is configured separately.<br /><br />
-
-Images can be categorized and uploaded directly into the images manager through a browser in this window with one click of a button, enabling easy insertion of images into news articles and other content. There is an extensive permission system controlling image dimensions, file size and access of user groups to different categories.
-
-</p>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/mailusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/mailusers.html 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/help/mailusers.html 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,8 +0,0 @@
-<h1>Help: Mail Users</h1>
-<h4>Description</h4>
-
-<p>
-XOOPS has a built in messaging system that enables you to send a message to your entire registered user base or subgroups thereof, or using date filters. This can be in the form of a private message (i.e. through the XOOPS built-in messaging system) or through an email. A range of options is available for filtering out subgroups of users from your membership.<br /><br />
-
-You can also use predefined tags that will enable you to personalize your message.
-</p>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_images.html 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_images.html 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,216 +0,0 @@
-<!-- Header -->
-<{includeq file="admin:system|admin_breadcrumb.html"}>
-<{includeq file="admin:system|admin_tips.html"}>
-<{includeq file="admin:system|admin_buttons.html"}>
-<!-- Buttons -->
-<div class="floatright">
- <div class="xo-buttons">
- <{if !$edit_form && !$listimg}>
- <button id="xo-addcat-btn" class="btn" onclick="xo_toggle('div#xo-category-add');" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>">
- <img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>" />
- <{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>
- </button>
- <{/if}>
- <{if $cat_img || $listimg}>
- <button id="xo-addimg-btn" class="btn" onclick="xo_toggle('div#xo-images-add');" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>">
- <img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>" />
- <{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>
- </button>
- <{/if}>
- </div>
-</div>
-<!-- Category List -->
-<{if !$edit_form && !$listimg}>
-<table class="outer" cellspacing="1">
- <thead>
- <tr>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_NAME}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_NBIMAGES}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXSIZE}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXWIDTH}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_MAXHEIGHT}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_DISPLAY}></th>
- <th><{$smarty.const._AM_SYSTEM_IMAGES_ACTIONS}></th>
- </tr>
- </thead>
- <tbody>
- <{foreach item=cat from=$cat_img}>
- <tr class="<{cycle values='odd, even'}> txtcenter">
- <td>
- <a class="xo-tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
- <{$cat.name}>
- </a>
- </td>
- <td><{$cat.count}></td>
- <td><{$cat.maxsize}></td>
- <td><{$cat.maxwidth}></td>
- <td><{$cat.maxheight}></td>
- <td class="xo-actions"><img id="loading_cat<{$cat.id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer xo-tooltip" id="cat<{$cat.id}>" onclick="system_setStatus( { fct: 'images', op: 'display_cat', imgcat_id: <{$cat.id}> }, 'cat<{$cat.id}>', 'admin.php' )" src="<{if $cat.display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="" title="<{if $cat.display}><{$smarty.const._AM_SYSTEM_IMAGES_OFF}><{else}><{$smarty.const._AM_SYSTEM_IMAGES_ON}><{/if}>" />
- </td>
- <td class="xo-actions txtcenter">
- <a class="xo-tooltip" href="admin.php?fct=images&op=listimg&imgcat_id=<{$cat.id}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>">
- <img src="<{xoAdminIcons view.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
- </a>
- <{if $xoops_isadmin}>
- <a class="xo-tooltip" href="admin.php?fct=images&op=editcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
- <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" />
- </a>
- <a class="xo-tooltip" href="admin.php?fct=images&op=delcat&imgcat_id=<{$cat.id}>" title="<{$smarty.const._EDIT}>">
- <img src="<{xoAdminIcons delete.png}>" alt="" />
- </a>
- <{/if}>
- </td>
- </tr>
- <{/foreach}>
- <{if !$cat_img}>
- <tr>
- <td class="txtcenter bold odd" colspan="7"><{$smarty.const._AM_SYSTEM_IMAGES_NOCAT}></td>
- </tr>
- <{/if}>
- </tbody>
-</table>
-<!-- Nav menu -->
-<{if $nav_menu}><div class="xo-avatar-pagenav floatright"><{$nav_menu}></div><div class="clear spacer"></div><{/if}>
-<{/if}>
-<{if $images}>
-<!-- Image list -->
-<div id="xo-category-add" class="">
- <{foreach item=img from=$images}>
- <div class="floatleft">
- <div class="ui-corner-all xo-thumb txtcenter">
- <div class="xo-thumbimg">
- <{if !$db_store}>
- <img class="xo-tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$img.image_name}>&h=120&w=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" />
- <{else}>
- <img class="xo-tooltip" src="<{$xoops_url}>/image.php?id=<{$img.image_id}>" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" style="max-width:120px; max-height:120px;" />
- <{/if}>
- </div>
- <div class="xo-actions txtcenter">
- <div class="spacer bold"><{$img.image_nicename}></div>
- <img id="loading_img<{$img.image_id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer xo-tooltip" id="img<{$img.image_id}>" onclick="system_setStatus( { fct: 'images', op: 'display_img', image_id: <{$img.image_id}> }, 'img<{$img.image_id}>', 'admin.php' )" src="<{if $img.image_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
- <{if !$db_store}>
- <a class="lightbox xo-tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$img.image_nicename}>">
- <{else}>
- <a class="lightbox xo-tooltip" href="<{$xoops_url}>/image.php?id=<{$img.image_id}>" title="<{$img.image_nicename}>">
- <{/if}>
- <img src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
- </a>
- <a class="xo-tooltip" href="admin.php?fct=images&op=editimg&image_id=<{$img.image_id}>" title="<{$smarty.const._EDIT}>">
- <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>" />
- </a>
- <a class="xo-tooltip" href="admin.php?fct=images&op=delfile&image_id=<{$img.image_id}>" title="<{$smarty.const._DELETE}>">
- <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" />
- </a>
- <img class="xo-tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
- </div>
- </div>
- </div>
-
- <div id="dialog<{$img.image_id}>" title="<{$img.image_nicename}>" style='display:none;'>
- <div class="center">
- <{if !$db_store}>
- <{$xoops_upload_url}>/<{$img.image_name}>
- <{else}>
- <{$xoops_url}>/image.php?id=<{$img.image_id}>
- <{/if}>
- </div>
- </div>
-
- <{/foreach}>
- <div class="clear"></div>
-</div>
-<{if $nav_menu}><div class="xo-avatar-pagenav floatright"><{$nav_menu}></div><div class="clear spacer"></div><{/if}>
-<{/if}>
-
-<!-- Add Image form -->
-<div id="xo-images-add" class="hide">
- <br />
- <{$image_form.javascript}>
- <form name="<{$image_form.name}>" id="<{$image_form.name}>" action="<{$image_form.action}>" method="<{$image_form.method}>" <{$image_form.extra}> >
- <table class="outer">
- <tr>
- <th colspan="2"><{$image_form.title}></th>
- </tr>
- <{foreach item=element from=$image_form.elements}>
- <{if $element.hidden != true && $element.body != ''}>
- <tr>
- <td class="odd aligntop">
- <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
- <div class="spacer"><{$element.description}></div>
- </td>
- <td class="even"><{$element.body}></td>
- </tr>
- <{else}>
- <{$element.body}>
- <{/if}>
- <{/foreach}>
- </table>
- </form>
-</div>
-<!-- Add Category form -->
-<div id="xo-category-add" class="hide">
- <br />
- <{$imagecat_form.javascript}>
- <form name="<{$imagecat_form.name}>" id="<{$imagecat_form.name}>" action="<{$imagecat_form.action}>" method="<{$imagecat_form.method}>" <{$imagecat_form.extra}> >
- <table class="outer">
- <tr>
- <th colspan="2"><{$imagecat_form.title}></th>
- </tr>
- <{foreach item=element from=$imagecat_form.elements}>
- <{if $element.hidden != true && $element.body != ''}>
- <tr>
- <td class="odd aligntop">
- <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
- <div class="spacer"><{$element.description}></div>
- </td>
- <td class="even"><{$element.body}></td>
- </tr>
- <{else}>
- <{$element.body}>
- <{/if}>
- <{/foreach}>
- </table>
- </form>
-</div>
-<!-- Edit form image -->
-<{if $edit_form}>
-<div id="xo-images-add" class="">
- <{$edit_thumbs}>
- <br />
- <{$edit_form.javascript}>
- <form name="<{$edit_form.name}>" id="<{$edit_form.name}>" action="<{$edit_form.action}>" method="<{$edit_form.method}>" <{$edit_form.extra}> >
- <table class="outer">
- <tr>
- <th colspan="2"><{$edit_form.title}></th>
- </tr>
- <{foreach item=element from=$edit_form.elements}>
- <{if $element.hidden != true && $element.body != ''}>
- <tr>
- <td class="odd aligntop">
- <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div>
- <div class="spacer"><{$element.description}></div>
- </td>
- <td class="even"><{$element.body}></td>
- </tr>
- <{else}>
- <{$element.body}>
- <{/if}>
- <{/foreach}>
- </table>
- </form>
-</div>
-<{/if}>
-<script type="text/javascript">
- IMG_ON = '<{xoAdminIcons success.png}>';
- IMG_OFF = '<{xoAdminIcons cancel.png}>';
-
- $('.lightbox').lightBox({
- imageLoading:'language/<{$xoops_language}>/images/lightbox-ico-loading.gif',
- imageBtnClose:'language/<{$xoops_language}>/images/lightbox-btn-close.gif',
- imageBtnNext:'language/<{$xoops_language}>/images/lightbox-btn-next.gif',
- imageBtnPrev:'language/<{$xoops_language}>/images/lightbox-btn-prev.gif',
- imageBlank:'language/<{$xoops_language}>/images/lightbox-blank.gif'
- });
-
-
-</script>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_mailusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_mailusers.html 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_mailusers.html 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,9 +0,0 @@
-<!--smilies-->
-<{includeq file="admin:system|system_header.html"}>
-<!-- Display mailusers form -->
-<br />
-<{if $form}>
- <div class="spacer"><{$form}></div>
-<{/if}>
-<{$Sucess}>
-<{$Errors}>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_smilies.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_smilies.html 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_smilies.html 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,57 +0,0 @@
-<!--smilies-->
-<{includeq file="admin:system|system_header.html"}>
-<script type="text/javascript">
- IMG_ON = '<{xoAdminIcons success.png}>';
- IMG_OFF = '<{xoAdminIcons cancel.png}>';
-</script>
-<{if $smilies_count == true}>
-<div class="floatright">
- <div class="xo-buttons">
- <a class="ui-corner-all tooltip" href="admin.php?fct=smilies&op=new_smilie" title="<{$smarty.const._AM_SYSTEM_SMILIES_ADD}>">
- <img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_SMILIES_ADD}>" />
- <{$smarty.const._AM_SYSTEM_SMILIES_ADD}>
- </a>
- </div>
-</div>
-<table id="xo-smilies-sorter" cellspacing="1" class="outer tablesorter">
- <thead>
- <tr>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_SMILIES_CODE}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_SMILIES_SMILIE}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_SMILIES_DESCRIPTION}></th>
- <th class="txtcenter"><{$smarty.const._AM_SYSTEM_SMILIES_DISPLAY}></th>
- <th class="txtcenter width10"><{$smarty.const._AM_SYSTEM_SMILIES_ACTION}></th>
- </tr>
- </thead>
- <tbody>
- <{foreach item=smilies from=$smilies}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td class="txtcenter width5"><{$smilies.code}></td>
- <td class="txtcenter width5"><{$smilies.image}></td>
- <td class="txtcenter width50"><{$smilies.emotion}></td>
- <td class="xo-actions txtcenter width10">
- <img id="loading_sml<{$smilies.smilies_id}>" src="images/spinner.gif" style="display:none;" title="<{$smarty.const._AM_SYSTEM_LOADING}>" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer tooltip" id="sml<{$smilies.smilies_id}>" onclick="system_setStatus( { fct: 'smilies', op: 'smilies_update_display', smilies_id: <{$smilies.smilies_id}> }, 'sml<{$smilies.smilies_id}>', 'admin.php' )" src="<{if $smilies.display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{if $smilies.display}><{$smarty.const._AM_SYSTEM_SMILIES_OFF}><{else}><{$smarty.const._AM_SYSTEM_SMILIES_ON}><{/if}>" title="<{if $smilies.display}><{$smarty.const._AM_SYSTEM_SMILIES_OFF}><{else}><{$smarty.const._AM_SYSTEM_SMILIES_ON}><{/if}>" />
- </td>
- <td class="xo-actions txtcenter width10">
- <a class="tooltip" href="admin.php?fct=smilies&op=edit_smilie&smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._AM_SYSTEM_SMILIES_EDIT}>">
- <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SYSTEM_SMILIES_EDIT}>" />
- </a>
- <a class="tooltip" href="admin.php?fct=smilies&op=smilies_delete&smilies_id=<{$smilies.smilies_id}>" title="<{$smarty.const._AM_SYSTEM_SMILIES_DELETE}>">
- <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_SMILIES_DELETE}>" />
- </a>
- </td>
- </tr>
- <{/foreach}>
- </tbody>
-</table>
-<!-- Display smilies navigation -->
-<div class="clear spacer"></div>
-<{if $nav_menu}>
-<div class="xo-avatar-pagenav floatright"><{$nav_menu}></div>
-<div class="clear spacer"></div>
-<{/if}>
-<{/if}>
-<!-- Display smilies form (add,edit) -->
-<{if $form}>
-<div class="spacer"><{$form}></div>
-<{/if}>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_userrank.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_userrank.html 2013-01-01 22:35:09 UTC (rev 10626)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_userrank.html 2013-01-01 22:57:55 UTC (rev 10627)
@@ -1,59 +0,0 @@
-<{includeq file="admin:system|system_header.html"}>
-<script type="text/javascript">
- IMG_ON = '<{xoAdminIcons success.png}>';
- IMG_OFF = '<{xoAdminIcons cancel.png}>';
-</script>
-<!--User rank-->
-<{if $userrank_count == true}>
-<div class="floatright">
- <div class="xo-buttons">
- <a class="ui-corner-all tooltip" href="admin.php?fct=userrank&op=userrank_new" tit...
[truncated message content] |
|
From: <du...@us...> - 2013-01-04 20:16:20
|
Revision: 10663
http://sourceforge.net/p/xoops/svn/10663
Author: dugris
Date: 2013-01-04 20:16:17 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Improvement : plugin for block user menu
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/extension.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-01-04 19:51:19 UTC (rev 10662)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-01-04 20:16:17 UTC (rev 10663)
@@ -33,7 +33,7 @@
$block = array();
$system_extension = new SystemExtension();
- $extensions = $system_extension->getExtensionList();
+ $extensions = $system_extension->getExtensionPlugin('system', 'userMenus');
foreach ($extensions as $i => $extension) {
if ($plugin = Xoops_Module_Plugin::getPlugin($extension->getVar('dirname'), 'system')) {
if (method_exists($plugin, 'userMenus') && $plugin->userMenus()) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/extension.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/extension.php 2013-01-04 19:51:19 UTC (rev 10662)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/extension.php 2013-01-04 20:16:17 UTC (rev 10663)
@@ -25,7 +25,7 @@
public function getExtension( $mod = '' )
{
$ret = array();
- $extension = $this->getExtensionList();
+ $extension = self::getExtensionList();
foreach( $extension as $list ) {
/* @var $list XoopsModule */
if ( $list->getInfo('install') ) {
@@ -102,4 +102,34 @@
}
return $ret;
}
+
+ /**
+ * Return extensions by plugin
+ * @return array
+ */
+ public function getExtensionPlugin($dirname='system', $pluginName = '')
+ {
+ if (empty($pluginName)) {
+ return self::getExtensionList();
+ }
+ // Get main instance
+ $xoops = Xoops::getInstance();
+ $module_handler = $xoops->getHandlerModule();
+ $moduleperm_handler = $xoops->getHandlerGroupperm();
+
+ $ret = array();
+ foreach ($this->_list as $file) {
+ $file = trim($file);
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $file . '/xoops_version.php')) {
+ /* @var $module XoopsModule */
+ $module = $module_handler->create();
+ $module->loadInfoAsVar($file);
+ $plugin = Xoops_Module_Plugin::getPlugin($module->getInfo('dirname'), $dirname);
+ if ($module->getInfo('extension') && is_object($plugin) && method_exists($plugin, $pluginName)) {
+ $ret[] = $module;
+ }
+ }
+ }
+ return $ret;
+ }
}
|
|
From: <du...@us...> - 2013-01-04 20:53:50
|
Revision: 10664
http://sourceforge.net/p/xoops/svn/10664
Author: dugris
Date: 2013-01-04 20:53:47 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Add icon modules to user and main menu
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php 2013-01-04 20:16:17 UTC (rev 10663)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php 2013-01-04 20:53:47 UTC (rev 10664)
@@ -36,7 +36,10 @@
foreach (array_keys($modules) as $i) {
if (in_array($i, $read_allowed)) {
$block['modules'][$i]['name'] = $modules[$i]->getVar('name');
- $block['modules'][$i]['directory'] = $modules[$i]->getVar('dirname');
+ $block['modules'][$i]['dirname'] = $modules[$i]->getVar('dirname');
+ if (file_exists($xoops->path('modules/' . $modules[$i]->getVar('dirname') . '/icons/logo_small.png'))) {
+ $block['modules'][$i]['image'] = $xoops->url('modules/' . $modules[$i]->getVar('dirname') . '/icons/logo_small.png');
+ }
if ($xoops->isModule() && ($i == $xoops->module->getVar('mid'))) {
$block['modules'][$i]['highlight'] = true;
$block['nothome'] = true;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-01-04 20:16:17 UTC (rev 10663)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-01-04 20:53:47 UTC (rev 10664)
@@ -38,6 +38,7 @@
if ($plugin = Xoops_Module_Plugin::getPlugin($extension->getVar('dirname'), 'system')) {
if (method_exists($plugin, 'userMenus') && $plugin->userMenus()) {
$block['modules'][$i]['name'] = $extension->getVar('name');
+ $block['modules'][$i]['dirname'] = $extension->getVar('dirname');
$block['modules'][$i]['link'] = $xoops->url('modules/' . $extension->getVar('dirname') . '/');
if (file_exists($xoops->path('modules/' . $extension->getVar('dirname') . '/icons/logo_small.png'))) {
$block['modules'][$i]['image'] = $xoops->url('modules/' . $extension->getVar('dirname') . '/icons/logo_small.png');
@@ -95,7 +96,7 @@
array_push($block['modules'], array('name' => $name,
'link' => $xoops->url('viewpmsg.php'),
- 'icon' => 'icon-wrench',
+ 'icon' => 'icon-envelope',
'class' => $class,
));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2013-01-04 20:16:17 UTC (rev 10663)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2013-01-04 20:53:47 UTC (rev 10664)
@@ -1,3 +1,18 @@
+<style type="text/css">
+ <{foreachq from=$block.modules item=module}>
+ <{if $module.image}>
+ .<{$module.dirname}>-icon {
+ background-image: url('<{$module.image}>');
+ background-size: 16px 16px;
+ background-position: 0 0;
+ width: 14px;
+ height: 14px;
+ line-height: 14px;
+ vertical-align: text-top;
+ }
+ <{/if}>
+ <{/foreach}>
+</style>
<ul class="nav nav-list">
<li class="<{if !$block.nothome}>active<{/if}>">
<a href="<{xoAppUrl }>" title="<{$block.lang_home}>">
@@ -8,8 +23,8 @@
<!-- start module menu loop -->
<{foreach item=module from=$block.modules}>
<li class="<{if $module.highlight}>active<{/if}>">
- <a class="" href="<{$xoops_url}>/modules/<{$module.directory}>/" title="<{$module.name}>">
- <i class="icon-tags <{if $module.highlight}>icon-white<{/if}>"></i>
+ <a class="" href="<{$xoops_url}>/modules/<{$module.dirname}>/" title="<{$module.name}>">
+ <i class="icon-tags <{$module.dirname}>-icon<{if $module.highlight}> icon-white<{/if}>"></i>
<{$module.name}>
</a>
<{if $module.sublinks}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2013-01-04 20:16:17 UTC (rev 10663)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2013-01-04 20:53:47 UTC (rev 10664)
@@ -1,3 +1,18 @@
+<style type="text/css">
+ <{foreachq from=$block.modules item=module}>
+ <{if $module.image}>
+ .<{$module.dirname}>-icon {
+ background-image: url('<{$module.image}>');
+ background-size: 16px 16px;
+ background-position: 0 0;
+ width: 14px;
+ height: 14px;
+ line-height: 14px;
+ vertical-align: text-top;
+ }
+ <{/if}>
+ <{/foreach}>
+</style>
<ul class="nav nav-list">
<{foreachq from=$block.modules item=module}>
<li<{if $module.link == $block.active_url}> class="active"<{/if}>>
@@ -2,3 +17,3 @@
<a <{if $module.class}>class="<{$module.class}>"<{/if}> href="<{$module.link}>" title="<{$module.name}>" <{if $module.rel}>rel="<{$module.rel}>"<{/if}>>
- <i class="<{$module.icon}>"></i>
+ <i class="<{$module.icon}> <{$module.dirname}>-icon"></i>
<{$module.name}>
|
|
From: <du...@us...> - 2013-01-18 00:23:23
|
Revision: 10839
http://sourceforge.net/p/xoops/svn/10839
Author: dugris
Date: 2013-01-18 00:23:18 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
delete jquery ui duplicate content in modules/system/css
use /media/jquery/ui
Modified Paths:
--------------
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/css/ui/
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 2013-01-17 21:49:18 UTC (rev 10838)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2013-01-18 00:23:18 UTC (rev 10839)
@@ -891,7 +891,7 @@
$modversion['config'][$i]['default'] = 'default';
$modversion['config'][$i]['options'] = $breadcrumb;
$i++;
-$jquery_theme = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/css/ui');
+$jquery_theme = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . 'media/jquery/ui');
$modversion['config'][$i]['name'] = 'jquery_theme';
$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_JQUERY_THEME';
$modversion['config'][$i]['description'] = '';
|
|
From: <tr...@us...> - 2013-02-01 22:18:01
|
Revision: 10964
http://sourceforge.net/p/xoops/svn/10964
Author: trabis
Date: 2013-02-01 22:17:28 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Adding locale to system xoops_version and preferences page
Modified Paths:
--------------
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/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html
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/language/english/_modinfo.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
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 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -78,7 +78,7 @@
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
$admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('extensions', 'adminpath'));
+ $admin_page->addBreadcrumbLink(XoopsLocale::PREFERENCES, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink($module->getVar('name'));
$admin_page->renderBreadcrumb();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -57,7 +57,7 @@
if (!$configCats) {
$configCats = array(
'default' => array(
- 'name' => _MD_AM_MODCONFIG,
+ 'name' => SystemLocale::OTHER_SETTINGS,
'description' => ''
)
);
@@ -65,7 +65,7 @@
if (!in_array('default', array_keys($configCats))) {
$configCats['default'] = array(
- 'name' => _MD_AM_MODCONFIG,
+ 'name' => SystemLocale::OTHER_SETTINGS,
'description' => ''
);
}
@@ -114,8 +114,8 @@
$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');
+ $optval = Xoops_Locale::translate($options[$j]->getVar('confop_value'), $mod->getVar('dirname'));
+ $optkey = Xoops_Locale::translate($options[$j]->getVar('confop_name'), $mod->getVar('dirname'));
$ele->addOption($optval, $optkey);
}
break;
@@ -125,8 +125,8 @@
$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');
+ $optval = Xoops_Locale::translate($options[$j]->getVar('confop_value'), $mod->getVar('dirname'));
+ $optkey = Xoops_Locale::translate($options[$j]->getVar('confop_name'), $mod->getVar('dirname'));
$ele->addOption($optval, $optkey);
}
break;
@@ -178,7 +178,7 @@
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
$criteria->add(new Criteria('isactive', 1));
$moduleslist = $module_handler->getNameList($criteria, true);
- $moduleslist['--'] = _MD_AM_NONE;
+ $moduleslist['--'] = XoopsLocale::NONE;
$ele->addOptionArray($moduleslist);
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/functions.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/functions.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -74,6 +74,11 @@
if (empty($name)) {
return false;
}
+ //for languages already moved into locale
+ $done = array('preferences');
+ if (in_array($name, $done)) {
+ return false;
+ }
$language = empty($language) ? $xoops->getConfig('language') : $language;
$path = 'modules/' . $domain . '/language/';
if (XoopsLoad::fileExists($file = $xoops->path($path . $language . '/admin/' . $name . '.php'))) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -26,24 +26,24 @@
$group_handler = $xoops->getHandlerGroup();
// create admin group
$obj = $group_handler->create();
- $obj->setVar("name", addslashes(_MI_SYSTEM_INSTALL_WEBMASTER));
- $obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_WEBMASTERD));
+ $obj->setVar("name", addslashes(XoopsLocale::WEBMASTERS));
+ $obj->setVar("description", addslashes(systemLocale::WEBMASTERS_OF_THIS_SITE));
$obj->setVar("group_type", 'Admin');
if (!$group_handler->insert($obj)) {
echo $xoops->alert('error', $obj->getHtmlErrors());
}
// create registered users group
$obj = $group_handler->create();
- $obj->setVar("name", addslashes(_MI_SYSTEM_INSTALL_REGUSERS));
- $obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_REGUSERSD));
+ $obj->setVar("name", addslashes(systemLocale::REGISTERED_USERS));
+ $obj->setVar("description", addslashes(systemLocale::REGISTERED_USERS_GROUP));
$obj->setVar("group_type", 'User');
if (!$group_handler->insert($obj)) {
echo $xoops->alert('error', $obj->getHtmlErrors());
}
// create anonymous users group
$obj = $group_handler->create();
- $obj->setVar("name", addslashes(_MI_SYSTEM_INSTALL_ANONUSERS));
- $obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_ANONUSERSD));
+ $obj->setVar("name", addslashes(systemLocale::ANONYMOUS_USERS));
+ $obj->setVar("description", addslashes(systemLocale::ANONYMOUS_USERS_GROUP));
$obj->setVar("group_type", 'Anonymous');
if (!$group_handler->insert($obj)) {
echo $xoops->alert('error', $obj->getHtmlErrors());
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_modinfo.php (from rev 10963, 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 (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_modinfo.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -0,0 +1,127 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+
+// Module Info
+
+// The name of this module
+//define("_MI_SYSTEM_NAME","System");
+
+// A brief description of this module
+//define("_MI_SYSTEM_DESC","For administration of core settings of the site.");
+
+// Names of blocks for this module (Not all module has blocks)
+/*
+define("_MI_SYSTEM_BNAME2","User Menu");
+define("_MI_SYSTEM_BNAME3","Login");
+define("_MI_SYSTEM_BNAME5","Waiting Contents");
+define("_MI_SYSTEM_BNAME6","Main Menu");
+define("_MI_SYSTEM_BNAME7","Site Info");
+define("_MI_SYSTEM_BNAME8", "Who is Online");
+define("_MI_SYSTEM_BNAME9", "Top Posters");
+define("_MI_SYSTEM_BNAME10", "New Members");
+//define("_MI_SYSTEM_BNAME11", "Recent Comments");
+// RMV-NOTIFY
+//define("_MI_SYSTEM_BNAME12", "Notification Options");
+define("_MI_SYSTEM_BNAME13", "Themes");
+*/
+// Names of admin menu items
+/*define("_MI_SYSTEM_ADMENU2","Blocks");
+define("_MI_SYSTEM_ADMENU3","Groups");
+define("_MI_SYSTEM_ADMENU5","Modules");
+define("_MI_SYSTEM_ADMENU6","Preferences");
+define("_MI_SYSTEM_ADMENU10","Edit User");
+define("_MI_SYSTEM_ADMENU12", "Find Users");
+define("_MI_SYSTEM_ADMENU13", "Images");
+define("_MI_SYSTEM_ADMENU15", "Templates");*/
+
+//Site preference
+/*
+define("_MI_SYSTEM_GENERAL", "General Settings");
+define("_MI_SYSTEM_USERSETTINGS", "User Info Settings");
+define("_MI_SYSTEM_METAFOOTER", "Meta Tags and Footer");
+define("_MI_SYSTEM_MAIL", "Email Setup");
+define("_MI_SYSTEM_CENSOR", "Word Censoring Options");
+define("_MI_SYSTEM_AUTHENTICATION", "Authentication Options");
+define("_MI_SYSTEM_SITEPREFERENCE_ANON", "Anonymous");
+define("_MI_SYSTEM_SITEPREFERENCE_CLOSESITETEXT", "The site is currently closed for maintenance. Please come back later.");
+define("_MI_SYSTEM_SITEPREFERENCE_DISCLMR", "While the administrators and moderators of this site will attempt to remove
+or edit any generally objectionable material as quickly as possible, it is
+impossible to review every message. Therefore you acknowledge that all posts
+made to this site express the views and opinions of the author and not the
+administrators, moderators or webmaster (except for posts by these people)
+and hence will not be held liable.
+
+You agree not to post any abusive, obscene, vulgar, slanderous, hateful,
+threatening, sexually-orientated or any other material that may violate any
+applicable laws. Doing so may lead to you being immediately and permanently
+banned (and your service provider being informed). The IP address of all
+posts is recorded to aid in enforcing these conditions. Creating multiple
+accounts for a single user is not allowed. You agree that the webmaster,
+administrator and moderators of this site have the right to remove, edit,
+move or close any topic at any time should they see fit. As a user you agree
+to any information you have entered above being stored in a database. While
+this information will not be disclosed to any third party without your
+consent the webmaster, administrator and moderators cannot be held
+responsible for any hacking attempt that may lead to the data being
+compromised.
+
+This site system uses cookies to store information on your local computer.
+These cookies do not contain any of the information you have entered above,
+they serve only to improve your viewing pleasure. The email address is used
+only for confirming your registration details and password (and for sending
+new passwords should you forget your current one).
+
+By clicking Register below you agree to be bound by these conditions.");
+
+define("_MI_SYSTEM_SITEPREFERENCE_METAKEY", "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management");
+define("_MI_SYSTEM_SITEPREFERENCE_METADSC", "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.");
+
+
+//Preference
+//define("_MI_SYSTEM_PREFERENCE_BREAK_GENERAL","General Settings");
+define("_MI_SYSTEM_PREFERENCE_TIPS","Help online?");
+define("_MI_SYSTEM_PREFERENCE_TIPS_DSC","This gives you tips and online help");
+define("_MI_SYSTEM_PREFERENCE_ICONS","Icons");
+define("_MI_SYSTEM_PREFERENCE_BREADCRUMB","Breadcrumb");
+
+//define("_MI_SYSTEM_PREFERENCE_BREAK_ACTIVE","Active Section");
+
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN","");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER","Active File Manager");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_GROUPS","");
+//define("_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES","Active Images Manager");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN","");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_PREFERENCES","");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS","");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_USERS","Active Users");
+//define("_MI_SYSTEM_PREFERENCE_ACTIVE_EXTENSIONS","Extensions");
+//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_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");
+
+//define("_MI_SYSTEM_PREFERENCE_BREAK_EDITOR","Editor Settings");
+define("_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR","Editor for blocks:");
+define("_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR_DSC","");
+//define("_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR","Editor for comments:");
+//define("_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR_DSC","");
+define("_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR","Editor for all modules:");
+define("_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR_DSC","");
+define("_MI_SYSTEM_PREFERENCE_ANONPOST","");
+define("_MI_SYSTEM_PREFERENCE_REDIRECT","");
+
+define("_MI_SYSTEM_PREFERENCE_JQUERY_THEME", "jQuery theme");
+*/
+//2.6.0 Alpha 2
+/*
+define('_MI_SYSTEM_INSTALL_WEBMASTER', 'Webmasters');
+define('_MI_SYSTEM_INSTALL_WEBMASTERD', 'Webmasters of this site');
+define('_MI_SYSTEM_INSTALL_REGUSERS', 'Registered Users');
+define('_MI_SYSTEM_INSTALL_REGUSERSD', 'Registered Users Group');
+define('_MI_SYSTEM_INSTALL_ANONUSERS', 'Anonymous Users');
+define('_MI_SYSTEM_INSTALL_ANONUSERSD', 'Anonymous Users Group');*/
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -8,10 +8,10 @@
*/
// dont change
-define("_AM_DBUPDATED",_AM_SYSTEM_DBUPDATED);
+//define("_AM_DBUPDATED",_AM_SYSTEM_DBUPDATED);
//Nav
-define("_AM_SYSTEM_PREFERENCES_NAV_MAIN","Preferences");
+//define("_AM_SYSTEM_PREFERENCES_NAV_MAIN","Preferences");
//define("_AM_SYSTEM_PREFERENCES_MAIN","Main");
/*define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_GENERAL","General Settings");
define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_USERSETTINGS","User Info Settings");
@@ -33,11 +33,12 @@
define("_AM_SYSTEM_PREFERENCES_NAV_TIPS_MD_AM_MAILER","A faire");
define("_AM_SYSTEM_PREFERENCES_NAV_TIPS_MD_AM_AUTHENTICATION","A faire");
*/
-define("_MD_AM_SITEPREF", "Site Preferences");
-define("_MD_AM_SITENAME", "Site name");
-define("_MD_AM_SITENAMEDSC", "");
-define("_MD_AM_SLOGAN", "Slogan for your site");
-define("_MD_AM_SLOGANDSC", "");
+//define("_MD_AM_SITEPREF", "Site Preferences");
+//define("_MD_AM_SITENAME", "Site name");
+//define("_MD_AM_SITENAMEDSC", "");
+//define("_MD_AM_SLOGAN", "Slogan for your site");
+//define("_MD_AM_SLOGANDSC", "");
+/*
define("_MD_AM_ADMINML", "Admin email address");
define("_MD_AM_ADMINMLDSC", "");
define("_MD_AM_LANGUAGE", "Default language");
@@ -117,7 +118,7 @@
/*define("_MD_AM_DEBUGMODE0", "Off");
define("_MD_AM_DEBUGMODE1", "Enable debug (inline mode)");
define("_MD_AM_DEBUGMODE2", "Enable debug (popup mode)");
-define("_MD_AM_DEBUGMODE3", "Smarty Templates Debug");*/
+define("_MD_AM_DEBUGMODE3", "Smarty Templates Debug");
define("_MD_AM_MINUNAME", "Minimum length of username required");
define("_MD_AM_MINUNAMEDSC", "");
define("_MD_AM_MAXUNAME", "Maximum length of username");
@@ -248,7 +249,7 @@
"<br><br>Format [Xoops Database field]=[Auth system SOAP attribute]" .
"<br>for example : email=mail" .
"<br>Separate each with a |" .
- "<br><br>!! For advanced users !!");*/
+ "<br><br>!! For advanced users !!");
// Xoops Authentication constants
@@ -329,4 +330,5 @@
// Preference module system
-define("_AM_SYSTEM_PREFERENCES_SETTINGS","System Module Settings");
\ No newline at end of file
+define("_AM_SYSTEM_PREFERENCES_SETTINGS","System Module Settings");
+*/
\ No newline at end of file
Deleted: 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 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -1,125 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-
-// Module Info
-
-// The name of this module
-define("_MI_SYSTEM_NAME","System");
-
-// A brief description of this module
-define("_MI_SYSTEM_DESC","For administration of core settings of the site.");
-
-// Names of blocks for this module (Not all module has blocks)
-define("_MI_SYSTEM_BNAME2","User Menu");
-define("_MI_SYSTEM_BNAME3","Login");
-define("_MI_SYSTEM_BNAME5","Waiting Contents");
-define("_MI_SYSTEM_BNAME6","Main Menu");
-define("_MI_SYSTEM_BNAME7","Site Info");
-define("_MI_SYSTEM_BNAME8", "Who is Online");
-define("_MI_SYSTEM_BNAME9", "Top Posters");
-define("_MI_SYSTEM_BNAME10", "New Members");
-//define("_MI_SYSTEM_BNAME11", "Recent Comments");
-// RMV-NOTIFY
-//define("_MI_SYSTEM_BNAME12", "Notification Options");
-define("_MI_SYSTEM_BNAME13", "Themes");
-
-// Names of admin menu items
-/*define("_MI_SYSTEM_ADMENU2","Blocks");
-define("_MI_SYSTEM_ADMENU3","Groups");
-define("_MI_SYSTEM_ADMENU5","Modules");
-define("_MI_SYSTEM_ADMENU6","Preferences");
-define("_MI_SYSTEM_ADMENU10","Edit User");
-define("_MI_SYSTEM_ADMENU12", "Find Users");
-define("_MI_SYSTEM_ADMENU13", "Images");
-define("_MI_SYSTEM_ADMENU15", "Templates");*/
-
-//Site preference
-define("_MI_SYSTEM_GENERAL", "General Settings");
-define("_MI_SYSTEM_USERSETTINGS", "User Info Settings");
-define("_MI_SYSTEM_METAFOOTER", "Meta Tags and Footer");
-define("_MI_SYSTEM_MAIL", "Email Setup");
-define("_MI_SYSTEM_CENSOR", "Word Censoring Options");
-define("_MI_SYSTEM_AUTHENTICATION", "Authentication Options");
-define("_MI_SYSTEM_SITEPREFERENCE_ANON", "Anonymous");
-define("_MI_SYSTEM_SITEPREFERENCE_CLOSESITETEXT", "The site is currently closed for maintenance. Please come back later.");
-define("_MI_SYSTEM_SITEPREFERENCE_DISCLMR", "While the administrators and moderators of this site will attempt to remove
-or edit any generally objectionable material as quickly as possible, it is
-impossible to review every message. Therefore you acknowledge that all posts
-made to this site express the views and opinions of the author and not the
-administrators, moderators or webmaster (except for posts by these people)
-and hence will not be held liable.
-
-You agree not to post any abusive, obscene, vulgar, slanderous, hateful,
-threatening, sexually-orientated or any other material that may violate any
-applicable laws. Doing so may lead to you being immediately and permanently
-banned (and your service provider being informed). The IP address of all
-posts is recorded to aid in enforcing these conditions. Creating multiple
-accounts for a single user is not allowed. You agree that the webmaster,
-administrator and moderators of this site have the right to remove, edit,
-move or close any topic at any time should they see fit. As a user you agree
-to any information you have entered above being stored in a database. While
-this information will not be disclosed to any third party without your
-consent the webmaster, administrator and moderators cannot be held
-responsible for any hacking attempt that may lead to the data being
-compromised.
-
-This site system uses cookies to store information on your local computer.
-These cookies do not contain any of the information you have entered above,
-they serve only to improve your viewing pleasure. The email address is used
-only for confirming your registration details and password (and for sending
-new passwords should you forget your current one).
-
-By clicking Register below you agree to be bound by these conditions.");
-
-define("_MI_SYSTEM_SITEPREFERENCE_METAKEY", "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management");
-define("_MI_SYSTEM_SITEPREFERENCE_METADSC", "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.");
-
-
-//Preference
-//define("_MI_SYSTEM_PREFERENCE_BREAK_GENERAL","General Settings");
-define("_MI_SYSTEM_PREFERENCE_TIPS","Help online?");
-define("_MI_SYSTEM_PREFERENCE_TIPS_DSC","This gives you tips and online help");
-define("_MI_SYSTEM_PREFERENCE_ICONS","Icons");
-define("_MI_SYSTEM_PREFERENCE_BREADCRUMB","Breadcrumb");
-
-//define("_MI_SYSTEM_PREFERENCE_BREAK_ACTIVE","Active Section");
-
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER","Active File Manager");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_GROUPS","");
-//define("_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES","Active Images Manager");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_PREFERENCES","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_USERS","Active Users");
-//define("_MI_SYSTEM_PREFERENCE_ACTIVE_EXTENSIONS","Extensions");
-//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_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");
-
-//define("_MI_SYSTEM_PREFERENCE_BREAK_EDITOR","Editor Settings");
-define("_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR","Editor for blocks:");
-define("_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR_DSC","");
-//define("_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR","Editor for comments:");
-//define("_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR_DSC","");
-define("_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR","Editor for all modules:");
-define("_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR_DSC","");
-define("_MI_SYSTEM_PREFERENCE_ANONPOST","");
-define("_MI_SYSTEM_PREFERENCE_REDIRECT","");
-
-define("_MI_SYSTEM_PREFERENCE_JQUERY_THEME", "jQuery theme");
-
-//2.6.0 Alpha 2
-
-define('_MI_SYSTEM_INSTALL_WEBMASTER', 'Webmasters');
-define('_MI_SYSTEM_INSTALL_WEBMASTERD', 'Webmasters of this site');
-define('_MI_SYSTEM_INSTALL_REGUSERS', 'Registered Users');
-define('_MI_SYSTEM_INSTALL_REGUSERSD', 'Registered Users Group');
-define('_MI_SYSTEM_INSTALL_ANONUSERS', 'Anonymous Users');
-define('_MI_SYSTEM_INSTALL_ANONUSERSD', 'Anonymous Users Group');
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -20,7 +20,7 @@
class SystemLocaleEn_US /*extends XoopsLocaleEn_US*/
{
- const DISCLAIMER_TEXT = "While the administrators and moderators of this site will attempt to remove
+ const CONF_DISCLAIMER_DEFAULT = "While the administrators and moderators of this site will attempt to remove
or edit any generally objectionable material as quickly as possible, it is
impossible to review every message. Therefore you acknowledge that all posts
made to this site express the views and opinions of the author and not the
@@ -66,7 +66,7 @@
const ALLOW_OTHER_USERS_TO_VIEW_THIS_EMAIL_ADDRESS = "Allow other users to view this email address";
const ANONYMOUS_USERS = "Anonymous users";
const ANONYMOUS_USERS_GROUP = "Anonymous users group";
- const AUTHENTICATION_OPTIONS = "Authentication options";
+ const AUTHENTICATION = "Authentication";
const AUTO_FORMAT_SMILIES_DISABLED = "Auto format (smilies disabled)";
const AUTO_FORMAT_SMILIES_ENABLED = "Auto format (smilies enabled)";
const AVAILABLE_MODULES = "Available modules";
@@ -74,8 +74,26 @@
const BLOCKS_INFO = "With blocks you can <br /> add many thing for <br /> your users";
const BLOCKS_TIPS = "<ul><li>You can easily change side or order position with the drag\'n drop, click on <img class='tooltip' src='%s' alt='%s' title='%s' /> this image and set your site just the way you want it</li><li>Add a new custom block</li><li>Set block online or offline by clicking on <img class='tooltip' width='16' src='%s' alt='%s' title='%s'/> or <img class='tooltip' width='16' src='%s' alt= '%s' title='%s' /></li></ul>";
const BLOCK_ACCESS_RIGHTS = "Block access rights";
+ const BLOCK_LOGIN = "Login";
+ const BLOCK_LOGIN_DESC = "Shows login form";
+ const BLOCK_MAIN_MENU = "Main menu";
+ const BLOCK_MAIN_MENU_DESC = "Shows the main navigation menu of the site";
const BLOCK_NAME = "Block name";
+ const BLOCK_NEW_MEMBERS = "New members";
+ const BLOCK_NEW_MEMBERS_DESC = "Shows most recent users";
+ const BLOCK_SITE_INFORMATION = "Site information";
+ const BLOCK_SITE_INFORMATION_DESC = "Shows basic information about the site and a link to 'Recommend Us' pop up window";
+ const BLOCK_THEMES = "Themes";
+ const BLOCK_THEMES_DESC = "Shows theme selection box";
+ const BLOCK_TOP_POSTERS = "Top posters";
+ const BLOCK_TOP_POSTERS_DESC = "Displays your site top posters";
const BLOCK_TYPE = "Block type";
+ const BLOCK_USER_MENU = "User menu";
+ const BLOCK_USER_MENU_DESC = "Shows user block";
+ const BLOCK_WAITING_CONTENTS = "Waiting contents";
+ const BLOCK_WAITING_CONTENTS_DESC = "Shows contents waiting for approval";
+ const BLOCK_WHO_IS_ONLINE = "Who is online";
+ const BLOCK_WHO_IS_ONLINE_DESC = "Displays users/guests currently online";
const BOTTOM_CENTER = "Bottom center";
const BOTTOM_LEFT = "Bottom left";
const BOTTOM_RIGHT = "Bottom right";
@@ -90,22 +108,18 @@
const CHOOSE_TEMPLATE = "Choose Template";
const CLICK_TO_EDIT_MODULE_NAME = "Click to edit module name...";
const CLONE_BLOCK = "Clone a block";
- const CLOSE_SITE_TEXT = "The site is currently closed for maintenance. Please come back later.";
const COMMENTS_SPAN = "<ul><li><span class='bold red'>%s</span> comments.</li></ul>";
const CONF_ACTIVATION_GROUP = "Select group to which activation email will be sent";
const CONF_ACTIVATION_GROUP_DESC = "Valid only when 'Activation by administrators' is selected";
const CONF_ACTIVATION_TYPE = "Select activation type of newly registered users";
- const CONF_ACTIVATION_TYPE_DESC = "";
const CONF_ADMIN_ACTIVATION = "Activation by administrators";
const CONF_ADMIN_EMAIL = "Admin email address";
const CONF_ALLOW_CHANGE_EMAIL = "Allow users to change email address?";
- const CONF_ALLOW_CHANGE_EMAIL_DESC = "";
const CONF_ALLOW_REGISTRATION = "Allow new user registration?";
const CONF_ALLOW_REGISTRATION_DESC = "Select yes to accept new user registration";
const CONF_ANONYMOUS = "Username for anonymous users";
- const CONF_ANONYMOUS_DESC = "";
const CONF_AUTHMETHOD = "Authentication Method";
- const CONF_AUTHMETHODDESC = "Which authentication method would you like to use for signing on users.";
+ const CONF_AUTHMETHOD_DESC = "Which authentication method would you like to use for signing on users.";
const CONF_AUTH_CONFOPTION_AD = "Microsoft Active Directory ©";
const CONF_AUTH_CONFOPTION_LDAP = "Standard LDAP Directory";
const CONF_AUTH_CONFOPTION_XOOPS = "XOOPS Database";
@@ -115,11 +129,14 @@
const CONF_BAD_IPS = "Enter IP addresses that should be banned from the site.<br />Separate each with a <strong>|</strong>, case insensitive, regex enabled (so dot - '.' means 'any char' and '\.' means '.').";
const CONF_BAD_IPS_DESC = "^aaa\.bbb\.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc<br />aaa\.bbb\.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc<br />aaa\.bbb\.ccc will disallow visitors with an IP that contains aaa.bbb.ccc";
const CONF_BAD_USERNAMES = "Enter names that should not be selected as username";
+ const CONF_BLOCKS_EDITOR = "Editor for blocks:";
+ const CONF_BREADCRUMB ="Breadcrumb";
const CONF_CENSORRPLC = "Censored words will be replaced with:";
const CONF_CENSORRPLC_DESC = "Censored words will be replaced with the characters entered in this textbox";
const CONF_CENSORWRD = "Words to censor";
const CONF_CENSORWRD_DESC = "Enter words that should be censored in user posts.<br />Separate each with a <strong>|</strong>, case insensitive.";
const CONF_CLOSE_SITE = "Turn your site off?";
+ const CONF_CLOSE_SITE_DEFAULT = "The site is currently closed for maintenance. Please come back later.";
const CONF_CLOSE_SITE_DESC = "Select yes to turn your site off so that only users in selected groups have access to the site. ";
const CONF_CLOSE_SITE_GROUP = "Select groups that are allowed to access while the site is turned off.";
const CONF_CLOSE_SITE_GROUP_DESC = "Users in the default webmasters group are always granted access.";
@@ -135,11 +152,17 @@
const CONF_ENABLE_BAD_IPS = "Enable IP bans?";
const CONF_ENABLE_BAD_IPS_DESC = "Users from specified IP addresses will not be able to view your site";
const CONF_FOOTER = "Footer";
+ const CONF_FOOTER_DEFAULT = "Powered by XOOPS @ 2001-%s <a href='http://xoops.sourceforge.net' rel='external' title='The XOOPS Project'>The XOOPS Project</a>";
const CONF_FOOTER_DESC = "Be sure to type links in full path starting from http://, otherwise the links will not work correctly in modules pages.";
+ const CONF_GENERAL_EDITOR = "Editor for modules:";
+ const CONF_GROUPS_PER_PAGE = "Number of groups to display per page";
const CONF_GZIP_COMPRESSION = "Use gzip compression?";
- const CONF_GZIP_COMPRESSION_DESC = "";
+ const CONF_HELP_ONLINE = "Help online?";
+ const CONF_HELP_ONLINE_DESC = "This gives you tips and online help";
+ const CONF_ICONS = "Icons";
const CONF_INDEXFOLLOW = "Index, follow";
const CONF_INDEXNOFOLLOW = "Index, no follow";
+ const CONF_JQUERY_THEME = "jQuery theme";
const CONF_LANGUAGE = "Default language";
const CONF_LDAP_BASE_DN = "LDAP - Base DN";
const CONF_LDAP_BASE_DN_DESC = "The base DN (Distinguished Name) of your LDAP directory tree.";
@@ -150,11 +173,11 @@
const CONF_LDAP_FILTER_PERSON = "The search filter LDAP query to find user";
const CONF_LDAP_FILTER_PERSON_DESC = "Special LDAP Filter to find user. @@loginname@@ is replace by the users's login name<br> MUST BE BLANK IF YOU DON'T KNOW WHAT YOU DO' !<br />Ex : (&(objectclass=person)(samaccountname=@@loginname@@)) for AD <br />Ex : (&(objectclass=inetOrgPerson)(uid=@@loginname@@)) for LDAP";
const CONF_LDAP_GIVENNAME_ATTR = "LDAP - Given Name Field Name";
- const CONF_LDAP_GIVENNAME_ATTR_DSC = "The name of the Given Name attribute in your LDAP directory.";
+ const CONF_LDAP_GIVENNAME_ATTR_DESC = "The name of the Given Name attribute in your LDAP directory.";
const CONF_LDAP_LOGINLDAP_ATTR = "LDAP Attribute use to search the user";
- const CONF_LDAP_LOGINLDAP_ATTR_D = "When Login name use in the DN option is set to yes, must correspond to the login name XOOPS";
+ const CONF_LDAP_LOGINLDAP_ATTR_DESC = "When Login name use in the DN option is set to yes, must correspond to the login name XOOPS";
const CONF_LDAP_LOGINNAME_ASDN = "Login name use in the DN";
- const CONF_LDAP_LOGINNAME_ASDN_D = "The XOOPS login name is used in the LDAP DN (eg : uid=<loginname>,dc=xoops,dc=org)<br>The entry is directly read in the LDAP Server without search";
+ const CONF_LDAP_LOGINNAME_ASDN_DESC = "The XOOPS login name is used in the LDAP DN (eg : uid=<loginname>,dc=xoops,dc=org)<br>The entry is directly read in the LDAP Server without search";
const CONF_LDAP_MAIL_ATTR = "LDAP - Email Field Name";
const CONF_LDAP_MAIL_ATTR_DESC = "The name of the E-Mail attribute in your LDAP directory tree.";
const CONF_LDAP_MANAGER_DN = "DN of the LDAP manager";
@@ -165,7 +188,7 @@
const CONF_LDAP_PROVIS = "Automatic XOOPS account provisioning";
const CONF_LDAP_PROVIS_DESC = "Create XOOPS user database if it doesn't exists";
const CONF_LDAP_PROVIS_GROUP = "Default affect group";
- const CONF_LDAP_PROVIS_GROUP_DSC = "The new user is assign to these groups";
+ const CONF_LDAP_PROVIS_GROUP_DESC = "The new user is assign to these groups";
const CONF_LDAP_PROVIS_UPD = "Maintain XOOPS account provisioning";
const CONF_LDAP_PROVIS_UPD_DESC = "The XOOPS User account is always synchronized with the Authentication Server";
const CONF_LDAP_SERVER = "LDAP - Server Name";
@@ -183,22 +206,22 @@
const CONF_LEVEL_STRICT = "Strict (only alphabets and numbers)";
const CONF_MAILER = "Email Setup";
const CONF_MAILERMETHOD = "Email delivery method";
- const CONF_MAILERMETHODDESC = "Method used to deliver email. Default is \"mail\", use others only if that makes trouble.";
+ const CONF_MAILERMETHOD_DESC = "Method used to deliver email. Default is \"mail\", use others only if that makes trouble.";
const CONF_MAILFROM = "FROM address";
- const CONF_MAILFROMDESC = "";
const CONF_MAILFROMNAME = "FROM name";
- const CONF_MAILFROMNAMEDESC = "";
const CONF_MAILFROMUID = "FROM user";
- const CONF_MAILFROMUIDDESC = "When the system sends a private message, which user should appear to have sent it?";
+ const CONF_MAILFROMUID_DESC = "When the system sends a private message, which user should appear to have sent it?";
const CONF_MAX_USERNAME = "Maximum length of username";
- const CONF_MAX_USERNAME_DESC = "";
const CONF_METAAUTHOR = "Meta Author";
const CONF_METAAUTHOR_DESC = "The author meta tag defines the name of the author of the document being read. Supported data formats include the name, email address of the webmaster, company name or URL.";
const CONF_METACOPYR = "Meta Copyright";
+ const CONF_METACOPYR_DEFAULT = "Copyright @ 2001-%s";
const CONF_METACOPYR_DESC = "The copyright meta tag defines any copyright statements you wish to disclose about your web page documents.";
const CONF_METADESC = "Meta Description";
+ const CONF_METADESC_DEFAULT= "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
const CONF_METADESC_DESC = "The description meta tag is a general description of what is contained in your web page";
const CONF_METAKEY = "Meta Keywords";
+ const CONF_METAKEY_DEFAULT = "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management";
const CONF_METAKEY_DESC = "The keywords meta tag is a series of keywords that represents the content of your site. Type in keywords with each separated by a comma or a space in between. (Ex. XOOPS, PHP, mySQL, portal system)";
const CONF_METAO14YRS = "14 years";
const CONF_METAOGEN = "General";
@@ -207,16 +230,12 @@
const CONF_METARATING = "Meta Rating";
const CONF_METARATING_DESC = "The rating meta tag defines your site age and content rating";
const CONF_METAROBOTS = "Meta Robots";
- const CONF_METAROBOTSDSC = "The Robots Tag declares to search engines what content to index and spider";
+ const CONF_METAROBOTS_DESC = "The Robots Tag declares to search engines what content to index and spider";
const CONF_MIN_PASS = "Minimum required length of the password";
- const CONF_MIN_PASS_DESC = "";
const CONF_MIN_USERNAME = "Minimum length of username required";
- const CONF_MIN_USERNAME_DSC = "";
- const CONF_MODCONFIG = "Module Config Options";
const CONF_MODULE_CACHE = "Module-wide Cache";
const CONF_MODULE_CACHE_DESC = "Caches module contents for a specified amount of time to enhance performance. Setting module-wide cache will override module item level cache if any.";
const CONF_NEW_USER_NOTIFY = "Notify by email when a new user is registered?";
- const CONF_NEW_USER_NOTIFY_DESC = "";
const CONF_NOINDEXFOLLOW = "No Index, Follow";
const CONF_NOINDEXNOFOLLOW = "No Index, No Follow";
const CONF_NOMODULE = "There is no module that can be cached.";
@@ -226,47 +245,47 @@
const CONF_REGDSCLMR = "Registration disclaimer";
const CONF_REGDSCLMR_DESC = "Enter text to be displayed as registration disclaimer";
const CONF_SELF_DELETE = "Allow users to delete own account?";
- const CONF_SELF_DELETE_DESC = "";
const CONF_SENDMAILPATH = "Path to sendmail";
- const CONF_SENDMAILPATHDESC = "Path to the sendmail program (or substitute) on the webserver.";
+ const CONF_SENDMAILPATH_DESC = "Path to the sendmail program (or substitute) on the webserver.";
const CONF_SERVER_TIMEZONE = "Server timezone";
const CONF_SESSION_EXPIRE = "Session expiration";
const CONF_SESSION_EXPIRE_DESC = "Maximum duration of session idle time in minutes (Valid only when 'use custom session' is enabled.)";
const CONF_SESSION_NAME = "Session name";
const CONF_SESSION_NAME_DESC = "The name of session (Valid only when 'use custom session' is enabled)";
const CONF_SITE_NAME = "Site name";
+ const CONF_SITE_NAME_DEFAULT = "XOOPS Site";
const CONF_SLOGAN = "Slogan for your site";
+ const CONF_SLOGAN_DEFAULT = "Just use it!";
const CONF_SMTPHOST = "SMTP host(s)";
- const CONF_SMTPHOSTDESC = "List of SMTP servers to try to connect to.";
+ const CONF_SMTPHOST_DESC = "List of SMTP servers to try to connect to.";
const CONF_SMTPPASS = "SMTPAuth password";
- const CONF_SMTPPASSDESC = "Password to connect to an SMTP host with SMTPAuth.";
+ const CONF_SMTPPASS_DESC = "Password to connect to an SMTP host with SMTPAuth.";
const CONF_SMTPUSER = "SMTPAuth username";
- const CONF_SMTPUSERDESC = "Username to connect to an SMTP host with SMTPAuth.";
+ const CONF_SMTPUSER_DESC = "Username to connect to an SMTP host with SMTPAuth.";
const CONF_SSL_LINK = "URL where SSL login page is located";
- const CONF_SSL_LINK_DESC = "";
const CONF_SSL_POST_NAME = "SSL Post variable name";
const CONF_SSL_POST_NAME_DESC = "The name of variable used to transfer session value via POST. If you are unsure, set any name that is hard to guess.";
const CONF_START_PAGE = "Module for your start page";
const CONF_TEMPLATE_SET = "Default template set";
- const CONF_TEMPLATE_SET_DESC = "";
const CONF_THEME_FILE = "Check templates for modifications ?";
const CONF_THEME_FILE_DESC = "If this option is enabled, modified templates will be automatically recompiled when they are displayed. You must turn this option off on a production site.";
const CONF_THEME_SET = "Default theme";
const CONF_THEME_SET_ALLOWED = "Selectable themes";
const CONF_THEME_SET_ALLOWED_DESC = "Choose themes that users can select as the default theme";
const CONF_USERNAME_LEVEL = "Select the level of strictness for username filtering";
- const CONF_USERNAME_LEVEL_DESC = "";
+ const CONF_USERS_PER_PAGE = "Number of users to display per page";
const CONF_USER_ACTIVATION = "Requires activation by user (recommended)";
const CONF_USER_COOKIE = "Name for user cookies.";
const CONF_USER_COOKIE_DESC = "If the cookie name is set, 'Remember me' will be enabled for user login. If a user has chosen 'Remember me', he will be logged in automatically. The expiration for the cookie is one year.";
const CONF_USE_MY_SESSION = "Use custom session";
const CONF_USE_MY_SESSION_DESC = "Select yes to customize session related values.";
const CONF_USE_SSL = "Use SSL for login?";
- const CONF_USE_SSL_DESC = ", SSL is used for secure login and requires a certificate. Contact your Host about how to obtain certificate for your site.";
+ const CONF_USE_SSL_DESC = "SSL is used for secure login and requires a certificate. Contact your Host about how to obtain certificate for your site.";
const CONF_WELCOME_TYPE = "Sending welcoming message";
const CONF_WELCOME_TYPE_BOTH = "Email and message";
const CONF_WELCOME_TYPE_DESC = "The way of sending out a welcoming message to a user upon his successful registration.";
const CONF_WELCOME_TYPE_EMAIL = "Email";
+ const CONF_WELCOME_TYPE_NONE = "None";
const CONF_WELCOME_TYPE_PM = "Message";
const CONTENT_TYPE = "Content type";
const CONTROL_PANEL = "Control panel";
@@ -277,8 +296,6 @@
const CUSTOM_BLOCK_HTML = "Custom Block (HTML)";
const CUSTOM_BLOCK_PHP = "Custom Block (PHP)";
const C_DO_NOT_DISPLAY_USERS_WHOSE_RANK_IS = "Do not display users whose rank is:";
- const C_EDITOR_FOR_BLOCKS = "Editor for blocks:";
- const C_EDITOR_FOR_MODULES = "Editor for modules:";
const C_SEARCH_USER = "Search user:";
const C_YOUR_THEMES = "Your themes:";
const DELETE_BLOCK = "Delete a block";
@@ -305,7 +322,6 @@
const EF_BLOCK_NOT_DELETED = "ERROR: Could not delete block %s";
const EF_BLOCK_TEMPLATE_DEPRECATED_NOT_REMOVED = "ERROR: Could not remove deprecated block template.";
const EF_BLOCK_TEMPLATE_NOT_DELETED = "ERROR: Could not delete block template %s from the database";
- const SF_BLOCK_UPDATED = "Block %s updated.";
const EF_CAN_NOT_DELETE_ADMIN_USER = "Admin user cannot be deleted: %s <br />";
const EF_CONFIG_NOT_ADDED_TO_DATABASE = " ERROR: Could not insert config %s to the database.";
const EF_COULD_NOT_ADD_PERMISSION_FOR_GROUP = "Could not add %s permission to %s for group %s";
@@ -319,7 +335,6 @@
const EF_TEMPLATE_NOT_DELETED_FROM_DATABASE = "ERROR: Could not delete template %s from the database.";
const EF_TEMPLATE_NOT_RECOMPILED = "ERROR: Template %s recompile failed";
const EF_TEMPLATE_NOT_UPDATED = "ERROR: Could not update %s template.";
- const EMAIL_SETUP = "Email setup";
const EMPTY_FILE = "Empty file";
const EXTENSIONS_ADMINISTRATION = "Extensions administration";
const EXTENSIONS_INFO = "Here you can install <br /> and uninstall your XOOPS <br /> extensions.";
@@ -327,8 +342,8 @@
const E_BLOCK_ACCESS_NOT_ADDED = "ERROR: Could not add block access right";
const E_CONFIG_DATA_NOT_DELETED_FROM_DATABASE = "ERROR: Could not delete config data from the database";
const E_GROUP_PERMISSIONS_NOT_DELETED = "ERROR: Could not delete group permissions";
+ const E_NEW_PASSWORDS_NOT_MATCH_TRY_AGAIN = "Sorry, the new passwords do not match. Click back and try again";
const E_NOT_RESTORED = "Not restored";
- const E_NEW_PASSWORDS_NOT_MATCH_TRY_AGAIN = "Sorry, the new passwords do not match. Click back and try again";
const E_SYSTEM_BLOCKS_CANNOT_BE_DELETED = "System blocks cannot be deleted!";
const E_THIS_BLOCK_CANNOT_BE_DELETED = "This block cannot be deleted directly! If you wish to disable this block, deactivate the module.";
const E_YOU_NEED_POSITIVE_INTEGER = "You need a positive integer";
@@ -360,21 +375,16 @@
const INSTALLED_MODULES = "Installed modules";
const INSTALL_EXTENSION = "Install extension";
const INSTALL_MODULE = "Install module";
- const I_THIS_GIVES_YOU_TIPS_AND_HELP = "This gives you tips and online help";
- const JQUERY_THEME = "jQuery theme";
const LARGE_VIEW = "Large view";
const LAST_LOGIN_GREATER_THAN_X = "Last login is more than <span style='color:#ff0000;'>X</span> days ago";
const LAST_LOGIN_LESS_THAN_X = "Last login is less than <span style='color:#ff0000;'>X</span> days ago";
const LINE_VIEW = "Line View";
- const MAIN_MENU = "Main menu";
const MANAGE_BLOCKS = "Manage Blocks";
const MANAGE_MENU = "Manage Menu";
const MANAGE_MODULE = "Manage Module";
const MANAGE_PREFERENCES = "Manage Preferences";
const MENU_BLOCK = "Menu Block";
const MENU_TIPS = "<ul><li>To change order of modules (which will be reflected in the Menu), you just need to drag and drop the modules to the desired placement.</li></ul>";
- const META_DESCRIPTION_TEXT = "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
- const META_KEYWORDS_TEXT = "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management";
const META_TAGS_AND_FOOTER = "Meta tags and footer";
const MODULES_ADMINISTRATION = "Modules administration";
const MODULES_INFO = "Here you can install <br /> and unistall your XOOPS <br /> modules. Do you know <br /> which module?";
@@ -384,17 +394,15 @@
const MODULE_DESCRIPTION = "For administration of core settings of the site.";
const MODULE_NAME = "System";
const NEVER_CONNECTED = "Never connected";
- const NEW_MEMBERS = "New members";
const NO_FILES_CREATED = "No files created";
const NO_USERS_FOUND = "No user(s) found";
- const NUMBER_OF_GROUPS_PER_PAGE = "Number of groups to display per page";
const NUMBER_OF_MEMBERS_TO_DISPLAY = "Number of members to display";
const NUMBER_OF_USERS_BY_GROUP = "Number of users by group";
- const NUMBER_OF_USERS_PER_PAGE = "Number of users to display per page";
const ONLY_ACTIVE_USERS = "Only active users";
const ONLY_INACTIVE_USERS = "Only inactive users";
const ONLY_USERS_ACCEPT_EMAIL = "Only users that accept email";
const ONLY_USERS_DO_NOT_ACCEPT_EMAIL = "Only users that don't accept email";
+ const OTHER_SETTINGS = "Other settings";
const PHP_SCRIPT = "PHP Script";
const POPUP_WINDOW_HEIGHT = "Pop-up window height";
const POPUP_WINDOW_WIDTH = "Pop-up window width";
@@ -402,7 +410,6 @@
const POSTS_NUMBERS_LESS_THAN_X = "Number of Posts is less than <span style='color:#ff0000;'>X</span>";
const PREFERENCES_INFO = "XOOPS and all of your <br /> modules have a preferences <br /> for manage module options";
const Q_ARE_YOU_SURE_DELETE_THIS_GROUP = "Are you sure you want to delete this group?";
- const Q_HELP_ONLINE = "Help online?";
const Q_LOST_PASSWORD = "Lost password?";
const Qf_ARE_YOU_SURE_TO_DELETE_THIS_BLOCK = "Are you sure to delete this block ? <div class='bold'>%s</div>";
const REBUILDING_BLOCKS = "Rebuilding blocks...";
@@ -422,6 +429,7 @@
const SF_BLOCK_DELETE = "Block %s deleted.";
const SF_BLOCK_TEMPLATE_DELETED_FROM_DATABASE = "Block template %s deleted from the database. ";
const SF_BLOCK_TEMPLATE_DEPRECATED = "Block template %s deprecated";
+ const SF_BLOCK_UPDATED = "Block %s updated.";
const SF_CONFIG_ADDED_TO_DATABASE = "Config %s added to the database";
const SF_GROUP_ID_USER_ACCESS_RIGHT_ADDED = "Added user access right for Group ID: %s";
const SF_GROUP_ID_USER_ACCESS_RIGHT_NOT_ADDED = "ERROR: Could not add user access right for Group ID: %s";
@@ -434,12 +442,11 @@
const SHOW_ADMIN_GROUPS = "Show admin groups";
const SIDE_BLOCK_LEFT = "Side Block - Left";
const SIDE_BLOCK_RIGHT = "Side Block - Right";
- const SITE_INFORMATION = "Site information";
const SITE_PREFERENCES = "Site preferences";
const SYSTEM_ADMIN_RIGHTS = "System admin rights";
const SYSTEM_CONFIGURATION = "System configuration";
const SYSTEM_MODULE_CANNOT_BE_DEACTIVATED = "System module cannot be deactivated.";
- const SYSTEM_PREFERENCE = "System module settings";
+ const SYSTEM_PREFERENCES = "System module settings";
const S_BLOCK_ACCESS_ADDED = "Added block access right";
const S_CONFIG_DATA_DELETED_FROM_DATABASE = "Config data deleted from the database.";
const S_CONFIG_OPTION_ADDED = "Config option added";
@@ -461,7 +468,6 @@
const TOP_CENTER = "Top center";
const TOP_LEFT = "Top left";
const TOP_PAGE = "Top page";
- const TOP_POSTERS = "Top posters";
const TOP_RIGHT = "Top right";
const UNINSTALL_EXTENSION = "Uninstall extension";
const UNINSTALL_MODULE = "Uninstall module";
@@ -472,15 +478,12 @@
const USERS_INFO = "With this options you <br /> can add new user or <br /> edit old user and userinfo, <br /> change groups and many <br /> other things";
const USERS_MANAGEMENT = "Users management";
const USERS_SPAN = "<ul><li><span class='bold red'>%s</span> users.</li></ul>";
- const USER_MENU = "User menu";
- const USER_SETTINGS = "User settings";
const USER_TIPS = "<ul><li>Manage Xoops users</li></ul>";
const VIEW_ACCOUNT = "View account";
const VIEW_MEMBER_INFO = "View member info";
- const WAITING_CONTENTS = "Waiting contents";
const WEBMASTERS_OF_THIS_SITE = "Webmasters of this site";
const WELCOME_TO_XOOPS_HELP_CENTER = "Welcome to XOOPS Help Center";
- const WORD_CENSORING_OPTIONS = "Word censoring options";
+ const WORD_CENSORING = "Word censoring";
const YOU_CANNOT_REMOVE_THIS_GROUP = "You can not remove this group";
const YOU_MUST_COMPLETE_ALL_REQUIRED_FIELDS = "You must complete all required fields";
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html 2013-02-01 22:17:28 UTC (rev 10964)
@@ -10,9 +10,9 @@
<span><{$preferences.name}></span>
</a>
<{/foreach}>
- <a class="xo-tooltip" href="admin.php?fct=preferences&op=showmod&mod=1" title="<{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}>">
- <img src="<{xoAdminIcons xoops/system_mods.png}>" alt="<{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}>" />
- <span><{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}></span>
+ <a class="xo-tooltip" href="admin.php?fct=preferences&op=showmod&mod=1" title="<{translate key='SYSTEM_PREFERENCES' dirname='system'}>">
+ <img src="<{xoAdminIcons xoops/system_mods.png}>" alt="<{translate key='SYSTEM_PREFERENCES' dirname='system'}>" />
+ <span><{translate key='SYSTEM_PREFERENCES' dirname='system'}></span>
</a>
</div>
<{/if}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html 2013-02-01 22:17:28 UTC (rev 10964)
@@ -29,8 +29,8 @@
<li>
<a class="xo-tooltip"
href="<{$xoops_url}>/modules/system/admin.php?fct=preferences&op=showmod&mod=<{$modid}>"
- title="<strong><{$smarty.const._MD_AM_SITEPREF}></strong>">
- <img src="<{$theme_icons}>/prefs.png" alt="<{$smarty.const._MD_AM_SITEPREF}>"/>
+ title="<strong><{translate key='SITE_PREFERENCES' dirname='system'}></strong>">
+ <img src="<{$theme_icons}>/prefs.png" alt="<{translate key='SITE_PREFERENCES' dirname='system'}>"/>
</a>
</li>
<{/if}>
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 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -24,14 +24,14 @@
/*
General settings
*/
-$modversion['name'] = _MI_SYSTEM_NAME;
-$modversion['description'] = _MI_SYSTEM_DESC;
+$modversion['name'] = SystemLocale::MODULE_NAME;
+$modversion['description'] = SystemLocale::MODULE_DESCRIPTION;
$modversion['version'] = 2.10;
$modversion['author'] = 'Andricq Nicolas,Cointin Maxime,Mage Gregory';
$modversion['nickname'] = 'MusS,Kraven30,Mage';
$modversion['credits'] = 'The XOOPS Project';
-$modversion['license'] = 'GNU GPL 2.0';
-$modversion['license_url'] = 'www.gnu.org/licenses/gpl-2.0.html/';
+$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license_url'] = 'www.gnu.org/licenses/gpl-2.0.html/';
$modversion['official'] = 1;
$modversion['help'] = 'system.html';
$modversion['image'] = 'images/logo.png';
@@ -40,13 +40,13 @@
/*
Settings for configs
*/
-$modversion['release_date'] = '2011/12/20';
-$modversion['module_website_url'] = 'http://www.xoops.org/';
+$modversion['release_date'] = '2011/12/20';
+$modversion['module_website_url'] = 'http://www.xoops.org/';
$modversion['module_website_name'] = 'XOOPS';
-$modversion['module_status'] = 'ALPHA';
-$modversion['min_php'] = '5.3';
-$modversion['min_xoops'] = '2.6.0';
-$modversion['min_db'] = array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+$modversion['module_status'] = 'ALPHA';
+$modversion['min_php'] = '5.3';
+$modversion['min_xoops'] = '2.6.0';
+$modversion['min_db'] = array('mysql' => '5.0.7', 'mysqli' => '5.0.7');
// Admin things
$modversion['hasAdmin'] = 1;
@@ -63,7 +63,9 @@
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
// Tables created by sql file (without prefix!)
-$i=1;
+
+//todo, are we using all these tables?
+$i = 1;
$modversion['tables'][$i] = "block_module_link";
$i++;
$modversion['tables'][$i] = "config";
@@ -106,65 +108,65 @@
// Admin Templates
// Blocks
-$i=0;
+$i = 0;
$modversion['blocks'][$i]['file'] = 'user.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME2;
-$modversion['blocks'][$i]['description'] = 'Shows user block';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_USER_MENU;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_USER_MENU_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_user_show';
$modversion['blocks'][$i]['template'] = 'system_block_user.html';
$i++;
$modversion['blocks'][$i]['file'] = 'login.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME3;
-$modversion['blocks'][$i]['description'] = 'Shows login form';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_LOGIN;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_LOGIN_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_login_show';
$modversion['blocks'][$i]['template'] = 'system_block_login.html';
$i++;
$modversion['blocks'][$i]['file'] = 'waiting.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME5;
-$modversion['blocks'][$i]['description'] = 'Shows contents waiting for approval';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_WAITING_CONTENTS;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_WAITING_CONTENTS_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_waiting_show';
$modversion['blocks'][$i]['template'] = 'system_block_waiting.html';
$i++;
$modversion['blocks'][$i]['file'] = 'main.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME6;
-$modversion['blocks'][$i]['description'] = 'Shows the main navigation menu of the site';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_MAIN_MENU;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_MAIN_MENU_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_main_show';
$modversion['blocks'][$i]['edit_func'] = 'b_system_main_edit';
$modversion['blocks'][$i]['template'] = 'system_block_mainmenu.html';
$i++;
$modversion['blocks'][$i]['file'] = 'info.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME7;
-$modversion['blocks'][$i]['description'] = 'Shows basic info about the site and a link to Recommend Us pop up window';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_SITE_INFORMATION;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_SITE_INFORMATION;
$modversion['blocks'][$i]['show_func'] = 'b_system_info_show';
$modversion['blocks'][$i]['edit_func'] = 'b_system_info_edit';
$modversion['blocks'][$i]['options'] = '320|190|s_poweredby.gif|1';
$modversion['blocks'][$i]['template'] = 'system_block_siteinfo.html';
$i++;
$modversion['blocks'][$i]['file'] = 'online.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME8;
-$modversion['blocks'][$i]['description'] = 'Displays users/guests currently online';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_WHO_IS_ONLINE;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_WHO_IS_ONLINE_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_online_show';
$modversion['blocks'][$i]['template'] = 'system_block_online.html';
$i++;
$modversion['blocks'][$i]['file'] = 'topposters.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME9;
-$modversion['blocks'][$i]['description'] = 'Top posters';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_TOP_POSTERS;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_TOP_POSTERS_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_topposters_show';
$modversion['blocks'][$i]['edit_func'] = 'b_system_topposters_edit';
$modversion['blocks'][$i]['options'] = '10|1';
$modversion['blocks'][$i]['template'] = 'system_block_topusers.html';
$i++;
$modversion['blocks'][$i]['file'] = 'newmembers.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME10;
-$modversion['blocks'][$i]['description'] = 'Shows most recent users';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_NEW_MEMBERS;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_NEW_MEMBERS_DESC;
$modversion['blocks'][$i]['...
[truncated message content] |
|
From: <tr...@us...> - 2013-02-01 22:33:08
|
Revision: 10965
http://sourceforge.net/p/xoops/svn/10965
Author: trabis
Date: 2013-02-01 22:33:03 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Updating locale for system blocks
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/newmembers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/topposters.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_blocks.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -65,16 +65,16 @@
$block['showgroups'] = false;
}
$block['logourl'] = XOOPS_URL . '/images/' . $options[2];
- $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/misc.php?action=showpopups&type=friend&op=sendform&t=" . time() . "','friend'," . $options[0] . "," . $options[1] . ")\">" . _MB_SYSTEM_RECO . "</a>";
+ $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/misc.php?action=showpopups&type=friend&op=sendform&t=" . time() . "','friend'," . $options[0] . "," . $options[1] . ")\">" . SystemLocale::RECOMMEND_US . "</a>";
return $block;
}
function b_system_info_edit($options)
{
$block_form = new XoopsBlockForm();
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_PWWIDTH, 'options[0]', 1, 3, $options[0]), true);
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_PWHEIGHT, 'options[1]', 1, 3, $options[1]), true);
- $block_form->addElement( new XoopsFormText(sprintf(_MB_SYSTEM_LOGO, XOOPS_URL . "/images/"), 'options[2]', 5, 100, $options[2]), true);
- $block_form->addElement(new XoopsFormRadioYN(_MB_SYSTEM_SADMIN, 'options[3]', $options[3]));
+ $block_form->addElement( new XoopsFormText(SystemLocale::POPUP_WINDOW_WIDTH, 'options[0]', 1, 3, $options[0]), true);
+ $block_form->addElement( new XoopsFormText(SystemLocale::POPUP_WINDOW_HEIGHT, 'options[1]', 1, 3, $options[1]), true);
+ $block_form->addElement( new XoopsFormText(sprintf(SystemLocale::F_LOGO_IMAGE_FILE_IS_LOCATED_UNDER, XOOPS_URL . "/images/"), 'options[2]', 5, 100, $options[2]), true);
+ $block_form->addElement(new XoopsFormRadioYN(SystemLocale::SHOW_ADMIN_GROUPS, 'options[3]', $options[3]));
return $block_form->render();
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -28,13 +28,12 @@
$block['unamevalue'] = "";
$block['lang_password'] = XoopsLocale::C_PASSWORD;
$block['lang_login'] = XoopsLocale::A_LOGIN;
- $block['lang_lostpass'] = _MB_SYSTEM_LPASS;
- $block['lang_registernow'] = _MB_SYSTEM_RNOW;
- //$block['lang_rememberme'] = _MB_SYSTEM_REMEMBERME;
+ $block['lang_lostpass'] = XoopsLocale::Q_LOST_YOUR_PASSWORD;
+ $block['lang_registernow'] = XoopsLocale::REGISTER_NOW;
if ($xoops->getConfig('use_ssl') == 1 && $xoops->getConfig('sslloginlink') != '') {
- $block['sslloginlink'] = "<a href=\"javascript:openWithSelfMain('" . $xoops->getConfig('sslloginlink') . "', 'ssllogin', 300, 200);\">" . _MB_SYSTEM_SECURE . "</a>";
+ $block['sslloginlink'] = "<a href=\"javascript:openWithSelfMain('" . $xoops->getConfig('sslloginlink') . "', 'ssllogin', 300, 200);\">" . SystemLocale::SECURE_LOGIN . "</a>";
} elseif ($xoops->getConfig('usercookie')) {
- $block['lang_rememberme'] = _MB_SYSTEM_REMEMBERME;
+ $block['lang_rememberme'] = XoopsLocale::REMEMBER_ME;
}
return $block;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -23,7 +23,7 @@
{
$xoops = Xoops::getInstance();
$block = array();
- $block['lang_home'] = _MB_SYSTEM_HOME;
+ $block['lang_home'] = XoopsLocale::HOME;
$block['lang_close'] = XoopsLocale::A_CLOSE;
$module_handler = $xoops->getHandlerModule();
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/newmembers.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/newmembers.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/newmembers.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -51,7 +51,7 @@
function b_system_newmembers_edit($options)
{
$block_form = new XoopsBlockForm();
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
- $block_form->addElement(new XoopsFormRadioYN(_MB_SYSTEM_DISPLAYA, 'options[1]', $options[1]));
+ $block_form->addElement( new XoopsFormText(SystemLocale::NUMBER_OF_MEMBERS_TO_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
+ $block_form->addElement(new XoopsFormRadioYN(SystemLocale::DISPLAY_MEMBERS_AVATARS, 'options[1]', $options[1]));
return $block_form->render();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -38,14 +38,14 @@
$block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
}
- $block['theme_select'] .= '<br />(' . sprintf(_MB_SYSTEM_NUMTHEME, '<strong>' . count($theme_set_allowed) . '</strong>') . ')<br />';
+ $block['theme_select'] .= '<br />(' . sprintf(SystemLocale::F_THEMES, '<strong>' . count($theme_set_allowed) . '</strong>') . ')<br />';
return $block;
}
function b_system_themes_edit($options)
{
$block_form = new XoopsBlockForm();
- $block_form->addElement(new XoopsFormRadioYN(_MB_SYSTEM_THSHOW, 'options[0]', $options[0]));
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_THWIDTH, 'options[1]', 1, 3, $options[1]), true);
+ $block_form->addElement(new XoopsFormRadioYN(SystemLocale::DISPLAY_SCREENSHOT_IMAGE, 'options[0]', $options[0]));
+ $block_form->addElement( new XoopsFormText(SystemLocale::SCREENSHOT_IMAGE_WIDTH, 'options[1]', 1, 3, $options[1]), true);
return $block_form->render();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/topposters.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/topposters.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/topposters.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -51,14 +51,12 @@
function b_system_topposters_edit($options)
{
- include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-
$block_form = new XoopsBlockForm();
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
- $block_form->addElement(new XoopsFormRadioYN(_MB_SYSTEM_DISPLAYA, 'options[1]', $options[1]));
+ $block_form->addElement( new XoopsFormText(SystemLocale::NUMBER_OF_MEMBERS_TO_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
+ $block_form->addElement(new XoopsFormRadioYN(SystemLocale::DISPLAY_MEMBERS_AVATARS, 'options[1]', $options[1]));
$ranks = XoopsLists::getUserRankList();
- $ranks_select = new XoopsFormSelect(_MB_SYSTEM_NODISPGR, 'options[2]', explode(',',$options[2]), 5, true);
+ $ranks_select = new XoopsFormSelect(SystemLocale::C_DO_NOT_DISPLAY_USERS_WHOSE_RANK_IS, 'options[2]', explode(',',$options[2]), 5, true);
$ranks_select->addOptionArray( $ranks );
$block_form->addElement($ranks_select);
return $block_form->render();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -61,14 +61,14 @@
// View Account
array_unshift($block['modules'], array(
- 'name' => _MB_SYSTEM_VACNT,
+ 'name' => SystemLocale::VIEW_ACCOUNT,
'link' => $xoops->url('userinfo.php?uid=' . $xoops->user->getVar('uid')),
'icon' => 'icon-user',
));
// Edit Account
array_unshift($block['modules'], array(
- 'name' => _MB_SYSTEM_EACNT,
+ 'name' => SystemLocale::EDIT_ACCOUNT,
'link' => $xoops->url('edituser.php'),
'icon' => 'icon-user',
));
@@ -76,7 +76,7 @@
// Administration Menu
if ($xoops->isAdmin()) {
array_unshift($block['modules'], array(
- 'name' => _MB_SYSTEM_ADMENU,
+ 'name' => SystemLocale::ADMINISTRATION_MENU,
'link' => $xoops->url('admin.php'),
'rel' => 'external',
'icon' => 'icon-wrench',
@@ -89,10 +89,10 @@
$pm_handler = $xoops->getHandlerPrivmessage();
$xoops->preload()->triggerEvent('system.blocks.system_blocks.usershow', array(&$pm_handler));
- $name = _MB_SYSTEM_INBOX;
+ $name = XoopsLocale::INBOX;
$class = '';
if ($pm_count = $pm_handler->getCount($criteria)) {
- $name = _MB_SYSTEM_INBOX . ' <strong>' . $pm_count . '</strong>';
+ $name = XoopsLocale::INBOX . ' <strong>' . $pm_count . '</strong>';
$class = 'highlight';
}
@@ -105,7 +105,7 @@
// Logout
array_push($block['modules'], array(
- 'name' => _MB_SYSTEM_LOUT,
+ 'name' => XoopsLocale::A_LOGOUT,
'link' => $xoops->url('user.php?op=logout'),
'icon' => 'icon-off',
));
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_blocks.php (from rev 10963, XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_blocks.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_blocks.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -0,0 +1,52 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+
+// Blocks
+//define("_MB_SYSTEM_ADMENU","Administration Menu");
+//define("_MB_SYSTEM_RNOW","Register now!");
+//define("_MB_SYSTEM_LPASS","Lost Password?");
+//define("_MB_SYSTEM_SEARCH","Search");
+//define("_MB_SYSTEM_ADVS","Advanced Search");
+//define("_MB_SYSTEM_VACNT","View Account");
+//define("_MB_SYSTEM_EACNT","Edit Account");
+//define("_MB_SYSTEM_USERCONFIGS","User configs");
+// RMV-NOTIFY
+//define("_MB_SYSTEM_NOTIF", "Notifications");
+//define("_MB_SYSTEM_LOUT","Logout");
+//define("_MB_SYSTEM_INBOX","Inbox");
+//define("_MB_SYSTEM_SUBMS","Submitted News");
+//define("_MB_SYSTEM_WLNKS","Waiting Links");
+//define("_MB_SYSTEM_BLNK","Broken Links");
+//define("_MB_SYSTEM_MLNKS","Modified Links");
+//define("_MB_SYSTEM_WDLS","Waiting Downloads");
+//define("_MB_SYSTEM_BFLS","Broken Files");
+//define("_MB_SYSTEM_MFLS","Modified Downloads");
+//define("_MB_SYSTEM_TDMDOWNLOADS","Waiting Downloads");
+//define("_MB_SYSTEM_EXTGALLERY","Waiting Photos");
+//define("_MB_SYSTEM_SMARTSECTION","Articles");
+//define("_MB_SYSTEM_HOME","Home"); // link to home page in main menu block
+//define("_MB_SYSTEM_RECO","Recommend Us");
+//define("_MB_SYSTEM_PWWIDTH","Pop-Up Window Width");
+//define("_MB_SYSTEM_PWHEIGHT","Pop-Up Window Height");
+//define("_MB_SYSTEM_LOGO","Logo image file is located under %s directory"); // %s is your root image directory name
+//define("_MB_SYSTEM_COMPEND", "Comments");
+
+//define("_MB_SYSTEM_LOGGEDINAS", "Logged in as");
+//define("_MB_SYSTEM_SADMIN","Show admin groups");
+//define("_MB_SYSTEM_SPMTO","Send Private Message to %s");
+//define("_MB_SYSTEM_SEMTO","Send Email to %s");
+
+//define("_MB_SYSTEM_DISPLAY","Number of members to display");
+//define("_MB_SYSTEM_DISPLAYA","Display member avatars");
+//define("_MB_SYSTEM_NODISPGR","Do not display users whose rank is:");
+
+//define("_MB_SYSTEM_DISPLAYC","Number of comments to display");
+//define("_MB_SYSTEM_SECURE", "Secure Login");
+
+//define("_MB_SYSTEM_NUMTHEME", "%s themes");
+//define("_MB_SYSTEM_THSHOW", "Display screenshot image");
+//define("_MB_SYSTEM_THWIDTH", "Screenshot image width");
+define("_MB_SYSTEM_REMEMBERME","Remember me");
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -1,52 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-
-// Blocks
-define("_MB_SYSTEM_ADMENU","Administration Menu");
-define("_MB_SYSTEM_RNOW","Register now!");
-define("_MB_SYSTEM_LPASS","Lost Password?");
-//define("_MB_SYSTEM_SEARCH","Search");
-//define("_MB_SYSTEM_ADVS","Advanced Search");
-define("_MB_SYSTEM_VACNT","View Account");
-define("_MB_SYSTEM_EACNT","Edit Account");
-//define("_MB_SYSTEM_USERCONFIGS","User configs");
-// RMV-NOTIFY
-//define("_MB_SYSTEM_NOTIF", "Notifications");
-define("_MB_SYSTEM_LOUT","Logout");
-define("_MB_SYSTEM_INBOX","Inbox");
-//define("_MB_SYSTEM_SUBMS","Submitted News");
-//define("_MB_SYSTEM_WLNKS","Waiting Links");
-//define("_MB_SYSTEM_BLNK","Broken Links");
-//define("_MB_SYSTEM_MLNKS","Modified Links");
-//define("_MB_SYSTEM_WDLS","Waiting Downloads");
-//define("_MB_SYSTEM_BFLS","Broken Files");
-//define("_MB_SYSTEM_MFLS","Modified Downloads");
-//define("_MB_SYSTEM_TDMDOWNLOADS","Waiting Downloads");
-//define("_MB_SYSTEM_EXTGALLERY","Waiting Photos");
-//define("_MB_SYSTEM_SMARTSECTION","Articles");
-define("_MB_SYSTEM_HOME","Home"); // link to home page in main menu block
-define("_MB_SYSTEM_RECO","Recommend Us");
-define("_MB_SYSTEM_PWWIDTH","Pop-Up Window Width");
-define("_MB_SYSTEM_PWHEIGHT","Pop-Up Window Height");
-define("_MB_SYSTEM_LOGO","Logo image file is located under %s directory"); // %s is your root image directory name
-//define("_MB_SYSTEM_COMPEND", "Comments");
-
-//define("_MB_SYSTEM_LOGGEDINAS", "Logged in as");
-define("_MB_SYSTEM_SADMIN","Show admin groups");
-//define("_MB_SYSTEM_SPMTO","Send Private Message to %s");
-//define("_MB_SYSTEM_SEMTO","Send Email to %s");
-
-define("_MB_SYSTEM_DISPLAY","Number of members to display");
-define("_MB_SYSTEM_DISPLAYA","Display member avatars");
-define("_MB_SYSTEM_NODISPGR","Do not display users whose rank is:");
-
-//define("_MB_SYSTEM_DISPLAYC","Number of comments to display");
-define("_MB_SYSTEM_SECURE", "Secure Login");
-
-define("_MB_SYSTEM_NUMTHEME", "%s themes");
-define("_MB_SYSTEM_THSHOW", "Display screenshot image");
-define("_MB_SYSTEM_THWIDTH", "Screenshot image width");
-define("_MB_SYSTEM_REMEMBERME","Remember me");
\ No newline at end of file
|
|
From: <tr...@us...> - 2013-02-01 22:37:58
|
Revision: 10966
http://sourceforge.net/p/xoops/svn/10966
Author: trabis
Date: 2013-02-01 22:37:55 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Updating system cpanel locale
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_cpanel.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php 2013-02-01 22:33:03 UTC (rev 10965)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/help.php 2013-02-01 22:37:55 UTC (rev 10966)
@@ -166,7 +166,7 @@
if (XoopsLoad::fileExists(XOOPS_ROOT_PATH . '/modules/system/language/' . $xoops->getConfig('language') . '/help/help_center.html')) {
$helpcontent = $xoops->tpl()->fetch(XOOPS_ROOT_PATH . '/modules/system/language/' . $xoops->getConfig('language') . '/help/help_center.html');
} else {
- $helpcontent = '<div id="non-modhelp">' . _MD_CPANEL_HELPCENTER . '</div>';
+ $helpcontent = '<div id="non-modhelp">' . SystemLocale::WELCOME_TO_XOOPS_HELP_CENTER . '</div>';
}
$xoops->tpl()->assign('helpcontent', $helpcontent);
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_cpanel.php (from rev 10963, XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_cpanel.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_cpanel.php 2013-02-01 22:37:55 UTC (rev 10966)
@@ -0,0 +1,27 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+
+/*define("_MD_AM_VRSN", "Version");
+define("_MD_AM_FINDUSER", "Find Users");
+define("_MD_CPANEL_NEWS", "News");
+define("_MD_CPANEL_NEWS_DESC", "XOOPS development news");
+define("_MD_CPANEL_PROJECT", "Project");
+define("_MD_CPANEL_PROJECT_DESC", "XOOPS Project website");
+define("_MD_CPANEL_COMMUNITY", "Community");
+define("_MD_CPANEL_COMMUNITY_DESC", "XOOPS Official Community website");
+define("_MD_CPANEL_LOCAL", "Local Support");
+define("_MD_CPANEL_LOCAL_DESC", "XOOPS Certified Local Support websites");
+
+define("_MD_CPANEL_OVERVIEW", "System Overview");
+define("_MD_CPANEL_PHPEXTENSIONS", "Loaded PHP extensions");
+define("_MD_CPANEL_VERSION", "%s Version");
+
+define("_MD_CPANEL_QUICKLINKS", "Quick links");
+
+define("_MD_CPANEL_SITE_ADMINISTRATION", "%s administration");*/
+
+// for help page
+//define("_MD_CPANEL_HELPCENTER", "Welcome to XOOPS Help Center");
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php 2013-02-01 22:33:03 UTC (rev 10965)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/cpanel.php 2013-02-01 22:37:55 UTC (rev 10966)
@@ -1,27 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-
-/*define("_MD_AM_VRSN", "Version");
-define("_MD_AM_FINDUSER", "Find Users");
-define("_MD_CPANEL_NEWS", "News");
-define("_MD_CPANEL_NEWS_DESC", "XOOPS development news");
-define("_MD_CPANEL_PROJECT", "Project");
-define("_MD_CPANEL_PROJECT_DESC", "XOOPS Project website");
-define("_MD_CPANEL_COMMUNITY", "Community");
-define("_MD_CPANEL_COMMUNITY_DESC", "XOOPS Official Community website");
-define("_MD_CPANEL_LOCAL", "Local Support");
-define("_MD_CPANEL_LOCAL_DESC", "XOOPS Certified Local Support websites");
-
-define("_MD_CPANEL_OVERVIEW", "System Overview");
-define("_MD_CPANEL_PHPEXTENSIONS", "Loaded PHP extensions");
-define("_MD_CPANEL_VERSION", "%s Version");
-
-define("_MD_CPANEL_QUICKLINKS", "Quick links");
-
-define("_MD_CPANEL_SITE_ADMINISTRATION", "%s administration");*/
-
-// for help page
-define("_MD_CPANEL_HELPCENTER", "Welcome to XOOPS Help Center");
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2013-02-01 22:33:03 UTC (rev 10965)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2013-02-01 22:37:55 UTC (rev 10966)
@@ -34,8 +34,6 @@
{
$xoops = Xoops::getInstance();
$xoops->loadLanguage('admin', 'system');
- $xoops->loadLanguage('cpanel', 'system');
- $xoops->loadLanguage('modinfo', 'system');
$xoops->theme()->addStylesheet('media/xoops/css/moduladmin.css');
$xoops->theme()->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');
|
×
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