1
0
mirror of https://github.com/typemill/typemill.git synced 2025-08-09 07:36:34 +02:00

Version 1.4.0

This commit is contained in:
trendschau
2020-10-03 21:28:20 +02:00
parent 5a0ad33e19
commit c1c40924db
91 changed files with 2420 additions and 1146 deletions

View File

@@ -249,5 +249,5 @@ class ProcessAssets
}
return $bytes;
}
}
}

View File

@@ -177,7 +177,7 @@ class ProcessImage extends ProcessAssets
$new = imagecreatetruecolor($desired['width'], $desired['height']);
// preserve transparency
if($imageType == "gif" or $imageType == "png")
if($imageType == "gif" or $imageType == "png" or $imageType == "webp")
{
imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
imagealphablending($new, false);
@@ -214,6 +214,10 @@ class ProcessImage extends ProcessAssets
{
$result = imagegif( $image, $folder . $name . '.gif' );
}
elseif($type == "webp")
{
$result = imagewebp( $image, $folder . $name . '.webp', 100);
}
elseif($type == "jpg" OR $type == "jpeg")
{
$result = imagejpeg( $image, $folder . $name . '.' . $type );
@@ -400,6 +404,7 @@ class ProcessImage extends ProcessAssets
case 'jpg' :
case 'jpeg': $image = imagecreatefromjpeg($imagePath); break;
case 'png': $image = imagecreatefrompng($imagePath); break;
case 'webp': $image = imagecreatefromwebp($imagePath); break;
default: return 'image type not supported';
}

View File

@@ -38,26 +38,12 @@ class User extends WriteYaml
}
public function createUser($params)
{
$userdata = array(
'username' => $params['username'],
'email' => $params['email'],
'password' => $this->generatePassword($params['password']),
'userrole' => $params['userrole']
);
if(isset($params['firstname']))
{
$userdata['firstname'] = $params['firstname'];
}
if(isset($params['lastname']))
{
$userdata['lastname'] = $params['lastname'];
}
{
$params['password'] = $this->generatePassword($params['password']);
if($this->updateYaml('settings/users', $userdata['username'] . '.yaml', $userdata))
if($this->updateYaml('settings/users', $params['username'] . '.yaml', $params))
{
return $userdata['username'];
return $params['username'];
}
return false;
}
@@ -81,11 +67,14 @@ class User extends WriteYaml
}
$update = array_merge($userdata, $params);
# cleanup data here
$this->updateYaml('settings/users', $userdata['username'] . '.yaml', $update);
# if user updated his own profile, update session data
if($_SESSION['user'] == $params['username'])
if(isset($_SESSION['user']) && $_SESSION['user'] == $params['username'])
{
$_SESSION['role'] = $update['userrole'];

View File

@@ -29,12 +29,12 @@ class Validation
Validator::addRule('image_types', function($field, $value, array $params, array $fields) use ($user)
{
$allowed = ['jpg', 'jpeg', 'png'];
$allowed = ['jpg', 'jpeg', 'png', 'webp'];
$pathinfo = pathinfo($value);
$extension = strtolower($pathinfo['extension']);
if(array_search($extension, $allowed)){ return true; }
if(in_array($extension, $allowed)){ return true; }
return false;
}, 'only jpg, jpeg, png allowed');
}, 'only jpg, jpeg, png, webp, allowed');
Validator::addRule('userAvailable', function($field, $value, array $params, array $fields) use ($user)
{

View File

@@ -46,11 +46,16 @@ class WriteCache extends Write
public function updateCache($folderName, $cacheFileName, $requestFileName, $cacheData)
{
$sCacheData = serialize($cacheData);
$this->writeFile($folderName, $cacheFileName, $sCacheData);
if($requestFileName)
if($this->writeFile($folderName, $cacheFileName, $sCacheData))
{
$this->writeFile($folderName, $requestFileName, time());
if($requestFileName)
{
$this->writeFile($folderName, $requestFileName, time());
}
return true;
}
return false;
}
/**