diff --git a/e107_admin/admin.php b/e107_admin/admin.php index 1002dfc5f..3fbb76429 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -88,6 +88,7 @@ class admin_start $this->checkIncompatiblePlugins(); $this->checkFileTypes(); $this->checkSuspiciousFiles(); + $this->checkDeprecated(); } @@ -147,6 +148,40 @@ class admin_start } + + function checkDeprecated() + { + $deprecated = array( + e_ADMIN."ad_links.php", + e_PLUGIN."tinymce4/e_meta.php", e_THEME."bootstrap3/css/bootstrap_dark.css", + e_PLUGIN."search_menu/languages/English.php", + e_LANGUAGEDIR."English/lan_parser_functions.php", + e_HANDLER."np_class.php", + e_CORE."shortcodes/single/user_extended.sc", + e_ADMIN."download.php" + ); + + $found = array(); + foreach($deprecated as $path) + { + if(file_exists($path)) + { + $found[] = $path; + } + + + } + + if(!empty($found)) + { + $text = "The following old files can be safely deleted from your system: "; + $text .= ""; + + e107::getMessage()->addWarning($text); + } + + } + function checkFileTypes() { diff --git a/e107_admin/auth.php b/e107_admin/auth.php index aa940e6cc..e27082bea 100644 --- a/e107_admin/auth.php +++ b/e107_admin/auth.php @@ -26,7 +26,7 @@ define('e_CAPTCHA_FONTCOLOR','#F9A533'); $core = e107::getConfig('core'); if($core->get('admintheme') != 'bootstrap' && $core->get('admintheme') != 'bootstrap3') { - $core->update('admintheme','bootstrap'); + $core->update('admintheme','bootstrap3'); $core->update('adminstyle','infopanel'); $core->update('admincss','admin_dark.css'); $core->set('e_jslib_core',array('prototype' => 'none', 'jquery'=> 'auto')); diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index 0627fbd53..445aa42f2 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -9,7 +9,7 @@ 0 infopanel - bootstrap + bootstrap3 0 2 0 diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index 6185719ba..8cdb8f0e1 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -53,7 +53,7 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; } .carousel-indicators { top:10px; max-width: 200px; height: 40px; margin-left: 100px; } -li.divider { padding-top: 10px; border-bottom: 1px outset #262626; margin-bottom: 10px; } +#admin-ui-nav-menu li.divider { padding-top: 10px; border-bottom: 1px outset #262626; margin-bottom: 10px; } /* TODO - use col-xx-x markup where core-mainpanel-block occurs. ? */ @media (max-width: 1700px){