Make logging in mandatory.
This commit is contained in:
parent
bfcbe5aa2e
commit
3587447cc0
@ -13,9 +13,6 @@ class Login extends HTMLController
|
||||
// No need to log in twice, dear heart!
|
||||
if (Registry::get('user')->isLoggedIn())
|
||||
{
|
||||
if (Registry::get('user')->isAdmin())
|
||||
header('Location: ' . BASEURL . '/admin/');
|
||||
else
|
||||
header('Location: ' . BASEURL . '/');
|
||||
exit;
|
||||
}
|
||||
@ -41,7 +38,7 @@ class Login extends HTMLController
|
||||
$login_error = true;
|
||||
}
|
||||
|
||||
parent::__construct('Log in');
|
||||
parent::__construct('Log in - ' . SITE_TITLE);
|
||||
$this->page->appendStylesheet(BASEURL . '/css/admin.css');
|
||||
$form = new LogInForm('Log in');
|
||||
if ($login_error)
|
||||
|
||||
@ -10,8 +10,8 @@ class ProvideAutoSuggest extends JSONController
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
// Ensure it's just admins at this point.
|
||||
if (!Registry::get('user')->isAdmin())
|
||||
// Ensure we're logged in at this point.
|
||||
if (!Registry::get('user')->isLoggedIn())
|
||||
throw new NotAllowedException();
|
||||
|
||||
if (!isset($_GET['type']))
|
||||
|
||||
@ -12,6 +12,10 @@ class ViewPeople extends HTMLController
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
// Ensure we're logged in at this point.
|
||||
if (!Registry::get('user')->isLoggedIn())
|
||||
throw new NotAllowedException();
|
||||
|
||||
$page = isset($_GET['page']) ? (int) $_GET['page'] : 1;
|
||||
$start = ($page - 1) * self::PER_PAGE;
|
||||
$total_count = Tag::getCount(1, 'Person');
|
||||
|
||||
@ -16,6 +16,10 @@ class ViewPhotoAlbum extends HTMLController
|
||||
|
||||
public function __construct($title = 'Photos - ' . SITE_TITLE)
|
||||
{
|
||||
// Ensure we're logged in at this point.
|
||||
if (!Registry::get('user')->isLoggedIn())
|
||||
throw new NotAllowedException();
|
||||
|
||||
// Viewing an album?
|
||||
if (isset($_GET['tag']))
|
||||
{
|
||||
|
||||
@ -16,6 +16,10 @@ class ViewTimeline extends HTMLController
|
||||
|
||||
public function __construct($title = 'Photos - ' . SITE_TITLE)
|
||||
{
|
||||
// Ensure we're logged in at this point.
|
||||
if (!Registry::get('user')->isLoggedIn())
|
||||
throw new NotAllowedException();
|
||||
|
||||
// What page are we at?
|
||||
$page = isset($_GET['page']) ? (int) $_GET['page'] : 1;
|
||||
|
||||
|
||||
@ -56,44 +56,6 @@ body {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* Login box styles
|
||||
---------------------*/
|
||||
|
||||
#login {
|
||||
background: #fff;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 10px;
|
||||
box-shadow: 2px 2px 4px rgba(0,0,0,0.1);
|
||||
margin: 0 auto;
|
||||
padding: 15px;
|
||||
width: 275px;
|
||||
}
|
||||
#login * {
|
||||
font-size: 15px;
|
||||
line-height: 35px;
|
||||
}
|
||||
#login h3 {
|
||||
font: 700 24px/36px "Open Sans", sans-serif;
|
||||
margin: 0;
|
||||
}
|
||||
#login dd {
|
||||
width: 96%;
|
||||
margin: 0 0 10px;
|
||||
}
|
||||
#login input {
|
||||
background: #eee;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 3px;
|
||||
padding: 4px 5px;
|
||||
width: 100%;
|
||||
}
|
||||
#login div {
|
||||
text-align: right;
|
||||
}
|
||||
#login button {
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
|
||||
/* (Tag) autosuggest
|
||||
----------------------*/
|
||||
|
||||
@ -352,6 +352,49 @@ textarea {
|
||||
}
|
||||
|
||||
|
||||
/* Login box styles
|
||||
---------------------*/
|
||||
#login {
|
||||
background: #fff;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 10px;
|
||||
box-shadow: 2px 2px 4px rgba(0,0,0,0.1);
|
||||
margin: 0 auto;
|
||||
overflow: auto;
|
||||
padding: 15px;
|
||||
width: 300px;
|
||||
}
|
||||
#login dl *, #login button {
|
||||
font-size: 15px;
|
||||
line-height: 35px;
|
||||
}
|
||||
#login h3 {
|
||||
font: 700 24px/36px "Open Sans", sans-serif;
|
||||
margin: 0;
|
||||
}
|
||||
#login dd {
|
||||
width: 96%;
|
||||
margin: 0 0 10px;
|
||||
}
|
||||
#login input {
|
||||
background: #eee;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 3px;
|
||||
padding: 4px 5px;
|
||||
width: 100%;
|
||||
}
|
||||
#login div.alert {
|
||||
margin: 15px 0;
|
||||
}
|
||||
#login div.buttonstrip {
|
||||
float: right;
|
||||
padding: 0 0 5px;
|
||||
}
|
||||
#login button {
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
|
||||
/* Responsive: smartphone in portrait
|
||||
---------------------------------------*/
|
||||
@media only screen and (max-width: 895px) {
|
||||
@ -388,17 +431,6 @@ textarea {
|
||||
padding: 15px 4px;
|
||||
}
|
||||
|
||||
.grid li {
|
||||
margin: 0 0 5%;
|
||||
width: 47.5%;
|
||||
}
|
||||
.grid li:nth-child(2n) {
|
||||
margin-right: 0 !important;
|
||||
}
|
||||
.grid li:nth-child(2n+1) {
|
||||
margin-right: 5% !important;
|
||||
}
|
||||
|
||||
.tiled_header {
|
||||
font-size: 14px;
|
||||
margin: 0 0 3.5% 0;
|
||||
|
||||
@ -66,7 +66,7 @@ class MainTemplate extends Template
|
||||
}
|
||||
else
|
||||
echo '
|
||||
<span class="vanity">Powered by <a href="https://aaronweb.net/projects/kabuki/">Kabuki CMS</a> | <a href="', BASEURL, '/login/">Admin</a></span>';
|
||||
<span class="vanity">Powered by <a href="https://aaronweb.net/projects/kabuki/">Kabuki CMS</a></span>';
|
||||
|
||||
echo '
|
||||
</footer>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user