mirror of
https://github.com/itflow-org/itflow
synced 2026-03-08 06:44:51 +00:00
Merge branch 'master' into more-tidy
This commit is contained in:
12
login.php
12
login.php
@@ -28,9 +28,13 @@ if ($failed_login_count >= 15) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Query Settings for "default" company (as companies are being removed shortly)
|
// Query Settings for "default" company (as companies are being removed shortly)
|
||||||
$sql_settings = mysqli_query($mysqli, "SELECT * FROM settings WHERE company_id = 1");
|
$sql_settings = mysqli_query($mysqli, "SELECT * FROM settings LEFT JOIN companies ON settings.company_id = companies.company_id WHERE settings.company_id = 1");
|
||||||
$row = mysqli_fetch_array($sql_settings);
|
$row = mysqli_fetch_array($sql_settings);
|
||||||
|
|
||||||
|
// Company info
|
||||||
|
$company_name = $row['company_name'];
|
||||||
|
$company_logo = $row['company_logo'];
|
||||||
|
|
||||||
// Mail
|
// Mail
|
||||||
$config_smtp_host = $row['config_smtp_host'];
|
$config_smtp_host = $row['config_smtp_host'];
|
||||||
$config_smtp_port = $row['config_smtp_port'];
|
$config_smtp_port = $row['config_smtp_port'];
|
||||||
@@ -219,7 +223,11 @@ if (isset($_POST['login'])) {
|
|||||||
<body class="hold-transition login-page">
|
<body class="hold-transition login-page">
|
||||||
<div class="login-box">
|
<div class="login-box">
|
||||||
<div class="login-logo">
|
<div class="login-logo">
|
||||||
<b>IT</b>Flow
|
<?php if(!empty($company_logo)) { ?>
|
||||||
|
<img alt="<?=$company_name?> logo" height="110" width="380" class="img-fluid" src="<?php echo "uploads/settings/1/$company_logo"; ?>">
|
||||||
|
<?php } else { ?>
|
||||||
|
<b>IT</b>Flow
|
||||||
|
<?php } ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- /.login-logo -->
|
<!-- /.login-logo -->
|
||||||
|
|||||||
@@ -26,9 +26,10 @@ $sql_settings = mysqli_query($mysqli, "SELECT config_azure_client_id FROM settin
|
|||||||
$settings = mysqli_fetch_array($sql_settings);
|
$settings = mysqli_fetch_array($sql_settings);
|
||||||
$azure_client_id = $settings['config_azure_client_id'];
|
$azure_client_id = $settings['config_azure_client_id'];
|
||||||
|
|
||||||
$company_sql = mysqli_query($mysqli, "SELECT company_name FROM companies WHERE company_id = '1'");
|
$company_sql = mysqli_query($mysqli, "SELECT company_name, company_logo FROM companies WHERE company_id = '1'");
|
||||||
$company_results = mysqli_fetch_array($company_sql);
|
$company_results = mysqli_fetch_array($company_sql);
|
||||||
$company_name = $company_results['company_name'];
|
$company_name = $company_results['company_name'];
|
||||||
|
$company_logo = $company_results['company_logo'];
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
|
if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
|
||||||
|
|
||||||
@@ -89,7 +90,13 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
|
|||||||
|
|
||||||
<body class="hold-transition login-page">
|
<body class="hold-transition login-page">
|
||||||
<div class="login-box">
|
<div class="login-box">
|
||||||
<div class="login-logo"><b><?=$company_name?></b> <br>Client Portal Login</h2></div>
|
<div class="login-logo">
|
||||||
|
<?php if(!empty($company_logo)) { ?>
|
||||||
|
<img alt="<?=$company_name?> logo" height="110" width="380" class="img-fluid" src="<?php echo "../uploads/settings/1/$company_logo"; ?>">
|
||||||
|
<?php } else { ?>
|
||||||
|
<b><?=$company_name?></b> <br>Client Portal Login</h2>
|
||||||
|
<?php } ?>
|
||||||
|
</div>
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body login-card-body">
|
<div class="card-body login-card-body">
|
||||||
<p class="login-box-msg text-danger">
|
<p class="login-box-msg text-danger">
|
||||||
@@ -102,7 +109,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
|
|||||||
</p>
|
</p>
|
||||||
<form method="post">
|
<form method="post">
|
||||||
<div class="input-group mb-3">
|
<div class="input-group mb-3">
|
||||||
<input type="text" class="form-control" placeholder="Client Email" name="email" required autofocus>
|
<input type="text" class="form-control" placeholder="Registered Client Email" name="email" required autofocus>
|
||||||
<div class="input-group-append">
|
<div class="input-group-append">
|
||||||
<div class="input-group-text">
|
<div class="input-group-text">
|
||||||
<span class="fas fa-envelope"></span>
|
<span class="fas fa-envelope"></span>
|
||||||
|
|||||||
Reference in New Issue
Block a user