adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 01:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug 2340 fixed: external authentication was broken, error in SQL syntax and wrong PHP variable name was used.

Browse Source 
git-svn-id: http://piwigo.org/svn/branches/2.2@11355 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-06-14 08:24:48 +00:00
parent a08c683c1e
commit b137b4f018
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_user.inc.php
+19 -21
View File
@@ -292,6 +292,25 @@ SELECT ';
$row = pwg_db_fetch_assoc(pwg_query($query));
// retrieve additional user data ?
if ($conf['external_authentification'])
{
$query = '
SELECT
COUNT(1) AS counter
FROM '.USER_INFOS_TABLE.' AS ui
LEFT JOIN '.USER_CACHE_TABLE.' AS uc ON ui.user_id = uc.user_id
LEFT JOIN '.THEMES_TABLE.' AS t ON t.id = ui.theme
WHERE ui.user_id = '.$user_id.'
GROUP BY ui.user_id
;';
list($counter) = pwg_db_fetch_row(pwg_query($query));
if ($counter != 1)
{
create_user_infos($user_id);
}
}
// retrieve user info
$query = '
SELECT
@@ -307,27 +326,6 @@ SELECT
$result = pwg_query($query);
$user_infos_row = pwg_db_fetch_assoc($result);
// retrieve additional user data ?
if ($conf['external_authentification'])
{
$query = '
SELECT
COUNT(1) AS counter,
FROM '.USER_INFOS_TABLE.' AS ui
LEFT JOIN '.USER_CACHE_TABLE.' AS uc ON ui.user_id = uc.user_id
LEFT JOIN '.THEMES_TABLE.' AS t ON t.id = ui.theme
WHERE ui.user_id = '.$user_id.'
GROUP BY ui.user_id
;';
if (pwg_db_fetch_row(pwg_query($query))!=1)
{
create_user_infos($user_id);
$result = pwg_query($user_info_query);
$user_infos_row = pwg_db_fetch_assoc($result);
}
}
// then merge basic + additional user data
$row = array_merge($row, $user_infos_row);