show warning when key is not set.

This commit is contained in:
Taylor Otwell 2012-01-31 16:35:35 -06:00
parent d20deb2847
commit 96b43e90b3
3 changed files with 48 additions and 39 deletions

View File

@ -69,6 +69,14 @@
padding: 10px; padding: 10px;
} }
#main div.warning {
background-color: #feefb3;
border: 1px solid;
border-radius: 5px;
color: #9f6000;
padding: 10px;
}
#main ul { #main ul {
margin: 10px 0; margin: 10px 0;
padding: 0 30px; padding: 0 30px;
@ -81,41 +89,55 @@
</head> </head>
<body> <body>
<div id="main"> <div id="main">
<h1>Welcome To Laravel</h1> <?php if (Config::get('application.key') == ''): ?>
<h2>A Framework For Web Artisans</h2> <h1>Whoops!</h1>
<p> <br>
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>
<h3>Learn the terrain.</h3> <div class="warning">
Please set an application key in <strong>application/config/application.php</strong>!
</div>
<p> <?php else: ?>
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> <h1>Welcome To Laravel</h1>
<p>And the view sitting before you can be found at:</p> <h2>A Framework For Web Artisans</h2>
<pre><code>APP_PATH/views/home/index.php</code></pre> <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>
<h3>Create something beautiful.</h3> <h3>Learn the terrain.</h3>
<p> <p>
Now that you're up and running, it's time to start creating! You've landed yourself on our default home page. The route that
Here are some links to help you get started: is generating this page lives at:
</p> </p>
<ul> <pre><code>APP_PATH/routes.php</code></pre>
<li><a href="http://laravel.com">Official Website</a></li>
<li><a href="http://forums.laravel.com">Laravel Forums</a></li> <p>And the view sitting before you can be found at:</p>
<li><a href="http://github.com/laravel/laravel">GitHub Repository</a></li>
</ul> <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; ?>
</div> </div>
</body> </body>

View File

@ -7,19 +7,6 @@
*/ */
require 'core.php'; require 'core.php';
/**
* Verify that an application key has been set in the configuration.
* The key is used to do proper signature hashing on cookies, as
* well as keep various other parts of the framework secure, so
* it is a required configuration option.
*/
if (Config::$items['application']['application']['key'] == '')
{
$path = 'application/config/application.php';
die("Please set an application key in <b>{$path}</b>.");
}
/** /**
* Register the default timezone for the application. This will be the * Register the default timezone for the application. This will be the
* default timezone used by all date / timezone functions throughout * default timezone used by all date / timezone functions throughout

View File

@ -1,6 +1,6 @@
MIT License MIT License
Copyright (c) <2011> <Taylor Otwell> <taylorotwell@gmail.com> Copyright (c) <2012> <Taylor Otwell> <taylorotwell@gmail.com>
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in