Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1483) +++ branches/2.8.x/CHANGELOG (revision 1484) @@ -11,6 +11,12 @@ ! = Update/Change =============================== FEATURES FREEZE ================================ +------------------------------------- 2.8.3 ------------------------------------ +31 Jul-2011 Build 1484 Dietmar Woellbrink (Luisehahne) +! move fixes 2.8.2 to 2.8.3 +! fixes will be shown in an extra readme +! an package with the fixed files will be created +! for all users who downloaded the 2.8.2 before 29 Jul-2011 ------------------------------------- 2.8.2 ------------------------------------ 25 Jul-2011 Build 1480 Dietmar Woellbrink (Luisehahne) ! Changed version to 2.8.2 Index: branches/2.8.x/wb/config.php =================================================================== --- branches/2.8.x/wb/config.php (revision 1483) +++ branches/2.8.x/wb/config.php (nonexistent) @@ -1 +0,0 @@ -' .$message .''; + $msg = '<'.$element.' class="'.$class.'">'; + $msg .= ''.strtoupper(strtok($class, ' ')).'
'; + $msg .= $message.''; + echo $msg; } // database tables including in WB package @@ -33,6 +46,24 @@ 'mod_output_filter','mod_wrapper','mod_wysiwyg' ); +$OK = ' OK '; +$FAIL = ' FAILED '; +$DEFAULT_THEME = 'wb_theme'; + +$files2remove = array( + + '[ADMIN]/preferences/details.php', + '[ADMIN]/preferences/email.php', + '[ADMIN]/preferences/password.php', +/* + '[TEMPLATE]/allcss/', + '[TEMPLATE]/blank/', + '[TEMPLATE]/round/', + '[TEMPLATE]/simple/', +*/ + ); + + // analyze/check database tables function mysqlCheckTables( $dbName ) { @@ -63,14 +94,9 @@ $x++; } } - - - - return $data; } - // check existings tables for upgrade or install function check_wb_tables() { @@ -99,17 +125,6 @@ // check existing tables $all_tables = check_wb_tables(); -// only for array tests -function show_array($array=array()) -{ - print '
';
-    print_r ($array);
-    print '
'; -} - -require_once(WB_PATH.'/framework/functions.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Addons', 'modules', false, false); ?> @@ -218,8 +233,6 @@ exit(); } echo '

Step 2: Updating database entries

'; -$OK = 'OK'; -$FAIL = 'FAILED'; // function to add a var/value-pair into settings-table function db_add_key_value($key, $value) { @@ -267,14 +280,15 @@ * - Adding field default_theme to settings table */ echo "
Adding default_theme to settings table
"; +db_update_key_value('settings', 'default_theme', $DEFAULT_THEME); +/* $cfg = array( 'default_theme' => 'wb_theme' ); - foreach($cfg as $key=>$value) { db_add_key_value($key, $value); } - +*/ /********************************************************** * - install droplets */ @@ -351,8 +365,10 @@ echo "
Adding mediasettings to settings table
"; $cfg = array( 'mediasettings' => '', - 'rename_files_on_upload' => 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx' + 'rename_files_on_upload' => 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js' ); +db_update_key_value('settings', 'rename_files_on_upload', $cfg['rename_files_on_upload']); + foreach($cfg as $key=>$value) { db_add_key_value($key, $value); } @@ -505,12 +521,12 @@ * upgrade media folder index protect files */ $dir = (WB_PATH.MEDIA_DIRECTORY); -echo '

Upgrade '.MEDIA_DIRECTORY.'/ index.php protect files

'; +echo '

Upgrade '.MEDIA_DIRECTORY.'/ index.php protect files


'; $array = rebuildFolderProtectFile($dir); if( sizeof( $array ) ){ - print 'Upgrade '.MEDIA_DIRECTORY.'/ index.php protect files'." $OK
"; + print '
Upgrade '.sizeof( $array ).' '.MEDIA_DIRECTORY.'/ protect files'." $OK
"; } else { - print 'Upgrade '.MEDIA_DIRECTORY.'/ index.php protect files'." $FAIL!
"; + print '
Upgrade '.MEDIA_DIRECTORY.'/ protect files'." $FAIL!
"; print implode ('
',$array); } @@ -531,8 +547,50 @@ * - Set Version to new Version */ echo '
Update database version number to '.VERSION.' : '; -echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value`='".VERSION."' WHERE `name` = 'wb_version'")) ? " $OK
" : " $FAIL
"; +// echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value`='".VERSION."' WHERE `name` = 'wb_version'")) ? " $OK
" : " $FAIL
"; +db_update_key_value('settings', 'wb_version', VERSION); +/* ***************************************************************************** + * - check for deprecated / never needed files + */ +?> +

