Skip to content

Commit 6773cec

Browse files
danieldaniel
daniel
authored and
daniel
committed
Encode pass correctly
1 parent 2e8a70e commit 6773cec

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

objects/Login.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?php
22

33
require_once dirname(__FILE__) . '/../videos/configuration.php';
4-
require_once dirname(__FILE__) .'/Streamer.php';
4+
require_once dirname(__FILE__) . '/Streamer.php';
5+
56
class Login {
67

7-
static function run($user, $pass, $youPHPTubeURL, $encodedPass=false) {
8+
static function run($user, $pass, $youPHPTubeURL, $encodedPass = false) {
89
global $global;
910
if (substr($youPHPTubeURL, -1) !== '/') {
1011
$youPHPTubeURL .= "/";
1112
}
12-
13+
1314
$postdata = http_build_query(
1415
array(
1516
'user' => $user,
@@ -33,34 +34,33 @@ static function run($user, $pass, $youPHPTubeURL, $encodedPass=false) {
3334
$context = stream_context_create($opts);
3435

3536
$result = @file_get_contents($youPHPTubeURL . 'login', false, $context);
36-
if(empty($result)){
37+
if (empty($result)) {
3738
$object = new stdClass();
3839
$object->streamer = false;
3940
$object->streamers_id = 0;
4041
$object->isLogged = false;
4142
$object->isAdmin = false;
4243
$object->canUpload = false;
4344
$object->canComment = false;
44-
}else{
45+
} else {
4546
$object = json_decode($result);
4647
$object->streamer = $youPHPTubeURL;
47-
$object->streamers_id = 0;
48-
if(!empty($object->canUpload)){
48+
$object->streamers_id = 0;
49+
if (!empty($object->canUpload)) {
4950
$object->streamers_id = Streamer::createIfNotExists($user, $pass, $youPHPTubeURL, $encodedPass);
5051
}
51-
if($object->streamers_id){
52+
if ($object->streamers_id) {
5253
$s = new Streamer($object->streamers_id);
5354
$object->isAdmin = $s->getIsAdmin();
54-
if(!$encodedPass){
55+
if (!$encodedPass || $encodedPass === 'false') {
5556
$pass = md5($pass);
5657
}
5758
// update pass
5859
$s->setPass($pass);
5960
$s->save();
6061
}
6162
}
62-
$_SESSION['login'] = $object;
63-
63+
$_SESSION['login'] = $object;
6464
}
6565

6666
static function logoff() {
@@ -82,16 +82,16 @@ static function canUpload() {
8282
static function canComment() {
8383
return !empty($_SESSION['login']->canComment);
8484
}
85-
85+
8686
static function getStreamerURL() {
87-
if(!static::isLogged()){
87+
if (!static::isLogged()) {
8888
return false;
8989
}
9090
return $_SESSION['login']->streamer;
9191
}
92-
92+
9393
static function getStreamerId() {
94-
if(!static::isLogged()){
94+
if (!static::isLogged()) {
9595
return false;
9696
}
9797
return $_SESSION['login']->streamers_id;

0 commit comments

Comments
 (0)