mirror of https://github.com/itflow-org/itflow
Adjust setting related pages to require inc_all_settings rather than include
This commit is contained in:
parent
cfa4b1dcb5
commit
7ea36eeff6
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php");
|
<?php require_once("inc_all_settings.php");
|
||||||
|
|
||||||
if (!empty($_GET['sb'])) {
|
if (!empty($_GET['sb'])) {
|
||||||
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php");
|
<?php require_once("inc_all_settings.php");
|
||||||
|
|
||||||
if (isset($_GET['category'])) {
|
if (isset($_GET['category'])) {
|
||||||
$category = strip_tags(mysqli_real_escape_string($mysqli,$_GET['category']));
|
$category = strip_tags(mysqli_real_escape_string($mysqli,$_GET['category']));
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php");
|
<?php require_once("inc_all_settings.php");
|
||||||
|
|
||||||
if (!empty($_GET['sb'])) {
|
if (!empty($_GET['sb'])) {
|
||||||
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
||||||
|
|
|
||||||
2
logs.php
2
logs.php
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php");
|
<?php require_once("inc_all_settings.php");
|
||||||
|
|
||||||
if (!empty($_GET['sb'])) {
|
if (!empty($_GET['sb'])) {
|
||||||
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php");
|
<?php require_once("inc_all_settings.php");
|
||||||
|
|
||||||
if (!empty($_GET['sb'])) {
|
if (!empty($_GET['sb'])) {
|
||||||
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark mb-3">
|
<div class="card card-dark mb-3">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="alert alert-warning">
|
<div class="alert alert-warning">
|
||||||
Work in Progress
|
Work in Progress
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php");
|
<?php require_once("inc_all_settings.php");
|
||||||
|
|
||||||
if (!empty($_GET['sb'])) {
|
if (!empty($_GET['sb'])) {
|
||||||
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?php include("inc_all_settings.php"); ?>
|
<?php require_once("inc_all_settings.php"); ?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-3">
|
<div class="card-header py-3">
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
include("inc_all_settings.php");
|
require_once("inc_all_settings.php");
|
||||||
include("database_version.php");
|
include("database_version.php");
|
||||||
include("config.php");
|
include("config.php");
|
||||||
|
|
||||||
|
|
|
||||||
34
users.php
34
users.php
|
|
@ -1,25 +1,25 @@
|
||||||
<?php include("inc_all_settings.php");
|
<?php require_once("inc_all_settings.php");
|
||||||
|
|
||||||
if (!empty($_GET['sb'])) {
|
if (!empty($_GET['sb'])) {
|
||||||
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
|
||||||
}else{
|
} else {
|
||||||
$sb = "user_name";
|
$sb = "user_name";
|
||||||
}
|
}
|
||||||
|
|
||||||
//Rebuild URL
|
//Rebuild URL
|
||||||
$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
|
$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
|
||||||
|
|
||||||
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM users, user_settings
|
$sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM users, user_settings
|
||||||
WHERE users.user_id = user_settings.user_id
|
WHERE users.user_id = user_settings.user_id
|
||||||
AND (user_name LIKE '%$q%' OR user_email LIKE '%$q%')
|
AND (user_name LIKE '%$q%' OR user_email LIKE '%$q%')
|
||||||
AND user_archived_at IS NULL
|
AND user_archived_at IS NULL
|
||||||
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
ORDER BY $sb $o LIMIT $record_from, $record_to");
|
||||||
|
|
||||||
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
|
$num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
<div class="card-header py-2">
|
<div class="card-header py-2">
|
||||||
<h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Users</h3>
|
<h3 class="card-title mt-2"><i class="fa fa-fw fa-users"></i> Users</h3>
|
||||||
<div class="card-tools">
|
<div class="card-tools">
|
||||||
|
|
@ -82,7 +82,7 @@
|
||||||
}else{
|
}else{
|
||||||
$user_role_display = "Accountant";
|
$user_role_display = "Accountant";
|
||||||
}
|
}
|
||||||
$user_company_access_sql = mysqli_query($mysqli,"SELECT company_id FROM user_companies WHERE user_id = $user_id");
|
$user_company_access_sql = mysqli_query($mysqli, "SELECT company_id FROM user_companies WHERE user_id = $user_id");
|
||||||
$user_company_access_array = array();
|
$user_company_access_array = array();
|
||||||
while ($row = mysqli_fetch_array($user_company_access_sql)) {
|
while ($row = mysqli_fetch_array($user_company_access_sql)) {
|
||||||
$user_company_access_array[] = $row['company_id'];
|
$user_company_access_array[] = $row['company_id'];
|
||||||
|
|
@ -91,7 +91,7 @@
|
||||||
|
|
||||||
$user_initials = htmlentities(initials($user_name));
|
$user_initials = htmlentities(initials($user_name));
|
||||||
|
|
||||||
$sql_last_login = mysqli_query($mysqli,"SELECT * FROM logs
|
$sql_last_login = mysqli_query($mysqli, "SELECT * FROM logs
|
||||||
WHERE log_user_id = $user_id AND log_type = 'Login'
|
WHERE log_user_id = $user_id AND log_type = 'Login'
|
||||||
ORDER BY log_id DESC LIMIT 1"
|
ORDER BY log_id DESC LIMIT 1"
|
||||||
);
|
);
|
||||||
|
|
@ -167,18 +167,18 @@
|
||||||
</div>
|
</div>
|
||||||
<?php include("pagination.php"); ?>
|
<?php include("pagination.php"); ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script>
|
<script>
|
||||||
function generatePassword() {
|
function generatePassword() {
|
||||||
document.getElementById("password").value = "<?php echo keygen() ?>"
|
document.getElementById("password").value = "<?php echo keygen() ?>"
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
include("user_add_modal.php");
|
include("user_add_modal.php");
|
||||||
include("user_invite_modal.php");
|
include("user_invite_modal.php");
|
||||||
|
|
||||||
include("footer.php");
|
include("footer.php");
|
||||||
|
|
||||||
?>
|
?>
|
||||||
Loading…
Reference in New Issue