Step 3: Remove deprecated and old files

+'; + } + } + } + + if($msg != '') + { + $msg = 'Following files are deprecated, outdated or a security risk and + can not be removed automatically.

Please delete them + using FTP and restart upgrade-script!

'.$msg; + status_msg($msg, 'error warning', 'div'); + echo '

'; + exit(); + } /********************************************************** * - Reload all addons */ @@ -544,7 +602,7 @@ while(false !== ($file = readdir($handle))) { if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') { load_module(WB_PATH.'/modules/'.$file ); - upgrade_module($file, true); + // upgrade_module($file, true); } } closedir($handle); @@ -584,7 +642,7 @@ // require(WB_PATH.'/framework/initialize.php'); -if(!defined('DEFAULT_THEME')) { define('DEFAULT_THEME', 'wb_theme'); } +if(!defined('DEFAULT_THEME')) { define('DEFAULT_THEME', $DEFAULT_THEME); } if(!defined('THEME_PATH')) { define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME);} echo '

Congratulations: The upgrade script is finished ...

'; Index: branches/2.8.x/wb/config.php.bak =================================================================== --- branches/2.8.x/wb/config.php.bak (nonexistent) +++ branches/2.8.x/wb/config.php.bak (revision 1484) @@ -0,0 +1 @@ +query($query); if($database->is_error()) { $admin->print_error($database->get_error(), 'index.php'); @@ -42,6 +42,7 @@ // Insert first value to say please select $template->set_var('VALUE', ''); $template->set_var('NAME', $TEXT['PLEASE_SELECT'].'...'); + $template->set_var('STATUS', 'text-decoration :none;' ); $template->parse('list', 'list_block', true); // Loop through users while($user = $results->fetchRow()) { Index: branches/2.8.x/wb/framework/functions.php =================================================================== --- branches/2.8.x/wb/framework/functions.php (revision 1483) +++ branches/2.8.x/wb/framework/functions.php (revision 1484) @@ -707,7 +707,8 @@ { global $admin, $MESSAGE; $retVal = array(); - if( ($sAbsDir=='') || ($sAbsDir == WB_PATH) ) { return $retVal;} + $wb_path = rtrim(str_replace('\/\\', '/', WB_PATH), '/'); + if( ($sAbsDir=='') || ($sAbsDir == $wb_path) ) { return $retVal;} if ( $make_dir==true ) { // Check to see if the folder already exists @@ -727,7 +728,7 @@ { // if(file_exists($sAbsDir.'/index.php')) { unlink($sAbsDir.'/index.php'); } // Create default "index.php" file - $rel_pages_dir = str_replace(WB_PATH, '', dirname($sAbsDir) ); + $rel_pages_dir = str_replace($wb_path, '', dirname($sAbsDir) ); $step_back = str_repeat( '../', substr_count($rel_pages_dir, '/')+1 ); $sResponse = $_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently'; @@ -742,41 +743,39 @@ "\t".'header(\'Location: '.WB_URL.'/index.php\');'."\n". '// *************************************************'."\n"; $filename = $sAbsDir.'/index.php'; + // write content into file - if ($handle = fopen($filename, 'w')) { - fwrite($handle, $content); - fclose($handle); - change_mode($filename, 'file'); + if(is_writable($filename)) { + if(file_put_contents($filename, $content)) { + print 'create => '.str_replace( $wb_path,'',$filename).'
'; + change_mode($filename, 'file'); + } } - // $admin->print_success($MESSAGE['MEDIA']['DIR_MADE']); } else { - // $admin->print_error($MESSAGE['GENERIC_BAD_PERMISSIONS']); $retVal[] = $MESSAGE['GENERIC_BAD_PERMISSIONS']; } return $retVal; } -// Rebuild new protected files in the given directory and subs function rebuildFolderProtectFile($dir='') { - $retVal = array(); + $retVal = array(); + $dir = rtrim(str_replace('\/\\', '/', $dir), '/'); try { - $iterator = new RecursiveDirectoryIterator($dir); - foreach (new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::SELF_FIRST) as $file) - { - if ($file->isDir()) { - $protect_file = ($file->getPathname()); - $retVal[] = createFolderProtectFile($protect_file,false); - } else { - // print ($file->getPathname())."
"; - } - } - } catch ( Exception $e ) { - $retVal[] = $MESSAGE['MEDIA_DIR_ACCESS_DENIED']; - } - - $retVal = array_merge($retVal); - return $retVal; + $files = array(); + $files[] = $dir; + foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir)) as $fileInfo){ + $files[] = $fileInfo->getPath(); + } + $files = array_unique($files); + foreach( $files as $file){ + $protect_file = rtrim(str_replace('\/\\', '/', $file), '/'); + $retVal[] = createFolderProtectFile($protect_file,false); + } + } catch ( Exception $e ) { + $retVal[] = $MESSAGE['MEDIA_DIR_ACCESS_DENIED']; + } + return $retVal; } // Create a new file in the pages directory Index: branches/2.8.x/wb/favicon.ico =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: branches/2.8.x/wb/favicon.ico ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: branches/2.8.x/wb/modules/SecureFormSwitcher/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/SecureFormSwitcher/upgrade.php (revision 1483) +++ branches/2.8.x/wb/modules/SecureFormSwitcher/upgrade.php (revision 1484) @@ -3,8 +3,7 @@ * * @category modules * @package SecureFormSwitcher - * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich + * @author Luisehahne * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html @@ -18,24 +17,3 @@ // Must include code to stop this file being access directly if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } -global $i; -// load module language file -$mod_path = (dirname(__FILE__)); -require_once( $mod_path.'/language_load.php' ); -$i = (!isset($i) ? 1 : $i); -print "
"; -print "

Step $i: Updating SecureForm Switcher

\n"; -$i++; -$OK = "OK"; -$FAIL = "FAILED"; -$target = $mod_path.'/files/SecureForm.mtab.php'; -$dest = WB_PATH.'/framework/SecureForm.mtab.php'; - -if(is_writeable(WB_PATH.'/framework')) { - if((copy($target,$dest) && change_mode($dest)) || file_exists($target)) { - print "
Updating secure_form_module $OK
\n"; - } else { - print "
Updating secure_form_module $FAIL
\n"; - } -} -print "
"; Index: branches/2.8.x/wb/modules/edit_module_files.php =================================================================== --- branches/2.8.x/wb/modules/edit_module_files.php (revision 1483) +++ branches/2.8.x/wb/modules/edit_module_files.php (revision 1484) @@ -104,7 +104,7 @@ Index: branches/2.8.x/wb/modules/output_filter/install.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/install.php (revision 1483) +++ branches/2.8.x/wb/modules/output_filter/install.php (revision 1484) @@ -33,4 +33,4 @@ // add default values to the module table $database->query("INSERT INTO ".TABLE_PREFIX - ."mod_output_filter (sys_rel,email_filter, mailto_filter, at_replacement, dot_replacement) VALUES ('1','1', '1', '(at)', '(dot)')"); + ."mod_output_filter (sys_rel,email_filter, mailto_filter, at_replacement, dot_replacement) VALUES ('0','1', '1', '(at)', '(dot)')"); Index: branches/2.8.x/wb/modules/news/rss.php =================================================================== --- branches/2.8.x/wb/modules/news/rss.php (revision 1483) +++ branches/2.8.x/wb/modules/news/rss.php (revision 1484) @@ -60,8 +60,8 @@ ?> - - + + WebsiteBaker Content Management Systemquery($query); //Generating the news items -while($item = $result->fetchRow()){ ?> - - <![CDATA[<?php echo stripslashes($item["title"]); ?>]]> - ]]> - - - +while($item = $result->fetchRow()){ + $description = stripslashes($item["content_short"]); + // wb->preprocess() -- replace all [wblink123] with real, internal links + $wb->preprocess($description); +?> + + <![CDATA[<?php echo stripslashes($item["title"]); ?>]]> + ]]> + + + + \ No newline at end of file