aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/functions.inc.php2
-rw-r--r--include/functions_user.inc.php5
2 files changed, 6 insertions, 1 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 2119abe8f..578830ba5 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -446,6 +446,7 @@ INSERT INTO '.HISTORY_TABLE.'
image_id,
image_type,
format_id,
+ auth_key_id,
tag_ids
)
VALUES
@@ -459,6 +460,7 @@ INSERT INTO '.HISTORY_TABLE.'
'.(isset($image_id) ? $image_id : 'NULL').',
'.(isset($image_type) ? "'".$image_type."'" : 'NULL').',
'.(isset($format_id) ? $format_id : 'NULL').',
+ '.(isset($page['auth_key_id']) ? $page['auth_key_id'] : 'NULL').',
'.(isset($tags_string) ? "'".$tags_string."'" : 'NULL').'
)
;';
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index ba4ed6808..cd186183a 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -1472,7 +1472,7 @@ function get_recent_photos_sql($db_field)
*/
function auth_key_login($auth_key)
{
- global $conf, $user;
+ global $conf, $user, $page;
if ($user['id'] != $conf['guest_id'])
{
@@ -1519,6 +1519,9 @@ SELECT
log_user($user['id'], false);
trigger_notify('login_success', stripslashes($key['username']));
+ // to be registered in history table by pwg_log function
+ $page['auth_key_id'] = $key['auth_key_id'];
+
return true;
}