Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1667) +++ branches/2.8.x/CHANGELOG (revision 1668) @@ -11,6 +11,10 @@ ! = Update/Change =============================================================================== +17 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne) +! settigs.php add fields dev_infos and page_icon_dir ++ add developer info to footer +! update class.admin.php, footer.htt 17 Apr-2012 Build 1667 Dietmar Woellbrink (Luisehahne) + add folder /templates/round/title_images to work with page_icon 17 Apr-2012 Build 1666 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/skel/themes/htt/footer.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/footer.htt (revision 1667) +++ branches/2.8.x/wb/admin/skel/themes/htt/footer.htt (revision 1668) @@ -13,6 +13,23 @@ + +
+
+ Memory Limit: {FILESIZE} |  + Used Memory: {MEMORY} |  + SQL-Queries executed: {QUERIES} |  + Included {INCLUDES} files  | {TXT_SUM_FILESIZE}{SUM_FILESIZE} + + + +
+
+ {BACKEND_BODY_MODULE_JS} Index: branches/2.8.x/wb/admin/skel/themes/htt/settings.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/settings.htt (revision 1667) +++ branches/2.8.x/wb/admin/skel/themes/htt/settings.htt (revision 1668) @@ -6,37 +6,37 @@ {FTAN} - +
- + - - - - - @@ -43,7 +43,7 @@ - - - - - - - - - - - - @@ -163,7 +163,7 @@ - - - + - - - - + - - - - - - - - - - + - - - - - - - - - - - @@ -383,20 +383,20 @@ - - - + - - - -

{HEADING_GENERAL_SETTINGS}

{HEADING_GENERAL_SETTINGS}
{TEXT_WEBSITE_TITLE}: +
{TEXT_WEBSITE_DESCRIPTION}: +
{TEXT_WEBSITE_KEYWORDS}: +
{TEXT_WEBSITE_HEADER}: +
{TEXT_WEBSITE_FOOTER}: +
{TEXT_PAGE_LEVEL_LIMIT}: +
{TEXT_PAGE_TRASH}: + @@ -68,7 +68,7 @@ {TEXT_PAGE_LANGUAGES}: + @@ -77,7 +77,7 @@
{TEXT_MULTIPLE_MENUS}: + @@ -87,7 +87,7 @@
{TEXT_HOME_FOLDERS}: + @@ -97,7 +97,7 @@ {TEXT_MANAGE_SECTIONS}: + @@ -106,7 +106,7 @@
{TEXT_SECTION_BLOCKS}: + @@ -116,7 +116,7 @@
{TEXT_INTRO_PAGE}: + @@ -126,7 +126,7 @@ {TEXT_HOMEPAGE_REDIRECTION}: + @@ -135,7 +135,7 @@
{TEXT_SMART_LOGIN}: + @@ -145,7 +145,7 @@
{TEXT_LOGIN}: + @@ -155,7 +155,7 @@ {TEXT_REDIRECT_AFTER}: +
{TEXT_SIGNUP}: + {TEXT_PHP_ERROR_LEVEL}: + {TEXT_WYSIWYG_STYLE}:
{TEXT_WYSIWYG_EDITOR}: +
  + +

{HEADING_DEFAULT_SETTINGS}

{HEADING_DEFAULT_SETTINGS}
{TEXT_LANGUAGE}: + {TEXT_CHARSET}: +
{TEXT_TIMEZONE}: +
{TEXT_DATE_FORMAT}: +
{TEXT_TIME_FORMAT}: +
{TEXT_TEMPLATE}: +
{TEXT_THEME}: +
  + +

{HEADING_SEARCH_SETTINGS}

{HEADING_SEARCH_SETTINGS}
{TEXT_VISIBILITY}: +
{TEXT_TEMPLATE}: + {TEXT_HEADER}: +
{TEXT_RESULTS_HEADER}: +
{TEXT_RESULTS_LOOP}: +
{TEXT_RESULTS_FOOTER}: +
{TEXT_NO_RESULTS}: +
{TEXT_FOOTER}: +
{TEXT_MODULE_ORDER}: +
{TEXT_MAX_EXCERPT}: +
{TEXT_TIME_LIMIT}: +
  + +

