diff --git a/accounts.php b/accounts.php index d76a2e3d..4fe99e0e 100644 --- a/accounts.php +++ b/accounts.php @@ -1,4 +1,4 @@ - - - +
@@ -44,4 +44,4 @@
- \ No newline at end of file +?> diff --git a/settings_backup.php b/settings_backup.php index 07f7b1aa..b889ea93 100644 --- a/settings_backup.php +++ b/settings_backup.php @@ -1,4 +1,4 @@ - +
@@ -30,4 +30,4 @@
- +
@@ -202,4 +202,4 @@
- +
@@ -36,4 +36,4 @@
- +
@@ -88,4 +88,4 @@
- +
@@ -165,4 +165,4 @@ - +
@@ -30,4 +30,4 @@
- +
Work in Progress @@ -48,4 +48,4 @@
- +
@@ -60,4 +60,4 @@
- + \ No newline at end of file +?> diff --git a/settings_taxes.php b/settings_taxes.php index b80bb0d7..fcb749b8 100644 --- a/settings_taxes.php +++ b/settings_taxes.php @@ -1,4 +1,4 @@ - \ No newline at end of file +?> diff --git a/settings_theme.php b/settings_theme.php index b3ffe09b..91d1136f 100644 --- a/settings_theme.php +++ b/settings_theme.php @@ -1,4 +1,4 @@ - +
@@ -39,4 +39,4 @@
- +
diff --git a/settings_update.php b/settings_update.php index fe366e9d..87b478b1 100644 --- a/settings_update.php +++ b/settings_update.php @@ -1,5 +1,5 @@ $sb, 'o' => $o))); +//Rebuild URL +$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 AND (user_name LIKE '%$q%' OR user_email LIKE '%$q%') AND user_archived_at IS NULL 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()")); ?> -
-
-

Users

-
-
- - - -
-
-
-
- -
- -
-
-
-
-
- - "> - - - - - - - - - - - Invited"; - }elseif ($user_status == 1) { - $user_status_display = "Active"; - }else{ - $user_status_display = "Disabled"; - } - $user_avatar = htmlentities($row['user_avatar']); - $user_token = htmlentities($row['user_token']); - $user_default_company = $row['user_default_company']; - $user_role = $row['user_role']; - if ($user_role == 3) { - $user_role_display = "Administrator"; - }elseif ($user_role == 2) { - $user_role_display = "Technician"; - }else{ - $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_array = array(); - while ($row = mysqli_fetch_array($user_company_access_sql)) { - $user_company_access_array[] = $row['company_id']; - } - $user_company_access = implode(',',$user_company_access_array); +
+
+
+ +
+ +
+
+ +
+
+
NameEmailRoleStatusLast LoginAction
+ "> + + + + + + + + + + + Invited"; + }elseif ($user_status == 1) { + $user_status_display = "Active"; + }else{ + $user_status_display = "Disabled"; + } + $user_avatar = htmlentities($row['user_avatar']); + $user_token = htmlentities($row['user_token']); + $user_default_company = $row['user_default_company']; + $user_role = $row['user_role']; + if ($user_role == 3) { + $user_role_display = "Administrator"; + }elseif ($user_role == 2) { + $user_role_display = "Technician"; + }else{ + $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_array = array(); + while ($row = mysqli_fetch_array($user_company_access_sql)) { + $user_company_access_array[] = $row['company_id']; + } + $user_company_access = implode(',',$user_company_access_array); - $sql_last_login = mysqli_query($mysqli,"SELECT * FROM logs + $user_initials = htmlentities(initials($user_name)); + + $sql_last_login = mysqli_query($mysqli, "SELECT * FROM logs WHERE log_user_id = $user_id AND log_type = 'Login' ORDER BY log_id DESC LIMIT 1" - ); - $row = mysqli_fetch_array($sql_last_login); - $log_created_at = $row['log_created_at']; - $log_ip = htmlentities($row['log_ip']); - $log_user_agent = htmlentities($row['log_user_agent']); - $log_user_os = get_os($log_user_agent); - $log_user_browser = get_web_browser($log_user_agent); - $last_login = "$log_user_os
$log_user_browser
$log_ip"; - if (empty($last_login)) { - $last_login = "Never logged in"; - } - - ?> - - + - - - - - - +
+ + + + + + + + - + include("user_edit_modal.php"); + include("user_companies_modal.php"); + include("user_archive_modal.php"); - -
NameEmailRoleStatusLast LoginAction
- - - "> - - + ); + $row = mysqli_fetch_array($sql_last_login); + $log_created_at = $row['log_created_at']; + $log_ip = htmlentities($row['log_ip']); + $log_user_agent = htmlentities($row['log_user_agent']); + $log_user_os = get_os($log_user_agent); + $log_user_browser = get_web_browser($log_user_agent); + $last_login = "$log_user_os
$log_user_browser
$log_ip"; + if (empty($last_login)) { + $last_login = "Never logged in"; + } + + ?> +
+ + + "> + + -
- +
+ -
-
-
- -
- -
- -
+ +
+ +
+ +
+ } + + ?> + + + +
+ +
- -
-
- + \ No newline at end of file +include("user_add_modal.php"); +include("user_invite_modal.php"); + +include("footer.php"); + +?>