From b045d16354375d7b7472734439aefc9ae05e4eb7 Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Sat, 2 Jul 2011 19:45:56 +0100 Subject: [PATCH] Revert "Updated system tracking to latest kohana/core3.2/develop" This reverts commit fe45ac932890b5752b79637e6ed097ee1eb25865. --- application/bootstrap.php | 9 +- application/cache/.gitignore | 1 + application/classes/controller/welcome.php | 9 +- index.php | 26 +-- install.php | 233 +++++++++++++++++++++ system | 2 +- 6 files changed, 240 insertions(+), 40 deletions(-) create mode 100644 application/cache/.gitignore create mode 100644 install.php diff --git a/application/bootstrap.php b/application/bootstrap.php index f8e390d35..d6081cd09 100644 --- a/application/bootstrap.php +++ b/application/bootstrap.php @@ -93,25 +93,20 @@ */ Kohana::$config->attach(new Config_File); -Kohana::$expose = TRUE; - /** * Enable modules. Modules are referenced by a relative or absolute path. */ Kohana::modules(array( // 'auth' => MODPATH.'auth', // Basic authentication - 'cache' => '../kohana-cache', // Caching with multiple backends + // 'cache' => MODPATH.'cache', // Caching with multiple backends // 'codebench' => MODPATH.'codebench', // Benchmarking tool // 'database' => MODPATH.'database', // Database access // 'image' => MODPATH.'image', // Image manipulation // 'orm' => MODPATH.'orm', // Object Relationship Mapping - 'unittest' => '../kohana-unittest', // Unit testing + // 'unittest' => MODPATH.'unittest', // Unit testing // 'userguide' => MODPATH.'userguide', // User guide and API documentation )); -// Kohana::$expose = TRUE; -// Request_Client_External::$client = 'Request_Client_Stream'; - /** * Set the routes. Each route must have a minimum of a name, a URI and a set of * defaults for the URI. diff --git a/application/cache/.gitignore b/application/cache/.gitignore new file mode 100644 index 000000000..80e609ab0 --- /dev/null +++ b/application/cache/.gitignore @@ -0,0 +1 @@ +[^.]* \ No newline at end of file diff --git a/application/classes/controller/welcome.php b/application/classes/controller/welcome.php index 71908b81b..0984eff64 100644 --- a/application/classes/controller/welcome.php +++ b/application/classes/controller/welcome.php @@ -4,14 +4,7 @@ class Controller_Welcome extends Controller { public function action_index() { - $this->response->body('Hello world!') - ->headers('cache-control', HTTP_Header::create_cache_control( - array( - 'max-age' => 15, - 'public' - ) - )); + $this->response->body('hello, world!'); } - } // End Welcome diff --git a/index.php b/index.php index 56d76680a..71c3249a0 100644 --- a/index.php +++ b/index.php @@ -1,13 +1,5 @@ Cache::instance('apc')))) +echo Request::factory() ->execute() ->send_headers() ->body(); - -// -- XHPROF disable ----------------------------------------------------------- -if ($xhprof) -{ - $profiler_namespace = 'kohana'; // namespace for your application - $xhprof_data = xhprof_disable(); - $xhprof_runs = new XHProfRuns_Default(); - $run_id = $xhprof_runs->save_run($xhprof_data, $profiler_namespace); - - // url to the XHProf UI libraries (change the host name and path) - $profiler_url = 'http://xhprof.development/index.php?run='.$run_id.'&source='. - $profiler_namespace; - echo 'Profiler output'; -} diff --git a/install.php b/install.php new file mode 100644 index 000000000..461f3e79a --- /dev/null +++ b/install.php @@ -0,0 +1,233 @@ + + + + + + + + Kohana Installation + + + + + + +

Environment Tests

+ +

+ The following tests have been run to determine if Kohana will work in your environment. + If any of the tests have failed, consult the documentation + for more information on how to correct the problem. +

+ + + + + + + =')): ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PHP VersionKohana requires PHP 5.2.3 or newer, this version is .
System DirectoryThe configured system directory does not exist or does not contain required files.
Application DirectoryThe configured application directory does not exist or does not contain required files.
Cache DirectoryThe directory is not writable.
Logs DirectoryThe directory is not writable.
PCRE UTF-8PCRE has not been compiled with UTF-8 support.PCRE has not been compiled with Unicode property support.Pass
SPL EnabledPassPHP SPL is either not loaded or not compiled in.
Reflection EnabledPassPHP reflection is either not loaded or not compiled in.
Filters EnabledPassThe filter extension is either not loaded or not compiled in.
Iconv Extension LoadedPassThe iconv extension is not loaded.
Mbstring Not OverloadedThe mbstring extension is overloading PHP's native string functions.Pass
Character Type (CTYPE) ExtensionThe ctype extension is not enabled.Pass
URI DeterminationPassNeither $_SERVER['REQUEST_URI'], $_SERVER['PHP_SELF'], or $_SERVER['PATH_INFO'] is available.
+ + +

✘ Kohana may not work correctly with your environment.

+ +

✔ Your environment passed all requirements.
+ Remove or rename the install file now.

+ + +

Optional Tests

+ +

+ The following extensions are not required to run the Kohana core, but if enabled can provide access to additional classes. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PECL HTTP EnabledPassKohana can use the http extension for the Request_Client_External class.
cURL EnabledPassKohana can use the cURL extension for the Request_Client_External class.
mcrypt EnabledPassKohana requires mcrypt for the Encrypt class.
GD EnabledPassKohana requires GD v2 for the Image class.
MySQL EnabledPassKohana can use the MySQL extension to support MySQL databases.
PDO EnabledPassKohana can use PDO to support additional databases.
+ + + diff --git a/system b/system index 55aeed9a2..a5269c0eb 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit 55aeed9a208eef9bc1fbc88531e5264f891bb2cb +Subproject commit a5269c0eb93f7f3ee12f118516aec89d8dd2fd15