CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Smarty Update v4.6.1, Bug fixes in DB\Extended\ArrayIO and Form\Generate

Browse Source
This commit is contained in:
Clemens Schwaighofer
2024-03-19 10:43:12 +09:00
parent 13c76efcef
commit db1007ef12
13 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
4dev/bin/mo_to_js.sh
View File

@@ -28,7 +28,7 @@ if [ "${target}" == '' ]; then
# default is admin # default is admin
TEXTDOMAIN=admin; TEXTDOMAIN=admin;
fi; fi;
js_folder="layout/${TEXTDOMAIN}/javascript/"; js_folder="${TEXTDOMAIN}/layout/javascript/";
error=0; error=0;
# this checks if the TEXTDOMAIN target actually exists # this checks if the TEXTDOMAIN target actually exists

8
www/composer.lock generated
View File

@@ -8,11 +8,11 @@
"packages": [ "packages": [
{ {
"name": "egrajp/smarty-extended", "name": "egrajp/smarty-extended",
"version": "4.4.1", "version": "4.5.1",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.4.1/egrajp-smarty-extended.4.4.1.zip", "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.1/egrajp-smarty-extended.4.5.1.zip",
"shasum": "edd7a0960e49bfcc709e0a525729aaaf9ed0db75" "shasum": "1461a83b478b8a34cb7b92aedb283ec673cbdc02"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -34,7 +34,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2024-03-06T18:43:44+09:00" "time": "2024-03-19T10:35:55+09:00"
}, },
{ {
"name": "gullevek/dotenv", "name": "gullevek/dotenv",

2
www/lib/CoreLibs/DB/Extended/ArrayIO.php
View File

@@ -236,7 +236,7 @@ class ArrayIO extends \CoreLibs\DB\IO
*/ */
public function getPkId(): int|string|null public function getPkId(): int|string|null
{ {
return $this->pk_id; return $this->pk_id ?? null;
} }
/** /**

2
www/lib/CoreLibs/Output/Form/Generate.php
View File

@@ -1507,7 +1507,7 @@ class Generate
} }
if ( if (
!empty($this->reference_array[$key]['mandatory']) && !empty($this->reference_array[$key]['mandatory']) &&
!$this->reference_array[$key]['selected'][0] empty($this->reference_array[$key]['selected'][0])
) { ) {
$this->msg .= sprintf( $this->msg .= sprintf(
$this->l->__('Please select at least one Element from field <b>%s</b>!<br>'), $this->l->__('Please select at least one Element from field <b>%s</b>!<br>'),

1
www/lib/CoreLibs/Output/Form/TableArrays/EditPages.php
View File

@@ -53,6 +53,7 @@ class EditPages implements Interface\TableArraysInterface
'value' => $_POST['name'] ?? '', 'value' => $_POST['name'] ?? '',
'output_name' => 'Page name', 'output_name' => 'Page name',
'mandatory' => 1, 'mandatory' => 1,
'error_check' => 'unique',
'type' => 'text' 'type' => 'text'
], ],
'order_number' => [ 'order_number' => [

10
www/vendor/composer/installed.json vendored
View File

@@ -2,14 +2,14 @@
"packages": [ "packages": [
{ {
"name": "egrajp/smarty-extended", "name": "egrajp/smarty-extended",
"version": "4.4.1", "version": "4.5.1",
"version_normalized": "4.4.1.0", "version_normalized": "4.5.1.0",
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.4.1/egrajp-smarty-extended.4.4.1.zip", "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.1/egrajp-smarty-extended.4.5.1.zip",
"shasum": "edd7a0960e49bfcc709e0a525729aaaf9ed0db75" "shasum": "1461a83b478b8a34cb7b92aedb283ec673cbdc02"
}, },
"time": "2024-03-06T18:43:44+09:00", "time": "2024-03-19T10:35:55+09:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

4
www/vendor/composer/installed.php vendored
View File

@@ -20,8 +20,8 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'egrajp/smarty-extended' => array( 'egrajp/smarty-extended' => array(
'pretty_version' => '4.4.1', 'pretty_version' => '4.5.1',
'version' => '4.4.1.0', 'version' => '4.5.1.0',
'reference' => null, 'reference' => null,
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../egrajp/smarty-extended', 'install_path' => __DIR__ . '/../egrajp/smarty-extended',

2
www/vendor/egrajp/smarty-extended/publish/last.published vendored
View File

@@ -1 +1 @@
4.3.4 4.4.1

2
www/vendor/egrajp/smarty-extended/src/Smarty.class.php vendored
View File

@@ -107,7 +107,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '4.4.1'; const SMARTY_VERSION = '4.5.1';
/** /**
* define variable scopes * define variable scopes
*/ */

8
www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_compile_private_modifier.php vendored
View File

@@ -109,9 +109,11 @@ class Smarty_Internal_Compile_Private_Modifier extends Smarty_Internal_CompileBa
if (!is_object($compiler->smarty->security_policy) if (!is_object($compiler->smarty->security_policy)
|| $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler) || $compiler->smarty->security_policy->isTrustedPhpModifier($modifier, $compiler)
) { ) {
trigger_error('Using php-function "' . $modifier . '" as a modifier is deprecated and will be ' . if (!in_array($modifier, ['time', 'join', 'is_array', 'in_array'])) {
'removed in a future release. Use Smarty::registerPlugin to explicitly register ' . trigger_error('Using unregistered function "' . $modifier . '" in a template is deprecated and will be ' .
'a custom modifier.', E_USER_DEPRECATED); 'removed in a future release. Use Smarty::registerPlugin to explicitly register ' .
'a custom modifier.', E_USER_DEPRECATED);
}
$output = "{$modifier}({$params})"; $output = "{$modifier}({$params})";
} }
$compiler->known_modifier_type[ $modifier ] = $type; $compiler->known_modifier_type[ $modifier ] = $type;

12
www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templatecompilerbase.php vendored
View File

@@ -640,7 +640,17 @@ abstract class Smarty_Internal_TemplateCompilerBase
return $func_name . '(' . $parameter[ 0 ] . ')'; return $func_name . '(' . $parameter[ 0 ] . ')';
} }
} else { } else {
return $name . '(' . implode(',', $parameter) . ')'; $first_param = array_shift($parameter);
$modifier = array_merge(array($name), $parameter);
// Now, compile the function call as a modifier
return $this->compileTag(
'private_modifier',
array(),
array(
'modifierlist' => array($modifier),
'value' => $first_param
)
);
} }
} else { } else {
$this->trigger_template_error("unknown function '{$name}'"); $this->trigger_template_error("unknown function '{$name}'");

3
www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_internal_templateparser.php vendored
View File

@@ -2425,6 +2425,9 @@ public static $yy_action = array(
if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) { if (isset($this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor])) {
$this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1]; $this->_retvalue = $this->smarty->registered_classes[$this->yystack[$this->yyidx + -2]->minor].'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
} else { } else {
trigger_error('Using unregistered static method "' . $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0] . '" in a template is deprecated and will be ' .
'removed in a future release. Use Smarty::registerClass to explicitly register ' .
'a class for access.', E_USER_DEPRECATED);
$this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1]; $this->_retvalue = $this->yystack[$this->yyidx + -2]->minor.'::'.$this->yystack[$this->yyidx + 0]->minor[0].$this->yystack[$this->yyidx + 0]->minor[1];
} }
} else { } else {

2
www/vendor/egrajp/smarty-extended/src/sysplugins/smarty_security.php vendored
View File

@@ -253,7 +253,7 @@ class Smarty_Security
* *
* @param string $function_name * @param string $function_name
* @param object $compiler compiler object * @param object $compiler compiler object
* * @deprecated
* @return boolean true if function is trusted * @return boolean true if function is trusted
*/ */
public function isTrustedPhpFunction($function_name, $compiler) public function isTrustedPhpFunction($function_name, $compiler)