diff --git a/e107_admin/fileinspector.php b/e107_admin/fileinspector.php index 705254d2f..4a9630a5b 100755 --- a/e107_admin/fileinspector.php +++ b/e107_admin/fileinspector.php @@ -200,6 +200,12 @@ class fileinspector_ui extends e_admin_ui { /** @var file_inspector */ $fi =e107::getSingleton('file_inspector'); + if (!$fi instanceof file_inspector) + { + return 'Fatal error: Unable to instantiate file_inspector.'; + } + + return $fi->scan_config(); } @@ -1332,6 +1338,11 @@ function e_help() // $fi = new file_inspector; $fi = e107::getSingleton('file_inspector'); + if (!$fi instanceof file_inspector) + { + return ['caption' => FC_LAN_37, 'text' => 'Fatal error: Unable to instantiate file_inspector.']; // DO NOT TRANSLATE + } + $list = $fi->getLegend(); $text = ''; diff --git a/e107_tests/tests/acceptance/0001_AdminLoginCest.php b/e107_tests/tests/acceptance/0001_AdminLoginCest.php index 991e68ac9..ec9da58a5 100644 --- a/e107_tests/tests/acceptance/0001_AdminLoginCest.php +++ b/e107_tests/tests/acceptance/0001_AdminLoginCest.php @@ -78,59 +78,125 @@ class AdminLoginCest $urls = array( 'admin.php?[debug=basic+]', + 'admin_log.php', + 'admin_log.php?mode=audit&action=list', + 'admin_log.php?mode=main&action=maintenance', + 'admin_log.php?mode=main&action=prefs', + 'admin_log.php?mode=rolling&action=list', + 'administrator.php', + 'banlist.php', + 'banlist.php?mode=failed&action=list', + 'banlist.php?mode=main&action=create', + 'banlist.php?mode=main&action=options', + 'banlist.php?mode=main&action=times', + 'banlist.php?mode=main&action=transfer', + 'banlist.php?mode=white&action=create', + 'banlist.php?mode=white&action=list', 'cache.php', + 'comment.php', + 'comment.php?mode=main&action=prefs', + 'comment.php?mode=main&action=tools', + 'cpage.php', + 'cpage.php?mode=cat&action=create', + 'cpage.php?mode=cat&action=list', + 'cpage.php?mode=menu&action=list&tab=2', + 'cpage.php?mode=page&action=create', + 'cpage.php?mode=page&action=list', + 'cpage.php?mode=page&action=prefs', + 'credits.php', + 'cron.php', + 'db.php', + 'db.php?mode=backup', + 'db.php?mode=convert_to_utf8', + 'db.php?mode=db_update', + 'db.php?mode=exportForm', + 'db.php?mode=importForm', + 'db.php?mode=plugin_scan', + 'db.php?mode=pref_editor', + 'db.php?mode=sc_override_scan', + 'db.php?mode=verify_sql', + 'docs.php', 'emoticon.php', + 'eurl.php', + 'eurl.php?mode=main&action=alias', + 'eurl.php?mode=main&action=settings', + 'eurl.php?mode=main&action=simple', + 'fileinspector.php', 'frontpage.php', 'frontpage.php?mode=create', + 'history.php', + 'image.php', + 'image.php?mode=cat&action=create', + 'image.php?mode=cat&action=list', + 'image.php?mode=main&action=avatar', + 'image.php?mode=main&action=import', + 'image.php?mode=main&action=prefs', 'language.php', 'language.php?mode=main&action=db', - 'language.php?mode=main&action=tools', 'language.php?mode=main&action=deprecated', - 'meta.php', - 'prefs.php', - 'search.php', - 'search.php?settings', + 'language.php?mode=main&action=tools', 'links.php', 'links.php?mode=main&action=create', 'links.php?mode=main&action=prefs', 'links.php?mode=main&action=tools', - 'eurl.php', - 'eurl.php?mode=main&action=alias', - 'eurl.php?mode=main&action=simple', - 'eurl.php?mode=main&action=settings', - 'updateadmin.php', - 'administrator.php', - 'banlist.php', - 'banlist.php?mode=main&action=create', - 'banlist.php?mode=white&action=list', - 'banlist.php?mode=white&action=create', - 'banlist.php?mode=failed&action=list', - 'banlist.php?mode=main&action=transfer', - 'banlist.php?mode=main&action=times', - 'banlist.php?mode=main&action=options', - 'users_extended.php', - 'users_extended.php?mode=main&action=add', - 'users_extended.php?mode=main&action=create', - 'users_extended.php?mode=cat&action=list', - 'users_extended.php?mode=cat&action=create', 'mailout.php', - 'mailout.php?mode=main&action=create', - 'mailout.php?mode=recipients&action=list', - 'mailout.php?mode=pending&action=list', 'mailout.php?mode=held&action=list', - 'mailout.php?mode=sent&action=list', - 'mailout.php?mode=prefs&action=prefs', - 'mailout.php?mode=maint&action=maint', + 'mailout.php?mode=main&action=create', + 'mailout.php?mode=main&action=preview&id=notify', + 'mailout.php?mode=main&action=preview&id=quickadduser', + 'mailout.php?mode=main&action=preview&id=signup', + 'mailout.php?mode=main&action=preview&id=whatsnew', 'mailout.php?mode=main&action=templates', + 'mailout.php?mode=maint&action=maint', + 'mailout.php?mode=pending&action=list', + 'mailout.php?mode=prefs&action=prefs', + 'mailout.php?mode=recipients&action=list', + 'mailout.php?mode=sent&action=list', + 'menus.php', + 'menus.php?configure=sidebar', + 'meta.php', + 'newspost.php', + 'newspost.php?mode=cat&action=create', + 'newspost.php?mode=cat&action=list', + 'newspost.php?mode=main&action=create', + 'newspost.php?mode=main&action=prefs', + 'newspost.php?mode=sub&action=list', + 'notify.php', + 'phpinfo.php', + 'plugin.php', + 'plugin.php?mode=avail&action=list', + 'plugin.php?mode=avail&action=upload', + 'plugin.php?mode=create&action=build', + 'plugin.php?mode=online&action=grid', + 'prefs.php', + 'search.php', + 'search.php?settings', + 'theme.php', + 'theme.php?mode=convert&action=main', + 'theme.php?mode=main&action=admin', + 'theme.php?mode=main&action=choose', + 'theme.php?mode=main&action=online', + 'theme.php?mode=main&action=upload', + 'ugflag.php', + 'updateadmin.php', + 'upload.php', 'userclass2.php', 'userclass2.php?mode=main&action=create', 'userclass2.php?mode=main&action=initial', 'userclass2.php?mode=main&action=options', 'users.php', 'users.php?mode=main&action=add', + 'users.php?mode=main&action=maintenance', 'users.php?mode=main&action=prefs', 'users.php?mode=ranks&action=list', - 'users.php?mode=main&action=maintenance' + 'users_extended.php', + 'users_extended.php?mode=cat&action=create', + 'users_extended.php?mode=cat&action=list', + 'users_extended.php?mode=main&action=add', + 'users_extended.php?mode=main&action=create', + 'wmessage.php', + 'wmessage.php?mode=main&action=create', + 'wmessage.php?mode=main&action=prefs' ); foreach($urls as $url)