Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8547] XoopsCore/trunk
|
From: <be...@us...> - 2011-12-25 23:10:32
|
Revision: 8547
http://xoops.svn.sourceforge.net/xoops/?rev=8547&view=rev
Author: beckmi
Date: 2011-12-25 23:10:24 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Updating Trunk to XOOPS 2.5.0 Final
Modified Paths:
--------------
XoopsCore/trunk/docs/changelog.250.txt
XoopsCore/trunk/htdocs/edituser.php
XoopsCore/trunk/htdocs/footer.php
XoopsCore/trunk/htdocs/include/comment_form.php
XoopsCore/trunk/htdocs/include/version.php
XoopsCore/trunk/htdocs/install/include/makedata.php
XoopsCore/trunk/htdocs/language/english/global.php
XoopsCore/trunk/htdocs/modules/profile/edituser.php
XoopsCore/trunk/htdocs/modules/profile/register.php
XoopsCore/trunk/htdocs/modules/profile/templates/profile_avatar.html
XoopsCore/trunk/htdocs/modules/profile/xoops_version.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/modulesadmin/main.php
XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php
XoopsCore/trunk/htdocs/modules/system/admin/userrank/main.php
XoopsCore/trunk/htdocs/modules/system/class/gui.php
XoopsCore/trunk/htdocs/modules/system/class/menu.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_comments.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_modules.html
XoopsCore/trunk/htdocs/modules/system/templates/admin/system_userrank.html
XoopsCore/trunk/htdocs/modules/system/themes/legacy/theme.html
XoopsCore/trunk/htdocs/themes/suico/theme.html
XoopsCore/trunk/htdocs/themes/suico/xotpl/xo_scripts.html
XoopsCore/trunk/htdocs/xoops.css
Added Paths:
-----------
XoopsCore/trunk/htdocs/install/img/xoops_2.5.0.png
XoopsCore/trunk/htdocs/modules/protector/
XoopsCore/trunk/htdocs/uploads/files/
XoopsCore/trunk/htdocs/xoops_lib/modules/
Removed Paths:
-------------
XoopsCore/trunk/htdocs/install/img/xoops_2.5.0-RC.png
XoopsCore/trunk/htdocs/modules/protector/
XoopsCore/trunk/htdocs/xoops_lib/modules/
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-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
+ /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-5726
/XoopsCore/releases/2.5.0:5727-8546
/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 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/docs/changelog.250.txt 2011-12-25 23:10:24 UTC (rev 8547)
@@ -3,6 +3,7 @@
===============================
Bug Fixes:
+ - Fix security bug in Profile (gaba/phppp)
- 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)
Modified: XoopsCore/trunk/htdocs/edituser.php
===================================================================
--- XoopsCore/trunk/htdocs/edituser.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/edituser.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -244,7 +244,7 @@
echo '<a href="userinfo.php?uid=' . $xoopsUser->getVar('uid') . '">' . _US_PROFILE . '</a> <span class="bold">»»</span> ' . _US_UPLOADMYAVATAR . '<br /><br />';
$oldavatar = $xoopsUser->getVar('user_avatar');
if (!empty($oldavatar) && $oldavatar != 'blank.gif') {
- echo '<div class="txtcenter"><h4 class="red bold">' . _US_OLDDELETED . '</h4>';
+ echo '<div class="pad10 txtcenter floatcenter0"><h4 class="red bold">' . _US_OLDDELETED . '</h4>';
echo '<img src="' . XOOPS_UPLOAD_URL . '/' . $oldavatar . '" alt="" /></div>';
}
if ($xoopsConfigUser['avatar_allow_upload'] == 1 && $xoopsUser->getVar('posts') >= $xoopsConfigUser['avatar_minposts']) {
@@ -360,12 +360,12 @@
$criteria_avatar->add(new Criteria('avatar_type', "S"));
$avatars = $avt_handler->getObjects($criteria_avatar);
if (!is_array($avatars) || ! count($avatars)) {
- $user_avatar = 'blank.gif';
+ $user_avatar = 'avatars/blank.gif';
}
unset($avatars, $criteria_avatar);
}
$user_avatarpath = str_replace("\\", "/", realpath(XOOPS_UPLOAD_PATH . '/' . $user_avatar));
- if (false === strpos($user_avatarpath, XOOPS_UPLOAD_PATH) && is_file($user_avatarpath)) {
+ if (false === strpos($user_avatarpath, realpath(XOOPS_UPLOAD_PATH)) && is_file($user_avatarpath)) {
$oldavatar = $xoopsUser->getVar('user_avatar');
$xoopsUser->setVar('user_avatar', $user_avatar);
$member_handler =& xoops_gethandler('member');
@@ -375,17 +375,17 @@
include $GLOBALS['xoops']->path('footer.php');
exit();
}
- if ($oldavatar && preg_match("/^cavt/", strtolower($oldavatar))) {
+ if ($oldavatar && preg_match("/^cavt/", strtolower(substr($oldavatar,8)))) {
$avatars = $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
$avt_handler->delete($avatars[0]);
$oldavatar_path = str_replace("\\", "/", realpath(XOOPS_UPLOAD_PATH . '/' . $oldavatar));
- if (false === strpos($oldavatar_path, XOOPS_UPLOAD_PATH) && is_file($oldavatar_path)) {
+ if (false === strpos($oldavatar_path, realpath(XOOPS_UPLOAD_PATH)) && is_file($oldavatar_path)) {
unlink($oldavatar_path);
}
}
}
- if ($user_avatar != 'blank.gif') {
+ if ($user_avatar != 'avatars/blank.gif') {
$avatars = $avt_handler->getObjects(new Criteria('avatar_file', $user_avatar));
if (is_object($avatars[0])) {
$avt_handler->addUser($avatars[0]->getVar('avatar_id'), $xoopsUser->getVar('uid'));
Modified: XoopsCore/trunk/htdocs/footer.php
===================================================================
--- XoopsCore/trunk/htdocs/footer.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/footer.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -29,7 +29,7 @@
if ($xoopsOption['theme_use_smarty'] == 0) {
// the old way
- $footer = htmlspecialchars($xoopsConfigMetaFooter['footer']) . '<br /><div class="txtcenter small">Powered by XOOPS © <a href="http://xoops.sourceforge.net/" rel="external">The XOOPS Project</a></div>';
+ $footer = htmlspecialchars($xoopsConfigMetaFooter['footer']) . '<br /><div class="txtcenter small">Powered by XOOPS © <a href="http://xoops.sourceforge.net" rel="external" title="The XOOPS Project">The XOOPS Project</a></div>';
if (isset($xoopsOption['template_main'])) {
$xoopsTpl->xoops_setCaching(0);
$xoopsTpl->display('db:' . $xoopsOption['template_main']);
Modified: XoopsCore/trunk/htdocs/include/comment_form.php
===================================================================
--- XoopsCore/trunk/htdocs/include/comment_form.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/include/comment_form.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -71,13 +71,14 @@
$button_tray = new XoopsFormElementTray('', ' ');
if (is_object($xoopsUser)) {
- if ($xoopsModuleConfig['com_anonpost'] == 1) {
- $noname = !empty($noname) ? 1 : 0;
- $noname_checkbox = new XoopsFormCheckBox('', 'noname', $noname);
- $noname_checkbox->addOption(1, _POSTANON);
- $option_tray->addElement($noname_checkbox);
+ if (isset($xoopsModuleConfig['com_anonpost'])) {
+ if ($xoopsModuleConfig['com_anonpost'] == 1) {
+ $noname = !empty($noname) ? 1 : 0;
+ $noname_checkbox = new XoopsFormCheckBox('', 'noname', $noname);
+ $noname_checkbox->addOption(1, _POSTANON);
+ $option_tray->addElement($noname_checkbox);
+ }
}
-
if (false != $xoopsUser->isAdmin($com_modid)) {
// show status change box when editing (comment id is not empty)
if (!empty($com_id)) {
Modified: XoopsCore/trunk/htdocs/include/version.php
===================================================================
--- XoopsCore/trunk/htdocs/include/version.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/include/version.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -30,6 +30,6 @@
/**
* Define XOOPS engine version
*/
-define('XOOPS_VERSION', 'XOOPS 2.5.0-RC');
+define('XOOPS_VERSION', 'XOOPS 2.5.0');
?>
\ No newline at end of file
Deleted: XoopsCore/trunk/htdocs/install/img/xoops_2.5.0-RC.png
===================================================================
(Binary files differ)
Copied: XoopsCore/trunk/htdocs/install/img/xoops_2.5.0.png (from rev 8546, XoopsCore/releases/2.5.0/htdocs/install/img/xoops_2.5.0.png)
===================================================================
(Binary files differ)
Modified: XoopsCore/trunk/htdocs/install/include/makedata.php
===================================================================
--- XoopsCore/trunk/htdocs/install/include/makedata.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/install/include/makedata.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -188,7 +188,7 @@
$dbm->insert('config', " VALUES (36, 0, 2, 'maxuname', '_MD_AM_MAXUNAME', '10', '_MD_AM_MAXUNAMEDSC', 'textbox', 'int', 3)");
$dbm->insert('config', " VALUES (37, 0, 1, 'bad_ips', '_MD_AM_BADIPS', '" . addslashes(serialize(array('127.0.0.1'))) . "', '_MD_AM_BADIPSDSC', 'textarea', 'array', 42)");
$dbm->insert('config', " VALUES (38, 0, 3, 'meta_keywords', '_MD_AM_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', '_MD_AM_METAKEYDSC', 'textarea', 'text', 0)");
- $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS @ 2001-" . date('Y', time()) . " <a href=\"http://xoops.sourceforge.net/\" rel=\"external\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
+ $dbm->insert('config', " VALUES (39, 0, 3, 'footer', '_MD_AM_FOOTER', 'Powered by XOOPS © 2001-" . date('Y', time()) . " <a href=\"http://xoops.sourceforge.net\" rel=\"external\" title=\"The XOOPS Project\">The XOOPS Project</a>', '_MD_AM_FOOTERDSC', 'textarea', 'text', 20)");
$dbm->insert('config', " VALUES (40, 0, 4, 'censor_enable', '_MD_AM_DOCENSOR', '0', '_MD_AM_DOCENSORDSC', 'yesno', 'int', 0)");
$dbm->insert('config', " VALUES (41, 0, 4, 'censor_words', '_MD_AM_CENSORWRD', '" . addslashes(serialize(array('fuck', 'shit'))) . "', '_MD_AM_CENSORWRDDSC', 'textarea', 'array', 1)");
$dbm->insert('config', " VALUES (42, 0, 4, 'censor_replace', '_MD_AM_CENSORRPLC', '#OOPS#', '_MD_AM_CENSORRPLCDSC', 'textbox', 'text', 2)");
Modified: XoopsCore/trunk/htdocs/language/english/global.php
===================================================================
--- XoopsCore/trunk/htdocs/language/english/global.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/language/english/global.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -98,6 +98,18 @@
/**
* Image manager
*/
+define("_MD_ADDIMGCAT","Add Category");
+define("_MD_IMGCATNAME","Category name");
+define("_MD_IMGCATRGRP","Select groups for image manager use");
+define("_MD_IMGCATWGRP","Select groups allowed to upload images");
+define("_MD_IMGCATWEIGHT","Display order in image manager");
+define("_MD_IMGCATDISPLAY","Display");
+define("_MD_IMGCATSTRTYPE","Images are uploaded to:");
+define("_MD_STRTYOPENG","This can not be changed afterwards!");
+define("_MD_ASFILE","Store as files (in uploads directory)");
+define("_MD_INDB","Store in the database (as binary \"blob\" data)");
+define ("_MD_IMGMAIN","Category");
+define ("_MD_EDITIMGCAT", "Images Settings");
define('_IMGMANAGER', 'Image Manager');
define('_NUMIMAGES', '%s images');
define('_ADDIMAGE', 'Add Image File');
Property changes on: XoopsCore/trunk/htdocs/modules
___________________________________________________________________
Modified: 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
+ /XoopsCore/branches/tasks/2.5.0-formuss-trabis/htdocs/modules:5405-5726
/XoopsCore/releases/2.5.0/htdocs/modules:5727-8546
/XoopsCore/releases/2.5.0-rc2/htdocs/modules:5597-8545
/XoopsModules/protector/releases/3.40/modules:4782-5620
Modified: XoopsCore/trunk/htdocs/modules/profile/edituser.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/edituser.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/profile/edituser.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -218,12 +218,12 @@
$criteria_avatar->add(new Criteria('avatar_type', "S") );
$avatars = $avt_handler->getObjects($criteria_avatar);
if (!is_array($avatars) || !count($avatars)) {
- $user_avatar = 'blank.gif';
+ $user_avatar = 'avatars/blank.gif';
}
unset($avatars, $criteria_avatar);
}
$user_avatarpath = str_replace("\\", "/", realpath(XOOPS_UPLOAD_PATH.'/'.$user_avatar));
- if (false === strpos($user_avatarpath, XOOPS_UPLOAD_PATH) && is_file($user_avatarpath)) {
+ if (false === strpos($user_avatarpath, realpath(XOOPS_UPLOAD_PATH)) && is_file($user_avatarpath)) {
$oldavatar = $GLOBALS['xoopsUser']->getVar('user_avatar');
$GLOBALS['xoopsUser']->setVar('user_avatar', $user_avatar);
$member_handler =& xoops_gethandler('member');
@@ -233,17 +233,17 @@
include $GLOBALS['xoops']->path('footer.php');
exit();
}
- if ($oldavatar && preg_match("/^cavt/", strtolower($oldavatar))) {
+ if ($oldavatar && preg_match("/^cavt/", strtolower(substr($oldavatar,8)))) {
$avatars = $avt_handler->getObjects(new Criteria('avatar_file', $oldavatar));
if (!empty($avatars) && count($avatars) == 1 && is_object($avatars[0])) {
$avt_handler->delete($avatars[0]);
$oldavatar_path = str_replace("\\", "/", realpath(XOOPS_UPLOAD_PATH . '/' . $oldavatar));
- if (false === strpos($oldavatar_path, XOOPS_UPLOAD_PATH) && is_file($oldavatar_path)) {
+ if (false === strpos($oldavatar_path, realpath(XOOPS_UPLOAD_PATH)) && is_file($oldavatar_path)) {
unlink($oldavatar_path);
}
}
}
- if ($user_avatar != 'blank.gif') {
+ if ($user_avatar != 'avatars/blank.gif') {
$avatars = $avt_handler->getObjects(new Criteria('avatar_file', $user_avatar));
if (is_object($avatars[0])) {
$avt_handler->addUser($avatars[0]->getVar('avatar_id'), $GLOBALS['xoopsUser']->getVar('uid'));
Modified: XoopsCore/trunk/htdocs/modules/profile/register.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/register.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/profile/register.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -10,7 +10,7 @@
* 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)
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package profile
* @since 2.3.0
* @author Taiwen Jiang <ph...@us...>
@@ -42,9 +42,11 @@
}
$op = !isset($_POST['op']) ? 'register' : $_POST['op'];
-$uid = isset($_POST['uid']) ? intval( $_POST['uid'] ) : 0;
$current_step = isset($_POST['step']) ? intval( $_POST['step'] ) : 0;
+// The newly introduced variable $_SESSION['profile_post'] is contaminated by $_POST, thus we use an old vaiable to hold uid parameter
+$uid = !empty($_SESSION['profile_register_uid']) ? intval($_SESSION['profile_register_uid']) : 0;
+
// First step is already secured by with the captcha Token so lets check the others
if ($current_step > 0 && !$GLOBALS['xoopsSecurity']->check()) {
redirect_header('user.php', 5, _PROFILE_MA_EXPIRED);
@@ -123,6 +125,7 @@
if ($current_step == 0) {
// Reset any previous session for first step
$_SESSION['profile_post'] = array();
+ $_SESSION['profile_register_uid'] = null;
} else {
// Merge current $_POST with $_SESSION['profile_post']
$_SESSION['profile_post'] = array_merge($_SESSION['profile_post'], $postfields);
@@ -266,6 +269,7 @@
if ($message) {
$GLOBALS['xoopsTpl']->append('confirm', $message);
}
+ $_SESSION['profile_register_uid'] = $newuser->getVar('uid');
}
}
}
Modified: XoopsCore/trunk/htdocs/modules/profile/templates/profile_avatar.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/templates/profile_avatar.html 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/profile/templates/profile_avatar.html 2011-12-25 23:10:24 UTC (rev 8547)
@@ -1,7 +1,7 @@
<{includeq file="db:profile_breadcrumbs.html"}>
<{if $old_avatar}>
- <div class="pad10">
+ <div class="pad10 center">
<h4 class="bold red"><{$smarty.const._US_OLDDELETED}></h4>
<img src="<{$old_avatar}>" alt="" />
</div>
Modified: XoopsCore/trunk/htdocs/modules/profile/xoops_version.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/profile/xoops_version.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/profile/xoops_version.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -25,7 +25,7 @@
*/
$modversion = array();
$modversion['name'] = _PROFILE_MI_NAME;
-$modversion['version'] = 1.59;
+$modversion['version'] = 1.60;
$modversion['description'] = _PROFILE_MI_DESC;
$modversion['author'] = "Jan Pedersen; Taiwen Jiang <ph...@us...>; alfred <my...@t-...>; Wishcraft <si...@xo...>";
$modversion['credits'] = "Ackbarr, mboyden, marco, mamba, etc.";
Modified: XoopsCore/trunk/htdocs/modules/system/admin/avatars/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/avatars/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/avatars/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -140,7 +140,7 @@
$avt_handler =& xoops_getmodulehandler('avatar');
$avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' );
if ( $avatar_id > 0 ) {
- $avatar = $avt_handler->get($avatar_id);
+ $avatar = $avt_handler->get( $avatar_id );
// Create form
$form = $avatar->getForm();
// Assign form
@@ -167,7 +167,7 @@
// Get avatar handler
$avt_handler =& xoops_gethandler('avatar');
// Get avatar id
- $avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' );
+ $avatar_id = system_CleanVars ( $_POST, 'avatar_id', 0, 'int' );
if ( $avatar_id > 0 ) {
$avatar =& $avt_handler->get( $avatar_id );
} else {
@@ -179,12 +179,12 @@
if (!$uploader->upload()) {
$err[] = $uploader->getErrors();
} else {
- $avatar->setVars($_REQUEST);
- $avatar->setVar('avatar_file', 'avatars/' . $uploader->getSavedFileName());
+ $avatar->setVars( $_POST );
+ $avatar->setVar('avatar_file', 'avatars/' . $uploader->getSavedFileName() );
$avatar->setVar('avatar_mimetype', $uploader->getMediaType());
$avatar->setVar('avatar_type', 's');
if (!$avt_handler->insert($avatar)) {
- $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name'));
+ $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name') );
}
}
} else {
@@ -201,13 +201,13 @@
// Call header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' );
// Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath') );
$xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_ERROR );
$xoBreadCrumb->render();
// Dsiplay errors
- xoops_error($err);
+ xoops_error( $err );
// Call Footer
xoops_cp_footer();
exit();
@@ -219,7 +219,7 @@
// Get avatar handler
$avt_handler =& xoops_gethandler('avatar');
// Get avatar id
- $avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' );
+ $avatar_id = system_CleanVars ( $_POST, 'avatar_id', 0, 'int' );
if ( $avatar_id > 0 ) {
// Get avatar
$avatar =& $avt_handler->get( $avatar_id );
@@ -265,20 +265,20 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('admin.php?fct=avatars',1, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' );
+ $avatar_id = system_CleanVars ( $_POST, 'avatar_id', 0, 'int' );
if ($avatar_id <= 0) {
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)) {
+ $avatar =& $avt_handler->get( $avatar_id );
+ if ( !is_object( $avatar ) ) {
redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR);
}
- if (!$avt_handler->delete($avatar)) {
+ if (!$avt_handler->delete( $avatar )) {
// Call Header
xoops_cp_header();
// Display errors
- xoops_error( sprintf( _AM_SYSTEM_AVATAR_FAILDEL, $avatar->getVar('avatar_id')));
+ xoops_error( sprintf( _AM_SYSTEM_AVATAR_FAILDEL, $avatar->getVar('avatar_id') ) );
// Call Footer
xoops_cp_footer();
exit();
Modified: XoopsCore/trunk/htdocs/modules/system/admin/banners/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/banners/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/banners/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -50,15 +50,15 @@
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $bid = system_CleanVars($_REQUEST, 'bid', 0, 'int' );
+ $bid = system_CleanVars($_POST, 'bid', 0, 'int' );
if ( $bid > 0 ) {
$obj =& $banner_Handler->get( $bid );
} else {
$obj =& $banner_Handler->create();
$obj->setVar("date", time());
}
- $obj->setVars( $_REQUEST );
- $verif_htmlbanner = system_CleanVars($_REQUEST, 'htmlbanner', 0, 'int');
+ $obj->setVars( $_POST );
+ $verif_htmlbanner = system_CleanVars($_POST, 'htmlbanner', 0, 'int');
$obj->setVar("htmlbanner", $verif_htmlbanner);
if ($banner_Handler->insert($obj)) {
@@ -93,7 +93,7 @@
$bid = system_CleanVars($_REQUEST, 'bid', 0, 'int' );
if ( $bid > 0 ) {
$obj =& $banner_Handler->get( $bid );
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
@@ -118,7 +118,7 @@
$bid = system_CleanVars($_REQUEST, 'bid', 0, 'int' );
if ( $bid > 0 ) {
$obj =& $banner_finish_Handler->get( $bid );
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1)
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1)
{
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
@@ -147,7 +147,7 @@
} else {
$obj =& $banner_client_Handler->create();
}
- $obj->setVars( $_REQUEST );
+ $obj->setVars( $_POST );
if ($banner_client_Handler->insert( $obj )) {
redirect_header("admin.php?fct=banners", 2, _AM_SYSTEM_BANNERS_DBUPDATED);
@@ -182,7 +182,7 @@
$cid = system_CleanVars($_REQUEST, 'cid', 0, 'int' );
if ( $cid > 0 ) {
$obj =& $banner_client_Handler->get( $cid );
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=banners", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
Modified: XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -201,12 +201,12 @@
// Initialize blocks handler
$block_handler =& xoops_getmodulehandler('block');
// Get variable
- $block_id = system_CleanVars ( $_REQUEST, 'bid', 0, 'int' );
- $visible = system_CleanVars ( $_REQUEST, 'visible', 0, 'int' );
+ $block_id = system_CleanVars ( $_POST, 'bid', 0, 'int' );
+ $visible = system_CleanVars ( $_POST, 'visible', 0, 'int' );
if ( $block_id > 0 ) {
- $block = $block_handler->get($block_id);
+ $block = $block_handler->get( $block_id );
$block->setVar('visible', $visible);
- if (!$block_handler->insert($block)) {
+ if (!$block_handler->insert( $block )) {
$error=true;
}
}
@@ -216,12 +216,12 @@
// Initialize blocks handler
$block_handler =& xoops_getmodulehandler('block');
// Get variable
- $block_id = system_CleanVars ( $_REQUEST, 'bid', 0, 'int' );
- $side = system_CleanVars ( $_REQUEST, 'side', 0, 'int' );
+ $block_id = system_CleanVars ( $_POST, 'bid', 0, 'int' );
+ $side = system_CleanVars ( $_POST, 'side', 0, 'int' );
if ( $block_id > 0 ) {
- $block = $block_handler->get($block_id);
+ $block = $block_handler->get( $block_id );
$block->setVar('side', $side);
- if (!$block_handler->insert($block)) {
+ if (!$block_handler->insert( $block )) {
$error=true;
}
}
@@ -230,16 +230,17 @@
case 'order':
// Initialize blocks handler
$block_handler =& xoops_getmodulehandler('block');
-
- $i=0;
- foreach ($_POST['blk'] as $order) {
- if( $order > 0 ) {
- $block = $block_handler->get($order);
- $block->setVar('weight', $i);
- if (!$block_handler->insert($block)) {
- $error=true;
+ if ( isset($_POST['blk'] ) ) {
+ $i=0;
+ foreach ($_POST['blk'] as $order) {
+ if( $order > 0 ) {
+ $block = $block_handler->get($order);
+ $block->setVar('weight', $i);
+ if (!$block_handler->insert($block)) {
+ $error=true;
+ }
+ $i++;
}
- $i++;
}
}
exit;
@@ -262,10 +263,10 @@
// Initialize blocks handler
$block_handler =& xoops_getmodulehandler('block');
// Get avatar id
- $block_id = system_CleanVars ( $_REQUEST, 'bid', 0, 'int' );
+ $block_id = system_CleanVars ( $_POST, 'bid', 0, 'int' );
if ( $block_id > 0 ) {
$block =& $block_handler->get( $block_id );
- $block->setVars($_REQUEST);
+ $block->setVars( $_POST );
$type = $block->getVar('block_type');
$name = $block->getVar('name');
// Save block options
@@ -285,7 +286,7 @@
}
} else {
$block =& $block_handler->create();
- $block->setVars($_REQUEST);
+ $block->setVars( $_POST );
switch ($block->getVar('c_type')) {
case 'H':
$name = _AM_SYSTEM_BLOCKS_CUSTOMHTML;
@@ -304,9 +305,9 @@
$block->setVar('name', $name);
$block->setVar('isactive', 1);
if ( isset($_REQUEST['content_block']) )
- $block->setVar('content', $_REQUEST['content_block']);
+ $block->setVar('content', $_POST['content_block']);
- if (!$newid = $block_handler->insert($block)) {
+ if (!$newid = $block_handler->insert( $block )) {
xoops_cp_header();
xoops_error( $block->getHtmlErrors() );
xoops_cp_footer();
@@ -318,7 +319,7 @@
$criteria = new CriteriaCompo(new Criteria('block_id', $newid ));
$blocklinkmodule_handler->deleteAll($criteria);
// Assign link
- $modules = $_REQUEST['modules'];
+ $modules = $_POST['modules'];
foreach ($modules as $mid) {
$blocklinkmodule = $blocklinkmodule_handler->create();
$blocklinkmodule->setVar( 'block_id', $newid );
@@ -421,12 +422,16 @@
break;
case 'delete_ok':
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('admin.php?fct=blocksadmin', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
// Initialize blocks handler
$block_handler =& xoops_getmodulehandler('block');
// Get avatar id
- $block_id = system_CleanVars ( $_REQUEST, 'bid', 0, 'int' );
+ $block_id = system_CleanVars ( $_POST, 'bid', 0, 'int' );
if ( $block_id > 0 ) {
- $block = $block_handler->get($block_id);
+ $block = $block_handler->get( $block_id );
if ($block_handler->delete($block)) {
// Delete Group link
$blocklinkmodule_handler =& xoops_getmodulehandler('blocklinkmodule');
Modified: XoopsCore/trunk/htdocs/modules/system/admin/comments/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/comments/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/comments/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -114,10 +114,10 @@
case 'comments_purge':
$criteria = new CriteriaCompo();
$verif = false;
- if (isset($_REQUEST['comments_after']) && isset($_REQUEST['comments_before'])) {
- if ($_REQUEST['comments_after'] != $_REQUEST['comments_before']) {
- $com_after = system_CleanVars($_REQUEST, 'comments_after', time(), 'date');
- $com_before = system_CleanVars($_REQUEST, 'comments_before', time(), 'date');
+ if (isset($_POST['comments_after']) && isset($_POST['comments_before'])) {
+ if ($_POST['comments_after'] != $_POST['comments_before']) {
+ $com_after = system_CleanVars($_POST, 'comments_after', time(), 'date');
+ $com_before = system_CleanVars($_POST, 'comments_before', time(), 'date');
if ($com_after) {
$criteria->add(new Criteria('com_created', $com_after, ">"));
}
@@ -127,17 +127,17 @@
$verif = true;
}
}
- $com_modid = system_CleanVars($_REQUEST, 'comments_modules', 0, 'int');
+ $com_modid = system_CleanVars($_POST, 'comments_modules', 0, 'int');
if ( $com_modid > 0 ) {
$criteria->add(new Criteria('com_modid', $com_modid));
$verif = true;
}
- $comments_status = system_CleanVars($_REQUEST, 'comments_status', 0, 'int');
+ $comments_status = system_CleanVars($_POST, 'comments_status', 0, 'int');
if ( $comments_status > 0 ) {
- $criteria->add(new Criteria('com_status', $_REQUEST['comments_status']));
+ $criteria->add(new Criteria('com_status', $_POST['comments_status']));
$verif = true;
}
- $comments_userid = system_CleanVars($_REQUEST, 'comments_userid', '', 'string');
+ $comments_userid = system_CleanVars($_POST, 'comments_userid', '', 'string');
if ( $comments_userid != '' ) {
foreach ($_REQUEST['comments_userid'] as $del)
{
@@ -145,9 +145,9 @@
}
$verif = true;
}
- $comments_groupe = system_CleanVars($_REQUEST, 'comments_groupe', '', 'string');
+ $comments_groupe = system_CleanVars($_POST, 'comments_groupe', '', 'string');
if ( $comments_groupe != '' ) {
- foreach ($_REQUEST['comments_groupe'] as $del => $u_name)
+ foreach ($_POST['comments_groupe'] as $del => $u_name)
{
$member_handler =& xoops_gethandler('member');
$members =& $member_handler->getUsersByGroup($u_name, true);
@@ -162,8 +162,8 @@
}
$verif = true;
}
- if(isset($_REQUEST['commentslist_id'])) {
- $commentslist_count = (!empty($_REQUEST['commentslist_id']) && is_array($_REQUEST['commentslist_id'])) ? count($_REQUEST['commentslist_id']) : 0;
+ if(isset($_POST['commentslist_id'])) {
+ $commentslist_count = (!empty($_POST['commentslist_id']) && is_array($_POST['commentslist_id'])) ? count($_POST['commentslist_id']) : 0;
if ($commentslist_count > 0) {
for ( $i=0; $i < $commentslist_count; $i++ )
{
@@ -206,6 +206,9 @@
$comments_status = $_REQUEST['comments_status'];
}
+ $criteria->setSort('com_created');
+ $criteria->setOrder('DESC');
+
$comments_count = $comments_Handler->getCount($criteria);
$xoopsTpl->assign( 'comments_count', $comments_count );
@@ -278,6 +281,7 @@
$comments['comments_icon'] = $comments_icon;
$comments['comments_title'] = '<a href="admin.php?fct=comments&op=comments_jump&com_id='.$comments_arr[$i]->getVar("com_id").'">'.$comments_arr[$i]->getVar("com_title");
$comments['comments_ip'] = $comments_arr[$i]->getVar('com_ip');
+ $comments['comments_date'] = formatTimeStamp($comments_arr[$i]->getVar('com_created'));
$comments['comments_text'] = $myts->undoHtmlSpecialChars($comments_arr[$i]->getVar('com_text'));
$comments['comments_status'] = @$status_array2[$comments_arr[$i]->getVar('com_status')];
$comments['comments_date_created'] = formatTimestamp($comments_arr[$i]->getVar('com_created'), 'm');
Modified: XoopsCore/trunk/htdocs/modules/system/admin/groups/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/groups/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/groups/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -136,21 +136,21 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('admin.php?fct=groups', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $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');
+ $system_catids = system_CleanVars($_POST, 'system_catids', array(), 'array');
+ $admin_mids = system_CleanVars($_POST, 'admin_mids', array(), 'array');
+ $read_mids = system_CleanVars($_POST, 'read_mids', array(), 'array');
+ $read_bids = system_CleanVars($_POST, 'read_bids', array(), 'array');
$member_handler = &xoops_gethandler('member');
$group = &$member_handler->createGroup();
- $group->setVar('name', $_REQUEST["name"]);
- $group->setVar('description', $_REQUEST["desc"]);
+ $group->setVar('name', $_POST["name"]);
+ $group->setVar('description', $_POST["desc"]);
if (count($system_catids) > 0) {
$group->setVar('group_type', 'Admin');
}
if (!$member_handler->insertGroup($group)) {
xoops_cp_header();
- echo $group->getHtmlErrors();
+ xoops_error( $group->getHtmlErrors() );
xoops_cp_footer();
} else {
$groupid = $group->getVar('groupid');
@@ -200,17 +200,17 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('admin.php?fct=groups', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $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');
+ $system_catids = system_CleanVars($_POST, 'system_catids', array(), 'array');
+ $admin_mids = system_CleanVars($_POST, 'admin_mids', array(), 'array');
+ $read_mids = system_CleanVars($_POST, 'read_mids', array(), 'array');
+ $read_bids = system_CleanVars($_POST, 'read_bids', array(), 'array');
$member_handler = &xoops_gethandler('member');
- $gid = system_CleanVars($_REQUEST, 'g_id', 0, 'int');
+ $gid = system_CleanVars($_POST, 'g_id', 0, 'int');
if ( $gid > 0 ) {
$group = $member_handler->getGroup( $gid );
- $group->setVar('name', $_REQUEST["name"]);
- $group->setVar('description', $_REQUEST["desc"]);
+ $group->setVar('name', $_POST["name"]);
+ $group->setVar('description', $_POST["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) {
@@ -282,7 +282,7 @@
$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 (isset($_POST["ok"]) && $_POST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=groups", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
Modified: XoopsCore/trunk/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/images/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/images/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -155,7 +155,7 @@
// Get Image Category handler
$imgcat_handler = xoops_gethandler('imagecategory');
// Get category id
- $imgcat_id = system_CleanVars ( $_REQUEST, 'imgcat_id', 0, 'int' );
+ $imgcat_id = system_CleanVars ( $_POST, 'imgcat_id', 0, 'int' );
if ( $imgcat_id > 0 ) {
$imgcat = $imgcat_handler->get($imgcat_id);
$old = $imgcat->getVar('imgcat_display');
@@ -251,7 +251,7 @@
// Get image handler
$image_handler = xoops_gethandler('image');
// Get image id
- $image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
+ $image_id = system_CleanVars ( $_POST, 'image_id', 0, 'int' );
if ( $image_id > 0 ) {
$img = $image_handler->get($image_id);
$old = $img->getVar('image_display');
@@ -344,7 +344,7 @@
redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
}
// Get image id
- $image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
+ $image_id = system_CleanVars ( $_POST, 'image_id', 0, 'int' );
if ($image_id <= 0) {
redirect_header('admin.php?fct=images',1);
}
@@ -364,6 +364,10 @@
break;
case 'save':
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('admin.php?fct=images', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()));
+ exit();
+ }
// Get image handler
$image_handler = xoops_gethandler('image');
// Call Header
@@ -371,10 +375,10 @@
// Define Stylesheet
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' );
// Get image id
- $image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
+ $image_id = system_CleanVars ( $_POST, 'image_id', 0, 'int' );
if ( $image_id > 0 ) {
$image = $image_handler->get($image_id);
- $image->setVars($_REQUEST);
+ $image->setVars($_POST);
if (!$image_handler->insert($image)) {
echo sprintf( _AM_SYSTEM_IMAGES_FAILSAVE, $avatar->getVar('avatar_name'));
xoops_cp_footer();
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -47,14 +47,14 @@
// Call Header
xoops_cp_header();
// Define Stylesheet
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
- $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
// Define scripts
- $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
- $xoTheme->addScript('browse.php?modules/system/js/admin.js');
- $xoTheme->addScript('browse.php?modules/system/js/module.js');
- // Define Breadcrumb and tips
+ $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ $xoTheme->addScript('browse.php?modules/system/js/admin.js');
+ $xoTheme->addScript('browse.php?modules/system/js/module.js');
+ // Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
$xoBreadCrumb->addHelp( system_adminVersion('modulesadmin', 'help') );
$xoBreadCrumb->addTips( _AM_SYSTEM_MODULES_TIPS );
@@ -78,9 +78,14 @@
$listed_mods[$i]['credits'] = $module->getInfo('credits');
$listed_mods[$i]['license'] = $module->getInfo('license');
$listed_mods[$i]['description'] = $module->getInfo('description');
+ if ( round( $module->getInfo( 'version' ), 2 ) != $listed_mods[$i]['version']){
+ $listed_mods[$i]['warning_update'] = true;
+ }else{
+ $listed_mods[$i]['warning_update'] = false;
+ }
$install_mods[] = $module->getInfo('dirname');
unset($module);
- $i++;
+ $i++;
}
// Get module to install
$dirlist = XoopsLists::getModulesList();
@@ -113,9 +118,9 @@
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css');
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
// Define scripts
- $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
- $xoTheme->addScript('browse.php?modules/system/js/admin.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ $xoTheme->addScript('browse.php?modules/system/js/admin.js');
// Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_ADMIN, system_adminVersion('modulesadmin', 'adminpath') );
$xoBreadCrumb->addLink( _AM_SYSTEM_MODULES_TOINSTALL );
@@ -164,15 +169,17 @@
case 'order':
// Get Module Handler
$module_handler =& xoops_gethandler('module');
- $i=1;
- foreach ($_POST['mod'] as $order) {
- if( $order > 0 ) {
- $module = $module_handler->get($order);
- $module->setVar('weight', $i);
- if (!$module_handler->insert($module)) {
- $error=true;
+ if ( isset($_POST['mod']) ) {
+ $i=1;
+ foreach ($_POST['mod'] as $order) {
+ if( $order > 0 ) {
+ $module = $module_handler->get($order);
+ $module->setVar('weight', $i);
+ if (!$module_handler->insert($module)) {
+ $error=true;
+ }
+ $i++;
}
- $i++;
}
}
exit;
@@ -223,9 +230,9 @@
case 'display':
// Get module handler
$module_handler =& xoops_gethandler('module');
- $module_id = system_CleanVars ( $_REQUEST, 'mid', 0, 'int' );
+ $module_id = system_CleanVars ( $_POST, 'mid', 0, 'int' );
if ( $module_id > 0 ) {
- $module =& $module_handler->get($module_id);
+ $module =& $module_handler->get( $module_id );
$old = $module->getVar('isactive');
// Set value
$module->setVar('isactive', !$old );
@@ -238,10 +245,10 @@
case 'display_in_menu':
// Get module handler
$module_handler =& xoops_gethandler('module');
- $module_id = system_CleanVars ( $_REQUEST, 'mid', 0, 'int' );
+ $module_id = system_CleanVars ( $_POST, 'mid', 0, 'int' );
if ( $module_id > 0 ) {
$module =& $module_handler->get($module_id);
- $old = $module->getVar('weight');
+ $old = $module->getVar('weight');
// Set value
$module->setVar('weight', !$old );
if (!$module_handler->insert($module)) {
Modified: XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/smilies/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -128,15 +128,15 @@
$xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM1,implode(', ', $mimetypes)) . sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM2, $upload_size/1000));
$xoBreadCrumb->render();
- if (isset($_REQUEST["smilies_id"])) {
- $obj =& $smilies_Handler->get(system_CleanVars($_REQUEST, 'smilies_id', 0, 'int'));
+ if (isset($_POST["smilies_id"])) {
+ $obj =& $smilies_Handler->get(system_CleanVars($_POST, 'smilies_id', 0, 'int'));
} else {
$obj =& $smilies_Handler->create();
}
// erreur
- $obj->setVar("code", $_REQUEST["code"]);
- $obj->setVar("emotion", $_REQUEST["emotion"]);
- $display = ($_REQUEST["display"] == 1) ? "1" : "0";
+ $obj->setVar("code", $_POST["code"]);
+ $obj->setVar("emotion", $_POST["emotion"]);
+ $display = ($_POST["display"] == 1) ? "1" : "0";
$obj->setVar("display", $display);
include_once XOOPS_ROOT_PATH . '/class/uploader.php';
@@ -152,7 +152,7 @@
$obj->setVar("smile_url", 'smilies/' . $uploader_smilies_img->getSavedFileName());
}
} else {
- $obj->setVar("smile_url", 'smilies/' . $_REQUEST["smile_url"]);
+ $obj->setVar("smile_url", 'smilies/' . $_POST["smile_url"]);
}
if ($smilies_Handler->insert($obj)) {
redirect_header("admin.php?fct=smilies", 2, _AM_SYSTEM_SMILIES_SAVE);
@@ -167,8 +167,9 @@
//Del a smilie
case "smilies_delete":
- $obj =& $smilies_Handler->get($_REQUEST["smilies_id"]);
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ $smilies_id = system_CleanVars($_REQUEST, 'smilies_id', 0, 'int');
+ $obj =& $smilies_Handler->get( $smilies_id );
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=smilies", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
@@ -180,7 +181,7 @@
}
redirect_header("admin.php?fct=smilies", 2, _AM_SYSTEM_SMILIES_SAVE);
} else {
- echo $obj->getHtmlErrors();
+ xoops_error( $obj->getHtmlErrors() );
}
} else {
// Define Stylesheet
@@ -196,7 +197,7 @@
case "smilies_update_display":
// Get smilies id
- $smilies_id = system_CleanVars ( $_REQUEST, 'smilies_id', 0, 'int' );
+ $smilies_id = system_CleanVars ( $_POST, 'smilies_id', 0, 'int' );
if ( $smilies_id > 0 ) {
$obj =& $smilies_Handler->get($smilies_id);
$old = $obj->getVar('display');
Modified: XoopsCore/trunk/htdocs/modules/system/admin/userrank/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/userrank/main.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/admin/userrank/main.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -123,16 +123,16 @@
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=userrank", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if (isset($_REQUEST["rank_id"])) {
- $obj =& $userrank_Handler->get($_REQUEST["rank_id"]);
+ if (isset($_POST["rank_id"])) {
+ $obj =& $userrank_Handler->get($_POST["rank_id"]);
} else {
$obj =& $userrank_Handler->create();
}
- $obj->setVar("rank_title", $_REQUEST["rank_title"]);
- $obj->setVar("rank_min", $_REQUEST["rank_min"]);
- $obj->setVar("rank_max", $_REQUEST["rank_max"]);
- $verif_rank_special = ($_REQUEST["rank_special"] == 1) ? "1" : "0";
+ $obj->setVar("rank_title", $_POST["rank_title"]);
+ $obj->setVar("rank_min", $_POST["rank_min"]);
+ $obj->setVar("rank_max", $_POST["rank_max"]);
+ $verif_rank_special = ($_POST["rank_special"] == 1) ? "1" : "0";
$obj->setVar("rank_special", $verif_rank_special);
include_once XOOPS_ROOT_PATH . '/class/uploader.php';
@@ -148,7 +148,7 @@
$obj->setVar("rank_image", 'ranks/' . $uploader_rank_img->getSavedFileName());
}
} else {
- $obj->setVar("rank_image", $_REQUEST["rank_image"]);
+ $obj->setVar("rank_image", 'ranks/' . $_POST["rank_image"]);
}
if ($userrank_Handler->insert($obj)) {
@@ -158,8 +158,9 @@
// Delete userrank
case 'userrank_delete':
- $obj =& $userrank_Handler->get($_REQUEST["rank_id"]);
- if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
+ $rank_id = system_CleanVars($_REQUEST, 'rank_id', 0, 'int');
+ $obj =& $userrank_Handler->get( $rank_id );
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("admin.php?fct=userrank", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
@@ -171,7 +172,7 @@
}
redirect_header("admin.php?fct=userrank", 2, _AM_SYSTEM_USERRANK_SAVE);
} else {
- echo $obj->getHtmlErrors();
+ xoops_error( $obj->getHtmlErrors() );
}
} else {
// Define Stylesheet
@@ -189,7 +190,7 @@
// Update userrank status
case 'userrank_update_special':
// Get rank id
- $rank_id = system_CleanVars ( $_REQUEST, 'rank_id', 0, 'int' );
+ $rank_id = system_CleanVars ( $_POST, 'rank_id', 0, 'int' );
if ( $rank_id > 0 ) {
$obj =& $userrank_Handler->get($rank_id);
$old = $obj->getVar('rank_special');
Modified: XoopsCore/trunk/htdocs/modules/system/class/gui.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/gui.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/class/gui.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -110,6 +110,7 @@
// Define top navigation
$menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoopsModule->getVar('mid', 'e'), _AM_SYSTEM_PREF);
$menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE);
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoopsModule->getVar('mid', 'e') . "&selmod=-2&selgrp=-1&selvis=-1", _AM_SYSTEM_BLOCKS);
$menu_handler->addMenuTop(XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname', 'e') . "/", _AM_SYSTEM_GOTOMODULE);
// Define main tab navigation
$i=0;
Modified: XoopsCore/trunk/htdocs/modules/system/class/menu.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/menu.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/class/menu.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -146,6 +146,8 @@
foreach ($this->_menutop as $k => $v) {
$menu .= " <a href=\"$k\">$v</a> |";
}
+ $menu = substr($menu, 0, -1);
+
$menu .= "</td>";
$menu .= "<td style='text-align: right;'><strong>" . $this->_obj->getVar( 'name' ) . "</strong> : " . $breadcrumb . "</td>";
$menu .= "</tr>\n</table>\n";
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin/maintenance.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -63,8 +63,8 @@
define("_AM_SYSTEM_MAINTENANCE_DUMP_RECORDS", "record(s)");
// Tips
-define("_AM_SYSTEM_MAINTENANCE_TIPS',
-'<ul>
+define("_AM_SYSTEM_MAINTENANCE_TIPS",
+"<ul>
<li>You can do a simple maintenance of your XOOPS Installation: clear your cache and session table, and do maintenance of your tables</li>
</ul>");
Modified: XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/language/english/admin/tplsets.php 2011-12-25 23:10:24 UTC (rev 8547)
@@ -33,7 +33,7 @@
define("_AM_SYSTEM_TEMPLATES_SELECT_MODULES","Select Module");
define("_AM_SYSTEM_TEMPLATES_MODULES","Modules : ");
define("_AM_SYSTEM_TEMPLATES_FILES","Files");
-define("_AM_SYSTEM_TEMPLATES_EMPTY_FILE","Emply file");
+define("_AM_SYSTEM_TEMPLATES_EMPTY_FILE","Empty file");
define("_AM_SYSTEM_TEMPLATES_TYPES","Types");
define("_AM_SYSTEM_TEMPLATES_STATUS","Status");
define("_AM_SYSTEM_TEMPLATES_TEMPLATES","Templates");
Modified: XoopsCore/trunk/htdocs/modules/system/templates/admin/system_comments.html
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/templates/admin/system_comments.html 2011-12-25 23:00:59 UTC (rev 8546)
+++ XoopsCore/trunk/htdocs/modules/system/templates/admin/system_comments.html 2011-12-25 23:10:24 UTC (rev 8547)
@@ -6,38 +6,40 @@
<div class="floatleft"><{$form_sort}></div>
<div class="floatright">
<div class="xo-buttons">
- <button class="ui-corner-all" 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}>" />
+ <button class="ui-corner-all" 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>
+ </button>
+ </div>
</div>
<div class="clear"></div>
<table id="xo-comment-sorter" cellspacing="1" 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._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>
- <form name='commentslist' id='commentslist' action='<{$php_selft}>' method="post">
- <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>
-...
[truncated message content] |
