Skip to content

S
syncEnrollments
Commit 82315f31 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

added configurable automatic key generation.

parent 6b14bd39
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 40 deletions
application/views/home/index.php
View file @ 82315f31
......@@ -89,56 +89,41 @@
</head>
<body>
<div id="main">
<?php if (Config::get('application.key') == ''): ?>
<h1>Welcome To Laravel</h1>
<h1>Whoops!</h1>
<h2>A Framework For Web Artisans</h2>
<br>
<p>
You have successfully installed the Laravel framework. Laravel is a simple framework
that helps web artisans create beautiful, creative applications using elegant, expressive
syntax. You'll love using it.
</p>
<div class="warning">
Please set an application key in <strong>application/config/application.php</strong>!
</div>
<h3>Learn the terrain.</h3>
<?php else: ?>
<p>
You've landed yourself on our default home page. The route that
is generating this page lives at:
</p>
<h1>Welcome To Laravel</h1>
<pre><code>APP_PATH/routes.php</code></pre>
<h2>A Framework For Web Artisans</h2>
<p>And the view sitting before you can be found at:</p>
<p>
You have successfully installed the Laravel framework. Laravel is a simple framework
that helps web artisans create beautiful, creative applications using elegant, expressive
syntax. You'll love using it.
</p>
<pre><code>APP_PATH/views/home/index.php</code></pre>
<h3>Learn the terrain.</h3>
<h3>Create something beautiful.</h3>
<p>
You've landed yourself on our default home page. The route that
is generating this page lives at:
</p>
<pre><code>APP_PATH/routes.php</code></pre>
<p>And the view sitting before you can be found at:</p>
<pre><code>APP_PATH/views/home/index.php</code></pre>
<h3>Create something beautiful.</h3>
<p>
Now that you're up and running, it's time to start creating!
Here are some links to help you get started:
</p>
<ul>
<li><a href="http://laravel.com">Official Website</a></li>
<li><a href="http://forums.laravel.com">Laravel Forums</a></li>
<li><a href="http://github.com/laravel/laravel">GitHub Repository</a></li>
</ul>
<?php endif; ?>
<p>
Now that you're up and running, it's time to start creating!
Here are some links to help you get started:
</p>
<ul>
<li><a href="http://laravel.com">Official Website</a></li>
<li><a href="http://forums.laravel.com">Laravel Forums</a></li>
<li><a href="http://github.com/laravel/laravel">GitHub Repository</a></li>
</ul>
</div>
</body>
</html>
\ No newline at end of file
laravel/core.php
View file @ 82315f31
......@@ -64,6 +64,18 @@ if (isset($_SERVER['CLI']['ENV']))
$_SERVER['LARAVEL_ENV'] = $_SERVER['CLI']['ENV'];
}
/**
* Call the bootstrap Closure that was defined in the start.php
* file for the framework. This allows events and more to be
* registered extremely early in the life cycle.
*/
if (isset($bootstrap))
{
call_user_func($bootstrap);
unset($bootstrap);
}
/**
* Register all of the core class aliases. These aliases provide a
* convenient way of working with the Laravel core classes without
......
laravel/laravel.php
View file @ 82315f31
......@@ -52,6 +52,20 @@ error_reporting(-1);
ini_set('display_errors', Config::get('error.display'));
/**
* Determine if we need to set the application key to a random
* string for the developer. This provides the developer with
* a zero configuration install process.
*/
$key = Config::get('application.key');
if ($key == '' and Config::get('key.auto'))
{
ob_start() and with(new CLI\Tasks\Key)->generate();
ob_end_clean();
}
/**
* Even though "Magic Quotes" are deprecated in PHP 5.3, they may
* still be enabled on the server. To account for this, we will
......
paths.php
View file @ 82315f31
......@@ -58,6 +58,14 @@ else
$paths['public'] = 'public';
}
// --------------------------------------------------------------
// Define a bootstrap Closure that runs on core load.
// --------------------------------------------------------------
$bootstrap = function()
{
Laravel\Config::set('key.auto', true);
};
// --------------------------------------------------------------
// Define each constant if it hasn't been defined.
// --------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment