aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-20 17:55:40 -0700
committerredmatrix <git@macgirvin.com>2016-07-20 17:57:17 -0700
commitbc8c74eb422387a5537eb923c90a34c1196ce568 (patch)
tree4f8ba641908fd18cc810ee0086684a4041062231 /util
parenteac35c05e9059ba57aefc878cc669eb0efbbd086 (diff)
downloadvolse-hubzilla-bc8c74eb422387a5537eb923c90a34c1196ce568.tar.gz
volse-hubzilla-bc8c74eb422387a5537eb923c90a34c1196ce568.tar.bz2
volse-hubzilla-bc8c74eb422387a5537eb923c90a34c1196ce568.zip
sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for.
Diffstat (limited to 'util')
-rwxr-xr-xutil/fresh7
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)