mirror of
https://github.com/itflow-org/itflow
synced 2026-03-04 12:54:51 +00:00
Merge pull request #1128 from itflow-org/font-tidy
Stop using Source Sans Pro intermittently for some pages
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
* Certificate listing for PTC / technical contacts
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Contact management for PTC / technical contacts
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Contact management for PTC / technical contacts
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Contact management for PTC / technical contacts
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Docs for PTC / technical contacts
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com; img-src 'self' data:");
|
||||
header("Content-Security-Policy: default-src 'self'; img-src 'self' data:");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Docs for PTC / technical contacts
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Domain listing for PTC / technical contacts
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Landing / Home page for the client portal
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Invoices for PTC
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Landing / Home page for the client portal
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once '../config.php';
|
||||
|
||||
@@ -50,13 +50,13 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
|
||||
$password = $_POST['password'];
|
||||
|
||||
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
|
||||
|
||||
|
||||
header("HTTP/1.1 401 Unauthorized");
|
||||
|
||||
|
||||
$_SESSION['login_message'] = 'Invalid e-mail';
|
||||
|
||||
|
||||
} else {
|
||||
|
||||
|
||||
$sql = mysqli_query($mysqli, "SELECT * FROM users LEFT JOIN contacts ON user_id = contact_user_id WHERE user_email = '$email' AND user_archived_at IS NULL AND user_type = 2 AND user_status = 1 LIMIT 1");
|
||||
$row = mysqli_fetch_array($sql);
|
||||
$client_id = intval($row['contact_client_id']);
|
||||
@@ -82,7 +82,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
|
||||
logAction("Client Login", "Success", "Client contact $user_email successfully logged in locally", $client_id, $user_id);
|
||||
|
||||
} else {
|
||||
|
||||
|
||||
// Logging
|
||||
logAction("Client Login", "Failed", "Failed client portal login attempt using $email (incorrect password for contact ID $contact_id)", $client_id, $user_id);
|
||||
|
||||
@@ -92,14 +92,14 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
|
||||
// Logging
|
||||
logAction("Client Login", "Failed", "Failed client portal login attempt using $email (invalid email/not allowed local auth)");
|
||||
|
||||
|
||||
header("HTTP/1.1 401 Unauthorized");
|
||||
|
||||
|
||||
$_SESSION['login_message'] = 'Incorrect username or password.';
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -127,8 +127,6 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="../dist/css/adminlte.min.css">
|
||||
|
||||
<!-- Google Font: Source Sans Pro -->
|
||||
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
||||
</head>
|
||||
|
||||
<body class="hold-transition login-page">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Password reset page
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once '../config.php';
|
||||
require_once '../functions.php';
|
||||
@@ -195,8 +195,6 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") {
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="../dist/css/adminlte.min.css">
|
||||
|
||||
<!-- Google Font: Source Sans Pro -->
|
||||
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
||||
</head>
|
||||
|
||||
<body class="hold-transition login-page">
|
||||
|
||||
@@ -29,8 +29,6 @@ header("X-Frame-Options: DENY"); // Legacy
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="../dist/css/adminlte.min.css">
|
||||
|
||||
<!-- Google Font: Source Sans Pro -->
|
||||
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
|
||||
</head>
|
||||
|
||||
<!-- Navbar -->
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* User profile
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once 'inc_portal.php';
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Quotes for PTC / billing contacts
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* Landing / Home page for the client portal
|
||||
*/
|
||||
|
||||
header("Content-Security-Policy: default-src 'self' fonts.googleapis.com fonts.gstatic.com");
|
||||
header("Content-Security-Policy: default-src 'self'");
|
||||
|
||||
require_once "inc_portal.php";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user