From f5daaca5987e30b82e3223fc9cdeda34192e5b82 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 8 Jul 2022 17:25:45 +0900 Subject: [PATCH] Fixes for Create\Email docstrings --- .../update/20220617-edit_user_login_user_id_add.sql | 2 ++ www/layout/admin/javascript/edit.jq.js | 6 +++--- www/lib/CoreLibs/Create/Email.php | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/4dev/database/update/20220617-edit_user_login_user_id_add.sql b/4dev/database/update/20220617-edit_user_login_user_id_add.sql index 37a9293d..32f0053f 100644 --- a/4dev/database/update/20220617-edit_user_login_user_id_add.sql +++ b/4dev/database/update/20220617-edit_user_login_user_id_add.sql @@ -1,5 +1,7 @@ -- 2022/6/17 update edit_user with login uid +-- !!! COPY TABLE ARRAY FOLDER !!! + -- the login uid, at least 32 chars ALTER TABLE edit_user ADD login_user_id VARCHAR UNIQUE; -- CREATE UNIQUE INDEX edit_user_login_user_id_key ON edit_user (login_user_id) WHERE login_user_id IS NOT NULL; diff --git a/www/layout/admin/javascript/edit.jq.js b/www/layout/admin/javascript/edit.jq.js index 4475104a..0f983fb7 100644 --- a/www/layout/admin/javascript/edit.jq.js +++ b/www/layout/admin/javascript/edit.jq.js @@ -14,9 +14,9 @@ if (!DEBUG) { }); }*/ -// open overlay boxes counter -var GL_OB_S = 30; -var GL_OB_BASE = 30; +// open overlay boxes counter for z-index +var GL_OB_S = 100; +var GL_OB_BASE = 100; /** * opens a popup window with winName and given features (string) diff --git a/www/lib/CoreLibs/Create/Email.php b/www/lib/CoreLibs/Create/Email.php index d27c8d1a..1c1cba11 100644 --- a/www/lib/CoreLibs/Create/Email.php +++ b/www/lib/CoreLibs/Create/Email.php @@ -24,7 +24,7 @@ class Email 'JIS', 'JIS-ms', ]; - /** @var string, normaly this does not need to be changed */ + /** @var string normaly this does not need to be changed */ private static $mb_convert_kana_mode = 'KV'; /** @@ -36,7 +36,7 @@ class Email * @param string $email E-Mail address * @param string $email_name Name for the email address, in UTF-8, if not set, empty * @param string $encoding Encoding, if not set UTF-8 - * @param bool $kv_fodling If set to true and a valid encoding, do KV folding + * @param bool $kv_folding If set to true and a valid encoding, do KV folding * @return string Correctly encoded and build email string */ public static function encodeEmailName( @@ -75,7 +75,7 @@ class Email * @param string $body Body string, in UTF-8 * @param array $replace Replace the array as key -> value, in UTF-8 * @param string $encoding Encoding for subject encode mime header - * @param bool $kv_fodling If set to true and a valid encoding, + * @param bool $kv_folding If set to true and a valid encoding, * do KV folding * @return array Pos 0: Subject, Pos 1: Body */