{HEADING_SERVER_SETTINGS}

{HEADING_SERVER_SETTINGS}
{TEXT_SERVER_OPERATING_SYSTEM}: + @@ -405,7 +405,7 @@
 
 +
{TEXT_FILESYSTEM_PERMISSIONS}:
 + - + @@ -462,10 +462,10 @@
{TEXT_FILES}: {STRING_FILE_MODE}{TEXT_FILES}: {STRING_FILE_MODE}
{TEXT_USER}:
 + - + @@ -508,36 +508,54 @@ + + + + + + + - + + + + + - + - + - + - + - + - + - @@ -544,15 +562,15 @@ - + - + - - + - + - @@ -578,20 +596,20 @@ - + - + - - Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1667) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1668) @@ -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', '1667'); +if(!defined('REVISION')) define('REVISION', '1668'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/settings/index.php =================================================================== --- branches/2.8.x/wb/admin/settings/index.php (revision 1667) +++ branches/2.8.x/wb/admin/settings/index.php (revision 1668) @@ -397,6 +397,14 @@ $template->set_var('WINDOWS_SELECTED', ' checked="checked"'); } + // Work-out if developer infos feature is enabled + if(defined('DEV_INFOS') && DEV_INFOS == true) + { + $template->set_var('DEV_INFOS_ENABLED', ' checked="checked"'); + } else { + $template->set_var('DEV_INFOS_DISABLED', ' checked="checked"'); + } + // Work-out if manage sections feature is enabled if(MANAGE_SECTIONS) { @@ -581,6 +589,7 @@ $template->set_var(array( 'PAGES_DIRECTORY' => PAGES_DIRECTORY, + 'PAGE_ICON_DIR' => PAGE_ICON_DIR, 'MEDIA_DIRECTORY' => MEDIA_DIRECTORY, 'PAGE_EXTENSION' => PAGE_EXTENSION, 'PAGE_SPACER' => PAGE_SPACER, @@ -653,7 +662,10 @@ 'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'], 'TEXT_SIGNUP' => $TEXT['SIGNUP'], 'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'], + 'TEXT_MULTILINGUAL' => $TEXT['MULTILINGUAL'], + 'TEXT_DEV_INFOS' => $TEXT['DEV_INFOS'], 'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'], + 'TEXT_PAGE_ICON_DIR' => $TEXT['PAGE_ICON_DIR'], 'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'], 'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'], 'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'], Index: branches/2.8.x/wb/framework/class.admin.php =================================================================== --- branches/2.8.x/wb/framework/class.admin.php (revision 1667) +++ branches/2.8.x/wb/framework/class.admin.php (revision 1668) @@ -187,6 +187,7 @@ // Print the admin footer function print_footer($activateJsAdmin = false) { + global $database; // include the required file for Javascript admin if($activateJsAdmin != false) { if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php')){ @@ -204,6 +205,49 @@ 'ADMIN_URL' => ADMIN_URL, 'THEME_URL' => THEME_URL, ) ); + + $footer_template->set_block('footer_block', 'show_debug_block', 'show_debug'); + + $bDebug = (defined('DEBUG') ? true : false); + $bDevInfo = (defined('DEV_INFOS') && (DEV_INFOS == true) && (1 == $this->get_user_id()) ? true : false); +// if( $debug && (1 == $this->get_user_id())) + if( $bDevInfo ) + { + $footer_template->set_var('MEMORY', number_format(memory_get_peak_usage(), 0, ',', '.').' Byte' ); + $footer_template->set_var('QUERIES', $database->getQueryCount ); + // $footer_template->set_var('QUERIES', 'disabled' ); + $included_files = get_included_files(); + $footer_template->set_var('INCLUDES', sizeof($included_files) ); + + $sum_filesize = 0; + $footer_template->set_block('show_debug_block', 'show_block_list', 'show_list'); + $footer_template->set_block('show_block_list', 'include_block_list', 'include_list'); + // $debug = true; + foreach($included_files as $filename) + { + if($bDebug) + { + $footer_template->set_var('INCLUDES_ARRAY', str_replace(WB_PATH, '',$filename) ); + $footer_template->set_var('FILESIZE', number_format(filesize($filename), 0, ',', '.').' Byte'); + $footer_template->parse('include_list', 'include_block_list', true); + } + $sum_filesize += filesize($filename); + } + $footer_template->parse('show_list', 'show_block_list', true); + + if($bDebug) + { + $footer_template->parse('include_list', ''); + $footer_template->parse('show_list', ''); + } + + $footer_template->set_var('FILESIZE', ini_get('memory_limit')); + $footer_template->set_var('TXT_SUM_FILESIZE', 'Summary size of included files: '); + $footer_template->set_var('SUM_FILESIZE', number_format($sum_filesize, 0, ',', '.').' Byte'); + $footer_template->parse('show_debug', 'show_debug_block', true); + } else { + $footer_template->parse('show_debug', ''); + } $footer_template->parse('header', 'footer_block', false); $footer_template->pparse('output', 'page'); } Index: branches/2.8.x/wb/templates/wb_theme/templates/footer.htt =================================================================== --- branches/2.8.x/wb/templates/wb_theme/templates/footer.htt (revision 1667) +++ branches/2.8.x/wb/templates/wb_theme/templates/footer.htt (revision 1668) @@ -13,6 +13,23 @@
{TEXT_DIRECTORIES}: {STRING_DIR_MODE}{TEXT_DIRECTORIES}: {STRING_DIR_MODE}
{TEXT_USER}:
{TEXT_DEV_INFOS}: + + + + +
{TEXT_PAGES_DIRECTORY}:
{TEXT_PAGE_ICON_DIR}: + +
{TEXT_MEDIA_DIRECTORY}:
{TEXT_PAGE_EXTENSION}:
{TEXT_PAGE_SPACER}:
{TEXT_RENAME_FILES_ON_UPLOAD}:
{TEXT_SESSION_IDENTIFIER}:
{TEXT_SEC_ANCHOR}:
+

