File tree Expand file tree Collapse file tree 2 files changed +11
-2
lines changed
Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change 5555 $ _REQUEST ['encodedPass ' ] = 1 ;
5656}
5757useVideoHashOrLogin ();
58+ _error_log ("aVideoEncoder.json: after useVideoHashOrLogin - User::getId()= " . User::getId () . " isLogged= " . (User::isLogged () ? 'true ' : 'false ' ) . " videos_id= " . @$ _REQUEST ['videos_id ' ] . " video_id_hash= " . @$ _REQUEST ['video_id_hash ' ]);
5859if (!User::canUpload ()) {
5960 $ obj ->msg = __ ("Permission denied to receive a file " ) . ': ' . json_encode ($ _REQUEST );
6061 _error_log ("aVideoEncoder.json: {$ obj ->msg } canUploadMessage=[ {$ canUploadMessage }] " . json_encode (User::canNotUploadReason ()));
Original file line number Diff line number Diff line change @@ -6737,9 +6737,17 @@ function useVideoHashOrLogin()
67376737 $ videos_id = Video::getVideoIdFromHash ($ _REQUEST ['video_id_hash ' ]);
67386738 if (!empty ($ videos_id )) {
67396739 $ users_id = Video::getOwner ($ videos_id );
6740+ _error_log ("useVideoHashOrLogin: users_id= " . json_encode ($ users_id ) . " videos_id= $ videos_id " );
6741+ if (empty ($ users_id )) {
6742+ _error_log ("useVideoHashOrLogin: ERROR - Video::getOwner( $ videos_id) returned empty, cannot authenticate via hash. Falling back to loginFromRequest. " );
6743+ return User::loginFromRequest ();
6744+ }
67406745 $ user = new User ($ users_id );
6741- _error_log ("useVideoHashOrLogin: $ users_id, $ videos_id " );
6742- return $ user ->login (true );
6746+ $ loginResult = $ user ->login (true );
6747+ _error_log ("useVideoHashOrLogin: login result= $ loginResult for users_id= $ users_id ( " . User::USER_LOGGED . "=USER_LOGGED, " . User::USER_NOT_FOUND . "=USER_NOT_FOUND) " );
6748+ return $ loginResult ;
6749+ } else {
6750+ _error_log ("useVideoHashOrLogin: ERROR - could not decode video_id_hash into a valid videos_id. hash= " . $ _REQUEST ['video_id_hash ' ]);
67436751 }
67446752 }
67456753 return User::loginFromRequest ();
You can’t perform that action at this time.
0 commit comments