bugfix, profile picture WIP, profile frontend refactored
This commit is contained in:
@@ -4,6 +4,7 @@ namespace Core\Objects;
|
||||
|
||||
use Core\Configuration\Configuration;
|
||||
use Core\Configuration\Settings;
|
||||
use Core\Driver\SQL\Column\Column;
|
||||
use Core\Driver\SQL\Condition\Compare;
|
||||
use Core\Driver\SQL\Condition\CondLike;
|
||||
use Core\Driver\SQL\Condition\CondOr;
|
||||
@@ -125,9 +126,9 @@ class Context {
|
||||
if ($this->sql) {
|
||||
$language = Language::findBy(Language::createBuilder($this->sql, true)
|
||||
->where(new CondOr(
|
||||
new CondLike("name", "%$lang%"), // english
|
||||
new CondLike(new Column("name"), "%$lang%"), // english
|
||||
new Compare("code", $lang), // de_DE
|
||||
new CondLike("code", "{$lang}_%") // de -> de_%
|
||||
new CondLike(new Column("code"), "{$lang}_%") // de -> de_%
|
||||
))
|
||||
);
|
||||
if ($language) {
|
||||
|
||||
@@ -38,8 +38,9 @@ class AuthenticationData extends ApiObject {
|
||||
$credentialIdLength = unpack("n", substr($buffer, $offset, 4))[1]; $offset += 2;
|
||||
$this->credentialID = substr($buffer, $offset, $credentialIdLength); $offset += $credentialIdLength;
|
||||
|
||||
if ($offset < $bufferLength) {
|
||||
if ($bufferLength > $offset) {
|
||||
$publicKeyData = $this->decode(substr($buffer, $offset));
|
||||
var_dump($publicKeyData);
|
||||
$this->publicKey = new PublicKey($publicKeyData);
|
||||
// TODO: we should add $publicKeyData->length to $offset, but it's not implemented yet?;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user