diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-20 19:03:18 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-20 19:03:18 -0700 |
| commit | 6a56a509d3df833c82b876cf89f0bbab2a26c641 (patch) | |
| tree | f78ed120a535606929d3f701f917fc048a70a8c2 /util/fresh | |
| parent | df0cd4dbc7fbd4d31a953144e0af75ab27447969 (diff) | |
| parent | 779885f9afe99980c32d2bf30757cc655e5d9427 (diff) | |
| download | volse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.tar.gz volse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.tar.bz2 volse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'util/fresh')
| -rwxr-xr-x | util/fresh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util/fresh b/util/fresh index 9d74ea584..7f57931aa 100755 --- a/util/fresh +++ b/util/fresh @@ -82,12 +82,15 @@ function process_command($line) { exec('/bin/stty echo'); echo "\n"; require_once('include/auth.php'); - $record = App::$account = account_verify_password(argv(1),trim($x,"\n")); + $record = null; + $x = account_verify_password(argv(1),trim($x,"\n")); + if($x['account']) + $record = App::$account = $x['account']; if($record) { $_SESSION['account_id'] = App::$account['account_id']; $_SESSION['last_login_date'] = datetime_convert(); - authenticate_success($record, true, true); + authenticate_success($record, $x['channel'], true, true); echo 'logged in'; $channel = App::get_channel(); if($channel) |