Major backend reorganization - moved much of backend.php into build class, reformated bundlers to be the same format as modules, fixed build status tracking to be properly resumable throughout the process (except stages that create files that get in their own way); etc.

2 files changed, 3 insertions, 9 deletions

diff --git a/shared/include/defaults.php b/shared/include/defaults.php
index ced0e01..95cbfc2 100644
--- a/shared/include/defaults.php
+++ b/shared/include/defaults.php
@@ -14,10 +14,8 @@ foreach (glob(FRONTEND.'/modules/*.info') as $module) {
 }
 $modules=implode(' ', $modules);
 $bundlers=array();
-foreach (glob(BACKEND.'/bundlers/*.php') as $bundler) {
-	$bundler=basename($bundler);
-	$bundlers[]=substr($bundler, 0, strlen($bundler)-4);
-}
+foreach (glob(BACKEND.'/bundlers/*/bundle.php') as $bundler)
+	$bundlers[]=basename(dirname($bundler));
 $bundlers=implode(' ', $bundlers);
 $cookiename='ingenueid';
 $sessionlength=1814400;
@@ -25,7 +23,6 @@ $mod_rewrite=true;
 $timezone_root='/usr/share/zoneinfo';
 $emailfrom='noreply@noreply.net';
 $check_email_dns=false;
-$split_setup=true;
 $registration=false;
 $invite='admin';
 $logview_max=1000;
diff --git a/shared/include/includes.php b/shared/include/includes.php
index 410177f..8a75b58 100644
--- a/shared/include/includes.php
+++ b/shared/include/includes.php
@@ -9,9 +9,6 @@ foreach (array('functions', 'classes') as $type) {
 		}
 	}
 }
-$includes=($_SERVER['DOCUMENT_ROOT']?FRONTEND:BACKEND).'/include/includes.php';
-if (is_readable($includes))
-	require_once($includes);
-unset($dir, $file, $type, $includes);
+unset($dir, $file, $type);
 load_config();
 ?>