{HEADING_WBMAILER_SETTINGS}

{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}

{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:
{TEXT_WBMAILER_DEFAULT_SENDER_NAME}:
{TEXT_WBMAILER_FUNCTION}: + @@ -561,16 +579,16 @@

{TEXT_WBMAILER_NOTICE}

{TEXT_WBMAILER_NOTICE}
{TEXT_WBMAILER_SMTP_HOST}:
{TEXT_WBMAILER_SMTP_AUTH}: +
{TEXT_WBMAILER_SMTP_USERNAME}:
{TEXT_WBMAILER_SMTP_PASSWORD}:
  + +
+ +
+
+ Memory Limit: {FILESIZE} |  + Used Memory: {MEMORY} |  + SQL-Queries executed: {QUERIES} |  + Included {INCLUDES} files  | {TXT_SUM_FILESIZE}{SUM_FILESIZE} + +
    + +
  • {INCLUDES_ARRAY} ({FILESIZE})
    • + +
+ +
+
+ {BACKEND_BODY_MODULE_JS} Index: branches/2.8.x/wb/templates/argos_theme/templates/footer.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/footer.htt (revision 1667) +++ branches/2.8.x/wb/templates/argos_theme/templates/footer.htt (revision 1668) @@ -14,7 +14,23 @@
+ +
+
+ Memory Limit: {FILESIZE} |  + Used Memory: {MEMORY} |  + SQL-Queries executed: {QUERIES} |  + Included {INCLUDES} files  | {TXT_SUM_FILESIZE}{SUM_FILESIZE} + + + +
+ {BACKEND_BODY_MODULE_JS}