yohan/SemanticScuttle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CS fixes for privatekey

Browse Source
This commit is contained in:
Christian Weiske 2011-04-11 16:43:08 +02:00
parent 92f64f95cb
commit 8982afef1e
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/SemanticScuttle/Service/User.php
View File

@ -514,12 +514,12 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
/** /**
* Set the current user ID (i.e. when logging on) * Set the current user ID (i.e. when logging on)
* *
* @internal
* No ID verification is being done.
*
* @param integer $user User ID or null to unset the user * @param integer $user User ID or null to unset the user
* *
* @return void * @return void
*
* @internal
* No ID verification is being done.
*/ */
public function setCurrentUserId($user) public function setCurrentUserId($user)
{ {
@ -856,7 +856,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
/** /**
* Update User Record * Update User Record
* *
* @param string $uId User ID * @param integer $uId User ID
* @param string $password User Password * @param string $password User Password
* @param string $name User Name * @param string $name User Name
* @param string $email Email Address * @param string $email Email Address
@ -867,7 +867,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
* *
* @return boolean true if it successful, false if not * @return boolean true if it successful, false if not
*/ */
function updateUser( public function updateUser(
$uId, $password, $name, $email, $homepage, $uContent, $uId, $password, $name, $email, $homepage, $uContent,
$privateKey = null, $enablePrivateKey = false $privateKey = null, $enablePrivateKey = false
) { ) {
@ -875,18 +875,22 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
return false; return false;
} }
// prepend - to privateKey if disabled // prepend '-' to privateKey if disabled
if ($privateKey!=null and strlen($privateKey)==32 and $enablePrivateKey==false) { if ($privateKey != null && strlen($privateKey) == 32
$privateKey = "-".$privateKey; && $enablePrivateKey == false
) {
$privateKey = '-' . $privateKey;
} }
// remove - from privateKey if enabling // remove '-' from privateKey if enabling
if ($privateKey!=null and strlen($privateKey)==33 and $enablePrivateKey==true) { if ($privateKey != null && strlen($privateKey) == 33
&& $enablePrivateKey == true
) {
$privateKey = substr($privateKey, 1, 32); $privateKey = substr($privateKey, 1, 32);
} }
// if new user is enabling Private Key, create new key // if new user is enabling Private Key, create new key
if ($privateKey==null and $enablePrivateKey==true) { if ($privateKey == null && $enablePrivateKey == true) {
$privateKey = $this->getNewPrivateKey(); $privateKey = $this->getNewPrivateKey();
} }