mirror of
https://github.com/ShaYmez/FreeSTAR-Status-Engine.git
synced 2026-06-20 06:38:40 -04:00
Fix #14 - show installation dialog on 404 page if config not found
This commit is contained in:
+2
-2
@@ -69,10 +69,10 @@ Template::render_header(_("Dashboard"), true);
|
||||
<i class="glyphicon glyphicon-info-sign"></i>
|
||||
</div>
|
||||
<div class="panel-heading clearfix">
|
||||
<input type="text" name="title" id="title" placeholder="<?php echo _("Title");?>" value="<?php echo (isset($_POST['title'])?htmlspecialchars($_POST['title']):''); ?>" required> <span id="time"><input id="time_input" type="text" pattern="(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))" name="time" value="<?php echo (isset($_POST['time'])?htmlspecialchars($_POST['time']):''); ?>" class="pull-right" title="Use ISO 8601 format (e.g. 2017-11-23T19:50:51+00:00)" placeholder="<?php echo _("Time");?>"></span>
|
||||
<input type="text" name="title" id="title" placeholder="<?php echo _("Title");?>" value="<?php echo (isset($_POST['title'])?htmlspecialchars($_POST['title']):''); ?>" require_onced> <span id="time"><input id="time_input" type="text" pattern="(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))" name="time" value="<?php echo (isset($_POST['time'])?htmlspecialchars($_POST['time']):''); ?>" class="pull-right" title="Use ISO 8601 format (e.g. 2017-11-23T19:50:51+00:00)" placeholder="<?php echo _("Time");?>"></span>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<textarea name="text" placeholder="<?php echo _("Here goes your text...");?>" required><?php echo (isset($_POST['text'])?htmlspecialchars($_POST['text']):''); ?></textarea>
|
||||
<textarea name="text" placeholder="<?php echo _("Here goes your text...");?>" require_onced><?php echo (isset($_POST['text'])?htmlspecialchars($_POST['text']):''); ?></textarea>
|
||||
</div>
|
||||
<div class="panel-footer clearfix">
|
||||
<small><?php echo _("Posted by");?>: <?php echo $user->get_username();?> <span class="pull-right" id="end_time_wrapper"><?php echo _("Ending");?>: <input id="end_time" title="Use ISO 8601 format (e.g. 2017-11-23T19:50:51+00:00)" type="text" pattern="(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))" name="end_time" class="pull-right" placeholder="<?php echo _("End time");?>" value="<?php echo (isset($_POST['end_time'])?htmlspecialchars($_POST['end_time']):''); ?>"></span></small>
|
||||
|
||||
+60
-53
@@ -1,66 +1,73 @@
|
||||
<?php
|
||||
require("../config.php");
|
||||
require("../classes/constellation.php");
|
||||
require("../template.php");
|
||||
|
||||
if(isset($_COOKIE['user'])&&!isset($_SESSION['user']))
|
||||
if (!file_exists("config.php"))
|
||||
{
|
||||
User::restore_session();
|
||||
require_once("../install.php");
|
||||
}
|
||||
else{
|
||||
require_once("../config.php");
|
||||
require_once("../classes/constellation.php");
|
||||
require_once("../template.php");
|
||||
|
||||
if (!isset($_SESSION['user']))
|
||||
{
|
||||
if (isset($_GET['do']) && $_GET['do']=="lost-password")
|
||||
if(isset($_COOKIE['user'])&&!isset($_SESSION['user']))
|
||||
{
|
||||
require("lost-password.php");
|
||||
}else if (isset($_GET['do']) && $_GET['do']=="change-email"){
|
||||
$user_pwd = new User($_GET['id']);
|
||||
$user_pwd->change_email();
|
||||
require("login-form.php");
|
||||
User::restore_session();
|
||||
}
|
||||
else{
|
||||
User::login();
|
||||
require("login-form.php");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$user = new User($_SESSION['user']);
|
||||
if (!$user->is_active())
|
||||
|
||||
if (!isset($_SESSION['user']))
|
||||
{
|
||||
User::logout();
|
||||
if (isset($_GET['do']) && $_GET['do']=="lost-password")
|
||||
{
|
||||
require_once("lost-password.php");
|
||||
}else if (isset($_GET['do']) && $_GET['do']=="change-email"){
|
||||
$user_pwd = new User($_GET['id']);
|
||||
$user_pwd->change_email();
|
||||
require_once("login-form.php");
|
||||
}
|
||||
else{
|
||||
User::login();
|
||||
require_once("login-form.php");
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($_GET['do'])){
|
||||
$do = "";
|
||||
}else{
|
||||
$do = $_GET['do'];
|
||||
}
|
||||
|
||||
switch ($do) {
|
||||
case 'change-email':
|
||||
$user = new User($_GET['id']);
|
||||
$user->change_email();
|
||||
case 'user':
|
||||
require("user.php");
|
||||
break;
|
||||
|
||||
case 'settings':
|
||||
require("settings.php");
|
||||
break;
|
||||
|
||||
case 'new-user':
|
||||
require("new-user.php");
|
||||
break;
|
||||
|
||||
case 'logout':
|
||||
else
|
||||
{
|
||||
$user = new User($_SESSION['user']);
|
||||
if (!$user->is_active())
|
||||
{
|
||||
User::logout();
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
require("dashboard.php");
|
||||
break;
|
||||
if (!isset($_GET['do'])){
|
||||
$do = "";
|
||||
}else{
|
||||
$do = $_GET['do'];
|
||||
}
|
||||
|
||||
switch ($do) {
|
||||
case 'change-email':
|
||||
$user = new User($_GET['id']);
|
||||
$user->change_email();
|
||||
case 'user':
|
||||
require_once("user.php");
|
||||
break;
|
||||
|
||||
case 'settings':
|
||||
require_once("settings.php");
|
||||
break;
|
||||
|
||||
case 'new-user':
|
||||
require_once("new-user.php");
|
||||
break;
|
||||
|
||||
case 'logout':
|
||||
User::logout();
|
||||
break;
|
||||
|
||||
default:
|
||||
require_once("dashboard.php");
|
||||
break;
|
||||
}
|
||||
|
||||
Template::render_footer(true);
|
||||
}
|
||||
|
||||
Template::render_footer(true);
|
||||
}
|
||||
@@ -13,11 +13,11 @@ Template::render_header(_("Login"));
|
||||
<form action="<?php echo WEB_URL;?>/admin/" method="post">
|
||||
<div class="form-group">
|
||||
<label for="email"><?php echo _("Email");?></label>
|
||||
<input placeholder="<?php echo _("Email");?>" class="form-control" name="email" id="email" type="email" tabindex="1" value="<?php echo htmlspecialchars((isset($_POST['email'])?$_POST['email']:''),ENT_QUOTES);?>" required>
|
||||
<input placeholder="<?php echo _("Email");?>" class="form-control" name="email" id="email" type="email" tabindex="1" value="<?php echo htmlspecialchars((isset($_POST['email'])?$_POST['email']:''),ENT_QUOTES);?>" require_onced>
|
||||
</div>
|
||||
<div class="form-group" style="margin-bottom: 8px">
|
||||
<label for="pass"><?php echo _("Password");?></label>
|
||||
<input placeholder="<?php echo _("Password");?>" class="form-control" name="pass" id="pass" type="password" tabindex="2" required>
|
||||
<input placeholder="<?php echo _("Password");?>" class="form-control" name="pass" id="pass" type="password" tabindex="2" require_onced>
|
||||
<div style="padding-top: 8px; position: relative;">
|
||||
<a href="<?php echo WEB_URL;?>/admin/?do=lost-password" class="pull-right noselect" tabindex="5"><?php echo _("Forgotten password?");?></a>
|
||||
<input name="remember" id="remember" type="checkbox" tabindex="3"> <label class="lbl-login noselect" style="color: black;" for="remember"><?php echo _("Remember me");?></label>
|
||||
|
||||
@@ -45,7 +45,7 @@ Template::render_header(_("Lost password"));
|
||||
<?php if (!isset($_GET['id'])||!isset($_GET['token'])){?>
|
||||
<label for="email"><?php echo _("Email");?>:</label>
|
||||
<div class="input-group pull-right">
|
||||
<input class="form-control" name="email" id="email" placeholder="<?php echo _("Email");?>" type="email" required>
|
||||
<input class="form-control" name="email" id="email" placeholder="<?php echo _("Email");?>" type="email" require_onced>
|
||||
<span class="input-group-btn">
|
||||
<button type="submit" class="btn btn-success pull-right"><?php echo _("Submit request");?></button>
|
||||
</span>
|
||||
|
||||
+5
-5
@@ -16,15 +16,15 @@ Template::render_header(_("New user"), true); ?>
|
||||
<?php
|
||||
} ?>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-6"><label for="name"><?php echo _("Name");?>: </label><input type="text" maxlength="50" name="name" value="<?php echo ((isset($_POST['name']))?htmlspecialchars($_POST['name'],ENT_QUOTES):'');?>" id="name" placeholder="<?php echo _("Name");?>" class="form-control" required></div>
|
||||
<div class="col-sm-6"><label for="surname"><?php echo _("Surname");?>: </label><input type="text" maxlength="50" name="surname" value="<?php echo ((isset($_POST['surname']))?htmlspecialchars($_POST['surname'],ENT_QUOTES):'');?>" id="surname" placeholder="<?php echo _("Surname");?>" class="form-control" required></div>
|
||||
<div class="col-sm-6"><label for="name"><?php echo _("Name");?>: </label><input type="text" maxlength="50" name="name" value="<?php echo ((isset($_POST['name']))?htmlspecialchars($_POST['name'],ENT_QUOTES):'');?>" id="name" placeholder="<?php echo _("Name");?>" class="form-control" require_onced></div>
|
||||
<div class="col-sm-6"><label for="surname"><?php echo _("Surname");?>: </label><input type="text" maxlength="50" name="surname" value="<?php echo ((isset($_POST['surname']))?htmlspecialchars($_POST['surname'],ENT_QUOTES):'');?>" id="surname" placeholder="<?php echo _("Surname");?>" class="form-control" require_onced></div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-6"><label for="username"><?php echo _("Username");?>:</label><input type="text" maxlength="50" name="username" value="<?php echo ((isset($_POST['username']))?htmlspecialchars($_POST['username'],ENT_QUOTES):'');?>" id="username" placeholder="<?php echo _("Username");?>" class="form-control" required></div>
|
||||
<div class="col-sm-6"><label for="email"><?php echo _("Email");?>:</label><input type="email" maxlength="60" name="email" value="<?php echo ((isset($_POST['email']))?htmlspecialchars($_POST['email'],ENT_QUOTES):'');?>" id="email" placeholder="<?php echo _("Email");?>" class="form-control" required></div>
|
||||
<div class="col-sm-6"><label for="username"><?php echo _("Username");?>:</label><input type="text" maxlength="50" name="username" value="<?php echo ((isset($_POST['username']))?htmlspecialchars($_POST['username'],ENT_QUOTES):'');?>" id="username" placeholder="<?php echo _("Username");?>" class="form-control" require_onced></div>
|
||||
<div class="col-sm-6"><label for="email"><?php echo _("Email");?>:</label><input type="email" maxlength="60" name="email" value="<?php echo ((isset($_POST['email']))?htmlspecialchars($_POST['email'],ENT_QUOTES):'');?>" id="email" placeholder="<?php echo _("Email");?>" class="form-control" require_onced></div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-6"><label for="password"><?php echo _("Password");?>:</label><input type="password" name="password" value="<?php echo ((isset($_POST['password']))?htmlspecialchars($_POST['password'],ENT_QUOTES):'');?>" id="password" placeholder="<?php echo _("Password");?>" class="form-control" required></div>
|
||||
<div class="col-sm-6"><label for="password"><?php echo _("Password");?>:</label><input type="password" name="password" value="<?php echo ((isset($_POST['password']))?htmlspecialchars($_POST['password'],ENT_QUOTES):'');?>" id="password" placeholder="<?php echo _("Password");?>" class="form-control" require_onced></div>
|
||||
<div class="col-sm-6">
|
||||
<label for="permission"><?php echo _("Permission");?>: </label>
|
||||
<select name="permission" id="permission" class="form-control">
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ if (isset($message)){
|
||||
<?php if ($user->get_rank() <= 1){?>
|
||||
<form action="?do=settings&new=service" method="post">
|
||||
<div class="input-group pull-right new-service">
|
||||
<input class="form-control" name="service" placeholder="Name" type="text" value="<?php echo ((isset($_POST['service']))?htmlspecialchars($_POST['service']):''); ?>" maxlength="50" required>
|
||||
<input class="form-control" name="service" placeholder="Name" type="text" value="<?php echo ((isset($_POST['service']))?htmlspecialchars($_POST['service']):''); ?>" maxlength="50" require_onced>
|
||||
<span class="input-group-btn">
|
||||
<button type="submit" class="btn btn-success pull-right"><?php echo _("Add service");?></button>
|
||||
</span>
|
||||
|
||||
Reference in New Issue
Block a user