harmacist/vichan
1
0
Fork 0
forked from GithubBackups/vichan
Code Pull Requests Activity

Merge pull request #986 from vichan-devel/5.2.2

Browse Source 
5.2.2
This commit is contained in:
Lorenzo Yario 2025-10-29 17:18:07 -05:00 committed by GitHub
commit 03e86f5bb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/api.php
View File

@ -209,7 +209,7 @@ class Api {
return $apiCatalog; return $apiCatalog;
} }
public function translateBoard(Board $board) { public function translateBoard($board) {
$apiBoard = []; $apiBoard = [];
foreach ($boards as $board) { foreach ($boards as $board) {

10
inc/image.php
View File

@ -250,7 +250,7 @@ class ImageConvert extends ImageBase {
if ($size = @getimagesize($src)) if ($size = @getimagesize($src))
return $size; return $size;
} }
$size = shell_exec_error(($this->gm ? 'gm ' : '') . 'identify -format "%w %h" ' . escapeshellarg($src . '[0]')); $size = shell_exec_error(($this->gm ? 'gm ' : 'magick ') . 'identify -format "%w %h" ' . escapeshellarg($src . '[0]'));
if (preg_match('/^(\d+) (\d+)$/', $size, $m)) if (preg_match('/^(\d+) (\d+)$/', $size, $m))
return array($m[1], $m[2]); return array($m[1], $m[2]);
return false; return false;
@ -276,13 +276,13 @@ class ImageConvert extends ImageBase {
if (!$this->temp) { if (!$this->temp) {
if ($config['strip_exif']) { if ($config['strip_exif']) {
if($error = shell_exec_error(($this->gm ? 'gm ' : '') . 'convert ' . if($error = shell_exec_error(($this->gm ? 'gm convert ' : 'magick ') .
escapeshellarg($this->src) . ' -auto-orient -strip ' . escapeshellarg($src))) { escapeshellarg($this->src) . ' -auto-orient -strip ' . escapeshellarg($src))) {
$this->destroy(); $this->destroy();
error(_('Failed to redraw image!'), null, $error); error(_('Failed to redraw image!'), null, $error);
} }
} else { } else {
if($error = shell_exec_error(($this->gm ? 'gm ' : '') . 'convert ' . if($error = shell_exec_error(($this->gm ? 'gm convert ' : 'magick ') .
escapeshellarg($this->src) . ' -auto-orient ' . escapeshellarg($src))) { escapeshellarg($this->src) . ' -auto-orient ' . escapeshellarg($src))) {
$this->destroy(); $this->destroy();
error(_('Failed to redraw image!'), null, $error); error(_('Failed to redraw image!'), null, $error);
@ -329,7 +329,7 @@ class ImageConvert extends ImageBase {
} else { } else {
$convert_args = &$config['convert_args']; $convert_args = &$config['convert_args'];
if (($error = shell_exec_error(($this->gm ? 'gm ' : '') . 'convert ' . if (($error = shell_exec_error(($this->gm ? 'gm convert ' : 'magick ') .
sprintf($convert_args, sprintf($convert_args,
$this->width, $this->width,
$this->height, $this->height,
@ -348,7 +348,7 @@ class ImageConvert extends ImageBase {
} else { } else {
$convert_args = &$config['convert_args']; $convert_args = &$config['convert_args'];
if (($error = shell_exec_error(($this->gm ? 'gm ' : '') . 'convert ' . if (($error = shell_exec_error(($this->gm ? 'gm convert ' : 'magick ') .
sprintf($convert_args, sprintf($convert_args,
$this->width, $this->width,
$this->height, $this->height,

3
inc/mod/pages.php
View File

@ -57,6 +57,9 @@ function mod_login(Context $ctx, $redirect = false) {
// Check if inputs are set and not empty // Check if inputs are set and not empty
if (!isset($_POST['username'], $_POST['password']) || $_POST['username'] == '' || $_POST['password'] == '') { if (!isset($_POST['username'], $_POST['password']) || $_POST['username'] == '' || $_POST['password'] == '') {
$args['error'] = $config['error']['invalid']; $args['error'] = $config['error']['invalid'];
}
elseif (strlen($_POST['password']) > 128 || strlen($_POST['username']) > 128) {
$args['error'] = $config['error']['infotoolong'];
} elseif (!login($_POST['username'], $_POST['password'])) { } elseif (!login($_POST['username'], $_POST['password'])) {
if ($config['syslog']) if ($config['syslog'])
_syslog(LOG_WARNING, 'Unauthorized login attempt!'); _syslog(LOG_WARNING, 'Unauthorized login attempt!');

4
install.php
View File

@ -1,7 +1,7 @@
<?php <?php
// Installation/upgrade file // Installation/upgrade file
define('VERSION', '5.2.1'); define('VERSION', '5.2.2');
require 'inc/bootstrap.php'; require 'inc/bootstrap.php';
loadConfig(); loadConfig();
@ -1101,4 +1101,4 @@ if ($step == 0) {
} }
echo Element('page.html', $page); echo Element('page.html', $page);
} }

1
static/banners/.gitkeep Normal file
View File

@ -0,0 +1 @@

BIN
static/banners/defaultbanner.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB