diff --git a/phpgwapi/inc/class.egw.inc.php b/phpgwapi/inc/class.egw.inc.php
index 2a6f002858..c4e325caab 100644
--- a/phpgwapi/inc/class.egw.inc.php
+++ b/phpgwapi/inc/class.egw.inc.php
@@ -155,8 +155,6 @@
'/class.'.$class.'.inc.php');
$this->framework =& new $class;
- $this->load_theme_info();
-
$this->check_app_rights();
$this->load_optional_classes();
@@ -334,14 +332,14 @@
{
// This will need to use ACL in the future
if (!$GLOBALS['egw_info']['user']['apps'][$GLOBALS['egw_info']['flags']['currentapp']] ||
- ($GLOBALS['egw_info']['flags']['admin_only'] && !$GLOBALS['egw_info']['user']['apps']['admin']))
+ ($GLOBALS['egw_info']['flags']['admin_only'] && !$GLOBALS['egw_info']['user']['apps']['admin']))
{
$this->common->egw_header();
if ($GLOBALS['egw_info']['flags']['nonavbar'])
{
echo parse_navbar();
}
-
+ error_log('Permission denied, attempted to access '.$GLOBALS['egw_info']['flags']['currentapp']);
$this->log->write(array('text'=>'W-Permissions, Attempted to access %1','p1'=>$GLOBALS['egw_info']['flags']['currentapp']));
echo ''.lang('Access not permitted').'';
@@ -350,35 +348,6 @@
}
}
- /**
- * Load old theme info into egw_info[theme]
- *
- * @deprecated all theming should be done via CSS files of the template
- */
- function load_theme_info()
- {
- global $phpgw_info; // this is necesary as the included theme-files use $phpgw_info !!!
-
- // at the moment we still need the theme files, hopefully they are gone soon in favor of CSS
- if(@file_exists(EGW_SERVER_ROOT . '/phpgwapi/themes/' . $GLOBALS['egw_info']['user']['preferences']['common']['theme'] . '.theme'))
- {
- include($file = EGW_SERVER_ROOT . '/phpgwapi/themes/' . $GLOBALS['egw_info']['user']['preferences']['common']['theme'] . '.theme');
- }
- elseif(@file_exists(EGW_SERVER_ROOT . '/phpgwapi/themes/default.theme'))
- {
- include($file = EGW_SERVER_ROOT . '/phpgwapi/themes/default.theme');
- }
- else
- {
- // Hope we don't get to this point. Better then the user seeing a
- // complety back screen and not know whats going on
- echo '';
- $this->log->write(array('text'=>'F-Abort, No themes found'));
-
- exit;
- }
- }
-
/**
* create all the defines / constants of the eGW-environment (plus the deprecated phpgw ones)
*/
diff --git a/phpgwapi/themes/black.theme b/phpgwapi/themes/black.theme
deleted file mode 100644
index 2df5b4fc54..0000000000
--- a/phpgwapi/themes/black.theme
+++ /dev/null
@@ -1,47 +0,0 @@
-
diff --git a/phpgwapi/themes/heaven.theme b/phpgwapi/themes/heaven.theme
deleted file mode 100644
index ec4b7ec702..0000000000
--- a/phpgwapi/themes/heaven.theme
+++ /dev/null
@@ -1,46 +0,0 @@
- *
- * -------------------------------------------- *
- * This program is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU General Public License as published by the *
- * Free Software Foundation; either version 2 of the License, or (at your *
- * option) any later version. *
- \**************************************************************************/
-
- /* $Id$ */
-
- $phpgw_info['theme']['bg_color'] = '#000000';
- $phpgw_info['theme']['bg_text'] = '#00FF33';
- $phpgw_info['theme']['vlink'] = '#0000FF';
- $phpgw_info['theme']['alink'] = '#999999';
- $phpgw_info['theme']['link'] = '#0000FF';
- $phpgw_info['theme']['row_on'] = '#909090';
- $phpgw_info['theme']['row_off'] = '#808080';
- $phpgw_info['theme']['row_text'] = '#000000';
- $phpgw_info['theme']['th_bg'] = '#404040';
- $phpgw_info['theme']['th_text'] = '#00FF33';
- $phpgw_info['theme']['navbar_bg'] = '#00FF33';
- $phpgw_info['theme']['navbar_text'] = '#FFFFFF';
- $phpgw_info['theme']['table_bg'] = '#00FF33';
- $phpgw_info['theme']['table_text'] = '#FFFFFF';
- $phpgw_info['theme']['font'] = 'Helvetica';
- $phpgw_info['theme']['bg01'] = '#dadada';
- $phpgw_info['theme']['bg02'] = '#dad0d0';
- $phpgw_info['theme']['bg03'] = '#dacaca';
- $phpgw_info['theme']['bg04'] = '#dac0c0';
- $phpgw_info['theme']['bg05'] = '#dababa';
- $phpgw_info['theme']['bg06'] = '#dab0b0';
- $phpgw_info['theme']['bg07'] = '#daaaaa';
- $phpgw_info['theme']['bg08'] = '#da9090';
- $phpgw_info['theme']['bg09'] = '#da8a8a';
- $phpgw_info['theme']['bg10'] = '#da7a7a';
-
- // This one is for the calendar only
- $phpgw_info['theme']['cal_today'] = '#BFBFBF';
- $phpgw_info['theme']['cal_dayview'] = '#C0C0C0';
-
- // These are for the email only
- $phpgw_info['theme']['em_folder'] = '#808080';
- $phpgw_info['theme']['em_folder_text'] = '#000000';
-
diff --git a/phpgwapi/themes/purple.theme b/phpgwapi/themes/purple.theme
deleted file mode 100644
index f76270d19d..0000000000
--- a/phpgwapi/themes/purple.theme
+++ /dev/null
@@ -1,47 +0,0 @@
-