Updated submodules
This commit is contained in:
Woody Gilk
parent
75f542c7dd
commit
daa0deb7c5
|
|
@ -49,7 +49,10 @@ ini_set('unserialize_callback_func', 'spl_autoload_call');
|
|||
* - boolean profile enable or disable internal profiling TRUE
|
||||
* - boolean caching enable or disable internal caching FALSE
|
||||
*/
|
||||
Kohana::init(array('base_url' => '/kohana/'));
|
||||
Kohana::init(array(
|
||||
'base_url' => '/',
|
||||
'index_file' => FALSE,
|
||||
));
|
||||
|
||||
/**
|
||||
* Attach the file write to logging. Multiple writers are supported.
|
||||
|
|
@ -67,11 +70,12 @@ Kohana::$config->attach(new Kohana_Config_File);
|
|||
Kohana::modules(array(
|
||||
// 'auth' => MODPATH.'auth', // Basic authentication
|
||||
// 'codebench' => MODPATH.'codebench', // Benchmarking tool
|
||||
// 'database' => MODPATH.'database', // Database access
|
||||
'database' => MODPATH.'database', // Database access
|
||||
// 'image' => MODPATH.'image', // Image manipulation
|
||||
// 'orm' => MODPATH.'orm', // Object Relationship Mapping
|
||||
// 'pagination' => MODPATH.'pagination', // Paging of results
|
||||
// 'userguide' => MODPATH.'userguide', // User guide and API documentation
|
||||
'userguide' => MODPATH.'userguide', // User guide and API documentation
|
||||
// 'sprig' => MODPATH.'sprig',
|
||||
));
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4,7 +4,28 @@ class Controller_Welcome extends Controller {
|
|||
|
||||
public function action_index()
|
||||
{
|
||||
$this->request->response = 'hello, world!';
|
||||
// $keyword = 'test';
|
||||
//
|
||||
// $query = DB::select('id', 'title', 'tags')
|
||||
// ->from('table')
|
||||
// ->where('MATCH("title", "tags")', '', 'AGAINST(:keyword)')
|
||||
// ->bind(':keyword', $keyword);
|
||||
//
|
||||
// echo Kohana::debug($query->compile(Database::instance()));
|
||||
|
||||
// $feed = 'http://dev.kohanaframework.org/activity.atom?key=JXtiMOc7fJFxRssCOMrv8xo6J4GW3qDd6OjS45hy';
|
||||
// echo Kohana::debug(Feed::parse($feed));
|
||||
|
||||
echo Request::factory('welcome/test')->execute();
|
||||
|
||||
$this->request->response = View::factory('profiler/stats');
|
||||
}
|
||||
|
||||
public function action_test()
|
||||
{
|
||||
$this->request->response = (string) View::factory('request')
|
||||
->render();
|
||||
}
|
||||
|
||||
|
||||
} // End Welcome
|
||||
|
|
|
|||
193
install.php
193
install.php
|
|
@ -1,193 +0,0 @@
|
|||
<?php defined('SYSPATH') or exit('Install tests must be loaded from within index.php!'); ?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
<head>
|
||||
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>Kohana Installation</title>
|
||||
|
||||
<style type="text/css">
|
||||
body { width: 42em; margin: 0 auto; font-family: sans-serif; background: #fff; font-size: 1em; }
|
||||
h1 { letter-spacing: -0.04em; }
|
||||
h1 + p { margin: 0 0 2em; color: #333; font-size: 90%; font-style: italic; }
|
||||
code { font-family: monaco, monospace; }
|
||||
table { border-collapse: collapse; width: 100%; }
|
||||
table th,
|
||||
table td { padding: 0.4em; text-align: left; vertical-align: top; }
|
||||
table th { width: 12em; font-weight: normal; }
|
||||
table tr:nth-child(odd) { background: #eee; }
|
||||
table td.pass { color: #191; }
|
||||
table td.fail { color: #911; }
|
||||
#results { padding: 0.8em; color: #fff; font-size: 1.5em; }
|
||||
#results.pass { background: #191; }
|
||||
#results.fail { background: #911; }
|
||||
</style>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<h1>Environment Tests</h1>
|
||||
|
||||
<p>
|
||||
The following tests have been run to determine if <a href="http://kohanaphp.com/">Kohana</a> will work in your environment.
|
||||
If any of the tests have failed, consult the <a href="http://docs.kohanaphp.com/installation">documentation</a>
|
||||
for more information on how to correct the problem.
|
||||
</p>
|
||||
|
||||
<?php $failed = FALSE ?>
|
||||
|
||||
<table cellspacing="0">
|
||||
<tr>
|
||||
<th>PHP Version</th>
|
||||
<?php if (version_compare(PHP_VERSION, '5.2.3', '>=')): ?>
|
||||
<td class="pass"><?php echo PHP_VERSION ?></td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">Kohana requires PHP 5.2.3 or newer, this version is <?php echo PHP_VERSION ?>.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>System Directory</th>
|
||||
<?php if (is_dir(SYSPATH) AND is_file(SYSPATH.'classes/kohana'.EXT)): ?>
|
||||
<td class="pass"><?php echo SYSPATH ?></td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">The configured <code>system</code> directory does not exist or does not contain required files.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Application Directory</th>
|
||||
<?php if (is_dir(APPPATH) AND is_file(APPPATH.'bootstrap'.EXT)): ?>
|
||||
<td class="pass"><?php echo APPPATH ?></td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">The configured <code>application</code> directory does not exist or does not contain required files.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Cache Directory</th>
|
||||
<?php if (is_dir(APPPATH) AND is_dir(APPPATH.'cache') AND is_writable(APPPATH.'cache')): ?>
|
||||
<td class="pass"><?php echo APPPATH.'cache/' ?></td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">The <code><?php echo APPPATH.'cache/' ?></code> directory is not writable.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Logs Directory</th>
|
||||
<?php if (is_dir(APPPATH) AND is_dir(APPPATH.'logs') AND is_writable(APPPATH.'logs')): ?>
|
||||
<td class="pass"><?php echo APPPATH.'logs/' ?></td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">The <code><?php echo APPPATH.'logs/' ?></code> directory is not writable.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>PCRE UTF-8</th>
|
||||
<?php if ( ! @preg_match('/^.$/u', 'ñ')): $failed = TRUE ?>
|
||||
<td class="fail"><a href="http://php.net/pcre">PCRE</a> has not been compiled with UTF-8 support.</td>
|
||||
<?php elseif ( ! @preg_match('/^\pL$/u', 'ñ')): $failed = TRUE ?>
|
||||
<td class="fail"><a href="http://php.net/pcre">PCRE</a> has not been compiled with Unicode property support.</td>
|
||||
<?php else: ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>SPL Enabled</th>
|
||||
<?php if (function_exists('spl_autoload_register')): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">PHP <a href="http://www.php.net/spl">SPL</a> is either not loaded or not compiled in.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Reflection Enabled</th>
|
||||
<?php if (class_exists('ReflectionClass')): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">PHP <a href="http://www.php.net/reflection">reflection</a> is either not loaded or not compiled in.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Filters Enabled</th>
|
||||
<?php if (function_exists('filter_list')): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">The <a href="http://www.php.net/filter">filter</a> extension is either not loaded or not compiled in.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Iconv Extension Loaded</th>
|
||||
<?php if (extension_loaded('iconv')): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">The <a href="http://php.net/iconv">iconv</a> extension is not loaded.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<?php if (extension_loaded('mbstring')): ?>
|
||||
<tr>
|
||||
<th>Mbstring Not Overloaded</th>
|
||||
<?php if (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING): $failed = TRUE ?>
|
||||
<td class="fail">The <a href="http://php.net/mbstring">mbstring</a> extension is overloading PHP's native string functions.</td>
|
||||
<?php else: ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<?php endif ?>
|
||||
<tr>
|
||||
<th>URI Determination</th>
|
||||
<?php if (isset($_SERVER['REQUEST_URI']) OR isset($_SERVER['PHP_SELF']) OR isset($_SERVER['PATH_INFO'])): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: $failed = TRUE ?>
|
||||
<td class="fail">Neither <code>$_SERVER['REQUEST_URI']</code>, <code>$_SERVER['PHP_SELF']</code>, or <code>$_SERVER['PATH_INFO']</code> is available.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<?php if ($failed === TRUE): ?>
|
||||
<p id="results" class="fail">✘ Kohana may not work correctly with your environment.</p>
|
||||
<?php else: ?>
|
||||
<p id="results" class="pass">✔ Your environment passed all requirements.<br />
|
||||
Remove or rename the <code>install<?php echo EXT ?></code> file now.</p>
|
||||
<?php endif ?>
|
||||
|
||||
<h1>Optional Tests</h1>
|
||||
|
||||
<p>
|
||||
The following extensions are not required to run the Kohana core, but if enabled can provide access to additional classes.
|
||||
</p>
|
||||
|
||||
<table cellspacing="0">
|
||||
<tr>
|
||||
<th>cURL Enabled</th>
|
||||
<?php if (extension_loaded('curl')): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: ?>
|
||||
<td class="fail">Kohana requires <a href="http://php.net/curl">cURL</a> for the Remote class.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>mcrypt Enabled</th>
|
||||
<?php if (extension_loaded('mcrypt')): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: ?>
|
||||
<td class="fail">Kohana requires <a href="http://php.net/mcrypt">mcrypt</a> for the Encrypt class.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>GD Enabled</th>
|
||||
<?php if (function_exists('gd_info')): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: ?>
|
||||
<td class="fail">Kohana requires <a href="http://php.net/gd">GD</a> v2 for the Image class.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>PDO Enabled</th>
|
||||
<?php if (class_exists('PDO')): ?>
|
||||
<td class="pass">Pass</td>
|
||||
<?php else: ?>
|
||||
<td class="fail">Kohana can use <a href="http://php.net/pdo">PDO</a> to support additional databases.</td>
|
||||
<?php endif ?>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 6986628b399bc041fe70563dcd6e54fabfcfd991
|
||||
Subproject commit c178be1b63ead84030f3609b192955a93f90db64
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit bc1dbaf334c719c752ad9f7d5b94f8d12a21d177
|
||||
Subproject commit 99038e666d33d7bab05666b626e9b66ce06b3308
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit e0621c5daf56fa6c3a50ac58746a2534a5c7a22d
|
||||
Subproject commit 6c89e72c5803531fbd35d9a86df4c0658db93ca6
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit e908b7701d4a1194a1dd01e574d623e3a87f9c5b
|
||||
Subproject commit 913cad6012bcca4206335fa65768c7a576362903
|
||||
2
system
2
system
|
|
@ -1 +1 @@
|
|||
Subproject commit 0b145770a59116399b411e5bf95da4aa3ea8b916
|
||||
Subproject commit 673758d143735999db6f4d51ed6e09d8f2433a95
|
||||
Loading…
Reference in a new issue