Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1907) +++ branches/2.8.x/CHANGELOG (revision 1908) @@ -11,6 +11,12 @@ ! = Update/Change =============================================================================== + +07 Jun-2013 Build 1908 Dietmar Woellbrink (Luisehahne) +! class.admin.php corrected url_help, + add Translat::disableAddon() in methode print_footer +! frontend.functions.php page_content() set $sSectionIdPrefix to the right format +! functions.php change get_parent_titles from menu_title to filename 07 Jun-2013 Build 1907 Dietmar Woellbrink (Luisehahne) ! update headerinfo 06 Jun-2013 Build 1906 Werner v.d.Decken(DarkViper) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1907) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1908) @@ -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', '1907'); +if(!defined('REVISION')) define('REVISION', '1908'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/class.admin.php =================================================================== --- branches/2.8.x/wb/framework/class.admin.php (revision 1907) +++ branches/2.8.x/wb/framework/class.admin.php (revision 1908) @@ -4,13 +4,13 @@ * @category backend * @package framework * @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$ * */ @@ -202,7 +202,7 @@ 'LOGIN_LINK' => $_SERVER['SCRIPT_NAME'], 'LOGIN_ICON' => 'login', 'START_ICON' => 'blank', - 'URL_HELP' => 'http://www.websitebaker2.org'.$HelpUrl, + 'URL_HELP' => 'http://www.websitebaker.org'.$HelpUrl, 'BACKEND_MODULE_CSS' => $this->register_backend_modfiles('css'), // adds backend.css 'BACKEND_MODULE_JS' => $this->register_backend_modfiles('js') // adds backend.js ) @@ -294,6 +294,8 @@ // Print the admin footer function print_footer($activateJsAdmin = false) { global $database,$starttime,$iPhpDeclaredClasses; + $oTrans = Translate::getInstance(); + $oTrans->disableAddon(); // include the required file for Javascript admin if($activateJsAdmin == true) { if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php')){ Index: branches/2.8.x/wb/framework/frontend.functions.php =================================================================== --- branches/2.8.x/wb/framework/frontend.functions.php (revision 1907) +++ branches/2.8.x/wb/framework/frontend.functions.php (revision 1908) @@ -4,13 +4,13 @@ * @category framework * @package frontend.functions * @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 + * @platform WebsiteBaker 2.8.4 * @requirements PHP 5.2.2 and higher * @version $Id$ - * @filesource $HeadURL$ + * @filesource $HeadURL$ * @lastmodified $Date$ * */ @@ -305,11 +305,11 @@ // check if module exists - feature: write in errorlog if(file_exists(WB_PATH.'/modules/'.$module.'/view.php')) { // fetch content -- this is where to place possible output-filters (before highlighting) - ob_start(); // fetch original content - $sectionAnchor = (defined('SEC_ANCHOR') && SEC_ANCHOR!='') ? SEC_ANCHOR.$section_id : 'section_'.$section_id; - echo "\n".'
'."\n"; + ob_start(); // fetch original content
+ $sSectionIdPrefix = (defined( 'SEC_ANCHOR' ) && SEC_ANCHOR!='') ? SEC_ANCHOR : 'Sec'; + echo ($sSectionIdPrefix =='none') ? '' : "\n".'
'."\n"; require(WB_PATH.'/modules/'.$module.'/view.php'); - echo "\n".'
'."\n"; + echo ($sSectionIdPrefix =='none') ? '' : "\n".'
'."\n"; $content = ob_get_clean(); } else { continue; @@ -330,7 +330,7 @@ } else { require(PAGE_CONTENT); } - return $retVal; + return $retVal; } } @@ -386,7 +386,6 @@ print $show_crumb; break; } - if ( ( $counter <> $total_crumbs-1 ) ) { print ''.$sep.''; @@ -626,12 +625,7 @@ } } // include the Javascript email protection function - if( $file_id != 'css' && file_exists(WB_PATH .'/modules/droplets/js/mdcr.js')) - { - $head_links .= ''."\n"; - } - elseif( $file_id != 'css' && file_exists(WB_PATH .'/modules/output_filter/js/mdcr.js')) - { + if( $file_id != 'css' && file_exists(WB_PATH .'/modules/output_filter/js/mdcr.js')) { $head_links .= ''."\n"; } } Index: branches/2.8.x/wb/framework/functions.php =================================================================== --- branches/2.8.x/wb/framework/functions.php (revision 1907) +++ branches/2.8.x/wb/framework/functions.php (revision 1908) @@ -4,10 +4,10 @@ * @category frontend * @package framework * @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 + * @platform WebsiteBaker 2.8.4 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL$ @@ -525,11 +525,22 @@ $menu_title = $database->get_one($sql); return $menu_title; } +// Function to get a pages filename in sub +function get_sub_filename($id) +{ + $database = WbDatabase::getInstance(); + // Get title + $sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` ' + .'WHERE `page_id` = '.$id.' ' + . 'AND `level`>=0'; + $sRetval = basename($database->get_one($sql)); + return $sRetval; +} // Function to get all parent page titles function get_parent_titles($parent_id) { - $titles[] = get_menu_title($parent_id); + $titles[] = get_sub_filename($parent_id); if(is_parent($parent_id) != false) { $parent_titles = get_parent_titles(is_parent($parent_id)); $titles = array_merge($titles, $parent_titles); @@ -660,7 +671,7 @@ global $admin, $MESSAGE; $retVal = array(); $wb_path = rtrim(str_replace('\/\\', '/', WB_PATH), '/'); - if( ($sAbsDir=='') || ($sAbsDir == $wb_path) ) { return $retVal;} + if( ($sAbsDir=='') || ($sAbsDir == $wb_path) ) { return $retVal;} if ( $make_dir==true ) { // Check to see if the folder already exists @@ -675,6 +686,9 @@ return $retVal; } +//$retVal[] = $sAbsDir; +//return $retVal; + if( is_writable($sAbsDir) ) { // if(file_exists($sAbsDir.'/index.php')) { unlink($sAbsDir.'/index.php'); } @@ -681,7 +695,6 @@ // Create default "index.php" file $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'; $content = '