diff --git a/README.md b/README.md index 41bc072..c1b039b 100755 --- a/README.md +++ b/README.md @@ -23,18 +23,29 @@ Features: When you see a - in front of a task that means it is a possibility but we aren't sure we will add it yet. +Current Tasks: + +* Convert codiad to database save instead of file save. + - Projects + - Settings + - Users +* Add in new admin interface + - Group Management + - Permissions Management + - Plugin Management + - Project Management + - System Settigns + - User Management + Task List: * Add ability to login with LDAP. -* Add ability to save users in database. * Add custom market. * Add if file could not be saved 5 times close the open file. * Add multi level users. ( Projects for only certain groups, Permission levels ) * Add mobile compatibility. * Clean up Collaborative compatibility. * Clean up update script. -* Fix [WangYihangs execution exploit](https://github.com/WangYihang/Codiad-Remote-Code-Execute-Exploit). -* Fix site settings identification issue. Completed: diff --git a/admin/index.php b/admin.php similarity index 58% rename from admin/index.php rename to admin.php index 38b9a14..cd4b854 100755 --- a/admin/index.php +++ b/admin.php @@ -11,9 +11,35 @@ * */ -require_once( '../common.php' ); -require_once( './assets/classes/initialize.php' ); +ini_set('display_errors', 1); +ini_set('display_startup_errors', 1); +error_reporting(E_ALL); + +require_once( './common.php' ); +require_once( './admin/assets/classes/initialize.php' ); new initialize(); + +// Read Components, Plugins, Themes +$components = Common::readDirectory( COMPONENTS ); +$plugins = Common::readDirectory( PLUGINS ); +$themes = Common::readDirectory( THEMES ); + +// Theme +$theme = THEME; +if( isset( $_SESSION['theme'] ) ) { + + $theme = $_SESSION['theme']; +} + +// Get Site name if set +if( defined( "SITE_NAME" ) && ! ( SITE_NAME === "" || SITE_NAME === null ) ) { + + $site_name = SITE_NAME; +} else { + + $site_name = "Codiad"; +} + ?> @@ -23,7 +49,12 @@ new initialize();