Permalink
Browse files

Now logging in with Red zaccount/zentity instead of Friendica user. Y…

…ay. Most existing Friendica functionality is now stuffed since the Red structures are quite different.
  • Loading branch information...
1 parent 8c3c3d5 commit 7fad83cea4dd134df6dacf8248ef6947dca7f100 @friendica committed Aug 28, 2012
Showing with 216 additions and 157 deletions.
  1. +4 −5 INSTALL.txt
  2. +1 −1 database.sql
  3. +5 −1 include/account.php
  4. +33 −23 include/auth.php
  5. +1 −0 include/js_strings.php
  6. +122 −70 include/security.php
  7. +12 −49 mod/settings.php
  8. +5 −1 mod/zentity.php
  9. +10 −3 mod/zregister.php
  10. +1 −1 version.inc
  11. +21 −0 view/js/mod_settings.js
  12. +1 −0 view/tpl/js_strings.tpl
  13. +0 −3 view/tpl/settings.tpl
View
@@ -32,15 +32,14 @@ link if your cert is self-signed).
- Apache with mod-rewrite enabled and "Options All" so you can use a
local .htaccess file
- - PHP 5.3+. The later the better. PHP 5.3 is required for communications
-with the Diaspora network and improved security.
+ - PHP 5.3+. The later the better.
- - PHP *command line* access with register_argc_argv set to true in the
+ - PHP *command line* access with register_argc_argv set to true in the
php.ini file [or see 'poormancron' in section 8]
- - curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions
+ - curl, gd (with at least jpeg support), mysql, mbstring, mcrypt, and openssl extensions
- - some form of email server or email gateway such that PHP mail() works
+ - some form of email server or email gateway such that PHP mail() works
- Mysql 5.x
View
@@ -227,7 +227,7 @@ CREATE TABLE IF NOT EXISTS `entity` (
`entity_name` char(255) NOT NULL DEFAULT '',
`entity_address` char(255) NOT NULL DEFAULT '',
`entity_global_id` char(255) NOT NULL DEFAULT '',
- `entity_timezone` char(128) NOT NULL DEFAULT '',
+ `entity_timezone` char(128) NOT NULL DEFAULT 'UTC',
`entity_location` char(255) NOT NULL DEFAULT '',
`entity_theme` char(255) NOT NULL DEFAULT '',
`entity_pubkey` text NOT NULL,
View
@@ -91,6 +91,10 @@ function create_account($arr) {
$parent = ((x($arr,'parent')) ? intval($arr['parent']) : 0 );
$flags = ((x($arr,'account_flags')) ? intval($arr['account_flags']) : ACCOUNT_OK);
+ $default_service_class = get_config('system','default_service_class');
+ if($default_service_class === false)
+ $default_service_class = '';
+
if((! x($email)) || (! x($password))) {
$result['message'] = t('Please enter the required information.');
return $result;
@@ -236,7 +240,7 @@ function send_reg_approval_email($arr) {
function send_verification_email($email,$password) {
$email_msg = replace_macros(get_intltext_template('register_open_eml.tpl'), array(
- '$sitename' => $get_config('config','sitename'),
+ '$sitename' => get_config('config','sitename'),
'$siteurl' => z_root(),
'$email' => $email,
'$password' => $password,
View
@@ -5,6 +5,7 @@
function nuke_session() {
unset($_SESSION['authenticated']);
+ unset($_SESSION['account_id']);
unset($_SESSION['uid']);
unset($_SESSION['visitor_id']);
unset($_SESSION['administrator']);
@@ -70,7 +71,7 @@ function account_verify_password($email,$pass) {
}
}
- if(x($_SESSION,'uid')) {
+ if(x($_SESSION,'uid') || x($_SESSION,'account_id')) {
// already logged in user returning
@@ -83,18 +84,27 @@ function account_verify_password($email,$pass) {
goaway(z_root());
}
- $r = q("select * from account where account_id = %d limit 1",
- intval($_SESSION['account_id'])
- );
- if(count($r) && (($r[0]['account_flags'] == ACCOUNT_OK) || ($r[0]['account_flags'] == ACCOUNT_UNVERIFIED)))
- get_app()->account = $r[0];
- else
- $_SESSION['account_id'] = 0;
-
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
- FROM `user` WHERE `uid` = %d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
- intval($_SESSION['uid'])
- );
+ if(x($_SESSION,'account_id')) {
+ $r = q("select * from account where account_id = %d limit 1",
+ intval($_SESSION['account_id'])
+ );
+ if(count($r) && (($r[0]['account_flags'] == ACCOUNT_OK) || ($r[0]['account_flags'] == ACCOUNT_UNVERIFIED))) {
+ get_app()->account = $r[0];
+ authenticate_success($r[0]);
+ }
+ else {
+ $_SESSION['account_id'] = 0;
+ nuke_session();
+ goaway(z_root());
+ }
+ }
+ else {
+ $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+ FROM `user` WHERE `uid` = %d AND `blocked` = 0
+ AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+ intval($_SESSION['uid'])
+ );
+ }
if(! count($r)) {
nuke_session();
@@ -139,7 +149,7 @@ function account_verify_password($email,$pass) {
}
else {
- get_app()->account = account_verify_password($_POST['username'],$_POST['password']);
+ $record = get_app()->account = account_verify_password($_POST['username'],$_POST['password']);
if(get_app()->account) {
$_SESSION['account_id'] = get_app()->account['account_id'];
@@ -153,15 +163,15 @@ function account_verify_password($email,$pass) {
// process normal login request
- $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
- FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
- AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
- dbesc(trim($_POST['username'])),
- dbesc(trim($_POST['username'])),
- dbesc($encrypted)
- );
- if(count($r))
- $record = $r[0];
+// $r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
+// FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
+// AND `password` = '%s' AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
+// dbesc(trim($_POST['username'])),
+// dbesc(trim($_POST['username'])),
+// dbesc($encrypted)
+// );
+// if(count($r))
+// $record = $r[0];
}
if((! $record) || (! count($record))) {
View
@@ -8,6 +8,7 @@ function js_strings() {
'$showfewer' => t('show fewer'),
'$pwshort' => t("Password too short"),
'$pwnomatch' => t("Passwords do not match"),
+ '$everybody' => t('everybody'),
'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : 'null'),
'$t02' => ((t('timeago.suffixAgo') != 'timeago.suffixAgo') ? t('timeago.suffixAgo') : 'null'),
View
@@ -1,95 +1,147 @@
<?php
-function authenticate_success($user_record, $login_initial = false, $interactive = false) {
+function authenticate_success($user_record, $login_initial = false, $interactive = false,$return = false) {
$a = get_app();
- $_SESSION['uid'] = $user_record['uid'];
- $_SESSION['theme'] = $user_record['theme'];
- $_SESSION['authenticated'] = 1;
- $_SESSION['page_flags'] = $user_record['page-flags'];
- $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $user_record['nickname'];
- $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
- $a->user = $user_record;
+// logger('authenticate_success: ' . print_r($user_record,true));
+// logger('authenticate_success: ' . print_r($_SESSION,true));
+
+ if(x($user_record,'account_id')) {
+ logger('authenticate_success: Red-style');
+ $a->account = $user_record;
+ $_SESSION['account_id'] = $a->account['account_id'];
+ $_SESSION['authenticated'] = 1;
+
+ if($login_initial) {
+ q("update account set account_lastlog = '%s' where account_id = %d limit 1",
+ dbesc(datetime_convert()),
+ intval($_SESSION['account_id'])
+ );
+ $a->account['account_lastlog'] = datetime_convert();
+ call_hooks('logged_in', $a->account);
- if($interactive) {
- 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);
- }
- $member_since = strtotime($a->user['register_date']);
- if(time() < ($member_since + ( 60 * 60 * 24 * 14)))
- $_SESSION['new_member'] = true;
- else
- $_SESSION['new_member'] = false;
- if(strlen($a->user['timezone'])) {
- date_default_timezone_set($a->user['timezone']);
- $a->timezone = $a->user['timezone'];
- }
+ $uid_to_load = (((x($_SESSION,'uid')) && (intval($_SESSION['uid']))) ? intval($_SESSION['uid']) : 0);
+ if(! $uid_to_load)
+ $uid_to_load = intval($a->account['account_default_entity']);
- $master_record = $a->user;
+ if($uid_to_load) {
+ $r = q("select * from entity where entity_id = %d and entity_account_id = %d limit 1",
+ intval($uid_to_load),
+ intval($a->account['account_id'])
+ );
+ if($r && count($r)) {
+ $_SESSION['uid'] = intval($r[0]['entity_id']);
+ $a->identity = $r[0];
+ $_SESSION['theme'] = $a->identity['entity_theme'];
+ date_default_timezone_set($a->identity['entity_timezone']);
+ }
+
+ }
- if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
- $r = q("select * from user where uid = %d limit 1",
- intval($_SESSION['submanage'])
- );
- if(count($r))
- $master_record = $r[0];
- }
- $r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
- dbesc($master_record['password']),
- dbesc($master_record['email'])
- );
- if($r && count($r))
- $a->identities = $r;
- else
- $a->identities = array();
-
- $r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname`
- from manage left join user on manage.mid = user.uid
- where `manage`.`uid` = %d",
- intval($master_record['uid'])
- );
- if($r && count($r))
- $a->identities = array_merge($a->identities,$r);
-
- if($login_initial)
- logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
-
- $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;
}
+ else {
+ $_SESSION['uid'] = $user_record['uid'];
+ $_SESSION['theme'] = $user_record['theme'];
+ $_SESSION['authenticated'] = 1;
+ $_SESSION['page_flags'] = $user_record['page-flags'];
+ $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $user_record['nickname'];
+ $_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
+
+ $a->user = $user_record;
+
+ if($interactive) {
+ 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);
+ }
+
+ $member_since = strtotime($a->user['register_date']);
+ if(time() < ($member_since + ( 60 * 60 * 24 * 14)))
+ $_SESSION['new_member'] = true;
+ else
+ $_SESSION['new_member'] = false;
+ if(strlen($a->user['timezone'])) {
+ date_default_timezone_set($a->user['timezone']);
+ $a->timezone = $a->user['timezone'];
+ }
+
+ $master_record = $a->user;
- header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
+ if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
+ $r = q("select * from user where uid = %d limit 1",
+ intval($_SESSION['submanage'])
+ );
+ if(count($r))
+ $master_record = $r[0];
+ }
- if($login_initial) {
- $l = get_browser_language();
+ $r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
+ dbesc($master_record['password']),
+ dbesc($master_record['email'])
+ );
+ if($r && count($r))
+ $a->identities = $r;
+ else
+ $a->identities = array();
- q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
- dbesc(datetime_convert()),
- dbesc($l),
- intval($_SESSION['uid'])
+ $r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname`
+ from manage left join user on manage.mid = user.uid
+ where `manage`.`uid` = %d",
+ intval($master_record['uid'])
);
+ if($r && count($r))
+ $a->identities = array_merge($a->identities,$r);
+
+ if($login_initial)
+ logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG);
+
+ $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;
+ }
+
+ header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
+
+ if($login_initial) {
+ $l = get_browser_language();
+
+ q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
+ dbesc(datetime_convert()),
+ dbesc($l),
+ intval($_SESSION['uid'])
+ );
- call_hooks('logged_in', $a->user);
+ call_hooks('logged_in', $a->user);
- if(($a->module !== 'home') && isset($_SESSION['return_url']))
- goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+ }
+ }
+
+
+ if($return || $_SESSION['workflow']) {
+ unset($_SESSION['workflow']);
+ return;
}
+
+
+ if(($a->module !== 'home') && isset($_SESSION['return_url']))
+ goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+
+
}
Oops, something went wrong.

0 comments on commit 7fad83c

Please sign in to comment.