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

Store gravatar image in DB

Browse Source
This commit is contained in:
Franzz
2021-02-15 21:59:48 +01:00
parent 1480545f1b
commit 3d5450319d
4 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
files/db/update_v11_to_v12.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE users ADD gravatar LONGTEXT AFTER email;

7
inc/spot.php
View File

@@ -83,7 +83,7 @@ class Spot extends Main
Project::PROJ_TABLE => array('name', 'codename', 'active_from', 'active_to', 'timezone'), Project::PROJ_TABLE => array('name', 'codename', 'active_from', 'active_to', 'timezone'),
self::POST_TABLE => array(Db::getId(Project::PROJ_TABLE), Db::getId(User::USER_TABLE), 'name', 'content', 'site_time'), self::POST_TABLE => array(Db::getId(Project::PROJ_TABLE), Db::getId(User::USER_TABLE), 'name', 'content', 'site_time'),
Media::MEDIA_TABLE => array(Db::getId(Project::PROJ_TABLE), 'filename', 'type', 'taken_on', 'posted_on', 'rotate', 'comment'), Media::MEDIA_TABLE => array(Db::getId(Project::PROJ_TABLE), 'filename', 'type', 'taken_on', 'posted_on', 'rotate', 'comment'),
User::USER_TABLE => array('name', 'email', 'language', 'timezone', 'active'), User::USER_TABLE => array('name', 'email', 'gravatar', 'language', 'timezone', 'active'),
self::MAP_TABLE => array('codename', 'geo_name', 'min_zoom', 'max_zoom', 'attribution'), self::MAP_TABLE => array('codename', 'geo_name', 'min_zoom', 'max_zoom', 'attribution'),
self::MAPPING_TABLE => array(Db::getId(self::MAP_TABLE) , Db::getId(Project::PROJ_TABLE)) self::MAPPING_TABLE => array(Db::getId(self::MAP_TABLE) , Db::getId(Project::PROJ_TABLE))
), ),
@@ -120,7 +120,8 @@ class Spot extends Main
'geo_name' => "VARCHAR(100)", 'geo_name' => "VARCHAR(100)",
'min_zoom' => "TINYINT UNSIGNED", 'min_zoom' => "TINYINT UNSIGNED",
'max_zoom' => "TINYINT UNSIGNED", 'max_zoom' => "TINYINT UNSIGNED",
'attribution' => "VARCHAR(100)" 'attribution' => "VARCHAR(100)",
'gravatar' => "LONGTEXT"
), ),
'constraints' => array 'constraints' => array
( (
@@ -361,7 +362,7 @@ class Spot extends Main
private function getPosts() private function getPosts()
{ {
$asInfo = array( $asInfo = array(
'select' => array(Db::getFullColumnName(self::POST_TABLE, '*'), 'MD5(email) AS email_hash'), 'select' => array(Db::getFullColumnName(self::POST_TABLE, '*'), 'gravatar'),
'from' => self::POST_TABLE, 'from' => self::POST_TABLE,
'join' => array(User::USER_TABLE => Db::getId(User::USER_TABLE)), 'join' => array(User::USER_TABLE => Db::getId(User::USER_TABLE)),
'constraint'=> array(Db::getId(Project::PROJ_TABLE) => $this->oProject->getProjectId()), 'constraint'=> array(Db::getId(Project::PROJ_TABLE) => $this->oProject->getProjectId()),

54
inc/user.php
View File

@@ -1,10 +1,10 @@
<?php <?php
class User extends PhpObject { class User extends PhpObject {
//DB Tables //DB Tables
const USER_TABLE = 'users'; const USER_TABLE = 'users';
//Cookie //Cookie
const COOKIE_ID_USER = 'subscriber'; const COOKIE_ID_USER = 'subscriber';
const COOKIE_DURATION = 60 * 60 * 24 * 365; //1 year const COOKIE_DURATION = 60 * 60 * 24 * 365; //1 year
@@ -13,11 +13,11 @@ class User extends PhpObject {
* @var Db * @var Db
*/ */
private $oDb; private $oDb;
//User Info //User Info
private $iUserId; private $iUserId;
private $asUserInfo; private $asUserInfo;
public function __construct(Db &$oDb) { public function __construct(Db &$oDb) {
parent::__construct(__CLASS__, Settings::DEBUG); parent::__construct(__CLASS__, Settings::DEBUG);
$this->oDb = &$oDb; $this->oDb = &$oDb;
@@ -25,19 +25,19 @@ class User extends PhpObject {
$this->asUserInfo = array(Db::getId(self::USER_TABLE)=>0, 'name'=>'', 'email'=>'', 'language'=>'', 'timezone'=>'', 'active'=>'0'); $this->asUserInfo = array(Db::getId(self::USER_TABLE)=>0, 'name'=>'', 'email'=>'', 'language'=>'', 'timezone'=>'', 'active'=>'0');
$this->checkUserCookie(); $this->checkUserCookie();
} }
public function getLang() { public function getLang() {
return $this->asUserInfo['language']; return $this->asUserInfo['language'];
} }
public function addUser($sEmail, $sLang, $sTimezone) { public function addUser($sEmail, $sLang, $sTimezone) {
$bSuccess = false; $bSuccess = false;
$sDesc = ''; $sDesc = '';
$sEmail = trim($sEmail); $sEmail = trim($sEmail);
//Check Email availability //Check Email availability
$iUserId = $this->oDb->selectValue(self::USER_TABLE, Db::getId(self::USER_TABLE), array('email'=>$sEmail, 'active'=>'1')); $iUserId = $this->oDb->selectValue(self::USER_TABLE, Db::getId(self::USER_TABLE), array('email'=>$sEmail, 'active'=>'1'));
if($iUserId > 0) { if($iUserId > 0) {
//Log user in //Log user in
$sDesc = 'lang:nl_email_exists'; $sDesc = 'lang:nl_email_exists';
@@ -48,6 +48,7 @@ class User extends PhpObject {
$iUserId = $this->oDb->insertUpdateRow(self::USER_TABLE, array('email'=>$sEmail, 'language'=>$sLang, 'timezone'=>$sTimezone, 'active'=>'1'), array('email')); $iUserId = $this->oDb->insertUpdateRow(self::USER_TABLE, array('email'=>$sEmail, 'language'=>$sLang, 'timezone'=>$sTimezone, 'active'=>'1'), array('email'));
if($iUserId==0) $sDesc = 'lang:error_commit_db'; if($iUserId==0) $sDesc = 'lang:error_commit_db';
else { else {
$this->updateGravatar($iUserId, $sEmail);
$sDesc = 'lang:nl_subscribed'; $sDesc = 'lang:nl_subscribed';
$bSuccess = true; $bSuccess = true;
} }
@@ -58,14 +59,14 @@ class User extends PhpObject {
$this->setUserId($iUserId); $this->setUserId($iUserId);
$this->updateCookie(self::COOKIE_DURATION); $this->updateCookie(self::COOKIE_DURATION);
} }
return Spot::getResult($bSuccess, $sDesc); return Spot::getResult($bSuccess, $sDesc);
} }
public function removeUser() { public function removeUser() {
$bSuccess = false; $bSuccess = false;
$sDesc = ''; $sDesc = '';
if($this->iUserId > 0) { if($this->iUserId > 0) {
$iUserId = $this->oDb->updateRow(self::USER_TABLE, $this->iUserId, array('active'=>'0')); $iUserId = $this->oDb->updateRow(self::USER_TABLE, $this->iUserId, array('active'=>'0'));
if($iUserId==0) $sDesc = 'lang:error_commit_db'; if($iUserId==0) $sDesc = 'lang:error_commit_db';
@@ -76,41 +77,46 @@ class User extends PhpObject {
} }
} }
else $sDesc = 'lang:nl_unknown_email'; else $sDesc = 'lang:nl_unknown_email';
return Spot::getResult($bSuccess, $sDesc); return Spot::getResult($bSuccess, $sDesc);
} }
public function updateNickname($sNickname) { public function updateNickname($sNickname) {
if($this->iUserId > 0 && $sNickname!='') $this->oDb->updateRow(self::USER_TABLE, $this->iUserId, array('name'=>$sNickname)); if($this->iUserId > 0 && $sNickname!='') $this->oDb->updateRow(self::USER_TABLE, $this->iUserId, array('name'=>$sNickname));
} }
private function updateGravatar($iUserId, $sEmail) {
$sImage = ($sEmail != '')?@file_get_contents('https://www.gravatar.com/avatar/'.md5($sEmail).'.png?d=404&s=24'):'';
$this->oDb->updateRow(self::USER_TABLE, $iUserId, array('gravatar' => base64_encode($sImage)));
}
private function checkUserCookie() { private function checkUserCookie() {
if(isset($_COOKIE[self::COOKIE_ID_USER])){ if(isset($_COOKIE[self::COOKIE_ID_USER])){
$this->setUserId($_COOKIE[self::COOKIE_ID_USER]); $this->setUserId($_COOKIE[self::COOKIE_ID_USER]);
//Extend cookie life //Extend cookie life
if($this->iUserId > 0) $this->updateCookie(self::COOKIE_DURATION); if($this->iUserId > 0) $this->updateCookie(self::COOKIE_DURATION);
} }
} }
public function getUserId() { public function getUserId() {
return $this->iUserId; return $this->iUserId;
} }
public function setUserId($iUserId) { public function setUserId($iUserId) {
$this->iUserId = 0; $this->iUserId = 0;
$asUser = $this->getActiveUsersInfo($iUserId); $asUser = $this->getActiveUsersInfo($iUserId);
if(!empty($asUser)) { if(!empty($asUser)) {
$this->iUserId = $iUserId; $this->iUserId = $iUserId;
$this->asUserInfo = array_shift($asUser); $this->asUserInfo = array_shift($asUser);
} }
} }
public function getUserInfo() { public function getUserInfo() {
return $this->asUserInfo; return $this->asUserInfo;
} }
public function getActiveUsersInfo($iUserId=-1) { public function getActiveUsersInfo($iUserId=-1) {
$asInfo = array( $asInfo = array(
'select' => array_keys($this->asUserInfo), 'select' => array_keys($this->asUserInfo),
@@ -118,11 +124,11 @@ class User extends PhpObject {
'constraint'=> array('active'=>'1') 'constraint'=> array('active'=>'1')
); );
if($iUserId != -1) $asInfo['constraint'][Db::getId(self::USER_TABLE)] = $iUserId; if($iUserId != -1) $asInfo['constraint'][Db::getId(self::USER_TABLE)] = $iUserId;
return $this->oDb->selectRows($asInfo); return $this->oDb->selectRows($asInfo);
} }
private function updateCookie($iDeltaTime) { private function updateCookie($iDeltaTime) {
setcookie(self::COOKIE_ID_USER, ($iDeltaTime < 0)?'':$this->iUserId, array('samesite' => 'Lax', 'expires' => time() + $iDeltaTime)); setcookie(self::COOKIE_ID_USER, ($iDeltaTime < 0)?'':$this->iUserId, array('samesite' => 'Lax', 'expires' => time() + $iDeltaTime));
} }
} }

2
masks/project.html
View File

@@ -843,7 +843,7 @@ function getPost(asPost) {
break; break;
case 'post': case 'post':
bLink = true; bLink = true;
var $SigImg = asPost.email_hash?$('<img>', {'src':'https://www.gravatar.com/avatar/'+asPost.email_hash+'?d=404&s=24', 'alt':'--'}):($('<span>').text('-- ')); var $SigImg = asPost.gravatar?$('<img>', {'src':'data:image/png;base64, '+asPost.gravatar, 'alt':'--'}):($('<span>').text('-- '));
$Body = $('<div>') $Body = $('<div>')
.append($('<p>', {'class':'message'}).text(asPost.content)) .append($('<p>', {'class':'message'}).text(asPost.content))
.append($('<p>', {'class':'signature'}) .append($('<p>', {'class':'signature'})