Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1906) +++ branches/2.8.x/CHANGELOG (revision 1907) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +07 Jun-2013 Build 1907 Dietmar Woellbrink (Luisehahne) +! update headerinfo 06 Jun-2013 Build 1906 Werner v.d.Decken(DarkViper) + new Method Password::isValid() checks a new password for invalid characters 01 Jun-2013 Build 1905 Werner v.d.Decken(DarkViper) Index: branches/2.8.x/wb/admin/groups/delete.inc.php =================================================================== --- branches/2.8.x/wb/admin/groups/delete.inc.php (revision 1906) +++ branches/2.8.x/wb/admin/groups/delete.inc.php (revision 1907) @@ -4,13 +4,13 @@ * @package groups * @author Independend-Software-Team * @author WebsiteBaker Project - * @copyright 2009-2012, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description all basic actions of this module, called by dispatcher only. */ Index: branches/2.8.x/wb/admin/groups/groups_list.inc.php =================================================================== --- branches/2.8.x/wb/admin/groups/groups_list.inc.php (revision 1906) +++ branches/2.8.x/wb/admin/groups/groups_list.inc.php (revision 1907) @@ -3,13 +3,13 @@ * @category admin * @package groups * @author WebsiteBaker Project, Independend-Software-Team - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description all basic actions of this module, called by dispatcher only. */ Index: branches/2.8.x/wb/admin/groups/groups_mask.inc.php =================================================================== --- branches/2.8.x/wb/admin/groups/groups_mask.inc.php (revision 1906) +++ branches/2.8.x/wb/admin/groups/groups_mask.inc.php (revision 1907) @@ -3,13 +3,13 @@ * @category admin * @package groups * @author WebsiteBaker Project. Independend-Software-Team - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description all basic actions of this module, called by dispatcher only. */ Index: branches/2.8.x/wb/admin/groups/upgradePermissions.php =================================================================== --- branches/2.8.x/wb/admin/groups/upgradePermissions.php (revision 1906) +++ branches/2.8.x/wb/admin/groups/upgradePermissions.php (revision 1907) @@ -4,13 +4,13 @@ * @category admin * @package start * @author Ryan Djurovich, WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ Index: branches/2.8.x/wb/admin/groups/save.inc.php =================================================================== --- branches/2.8.x/wb/admin/groups/save.inc.php (revision 1906) +++ branches/2.8.x/wb/admin/groups/save.inc.php (revision 1907) @@ -3,13 +3,13 @@ * @category admin * @package groups * @author WebsiteBaker Project, Independend-Software-Team - * @copyright 2009-2012, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, Website Baker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description all basic actions of this module, called by dispatcher only. */ Index: branches/2.8.x/wb/admin/groups/index.php =================================================================== --- branches/2.8.x/wb/admin/groups/index.php (revision 1906) +++ branches/2.8.x/wb/admin/groups/index.php (revision 1907) @@ -4,13 +4,13 @@ * @category admin * @package groups * @author Ryan Djurovich, WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * @description action dispatcher of this module. * Index: branches/2.8.x/wb/admin/start/index.php =================================================================== --- branches/2.8.x/wb/admin/start/index.php (revision 1906) +++ branches/2.8.x/wb/admin/start/index.php (revision 1907) @@ -4,13 +4,13 @@ * @category admin * @package start * @author Ryan Djurovich (2004-2009), WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -60,6 +60,7 @@ } // --------------------------------------- // check if it is neccessary to start the uograde-script + $msg = ''; $msg .= (is_readable(WB_PATH.'/install/')) ? $MESSAGE['START_INSTALL_DIR_EXISTS'].'
' : $msg; $msg .= (is_readable(WB_PATH.'/upgrade-script.php')) ? $MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'
' : ''; Index: branches/2.8.x/wb/admin/pages/sections_save.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections_save.php (revision 1906) +++ branches/2.8.x/wb/admin/pages/sections_save.php (revision 1907) @@ -6,8 +6,8 @@ * @subpackage pages * @author Ryan Djurovich, WebsiteBaker Project * @copyright 2004-2009, Ryan Djurovich - * @copyright 2009-2012, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1906) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1907) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1906'); +if(!defined('REVISION')) define('REVISION', '1907'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/class.wb.php =================================================================== --- branches/2.8.x/wb/framework/class.wb.php (revision 1906) +++ branches/2.8.x/wb/framework/class.wb.php (revision 1907) @@ -4,13 +4,13 @@ * @category framework * @package frontend * @author Ryan Djurovich (2004-2009), WebsiteBaker Project - * @copyright 2009-2012, WebsiteBaker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ Index: branches/2.8.x/wb/modules/menu_link/modify.php =================================================================== --- branches/2.8.x/wb/modules/menu_link/modify.php (revision 1906) +++ branches/2.8.x/wb/modules/menu_link/modify.php (revision 1907) @@ -4,13 +4,13 @@ * @category modules * @package menu_link * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2009-2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -85,9 +85,9 @@ $table_s = TABLE_PREFIX."sections"; foreach($links as $pid=>$l) { if($query_section = $database->query("SELECT section_id, module FROM $table_s WHERE page_id = '$pid' ORDER BY position")) { - while($section = $query_section->fetchRow()) { + while($section = $query_section->fetchRow(MYSQL_ASSOC)) { // get section-anchor - if(defined('SEC_ANCHOR') && SEC_ANCHOR!='') { + if(defined('SEC_ANCHOR') && SEC_ANCHOR!='none') { $targets[$pid][] = SEC_ANCHOR.$section['section_id']; } else { $targets[$pid] = array(); Index: branches/2.8.x/wb/modules/output_filter/filter-routines.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/filter-routines.php (revision 1906) +++ branches/2.8.x/wb/modules/output_filter/filter-routines.php (revision 1907) @@ -4,13 +4,13 @@ * @category modules * @package output_filter * @author Christian Sommer, WB-Project, Werner v.d. Decken - * @copyright 2011, Website Baker Org. e.V. - * @link http://www.websitebaker2.org/ + * @copyright 2013, WebsiteBaker Org. e.V. + * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.2 + * @platform WebsiteBaker 2.8.4 * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ Index: branches/2.8.x/wb/modules/output_filter/js/mdcr.js =================================================================== --- branches/2.8.x/wb/modules/output_filter/js/mdcr.js (revision 1906) +++ branches/2.8.x/wb/modules/output_filter/js/mdcr.js (revision 1907) @@ -1,6 +1,6 @@ /** * - * @copyright 2009-2012, WebsiteBaker Org. e.V. + * @copyright 2009-2013, WebsiteBaker Org. e.V. * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.4 Index: branches/2.8.x/wb/modules/output_filter/index.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/index.php (revision 1906) +++ branches/2.8.x/wb/modules/output_filter/index.php (revision 1907) @@ -4,10 +4,10 @@ * @category modules * @package output_filter * @author Christian Sommer, WB-Project, Werner v.d. Decken - * @copyright 2011, WebsiteBaker Org. e.V. + * @copyright 2013, WebsiteBaker Org. e.V. * @link http://www.websitebaker.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.2 + * @platform WebsiteBaker 2.8.4 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL$