Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8546] XoopsCore/trunk
|
From: <be...@us...> - 2011-12-25 23:01:09
|
Revision: 8546
http://xoops.svn.sourceforge.net/xoops/?rev=8546&view=rev
Author: beckmi
Date: 2011-12-25 23:00:59 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Updating Trunk to XOOPS 2.5.0 RC 2
Modified Paths:
--------------
XoopsCore/trunk/docs/changelog.250.txt
XoopsCore/trunk/docs/install.html
XoopsCore/trunk/extras/modules/system/js/filemanager.js
XoopsCore/trunk/htdocs/class/textsanitizer/image/image.php
XoopsCore/trunk/htdocs/language/english/global.php
XoopsCore/trunk/htdocs/modules/pm/templates/pm_pmlite.html
XoopsCore/trunk/htdocs/modules/pm/xoops_version.php
XoopsCore/trunk/htdocs/modules/profile/language/english/main.php
XoopsCore/trunk/htdocs/modules/system/admin/avatars/main.php
XoopsCore/trunk/htdocs/modules/system/admin/banners/main.php
XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/trunk/htdocs/modules/system/admin/comments/main.php
XoopsCore/trunk/htdocs/modules/system/admin/groups/main.php
XoopsCore/trunk/htdocs/modules/system/admin/images/main.php
XoopsCore/trunk/htdocs/modules/system/admin/maintenance/main.php
XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php
XoopsCore/trunk/htdocs/modules/system/admin/tplsets/jquery.php
XoopsCore/trunk/htdocs/modules/system/admin/tplsets/main.php
XoopsCore/trunk/htdocs/modules/system/admin/users/jquery.php
XoopsCore/trunk/htdocs/modules/system/admin/users/main.php
XoopsCore/trunk/htdocs/modules/system/admin/users/users.php
XoopsCore/trunk/htdocs/modules/system/admin.php
XoopsCore/trunk/htdocs/modules/system/class/avatar.php
XoopsCore/trunk/htdocs/modules/system/constants.php
XoopsCore/trunk/htdocs/modules/system/include/functions.php
XoopsCore/trunk/htdocs/modules/system/js/module.js
XoopsCore/trunk/htdocs/modules/system/language/english/admin/avatars.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/banners.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/comments.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/groups.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/images.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/mailusers.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/modulesadmin.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/smilies.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/userrank.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/users.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin.php
XoopsCore/trunk/htdocs/modules/system/language/english/blocks.php
XoopsCore/trunk/htdocs/modules/system/language/english/cpanel.php
XoopsCore/trunk/htdocs/modules/system/language/english/modinfo.php
XoopsCore/trunk/htdocs/modules/system/menu.php
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_banners.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_index.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_users.html
XoopsCore/trunk/htdocs/modules/system/templates/blocks/system_block_themes.html
XoopsCore/trunk/htdocs/modules/system/themes/default/css/footer.css
XoopsCore/trunk/htdocs/modules/system/themes/default/css/silver.css
XoopsCore/trunk/htdocs/modules/system/themes/default/js/styleswitch.js
XoopsCore/trunk/htdocs/modules/system/themes/default/language/english/admin.php
XoopsCore/trunk/htdocs/modules/system/themes/legacy/css/style.css
XoopsCore/trunk/htdocs/modules/system/themes/legacy/theme.html
XoopsCore/trunk/htdocs/modules/system/themes/zetadigme/css/style.css
XoopsCore/trunk/htdocs/modules/system/themes/zetadigme/language/english/admin.php
XoopsCore/trunk/htdocs/modules/system/themes/zetadigme/xotpl/xo_toolsbar.html
XoopsCore/trunk/htdocs/themes/suico/xotpl/xo_metas.html
XoopsCore/trunk/htdocs/themes/suico/xotpl/xo_scripts.html
XoopsCore/trunk/htdocs/uploads/avatars/blank.gif
XoopsCore/trunk/htdocs/xoops.css
Added Paths:
-----------
XoopsCore/trunk/htdocs/modules/system/themes/legacy/icons/
XoopsCore/trunk/htdocs/modules/system/themes/zetadigme/icons/help.png
Removed Paths:
-------------
XoopsCore/trunk/htdocs/class/xoopseditor/dhtmltextarea/language/schinese.php
XoopsCore/trunk/htdocs/class/xoopseditor/dhtmltextarea/language/schinese_utf8.php
XoopsCore/trunk/htdocs/class/xoopseditor/textarea/language/schinese.php
XoopsCore/trunk/htdocs/class/xoopseditor/textarea/language/schinese_utf8.php
Property Changed:
----------------
XoopsCore/trunk/
XoopsCore/trunk/htdocs/modules/
Property changes on: XoopsCore/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /XoopsCore/branches/2.4.x/2.4.4:4083-4170
/XoopsCore/branches/2.4.x/2.4.5:4294-4943
/XoopsCore/branches/2.5.x/2.5.0:5408-5536
/XoopsCore/branches/tasks/2.5.0-formuss-trabis:4945-5535
/XoopsCore/releases/2.5.0-beta:5409-8543
/XoopsCore/releases/2.5.0-rc:5537-8544
+ /XoopsCore/branches/2.4.x/2.4.4:4083-4170
/XoopsCore/branches/2.4.x/2.4.5:4294-4943
/XoopsCore/branches/2.5.x/2.5.0:5408-5536
/XoopsCore/branches/tasks/2.5.0-formuss-trabis:4945-5620
/XoopsCore/releases/2.5.0-beta:5409-8543
/XoopsCore/releases/2.5.0-rc:5537-8544
/XoopsCore/releases/2.5.0-rc2:5597-8545
Modified: XoopsCore/trunk/docs/changelog.250.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.250.txt 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/docs/changelog.250.txt 2011-12-25 23:00:59 UTC (rev 8546)
@@ -1,7 +1,34 @@
===============================
-Updated 2010/10/17: Version 2.5.0
+Updated 2010/10/23: Version 2.5.0
===============================
Bug Fixes:
+
+ - Fix save in edit avatar and change path to avatar in form (formuss)
+ - include jQuery in admin page (formuss)
+ - Fix: Banners - "add" buttons disappear after deleting all banners. (trabis)
+ - Fix: Banners - Blank page when deleting clients. (trabis)
+ - Fix: Impossible to edit a user if uname contains a ', it shows uname already taken. (trabis)
+ - Fix: Some user defines(Error messages) were placed in blocks language file! They were moved to user language file and renamed. (trabis)
+ - Fix: Impossible to "delete" or "update groups" of selected users. Table sorting does not work with select fields! Table sorting was disabled for now. Also, the action for deleting users was not matching the action requested by the submit form.
+ - Improving fix for "Arbitrary file deletion" reported by Ono. Make sure file is inside "themes" directory. (onokazu/trabis)
+ - Fixing Xss attack, and possible sql injections on admin user page(reported by Ono).. (onokazu/trabis)
+ - Added 3 language constants for interest, occupation and location for usage on "search user" page. . (trabis)
+ - Altered 3 language constants for interest, occupation and location used on "add/edit user" page.. (trabis)
+ - Fixed error messages constants that were using old definitions. . (trabis)
+ - Fixing "full path disclosure" (onokazu/trabis)
+ - Fix an error when we commit with blank.gif (formuss)
+ - Add default image for avatar (formuss)
+ - Clean variables passed by submit (formuss)
+ - Add case in clean variable function (formuss)
+ - Load english language as default (formuss)
+ - Fix errors with _AM_SYSTEM_DBUPDATED define in sub file (formuss)
+ - Fix an error on banners client deletion (formuss)
+ - Fix banners error on search client name (formuss)
+ - Fix an error when add smilies with existing file (formuss)
+ - Fix banners error on search client name (formuss)
+ - Fix an error when add smilies with existing file (formuss)
+ - Fix an error with IE (formuss)
+ - Fix problem for changing module name (formuss)
- ID: 3089455 (wrong width in Profile Style.css) (Mamba)
- ID: 3081037 (Updated PHP & MySQL requirementes) (Anderssk/Mamba)
- ID: 3089251 (Checkboxes in Block Accees not working) (Mamba/Formuss)
@@ -23,6 +50,7 @@
- Removing file class/xoopsform/formtree.php, class is not working and not following Xoops naming conventions (trabis)
Design Fixes:
+ - update legacy admin gui (change link in header) - xoops 2.5.0 (kris_fr)
- correction of image links and cleaning css code in legacy admin gui (kris_fr)
- correction and cleaning css code and deleting unused images in installer (kris_fr)
- correction define language, cleaning css code and deleting unused files in zetadigme admin gui (kris_fr)
@@ -30,6 +58,7 @@
- design template system_preferences.html in zetadigme admin gui (kris_fr)
- suico theme : delete french language, correction filemanager link and language define for baradmin/footerstatic, add if no avatar in userbar popup (kris_fr)
- suico theme : minors fixes for list : ol li (kris_fr)
+ - fix suico thm for ie (kris_fr)
- fix and cleaning css code in modules/system/css (kris_fr)
- complete generic class in modules/system/css/class.css (kris_fr)
- rebuild default admin gui based by morphogenesis 3.1.3 (voltan)
@@ -48,6 +77,12 @@
- add imagemanager.css for imagemanager.html (voltan)
- redesign fatal error message (kris_fr)
- redesign upgrade process (kris_fr)
+ - complete legacy admin gui : icons missing and link for help page (kris_fr)
+ - fix block theme with pm module (kris_fr)
+ - fix td align in pm_pmlite.html (kris_fr)
+ - fix cookie Styleswitch - problem with old orange style for default admin gui (kris_fr)
+ - fix color link under ie8/9 in default admin gui footer (kris_fr)
+ - add help page in zetadigme admin gui (kris_fr)
XOOPS:
- user.php: User page
Modified: XoopsCore/trunk/docs/install.html
===================================================================
--- XoopsCore/trunk/docs/install.html 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/docs/install.html 2011-12-25 23:00:59 UTC (rev 8546)
@@ -1,6 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>XOOPS Installation Instructions</title>
<meta name="keywords" content="XOOPS" />
<meta name="description" content="XOOPS installation guide" />
@@ -105,8 +106,8 @@
<h2>Requirements</h2>
<ul>
<li>WWW Server (<a href="http://www.apache.org/" target="_blank">Apache</a>, IIS, Roxen, etc)</li>
- <li><a href="http://www.php.net/" target="_blank">PHP</a> 4.3.0 or higher (5.2 or higher recommended)</li>
- <li><a href="http://www.mysql.com/" target="_blank">MySQL</a> 3.23 or higher (4.1 or higher recommended)</li>
+ <li><a href="http://www.php.net/" target="_blank">PHP</a> 5.1.0 or higher</li>
+ <li><a href="http://www.mysql.com/" target="_blank">MySQL</a> 5.1 or higher</li>
</ul>
<h2>Before you install</h2>
Modified: XoopsCore/trunk/extras/modules/system/js/filemanager.js
===================================================================
--- XoopsCore/trunk/extras/modules/system/js/filemanager.js 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/extras/modules/system/js/filemanager.js 2011-12-25 23:00:59 UTC (rev 8546)
@@ -366,7 +366,7 @@
parserfile: "parsesql.js",
stylesheet: "css/code_mirror/sqlcolors.css",
path: "js/code_mirror/",
- textWrapping: false,
+ textWrapping: false
});
}else{
var editor = CodeMirror.fromTextArea("code_mirror", {
Modified: XoopsCore/trunk/htdocs/class/textsanitizer/image/image.php
===================================================================
--- XoopsCore/trunk/htdocs/class/textsanitizer/image/image.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/class/textsanitizer/image/image.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -77,9 +77,9 @@
} else {
$ts->replacements[] = "<img src='\\5' class='\\2' border='0' alt='' onload=\"JavaScript:if(this.width>\\4) this.width=\\4\" />";
- $ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='' " . ($config['resize'] ? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
+ $ts->replacements[] = "<img src='\\3' class='\\2' border='0' alt='' " . ($config['resize'] ? "onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
$ts->replacements[] = "<img src='\\3' border='0' alt='' onload=\"JavaScript:if(this.width>\\2) this.width=\\2\" />";
- $ts->replacements[] = "<img src='\\1' border='0' alt='' " . ($config['resize'] ? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/></a>";
+ $ts->replacements[] = "<img src='\\1' border='0' alt='' " . ($config['resize'] ? " onload=\"javascript:imageResize(this, " . $config['max_width'] . ")\"" : "") . "/>";
// Added for script driven images
$ts->replacements[] = '<img align="\\1" width="\\2" src="\\3">';
$ts->replacements[] = '<img align="\\2" width="\\1" src="\\3">';
Deleted: XoopsCore/trunk/htdocs/class/xoopseditor/dhtmltextarea/language/schinese.php
===================================================================
--- XoopsCore/trunk/htdocs/class/xoopseditor/dhtmltextarea/language/schinese.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/class/xoopseditor/dhtmltextarea/language/schinese.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -1,17 +0,0 @@
-<?php
-/**
- * FCKeditor adapter for XOOPS
- *
- * @copyright The XOOPS project http://www.xoops.org/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
- * @since 4.00
- * @version $Id$
- * @package xoopseditor
- */
-/**
- * Assocated with editor_registry.php
- */
-define( '_XOOPS_EDITOR_DHTMLTEXTAREA', 'DHTML\xB1༭\xBF\xF2' );
-
-?>
Deleted: XoopsCore/trunk/htdocs/class/xoopseditor/dhtmltextarea/language/schinese_utf8.php
===================================================================
--- XoopsCore/trunk/htdocs/class/xoopseditor/dhtmltextarea/language/schinese_utf8.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/class/xoopseditor/dhtmltextarea/language/schinese_utf8.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -1,29 +0,0 @@
-<?php
-/**
- * Name: schinese_utf8.php
- * Description:
- *
- * 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)
- * @package : XOOPS
- * @Module :
- * @subpackage :
- * @since 2.3.0
- * @author John Neill
- * @version $Id$
- */
-defined( 'XOOPS_ROOT_PATH' ) or die( 'Restricted access' );
-
-/**
- * Assocated with editor_registry.php
- */
-define( '_XOOPS_EDITOR_DHTMLTEXTAREA', 'DHTML???' );
-
-?>
Deleted: XoopsCore/trunk/htdocs/class/xoopseditor/textarea/language/schinese.php
===================================================================
--- XoopsCore/trunk/htdocs/class/xoopseditor/textarea/language/schinese.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/class/xoopseditor/textarea/language/schinese.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -1,16 +0,0 @@
-<?php
-/**
- * Editor framework for XOOPS
- *
- * @copyright The XOOPS project http://www.xoops.org/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
- * @since 1.00
- * @version $Id$
- * @package xoopseditor
- */
-/*
- * Assocated with editor_registry.php
- */
-define("_XOOPS_EDITOR_TEXTAREA", "\xBC\xF2\xD2\xD7\xCEı\xBE\xB1༭\xBF\xF2");
-?>
Deleted: XoopsCore/trunk/htdocs/class/xoopseditor/textarea/language/schinese_utf8.php
===================================================================
--- XoopsCore/trunk/htdocs/class/xoopseditor/textarea/language/schinese_utf8.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/class/xoopseditor/textarea/language/schinese_utf8.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -1,16 +0,0 @@
-<?php
-/**
- * Editor framework for XOOPS
- *
- * @copyright The XOOPS project http://www.xoops.org/
- * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @author Taiwen Jiang (phppp or D.J.) <ph...@ho...>
- * @since 1.00
- * @version $Id$
- * @package xoopseditor
- */
-/*
- * Assocated with editor_registry.php
- */
-define("_XOOPS_EDITOR_TEXTAREA", "简易文本编辑框");
-?>
Modified: XoopsCore/trunk/htdocs/language/english/global.php
===================================================================
--- XoopsCore/trunk/htdocs/language/english/global.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/language/english/global.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -141,6 +141,13 @@
define('_CURRCHAR', 'Current chars length: ');
define('_PLZCOMPLETE', 'Please complete the subject and message fields.');
define('_MESSAGETOOLONG', 'Your message is too long.');
+/**
+* xoops smilie
+*/
+define('_AM_ADDSMILE',' Add a new smilie');
+define('_AM_SMILECODE','Code');
+define('_AM_SMILEEMOTION','Description');
+define('_AM_DISPLAYF','Display in the form');
// %%%%% TIME FORMAT SETTINGS %%%%%
define('_SECOND', '1 second');
define('_SECONDS', '%s seconds');
Property changes on: XoopsCore/trunk/htdocs/modules
___________________________________________________________________
Added: svn:mergeinfo
+ /XoopsCore/branches/tasks/2.5.0-formuss-trabis/htdocs/modules:5405-5620
/XoopsCore/releases/2.5.0-rc2/htdocs/modules:5597-8545
/XoopsModules/protector/releases/3.40/modules:4782-5620
Modified: XoopsCore/trunk/htdocs/modules/pm/templates/pm_pmlite.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/pm/templates/pm_pmlite.html 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/modules/pm/templates/pm_pmlite.html 2011-12-25 23:00:59 UTC (rev 8546)
@@ -2,16 +2,16 @@
<form name="<{$pmform.name}>" id="<{$pmform.name}>" action="<{$pmform.action}>" method="<{$pmform.method}>" <{$pmform.extra}> >
<table class='outer txtcenter width100'>
<tr>
- <td class='head width30'><{$smarty.const._PM_TO}></td>
- <td class='even'><{if $pmform.elements.to_userid.hidden != 1}><{$pmform.elements.to_userid.body}><{/if}><{$to_username}></td>
+ <td class='head width30 txtright'><{$smarty.const._PM_TO}></td>
+ <td class='even txtleft'><{if $pmform.elements.to_userid.hidden != 1}><{$pmform.elements.to_userid.body}><{/if}><{$to_username}></td>
</tr>
<tr>
- <td class='head width30'><{$smarty.const._PM_SUBJECTC}></td>
- <td class='even'><{$pmform.elements.subject.body}></td>
+ <td class='head width30 txtright'><{$smarty.const._PM_SUBJECTC}></td>
+ <td class='even txtleft'><{$pmform.elements.subject.body}></td>
</tr>
<tr class='aligntop'>
- <td class='head width30'><{$smarty.const._PM_MESSAGEC}></td>
- <td class='even'><{$pmform.elements.message.body}></td>
+ <td class='head width30 txtright'><{$smarty.const._PM_MESSAGEC}></td>
+ <td class='even txtleft'><{$pmform.elements.message.body}></td>
</tr>
<tr class='aligntop'>
<td class='head width30'><{$smarty.const._PM_SAVEINOUTBOX}></td>
Modified: XoopsCore/trunk/htdocs/modules/pm/xoops_version.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/pm/xoops_version.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/modules/pm/xoops_version.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -59,10 +59,10 @@
$modversion['templates'][1]['description'] = '';
$modversion['templates'][2]['file'] = 'pm_readpmsg.html';
$modversion['templates'][2]['description'] = '';
-$modversion['templates'][3]['file'] = 'pm_lookup.html';
+$modversion['templates'][3]['file'] = 'pm_viewpmsg.html';
$modversion['templates'][3]['description'] = '';
-$modversion['templates'][4]['file'] = 'pm_viewpmsg.html';
-$modversion['templates'][4]['description'] = '';
+//$modversion['templates'][4]['file'] = 'pm_lookup.html';
+//$modversion['templates'][4]['description'] = '';
// Menu
$modversion['hasMain'] = 1;
Modified: XoopsCore/trunk/htdocs/modules/profile/language/english/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/language/english/main.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/modules/profile/language/english/main.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -4,8 +4,8 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-define('_PROFILE_MA_REGISTER_NOTGROUP', 'New user is not registered to corresponding groups.');
-define('_PROFILE_MA_FINISH_LOGIN','Your account has been created successuflly, please click to log on.');
+define("_PROFILE_MA_REGISTER_NOTGROUP", "New user is not registered to corresponding groups.");
+define("_PROFILE_MA_FINISH_LOGIN","Your account has been created successuflly, please click to log on.");
define("_PROFILE_MA_REGISTER_FINISH", "Thanks for registering");
define("_PROFILE_MA_REGISTER_STEPS", "Register steps:");
@@ -16,11 +16,11 @@
define("_PROFILE_MA_EXPIRED", "The process has been expired, please go back to try again.");
-define('_PROFILE_MA_RECENTACTIVITY','Recent Activities');
-define('_PROFILE_MA_THEME','Theme');
-define('_PROFILE_MA_ACTIVATE','Activate');
-define('_PROFILE_MA_DEACTIVATE','Dectivate');
-define('_PROFILE_MA_SENDPM','Send Message');
+define("_PROFILE_MA_RECENTACTIVITY","Recent Activities");
+define("_PROFILE_MA_THEME","Theme");
+define("_PROFILE_MA_ACTIVATE","Activate");
+define("_PROFILE_MA_DEACTIVATE","Dectivate");
+define("_PROFILE_MA_SENDPM","Send Message");
//changepass.php
define("_PROFILE_MA_CHANGEPASSWORD", "Change Password");
Modified: XoopsCore/trunk/htdocs/modules/system/admin/avatars/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/avatars/main.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/modules/system/admin/avatars/main.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -139,11 +139,15 @@
// Get avatar handler
$avt_handler =& xoops_getmodulehandler('avatar');
$avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' );
- $avatar = $avt_handler->get($avatar_id);
- // Create form
- $form = $avatar->getForm();
- // Assign form
- $xoopsTpl->assign('form', $form->render());
+ if ( $avatar_id > 0 ) {
+ $avatar = $avt_handler->get($avatar_id);
+ // Create form
+ $form = $avatar->getForm();
+ // Assign form
+ $xoopsTpl->assign('form', $form->render());
+ } else {
+ redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR);
+ }
// Call Footer
xoops_cp_footer();
break;
@@ -185,15 +189,10 @@
}
} else {
$file = system_CleanVars ( $_REQUEST, 'avatar_file', 'blank.gif', 'string' );
- if ( $file != 'blank.gif' ) {
- $avatar->setVars($_REQUEST);
- $avatar->setVar('avatar_file', $file);
- if (!$avt_handler->insert($avatar)) {
- $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name'));
- }
- } else {
- $err[] = sprintf( _FAILFETCHIMG, $i );
- $err = array_merge( $err, $uploader->getErrors(false) );
+ $avatar->setVars($_REQUEST);
+ $avatar->setVar('avatar_file', 'avatars/' . $file);
+ if (!$avt_handler->insert($avatar)) {
+ $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name'));
}
}
if (count($err) > 0) {
@@ -250,10 +249,14 @@
$avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' );
// Get avatar handler
$avt_handler =& xoops_gethandler('avatar');
- $avatar = $avt_handler->get($avatar_id);
- $msg = '<div class="spacer"><img src="' . XOOPS_UPLOAD_URL . '/' . $avatar->getVar('avatar_file','s') . '" alt="" /></div><div class="txtcenter bold">' . $avatar->getVar('avatar_name', 's') . '</div>' . _AM_SYSTEM_AVATAR_SUREDEL;
- // Display message
- xoops_confirm(array('op' => 'delfileok', 'avatar_id' => $avatar_id, 'fct' => 'avatars', 'user_id' => $user_id), 'admin.php', $msg );
+ if ( $avatar_id > 0 ) {
+ $avatar = $avt_handler->get($avatar_id);
+ $msg = '<div class="spacer"><img src="' . XOOPS_UPLOAD_URL . '/' . $avatar->getVar('avatar_file','s') . '" alt="" /></div><div class="txtcenter bold">' . $avatar->getVar('avatar_name', 's') . '</div>' . _AM_SYSTEM_AVATAR_SUREDEL;
+ // Display message
+ xoops_confirm(array('op' => 'delfileok', 'avatar_id' => $avatar_id, 'fct' => 'avatars', 'user_id' => $user_id), 'admin.php', $msg );
+ } else {
+ redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR);
+ }
// Call footer
xoops_cp_footer();
break;
@@ -264,12 +267,12 @@
}
$avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' );
if ($avatar_id <= 0) {
- redirect_header('admin.php?fct=avatars',1);
+ redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR);
}
$avt_handler = xoops_gethandler('avatar');
$avatar =& $avt_handler->get($avatar_id);
if (!is_object($avatar)) {
- redirect_header('admin.php?fct=avatars',1);
+ redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR);
}
if (!$avt_handler->delete($avatar)) {
// Call Header
Modified: XoopsCore/trunk/htdocs/modules/system/admin/banners/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/banners/main.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/modules/system/admin/banners/main.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -45,155 +45,164 @@
// Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_BANNERS_NAV_MANAGER, system_adminVersion('banners', 'adminpath') );
switch ( $op ) {
- /* Banners */
- // Save banner
- case 'banner_save':
+ // Banners
+ case 'banner_save': // Save banner
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if (isset($_REQUEST["bid"])) {
- $obj =& $banner_Handler->get($_REQUEST["bid"]);
+ $bid = system_CleanVars($_REQUEST, 'bid', 0, 'int' );
+ if ( $bid > 0 ) {
+ $obj =& $banner_Handler->get( $bid );
} else {
$obj =& $banner_Handler->create();
$obj->setVar("date", time());
}
-
- $obj->setVar("cid", $_REQUEST["cid"]);
- $obj->setVar("imptotal", $_REQUEST["imptotal"]);
- $obj->setVar("imageurl", $_REQUEST["imageurl"]);
- $obj->setVar("clickurl", $_REQUEST["clickurl"]);
- $verif_htmlbanner = ($_REQUEST["htmlbanner"] == 1) ? "1" : "0";
+ $obj->setVars( $_REQUEST );
+ $verif_htmlbanner = system_CleanVars($_REQUEST, 'htmlbanner', 0, 'int');
$obj->setVar("htmlbanner", $verif_htmlbanner);
- $obj->setVar("htmlcode", $_REQUEST["htmlcode"]);
if ($banner_Handler->insert($obj)) {
redirect_header("admin.php?fct=banners", 2, _AM_SYSTEM_BANNERS_DBUPDATED);
}
-
- //include_once("../include/forms.php");
- echo $obj->getHtmlErrors();
+ xoops_error( $obj->getHtmlErrors() );
$form =& $obj->getForm(false);
$form->display();
break;
- // Edit banner
- case 'banner_edit':
+ case 'banner_edit': // Edit banner
$xoBreadCrumb->addLink( _AM_SYSTEM_BANNERS_NAV_EDITBNR );
$xoBreadCrumb->addHelp( system_adminVersion('banners', 'help') . '#banner_edit' );
$xoBreadCrumb->addTips( _AM_SYSTEM_BANNERS_NAV_TIPS );
$xoBreadCrumb->render();
- $obj = $banner_Handler->get($_REQUEST["bid"]);
- $form = $obj->getForm();
- $form->display();
+
+ $bid = system_CleanVars($_REQUEST, 'bid', 0, 'int' );
+ if ( $bid > 0 ) {
+ $obj = $banner_Handler->get( $bid );
+ $form = $obj->getForm();
+ $form->display();
+ } else {
+ redirect_header('admin.php?fct=banners', 1, _AM_SYSTEM_DBERROR);
+ }
break;
- // Delete banner
- case 'banner_delete':
+ case 'banner_delete': // Delete banner
$xoBreadCrumb->addLink( _AM_SYSTEM_BANNERS_NAV_DELETEBNR );
$xoBreadCrumb->addHelp( system_adminVersion('banners', 'help') . '#banner_delete' );
$xoBreadCrumb->render();
- $obj =& $banner_Handler->get($_REQUEST["bid"]);
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if ($banner_Handler->delete($obj)) {
- redirect_header("admin.php?fct=banners", 3, _AM_SYSTEM_BANNERS_DELEBNR);
- } else {
- echo $obj->getHtmlErrors();
- }
- } else {
- xoops_confirm(array("ok" => 1, "bid" => $_REQUEST["bid"], "op" => "banner_delete"), $_SERVER["REQUEST_URI"], sprintf(_AM_SYSTEM_BANNERS_SUREDELE));
- }
+
+ $bid = system_CleanVars($_REQUEST, 'bid', 0, 'int' );
+ if ( $bid > 0 ) {
+ $obj =& $banner_Handler->get( $bid );
+ if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($banner_Handler->delete($obj)) {
+ redirect_header("admin.php?fct=banners", 3, _AM_SYSTEM_BANNERS_DELEBNR);
+ } else {
+ xoops_error( $obj->getHtmlErrors() );
+ }
+ } else {
+ xoops_confirm( array("ok" => 1, "bid" => $bid, "op" => "banner_delete"), 'admin.php?fct=banners', sprintf(_AM_SYSTEM_BANNERS_SUREDELE));
+ }
+ } else {
+ redirect_header('admin.php?fct=banners', 1, _AM_SYSTEM_DBERROR);
+ }
break;
- // Delete finish banner
- case 'banner_finish_delete':
+ case 'banner_finish_delete': // Delete finish banner
$xoBreadCrumb->addLink( _AM_SYSTEM_BANNERS_NAV_DELETEFINISHBNR );
$xoBreadCrumb->addHelp( system_adminVersion('banners', 'help') . '#banner_finish_delete' );
$xoBreadCrumb->render();
- $obj =& $banner_finish_Handler->get($_REQUEST["bid"]);
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1)
- {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if ($banner_finish_Handler->delete($obj)) {
- redirect_header("admin.php?fct=banners", 3, _AM_SYSTEM_BANNERS_DBUPDATED);
- } else {
- echo $obj->getHtmlErrors();
- }
- } else {
- xoops_confirm(array("ok" => 1, "bid" => $_REQUEST["bid"], "op" => "banner_finish_delete"), $_SERVER["REQUEST_URI"], sprintf(_AM_SYSTEM_BANNERS_SUREDELE));
- }
+
+ $bid = system_CleanVars($_REQUEST, 'bid', 0, 'int' );
+ if ( $bid > 0 ) {
+ $obj =& $banner_finish_Handler->get( $bid );
+ if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1)
+ {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($banner_finish_Handler->delete( $obj )) {
+ redirect_header("admin.php?fct=banners", 3, _AM_SYSTEM_BANNERS_DBUPDATED);
+ } else {
+ xoops_error( $obj->getHtmlErrors() );
+ }
+ } else {
+ xoops_confirm( array("ok" => 1, "bid" => $bid, "op" => "banner_finish_delete"), 'admin.php?fct=banners', sprintf(_AM_SYSTEM_BANNERS_SUREDELE));
+ }
+ } else {
+ redirect_header('admin.php?fct=banners', 1, _AM_SYSTEM_DBERROR);
+ }
break;
- /* Clients */
- // Save client
- case 'banner_client_save':
+ // Clients
+ case 'banner_client_save': // Save client
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if (isset($_REQUEST["cid"])) {
- $obj =& $banner_client_Handler->get($_REQUEST["cid"]);
+ $cid = system_CleanVars($_REQUEST, 'cid', 0, 'int' );
+ if ( $cid > 0 ) {
+ $obj =& $banner_client_Handler->get( $cid );
} else {
$obj =& $banner_client_Handler->create();
}
+ $obj->setVars( $_REQUEST );
- $obj->setVar("name", trim($_REQUEST["name"]));
- $obj->setVar("contact", trim($_REQUEST["contact"]));
- $obj->setVar("email", trim($_REQUEST["email"]));
- $obj->setVar("login", trim($_REQUEST["login"]));
- $obj->setVar("passwd", trim($_REQUEST["passwd"]));
- $obj->setVar("extrainfo", trim($_REQUEST["extrainfo"]));
-
- if ($banner_client_Handler->insert($obj)) {
+ if ($banner_client_Handler->insert( $obj )) {
redirect_header("admin.php?fct=banners", 2, _AM_SYSTEM_BANNERS_DBUPDATED);
}
- //include_once("../include/forms.php");
- echo $obj->getHtmlErrors();
+ xoops_error( $obj->getHtmlErrors() );
$form =& $obj->getForm(false);
$form->display();
break;
- // Edit client
- case 'banner_client_edit':
+ case 'banner_client_edit': // Edit client
$xoBreadCrumb->addLink( _AM_SYSTEM_BANNERS_NAV_EDITADVCLI );
$xoBreadCrumb->addHelp( system_adminVersion('banners', 'help') . '#banner_client_edit' );
$xoBreadCrumb->addTips( _AM_SYSTEM_BANNERS_NAV_TIPS );
$xoBreadCrumb->render();
- $obj = $banner_client_Handler->get($_REQUEST["cid"]);
- $form = $obj->getForm();
- $xoopsTpl->assign('form', $form->render());
+
+ $cid = system_CleanVars($_REQUEST, 'cid', 0, 'int' );
+ if ( $cid > 0 ) {
+ $obj = $banner_client_Handler->get( $cid );
+ $form = $obj->getForm();
+ $xoopsTpl->assign('form', $form->render());
+ } else {
+ redirect_header('admin.php?fct=banners', 1, _AM_SYSTEM_DBERROR);
+ }
break;
- // Delete Client
- case 'banner_client_delete':
+ case 'banner_client_delete': // Delete Client
$xoBreadCrumb->addLink( _AM_SYSTEM_BANNERS_NAV_DELETECLI );
$xoBreadCrumb->addHelp( system_adminVersion('banners', 'help') . '#banner_client_delete' );
$xoBreadCrumb->render();
- $obj =& $banner_client_Handler->get($_REQUEST["cid"]);
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if ($banner_client_Handler->delete($obj)) {
- //Suppression des bannieres du client
- $obj_banner =& $banner_Handler->get($_REQUEST["cid"]);
- $banner_Handler->delete($obj_banner) or $obj_banner->getHtmlErrors();
- redirect_header("admin.php?fct=banners", 3, _AM_SYSTEM_BANNERS_DBUPDATED);
- } else {
- echo $obj->getHtmlErrors();
- }
- } else {
- xoops_confirm(array("ok" => 1, "cid" => $_REQUEST["cid"], "op" => "banner_client_delete"), $_SERVER["REQUEST_URI"], _AM_SYSTEM_BANNERS_SUREDELBNR);
- }
+ $cid = system_CleanVars($_REQUEST, 'cid', 0, 'int' );
+ if ( $cid > 0 ) {
+ $obj =& $banner_client_Handler->get( $cid );
+ if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($banner_client_Handler->delete($obj)) {
+ // Delete client banners
+ $banner_Handler->deleteAll(new Criteria('cid', $cid));
+
+ redirect_header("admin.php?fct=banners", 3, _AM_SYSTEM_BANNERS_DBUPDATED);
+ } else {
+ xoops_error( $obj->getHtmlErrors() );
+ }
+ } else {
+ xoops_confirm(array("ok" => 1, "cid" => $cid, "op" => "banner_client_delete"), 'admin.php?fct=banners', _AM_SYSTEM_BANNERS_SUREDELBNR);
+ }
+ } else {
+ redirect_header('admin.php?fct=banners', 1, _AM_SYSTEM_DBERROR);
+ }
break;
- // Form: New Banner
- case 'new_banner':
+ case 'new_banner': // Form: New Banner
$xoBreadCrumb->addLink( _AM_SYSTEM_BANNERS_NAV_ADDBNR );
$xoBreadCrumb->addHelp( system_adminVersion('banners', 'help') . '#new_banner' );
$xoBreadCrumb->addTips( _AM_SYSTEM_BANNERS_NAV_TIPS );
@@ -203,8 +212,7 @@
$xoopsTpl->assign('form', $form->render());
break;
- // Form: New Client
- case 'new_client':
+ case 'new_client': // Form: New Client
$xoBreadCrumb->addLink( _AM_SYSTEM_BANNERS_NAV_ADDNWCLI );
$xoBreadCrumb->addHelp( system_adminVersion('banners', 'help') . '#new_client' );
$xoBreadCrumb->addTips( _AM_SYSTEM_BANNERS_NAV_TIPS );
@@ -248,7 +256,8 @@
$htmlbanner =$banner_arr[$i]->getVar("htmlbanner");
$htmlcode = $banner_arr[$i]->getVar("htmlcode");
$name_client = $banner_client_Handler->get($banner_arr[$i]->getVar("cid"));
- $name = $name_client->getVar("name");
+ if ( is_object($name_client) )
+ $name = $name_client->getVar("name");
if ( $impmade == 0 ) {
$percent = 0;
Modified: XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -308,7 +308,7 @@
if (!$newid = $block_handler->insert($block)) {
xoops_cp_header();
- $block->getHtmlErrors();
+ xoops_error( $block->getHtmlErrors() );
xoops_cp_footer();
exit();
}
@@ -325,7 +325,7 @@
$blocklinkmodule->setVar( 'module_id', $mid );
if(!$blocklinkmodule_handler->insert($blocklinkmodule)){
xoops_cp_header();
- $blocklinkmodule->getHtmlErrors();
+ xoops_error( $blocklinkmodule->getHtmlErrors() );
xoops_cp_footer();
exit();
}
@@ -382,11 +382,10 @@
$block = $block_handler->get($block_id);
$blockform = $block->getForm();
$xoopsTpl->assign('blockform', $blockform->render() );
- //$blockform->assign( $xoopsTpl );
// Call Footer
xoops_cp_footer();
} else {
- redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
+ redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
}
break;
@@ -453,6 +452,8 @@
}
redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
}
+ } else {
+ redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
}
break;
@@ -479,118 +480,9 @@
// Call Footer
xoops_cp_footer();
} else {
- redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
+ redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
}
break;
- case 'old':
- // Call Header
- xoops_cp_header();
- // Display old block managment
- list_blocks();
- // Call Footer
- xoops_cp_footer();
- break;
}
-/*
-if ( $op == "order" ) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
- }
-
- $key = 0 ;
- $tmpoldbmodule = array();
- foreach ( $oldbmodule as $key => $eachBmodule ) {
- $tmpoldbmodule[$key] = @explode(',', $eachBmodule);
- }
- unset($oldbmodule);
- $oldbmodule = $tmpoldbmodule;
- unset($tmpoldbmodule);
-
- foreach (array_keys($bid) as $i) {
- $isChange = 0 ;
- $list = array('title', 'weight', 'visible', 'side', 'bcachetime', 'bmodule');
- foreach ($list as $each) {
- if ( is_array(${$each}[$i]) ) {
- if ( count(${$each}[$i]) != count(${'old'.$each}[$i]) ) {
- $isChange = 1;
- } elseif ( array_diff(${$each}[$i], ${'old'.$each}[$i]) ) {
- $isChange = 1;
- }
- } elseif ( trim(${'old'.$each}[$i]) != trim(${$each}[$i]) ) {
- $isChange = 1;
- }
- }
- if ( $isChange == 1 ) {
- order_block($bid[$i], $weight[$i], $visible[$i], $side[$i], $title[$i], $bmodule[$i], $bcachetime[$i]);
- }
- }
- redirect_header("admin.php?fct=blocksadmin", 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
- exit();
-}
-*/
-/*
-if ( $op == "save" ) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
- }
- $bgroups = isset($bgroups) ? $bgroups : array();
- save_block($bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bmodule, $bcachetime, $bgroups);
- exit();
-}
-*/
-/*
-if ( $op == "update" ) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
- }
- $bcachetime = isset($bcachetime) ? intval($bcachetime) : 0;
- $options = isset($options) ? $options : array();
- $bcontent = isset($bcontent) ? $bcontent : '';
- $bctype = isset($bctype) ? $bctype : '';
- $bgroups = isset($bgroups) ? $bgroups : array();
- update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $bmodule, $options, $bgroups);
-}
-*/
-/*
-if ( $op == "delete_ok" ) {
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header("admin.php?fct=blocksadmin", 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
- exit();
- }
- delete_block_ok($bid);
- exit();
-}
-*/
-/*
-if ( $op == "delete" ) {
- xoops_cp_header();
- delete_block($bid);
- xoops_cp_footer();
- exit();
-}
-*/
-/*
-if ( $op == "edit" ) {
- xoops_cp_header();
- edit_block($bid);
- xoops_cp_footer();
- exit();
-}
-*/
-/*
-if ($op == 'clone') {
- clone_block($bid);
-}
-
-if ($op == 'clone_ok') {
- $options = isset($options) ? $options : array();
- $bcontent = isset($bcontent) ? $bcontent : '';
- $bgroups = isset($bgroups) ? $bgroups : array();
- clone_block_ok($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bcachetime, $bmodule, $options, $bgroups);
-}
-*/
?>
Modified: XoopsCore/trunk/htdocs/modules/system/admin/comments/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/comments/main.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/modules/system/admin/comments/main.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -60,7 +60,7 @@
switch ($op) {
case 'comments_jump':
- $com_id = (isset($_GET['com_id'])) ? intval($_GET['com_id']) : 0;
+ $com_id = system_CleanVars ( $_GET, 'com_id', 0, 'int' );
if ($com_id > 0) {
$comment =& $comment_handler->get($com_id);
if (is_object($comment)) {
@@ -71,7 +71,7 @@
exit();
}
}
- redirect_header('admin.php?fct=comments', 1);
+ redirect_header('admin.php?fct=comments', 1, _AM_SYSTEM_COMMENTS_NO_COMMENTS);
break;
case 'comments_form_purge':
@@ -116,8 +116,8 @@
$verif = false;
if (isset($_REQUEST['comments_after']) && isset($_REQUEST['comments_before'])) {
if ($_REQUEST['comments_after'] != $_REQUEST['comments_before']) {
- $com_after = strtotime($_REQUEST['comments_after']);
- $com_before = strtotime($_REQUEST['comments_before']);
+ $com_after = system_CleanVars($_REQUEST, 'comments_after', time(), 'date');
+ $com_before = system_CleanVars($_REQUEST, 'comments_before', time(), 'date');
if ($com_after) {
$criteria->add(new Criteria('com_created', $com_after, ">"));
}
@@ -127,22 +127,26 @@
$verif = true;
}
}
- if (isset($_REQUEST['comments_modules']) && $_REQUEST['comments_modules'] > 0) {
- $criteria->add(new Criteria('com_modid', $_REQUEST['comments_modules']));
+ $com_modid = system_CleanVars($_REQUEST, 'comments_modules', 0, 'int');
+ if ( $com_modid > 0 ) {
+ $criteria->add(new Criteria('com_modid', $com_modid));
$verif = true;
}
- if (isset($_REQUEST['comments_status']) && $_REQUEST['comments_status'] > 0) {
+ $comments_status = system_CleanVars($_REQUEST, 'comments_status', 0, 'int');
+ if ( $comments_status > 0 ) {
$criteria->add(new Criteria('com_status', $_REQUEST['comments_status']));
$verif = true;
}
- if (isset($_REQUEST['comments_userid']) && $_REQUEST['comments_userid'] != '') {
+ $comments_userid = system_CleanVars($_REQUEST, 'comments_userid', '', 'string');
+ if ( $comments_userid != '' ) {
foreach ($_REQUEST['comments_userid'] as $del)
{
$criteria->add(new Criteria('com_uid', $del), 'OR');
}
$verif = true;
}
- if (isset($_REQUEST['comments_groupe']) && $_REQUEST['comments_groupe'] != '') {
+ $comments_groupe = system_CleanVars($_REQUEST, 'comments_groupe', '', 'string');
+ if ( $comments_groupe != '' ) {
foreach ($_REQUEST['comments_groupe'] as $del => $u_name)
{
$member_handler =& xoops_gethandler('member');
@@ -191,13 +195,14 @@
$comments_status = '';
$criteria = new CriteriaCompo();
- if (@$_REQUEST['comments_module'] > 0) {
- $criteria->add(new Criteria('com_modid', $_REQUEST['comments_module']));
+ $comments_module = system_CleanVars($_REQUEST, 'comments_module', 0, 'int');
+ if ( $comments_module > 0 ) {
+ $criteria->add(new Criteria('com_modid', $comments_module));
$comments_module = $_REQUEST['comments_module'];
}
-
- if (@$_REQUEST['comments_status'] > 0) {
- $criteria->add(new Criteria('com_status', $_REQUEST['comments_status']));
+ $comments_status = system_CleanVars($_REQUEST, 'comments_status', 0, 'int');
+ if ( $comments_status > 0 ) {
+ $criteria->add(new Criteria('com_status', $comments_status));
$comments_status = $_REQUEST['comments_status'];
}
@@ -206,8 +211,8 @@
$xoopsTpl->assign( 'comments_count', $comments_count );
if ($comments_count > 0) {
- $comments_start = isset($_REQUEST['comments_start']) ? intval($_REQUEST['comments_start']) : 0;
- $comments_limit = isset($_REQUEST['comments_limit']) ? intval($_REQUEST['comments_limit']) : 0;
+ $comments_start = system_CleanVars($_REQUEST, 'comments_start', 0, 'int');
+ $comments_limit = system_CleanVars($_REQUEST, 'comments_limit', 0, 'int');
if (!in_array($comments_limit, $limit_array)) {
$comments_limit = xoops_getModuleOption('comments_pager', 'system');
}
Modified: XoopsCore/trunk/htdocs/modules/system/admin/groups/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/groups/main.php 2011-12-25 22:52:19 UTC (rev 8545)
+++ XoopsCore/trunk/htdocs/modules/system/admin/groups/main.php 2011-12-25 23:00:59 UTC (rev 8546)
@@ -120,10 +120,15 @@
$xoBreadCrumb->addTips(_AM_SYSTEM_GROUPS_NAV_TIPS_2);
$xoBreadCrumb->render();
// Create form
- $obj = $groups_Handler->get(system_CleanVars($_REQUEST, 'groups_id', 0, 'int'));
- $form = $obj->getForm();
- // Assign form
- $xoopsTpl->assign('form', $form->render());
+ $groups_id = system_CleanVars($_REQUEST, 'groups_id', 0, 'int');
+ if ( $groups_id > 0 ) {
+ $obj = $groups_Handler->get($groups_id);
+ $form = $obj->getForm();
+ // Assign form
+ $xoopsTpl->assign('form', $form->render());
+ } else {
+ redirect_header('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
+ }
break;
//Save a new group
@@ -131,10 +136,11 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('admin.php?fct=groups', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $system_catids = empty($_REQUEST["system_catids"]) ? array() : $_REQUEST["system_catids"];
- $admin_mids = empty($_REQUEST["admin_mids"]) ? array() : $_REQUEST["admin_mids"];
- $read_mids = empty($_REQUEST["read_mids"]) ? array() : $_REQUEST["read_mids"];
- $read_bids = empty($_REQUEST["read_bids"]) ? array() : $_REQUEST["read_bids"];
+ $system_catids = system_CleanVars($_REQUEST, 'system_catids', array(), 'array');
+ $admin_mids = system_CleanVars($_REQUEST, 'admin_mids', array(), 'array');
+ $read_mids = system_CleanVars($_REQUEST, 'read_mids', array(), 'array');
+ $read_bids = system_CleanVars($_REQUEST, 'read_bids', array(), 'array');
+
$member_handler = &xoops_gethandler('member');
$group = &$member_handler->createGroup();
$group->setVar('name', $_REQUEST["name"]);
@@ -194,105 +200,116 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('admin.php?fct=groups', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $system_catids = empty($_REQUEST["system_catids"]) ? array() : $_REQUEST["system_catids"];
- $admin_mids = empty($_REQUEST["admin_mids"]) ? array() : $_REQUEST["admin_mids"];
- $read_mids = empty($_REQUEST["read_mids"]) ? array() : $_REQUEST["read_mids"];
- $read_bids = empty($_REQUEST["read_bids"]) ? array() : $_REQUEST["read_bids"];
+ $system_catids = system_CleanVars($_REQUEST, 'system_catids', array(), 'array');
+ $admin_mids = system_CleanVars($_REQUEST, 'admin_mids', array(), 'array');
+ $read_mids = system_CleanVars($_REQUEST, 'read_mids', array(), 'array');
+ $read_bids = system_CleanVars($_REQUEST, 'read_bids', array(), 'array');
+
$member_handler = &xoops_gethandler('member');
- $group = $member_handler->getGroup($_REQUEST["g_id"]);
- $group->setVar('name', $_REQUEST["name"]);
- $group->setVar('description', $_REQUEST["desc"]);
- // if this group is not one of the default groups
- if (!in_array($group->getVar('groupid'), array(XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS))) {
- if (count($system_catids) > 0) {
- $group->setVar('group_type', 'Admin');
+ $gid = system_CleanVars($_REQUEST, 'g_id', 0, 'int');
+ if ( $gid > 0 ) {
+ $group = $member_handler->getGroup( $gid );
+ $group->setVar('name', $_REQUEST["name"]);
+ $group->setVar('description', $_REQUEST["desc"]);
+ // if this group is not one of the default groups
+ if (!in_array($group->getVar('groupid'), array(XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS))) {
+ if (count($system_catids) > 0) {
+ $group->setVar('group_type', 'Admin');
+ } else {
+ $group->setVar('group_type', '');
+ }
+ }
+ if (!$member_handler->insertGroup($group)) {
+ xoops_cp_header();
+ echo $group->getHtmlErrors();
+ xoops_cp_footer();
} else {
- $group->setVar('group_type', '');
+ $groupid = $group->getVar('groupid');
+ $gperm_handler = &xoops_gethandler('groupperm');
+ $criteria = new CriteriaCompo(new Criteria('gperm_groupid', $groupid));
+ $criteria->add(new Criteria('gperm_modid', 1));
+ $criteria2 = new CriteriaCompo(new Criteria('gperm_name', 'system_admin'));
+ $criteria2->add(new Criteria('gperm_name', 'module_admin'), 'OR');
+ $criteria2->add(new Criteria('gperm_name', 'module_read'), 'OR');
+ $criteria2->add(new Criteria('gperm_name', 'block_read'), 'OR');
+ $criteria->add($criteria2);
+ $gperm_handler->deleteAll($criteria);
+ if (count($system_catids) > 0) {
+ array_push($admin_mids, 1);
+ foreach ($system_catids as $s_cid) {
+ $sysperm = &$gperm_handler->create();
+ $sysperm->setVar('gperm_groupid', $groupid);
+ $sysperm->setVar('gperm_itemid', $s_cid);
+ $sysperm->setVar('gperm_name', 'system_admin');
+ $sysperm->setVar('gperm_modid', 1);
+ $gperm_handler->insert($sysperm);
+ }
+ }
+ foreach ($admin_mids as $a_mid) {
+ $modperm = &$gperm_handler->create();
+ $modperm->setVar('gperm_groupid', $groupid);
+ $modperm->setVar('gperm_itemid', $a_mid);
+ $modperm->setVar('gperm_name', 'module_admin');
+ $modperm->setVar('gperm_modid', 1);
+ $gperm_handler->insert($modperm);
+ }
+ array_push($read_mids, 1);
+ foreach ($read_mids as $r_mid) {
+ $modperm = &$gperm_handler->create();
+ $modperm->setVar('gperm_groupid', $groupid);
+ $modperm->setVar('gperm_itemid', $r_mid);
+ $modperm->setVar('gperm_name', 'module_read');
+ $modperm->setVar('gperm_modid', 1);
+ $gperm_handler->insert($modperm);
+ }
+ foreach ($read_bids as $r_bid) {
+ $blockperm = &$gperm_handler->create();
+ $blockperm->setVar('gperm_groupid', $groupid);
+ $blockperm->setVar('gperm_itemid', $r_bid);
+ $blockperm->setVar('gperm_name', 'block_read');
+ $blockperm->setVar('gperm_modid', 1);
+ $gperm_handler->insert($blockperm);
+ }
+ redirect_header("admin.php?fct=groups", 1, _AM_SYSTEM_GROUPS_DBUPDATED);
}
- }
- if (!$member_handler->insertGroup($group)) {
- xoops_cp_header();
- echo $group->getHtmlErrors();
- xoops_cp_footer();
} else {
- $groupid = $group->getVar('groupid');
- $gperm_handler = &xoops_gethandler('groupperm');
- $criteria = new CriteriaCompo(new Criteria('gperm_groupid', $groupid));
- $criteria->add(new Criteria('gperm_modid', 1));
- $criteria2 = new CriteriaCompo(new Criteria('gperm_name', 'system_admin'));
- $criteria2->add(new Criteria('gperm_name', 'module_admin'), 'OR');
- $criteria2->add(new Criteria('gperm_name', 'module_read'), 'OR');
- $criteria2->add(new Criteria('gperm_name', 'block_read'), 'OR');
- $criteria->add($criteria2);
- $gperm_handler->deleteAll($criteria);
- if (count($system_catids) > 0) {
- array_push($admin_mids, 1);
- foreach ($system_catids as $s_cid) {
- $sysperm = &$gperm_handler->create();
- $sysperm->setVar('gperm_groupid', $groupid);
- $sysperm->setVar('gperm_itemid', $s_cid);
- $sysperm->setVar('gperm_name', 'system_admin');
- $sysperm->setVar('gperm_modid', 1);
- $gperm_handler->insert($sysperm);
- }
- }
- foreach ($admin_mids as $a_mid) {
- $modperm = &$gperm_handler->create();
- $modperm->setVar('gperm_groupid', $groupid);
- $modperm->setVar('gperm_itemid', $a_mid);
- $modperm->setVar('gperm_name', 'module_admin');
- $modperm->setVar('gperm_modid', 1);
- $gperm_handler->insert($modperm);
- }
- array_push($read_mids, 1);
- foreach ($read_mids as $r_mid) {
- $modperm = &$gperm_handler->create();
- $modperm->setVar('gperm_groupid', $groupid);
- $modperm->setVar('gperm_itemid', $r_mid);
- $modperm->setVar('gperm_name', 'module_read');
- $modperm->setVar('gperm_modid', 1);
- $gperm_handler->insert($modperm);
- }
- foreach ($read_bids as $r_bid) {
- $blockperm = &$gperm_handler->create();
- $blockperm->setVar('gperm_groupid', $groupid);
- $blockperm->setVar('gperm_itemid', $r_bid);
- $blockperm->setVar('gperm_name', 'block_read');
- $blockperm->setVar('gperm_modid', 1);
- $gperm_handler->insert($blockperm);
- }
- redirect_header("admin.php?fct=groups", 1, _AM_SYSTEM_GROUPS_DBUPDATED);
+ redirect_header('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);
}
break;
//Del a group
case 'groups_delete':
- $obj =& $groups_Handler->get($_REQUEST["groups_id"]);
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("admin.php?fct=groups", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if (intval($_REQUEST["groups_id"]) > 0 && !in_array($_REQUEST["groups_id"], array(XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS))) {
- $member_handler = &xoops_gethandler('member');
- $group = $member_handler->getGroup($_REQUEST["groups_id"]);
- $member_handler->deleteGroup($group);
- $gperm_handler = &xoops_gethandler('groupperm');
- $gperm_handler->deleteByGroup($_REQUEST["groups_id"]);
- redirect_header('admin.php?fct=groups', 1, _AM_SYSTEM_GROUPS_DBUPDATED);
- }else{
- redirect_header('admin.php?fct=groups', 2, _AM_SYSTEM_GROUPS_ERROR_DELETE);
+ $groups_id = system_CleanVars($_REQUEST, 'groups_id', 0, 'int');
+ if ( $groups_id > 0 ) {
+ $obj =& $groups_Handler->get( $groups_id );
+ if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if ( !$GL...
[truncated message content] |
