Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8550] XoopsCore/trunk
|
From: <be...@us...> - 2011-12-25 23:33:40
|
Revision: 8550
http://xoops.svn.sourceforge.net/xoops/?rev=8550&view=rev
Author: beckmi
Date: 2011-12-25 23:33:33 +0000 (Sun, 25 Dec 2011)
Log Message:
-----------
Updating Trunk to XOOPS 2.5.1a Final
Modified Paths:
--------------
XoopsCore/trunk/checksum.md5
XoopsCore/trunk/docs/README
XoopsCore/trunk/docs/changelog.250.txt
XoopsCore/trunk/docs/release_notes.txt
XoopsCore/trunk/htdocs/include/version.php
XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php
XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.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/2.5.x/2.5.1:6339-6525
/XoopsCore/branches/tasks/2.5.0-formuss-trabis:4945-6327
/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
/XoopsCore/releases/2.5.1:6526-8548
/XoopsCore/releases/2.5.1-rc:6408-8547
+ /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/2.5.x/2.5.1:6339-6525
/XoopsCore/branches/2.5.x/2.5.2:6629-6630
/XoopsCore/branches/tasks/2.5.0-formuss-trabis:4945-6327
/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
/XoopsCore/releases/2.5.1:6526-8548
/XoopsCore/releases/2.5.1-rc:6408-8547
/XoopsCore/releases/2.5.1a:6706-8549
Modified: XoopsCore/trunk/checksum.md5
===================================================================
--- XoopsCore/trunk/checksum.md5 2011-12-25 23:30:56 UTC (rev 8549)
+++ XoopsCore/trunk/checksum.md5 2011-12-25 23:33:33 UTC (rev 8550)
@@ -850,7 +850,7 @@
include/registerform.php:1c0403ab4139c026d2fee31b24335e76
include/searchform.php:ddd538bd05a28e638f26e1ea6e3d926e
include/site-closed.php:499db6c1d4c8e2a32ee997f54a5bb70f
-include/version.php:2ab33a73c506961992e8dd0f2a7ad91a
+include/version.php:53fc1d870d705d855c66a16d3e3a0f39
include/xoops.js:f0cf9850330f43b4aed408f3671bfaa3
include/xoops13_header.php:4a1ebb0aabdf989009bb298d150a4d92
include/xoopscodes.php:de983e0b7d2568e04d06ccd3472ebf57
@@ -1133,7 +1133,7 @@
modules/system/admin/banners/main.php:fcf85b52cbf6000f8dd33b91d8dd9e7f
modules/system/admin/banners/xoops_version.php:c411c09864cddeb4498a28a560857908
modules/system/admin/blocksadmin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
-modules/system/admin/blocksadmin/main.php:ed13f6b9a98aebb2ac717c3f4331c0bf
+modules/system/admin/blocksadmin/main.php:a28abc0de2755b2ec1a8355df6504e7f
modules/system/admin/blocksadmin/xoops_version.php:d161144d30228d567aa9ef77d25e91de
modules/system/admin/comments/admin_header.php:68aad7a915740a625703190c004def70
modules/system/admin/comments/comment_delete.php:f0afd822c2400f5d9c09c79999f9d52e
@@ -1156,7 +1156,7 @@
modules/system/admin/maintenance/xoops_version.php:064670df87ddf3160fb053594a02154c
modules/system/admin/maintenance/dump/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
modules/system/admin/modulesadmin/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
-modules/system/admin/modulesadmin/main.php:a519e94dfee270fcb208a977e9fc8ca0
+modules/system/admin/modulesadmin/main.php:59d9c363eff99582f03afd7137dff9c4
modules/system/admin/modulesadmin/modulesadmin.php:84aa7d4de17b7159a34aead3ac3c7418
modules/system/admin/modulesadmin/xoops_version.php:905007d8c8a790a06eca231e571e3240
modules/system/admin/preferences/index.html:e1aedf4e788d40c9dbb4f2520f8feffd
Modified: XoopsCore/trunk/docs/README
===================================================================
--- XoopsCore/trunk/docs/README 2011-12-25 23:30:56 UTC (rev 8549)
+++ XoopsCore/trunk/docs/README 2011-12-25 23:33:33 UTC (rev 8550)
@@ -1,14 +1,14 @@
-XOOPS 2.5.1 Final Release
+XOOPS 2.5.1 and 2.5.1a Release
-The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.1 Final. Several bugs have been fixed as well as security enhancement based on Aung Khant's report.
-Please be aware that the bugfix is not complete and 2.5 series will be following small but frequent release rule so that users can take advantage of quick fixes.
-
This 2.5 series builds on the XOOPS 2.4.x series with objectives of usability improvements instead of architecture or API changes.
-The system module is updated with a major redesign with jQuery based AJAX, done mainly by ForMusS, kraven_30, Mage with contributions from trabis, voltan, Kris_fr, onokazu etc.
-Besides usability, some proof-of-concept experiments have also been proven for module and theme development. Unavoidably there are bugs and incompatibility introduced.
-Developers are encouraged to improve the new functions and APIs but not advised to use them immediately in their modules since the they are designed with new architecture in XOOPS 3 (or Xoops Engine).
-Developers can check Xoops Engine details at http://www.xoopsengine.org to prepare for their next version of modules and themes.
+Upon community demands, the XOOPS 2.5.1a is released as a quick fix for 2.5.1 release. There are two fixes included: module name and order updates, missing "block_type" for adding custom blocks.
+A separate [url=http://xoops.org/modules/news/article.php?storyid=5889]quick fix was released on April 12th[/url], there is no new fix added to the 2.5.1a release.
+As stated in the quick fix, there are bugs and security weakness introduced into XOOPS 2.5.0. In XOOPS 2.5.1 all known security weaknesses have been fixed and the development team will be continously improving it.
+Some experimental features and APIs were also added to 2.5 and module developers are moderately suggested to keep their modules as it is and don't implement the 2.5-only features in a hurry to avoid potential compatibility issues.
+Meanwhile developers can check Xoops Engine progress at http://www.xoopsengine.org to prepare for their next version of modules and themes for forward compatibility.
+
+
Download XOOPS 2.5.1 from [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS%202.5.1/]Sourceforge repository[/url].
@@ -21,5 +21,6 @@
Xoops Engine development: http://www.xoopsengine.org
+Taiwen Jiang (aka phppp)
XOOPS Development Team
-April 5th, 2011
\ No newline at end of file
+April 12th, 2011
\ No newline at end of file
Modified: XoopsCore/trunk/docs/changelog.250.txt
===================================================================
--- XoopsCore/trunk/docs/changelog.250.txt 2011-12-25 23:30:56 UTC (rev 8549)
+++ XoopsCore/trunk/docs/changelog.250.txt 2011-12-25 23:33:33 UTC (rev 8550)
@@ -1,5 +1,13 @@
XOOPS 2.5 Changelog
+
+
+2011/04/12: Version 2.5.1a
===============================
+Bugfixes:
+- Module names and orders were not able to update (phppp/aitor)
+- Custom block was not able to add due to missing of 'block_type' (phppp/tatane/mr-reda04_fr/aitor)
+
+
2011/03/23: Version 2.5.1 Final
===============================
Bugfixes:
Modified: XoopsCore/trunk/docs/release_notes.txt
===================================================================
--- XoopsCore/trunk/docs/release_notes.txt 2011-12-25 23:30:56 UTC (rev 8549)
+++ XoopsCore/trunk/docs/release_notes.txt 2011-12-25 23:33:33 UTC (rev 8550)
@@ -1,24 +1,22 @@
-XOOPS 2.5.1 Final Release
+XOOPS 2.5.1a Release
-The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.1 Final. Several bugs have been fixed as well as security enhancement based on Aung Khant's report.
-Please be aware that the bugfix is not complete and 2.5 series will be following small but frequent release rule so that users can take advantage of quick fixes.
+Upon community demands, the XOOPS 2.5.1a is released as a quick fix for 2.5.1 release. There are two fixes included: module name and order updates, missing "block_type" for adding custom blocks.
+A separate [url=http://xoops.org/modules/news/article.php?storyid=5889]quick fix was released on April 12th[/url], there is no new fix added to the 2.5.1a release.
+As stated in the quick fix, there are bugs and security weakness introduced into XOOPS 2.5.0. In XOOPS 2.5.1 all known security weaknesses have been fixed and the development team will be continously improving it.
-This 2.5 series builds on the XOOPS 2.4.x series with objectives of usability improvements instead of architecture or API changes.
-The system module is updated with a major redesign with jQuery based AJAX, done mainly by ForMusS, kraven_30, Mage with contributions from trabis, voltan, Kris_fr, onokazu etc.
-Besides usability, some proof-of-concept experiments have also been proven for module and theme development. Unavoidably there are bugs and incompatibility introduced.
-Developers are encouraged to improve the new functions and APIs but not advised to use them immediately in their modules since the they are designed with new architecture in XOOPS 3 (or Xoops Engine).
-Developers can check Xoops Engine details at http://www.xoopsengine.org to prepare for their next version of modules and themes.
+Some experimental features and APIs were also added to 2.5 and module developers are moderately suggested to keep their modules as it is and don't implement the 2.5-only features in a hurry to avoid potential compatibility issues.
+Meanwhile developers can check Xoops Engine progress at http://www.xoopsengine.org to prepare for their next version of modules and themes for forward compatibility.
-Download XOOPS 2.5.1 from [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS%202.5.1/]Sourceforge repository[/url].
+Download XOOPS 2.5.1a from [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS%202.5.1/]Sourceforge repository[/url].
System requirements
-----------------------------------
PHP:
-Any PHP version >= 5.2 (PHP 5.3+ is strongly recommended)
+PHP version >= 5.2
MySQL:
-MySQL server 5.0+
+MySQL server >= 5.0
Web server:
Any server supporting the required PHP version (Apache highly recommended)
@@ -49,7 +47,11 @@
Upgrading from a previous version
-----------------------------------
-Upgrading from 2.5.0 to 2.5.1:
+Upgrading from 2.5.1 to 2.5.1a:
+ 1. Get the right update package xoops-2.5.1-fix-0412.zip from the sourceforge file repository
+ 2. Overwrite the two files in XOOPS directory on your server with the content of /htdocs
+
+Upgrading from 2.5.0 to 2.5.1a:
1. Get the right update package from the sourceforge file repository
2. Overwrite files in XOOPS directory on your server with the content of /htdocs
* make sure that you copy the content of /xoops_lib to whatever directory you keep it on the server now (it should be your current XOOPS_TRUST_PATH directory), then delete the /xoops_lib directory. There can NOT be two directories with the content of /xoops_lib
@@ -112,5 +114,6 @@
Xoops Engine development: http://www.xoopsengine.org
+Taiwen Jiang (aka phppp)
XOOPS Development Team
-April 5th, 2011
\ No newline at end of file
+April 12th, 2011
\ No newline at end of file
Modified: XoopsCore/trunk/htdocs/include/version.php
===================================================================
--- XoopsCore/trunk/htdocs/include/version.php 2011-12-25 23:30:56 UTC (rev 8549)
+++ XoopsCore/trunk/htdocs/include/version.php 2011-12-25 23:33:33 UTC (rev 8550)
@@ -30,6 +30,6 @@
/**
* Define XOOPS engine version
*/
-define('XOOPS_VERSION', 'XOOPS 2.5.1');
+define('XOOPS_VERSION', 'XOOPS 2.5.1a');
?>
\ No newline at end of file
Property changes on: XoopsCore/trunk/htdocs/modules
___________________________________________________________________
Modified: svn:mergeinfo
- /XoopsCore/branches/2.5.x/2.5.1/htdocs/modules:6339-6525
/XoopsCore/branches/tasks/2.5.0-formuss-trabis/htdocs/modules:5405-6327
/XoopsCore/releases/2.5.0/htdocs/modules:5727-8546
/XoopsCore/releases/2.5.0-rc2/htdocs/modules:5597-8545
/XoopsCore/releases/2.5.1/htdocs/modules:6526-8548
/XoopsCore/releases/2.5.1-rc/htdocs/modules:6408-8547
/XoopsModules/protector/releases/3.40/modules:4782-5620
+ /XoopsCore/branches/2.5.x/2.5.1/htdocs/modules:6339-6525
/XoopsCore/branches/tasks/2.5.0-formuss-trabis/htdocs/modules:5405-6327
/XoopsCore/releases/2.5.0/htdocs/modules:5727-8546
/XoopsCore/releases/2.5.0-rc2/htdocs/modules:5597-8545
/XoopsCore/releases/2.5.1/htdocs/modules:6526-8548
/XoopsCore/releases/2.5.1-rc/htdocs/modules:6408-8547
/XoopsCore/releases/2.5.1a/htdocs/modules:6706-8549
/XoopsModules/protector/releases/3.40/modules:4782-5620
Modified: XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php 2011-12-25 23:30:56 UTC (rev 8549)
+++ XoopsCore/trunk/htdocs/modules/system/admin/blocksadmin/main.php 2011-12-25 23:33:33 UTC (rev 8550)
@@ -73,11 +73,11 @@
// Define Stylesheet
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.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/blocks.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/blocks.js');
+ // Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath') );
$xoBreadCrumb->addHelp( system_adminVersion('blocksadmin', 'help') );
$xoBreadCrumb->addTips( sprintf(_AM_SYSTEM_BLOCKS_TIPS, system_AdminIcons('block.png'), system_AdminIcons('success.png'), system_AdminIcons('cancel.png')));
@@ -192,12 +192,12 @@
$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?Frameworks/jquery/plugins/jquery.form.js');
- $xoTheme->addScript('browse.php?modules/system/js/admin.js');
- $xoTheme->addScript('browse.php?modules/system/js/blocks.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?Frameworks/jquery/plugins/jquery.form.js');
+ $xoTheme->addScript('browse.php?modules/system/js/admin.js');
+ $xoTheme->addScript('browse.php?modules/system/js/blocks.js');
+ // Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath') );
$xoBreadCrumb->addLink( _AM_SYSTEM_BLOCKS_ADDBLOCK );
$xoBreadCrumb->render();
@@ -277,12 +277,13 @@
$block_handler =& xoops_getmodulehandler('block');
// Get avatar id
$block_id = system_CleanVars ( $_POST, 'bid', 0, 'int' );
- $block_type = system_CleanVars ( $_POST, 'block_type', '', 'string');
if ( $block_id > 0) {
$block =& $block_handler->get( $block_id );
} else {
$block =& $block_handler->create();
}
+ $block_type = system_CleanVars ($_POST, 'block_type', '', 'string');
+ $block->setVar('block_type', $block_type);
if (!$block->isCustom()) {
$block->setVars( $_POST );
@@ -394,7 +395,7 @@
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.form.js');
$xoTheme->addScript('browse.php?modules/system/js/admin.js');
- // Define Breadcrumb and tips
+ // Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath') );
$xoBreadCrumb->addLink( _AM_SYSTEM_BLOCKS_EDITBLOCK );
$xoBreadCrumb->render();
@@ -493,7 +494,7 @@
xoops_cp_header();
// Define Stylesheet
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' );
- // Define Breadcrumb and tips
+ // Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath') );
$xoBreadCrumb->addLink( _AM_SYSTEM_BLOCKS_CLONEBLOCK );
$xoBreadCrumb->render();
Modified: XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2011-12-25 23:30:56 UTC (rev 8549)
+++ XoopsCore/trunk/htdocs/modules/system/admin/modulesadmin/main.php 2011-12-25 23:33:33 UTC (rev 8550)
@@ -230,6 +230,7 @@
}
$i = 0;
$modifs_mods = array();
+ $module = empty($_POST['module']) ? array() : $_POST['module'];
foreach ($module as $mid) {
$modifs_mods[$i]['mid'] = $mid;
$modifs_mods[$i]['oldname'] = $myts->htmlspecialchars($myts->stripSlashesGPC($oldname[$mid]));
@@ -276,6 +277,7 @@
case 'submit':
$ret = array();
$write = false;
+ $module = empty($_POST['module']) ? array() : $_POST['module'];
foreach ($module as $mid) {
if (isset($newstatus[$mid]) && $newstatus[$mid] ==1) {
if ($oldstatus[$mid] == 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
