+
+ {'User'|translate}
+
+
+
-
-{if max_page != 1}
+
-{/if}
+
+
+ {'No results'|translate}
+
+
@@ -937,30 +440,105 @@ $(document).ready(function () {
display: flex;
flex-direction: row;
- align-items: center;
-
- height: 100px;
+ margin-top: 38px;
width: 100%;
}
-.select-user span {
+div:has(> .activity-header) {
+ margin-bottom: 38px;
+}
+
+.activity-select span {
font-size: 15px;
font-weight: bold;
-
- margin-right: 20px;
}
-.acivity-time {
- margin: 0 25px;
+.user-selecter, .action-selecter {
+ width: 230px;
+ margin-top: 10px;
}
-.user-selecter {
- width: 150px;
+.actions-filters{
+ margin-left: 25%;
}
+.user_activity_end_options{
+ margin-left: auto;
+ display: flex;
+}
+
+.activity-noresult{
+ opacity: 0.3;
+ text-align: center;
+ font-weight: bold;
+ font-size: 32px;
+ display: none;
+}
+
+.activity-more-filters{
+ margin-left: 14px;
+ padding: 4px 16px 4px 16px;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+ cursor: pointer;
+}
+
+.activity-more-filters.extend-padding{
+ padding-bottom: 10px;
+}
+
+.activity-more-filters, .activity-more-filters-content{
+ background-color: #F3F3F3;
+}
+
+.activity-more-filters-content{
+ display: flex;
+ position: relative;
+ flex-direction: row;
+ font-weight: normal;
+ padding : 23px 0px 22px 24px;
+ width: auto;
+}
+
+.activity-period-info{
+ margin-bottom : 30px;
+ font-weight: bold;
+}
+
+.additional-filters-section{
+ margin-left: 5%;
+}
+
+.additional-filters-info{
+ margin-bottom : 18px;
+ font-weight: bold;
+}
+
+.additional-filters{
+ display: flex;
+}
+
+.activity-filter-container span::before{
+ margin-right: 6px;
+}
+
+.activity-filter-container .icon-cancel{
+ margin-left: 5px;
+}
+
+.activity-date-selecter{
+ display: block;
+ height: 25.5px;
+ width: 130px;
+ margin-top: 10px;
+ font-size: 12px;
+ font-weight: bold;
+}
/* Selectize */
-.selectize-control.single.user-selecter {
+.selectize-control.single.user-selecter, .selectize-control.single.action-selecter {
height: 30px;
}
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 260bf8497..6041109d7 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -7253,17 +7253,16 @@ color:#FF7B00;
/* Activity Tab in user manager */
-.select-user {
- background: #fafafa;
+.activity-select {
height: 50%;
+ text-align: left;
+ margin-right: 20px;
+}
- display: flex;
- align-items: center;
-
- padding: 0 20px;
-
- box-shadow: 0px 2px 4px #00000024;
- border-radius: 5px;
+.activity-filter-container{
+ border-radius: 20px;
+ padding: 4px 10px;
+ margin-right: 6px;
}
.start-date,
@@ -7275,11 +7274,6 @@ color:#FF7B00;
white-space: nowrap;
}
-.acivity-time-text {
- font-size: 13px;
- font-weight: bold;
-}
-
.line {
background: #fafafa;
box-shadow: 0px 2px 4px #00000024;
@@ -7311,7 +7305,6 @@ color:#FF7B00;
}
.download_csv {
- margin-left: auto;
height: 25px;
width: 30px;
background: #dddddd;
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index 000eac0de..ea0521ae5 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -1915,23 +1915,28 @@ background:#6C2D2D!important;
/* Activity Tab in user manager */
-.select-user {
- background: #555555;
- height: 50%;
-
- display: flex;
- align-items: center;
-
- padding: 0 20px;
-
- box-shadow: 0px 2px 4px #00000024;
- border-radius: 5px;
+.activity-more-filters, .activity-more-filters-content {
+ background-color: #343434 !important;
}
-.select-user-title {
+.selectize-control.user-selecter.single .selectize-input, .selectize-control.action-selecter.single .selectize-input {
+ border-color: #555555 !important;
+}
+
+.activity-select-title {
color: #bbbbbb;
}
+.activity-date-selecter {
+ background-color: #555555;
+ color: #D5D5D5;
+}
+
+.activity-filter-container{
+ background-color: #555555;
+ color: #D5D5D5;
+}
+
.start-date,
.end-date {
padding: 5px 10px;
@@ -1941,12 +1946,6 @@ background:#6C2D2D!important;
color: #bbbbbb;
}
-.acivity-time-text {
- font-size: 13px;
- font-weight: bold;
- color: #bbbbbb;
-}
-
/* Strange why this is different from light mode */
.compactView .user-container-initials-wrapper > span {
height: 40px !important;
@@ -1988,7 +1987,6 @@ background:#6C2D2D!important;
}
.download_csv {
- margin-left: auto;
height: 25px;
width: 30px;
background: #555555;
diff --git a/admin/user_activity.php b/admin/user_activity.php
index dd31df050..f62d34014 100644
--- a/admin/user_activity.php
+++ b/admin/user_activity.php
@@ -142,6 +142,105 @@ SELECT COUNT(*)
list($nb_users) = pwg_db_fetch_row(pwg_query($query));
$template->assign('nb_users', $nb_users);
+$query = '
+SELECT
+ occured_on
+ FROM '.ACTIVITY_TABLE.'
+ WHERE object != \'system\'
+ ;';
+
+$result = query2array($query);
+
+$dates = array();
+
+foreach($result as $time){
+ list($date, $hour) = explode(' ', $time['occured_on']);
+ $dates[] = date_format(date_create($date),"Y-m-d");
+}
+
+$dates = array_unique($dates);
+$list_dates['allDates'] = implode(',',$dates);
+$list_dates['min'] = $dates[0];
+$list_dates['max'] = end($dates);
+
+$template->assign('ACTIVITY_DATES', $list_dates);
+
+$additional_filt_type = false;
+$additional_filt_name = null;
+$additional_filt_value = null;
+
+if(isset($_GET['photo']))
+{
+ $query = '
+ SELECT
+ name
+ FROM '.IMAGES_TABLE.'
+ WHERE id = '.$_GET['photo'].';';
+
+ $additional_filt_type = 'photo';
+ $additional_filt_name = query2array($query)[0]['name'];
+ $additional_filt_value = $_GET['photo'];
+}
+else if (isset($_GET['album']))
+{
+ $query = '
+ SELECT
+ name
+ FROM '.CATEGORIES_TABLE.'
+ WHERE id = '.$_GET['album'].';';
+
+ $additional_filt_type = 'album';
+ $additional_filt_name = query2array($query)[0]['name'];
+ $additional_filt_value = $_GET['album'];
+}
+else if (isset($_GET['group']))
+{
+ $query = '
+ SELECT
+ name
+ FROM '.GROUPS_TABLE.'
+ WHERE id = '.$_GET['group'].';';
+
+ $additional_filt_type = 'group';
+ $additional_filt_name = query2array($query)[0]['name'];
+ $additional_filt_value = $_GET['group'];
+}
+
+$template->assign('ADDITIONAL_FILT', array(
+ 'type' => $additional_filt_type,
+ 'name' => $additional_filt_name,
+ 'value' => $additional_filt_value
+));
+
+$query = '
+SELECT
+ object,
+ action,
+ count(*) AS counter
+ FROM '.ACTIVITY_TABLE.'
+ WHERE object != \'system\'';
+
+ if ($additional_filt_type)
+ {
+ $query .= '
+ AND object = "'.$additional_filt_type.'"';
+ }
+
+ $query .= '
+ GROUP BY
+ action,
+ object
+ ORDER BY object ASC
+ ;';
+
+
+$actions = query2array($query);
+foreach($actions as &$action){
+ $action['value'] = $action['object'].'/'.$action['action'];
+}
+
+$template->assign('ACTIONS', $actions);
+
$template->assign_var_from_handle('ADMIN_CONTENT', 'user_activity');
?>
\ No newline at end of file
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 21336b389..5a1cccd93 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -811,7 +811,7 @@ $conf['dashboard_activity_nb_weeks'] = 4;
// 'all' = do not filter, display all
// 'admins_only' = only display connections of admin users
// 'none' = don't even display connections of admin users
-$conf['activity_display_connections'] = 'admins_only';
+$conf['activity_display_connections'] = 'all';
// On album mover page, number of seconds before auto openning album when
// dragging an album. In milliseconds. 3 seconds by default.
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php
index c1886b189..bbb041180 100644
--- a/include/ws_functions/pwg.php
+++ b/include/ws_functions/pwg.php
@@ -459,12 +459,77 @@ function ws_getActivityList($param, &$service)
$output_lines = array();
$current_key = '';
- $page_size = 100000; //We will fetch X lines in database =/= lines displayed due to line concatenation
- $page_offset = $param['page']*$page_size;
+ $page_size = 100; //We will fetch X lines in database =/= lines displayed due to line concatenation
+ //$page_offset = $param['page']*$page_size;
+ $page_offset = $param['offset'];
$user_ids = array();
- $query = '
+ $line_id = 0;
+
+
+
+ if (!empty($param['date_min'])) {
+ $min = date_format(date_create($param['date_min']), "Y-m-d H:i:s");
+ $max = date_format(date_create($param['date_max']), "Y-m-d 23:59:59");
+ }
+
+ if (!empty($param['date_max'])) {
+ $max = date_format(date_create($param['date_max']), "Y-m-d 23:59:59");
+ }
+
+ if (isset($param['uid'])) {
+ $query = '
+ SELECT
+ count(*)
+ FROM '.ACTIVITY_TABLE.'
+ WHERE object != \'system\'
+ AND performed_by = '.$param['uid'];
+ } else {
+ $query = '
+ SELECT
+ count(*)
+ FROM '.ACTIVITY_TABLE.'
+ WHERE object != \'system\'';
+ }
+
+ if (isset($param['action']))
+ {
+ $query .= '
+ AND action = "'.$param['action'].'"';
+ }
+
+ if (isset($param['object']))
+ {
+ $query .= '
+ AND object = "'.$param['object'].'"';
+ }
+
+ if (!empty($param['date_min']))
+ {
+ $query .= '
+ AND occured_on >= "'.$min.'"';
+ }
+
+ if (!empty($param['date_max']))
+ {
+ $query .= '
+ AND occured_on <= "'.$max.'"';
+ }
+
+ if (!empty($param['id']))
+ {
+ $query .= '
+ AND object_id = '.$param['id'];
+ }
+
+ $query .= ';';
+
+ $max_line = (pwg_db_fetch_row(pwg_query($query))[0]);
+
+ while(sizeof($output_lines) < $page_size and !($page_offset >= $max_line))
+ {
+ $query = '
SELECT
activity_id,
performed_by,
@@ -479,11 +544,43 @@ SELECT
FROM '.ACTIVITY_TABLE.'
WHERE object != \'system\'';
- if (isset($param['uid']))
+ if (isset($param['uid']))
+ {
+ $query.= '
+ AND performed_by = '.$param['uid'];
+ }
+
+ if (isset($param['action']))
+ {
+ $query .= '
+ AND action = "'.$param['action'].'"';
+ }
+
+ if (isset($param['object']))
+ {
+ $query .= '
+ AND object = "'.$param['object'].'"';
+ }
+
+ if (!empty($param['date_min']))
{
- $query.= '
- AND performed_by = '.$param['uid'];
+ $query .= '
+ AND occured_on >= "'.$min.'"';
}
+
+ if (!empty($param['date_max']))
+ {
+ $query .= '
+ AND occured_on <= "'.$max.'"';
+ }
+
+ if (!empty($param['id']))
+ {
+ $id = pwg_db_real_escape_string(stripslashes($param['id']));
+ $query .= '
+ AND object_id = '.$id;
+ }
+
elseif ('none' == $conf['activity_display_connections'])
{
$query.= '
@@ -496,67 +593,77 @@ SELECT
AND NOT (action IN (\'login\', \'logout\') AND object_id NOT IN ('.implode(',', get_admins()).'))';
}
- $query.= '
+ $query.= '
ORDER BY activity_id DESC
- LIMIT '.$page_size.' OFFSET '.$page_offset.'
+ LIMIT '.($page_size * 5).' OFFSET '.$page_offset.'
;';
- $line_id = 0;
- $result = pwg_query($query);
- while ($row = pwg_db_fetch_assoc($result))
- {
- $row['details'] = str_replace('`groups`', 'groups', $row['details']);
- $row['details'] = str_replace('`rank`', 'rank', $row['details']);
- $details = @unserialize($row['details']);
+ $result = pwg_query($query);
- if (isset($row['user_agent']))
+ while ($row = pwg_db_fetch_assoc($result))
{
- $details['agent'] = $row['user_agent'];
- }
-
- if (isset($details['method']))
- {
- $detailsType = 'method';
- }
- if (isset($details['script']))
- {
- $detailsType = 'script';
- }
-
- $line_key = $row['session_idx'].'~'.$row['object'].'~'.$row['action'].'~'; // idx~photo~add
-
- if ($line_key === $current_key)
- {
- // I increment the counter of the previous line
- $output_lines[count($output_lines)-1]['counter']++;
- $output_lines[count($output_lines)-1]['object_id'][] = $row['object_id'];
- }
- else
- {
- list($date, $hour) = explode(' ', $row['occured_on']);
- // New line
- $output_lines[] = array(
- 'id' => $line_id,
- 'object' => $row['object'],
- 'object_id' => array($row['object_id']),
- 'action' => $row['action'],
- 'ip_address' => $row['ip_address'],
- 'date' => format_date($date),
- 'hour' => $hour,
- 'user_id' => $row['performed_by'],
- 'detailsType' => $detailsType,
- 'details' => $details,
- 'counter' => 1,
- );
-
- $user_ids[ $row['performed_by'] ] = 1;
- if ('user' == $row['object'])
+ if (sizeof($output_lines) < $page_size)
{
- $user_ids[ $row['object_id'] ] = 1;
- }
+ $page_offset++;
- $current_key = $line_key;
- $line_id++;
+ $row['details'] = str_replace('`groups`', 'groups', $row['details']);
+ $row['details'] = str_replace('`rank`', 'rank', $row['details']);
+ $details = @unserialize($row['details']);
+
+ if (isset($row['user_agent']))
+ {
+ $details['agent'] = $row['user_agent'];
+ }
+
+ if (isset($details['method']))
+ {
+ $detailsType = 'method';
+ }
+ if (isset($details['script']))
+ {
+ $detailsType = 'script';
+ }
+
+ $line_key = $row['session_idx'].'~'.$row['object'].'~'.$row['action'].'~'; // idx~photo~add
+
+ if ($line_key === $current_key)
+ {
+ // I increment the counter of the previous line
+ $output_lines[count($output_lines)-1]['counter']++;
+ $output_lines[count($output_lines)-1]['object_id'][] = $row['object_id'];
+ }
+ else
+ {
+ list($date, $hour) = explode(' ', $row['occured_on']);
+ // New line
+ $output_lines[] = array(
+ 'id' => $line_id,
+ 'object' => $row['object'],
+ 'object_id' => array($row['object_id']),
+ 'action' => $row['action'],
+ 'ip_address' => $row['ip_address'],
+ 'date' => format_date($date),
+ 'hour' => $hour,
+ 'user_id' => $row['performed_by'],
+ 'detailsType' => $detailsType,
+ 'details' => $details,
+ 'counter' => 1,
+ );
+
+ $user_ids[ $row['performed_by'] ] = 1;
+ if ('user' == $row['object'])
+ {
+ $user_ids[ $row['object_id'] ] = 1;
+ }
+
+ $current_key = $line_key;
+ $line_id++;
+ }
+ }
+ else
+ {
+ break;
+ }
}
}
@@ -596,27 +703,11 @@ SELECT
}
}
- if (isset($param['uid'])) {
- $query = '
- SELECT
- count(*)
- FROM '.ACTIVITY_TABLE.'
- WHERE performed_by = '.$param['uid'].'
- ;';
- } else {
- $query = '
- SELECT
- count(*)
- FROM '.ACTIVITY_TABLE.'
- ;';
- }
-
- $result = (pwg_db_fetch_row(pwg_query($query))[0])/$page_size;
-
return array(
'result_lines' => $output_lines,
- 'max_page' => floor($result),
- 'params' => $param,
+ 'page_offset' => $page_offset,
+ 'end_page' => ($page_offset >= $max_line),
+ 'params' => $param
);
}