Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG (revision 1882)
+++ branches/2.8.x/CHANGELOG (revision 1883)
@@ -11,6 +11,10 @@
! = Update/Change
===============================================================================
+07 Mar-2013 Build 1883 Dietmar Woellbrink (Luisehahne)
+! groups change languages class to translate class
+! prepare upgrade-script for WB Version 2.8.4 (versioncompare)
+! update Form modul to version 2.9.1
06 Mar-2013 Build 1882 Werner v.d.Decken(DarkViper)
# protect magic setter to fix security issue in WbAdapter
05 Mar-2013 Build 1881 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php (revision 1882)
+++ branches/2.8.x/wb/upgrade-script.php (revision 1883)
@@ -85,6 +85,7 @@
$DEFAULT_THEME = 'wb_theme';
$stepID = 0;
+$filesRemove = array();
$aFilesToRemove = array();
$dirRemove = array(
/*
@@ -103,6 +104,9 @@
'[ADMIN]/preferences/password.php',
'[ADMIN]/pages/settings2.php',
'[ADMIN]/users/users.php',
+ '[ADMIN]/groups/add.php',
+ '[ADMIN]/groups/groups.php',
+ '[ADMIN]/groups/save.php',
'[ADMIN]/skel/themes/htt/groups.htt',
'[FRAMEWORK]/class.msg_queue.php',
@@ -113,7 +117,7 @@
$aFilesToRemove = array_merge($filesRemove['0']);
// deleting files below only from less 2.8.4 stable
-if(version_compare(WB_REVISION, REVISION, '<='))
+if(version_compare(WB_VERSION, '2.8.4', '<'))
{
$filesRemove['1'] = array(
@@ -898,42 +902,53 @@
echo ''.implode ('
',$msg).'';
echo '';
- /* *****************************************************************************
- * - check for deprecated / never needed files
- */
- if(sizeof($aFilesToRemove)) {
- echo 'Step '.(++$stepID).': Remove deprecated and old files
';
- $searches = array(
- '[ADMIN]',
- '[MEDIA]',
- '[PAGES]',
- '[FRAMEWORK]',
- '[MODULES]',
- '[TEMPLATE]'
- );
- $replacements = array(
- '/'.substr(ADMIN_PATH, strlen(WB_PATH)+1),
- MEDIA_DIRECTORY,
- PAGES_DIRECTORY,
- '/framework',
- '/modules',
- '/templates'
- );
+ /* *****************************************************************************
+ * - check for deprecated / never needed files
+ */
+ $iLoaded = sizeof($aFilesToRemove);
+ if($iLoaded) {
+ echo 'Step '.(++$stepID).': Remove deprecated and outdated files
';
+ $iFailed = 0;
+ $iFound = 0;
+ $searches = array(
+ '[ADMIN]',
+ '[MEDIA]',
+ '[PAGES]',
+ '[FRAMEWORK]',
+ '[MODULES]',
+ '[TEMPLATE]'
+ );
+ $replacements = array(
+ '/'.substr(ADMIN_PATH, strlen(WB_PATH)+1),
+ MEDIA_DIRECTORY,
+ PAGES_DIRECTORY,
+ '/framework',
+ '/modules',
+ '/templates'
+ );
$msg = '';
- foreach( $aFilesToRemove as $file )
- {
+ echo '';
+ echo '
Search '.$iLoaded.' deprecated and outdated files
';
+ foreach( $aFilesToRemove as $file )
+ {
$file = str_replace($searches, $replacements, $file);
if( is_writable(WB_PATH.'/'.$file) ) {
+ $iFound++;
// try to unlink file
if(!unlink(WB_PATH.$file)) {
- // save in err-list, if failed
+ $iFailed++;
}
}
- if( is_readable(WB_PATH.'/'.$file) ) {
- $msg .= $file.'
';
- }
- }
+ if( is_readable(WB_PATH.'/'.$file) ) {
+ // save in err-list, if failed
+ $msg .= $file.'
';
+ }
+ }
+ $iRemove = $iFound-$iFailed;
+ echo 'Remove '.$iRemove.' from '.$iFound.' founded ';
+ echo ($iFailed == 0) ? $OK : $FAIL;
+ echo '';
if($msg != '')
{
@@ -956,11 +971,14 @@
}
-/**********************************************************
- * - check for deprecated / never needed files
- */
- if(sizeof($dirRemove)) {
- echo 'Step '.(++$stepID).': Remove deprecated and old folders
';
+ /**********************************************************
+ * - check for deprecated / never needed files
+ */
+ $iLoaded = sizeof($dirRemove);
+ if($iLoaded) {
+ echo 'Step '.(++$stepID).': Remove deprecated and outdated folders
';
+ $iFailed = 0;
+ $iFound = 0;
$searches = array(
'[ADMIN]',
'[MEDIA]',
@@ -974,19 +992,28 @@
'/templates',
);
$msg = '';
+ echo '';
+ echo '
Search '.$iLoaded.' deprecated and outdated folders
';
foreach( $dirRemove as $dir ) {
$dir = str_replace($searches, $replacements, $dir);
$dir = WB_PATH.'/'.$dir;
if( is_dir( $dir )) {
+ $iFound++;
// try to delete dir
if(!is_writable( $dir ) || !rm_full_dir($dir)) {
// save in err-list, if failed
- if( is_readable(WB_PATH.'/'.$file) ) {
- $msg .= str_replace(WB_PATH,'',$dir).'
';
- }
+ $iFailed++;
}
}
+ if( is_readable(WB_PATH.'/'.$dir) ) {
+ $msg .= str_replace(WB_PATH,'',$dir).'
';
+ }
}
+
+ $iRemove = $iFound-$iFailed;
+ echo 'Remove '.$iRemove.' from '.$iFound.' founded ';
+ echo ($iFailed == 0) ? $OK : $FAIL;
+ echo '';
if($msg != '') {
$msg = '
Following directories are deprecated, outdated or a security risk and
@@ -1004,13 +1031,15 @@