aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-12 15:46:39 -0800
committerfriendica <info@friendica.com>2012-01-12 15:46:39 -0800
commit4b6990e1ff42a509144b9b28f9377b2c9d9df3d9 (patch)
treeb53b3a9e690c1d8b6af96368eb5c97f2bde2e835 /mod
parent0856935d75701fe6076a32ce80a4f0326ba85b2a (diff)
downloadvolse-hubzilla-4b6990e1ff42a509144b9b28f9377b2c9d9df3d9.tar.gz
volse-hubzilla-4b6990e1ff42a509144b9b28f9377b2c9d9df3d9.tar.bz2
volse-hubzilla-4b6990e1ff42a509144b9b28f9377b2c9d9df3d9.zip
modularise successful authentication
Diffstat (limited to 'mod')
-rw-r--r--mod/openid.php56
1 files changed, 5 insertions, 51 deletions
diff --git a/mod/openid.php b/mod/openid.php
index b8734f023..df074b299 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -65,59 +65,13 @@ function openid_content(&$a) {
}
unset($_SESSION['openid']);
- $_SESSION['uid'] = $r[0]['uid'];
- $_SESSION['theme'] = $r[0]['theme'];
- $_SESSION['authenticated'] = 1;
- $_SESSION['page_flags'] = $r[0]['page-flags'];
- $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $r[0]['nickname'];
-
- $a->user = $r[0];
-
- if($a->user['login_date'] === '0000-00-00 00:00:00') {
- $_SESSION['return_url'] = 'profile_photo/new';
- $a->module = 'profile_photo';
- info( t("Welcome ") . $a->user['username'] . EOL);
- info( t('Please upload a profile photo.') . EOL);
- }
- else
- info( t("Welcome back ") . $a->user['username'] . EOL);
-
-
- if(strlen($a->user['timezone'])) {
- date_default_timezone_set($a->user['timezone']);
- $a->timezone = $a->user['timezone'];
- }
-
- $r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
- dbesc($a->user['password']),
- dbesc($a->user['email'])
- );
- if(count($r))
- $a->identities = $r;
+ require_once('include/security.php');
+ authenticate_success($r[0],true,true);
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
- intval($_SESSION['uid'])
- );
- if(count($r)) {
- $a->contact = $r[0];
- $a->cid = $r[0]['id'];
- $_SESSION['cid'] = $a->cid;
- }
-
- $l = get_language();
-
- q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
- dbesc(datetime_convert()),
- dbesc($l),
- intval($_SESSION['uid'])
- );
+ // just in case there was no return url set
+ // and we fell through
-
- header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
- if(($a->module !== 'home') && isset($_SESSION['return_url']))
- goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
- else
- goaway(z_root());
+ goaway(z_root());
}
}
notice( t('Login failed.') . EOL);