Eliminated the need for devmode.php.

drlippman · May 14, 2018 · 8ed5478 · 8ed5478
1 parent 5731a2d
commit 8ed5478
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/config.php.dist b/config.php.dist
@@ -4,6 +4,9 @@
 	//created automatically by install.php
   //(c) 2006 David Lippman
 
+  //uncomment the following line for development
+  //$GLOBALS['environment'] = 'development';
+
   //these settings must be editted before running dbsetup.php
   $dbserver = "localhost";  		//database server
   $dbname = "imas";			//database name

diff --git a/devmode.php.dist b/devmode.php.dist
diff --git a/init.php b/init.php
@@ -1,10 +1,5 @@
 <?php
 
-// Development dependencies
-if (file_exists(__DIR__ . '/devmode.php')) {
-	require_once(__DIR__ . "/devmode.php");
-}
-
 require_once(__DIR__ . "/includes/sanitize.php");
 
 // Load site config.
@@ -18,6 +13,12 @@
 
 require_once(__DIR__ . "/config.php");
 
+// Development dependencies
+if (isset($GLOBALS['environment']) && 'development' == $GLOBALS['environment']) {
+	require_once(__DIR__ . '/vendor/autoload.php');
+	require_once(__DIR__ . '/c3.php');
+}
+
 // Store PHP sessions in the database.
 require_once(__DIR__ . "/includes/session.php");
 if (!isset($use_local_sessions)) {