franzz/mythoughts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix registering

Browse Source
This commit is contained in:
Franzz
2018-11-29 00:10:38 +01:00
parent 8fea4b0b7c
commit 3f6a801c30
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
inc/auth.php
View File

@@ -66,7 +66,7 @@ class Auth extends PhpObject
if(array_key_exists('unknown_user', $asUser)) if(array_key_exists('unknown_user', $asUser))
{ {
$iUserId = $this->addUser($asUser['username'], $sNickName, $asUser['pass'], $bLogMeIn); $iUserId = $this->addUser($asUser['username'], $sNickName, $asUser['http_pass'], $bLogMeIn);
if($iUserId > 0) $bSuccess = true; if($iUserId > 0) $bSuccess = true;
else $sDesc = 'Error: Could not add user'; else $sDesc = 'Error: Could not add user';
} }
@@ -89,7 +89,7 @@ class Auth extends PhpObject
if($asResult['username']!='' && $asResult['http_pass']!='') if($asResult['username']!='' && $asResult['http_pass']!='')
{ {
$asUser = $this->oDb->selectRow(MyThoughts::USER_TABLE, array("MD5(".Db::getText(MyThoughts::USER_TABLE).")"=>$asResult['username'])); $asUser = $this->oDb->selectRow(MyThoughts::USER_TABLE, array(Db::getText(MyThoughts::USER_TABLE)=>$asResult['username']));
if(!empty($asUser)) if(!empty($asUser))
{ {
$asResult += $asUser; $asResult += $asUser;
@@ -134,17 +134,17 @@ class Auth extends PhpObject
} }
} }
public function addUser($sUserName, $sNickName, $sPass, $bLogMeIn=false) public function addUser($sUserHash, $sNickName, $sLoginToken, $bLogMeIn=false)
{ {
$sPass = self::hashPassword($sPass); $sPass = self::hashPassword($sLoginToken);
$bExist = $this->oDb->pingValue(MyThoughts::USER_TABLE, array(Db::getText(MyThoughts::USER_TABLE)=>$sUserName)); $bExist = $this->oDb->pingValue(MyThoughts::USER_TABLE, array(Db::getText(MyThoughts::USER_TABLE)=>$sUserHash));
if($bExist) return -1; if($bExist) return -1;
else else
{ {
$iUserId = $this->oDb->insertRow(MyThoughts::USER_TABLE, array(Db::getText(MyThoughts::USER_TABLE)=>$sUserName, 'nickname'=>$sNickName, 'pass'=>$sPass)); $iUserId = $this->oDb->insertRow(MyThoughts::USER_TABLE, array(Db::getText(MyThoughts::USER_TABLE)=>$sUserHash, 'nickname'=>$sNickName, 'pass'=>$sPass));
if($iUserId>0 && $bLogMeIn) if($iUserId>0 && $bLogMeIn)
{ {
$this->logMeIn($sUserName.self::TOKEN_SEP.$sPass); $this->logMeIn($sUserHash.self::TOKEN_SEP.$sPass);
} }
} }
return $iUserId; return $iUserId;
@@ -167,12 +167,12 @@ class Auth extends PhpObject
$asUsers = $this->oDb->selectRows($asInfo); $asUsers = $this->oDb->selectRows($asInfo);
foreach($asUsers as $asUser) foreach($asUsers as $asUser)
{ {
$sToken = self::hashPassword($asUser[$sUserTextCol]); $sToken = self::hashPassword(self::getLoginToken($asUser[$sUserTextCol]));
$this->oDb->updateRow(MyThoughts::USER_TABLE, array(Db::getId(MyThoughts::USER_TABLE)=>$asUser[$sUserIdCol]), array('pass'=>$sToken)); $this->oDb->updateRow(MyThoughts::USER_TABLE, array(Db::getId(MyThoughts::USER_TABLE)=>$asUser[$sUserIdCol]), array('pass'=>$sToken));
} }
} }
private static function getLoginToken($sPass) public static function getLoginToken($sPass)
{ {
//Add Server Name //Add Server Name
$sServerName = array_key_exists('SERVER_NAME', $_SERVER)?$_SERVER['SERVER_NAME']:$_SERVER['PWD']; $sServerName = array_key_exists('SERVER_NAME', $_SERVER)?$_SERVER['SERVER_NAME']:$_SERVER['PWD'];
@@ -204,7 +204,7 @@ class Auth extends PhpObject
private static function hashPassword($sPass) private static function hashPassword($sPass)
{ {
return password_hash(self::getLoginToken($sPass), self::ALGO, array('cost'=>self::COST)); return password_hash($sPass, self::ALGO, array('cost'=>self::COST));
} }
private static function checkPassword($sPass, $sHash) private static function checkPassword($sPass, $sHash)

1
inc/mythoughts.php
View File

@@ -71,7 +71,6 @@ class MyThoughts extends Main
//Install DB //Install DB
$this->oDb->install(); $this->oDb->install();
$this->oAuth->addUser('franzz', 'Franzz', '123456');
} }
private function setContext($sProcessPage) private function setContext($sProcessPage)

9
masks/logon.html
View File

@@ -3,15 +3,15 @@
<div class="form-group align-items-center"> <div class="form-group align-items-center">
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fal fa-user"></i></span> <span class="input-group-text" data-toggle="tooltip" data-placement="left" title="Username"><i class="fal fa-user"></i></span>
</div> </div>
<input type="text" class="form-control" placeholder="Nickname" name="login" id="login" value="Franzz" /> <input type="text" class="form-control" placeholder="Nickname" name="login" id="login" tool value="Franzz" />
</div> </div>
</div> </div>
<div class="form-group align-items-center"> <div class="form-group align-items-center">
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fal fa-password"></i></span> <span class="input-group-text" data-toggle="tooltip" data-placement="left" title="Password"><i class="fal fa-password"></i></span>
</div> </div>
<input type="password" class="form-control" placeholder="Password" name="pass" id="pass" value="123456" /> <input type="password" class="form-control" placeholder="Password" name="pass" id="pass" value="123456" />
</div> </div>
@@ -19,7 +19,7 @@
<div id="pass_conf_box" class="form-group align-items-center collapse"> <div id="pass_conf_box" class="form-group align-items-center collapse">
<div class="input-group"> <div class="input-group">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"> <span class="input-group-text" data-toggle="tooltip" data-placement="left" title="Repeat password">
<i class="fal fa-password first"></i> <i class="fal fa-password first"></i>
<i class="fal fa-password second"></i> <i class="fal fa-password second"></i>
</span> </span>
@@ -37,6 +37,7 @@
oMyThoughts.pageInit = function(asHash, bFirstPage) oMyThoughts.pageInit = function(asHash, bFirstPage)
{ {
self.elem.$Main.addClass('no_frame'); self.elem.$Main.addClass('no_frame');
$('[data-toggle="tooltip"]').tooltip();
//$(window).keyup(function(e){if(e.which==13) logMeIn();}); //$(window).keyup(function(e){if(e.which==13) logMeIn();});
$('#signin').click(logMeIn); $('#signin').click(logMeIn);