diff --git a/TestRunner.php b/TestRunner.php index 71fe53e..bc83ff2 100644 --- a/TestRunner.php +++ b/TestRunner.php @@ -5,11 +5,11 @@ require_once('recess/lib/simpletest/mock_objects.php'); require_once('recess/lib/simpletest/unit_tester.php'); -$_ENV['dir.documentRoot'] = str_replace('\\','/',realpath(dirname(__FILE__))) . '/'; +$_ENV['dir.bootstrap'] = str_replace('\\','/',realpath(dirname(__FILE__))) . '/'; $_ENV['url.base'] = str_replace('TestRunner.php', '', $_SERVER['PHP_SELF']); -$_ENV['dir.recess'] = $_ENV['dir.documentRoot'] . 'recess/'; -$_ENV['dir.apps'] = $_ENV['dir.documentRoot'] . 'apps/'; +$_ENV['dir.recess'] = $_ENV['dir.bootstrap'] . 'recess/'; +$_ENV['dir.apps'] = $_ENV['dir.bootstrap'] . 'apps/'; $_ENV['dir.test'] = $_ENV['dir.recess'] . 'test/'; $_ENV['dir.temp'] = $_ENV['dir.recess'] . 'temp/'; $_ENV['dir.lib'] = $_ENV['dir.recess'] . 'lib/'; diff --git a/bootstrap.php b/bootstrap.php index 22cb7c8..d4f6566 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -4,7 +4,7 @@ * * @author Kris Jordan */ -$_ENV['dir.documentRoot'] = str_replace('\\','/',realpath(dirname(__FILE__))) . '/'; +$_ENV['dir.bootstrap'] = str_replace('\\','/',realpath(dirname(__FILE__))) . '/'; $_ENV['url.base'] = str_replace('bootstrap.php', '', $_SERVER['PHP_SELF']); $bootstrapped = true; diff --git a/recess-conf.php b/recess-conf.php index 0d80216..f6bd364 100644 --- a/recess-conf.php +++ b/recess-conf.php @@ -1,34 +1,36 @@ array('sqlite:' . $_ENV['dir.documentRoot'] . 'recess/sqlite/default.db') + = array( // 'name' => array('sqlite:' . $_ENV['dir.bootstrap'] . 'recess/sqlite/default.db') // 'name' => array('mysql:host=localhost;dbname=recess', 'username', 'password') -// 'sqlite2' => 'sqlite:' . $_ENV['dir.documentRoot'] . 'recess/sqlite/sqlite2.db', - 'recess' => array( - 'mysql:host=localhost;dbname=recess', - 'recess', - 'recess'), ); // Paths to the recess and apps directories -RecessConf::$recessDir = $_ENV['dir.documentRoot'] . 'recess/'; -RecessConf::$appsDir = $_ENV['dir.documentRoot'] . 'apps/'; +RecessConf::$recessDir = $_ENV['dir.bootstrap'] . 'recess/'; +RecessConf::$appsDir = $_ENV['dir.bootstrap'] . 'apps/'; RecessConf::$cacheProviders = array( @@ -38,5 +40,4 @@ ); RecessConf::$useTurboSpeed = false; // I wanna go FAST! (Note: Experimental feature.) - ?> \ No newline at end of file diff --git a/recess/lib/recess/apps/tools/views/apps/newAppWizardComplete.php b/recess/lib/recess/apps/tools/views/apps/newAppWizardComplete.php index fb4801c..d895822 100644 --- a/recess/lib/recess/apps/tools/views/apps/newAppWizardComplete.php +++ b/recess/lib/recess/apps/tools/views/apps/newAppWizardComplete.php @@ -15,7 +15,7 @@

Last Step: Activate in recess-conf.php

-

To enable your application open the Recess! config file: recess-conf.php

+

To enable your application open the Recess! config file: recess-conf.php

Find the RecessConf::$applications array and add the following application string:

 RecessConf::$applications 
diff --git a/recess/lib/recess/apps/tools/views/apps/uninstall.php b/recess/lib/recess/apps/tools/views/apps/uninstall.php
index 9db3f84..e13e693 100644
--- a/recess/lib/recess/apps/tools/views/apps/uninstall.php
+++ b/recess/lib/recess/apps/tools/views/apps/uninstall.php
@@ -5,7 +5,7 @@
 ?>
 

To Uninstall name; ?>...

    -
  1. Open recess-conf.php
  2. +
  3. Open recess-conf.php
  4. Find the RecessConf::$applications array.
  5. Recess! allows for multiple named data sources. Currently only MySQL and Sqlite are supported.

      -
    1. Open recess-conf.php
    2. +
    3. Open recess-conf.php
    4. Find the RecessConf::$namedDatabases variable.
    5. Add a new keyed entry to the $namedDatabasesarray based on your RDBMS: