Composer/CoreLibs-Composer-All
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools update, bug fix Strings to return path if null, Fix form list loader, fix paths

Browse Source
This commit is contained in:
Clemens Schwaighofer
2024-03-07 15:01:19 +09:00
parent d3d4cf512f
commit 8c607ae610
16 changed files with 200 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Output/Form/Generate.php
View File

@@ -826,27 +826,28 @@ class Generate
$pk_selected = $res[$this->int_pk_name];
}
$t_string = '';
foreach ($this->field_array as $i => $field_array) {
foreach ($this->field_array as $field_array) {
if ($t_string) {
$t_string .= ', ';
}
if (isset($field_array['before_value'])) {
$t_string .= $field_array['before_value'];
if (!empty($field_array['before_value'])) {
$t_string .= $this->l->__($field_array['before_value']);
}
// must have res element set
if (
isset($field_array['name']) &&
!empty($field_array['name']) &&
isset($res[$field_array['name']])
) {
if (isset($field_array['binary'])) {
if (isset($field_array['binary'][0])) {
$t_string .= $field_array['binary'][0];
} elseif (isset($field_array['binary'][1])) {
$t_string .= $field_array['binary'][1];
}
$_t_value = '';
// if we have a binary set, where 0 = YES and 1 = NO
if (!empty($field_array['binary'])) {
$_t_value = !empty($res[$field_array['name']]) ?
($field_array['binary'][0] ?? 'Yes') :
($field_array['binary'][1] ?? 'No');
} else {
$t_string .= $res[$field_array['name']];
$_t_value = $res[$field_array['name']];
}
$t_string .= $this->l->__($_t_value);
}
}
$pk_names[] = $t_string;

4
src/Output/Image.php
View File

@@ -204,11 +204,11 @@ class Image
E_USER_DEPRECATED
);
// NOTE: we need to depracte this
$cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE . IMAGES;
$cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE . IMAGES;
$web_folder = LAYOUT . CACHE . IMAGES;
if (!is_dir($cache_folder)) {
if (false === mkdir($cache_folder)) {
$cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE;
$cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE;
$web_folder = LAYOUT . CACHE;
}
}

4
src/Output/ProgressBar.php
View File

@@ -156,7 +156,7 @@ class ProgressBar
{
// avoid divison through 0
if ($this->max - $this->min == 0) {
$this->max ++;
$this->max++;
}
$percent = round(($step - $this->min) / ($this->max - $this->min) * 100);
if ($percent > 100) {
@@ -186,7 +186,7 @@ class ProgressBar
}
// avoid divison through 0
if ($this->max - $this->min == 0) {
$this->max ++;
$this->max++;
}
$pixel = round(($step - $this->min) * ($bar - ($this->pedding * 2)) / ($this->max - $this->min));
if ($step <= $this->min) {